diff --git a/Resources/CMakeLists.txt b/Resources/CMakeLists.txt
index adf307f31..c390899eb 100644
--- a/Resources/CMakeLists.txt
+++ b/Resources/CMakeLists.txt
@@ -9,7 +9,7 @@ if(OPENSPADES_RESOURCES AND OPENSPADES_NONFREE_RESOURCES)
 	set(NONFREE_PAK_FILES
 		${CMAKE_CURRENT_BINARY_DIR}/pak000-Nonfree.pak
 		${CMAKE_CURRENT_BINARY_DIR}/font-unifont.pak)
-endif(OPENSPADES_NONFREE_RESOURCES)
+endif(OPENSPADES_RESOURCES AND OPENSPADES_NONFREE_RESOURCES)
 
 set(PAK_FILES
 	${COMPILED_PAK_FILES}
diff --git a/Sources/AngelScript/README.md b/Sources/AngelScript/README.md
deleted file mode 100644
index e3de24322..000000000
--- a/Sources/AngelScript/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-AngelScript
-===========
-
-This directory includes the source code of AngelScript 2.31.1.
diff --git a/Sources/AngelScript/add_on/autowrapper/aswrappedcall.h b/Sources/AngelScript/add_on/autowrapper/aswrappedcall.h
new file mode 100644
index 000000000..5474df48e
--- /dev/null
+++ b/Sources/AngelScript/add_on/autowrapper/aswrappedcall.h
@@ -0,0 +1,583 @@
+#ifndef AS_GEN_WRAPPER_H
+#define AS_GEN_WRAPPER_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#include <new>
+
+namespace gw {
+
+template <typename T> class Proxy {
+	public:
+		T value;
+		Proxy(T value) : value(value) {}
+		static T cast(void * ptr) {
+			return reinterpret_cast<Proxy<T> *>(&ptr)->value;
+		}
+	private:
+		Proxy(const Proxy &);
+		Proxy & operator=(const Proxy &);
+};
+
+template <typename T> struct Wrapper {};
+template <typename T> struct ObjFirst {};
+template <typename T> struct ObjLast {};
+template <typename T> struct Constructor {};
+
+template <typename T>
+void destroy(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+  static_cast<T *>(gen->GetObject())->~T();
+}
+template <>
+struct Wrapper<void (*)(void)> {
+	template <void (*fp)(void)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * /*gen*/) {
+		((fp)());
+	}
+};
+template <typename R>
+struct Wrapper<R (*)(void)> {
+	template <R (*fp)(void)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)());
+	}
+};
+template <typename T>
+struct Wrapper<void (T::*)(void)> {
+	template <void (T::*fp)(void)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)());
+	}
+};
+template <typename T, typename R>
+struct Wrapper<R (T::*)(void)> {
+	template <R (T::*fp)(void)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)());
+	}
+};
+template <typename T>
+struct Wrapper<void (T::*)(void) const> {
+	template <void (T::*fp)(void) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)());
+	}
+};
+template <typename T, typename R>
+struct Wrapper<R (T::*)(void) const> {
+	template <R (T::*fp)(void) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)());
+	}
+};
+template <typename T>
+struct ObjFirst<void (*)(T)> {
+	template <void (*fp)(T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename R>
+struct ObjFirst<R (*)(T)> {
+	template <R (*fp)(T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T>
+struct ObjLast<void (*)(T)> {
+	template <void (*fp)(T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename R>
+struct ObjLast<R (*)(T)> {
+	template <R (*fp)(T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T>
+struct Constructor <T ()> {
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetObject()) T();
+	}
+};
+template <typename A0>
+struct Wrapper<void (*)(A0)> {
+	template <void (*fp)(A0)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename R, typename A0>
+struct Wrapper<R (*)(A0)> {
+	template <R (*fp)(A0)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename T, typename A0>
+struct Wrapper<void (T::*)(A0)> {
+	template <void (T::*fp)(A0)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename T, typename R, typename A0>
+struct Wrapper<R (T::*)(A0)> {
+	template <R (T::*fp)(A0)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename T, typename A0>
+struct Wrapper<void (T::*)(A0) const> {
+	template <void (T::*fp)(A0) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename T, typename R, typename A0>
+struct Wrapper<R (T::*)(A0) const> {
+	template <R (T::*fp)(A0) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename T, typename A0>
+struct ObjFirst<void (*)(T, A0)> {
+	template <void (*fp)(T, A0)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename T, typename R, typename A0>
+struct ObjFirst<R (*)(T, A0)> {
+	template <R (*fp)(T, A0)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value));
+	}
+};
+template <typename T, typename A0>
+struct ObjLast<void (*)(A0, T)> {
+	template <void (*fp)(A0, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename R, typename A0>
+struct ObjLast<R (*)(A0, T)> {
+	template <R (*fp)(A0, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename A0>
+struct Constructor <T (A0)> {
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetObject()) T(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value);
+	}
+};
+template <typename A0, typename A1>
+struct Wrapper<void (*)(A0, A1)> {
+	template <void (*fp)(A0, A1)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename R, typename A0, typename A1>
+struct Wrapper<R (*)(A0, A1)> {
+	template <R (*fp)(A0, A1)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename T, typename A0, typename A1>
+struct Wrapper<void (T::*)(A0, A1)> {
+	template <void (T::*fp)(A0, A1)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1>
+struct Wrapper<R (T::*)(A0, A1)> {
+	template <R (T::*fp)(A0, A1)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename T, typename A0, typename A1>
+struct Wrapper<void (T::*)(A0, A1) const> {
+	template <void (T::*fp)(A0, A1) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1>
+struct Wrapper<R (T::*)(A0, A1) const> {
+	template <R (T::*fp)(A0, A1) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename T, typename A0, typename A1>
+struct ObjFirst<void (*)(T, A0, A1)> {
+	template <void (*fp)(T, A0, A1)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1>
+struct ObjFirst<R (*)(T, A0, A1)> {
+	template <R (*fp)(T, A0, A1)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value));
+	}
+};
+template <typename T, typename A0, typename A1>
+struct ObjLast<void (*)(A0, A1, T)> {
+	template <void (*fp)(A0, A1, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename R, typename A0, typename A1>
+struct ObjLast<R (*)(A0, A1, T)> {
+	template <R (*fp)(A0, A1, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename A0, typename A1>
+struct Constructor <T (A0, A1)> {
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetObject()) T(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value);
+	}
+};
+template <typename A0, typename A1, typename A2>
+struct Wrapper<void (*)(A0, A1, A2)> {
+	template <void (*fp)(A0, A1, A2)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename R, typename A0, typename A1, typename A2>
+struct Wrapper<R (*)(A0, A1, A2)> {
+	template <R (*fp)(A0, A1, A2)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2>
+struct Wrapper<void (T::*)(A0, A1, A2)> {
+	template <void (T::*fp)(A0, A1, A2)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2>
+struct Wrapper<R (T::*)(A0, A1, A2)> {
+	template <R (T::*fp)(A0, A1, A2)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2>
+struct Wrapper<void (T::*)(A0, A1, A2) const> {
+	template <void (T::*fp)(A0, A1, A2) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2>
+struct Wrapper<R (T::*)(A0, A1, A2) const> {
+	template <R (T::*fp)(A0, A1, A2) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2>
+struct ObjFirst<void (*)(T, A0, A1, A2)> {
+	template <void (*fp)(T, A0, A1, A2)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2>
+struct ObjFirst<R (*)(T, A0, A1, A2)> {
+	template <R (*fp)(T, A0, A1, A2)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2>
+struct ObjLast<void (*)(A0, A1, A2, T)> {
+	template <void (*fp)(A0, A1, A2, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2>
+struct ObjLast<R (*)(A0, A1, A2, T)> {
+	template <R (*fp)(A0, A1, A2, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2>
+struct Constructor <T (A0, A1, A2)> {
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetObject()) T(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value);
+	}
+};
+template <typename A0, typename A1, typename A2, typename A3>
+struct Wrapper<void (*)(A0, A1, A2, A3)> {
+	template <void (*fp)(A0, A1, A2, A3)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename R, typename A0, typename A1, typename A2, typename A3>
+struct Wrapper<R (*)(A0, A1, A2, A3)> {
+	template <R (*fp)(A0, A1, A2, A3)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2, typename A3>
+struct Wrapper<void (T::*)(A0, A1, A2, A3)> {
+	template <void (T::*fp)(A0, A1, A2, A3)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2, typename A3>
+struct Wrapper<R (T::*)(A0, A1, A2, A3)> {
+	template <R (T::*fp)(A0, A1, A2, A3)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2, typename A3>
+struct Wrapper<void (T::*)(A0, A1, A2, A3) const> {
+	template <void (T::*fp)(A0, A1, A2, A3) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2, typename A3>
+struct Wrapper<R (T::*)(A0, A1, A2, A3) const> {
+	template <R (T::*fp)(A0, A1, A2, A3) const>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((static_cast<T *>(gen->GetObject())->*fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2, typename A3>
+struct ObjFirst<void (*)(T, A0, A1, A2, A3)> {
+	template <void (*fp)(T, A0, A1, A2, A3)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2, typename A3>
+struct ObjFirst<R (*)(T, A0, A1, A2, A3)> {
+	template <R (*fp)(T, A0, A1, A2, A3)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				Proxy<T>::cast(gen->GetObject()),
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2, typename A3>
+struct ObjLast<void (*)(A0, A1, A2, A3, T)> {
+	template <void (*fp)(A0, A1, A2, A3, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename R, typename A0, typename A1, typename A2, typename A3>
+struct ObjLast<R (*)(A0, A1, A2, A3, T)> {
+	template <R (*fp)(A0, A1, A2, A3, T)>
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetAddressOfReturnLocation()) Proxy<R>((fp)(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value,
+				Proxy<T>::cast(gen->GetObject())));
+	}
+};
+template <typename T, typename A0, typename A1, typename A2, typename A3>
+struct Constructor <T (A0, A1, A2, A3)> {
+	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {
+		new (gen->GetObject()) T(
+				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value,
+				static_cast<Proxy <A1> *>(gen->GetAddressOfArg(1))->value,
+				static_cast<Proxy <A2> *>(gen->GetAddressOfArg(2))->value,
+				static_cast<Proxy <A3> *>(gen->GetAddressOfArg(3))->value);
+	}
+};
+template <typename T>
+struct Id {
+	template <T fn_ptr> AS_NAMESPACE_QUALIFIER asSFuncPtr  f(void) { return asFUNCTION(&Wrapper<T>::template f<fn_ptr>); }
+	template <T fn_ptr> AS_NAMESPACE_QUALIFIER asSFuncPtr of(void) { return asFUNCTION(&ObjFirst<T>::template f<fn_ptr>); }
+	template <T fn_ptr> AS_NAMESPACE_QUALIFIER asSFuncPtr ol(void) { return asFUNCTION(&ObjLast<T>::template f<fn_ptr>); }
+};
+
+template <typename T>
+Id<T> id(T /*fn_ptr*/) { return Id<T>(); }
+
+// On GNUC it is necessary to use the template keyword as disambiguator.
+// MSVC seems to accept both with or without the template keyword.
+#if defined(__GNUC__) 
+	#define TMPL template
+#else
+	#define TMPL
+#endif
+
+#define WRAP_FN(name)             (::gw::id(name).TMPL f< name >())
+#define WRAP_MFN(ClassType, name) (::gw::id(&ClassType::name).TMPL f< &ClassType::name >())
+#define WRAP_OBJ_FIRST(name)      (::gw::id(name).TMPL of< name >())
+#define WRAP_OBJ_LAST(name)       (::gw::id(name).TMPL ol< name >())
+
+#define WRAP_FN_PR(name, Parameters, ReturnType)             asFUNCTION((::gw::Wrapper<ReturnType (*)Parameters>::TMPL f< name >))
+#if defined(__clang__)
+ // Clang doesn't like the use of AS_METHOD_AMBIGUITY_CAST in the inner template
+ #define WRAP_MFN_PR(ClassType, name, Parameters, ReturnType) asFUNCTION((::gw::Wrapper<ReturnType (ClassType::*)Parameters>::TMPL f< &ClassType::name >))
+#else
+ #define WRAP_MFN_PR(ClassType, name, Parameters, ReturnType) asFUNCTION((::gw::Wrapper<ReturnType (ClassType::*)Parameters>::TMPL f< AS_METHOD_AMBIGUITY_CAST(ReturnType (ClassType::*)Parameters)(&ClassType::name) >))
+#endif
+#define WRAP_OBJ_FIRST_PR(name, Parameters, ReturnType)      asFUNCTION((::gw::ObjFirst<ReturnType (*)Parameters>::TMPL f< name >))
+#define WRAP_OBJ_LAST_PR(name, Parameters, ReturnType)       asFUNCTION((::gw::ObjLast<ReturnType (*)Parameters>::TMPL f< name >))
+
+#define WRAP_CON(ClassType, Parameters) asFUNCTION((::gw::Constructor<ClassType Parameters>::f))
+#define WRAP_DES(ClassType)             asFUNCTION((::gw::destroy<ClassType>))
+
+
+} // end namespace gw
+
+#endif
diff --git a/Sources/AngelScript/add_on/autowrapper/generator/generateheader.cpp b/Sources/AngelScript/add_on/autowrapper/generator/generateheader.cpp
new file mode 100644
index 000000000..50eff2420
--- /dev/null
+++ b/Sources/AngelScript/add_on/autowrapper/generator/generateheader.cpp
@@ -0,0 +1,168 @@
+//
+// This generator creates a header file that implements automatic
+// wrapper functions for the generic calling convention.
+//
+// Originally implemented by George Yohng from 4Front Technologies in 2009-03-11
+// Modifications by Pierre Fortin in order to add constructor wrapper generation
+//
+// A completely new implementation of automatic wrapper functions was
+// implemented by SiCrane at GameDev.net in 2011-12-18. The generator was 
+// adapted from Python to C++ by Andreas.
+//
+// ref: http://www.gamedev.net/topic/617111-more-angelscript-binding-wrappers/
+//
+
+
+#include <stdio.h>
+#include <string>
+
+// Generate templates for up to this number of function parameters
+const int max_args = 4;
+
+using namespace std;
+
+void PrintTemplate(const char *base, const char *typeNameList, const char *retType, const char *objType, const char *isConst, const char *newExpr, const char *objExpr, const char *argList1, const char *argList2, const char *wrapName);
+void PrintConstructor(const char *comma, const char *typeNameList, const char *typeList, const char *argList);
+
+int main()
+{
+	printf("#ifndef AS_GEN_WRAPPER_H\n"
+	"#define AS_GEN_WRAPPER_H\n"
+	"\n"
+	"#ifndef ANGELSCRIPT_H\n"
+	"// Avoid having to inform include path if header is already include before\n"
+	"#include <angelscript.h>\n"
+	"#endif\n"
+	"#include <new>\n"
+	"\n"
+	"namespace gw {\n"
+	"\n"
+	"template <typename T> class Proxy {\n"
+	"	public:\n"
+	"		T value;\n"
+	"		Proxy(T value) : value(value) {}\n"
+	"		static T cast(void * ptr) {\n"
+	"			return reinterpret_cast<Proxy<T> *>(&ptr)->value;\n"
+	"		}\n"
+	"	private:\n"
+	"		Proxy(const Proxy &);\n"
+	"		Proxy & operator=(const Proxy &);\n"
+	"};\n"
+	"\n"
+	"template <typename T> struct Wrapper {};\n"
+	"template <typename T> struct ObjFirst {};\n"
+	"template <typename T> struct ObjLast {};\n"
+	"template <typename T> struct Constructor {};\n"
+	"\n"
+	"template <typename T>\n"
+	"void destroy(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {\n"
+	"	static_cast<T *>(gen->GetObject())->~T();\n"
+	"}\n");
+
+	string typename_list = "typename A0";
+	string type_list     = "A0";
+	string arg_list      = "\n				static_cast<Proxy <A0> *>(gen->GetAddressOfArg(0))->value";
+	string new_exp       = "new (gen->GetAddressOfReturnLocation()) Proxy<R>";
+	string obj_exp       = "static_cast<T *>(gen->GetObject())->*";
+	string obj_arg_exp   = "\n				Proxy<T>::cast(gen->GetObject())";
+
+	PrintTemplate("",                       "", "void", "",    "",       "",              "",              "void", "", "Wrapper");
+	PrintTemplate("typename R",             "", "R",    "",    "",       new_exp.c_str(), "",              "void", "", "Wrapper");
+	PrintTemplate("typename T",             "", "void", "T::", "",       "",              obj_exp.c_str(), "void", "", "Wrapper");
+	PrintTemplate("typename T, typename R", "", "R",    "T::", "",       new_exp.c_str(), obj_exp.c_str(), "void", "", "Wrapper");
+	PrintTemplate("typename T",             "", "void", "T::", " const", "",              obj_exp.c_str(), "void", "", "Wrapper");
+	PrintTemplate("typename T, typename R", "", "R",    "T::", " const", new_exp.c_str(), obj_exp.c_str(), "void", "", "Wrapper");
+
+	PrintTemplate("typename T",             "", "void", "",    "",       "",              "",      "T",    obj_arg_exp.c_str(), "ObjFirst");
+	PrintTemplate("typename T, typename R", "", "R",    "",    "",       new_exp.c_str(), "",      "T",    obj_arg_exp.c_str(), "ObjFirst");
+	PrintTemplate("typename T",             "", "void", "",    "",       "",              "",      "T",    obj_arg_exp.c_str(), "ObjLast");
+	PrintTemplate("typename T, typename R", "", "R",    "",    "",       new_exp.c_str(), "",      "T",    obj_arg_exp.c_str(), "ObjLast");
+
+	PrintConstructor("", "", "", "");
+
+	for( int i = 0; i < max_args; i++ )
+	{
+		PrintTemplate("",                         typename_list.c_str(), "void", "",    "",       "",              "",              type_list.c_str(), arg_list.c_str(), "Wrapper");
+		PrintTemplate("typename R, ",             typename_list.c_str(), "R",    "",    "",       new_exp.c_str(), "",              type_list.c_str(), arg_list.c_str(), "Wrapper");
+		PrintTemplate("typename T, ",             typename_list.c_str(), "void", "T::", "",       "",              obj_exp.c_str(), type_list.c_str(), arg_list.c_str(), "Wrapper");
+		PrintTemplate("typename T, typename R, ", typename_list.c_str(), "R",    "T::", "",       new_exp.c_str(), obj_exp.c_str(), type_list.c_str(), arg_list.c_str(), "Wrapper");
+		PrintTemplate("typename T, ",             typename_list.c_str(), "void", "T::", " const", "",              obj_exp.c_str(), type_list.c_str(), arg_list.c_str(), "Wrapper");
+		PrintTemplate("typename T, typename R, ", typename_list.c_str(), "R",    "T::", " const", new_exp.c_str(), obj_exp.c_str(), type_list.c_str(), arg_list.c_str(), "Wrapper");
+
+		PrintTemplate("typename T, ",             typename_list.c_str(), "void", "", "", "",              "", ("T, " + type_list).c_str(), (obj_arg_exp + "," + arg_list).c_str(), "ObjFirst");
+		PrintTemplate("typename T, typename R, ", typename_list.c_str(), "R",    "", "", new_exp.c_str(), "", ("T, " + type_list).c_str(), (obj_arg_exp + "," + arg_list).c_str(), "ObjFirst");
+		PrintTemplate("typename T, ",             typename_list.c_str(), "void", "", "", "",              "", (type_list + ", T").c_str(), (arg_list + "," + obj_arg_exp).c_str(), "ObjLast");
+		PrintTemplate("typename T, typename R, ", typename_list.c_str(), "R",    "", "", new_exp.c_str(), "", (type_list + ", T").c_str(), (arg_list + "," + obj_arg_exp).c_str(), "ObjLast");
+
+		PrintConstructor(", ", typename_list.c_str(), type_list.c_str(), arg_list.c_str());
+
+		char buf[5];
+		sprintf(buf, "%d", i + 1);
+		typename_list += ", typename A" + string(buf);
+		type_list     += ", A" + string(buf);
+		arg_list      += ",\n				static_cast<Proxy <A" + string(buf) + "> *>(gen->GetAddressOfArg(" + string(buf) + "))->value";
+	}
+
+	printf("template <typename T>\n"
+	"struct Id {\n"
+	"	template <T fn_ptr> AS_NAMESPACE_QUALIFIER asSFuncPtr  f(void) { return asFUNCTION(&Wrapper<T>::template f<fn_ptr>); }\n"
+	"	template <T fn_ptr> AS_NAMESPACE_QUALIFIER asSFuncPtr of(void) { return asFUNCTION(&ObjFirst<T>::template f<fn_ptr>); }\n"
+	"	template <T fn_ptr> AS_NAMESPACE_QUALIFIER asSFuncPtr ol(void) { return asFUNCTION(&ObjLast<T>::template f<fn_ptr>); }\n"
+	"};\n"
+	"\n"
+	"template <typename T>\n"
+	"Id<T> id(T fn_ptr) { return Id<T>(); }\n"
+	"\n"
+	"// On GNUC it is necessary to use the template keyword as disambiguator.\n"
+	"// MSVC seems to accept both with or without the template keyword.\n"
+	"#if defined(__GNUC__)\n"
+	"	#define TMPL template\n"
+	"#else\n"
+	"	#define TMPL\n"
+	"#endif\n"
+	"\n"
+	"#define WRAP_FN(name)             (::gw::id(name).TMPL f< name >())\n"
+	"#define WRAP_MFN(ClassType, name) (::gw::id(&ClassType::name).TMPL f< &ClassType::name >())\n"
+	"#define WRAP_OBJ_FIRST(name)      (::gw::id(name).TMPL of< name >())\n"
+	"#define WRAP_OBJ_LAST(name)       (::gw::id(name).TMPL ol< name >())\n"
+	"\n"
+	"#define WRAP_FN_PR(name, Parameters, ReturnType)             asFUNCTION((::gw::Wrapper<ReturnType (*)Parameters>::TMPL f< name >))\n"
+	"#if defined(__clang__)\n"
+	" // Clang doesn't like the use of AS_METHOD_AMBIGUITY_CAST in the inner template\n"
+	" #define WRAP_MFN_PR(ClassType, name, Parameters, ReturnType) asFUNCTION((::gw::Wrapper<ReturnType (ClassType::*)Parameters>::TMPL f< &ClassType::name >))\n"
+	"#else\n"
+	" #define WRAP_MFN_PR(ClassType, name, Parameters, ReturnType) asFUNCTION((::gw::Wrapper<ReturnType (ClassType::*)Parameters>::TMPL f< AS_METHOD_AMBIGUITY_CAST(ReturnType (ClassType::*)Parameters)(&ClassType::name) >))\n"
+	"#endif\n"
+	"#define WRAP_OBJ_FIRST_PR(name, Parameters, ReturnType)      asFUNCTION((::gw::ObjFirst<ReturnType (*)Parameters>::TMPL f< name >))\n"
+	"#define WRAP_OBJ_LAST_PR(name, Parameters, ReturnType)       asFUNCTION((::gw::ObjLast<ReturnType (*)Parameters>::TMPL f< name >))\n"
+	"\n"
+	"#define WRAP_CON(ClassType, Parameters) asFUNCTION((::gw::Constructor<ClassType Parameters>::f))\n"
+	"#define WRAP_DES(ClassType)             asFUNCTION((::gw::destroy<ClassType>))\n"
+	"\n"
+	"} // end namespace gw\n"
+	"\n"
+	"#endif\n");
+
+	return 0;
+}
+
+void PrintTemplate(const char *base, const char *typeNameList, const char *retType, const char *objType, const char *isConst, const char *newExpr, const char *objExpr, const char *argList1, const char *argList2, const char *wrapName)
+{
+	printf("template <%s%s>\n", base, typeNameList);
+	printf("struct %s<%s (%s*)(%s)%s> {\n", wrapName, retType, objType, argList1, isConst);
+	printf("	template <%s (%s*fp)(%s)%s>\n", retType, objType, argList1, isConst);
+	printf("	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {\n");
+	printf("		%s((%sfp)(%s));\n", newExpr, objExpr, argList2);
+	printf("	}\n");
+	printf("};\n");
+}
+
+void PrintConstructor(const char *comma, const char *typeNameList, const char *typeList, const char *argList)
+{
+	printf("template <typename T%s%s>\n", comma, typeNameList);
+	printf("struct Constructor <T (%s)> {\n", typeList);
+	printf("	static void f(AS_NAMESPACE_QUALIFIER asIScriptGeneric * gen) {\n");
+	printf("		new (gen->GetObject()) T(%s);\n", argList);
+	printf("	}\n");
+	printf("};\n");
+}
\ No newline at end of file
diff --git a/Sources/AngelScript/add_on/autowrapper/generator/generator.vcproj b/Sources/AngelScript/add_on/autowrapper/generator/generator.vcproj
new file mode 100644
index 000000000..dddd95091
--- /dev/null
+++ b/Sources/AngelScript/add_on/autowrapper/generator/generator.vcproj
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="generator"
+	ProjectGUID="{086A2F1A-01B1-4EB3-A8FA-0926FF10E953}"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/generator.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\Debug/generator.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Debug/generator.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/generator.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/generator.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/generator.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/generator.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Release/generator.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/generator.pdb"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/generator.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="generateheader.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Sources/AngelScript/add_on/contextmgr/contextmgr.cpp b/Sources/AngelScript/add_on/contextmgr/contextmgr.cpp
new file mode 100644
index 000000000..8c11a7f68
--- /dev/null
+++ b/Sources/AngelScript/add_on/contextmgr/contextmgr.cpp
@@ -0,0 +1,401 @@
+#include <assert.h>
+#include <string>
+
+#include "contextmgr.h"
+
+using namespace std;
+
+// TODO: Should have a pool of free asIScriptContext so that new contexts
+//       won't be allocated every time. The application must not keep
+//       its own references, instead it must tell the context manager
+//       that it is using the context. Otherwise the context manager may
+//       think it can reuse the context too early.
+
+// TODO: Need to have a callback for when scripts finishes, so that the
+//       application can receive return values.
+
+BEGIN_AS_NAMESPACE
+
+// The id for the context manager user data.
+// The add-ons have reserved the numbers 1000
+// through 1999 for this purpose, so we should be fine.
+const asPWORD CONTEXT_MGR = 1002;
+
+struct SContextInfo
+{
+	asUINT                    sleepUntil;
+	vector<asIScriptContext*> coRoutines;
+	asUINT                    currentCoRoutine;
+	asIScriptContext *        keepCtxAfterExecution;
+};
+
+static void ScriptSleep(asUINT milliSeconds)
+{
+	// Get a pointer to the context that is currently being executed
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+	{
+		// Get the context manager from the user data
+		CContextMgr *ctxMgr = reinterpret_cast<CContextMgr*>(ctx->GetUserData(CONTEXT_MGR));
+		if( ctxMgr )
+		{
+			// Suspend its execution. The VM will continue until the current
+			// statement is finished and then return from the Execute() method
+			ctx->Suspend();
+
+			// Tell the context manager when the context is to continue execution
+			ctxMgr->SetSleeping(ctx, milliSeconds);
+		}
+	}
+}
+
+static void ScriptYield()
+{
+	// Get a pointer to the context that is currently being executed
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+	{
+		// Get the context manager from the user data
+		CContextMgr *ctxMgr = reinterpret_cast<CContextMgr*>(ctx->GetUserData(CONTEXT_MGR));
+		if( ctxMgr )
+		{
+			// Let the context manager know that it should run the next co-routine
+			ctxMgr->NextCoRoutine();
+
+			// The current context must be suspended so that VM will return from
+			// the Execute() method where the context manager will continue.
+			ctx->Suspend();
+		}
+	}
+}
+
+void ScriptCreateCoRoutine(asIScriptFunction *func, CScriptDictionary *arg)
+{
+	if( func == 0 )
+		return;
+
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+	{
+		// Get the context manager from the user data
+		CContextMgr *ctxMgr = reinterpret_cast<CContextMgr*>(ctx->GetUserData(CONTEXT_MGR));
+		if( ctxMgr )
+		{
+			// Create a new context for the co-routine
+			asIScriptContext *coctx = ctxMgr->AddContextForCoRoutine(ctx, func);
+
+			// Pass the argument to the context
+			coctx->SetArgObject(0, arg);
+
+			// The context manager will call Execute() on the context when it is time
+		}
+	}
+}
+
+#ifdef AS_MAX_PORTABILITY
+void ScriptYield_generic(asIScriptGeneric *)
+{
+	ScriptYield();
+}
+
+void ScriptCreateCoRoutine_generic(asIScriptGeneric *gen)
+{
+	asIScriptFunction *func = reinterpret_cast<asIScriptFunction*>(gen->GetArgAddress(0));
+	CScriptDictionary *dict = reinterpret_cast<CScriptDictionary*>(gen->GetArgAddress(1));
+	ScriptCreateCoRoutine(func, dict);
+}
+#endif
+
+CContextMgr::CContextMgr()
+{
+	m_getTimeFunc   = 0;
+	m_currentThread = 0;
+
+	m_numExecutions         = 0;
+	m_numGCObjectsCreated   = 0;
+	m_numGCObjectsDestroyed = 0;
+}
+
+CContextMgr::~CContextMgr()
+{
+	asUINT n;
+
+	// Free the memory
+	for( n = 0; n < m_threads.size(); n++ )
+	{
+		if( m_threads[n] )
+		{
+			for( asUINT c = 0; c < m_threads[n]->coRoutines.size(); c++ )
+			{
+				asIScriptContext *ctx = m_threads[n]->coRoutines[c];
+				if( ctx )
+				{
+					// Return the context to the engine (and possible context pool configured in it)
+					ctx->GetEngine()->ReturnContext(ctx);
+				}
+			}
+
+			delete m_threads[n];
+		}
+	}
+
+	for( n = 0; n < m_freeThreads.size(); n++ )
+	{
+		if( m_freeThreads[n] )
+		{
+			assert( m_freeThreads[n]->coRoutines.size() == 0 );
+
+			delete m_freeThreads[n];
+		}
+	}
+}
+
+int CContextMgr::ExecuteScripts()
+{
+	// TODO: Should have an optional time out for this function. If not all scripts executed before the
+	//       time out, the next time the function is called the loop should continue
+	//       where it left off.
+
+	// TODO: There should be a time out per thread as well. If a thread executes for too
+	//       long, it should be aborted. A group of co-routines count as a single thread.
+
+	// Check if the system time is higher than the time set for the contexts
+	asUINT time = m_getTimeFunc ? m_getTimeFunc() : asUINT(-1);
+	for( m_currentThread = 0; m_currentThread < m_threads.size(); m_currentThread++ )
+	{
+		SContextInfo *thread = m_threads[m_currentThread];
+		if( thread->sleepUntil < time )
+		{
+			int currentCoRoutine = thread->currentCoRoutine;
+
+			// Gather some statistics from the GC
+			asIScriptEngine *engine = thread->coRoutines[currentCoRoutine]->GetEngine();
+			asUINT gcSize1, gcSize2, gcSize3;
+			engine->GetGCStatistics(&gcSize1);
+
+			// Execute the script for this thread and co-routine
+			int r = thread->coRoutines[currentCoRoutine]->Execute();
+
+			// Determine how many new objects were created in the GC
+			engine->GetGCStatistics(&gcSize2);
+			m_numGCObjectsCreated += gcSize2 - gcSize1;
+			m_numExecutions++;
+
+			if( r != asEXECUTION_SUSPENDED )
+			{
+				// The context has terminated execution (for one reason or other)
+				// Unless the application has requested to keep the context we'll return it to the pool now
+				if( thread->keepCtxAfterExecution != thread->coRoutines[currentCoRoutine] )
+					engine->ReturnContext(thread->coRoutines[currentCoRoutine]);
+				thread->coRoutines[currentCoRoutine] = 0;
+
+				thread->coRoutines.erase(thread->coRoutines.begin() + thread->currentCoRoutine);
+				if( thread->currentCoRoutine >= thread->coRoutines.size() )
+					thread->currentCoRoutine = 0;
+
+				// If this was the last co-routine terminate the thread
+				if( thread->coRoutines.size() == 0 )
+				{
+					m_freeThreads.push_back(thread);
+					m_threads.erase(m_threads.begin() + m_currentThread);
+					m_currentThread--;
+				}
+			}
+
+			// Destroy all known garbage if any new objects were created
+			if( gcSize2 > gcSize1 )
+			{
+				engine->GarbageCollect(asGC_FULL_CYCLE | asGC_DESTROY_GARBAGE);
+
+				// Determine how many objects were destroyed
+ 				engine->GetGCStatistics(&gcSize3);
+				m_numGCObjectsDestroyed += gcSize3 - gcSize2;
+			}
+
+			// TODO: If more objects are created per execution than destroyed on average
+			//       then it may be necessary to run more iterations of the detection of
+			//       cyclic references. At the startup of an application there is usually
+			//       a lot of objects created that will live on through out the application
+			//       so the average number of objects created per execution will be higher
+			//       than the number of destroyed objects in the beginning, but afterwards
+			//       it usually levels out to be more or less equal.
+
+			// Just run an incremental step for detecting cyclic references
+			engine->GarbageCollect(asGC_ONE_STEP | asGC_DETECT_GARBAGE);
+		}
+	}
+
+	return int(m_threads.size());
+}
+
+void CContextMgr::DoneWithContext(asIScriptContext *ctx)
+{
+	ctx->GetEngine()->ReturnContext(ctx);
+}
+
+void CContextMgr::NextCoRoutine()
+{
+	m_threads[m_currentThread]->currentCoRoutine++;
+	if( m_threads[m_currentThread]->currentCoRoutine >= m_threads[m_currentThread]->coRoutines.size() )
+		m_threads[m_currentThread]->currentCoRoutine = 0;
+}
+
+void CContextMgr::AbortAll()
+{
+	// Abort all contexts and release them. The script engine will make
+	// sure that all resources held by the scripts are properly released.
+
+	for( asUINT n = 0; n < m_threads.size(); n++ )
+	{
+		for( asUINT c = 0; c < m_threads[n]->coRoutines.size(); c++ )
+		{
+			asIScriptContext *ctx = m_threads[n]->coRoutines[c];
+			if( ctx )
+			{
+				ctx->Abort();
+				ctx->GetEngine()->ReturnContext(ctx);
+				ctx = 0;
+			}
+		}
+		m_threads[n]->coRoutines.resize(0);
+
+		m_freeThreads.push_back(m_threads[n]);
+	}
+
+	m_threads.resize(0);
+
+	m_currentThread = 0;
+}
+
+asIScriptContext *CContextMgr::AddContext(asIScriptEngine *engine, asIScriptFunction *func, bool keepCtxAfterExec)
+{
+	// Use RequestContext instead of CreateContext so we can take
+	// advantage of possible context pooling configured with the engine
+	asIScriptContext *ctx = engine->RequestContext();
+	if( ctx == 0 )
+		return 0;
+
+	// Prepare it to execute the function
+	int r = ctx->Prepare(func);
+	if( r < 0 )
+	{
+		engine->ReturnContext(ctx);
+		return 0;
+	}
+
+	// Set the context manager as user data with the context so it
+	// can be retrieved by the functions registered with the engine
+	ctx->SetUserData(this, CONTEXT_MGR);
+
+	// Add the context to the list for execution
+	SContextInfo *info = 0;
+	if( m_freeThreads.size() > 0 )
+	{
+		info = *m_freeThreads.rbegin();
+		m_freeThreads.pop_back();
+	}
+	else
+	{
+		info = new SContextInfo;
+	}
+
+	info->coRoutines.push_back(ctx);
+	info->currentCoRoutine      = 0;
+	info->sleepUntil            = 0;
+	info->keepCtxAfterExecution = keepCtxAfterExec ? ctx : 0;
+	m_threads.push_back(info);
+
+	return ctx;
+}
+
+asIScriptContext *CContextMgr::AddContextForCoRoutine(asIScriptContext *currCtx, asIScriptFunction *func)
+{
+	asIScriptEngine *engine = currCtx->GetEngine();
+	asIScriptContext *coctx = engine->RequestContext();
+	if( coctx == 0 )
+	{
+		return 0;
+	}
+
+	// Prepare the context
+	int r = coctx->Prepare(func);
+	if( r < 0 )
+	{
+		// Couldn't prepare the context
+		engine->ReturnContext(coctx);
+		return 0;
+	}
+
+	// Set the context manager as user data with the context so it
+	// can be retrieved by the functions registered with the engine
+	coctx->SetUserData(this, CONTEXT_MGR);
+
+	// Find the current context thread info
+	// TODO: Start with the current thread so that we can find the group faster
+	for( asUINT n = 0; n < m_threads.size(); n++ )
+	{
+		if( m_threads[n]->coRoutines[m_threads[n]->currentCoRoutine] == currCtx )
+		{
+			// Add the coRoutine to the list
+			m_threads[n]->coRoutines.push_back(coctx);
+		}
+	}
+
+	return coctx;
+}
+
+void CContextMgr::SetSleeping(asIScriptContext *ctx, asUINT milliSeconds)
+{
+	assert( m_getTimeFunc != 0 );
+
+	// Find the context and update the timeStamp
+	// for when the context is to be continued
+
+	// TODO: Start with the current thread
+
+	for( asUINT n = 0; n < m_threads.size(); n++ )
+	{
+		if( m_threads[n]->coRoutines[m_threads[n]->currentCoRoutine] == ctx )
+		{
+			m_threads[n]->sleepUntil = (m_getTimeFunc ? m_getTimeFunc() : 0) + milliSeconds;
+		}
+	}
+}
+
+void CContextMgr::RegisterThreadSupport(asIScriptEngine *engine)
+{
+	int r;
+
+	// Must set the get time callback function for this to work
+	assert( m_getTimeFunc != 0 );
+
+	// Register the sleep function
+	r = engine->RegisterGlobalFunction("void sleep(uint)", asFUNCTION(ScriptSleep), asCALL_CDECL); assert( r >= 0 );
+
+	// TODO: Add support for spawning new threads, waiting for signals, etc
+}
+
+void CContextMgr::RegisterCoRoutineSupport(asIScriptEngine *engine)
+{
+	int r;
+
+	// The dictionary add-on must have been registered already
+	assert( engine->GetTypeInfoByDecl("dictionary") );
+
+#ifndef AS_MAX_PORTABILITY
+	r = engine->RegisterGlobalFunction("void yield()", asFUNCTION(ScriptYield), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterFuncdef("void coroutine(dictionary@)");
+	r = engine->RegisterGlobalFunction("void createCoRoutine(coroutine @+, dictionary @+)", asFUNCTION(ScriptCreateCoRoutine), asCALL_CDECL); assert( r >= 0 );
+#else
+	r = engine->RegisterGlobalFunction("void yield()", asFUNCTION(ScriptYield_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterFuncdef("void coroutine(dictionary@)");
+	r = engine->RegisterGlobalFunction("void createCoRoutine(coroutine @+, dictionary @+)", asFUNCTION(ScriptCreateCoRoutine_generic), asCALL_GENERIC); assert( r >= 0 );
+#endif
+}
+
+void CContextMgr::SetGetTimeCallback(TIMEFUNC_t func)
+{
+	m_getTimeFunc = func;
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/contextmgr/contextmgr.h b/Sources/AngelScript/add_on/contextmgr/contextmgr.h
new file mode 100644
index 000000000..cebf2af8c
--- /dev/null
+++ b/Sources/AngelScript/add_on/contextmgr/contextmgr.h
@@ -0,0 +1,99 @@
+#ifndef CONTEXTMGR_H
+#define CONTEXTMGR_H
+
+// The context manager simplifies the management of multiple concurrent scripts
+
+// More than one context manager can be used, if you wish to control different
+// groups of scripts separately, e.g. game object scripts, and GUI scripts.
+
+// OBSERVATION: This class is currently not thread safe.
+
+#ifndef ANGELSCRIPT_H
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#include <vector>
+
+BEGIN_AS_NAMESPACE
+
+class CScriptDictionary;
+
+// The internal structure for holding contexts
+struct SContextInfo;
+
+// The signature of the get time callback function
+typedef asUINT (*TIMEFUNC_t)();
+
+class CContextMgr
+{
+public:
+	CContextMgr();
+	~CContextMgr();
+
+	// Set the function that the manager will use to obtain the time in milliseconds
+	void SetGetTimeCallback(TIMEFUNC_t func);
+
+	// Registers the following:
+	//
+	//  void sleep(uint milliseconds)
+	//
+	// The application must set the get time callback for this to work
+	void RegisterThreadSupport(asIScriptEngine *engine);
+
+	// Registers the following:
+	//
+	//  funcdef void coroutine(dictionary@)
+	//  void createCoRoutine(coroutine @func, dictionary @args)
+	//  void yield()
+	void RegisterCoRoutineSupport(asIScriptEngine *engine);
+
+	// Create a new context, prepare it with the function id, then return
+	// it so that the application can pass the argument values. The context
+	// will be released by the manager after the execution has completed.
+	// Set keepCtxAfterExecution to true if the application needs to retrieve
+	// information from the context after it the script has finished.
+	asIScriptContext *AddContext(asIScriptEngine *engine, asIScriptFunction *func, bool keepCtxAfterExecution = false);
+
+	// If the context was kept after the execution, this method must be
+	// called when the application is done with the context so it can be
+	// returned to the pool for reuse.
+	void DoneWithContext(asIScriptContext *ctx);
+
+	// Create a new context, prepare it with the function id, then return
+	// it so that the application can pass the argument values. The context
+	// will be added as a co-routine in the same thread as the currCtx.
+	asIScriptContext *AddContextForCoRoutine(asIScriptContext *currCtx, asIScriptFunction *func);
+
+	// Execute each script that is not currently sleeping. The function returns after
+	// each script has been executed once. The application should call this function
+	// for each iteration of the message pump, or game loop, or whatever.
+	// Returns the number of scripts still in execution.
+	int ExecuteScripts();
+
+	// Put a script to sleep for a while
+	void SetSleeping(asIScriptContext *ctx, asUINT milliSeconds);
+
+	// Switch the execution to the next co-routine in the group.
+	// Returns true if the switch was successful.
+	void NextCoRoutine();
+
+	// Abort all scripts
+	void AbortAll();
+
+protected:
+	std::vector<SContextInfo*> m_threads;
+	std::vector<SContextInfo*> m_freeThreads;
+	asUINT                     m_currentThread;
+	TIMEFUNC_t                 m_getTimeFunc;
+
+	// Statistics for Garbage Collection
+	asUINT   m_numExecutions;
+	asUINT   m_numGCObjectsCreated;
+	asUINT   m_numGCObjectsDestroyed;
+};
+
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/add_on/datetime/datetime.cpp b/Sources/AngelScript/add_on/datetime/datetime.cpp
new file mode 100644
index 000000000..cd56cf6f4
--- /dev/null
+++ b/Sources/AngelScript/add_on/datetime/datetime.cpp
@@ -0,0 +1,289 @@
+#include "datetime.h"
+#include "../autowrapper/aswrappedcall.h"
+#include <string.h>
+#include <assert.h>
+#include <new>
+
+using namespace std;
+using namespace std::chrono;
+
+BEGIN_AS_NAMESPACE
+
+// TODO: Allow setting the timezone to use
+
+static tm time_point_to_tm(const std::chrono::time_point<std::chrono::system_clock> &tp)
+{
+	time_t t = system_clock::to_time_t(tp);
+	tm local;
+	
+	// Use the universal timezone
+#ifdef _MSC_VER
+	gmtime_s(&local, &t);
+#else
+	// TODO: gmtime is not threadsafe
+	local = *gmtime(&t);
+#endif
+	return local;
+}
+
+// Returns true if successful. Doesn't modify tp if not successful
+static bool tm_to_time_point(const tm &_tm, std::chrono::time_point<std::chrono::system_clock> &tp)
+{
+	tm localTm = _tm;
+
+	// Do not rely on timezone, as it is not portable
+	// ref: https://stackoverflow.com/questions/38298261/why-there-is-no-inverse-function-for-gmtime-in-libc
+	// ref: https://stackoverflow.com/questions/8558919/mktime-and-tm-isdst
+	// TODO: mktime is not threadsafe
+	time_t t = mktime(&localTm);
+	if (t == -1)
+		return false;
+	
+	// Adjust the time_t since epoch with the difference of the local timezone to the universal timezone
+	// TODO: localtime, gmtime, and mktime are not threadsafe
+	t += (mktime(localtime(&t)) - mktime(gmtime(&t)));
+
+	tp = system_clock::from_time_t(t);
+	return true;
+}
+
+CDateTime::CDateTime() : tp(std::chrono::system_clock::now()) 
+{
+}
+
+CDateTime::CDateTime(const CDateTime &o) : tp(o.tp) 
+{
+}
+
+CDateTime &CDateTime::operator=(const CDateTime &o)
+{
+	tp = o.tp;
+	return *this;
+}
+
+asUINT CDateTime::getYear() const
+{
+	tm local = time_point_to_tm(tp);
+	return local.tm_year + 1900;
+}
+
+asUINT CDateTime::getMonth() const
+{
+	tm local = time_point_to_tm(tp);
+	return local.tm_mon + 1;
+}
+
+asUINT CDateTime::getDay() const
+{
+	tm local = time_point_to_tm(tp);
+	return local.tm_mday;
+}
+
+asUINT CDateTime::getHour() const
+{
+	tm local = time_point_to_tm(tp);
+	return local.tm_hour;
+}
+
+asUINT CDateTime::getMinute() const
+{
+	tm local = time_point_to_tm(tp);
+	return local.tm_min;
+}
+
+asUINT CDateTime::getSecond() const
+{
+	tm local = time_point_to_tm(tp);
+	return local.tm_sec;
+}
+
+bool CDateTime::setDate(asUINT year, asUINT month, asUINT day)
+{
+	tm local = time_point_to_tm(tp);
+	local.tm_year = int(year) - 1900;
+	local.tm_mon = month - 1;
+	local.tm_mday = day;
+
+	std::chrono::time_point<std::chrono::system_clock> newTp;
+	if (!tm_to_time_point(local, newTp))
+		return false;
+	
+	// Check if the date was actually valid
+	tm local2 = time_point_to_tm(newTp);
+
+	if (local.tm_year != local2.tm_year ||
+		local.tm_mon != local2.tm_mon ||
+		local.tm_mday != local2.tm_mday)
+		return false;
+
+	tp = newTp;
+	return true;
+}
+
+bool CDateTime::setTime(asUINT hour, asUINT minute, asUINT second)
+{
+	tm local = time_point_to_tm(tp);
+	local.tm_hour = hour;
+	local.tm_min = minute;
+	local.tm_sec = second;
+
+	std::chrono::time_point<std::chrono::system_clock> newTp;
+	if (!tm_to_time_point(local, newTp))
+		return false;
+
+	// Check if the time was actually valid
+	tm local2 = time_point_to_tm(newTp);
+
+	if (local.tm_hour != local2.tm_hour ||
+		local.tm_min != local2.tm_min ||
+		local.tm_sec != local2.tm_sec)
+		return false;
+
+	tp = newTp;
+	return true;
+}
+
+CDateTime::CDateTime(asUINT year, asUINT month, asUINT day, asUINT hour, asUINT minute, asUINT second)
+{
+	tp = std::chrono::system_clock::now();
+	setDate(year, month, day);
+	setTime(hour, minute, second);
+}
+
+asINT64 CDateTime::operator-(const CDateTime &dt) const
+{
+	return (tp - dt.tp).count() / std::chrono::system_clock::period::den * std::chrono::system_clock::period::num;
+}
+
+CDateTime CDateTime::operator+(asINT64 seconds) const
+{
+	CDateTime dt(*this);
+	dt.tp += std::chrono::system_clock::duration(seconds * std::chrono::system_clock::period::den / std::chrono::system_clock::period::num);
+	return dt;
+}
+
+CDateTime &CDateTime::operator+=(asINT64 seconds)
+{
+	tp += std::chrono::system_clock::duration(seconds * std::chrono::system_clock::period::den / std::chrono::system_clock::period::num);
+	return *this;
+}
+
+CDateTime operator+(asINT64 seconds, const CDateTime &other)
+{
+	return other + seconds;
+}
+
+CDateTime CDateTime::operator-(asINT64 seconds) const
+{
+	return *this + -seconds;
+}
+
+CDateTime &CDateTime::operator-=(asINT64 seconds)
+{
+	return *this += -seconds;
+}
+
+CDateTime operator-(asINT64 seconds, const CDateTime &other)
+{
+	return other + -seconds;
+}
+
+bool CDateTime::operator==(const CDateTime &other) const
+{
+	return tp == other.tp;
+}
+
+bool CDateTime::operator<(const CDateTime &other) const
+{
+	return tp < other.tp;
+}
+
+static int opCmp(const CDateTime &a, const CDateTime &b)
+{
+	if (a < b) return -1;
+	if (a == b) return 0;
+	return 1;
+}
+
+static void Construct(CDateTime *mem)
+{
+	new(mem) CDateTime();
+}
+
+static void ConstructCopy(CDateTime *mem, const CDateTime &o)
+{
+	new(mem) CDateTime(o);
+}
+
+static void ConstructSet(CDateTime *mem, asUINT year, asUINT month, asUINT day, asUINT hour, asUINT minute, asUINT second)
+{
+	new(mem) CDateTime(year, month, day, hour, minute, second);
+}
+
+static void ConstructSet_Generic(asIScriptGeneric *gen)
+{
+    CDateTime *date = (CDateTime*)gen->GetObject();
+    asUINT year = *(asUINT*)gen->GetAddressOfArg(0);
+    asUINT month = *(asUINT*)gen->GetAddressOfArg(1);
+    asUINT day = *(asUINT*)gen->GetAddressOfArg(2);
+    asUINT hour = *(asUINT*)gen->GetAddressOfArg(3);
+    asUINT minute = *(asUINT*)gen->GetAddressOfArg(4);
+    asUINT second = *(asUINT*)gen->GetAddressOfArg(5);
+    ConstructSet(date, year, month, day, hour, minute, second);
+}
+
+void RegisterScriptDateTime(asIScriptEngine *engine)
+{
+	int r = engine->RegisterObjectType("datetime", sizeof(CDateTime), asOBJ_VALUE | asOBJ_POD | asGetTypeTraits<CDateTime>()); assert(r >= 0);
+
+	if(strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY")==0)
+	{
+		r = engine->RegisterObjectBehaviour("datetime", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(Construct), asCALL_CDECL_OBJLAST); assert(r >= 0);
+		r = engine->RegisterObjectBehaviour("datetime", asBEHAVE_CONSTRUCT, "void f(const datetime &in)", asFUNCTION(ConstructCopy), asCALL_CDECL_OBJFIRST); assert(r >= 0);
+		r = engine->RegisterObjectBehaviour("datetime", asBEHAVE_CONSTRUCT, "void f(uint, uint, uint, uint = 0, uint = 0, uint = 0)", asFUNCTION(ConstructSet), asCALL_CDECL_OBJFIRST); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime &opAssign(const datetime &in)", asMETHOD(CDateTime, operator=), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_year() const property", asMETHOD(CDateTime, getYear), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_month() const property", asMETHOD(CDateTime, getMonth), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_day() const property", asMETHOD(CDateTime, getDay), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_hour() const property", asMETHOD(CDateTime, getHour), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_minute() const property", asMETHOD(CDateTime, getMinute), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_second() const property", asMETHOD(CDateTime, getSecond), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "bool setDate(uint year, uint month, uint day)", asMETHOD(CDateTime, setDate), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "bool setTime(uint hour, uint minute, uint second)", asMETHOD(CDateTime, setTime), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "int64 opSub(const datetime &in) const", asMETHODPR(CDateTime, operator-, (const CDateTime &other) const, asINT64), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opAdd(int64 seconds) const", asMETHOD(CDateTime, operator+), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opAdd_r(int64 seconds) const", asFUNCTIONPR(operator+, (asINT64 seconds, const CDateTime &other), CDateTime), asCALL_CDECL_OBJLAST); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime &opAddAssign(int64 seconds)", asMETHOD(CDateTime, operator+=), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opSub(int64 seconds) const", asMETHODPR(CDateTime, operator-, (asINT64) const, CDateTime), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opSub_r(int64 seconds) const", asFUNCTIONPR(operator-, (asINT64 seconds, const CDateTime &other), CDateTime), asCALL_CDECL_OBJLAST); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime &opSubAssign(int64 seconds)", asMETHOD(CDateTime, operator-=), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "bool opEquals(const datetime &in) const", asMETHODPR(CDateTime, operator==, (const CDateTime &other) const, bool), asCALL_THISCALL); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "int opCmp(const datetime &in) const", asFUNCTION(opCmp), asCALL_CDECL_OBJFIRST); assert(r >= 0);
+	}
+	else
+	{
+		r = engine->RegisterObjectBehaviour("datetime", asBEHAVE_CONSTRUCT, "void f()", WRAP_OBJ_LAST(Construct), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectBehaviour("datetime", asBEHAVE_CONSTRUCT, "void f(const datetime &in)", WRAP_OBJ_FIRST(ConstructCopy), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectBehaviour("datetime", asBEHAVE_CONSTRUCT, "void f(uint, uint, uint, uint = 0, uint = 0, uint = 0)", asFUNCTION(ConstructSet_Generic), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime &opAssign(const datetime &in)", WRAP_MFN(CDateTime, operator=), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_year() const property", WRAP_MFN(CDateTime, getYear), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_month() const property", WRAP_MFN(CDateTime, getMonth), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_day() const property", WRAP_MFN(CDateTime, getDay), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_hour() const property", WRAP_MFN(CDateTime, getHour), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_minute() const property", WRAP_MFN(CDateTime, getMinute), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "uint get_second() const property", WRAP_MFN(CDateTime, getSecond), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "bool setDate(uint year, uint month, uint day)", WRAP_MFN(CDateTime, setDate), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "bool setTime(uint hour, uint minute, uint second)", WRAP_MFN(CDateTime, setTime), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "int64 opSub(const datetime &in) const", WRAP_MFN_PR(CDateTime, operator-, (const CDateTime &other) const, asINT64), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opAdd(int64 seconds) const", WRAP_MFN(CDateTime, operator+), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opAdd_r(int64 seconds) const", WRAP_OBJ_LAST_PR(operator+, (asINT64 seconds, const CDateTime &other), CDateTime), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime &opAddAssign(int64 seconds)", WRAP_MFN(CDateTime, operator+=), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opSub(int64 seconds) const", WRAP_MFN_PR(CDateTime, operator-, (asINT64) const, CDateTime), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime opSub_r(int64 seconds) const", WRAP_OBJ_LAST_PR(operator-, (asINT64 seconds, const CDateTime &other), CDateTime), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "datetime &opSubAssign(int64 seconds)", WRAP_MFN(CDateTime, operator-=), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "bool opEquals(const datetime &in) const", WRAP_MFN_PR(CDateTime, operator==, (const CDateTime &other) const, bool), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterObjectMethod("datetime", "int opCmp(const datetime &in) const", WRAP_OBJ_FIRST(opCmp), asCALL_GENERIC); assert(r >= 0);
+	}
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/datetime/datetime.h b/Sources/AngelScript/add_on/datetime/datetime.h
new file mode 100644
index 000000000..8148da9e2
--- /dev/null
+++ b/Sources/AngelScript/add_on/datetime/datetime.h
@@ -0,0 +1,61 @@
+#ifndef SCRIPTDATETIME_H
+#define SCRIPTDATETIME_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#ifdef AS_CAN_USE_CPP11
+#include <chrono>
+#else
+#error Sorry, this requires C++11 which your compiler doesnt appear to support
+#endif
+
+BEGIN_AS_NAMESPACE
+
+class CDateTime
+{
+public:
+	// Constructors
+	CDateTime();
+	CDateTime(const CDateTime &other);
+	CDateTime(asUINT year, asUINT month, asUINT day, asUINT hour, asUINT minute, asUINT second);
+
+	// Copy the stored value from another any object
+	CDateTime &operator=(const CDateTime &other);
+
+	// Accessors
+	asUINT getYear() const;
+	asUINT getMonth() const;
+	asUINT getDay() const;
+	asUINT getHour() const;
+	asUINT getMinute() const;
+	asUINT getSecond() const;
+
+	// Setters
+	// Returns true if valid
+	bool setDate(asUINT year, asUINT month, asUINT day);
+	bool setTime(asUINT hour, asUINT minute, asUINT second);
+
+	// Operators
+	// Return difference in seconds
+	asINT64          operator-(const CDateTime &other) const;
+	CDateTime        operator+(asINT64 seconds) const;
+	friend CDateTime operator+(asINT64 seconds, const CDateTime &other);
+	CDateTime &      operator+=(asINT64 seconds);
+	CDateTime        operator-(asINT64 seconds) const;
+	friend CDateTime operator-(asINT64 seconds, const CDateTime &other);
+	CDateTime &      operator-=(asINT64 seconds);
+	bool             operator==(const CDateTime &other) const;
+	bool             operator<(const CDateTime &other) const;
+
+protected:
+	std::chrono::system_clock::time_point tp;
+};
+
+void RegisterScriptDateTime(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/add_on/debugger/debugger.cpp b/Sources/AngelScript/add_on/debugger/debugger.cpp
new file mode 100644
index 000000000..5a3010928
--- /dev/null
+++ b/Sources/AngelScript/add_on/debugger/debugger.cpp
@@ -0,0 +1,862 @@
+#include "debugger.h"
+#include <iostream>  // cout
+#include <sstream>   // stringstream
+#include <stdlib.h>  // atoi
+#include <assert.h>  // assert
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+CDebugger::CDebugger()
+{
+	m_action = CONTINUE;
+	m_lastFunction = 0;
+	m_engine = 0;
+}
+
+CDebugger::~CDebugger()
+{
+	SetEngine(0);
+}
+
+string CDebugger::ToString(void *value, asUINT typeId, int expandMembers, asIScriptEngine *engine)
+{
+	if( value == 0 )
+		return "<null>";
+
+	// If no engine pointer was provided use the default
+	if( engine == 0 )
+		engine = m_engine;
+
+	stringstream s;
+	if( typeId == asTYPEID_VOID )
+		return "<void>";
+	else if( typeId == asTYPEID_BOOL )
+		return *(bool*)value ? "true" : "false";
+	else if( typeId == asTYPEID_INT8 )
+		s << (int)*(signed char*)value;
+	else if( typeId == asTYPEID_INT16 )
+		s << (int)*(signed short*)value;
+	else if( typeId == asTYPEID_INT32 )
+		s << *(signed int*)value;
+	else if( typeId == asTYPEID_INT64 )
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+		s << "{...}"; // MSVC6 doesn't like the << operator for 64bit integer
+#else
+		s << *(asINT64*)value;
+#endif
+	else if( typeId == asTYPEID_UINT8 )
+		s << (unsigned int)*(unsigned char*)value;
+	else if( typeId == asTYPEID_UINT16 )
+		s << (unsigned int)*(unsigned short*)value;
+	else if( typeId == asTYPEID_UINT32 )
+		s << *(unsigned int*)value;
+	else if( typeId == asTYPEID_UINT64 )
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+		s << "{...}"; // MSVC6 doesn't like the << operator for 64bit integer
+#else
+		s << *(asQWORD*)value;
+#endif
+	else if( typeId == asTYPEID_FLOAT )
+		s << *(float*)value;
+	else if( typeId == asTYPEID_DOUBLE )
+		s << *(double*)value;
+	else if( (typeId & asTYPEID_MASK_OBJECT) == 0 )
+	{
+		// The type is an enum
+		s << *(asUINT*)value;
+
+		// Check if the value matches one of the defined enums
+		if( engine )
+		{
+			asITypeInfo *t = engine->GetTypeInfoById(typeId);
+			for( int n = t->GetEnumValueCount(); n-- > 0; )
+			{
+				int enumVal;
+				const char *enumName = t->GetEnumValueByIndex(n, &enumVal);
+				if( enumVal == *(int*)value )
+				{
+					s << ", " << enumName;
+					break;
+				}
+			}
+		}
+	}
+	else if( typeId & asTYPEID_SCRIPTOBJECT )
+	{
+		// Dereference handles, so we can see what it points to
+		if( typeId & asTYPEID_OBJHANDLE )
+			value = *(void**)value;
+
+		asIScriptObject *obj = (asIScriptObject *)value;
+		
+		// Print the address of the object
+		s << "{" << obj << "}";
+
+		// Print the members
+		if( obj && expandMembers > 0 )
+		{
+			asITypeInfo *type = obj->GetObjectType();
+			for( asUINT n = 0; n < obj->GetPropertyCount(); n++ )
+			{
+				if( n == 0 )
+					s << " ";
+				else
+					s << ", ";
+
+				s << type->GetPropertyDeclaration(n) << " = " << ToString(obj->GetAddressOfProperty(n), obj->GetPropertyTypeId(n), expandMembers - 1, type->GetEngine());
+			}
+		}
+	}
+	else
+	{
+		// Dereference handles, so we can see what it points to
+		if( typeId & asTYPEID_OBJHANDLE )
+			value = *(void**)value;
+
+		// Print the address for reference types so it will be
+		// possible to see when handles point to the same object
+		if( engine )
+		{
+			asITypeInfo *type = engine->GetTypeInfoById(typeId);
+			if( type->GetFlags() & asOBJ_REF )
+				s << "{" << value << "}";
+
+			if( value )
+			{
+				// Check if there is a registered to-string callback
+				map<const asITypeInfo*, ToStringCallback>::iterator it = m_toStringCallbacks.find(type);
+				if( it == m_toStringCallbacks.end() )
+				{
+					// If the type is a template instance, there might be a
+					// to-string callback for the generic template type
+					if( type->GetFlags() & asOBJ_TEMPLATE )
+					{
+						asITypeInfo *tmplType = engine->GetTypeInfoByName(type->GetName());
+						it = m_toStringCallbacks.find(tmplType);
+					}
+				}
+
+				if( it != m_toStringCallbacks.end() )
+				{
+					if( type->GetFlags() & asOBJ_REF )
+						s << " ";
+
+					// Invoke the callback to get the string representation of this type
+					string str = it->second(value, expandMembers, this);
+					s << str;
+				}
+			}
+		}
+		else
+			s << "{no engine}";
+	}
+
+	return s.str();
+}
+
+void CDebugger::RegisterToStringCallback(const asITypeInfo *ot, ToStringCallback callback)
+{
+	if( m_toStringCallbacks.find(ot) == m_toStringCallbacks.end() )
+		m_toStringCallbacks.insert(map<const asITypeInfo*, ToStringCallback>::value_type(ot, callback));
+}
+
+void CDebugger::LineCallback(asIScriptContext *ctx)
+{
+	assert( ctx );
+
+	// This should never happen, but it doesn't hurt to validate it
+	if( ctx == 0 )
+		return;
+
+	// By default we ignore callbacks when the context is not active.
+	// An application might override this to for example disconnect the
+	// debugger as the execution finished.
+	if( ctx->GetState() != asEXECUTION_ACTIVE )
+		return;
+
+	if( m_action == CONTINUE )
+	{
+		if( !CheckBreakPoint(ctx) )
+			return;
+	}
+	else if( m_action == STEP_OVER )
+	{
+		if( ctx->GetCallstackSize() > m_lastCommandAtStackLevel )
+		{
+			if( !CheckBreakPoint(ctx) )
+				return;
+		}
+	}
+	else if( m_action == STEP_OUT )
+	{
+		if( ctx->GetCallstackSize() >= m_lastCommandAtStackLevel )
+		{
+			if( !CheckBreakPoint(ctx) )
+				return;
+		}
+	}
+	else if( m_action == STEP_INTO )
+	{
+		CheckBreakPoint(ctx);
+
+		// Always break, but we call the check break point anyway 
+		// to tell user when break point has been reached
+	}
+
+	stringstream s;
+	const char *file = 0;
+	int lineNbr = ctx->GetLineNumber(0, 0, &file);
+	s << (file ? file : "{unnamed}") << ":" << lineNbr << "; " << ctx->GetFunction()->GetDeclaration() << endl;
+	Output(s.str());
+
+	TakeCommands(ctx);
+}
+
+bool CDebugger::CheckBreakPoint(asIScriptContext *ctx)
+{
+	if( ctx == 0 )
+		return false;
+
+	// TODO: Should cache the break points in a function by checking which possible break points
+	//       can be hit when entering a function. If there are no break points in the current function
+	//       then there is no need to check every line.
+
+	const char *tmp = 0;
+	int lineNbr = ctx->GetLineNumber(0, 0, &tmp);
+
+	// Consider just filename, not the full path
+	string file = tmp ? tmp : "";
+	size_t r = file.find_last_of("\\/");
+	if( r != string::npos )
+		file = file.substr(r+1);
+
+	// Did we move into a new function?
+	asIScriptFunction *func = ctx->GetFunction();
+	if( m_lastFunction != func )
+	{
+		// Check if any breakpoints need adjusting
+		for( size_t n = 0; n < m_breakPoints.size(); n++ )
+		{
+			// We need to check for a breakpoint at entering the function
+			if( m_breakPoints[n].func )
+			{
+				if( m_breakPoints[n].name == func->GetName() )
+				{
+					stringstream s;
+					s << "Entering function '" << m_breakPoints[n].name << "'. Transforming it into break point" << endl;
+					Output(s.str());
+
+					// Transform the function breakpoint into a file breakpoint
+					m_breakPoints[n].name           = file;
+					m_breakPoints[n].lineNbr        = lineNbr;
+					m_breakPoints[n].func           = false;
+					m_breakPoints[n].needsAdjusting = false;
+				}
+			}
+			// Check if a given breakpoint fall on a line with code or else adjust it to the next line
+			else if( m_breakPoints[n].needsAdjusting &&
+					 m_breakPoints[n].name == file )
+			{
+				int line = func->FindNextLineWithCode(m_breakPoints[n].lineNbr);
+				if( line >= 0 )
+				{
+					m_breakPoints[n].needsAdjusting = false;
+					if( line != m_breakPoints[n].lineNbr )
+					{
+						stringstream s;
+						s << "Moving break point " << n << " in file '" << file << "' to next line with code at line " << line << endl;
+						Output(s.str());
+
+						// Move the breakpoint to the next line
+						m_breakPoints[n].lineNbr = line;
+					}
+				}
+			}
+		}
+	}
+	m_lastFunction = func;
+
+	// Determine if there is a breakpoint at the current line
+	for( size_t n = 0; n < m_breakPoints.size(); n++ )
+	{
+		// TODO: do case-less comparison for file name
+
+		// Should we break?
+		if( !m_breakPoints[n].func &&
+			m_breakPoints[n].lineNbr == lineNbr &&
+			m_breakPoints[n].name == file )
+		{
+			stringstream s;
+			s << "Reached break point " << n << " in file '" << file << "' at line " << lineNbr << endl;
+			Output(s.str());
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void CDebugger::TakeCommands(asIScriptContext *ctx)
+{
+	for(;;)
+	{
+		char buf[512];
+
+		Output("[dbg]> ");
+		cin.getline(buf, 512);
+
+		if( InterpretCommand(string(buf), ctx) )
+			break;
+	}
+}
+
+bool CDebugger::InterpretCommand(const string &cmd, asIScriptContext *ctx)
+{
+	if( cmd.length() == 0 ) return true;
+
+	switch( cmd[0] )
+	{
+	case 'c':
+		m_action = CONTINUE;
+		break;
+
+	case 's':
+		m_action = STEP_INTO;
+		break;
+
+	case 'n':
+		m_action = STEP_OVER;
+		m_lastCommandAtStackLevel = ctx ? ctx->GetCallstackSize() : 1;
+		break;
+
+	case 'o':
+		m_action = STEP_OUT;
+		m_lastCommandAtStackLevel = ctx ? ctx->GetCallstackSize() : 0;
+		break;
+
+	case 'b':
+		{
+			// Set break point
+			size_t p = cmd.find_first_not_of(" \t", 1);
+			size_t div = cmd.find(':'); 
+			if( div != string::npos && div > 2 && p > 1 )
+			{
+				string file = cmd.substr(2, div-2);
+				string line = cmd.substr(div+1);
+
+				int nbr = atoi(line.c_str());
+
+				AddFileBreakPoint(file, nbr);
+			}
+			else if( div == string::npos && p != string::npos && p > 1 )
+			{
+				string func = cmd.substr(p);
+
+				AddFuncBreakPoint(func);
+			}
+			else
+			{
+				Output("Incorrect format for setting break point, expected one of:\n"
+				       " b <file name>:<line number>\n"
+				       " b <function name>\n");
+			}
+		}
+		// take more commands
+		return false;
+
+	case 'r':
+		{
+			// Remove break point
+			size_t p = cmd.find_first_not_of(" \t", 1);
+			if( cmd.length() > 2 && p != string::npos && p > 1 )
+			{
+				string br = cmd.substr(2);
+				if( br == "all" )
+				{
+					m_breakPoints.clear();
+					Output("All break points have been removed\n");
+				}
+				else
+				{
+					int nbr = atoi(br.c_str());
+					if( nbr >= 0 && nbr < (int)m_breakPoints.size() )
+						m_breakPoints.erase(m_breakPoints.begin()+nbr);
+					ListBreakPoints();
+				}
+			}
+			else
+			{
+				Output("Incorrect format for removing break points, expected:\n"
+				       " r <all|number of break point>\n");
+			}
+		}
+		// take more commands
+		return false;
+
+	case 'l':
+		{
+			// List something
+			bool printHelp = false;
+			size_t p = cmd.find_first_not_of(" \t", 1);
+			if( p != string::npos && p > 1 )
+			{
+				if( cmd[p] == 'b' )
+				{
+					ListBreakPoints();
+				}
+				else if( cmd[p] == 'v' )
+				{
+					ListLocalVariables(ctx);
+				}
+				else if( cmd[p] == 'g' )
+				{
+					ListGlobalVariables(ctx);
+				}
+				else if( cmd[p] == 'm' )
+				{
+					ListMemberProperties(ctx);
+				}
+				else if( cmd[p] == 's' )
+				{
+					ListStatistics(ctx);
+				}
+				else
+				{
+					Output("Unknown list option.\n");
+					printHelp = true;
+				}
+			}
+			else
+			{
+				Output("Incorrect format for list command.\n");
+				printHelp = true;
+			}
+
+			if( printHelp )
+			{
+				Output("Expected format: \n"
+					   " l <list option>\n"
+					   "Available options: \n"
+					   " b - breakpoints\n"
+					   " v - local variables\n"
+					   " m - member properties\n"
+					   " g - global variables\n"
+					   " s - statistics\n");
+			}
+		}
+		// take more commands
+		return false;
+
+	case 'h':
+		PrintHelp();
+		// take more commands
+		return false;
+
+	case 'p':
+		{
+			// Print a value 
+			size_t p = cmd.find_first_not_of(" \t", 1);
+			if( p != string::npos && p > 1 )
+			{
+				PrintValue(cmd.substr(p), ctx);
+			}
+			else
+			{
+				Output("Incorrect format for print, expected:\n"
+					   " p <expression>\n");
+			}
+		}
+		// take more commands
+		return false;
+
+	case 'w':
+		// Where am I?
+		PrintCallstack(ctx);
+		// take more commands
+		return false;
+
+	case 'a':
+		// abort the execution
+		if( ctx == 0 )
+		{
+			Output("No script is running\n");
+			return false;
+		}
+		ctx->Abort();
+		break;
+
+	default:
+		Output("Unknown command\n");
+		// take more commands
+		return false;
+	}
+
+	// Continue execution
+	return true;
+}
+
+void CDebugger::PrintValue(const std::string &expr, asIScriptContext *ctx)
+{
+	if( ctx == 0 )
+	{
+		Output("No script is running\n");
+		return;
+	}
+
+	asIScriptEngine *engine = ctx->GetEngine();
+
+	// Tokenize the input string to get the variable scope and name
+	asUINT len = 0;
+	string scope;
+	string name;
+	string str = expr;
+	asETokenClass t = engine->ParseToken(str.c_str(), 0, &len);
+	while( t == asTC_IDENTIFIER || (t == asTC_KEYWORD && len == 2 && str.compare(0, 2, "::") == 0) )
+	{
+		if( t == asTC_KEYWORD )
+		{
+			if( scope == "" && name == "" )
+				scope = "::";			// global scope
+			else if( scope == "::" || scope == "" )
+				scope = name;			// namespace
+			else
+				scope += "::" + name;	// nested namespace
+			name = "";
+		}
+		else if( t == asTC_IDENTIFIER )
+			name.assign(str.c_str(), len);
+
+		// Skip the parsed token and get the next one
+		str = str.substr(len);
+		t = engine->ParseToken(str.c_str(), 0, &len);
+	}
+
+	if( name.size() )
+	{
+		// Find the variable
+		void *ptr = 0;
+		int typeId = 0;
+
+		asIScriptFunction *func = ctx->GetFunction();
+		if( !func ) return;
+
+		// skip local variables if a scope was informed
+		if( scope == "" )
+		{
+			// We start from the end, in case the same name is reused in different scopes
+			for( asUINT n = func->GetVarCount(); n-- > 0; )
+			{
+				const char* varName = 0;
+				ctx->GetVar(n, 0, &varName, &typeId);
+				if( ctx->IsVarInScope(n) && varName != 0 && name == varName )
+				{
+					ptr = ctx->GetAddressOfVar(n);
+					break;
+				}
+			}
+
+			// Look for class members, if we're in a class method
+			if( !ptr && func->GetObjectType() )
+			{
+				if( name == "this" )
+				{
+					ptr = ctx->GetThisPointer();
+					typeId = ctx->GetThisTypeId();
+				}
+				else
+				{
+					asITypeInfo *type = engine->GetTypeInfoById(ctx->GetThisTypeId());
+					for( asUINT n = 0; n < type->GetPropertyCount(); n++ )
+					{
+						const char *propName = 0;
+						int offset = 0;
+						bool isReference = 0;
+						int compositeOffset = 0;
+						bool isCompositeIndirect = false;
+						type->GetProperty(n, &propName, &typeId, 0, 0, &offset, &isReference, 0, &compositeOffset, &isCompositeIndirect);
+						if( name == propName )
+						{
+							ptr = (void*)(((asBYTE*)ctx->GetThisPointer())+compositeOffset);
+							if (isCompositeIndirect) ptr = *(void**)ptr;
+							ptr = (void*)(((asBYTE*)ptr) + offset);
+							if( isReference ) ptr = *(void**)ptr;
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		// Look for global variables
+		if( !ptr )
+		{
+			if( scope == "" )
+			{
+				// If no explicit scope was informed then use the namespace of the current function by default
+				scope = func->GetNamespace();
+			}
+			else if( scope == "::" )
+			{
+				// The global namespace will be empty
+				scope = "";
+			}
+
+			asIScriptModule *mod = func->GetModule();
+			if( mod )
+			{
+				for( asUINT n = 0; n < mod->GetGlobalVarCount(); n++ )
+				{
+					const char *varName = 0, *nameSpace = 0;
+					mod->GetGlobalVar(n, &varName, &nameSpace, &typeId);
+
+					// Check if both name and namespace match
+					if( name == varName && scope == nameSpace )
+					{
+						ptr = mod->GetAddressOfGlobalVar(n);
+						break;
+					}
+				}
+			}
+		}
+
+		if( ptr )
+		{
+			// TODO: If there is a . after the identifier, check for members
+			// TODO: If there is a [ after the identifier try to call the 'opIndex(expr) const' method 
+			if( str != "" )
+			{
+				Output("Invalid expression. Expression doesn't end after symbol\n");
+			}
+			else
+			{
+				stringstream s;
+				// TODO: Allow user to set if members should be expanded
+				// Expand members by default to 3 recursive levels only
+				s << ToString(ptr, typeId, 3, engine) << endl;
+				Output(s.str());
+			}
+		}
+		else
+		{
+			Output("Invalid expression. No matching symbol\n");
+		}
+	}
+	else
+	{
+		Output("Invalid expression. Expected identifier\n");
+	}
+}
+
+void CDebugger::ListBreakPoints()
+{
+	// List all break points
+	stringstream s;
+	for( size_t b = 0; b < m_breakPoints.size(); b++ )
+		if( m_breakPoints[b].func )
+			s << b << " - " << m_breakPoints[b].name << endl;
+		else
+			s << b << " - " << m_breakPoints[b].name << ":" << m_breakPoints[b].lineNbr << endl;
+	Output(s.str());
+}
+
+void CDebugger::ListMemberProperties(asIScriptContext *ctx)
+{
+	if( ctx == 0 )
+	{
+		Output("No script is running\n");
+		return;
+	}
+
+	void *ptr = ctx->GetThisPointer();
+	if( ptr )
+	{
+		stringstream s;
+		// TODO: Allow user to define if members should be expanded or not
+		// Expand members by default to 3 recursive levels only
+		s << "this = " << ToString(ptr, ctx->GetThisTypeId(), 3, ctx->GetEngine()) << endl;
+		Output(s.str());
+	}
+}
+
+void CDebugger::ListLocalVariables(asIScriptContext *ctx)
+{
+	if( ctx == 0 )
+	{
+		Output("No script is running\n");
+		return;
+	}
+
+	asIScriptFunction *func = ctx->GetFunction();
+	if( !func ) return;
+
+	stringstream s;
+	for( asUINT n = 0; n < func->GetVarCount(); n++ )
+	{
+		// Skip temporary variables
+		// TODO: Should there be an option to view temporary variables too?
+		const char* name;
+		func->GetVar(n, &name);
+		if (name == 0 || strlen(name) == 0)
+			continue;
+
+		if( ctx->IsVarInScope(n) )
+		{
+			// TODO: Allow user to set if members should be expanded or not
+			// Expand members by default to 3 recursive levels only
+			int typeId;
+			ctx->GetVar(n, 0, 0, &typeId);
+			s << func->GetVarDecl(n) << " = " << ToString(ctx->GetAddressOfVar(n), typeId, 3, ctx->GetEngine()) << endl;
+		}
+	}
+	Output(s.str());
+}
+
+void CDebugger::ListGlobalVariables(asIScriptContext *ctx)
+{
+	if( ctx == 0 )
+	{
+		Output("No script is running\n");
+		return;
+	}
+
+	// Determine the current module from the function
+	asIScriptFunction *func = ctx->GetFunction();
+	if( !func ) return;
+
+	asIScriptModule *mod = func->GetModule();
+	if( !mod ) return;
+
+	stringstream s;
+	for( asUINT n = 0; n < mod->GetGlobalVarCount(); n++ )
+	{
+		int typeId = 0;
+		mod->GetGlobalVar(n, 0, 0, &typeId);
+		// TODO: Allow user to set how many recursive expansions should be done
+		// Expand members by default to 3 recursive levels only
+		s << mod->GetGlobalVarDeclaration(n) << " = " << ToString(mod->GetAddressOfGlobalVar(n), typeId, 3, ctx->GetEngine()) << endl;
+	}
+	Output(s.str());
+}
+
+void CDebugger::ListStatistics(asIScriptContext *ctx)
+{
+	if( ctx == 0 )
+	{
+		Output("No script is running\n");
+		return;
+	}
+
+	asIScriptEngine *engine = ctx->GetEngine();
+	
+	asUINT gcCurrSize, gcTotalDestr, gcTotalDet, gcNewObjects, gcTotalNewDestr;
+	engine->GetGCStatistics(&gcCurrSize, &gcTotalDestr, &gcTotalDet, &gcNewObjects, &gcTotalNewDestr);
+
+	stringstream s;
+	s << "Garbage collector:" << endl;
+	s << " current size:          " << gcCurrSize << endl;
+	s << " total destroyed:       " << gcTotalDestr << endl;
+	s << " total detected:        " << gcTotalDet << endl;
+	s << " new objects:           " << gcNewObjects << endl;
+	s << " new objects destroyed: " << gcTotalNewDestr << endl;
+
+	Output(s.str());
+}
+
+void CDebugger::PrintCallstack(asIScriptContext *ctx)
+{
+	if( ctx == 0 )
+	{
+		Output("No script is running\n");
+		return;
+	}
+
+	stringstream s;
+	const char *file = 0;
+	int lineNbr = 0;
+	for( asUINT n = 0; n < ctx->GetCallstackSize(); n++ )
+	{
+		lineNbr = ctx->GetLineNumber(n, 0, &file);
+		s << (file ? file : "{unnamed}") << ":" << lineNbr << "; " << ctx->GetFunction(n)->GetDeclaration() << endl;
+	}
+	Output(s.str());
+}
+
+void CDebugger::AddFuncBreakPoint(const string &func)
+{
+	// Trim the function name
+	size_t b = func.find_first_not_of(" \t");
+	size_t e = func.find_last_not_of(" \t");
+	string actual = func.substr(b, e != string::npos ? e-b+1 : string::npos);
+
+	stringstream s;
+	s << "Adding deferred break point for function '" << actual << "'" << endl;
+	Output(s.str());
+
+	BreakPoint bp(actual, 0, true);
+	m_breakPoints.push_back(bp);
+}
+
+void CDebugger::AddFileBreakPoint(const string &file, int lineNbr)
+{
+	// Store just file name, not entire path
+	size_t r = file.find_last_of("\\/");
+	string actual;
+	if( r != string::npos )
+		actual = file.substr(r+1);
+	else
+		actual = file;
+
+	// Trim the file name
+	size_t b = actual.find_first_not_of(" \t");
+	size_t e = actual.find_last_not_of(" \t");
+	actual = actual.substr(b, e != string::npos ? e-b+1 : string::npos);
+
+	stringstream s;
+	s << "Setting break point in file '" << actual << "' at line " << lineNbr << endl;
+	Output(s.str());
+
+	BreakPoint bp(actual, lineNbr, false);
+	m_breakPoints.push_back(bp);
+}
+
+void CDebugger::PrintHelp()
+{
+	Output(" c - Continue\n"
+	       " s - Step into\n"
+	       " n - Next step\n"
+	       " o - Step out\n"
+	       " b - Set break point\n"
+	       " l - List various things\n"
+	       " r - Remove break point\n"
+	       " p - Print value\n"
+	       " w - Where am I?\n"
+	       " a - Abort execution\n"
+	       " h - Print this help text\n");
+}
+
+void CDebugger::Output(const string &str)
+{
+	// By default we just output to stdout
+	cout << str;
+}
+
+void CDebugger::SetEngine(asIScriptEngine *engine)
+{
+	if( m_engine != engine )
+	{
+		if( m_engine )
+			m_engine->Release();
+		m_engine = engine;
+		if( m_engine )
+			m_engine->AddRef();
+	}
+}
+
+asIScriptEngine *CDebugger::GetEngine()
+{
+	return m_engine;
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/debugger/debugger.h b/Sources/AngelScript/add_on/debugger/debugger.h
new file mode 100644
index 000000000..3bb560c75
--- /dev/null
+++ b/Sources/AngelScript/add_on/debugger/debugger.h
@@ -0,0 +1,87 @@
+#ifndef DEBUGGER_H
+#define DEBUGGER_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#include <string>
+#include <vector>
+#include <map>
+
+BEGIN_AS_NAMESPACE
+
+class CDebugger
+{
+public:
+	CDebugger();
+	virtual ~CDebugger();
+
+	// Register callbacks to handle to-string conversions of application types
+	// The expandMembersLevel is a counter for how many recursive levels the members should be expanded.
+	// If the object that is being converted to a string has members of its own the callback should call
+	// the debugger's ToString passing in expandMembersLevel - 1.
+	typedef std::string (*ToStringCallback)(void *obj, int expandMembersLevel, CDebugger *dbg);
+	virtual void RegisterToStringCallback(const asITypeInfo *ti, ToStringCallback callback);
+
+	// User interaction
+	virtual void TakeCommands(asIScriptContext *ctx);
+	virtual void Output(const std::string &str);
+
+	// Line callback invoked by context
+	virtual void LineCallback(asIScriptContext *ctx);
+
+	// Commands
+	virtual void PrintHelp();
+	virtual void AddFileBreakPoint(const std::string &file, int lineNbr);
+	virtual void AddFuncBreakPoint(const std::string &func);
+	virtual void ListBreakPoints();
+	virtual void ListLocalVariables(asIScriptContext *ctx);
+	virtual void ListGlobalVariables(asIScriptContext *ctx);
+	virtual void ListMemberProperties(asIScriptContext *ctx);
+	virtual void ListStatistics(asIScriptContext *ctx);
+	virtual void PrintCallstack(asIScriptContext *ctx);
+	virtual void PrintValue(const std::string &expr, asIScriptContext *ctx);
+
+	// Helpers
+	virtual bool InterpretCommand(const std::string &cmd, asIScriptContext *ctx);
+	virtual bool CheckBreakPoint(asIScriptContext *ctx);
+	virtual std::string ToString(void *value, asUINT typeId, int expandMembersLevel, asIScriptEngine *engine);
+
+	// Optionally set the engine pointer in the debugger so it can be retrieved
+	// by callbacks that need it. This will hold a reference to the engine.
+	virtual void SetEngine(asIScriptEngine *engine);
+	virtual asIScriptEngine *GetEngine();
+	
+protected:
+	enum DebugAction
+	{
+		CONTINUE,  // continue until next break point
+		STEP_INTO, // stop at next instruction
+		STEP_OVER, // stop at next instruction, skipping called functions
+		STEP_OUT   // run until returning from current function
+	};
+	DebugAction        m_action;
+	asUINT             m_lastCommandAtStackLevel;
+	asIScriptFunction *m_lastFunction;
+
+	struct BreakPoint
+	{
+		BreakPoint(std::string f, int n, bool _func) : name(f), lineNbr(n), func(_func), needsAdjusting(true) {}
+		std::string name;
+		int         lineNbr;
+		bool        func;
+		bool        needsAdjusting;
+	};
+	std::vector<BreakPoint> m_breakPoints;
+
+	asIScriptEngine *m_engine;
+
+	// Registered callbacks for converting types to strings
+	std::map<const asITypeInfo*, ToStringCallback> m_toStringCallbacks;
+};
+
+END_AS_NAMESPACE
+
+#endif
\ No newline at end of file
diff --git a/Sources/AngelScript/addons/scriptany.cpp b/Sources/AngelScript/add_on/scriptany/scriptany.cpp
old mode 100755
new mode 100644
similarity index 92%
rename from Sources/AngelScript/addons/scriptany.cpp
rename to Sources/AngelScript/add_on/scriptany/scriptany.cpp
index 348274341..a7cf312a3
--- a/Sources/AngelScript/addons/scriptany.cpp
+++ b/Sources/AngelScript/add_on/scriptany/scriptany.cpp
@@ -1,480 +1,490 @@
-#include "scriptany.h"
-#include <new>
-#include <assert.h>
-#include <string.h>
-
-BEGIN_AS_NAMESPACE
-
-// We'll use the generic interface for the factories as we need the engine pointer
-static void ScriptAnyFactory_Generic(asIScriptGeneric *gen)
-{
-	asIScriptEngine *engine = gen->GetEngine();
-
-	*(CScriptAny**)gen->GetAddressOfReturnLocation() = new CScriptAny(engine);
-}
-
-static void ScriptAnyFactory2_Generic(asIScriptGeneric *gen)
-{
-	asIScriptEngine *engine = gen->GetEngine();
-	void *ref = (void*)gen->GetArgAddress(0);
-	int refType = gen->GetArgTypeId(0);
-
-	*(CScriptAny**)gen->GetAddressOfReturnLocation() = new CScriptAny(ref,refType,engine);
-}
-
-static CScriptAny &ScriptAnyAssignment(CScriptAny *other, CScriptAny *self)
-{
-	return *self = *other;
-}
-
-static void ScriptAnyAssignment_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *other = (CScriptAny*)gen->GetArgObject(0);
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-
-	*self = *other;
-
-	gen->SetReturnObject(self);
-}
-
-static void ScriptAny_Store_Generic(asIScriptGeneric *gen)
-{
-	void *ref = (void*)gen->GetArgAddress(0);
-	int refTypeId = gen->GetArgTypeId(0);
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-
-	self->Store(ref, refTypeId);
-}
-
-static void ScriptAny_StoreInt_Generic(asIScriptGeneric *gen)
-{
-	asINT64 *ref = (asINT64*)gen->GetArgAddress(0);
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-
-	self->Store(*ref);
-}
-
-static void ScriptAny_StoreFlt_Generic(asIScriptGeneric *gen)
-{
-	double *ref = (double*)gen->GetArgAddress(0);
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-
-	self->Store(*ref);
-}
-
-static void ScriptAny_Retrieve_Generic(asIScriptGeneric *gen)
-{
-	void *ref = (void*)gen->GetArgAddress(0);
-	int refTypeId = gen->GetArgTypeId(0);
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-
-	*(bool*)gen->GetAddressOfReturnLocation() = self->Retrieve(ref, refTypeId);
-}
-
-static void ScriptAny_RetrieveInt_Generic(asIScriptGeneric *gen)
-{
-	asINT64 *ref = (asINT64*)gen->GetArgAddress(0);
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-
-	*(bool*)gen->GetAddressOfReturnLocation() = self->Retrieve(*ref);
-}
-
-static void ScriptAny_RetrieveFlt_Generic(asIScriptGeneric *gen)
-{
-	double *ref = (double*)gen->GetArgAddress(0);
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-
-	*(bool*)gen->GetAddressOfReturnLocation() = self->Retrieve(*ref);
-}
-
-static void ScriptAny_AddRef_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-	self->AddRef();
-}
-
-static void ScriptAny_Release_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-	self->Release();
-}
-
-static void ScriptAny_GetRefCount_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
-}
-
-static void ScriptAny_SetFlag_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-	self->SetFlag();
-}
-
-static void ScriptAny_GetFlag_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-	*(bool*)gen->GetAddressOfReturnLocation() = self->GetFlag();
-}
-
-static void ScriptAny_EnumReferences_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->EnumReferences(engine);
-}
-
-static void ScriptAny_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
-{
-	CScriptAny *self = (CScriptAny*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->ReleaseAllHandles(engine);
-}
-
-void RegisterScriptAny(asIScriptEngine *engine)
-{
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
-		RegisterScriptAny_Generic(engine);
-	else
-		RegisterScriptAny_Native(engine);
-}
-
-void RegisterScriptAny_Native(asIScriptEngine *engine)
-{
-	int r;
-	r = engine->RegisterObjectType("any", sizeof(CScriptAny), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
-
-	// We'll use the generic interface for the constructor as we need the engine pointer
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f()", asFUNCTION(ScriptAnyFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(?&in)", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const int64&in)", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const double&in)", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
-
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptAny,AddRef), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptAny,Release), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "any &opAssign(any&in)", asFUNCTION(ScriptAnyAssignment), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "void store(?&in)", asMETHODPR(CScriptAny,Store,(void*,int),void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "void store(const int64&in)", asMETHODPR(CScriptAny,Store,(asINT64&),void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "void store(const double&in)", asMETHODPR(CScriptAny,Store,(double&),void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "bool retrieve(?&out)", asMETHODPR(CScriptAny,Retrieve,(void*,int) const,bool), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "bool retrieve(int64&out)", asMETHODPR(CScriptAny,Retrieve,(asINT64&) const,bool), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "bool retrieve(double&out)", asMETHODPR(CScriptAny,Retrieve,(double&) const,bool), asCALL_THISCALL); assert( r >= 0 );
-
-	// Register GC behaviours
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(CScriptAny,GetRefCount), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_SETGCFLAG, "void f()", asMETHOD(CScriptAny,SetFlag), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(CScriptAny,GetFlag), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptAny,EnumReferences), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptAny,ReleaseAllHandles), asCALL_THISCALL); assert( r >= 0 );
-}
-
-void RegisterScriptAny_Generic(asIScriptEngine *engine)
-{
-	int r;
-	r = engine->RegisterObjectType("any", sizeof(CScriptAny), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
-
-	// We'll use the generic interface for the constructor as we need the engine pointer
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f()", asFUNCTION(ScriptAnyFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(?&in)", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const int64&in)", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const double&in)", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
-
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptAny_AddRef_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptAny_Release_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "any &opAssign(any&in)", asFUNCTION(ScriptAnyAssignment_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "void store(?&in)", asFUNCTION(ScriptAny_Store_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "void store(const int64&in)", asFUNCTION(ScriptAny_StoreInt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "void store(const double&in)", asFUNCTION(ScriptAny_StoreFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "bool retrieve(?&out) const", asFUNCTION(ScriptAny_Retrieve_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "bool retrieve(int64&out) const", asFUNCTION(ScriptAny_RetrieveInt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("any", "bool retrieve(double&out) const", asFUNCTION(ScriptAny_RetrieveFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Register GC behaviours
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptAny_GetRefCount_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptAny_SetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptAny_GetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptAny_EnumReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptAny_ReleaseAllHandles_Generic), asCALL_GENERIC); assert( r >= 0 );
-}
-
-
-CScriptAny &CScriptAny::operator=(const CScriptAny &other)
-{
-	// Hold on to the object type reference so it isn't destroyed too early
-	if( (other.value.typeId & asTYPEID_MASK_OBJECT) )
-	{
-		asITypeInfo *ti = engine->GetTypeInfoById(other.value.typeId);
-		if( ti )
-			ti->AddRef();
-	}
-
-	FreeObject();
-
-	value.typeId = other.value.typeId;
-	if( value.typeId & asTYPEID_OBJHANDLE )
-	{
-		// For handles, copy the pointer and increment the reference count
-		value.valueObj = other.value.valueObj;
-		engine->AddRefScriptObject(value.valueObj, engine->GetTypeInfoById(value.typeId));
-	}
-	else if( value.typeId & asTYPEID_MASK_OBJECT )
-	{
-		// Create a copy of the object
-		value.valueObj = engine->CreateScriptObjectCopy(other.value.valueObj, engine->GetTypeInfoById(value.typeId));
-	}
-	else
-	{
-		// Primitives can be copied directly
-		value.valueInt = other.value.valueInt;
-	}
-
-	return *this;
-}
-
-int CScriptAny::CopyFrom(const CScriptAny *other)
-{
-	if( other == 0 ) return asINVALID_ARG;
-
-	*this = *(CScriptAny*)other;
-
-	return 0;
-}
-
-CScriptAny::CScriptAny(asIScriptEngine *engine)
-{
-	this->engine = engine;
-	refCount = 1;
-	gcFlag = false;
-
-	value.typeId = 0;
-	value.valueInt = 0;
-
-	// Notify the garbage collector of this object
-	engine->NotifyGarbageCollectorOfNewObject(this, engine->GetTypeInfoByName("any"));
-}
-
-CScriptAny::CScriptAny(void *ref, int refTypeId, asIScriptEngine *engine)
-{
-	this->engine = engine;
-	refCount = 1;
-	gcFlag = false;
-
-	value.typeId = 0;
-	value.valueInt = 0;
-
-	// Notify the garbage collector of this object
-	engine->NotifyGarbageCollectorOfNewObject(this, engine->GetTypeInfoByName("any"));
-
-	Store(ref, refTypeId);
-}
-
-CScriptAny::~CScriptAny()
-{
-	FreeObject();
-}
-
-void CScriptAny::Store(void *ref, int refTypeId)
-{
-	// This method is not expected to be used for primitive types, except for bool, int64, or double
-	assert( refTypeId > asTYPEID_DOUBLE || refTypeId == asTYPEID_VOID || refTypeId == asTYPEID_BOOL || refTypeId == asTYPEID_INT64 || refTypeId == asTYPEID_DOUBLE );
-
-	// Hold on to the object type reference so it isn't destroyed too early
-	if( (refTypeId & asTYPEID_MASK_OBJECT) )
-	{
-		asITypeInfo *ti = engine->GetTypeInfoById(refTypeId);
-		if( ti )
-			ti->AddRef();
-	}
-
-	FreeObject();
-
-	value.typeId = refTypeId;
-	if( value.typeId & asTYPEID_OBJHANDLE )
-	{
-		// We're receiving a reference to the handle, so we need to dereference it
-		value.valueObj = *(void**)ref;
-		engine->AddRefScriptObject(value.valueObj, engine->GetTypeInfoById(value.typeId));
-	}
-	else if( value.typeId & asTYPEID_MASK_OBJECT )
-	{
-		// Create a copy of the object
-		value.valueObj = engine->CreateScriptObjectCopy(ref, engine->GetTypeInfoById(value.typeId));
-	}
-	else
-	{
-		// Primitives can be copied directly
-		value.valueInt = 0;
-
-		// Copy the primitive value
-		// We receive a pointer to the value.
-		int size = engine->GetSizeOfPrimitiveType(value.typeId);
-		memcpy(&value.valueInt, ref, size);
-	}
-}
-
-void CScriptAny::Store(double &ref)
-{
-	Store(&ref, asTYPEID_DOUBLE);
-}
-
-void CScriptAny::Store(asINT64 &ref)
-{
-	Store(&ref, asTYPEID_INT64);
-}
-
-
-bool CScriptAny::Retrieve(void *ref, int refTypeId) const
-{
-	// This method is not expected to be used for primitive types, except for bool, int64, or double
-	assert( refTypeId > asTYPEID_DOUBLE || refTypeId == asTYPEID_BOOL || refTypeId == asTYPEID_INT64 || refTypeId == asTYPEID_DOUBLE );
-
-	if( refTypeId & asTYPEID_OBJHANDLE )
-	{
-		// Is the handle type compatible with the stored value?
-
-		// A handle can be retrieved if the stored type is a handle of same or compatible type
-		// or if the stored type is an object that implements the interface that the handle refer to.
-		if( (value.typeId & asTYPEID_MASK_OBJECT) )
-		{
-			// Don't allow the retrieval if the stored handle is to a const object but not the wanted handle
-			if( (value.typeId & asTYPEID_HANDLETOCONST) && !(refTypeId & asTYPEID_HANDLETOCONST) )
-				return false;
-
-			// RefCastObject will increment the refCount of the returned pointer if successful
-			engine->RefCastObject(value.valueObj, engine->GetTypeInfoById(value.typeId), engine->GetTypeInfoById(refTypeId), reinterpret_cast<void**>(ref));
-			if( *(asPWORD*)ref == 0 )
-				return false;
-			return true;
-		}
-	}
-	else if( refTypeId & asTYPEID_MASK_OBJECT )
-	{
-		// Is the object type compatible with the stored value?
-
-		// Copy the object into the given reference
-		if( value.typeId == refTypeId )
-		{
-			engine->AssignScriptObject(ref, value.valueObj, engine->GetTypeInfoById(value.typeId));
-			return true;
-		}
-	}
-	else
-	{
-		// Is the primitive type compatible with the stored value?
-
-		if( value.typeId == refTypeId )
-		{
-			int size = engine->GetSizeOfPrimitiveType(refTypeId);
-			memcpy(ref, &value.valueInt, size);
-			return true;
-		}
-
-		// We know all numbers are stored as either int64 or double, since we register overloaded functions for those
-		if( value.typeId == asTYPEID_INT64 && refTypeId == asTYPEID_DOUBLE )
-		{
-			*(double*)ref = double(value.valueInt);
-			return true;
-		}
-		else if( value.typeId == asTYPEID_DOUBLE && refTypeId == asTYPEID_INT64 )
-		{
-			*(asINT64*)ref = asINT64(value.valueFlt);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-bool CScriptAny::Retrieve(asINT64 &outValue) const
-{
-	return Retrieve(&outValue, asTYPEID_INT64);
-}
-
-bool CScriptAny::Retrieve(double &outValue) const
-{
-	return Retrieve(&outValue, asTYPEID_DOUBLE);
-}
-
-int CScriptAny::GetTypeId() const
-{
-	return value.typeId;
-}
-
-void CScriptAny::FreeObject()
-{
-	// If it is a handle or a ref counted object, call release
-	if( value.typeId & asTYPEID_MASK_OBJECT )
-	{
-		// Let the engine release the object
-		asITypeInfo *ti = engine->GetTypeInfoById(value.typeId);
-		engine->ReleaseScriptObject(value.valueObj, ti);
-
-		// Release the object type info
-		if( ti )
-			ti->Release();
-
-		value.valueObj = 0;
-		value.typeId = 0;
-	}
-
-	// For primitives, there's nothing to do
-}
-
-
-void CScriptAny::EnumReferences(asIScriptEngine *inEngine)
-{
-	// If we're holding a reference, we'll notify the garbage collector of it
-	if( value.valueObj && (value.typeId & asTYPEID_MASK_OBJECT) )
-	{
-		inEngine->GCEnumCallback(value.valueObj);
-
-		// The object type itself is also garbage collected
-		asITypeInfo *ti = inEngine->GetTypeInfoById(value.typeId);
-		if( ti )
-			inEngine->GCEnumCallback(ti);
-	}
-}
-
-void CScriptAny::ReleaseAllHandles(asIScriptEngine * /*engine*/)
-{
-	FreeObject();
-}
-
-int CScriptAny::AddRef() const
-{
-	// Increase counter and clear flag set by GC
-	gcFlag = false;
-	return refCount.fetch_add(1) + 1;
-}
-
-int CScriptAny::Release() const
-{
-	// Decrease the ref counter
-	gcFlag = false;
-	if( refCount.fetch_sub(1) == 1 )
-	{
-		// Delete this object as no more references to it exists
-		delete this;
-		return 0;
-	}
-
-	return refCount;
-}
-
-int CScriptAny::GetRefCount()
-{
-	return refCount;
-}
-
-void CScriptAny::SetFlag()
-{
-	gcFlag = true;
-}
-
-bool CScriptAny::GetFlag()
-{
-	return gcFlag;
-}
-
-
-END_AS_NAMESPACE
+#include "scriptany.h"
+#include <new>
+#include <assert.h>
+#include <string.h>
+
+BEGIN_AS_NAMESPACE
+
+// We'll use the generic interface for the factories as we need the engine pointer
+static void ScriptAnyFactory_Generic(asIScriptGeneric *gen)
+{
+	asIScriptEngine *engine = gen->GetEngine();
+
+	*(CScriptAny**)gen->GetAddressOfReturnLocation() = new CScriptAny(engine);
+}
+
+static void ScriptAnyFactory2_Generic(asIScriptGeneric *gen)
+{
+	asIScriptEngine *engine = gen->GetEngine();
+	void *ref = (void*)gen->GetArgAddress(0);
+	int refType = gen->GetArgTypeId(0);
+
+	*(CScriptAny**)gen->GetAddressOfReturnLocation() = new CScriptAny(ref,refType,engine);
+}
+
+static CScriptAny &ScriptAnyAssignment(CScriptAny *other, CScriptAny *self)
+{
+	return *self = *other;
+}
+
+static void ScriptAnyAssignment_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *other = (CScriptAny*)gen->GetArgObject(0);
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+
+	*self = *other;
+
+	gen->SetReturnObject(self);
+}
+
+static void ScriptAny_Store_Generic(asIScriptGeneric *gen)
+{
+	void *ref = (void*)gen->GetArgAddress(0);
+	int refTypeId = gen->GetArgTypeId(0);
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+
+	self->Store(ref, refTypeId);
+}
+
+static void ScriptAny_StoreInt_Generic(asIScriptGeneric *gen)
+{
+	asINT64 *ref = (asINT64*)gen->GetArgAddress(0);
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+
+	self->Store(*ref);
+}
+
+static void ScriptAny_StoreFlt_Generic(asIScriptGeneric *gen)
+{
+	double *ref = (double*)gen->GetArgAddress(0);
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+
+	self->Store(*ref);
+}
+
+static void ScriptAny_Retrieve_Generic(asIScriptGeneric *gen)
+{
+	void *ref = (void*)gen->GetArgAddress(0);
+	int refTypeId = gen->GetArgTypeId(0);
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+
+	*(bool*)gen->GetAddressOfReturnLocation() = self->Retrieve(ref, refTypeId);
+}
+
+static void ScriptAny_RetrieveInt_Generic(asIScriptGeneric *gen)
+{
+	asINT64 *ref = (asINT64*)gen->GetArgAddress(0);
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+
+	*(bool*)gen->GetAddressOfReturnLocation() = self->Retrieve(*ref);
+}
+
+static void ScriptAny_RetrieveFlt_Generic(asIScriptGeneric *gen)
+{
+	double *ref = (double*)gen->GetArgAddress(0);
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+
+	*(bool*)gen->GetAddressOfReturnLocation() = self->Retrieve(*ref);
+}
+
+static void ScriptAny_AddRef_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+	self->AddRef();
+}
+
+static void ScriptAny_Release_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+	self->Release();
+}
+
+static void ScriptAny_GetRefCount_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
+}
+
+static void ScriptAny_SetFlag_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+	self->SetFlag();
+}
+
+static void ScriptAny_GetFlag_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+	*(bool*)gen->GetAddressOfReturnLocation() = self->GetFlag();
+}
+
+static void ScriptAny_EnumReferences_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->EnumReferences(engine);
+}
+
+static void ScriptAny_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
+{
+	CScriptAny *self = (CScriptAny*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->ReleaseAllHandles(engine);
+}
+
+void RegisterScriptAny(asIScriptEngine *engine)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+		RegisterScriptAny_Generic(engine);
+	else
+		RegisterScriptAny_Native(engine);
+}
+
+void RegisterScriptAny_Native(asIScriptEngine *engine)
+{
+	int r;
+	r = engine->RegisterObjectType("any", sizeof(CScriptAny), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
+
+	// We'll use the generic interface for the constructor as we need the engine pointer
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f()", asFUNCTION(ScriptAnyFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(?&in) explicit", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const int64&in) explicit", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const double&in) explicit", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
+
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptAny,AddRef), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptAny,Release), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "any &opAssign(any&in)", asFUNCTION(ScriptAnyAssignment), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "void store(?&in)", asMETHODPR(CScriptAny,Store,(void*,int),void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "void store(const int64&in)", asMETHODPR(CScriptAny,Store,(asINT64&),void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "void store(const double&in)", asMETHODPR(CScriptAny,Store,(double&),void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "bool retrieve(?&out)", asMETHODPR(CScriptAny,Retrieve,(void*,int) const,bool), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "bool retrieve(int64&out)", asMETHODPR(CScriptAny,Retrieve,(asINT64&) const,bool), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "bool retrieve(double&out)", asMETHODPR(CScriptAny,Retrieve,(double&) const,bool), asCALL_THISCALL); assert( r >= 0 );
+
+	// Register GC behaviours
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(CScriptAny,GetRefCount), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_SETGCFLAG, "void f()", asMETHOD(CScriptAny,SetFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(CScriptAny,GetFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptAny,EnumReferences), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptAny,ReleaseAllHandles), asCALL_THISCALL); assert( r >= 0 );
+}
+
+void RegisterScriptAny_Generic(asIScriptEngine *engine)
+{
+	int r;
+	r = engine->RegisterObjectType("any", sizeof(CScriptAny), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
+
+	// We'll use the generic interface for the constructor as we need the engine pointer
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f()", asFUNCTION(ScriptAnyFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(?&in) explicit", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const int64&in) explicit", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_FACTORY, "any@ f(const double&in) explicit", asFUNCTION(ScriptAnyFactory2_Generic), asCALL_GENERIC); assert(r >= 0);
+
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptAny_AddRef_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptAny_Release_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "any &opAssign(any&in)", asFUNCTION(ScriptAnyAssignment_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "void store(?&in)", asFUNCTION(ScriptAny_Store_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "void store(const int64&in)", asFUNCTION(ScriptAny_StoreInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "void store(const double&in)", asFUNCTION(ScriptAny_StoreFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "bool retrieve(?&out) const", asFUNCTION(ScriptAny_Retrieve_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "bool retrieve(int64&out) const", asFUNCTION(ScriptAny_RetrieveInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("any", "bool retrieve(double&out) const", asFUNCTION(ScriptAny_RetrieveFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Register GC behaviours
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptAny_GetRefCount_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptAny_SetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptAny_GetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptAny_EnumReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("any", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptAny_ReleaseAllHandles_Generic), asCALL_GENERIC); assert( r >= 0 );
+}
+
+
+CScriptAny &CScriptAny::operator=(const CScriptAny &other)
+{
+	// Hold on to the object type reference so it isn't destroyed too early
+	if( (other.value.typeId & asTYPEID_MASK_OBJECT) )
+	{
+		asITypeInfo *ti = engine->GetTypeInfoById(other.value.typeId);
+		if( ti )
+			ti->AddRef();
+	}
+
+	FreeObject();
+
+	value.typeId = other.value.typeId;
+	if( value.typeId & asTYPEID_OBJHANDLE )
+	{
+		// For handles, copy the pointer and increment the reference count
+		value.valueObj = other.value.valueObj;
+		engine->AddRefScriptObject(value.valueObj, engine->GetTypeInfoById(value.typeId));
+	}
+	else if( value.typeId & asTYPEID_MASK_OBJECT )
+	{
+		// Create a copy of the object
+		value.valueObj = engine->CreateScriptObjectCopy(other.value.valueObj, engine->GetTypeInfoById(value.typeId));
+	}
+	else
+	{
+		// Primitives can be copied directly
+		value.valueInt = other.value.valueInt;
+	}
+
+	return *this;
+}
+
+int CScriptAny::CopyFrom(const CScriptAny *other)
+{
+	if( other == 0 ) return asINVALID_ARG;
+
+	*this = *(CScriptAny*)other;
+
+	return 0;
+}
+
+CScriptAny::CScriptAny(asIScriptEngine *engine)
+{
+	this->engine = engine;
+	refCount = 1;
+	gcFlag = false;
+
+	value.typeId = 0;
+	value.valueInt = 0;
+
+	// Notify the garbage collector of this object
+	engine->NotifyGarbageCollectorOfNewObject(this, engine->GetTypeInfoByName("any"));
+}
+
+CScriptAny::CScriptAny(void *ref, int refTypeId, asIScriptEngine *engine)
+{
+	this->engine = engine;
+	refCount = 1;
+	gcFlag = false;
+
+	value.typeId = 0;
+	value.valueInt = 0;
+
+	// Notify the garbage collector of this object
+	engine->NotifyGarbageCollectorOfNewObject(this, engine->GetTypeInfoByName("any"));
+
+	Store(ref, refTypeId);
+}
+
+CScriptAny::~CScriptAny()
+{
+	FreeObject();
+}
+
+void CScriptAny::Store(void *ref, int refTypeId)
+{
+	// This method is not expected to be used for primitive types, except for bool, int64, or double
+	assert( refTypeId > asTYPEID_DOUBLE || refTypeId == asTYPEID_VOID || refTypeId == asTYPEID_BOOL || refTypeId == asTYPEID_INT64 || refTypeId == asTYPEID_DOUBLE );
+
+	// Hold on to the object type reference so it isn't destroyed too early
+	if( (refTypeId & asTYPEID_MASK_OBJECT) )
+	{
+		asITypeInfo *ti = engine->GetTypeInfoById(refTypeId);
+		if( ti )
+			ti->AddRef();
+	}
+
+	FreeObject();
+
+	value.typeId = refTypeId;
+	if( value.typeId & asTYPEID_OBJHANDLE )
+	{
+		// We're receiving a reference to the handle, so we need to dereference it
+		value.valueObj = *(void**)ref;
+		engine->AddRefScriptObject(value.valueObj, engine->GetTypeInfoById(value.typeId));
+	}
+	else if( value.typeId & asTYPEID_MASK_OBJECT )
+	{
+		// Create a copy of the object
+		value.valueObj = engine->CreateScriptObjectCopy(ref, engine->GetTypeInfoById(value.typeId));
+	}
+	else
+	{
+		// Primitives can be copied directly
+		value.valueInt = 0;
+
+		// Copy the primitive value
+		// We receive a pointer to the value.
+		int size = engine->GetSizeOfPrimitiveType(value.typeId);
+		memcpy(&value.valueInt, ref, size);
+	}
+}
+
+void CScriptAny::Store(double &ref)
+{
+	Store(&ref, asTYPEID_DOUBLE);
+}
+
+void CScriptAny::Store(asINT64 &ref)
+{
+	Store(&ref, asTYPEID_INT64);
+}
+
+
+bool CScriptAny::Retrieve(void *ref, int refTypeId) const
+{
+	// This method is not expected to be used for primitive types, except for bool, int64, or double
+	assert( refTypeId > asTYPEID_DOUBLE || refTypeId == asTYPEID_BOOL || refTypeId == asTYPEID_INT64 || refTypeId == asTYPEID_DOUBLE );
+
+	if( refTypeId & asTYPEID_OBJHANDLE )
+	{
+		// Is the handle type compatible with the stored value?
+
+		// A handle can be retrieved if the stored type is a handle of same or compatible type
+		// or if the stored type is an object that implements the interface that the handle refer to.
+		if( (value.typeId & asTYPEID_MASK_OBJECT) )
+		{
+			// Don't allow the retrieval if the stored handle is to a const object but not the wanted handle
+			if( (value.typeId & asTYPEID_HANDLETOCONST) && !(refTypeId & asTYPEID_HANDLETOCONST) )
+				return false;
+
+			// RefCastObject will increment the refCount of the returned pointer if successful
+			engine->RefCastObject(value.valueObj, engine->GetTypeInfoById(value.typeId), engine->GetTypeInfoById(refTypeId), reinterpret_cast<void**>(ref));
+			if( *(asPWORD*)ref == 0 )
+				return false;
+			return true;
+		}
+	}
+	else if( refTypeId & asTYPEID_MASK_OBJECT )
+	{
+		// Is the object type compatible with the stored value?
+
+		// Copy the object into the given reference
+		if( value.typeId == refTypeId )
+		{
+			engine->AssignScriptObject(ref, value.valueObj, engine->GetTypeInfoById(value.typeId));
+			return true;
+		}
+	}
+	else
+	{
+		// Is the primitive type compatible with the stored value?
+
+		if( value.typeId == refTypeId )
+		{
+			int size = engine->GetSizeOfPrimitiveType(refTypeId);
+			memcpy(ref, &value.valueInt, size);
+			return true;
+		}
+
+		// We know all numbers are stored as either int64 or double, since we register overloaded functions for those
+		if( value.typeId == asTYPEID_INT64 && refTypeId == asTYPEID_DOUBLE )
+		{
+			*(double*)ref = double(value.valueInt);
+			return true;
+		}
+		else if( value.typeId == asTYPEID_DOUBLE && refTypeId == asTYPEID_INT64 )
+		{
+			*(asINT64*)ref = asINT64(value.valueFlt);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool CScriptAny::Retrieve(asINT64 &outValue) const
+{
+	return Retrieve(&outValue, asTYPEID_INT64);
+}
+
+bool CScriptAny::Retrieve(double &outValue) const
+{
+	return Retrieve(&outValue, asTYPEID_DOUBLE);
+}
+
+int CScriptAny::GetTypeId() const
+{
+	return value.typeId;
+}
+
+void CScriptAny::FreeObject()
+{
+	// If it is a handle or a ref counted object, call release
+	if( value.typeId & asTYPEID_MASK_OBJECT )
+	{
+		// Let the engine release the object
+		asITypeInfo *ti = engine->GetTypeInfoById(value.typeId);
+		engine->ReleaseScriptObject(value.valueObj, ti);
+
+		// Release the object type info
+		if( ti )
+			ti->Release();
+
+		value.valueObj = 0;
+		value.typeId = 0;
+	}
+
+	// For primitives, there's nothing to do
+}
+
+
+void CScriptAny::EnumReferences(asIScriptEngine *inEngine)
+{
+	// If we're holding a reference, we'll notify the garbage collector of it
+	if (value.valueObj && (value.typeId & asTYPEID_MASK_OBJECT))
+	{
+		asITypeInfo *subType = engine->GetTypeInfoById(value.typeId);
+		if ((subType->GetFlags() & asOBJ_REF))
+		{
+			inEngine->GCEnumCallback(value.valueObj);
+		}
+		else if ((subType->GetFlags() & asOBJ_VALUE) && (subType->GetFlags() & asOBJ_GC))
+		{
+			// For value types we need to forward the enum callback
+			// to the object so it can decide what to do
+			engine->ForwardGCEnumReferences(value.valueObj, subType);
+		}
+
+		// The object type itself is also garbage collected
+		asITypeInfo *ti = inEngine->GetTypeInfoById(value.typeId);
+		if (ti)
+			inEngine->GCEnumCallback(ti);
+	}
+}
+
+void CScriptAny::ReleaseAllHandles(asIScriptEngine * /*engine*/)
+{
+	FreeObject();
+}
+
+int CScriptAny::AddRef() const
+{
+	// Increase counter and clear flag set by GC
+	gcFlag = false;
+	return asAtomicInc(refCount);
+}
+
+int CScriptAny::Release() const
+{
+	// Decrease the ref counter
+	gcFlag = false;
+	if( asAtomicDec(refCount) == 0 )
+	{
+		// Delete this object as no more references to it exists
+		delete this;
+		return 0;
+	}
+
+	return refCount;
+}
+
+int CScriptAny::GetRefCount()
+{
+	return refCount;
+}
+
+void CScriptAny::SetFlag()
+{
+	gcFlag = true;
+}
+
+bool CScriptAny::GetFlag()
+{
+	return gcFlag;
+}
+
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/addons/scriptany.h b/Sources/AngelScript/add_on/scriptany/scriptany.h
old mode 100755
new mode 100644
similarity index 89%
rename from Sources/AngelScript/addons/scriptany.h
rename to Sources/AngelScript/add_on/scriptany/scriptany.h
index a7b5be17f..d81cf8e37
--- a/Sources/AngelScript/addons/scriptany.h
+++ b/Sources/AngelScript/add_on/scriptany/scriptany.h
@@ -1,77 +1,76 @@
-#ifndef SCRIPTANY_H
-#define SCRIPTANY_H
-
-#ifndef ANGELSCRIPT_H 
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-#include <atomic>
-
-BEGIN_AS_NAMESPACE
-
-class CScriptAny 
-{
-public:
-	// Constructors
-	CScriptAny(asIScriptEngine *engine);
-	CScriptAny(void *ref, int refTypeId, asIScriptEngine *engine);
-
-	// Memory management
-	int AddRef() const;
-	int Release() const;
-
-	// Copy the stored value from another any object
-	CScriptAny &operator=(const CScriptAny&);
-	int CopyFrom(const CScriptAny *other);
-
-	// Store the value, either as variable type, integer number, or real number
-	void Store(void *ref, int refTypeId);
-	void Store(asINT64 &value);
-	void Store(double &value);
-
-	// Retrieve the stored value, either as variable type, integer number, or real number
-	bool Retrieve(void *ref, int refTypeId) const;
-	bool Retrieve(asINT64 &value) const;
-	bool Retrieve(double &value) const;
-
-	// Get the type id of the stored value
-	int  GetTypeId() const;
-
-	// GC methods
-	int  GetRefCount();
-	void SetFlag();
-	bool GetFlag();
-	void EnumReferences(asIScriptEngine *engine);
-	void ReleaseAllHandles(asIScriptEngine *engine);
-
-protected:
-	virtual ~CScriptAny();
-	void FreeObject();
-
-	mutable std::atomic<int> refCount;
-	mutable bool gcFlag;
-	asIScriptEngine *engine;
-
-	// The structure for holding the values
-    struct valueStruct
-    {
-        union
-        {
-            asINT64 valueInt;
-            double  valueFlt;
-            void   *valueObj;
-        };
-        int   typeId;
-    };
-
-	valueStruct value;
-};
-
-void RegisterScriptAny(asIScriptEngine *engine);
-void RegisterScriptAny_Native(asIScriptEngine *engine);
-void RegisterScriptAny_Generic(asIScriptEngine *engine);
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTANY_H
+#define SCRIPTANY_H
+
+#ifndef ANGELSCRIPT_H
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+
+BEGIN_AS_NAMESPACE
+
+class CScriptAny
+{
+public:
+	// Constructors
+	CScriptAny(asIScriptEngine *engine);
+	CScriptAny(void *ref, int refTypeId, asIScriptEngine *engine);
+
+	// Memory management
+	int AddRef() const;
+	int Release() const;
+
+	// Copy the stored value from another any object
+	CScriptAny &operator=(const CScriptAny&);
+	int CopyFrom(const CScriptAny *other);
+
+	// Store the value, either as variable type, integer number, or real number
+	void Store(void *ref, int refTypeId);
+	void Store(asINT64 &value);
+	void Store(double &value);
+
+	// Retrieve the stored value, either as variable type, integer number, or real number
+	bool Retrieve(void *ref, int refTypeId) const;
+	bool Retrieve(asINT64 &value) const;
+	bool Retrieve(double &value) const;
+
+	// Get the type id of the stored value
+	int  GetTypeId() const;
+
+	// GC methods
+	int  GetRefCount();
+	void SetFlag();
+	bool GetFlag();
+	void EnumReferences(asIScriptEngine *engine);
+	void ReleaseAllHandles(asIScriptEngine *engine);
+
+protected:
+	virtual ~CScriptAny();
+	void FreeObject();
+
+	mutable int refCount;
+	mutable bool gcFlag;
+	asIScriptEngine *engine;
+
+	// The structure for holding the values
+    struct valueStruct
+    {
+        union
+        {
+            asINT64 valueInt;
+            double  valueFlt;
+            void   *valueObj;
+        };
+        int   typeId;
+    };
+
+	valueStruct value;
+};
+
+void RegisterScriptAny(asIScriptEngine *engine);
+void RegisterScriptAny_Native(asIScriptEngine *engine);
+void RegisterScriptAny_Generic(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scriptarray.cpp b/Sources/AngelScript/add_on/scriptarray/scriptarray.cpp
old mode 100755
new mode 100644
similarity index 84%
rename from Sources/AngelScript/addons/scriptarray.cpp
rename to Sources/AngelScript/add_on/scriptarray/scriptarray.cpp
index 3da5fba13..866a2d574
--- a/Sources/AngelScript/addons/scriptarray.cpp
+++ b/Sources/AngelScript/add_on/scriptarray/scriptarray.cpp
@@ -1,2050 +1,2260 @@
-#include <new>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdio.h> // sprintf
-#include <string>
-
-#include "scriptarray.h"
-
-using namespace std;
-
-BEGIN_AS_NAMESPACE
-
-// This macro is used to avoid warnings about unused variables.
-// Usually where the variables are only used in debug mode.
-#define UNUSED_VAR(x) (void)(x)
-
-// Set the default memory routines
-// Use the angelscript engine's memory routines by default
-static asALLOCFUNC_t userAlloc = asAllocMem;
-static asFREEFUNC_t  userFree  = asFreeMem;
-
-// Allows the application to set which memory routines should be used by the array object
-void CScriptArray::SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc)
-{
-	userAlloc = allocFunc;
-	userFree = freeFunc;
-}
-
-static void RegisterScriptArray_Native(asIScriptEngine *engine);
-static void RegisterScriptArray_Generic(asIScriptEngine *engine);
-
-struct SArrayBuffer
-{
-	asDWORD maxElements;
-	asDWORD numElements;
-	asBYTE  data[1];
-};
-
-struct SArrayCache
-{
-	asIScriptFunction *cmpFunc;
-	asIScriptFunction *eqFunc;
-	int cmpFuncReturnCode; // To allow better error message in case of multiple matches
-	int eqFuncReturnCode;
-};
-
-// We just define a number here that we assume nobody else is using for
-// object type user data. The add-ons have reserved the numbers 1000
-// through 1999 for this purpose, so we should be fine.
-const asPWORD ARRAY_CACHE = 1000;
-
-static void CleanupTypeInfoArrayCache(asITypeInfo *type)
-{
-	SArrayCache *cache = reinterpret_cast<SArrayCache*>(type->GetUserData(ARRAY_CACHE));
-	if( cache )
-	{
-		cache->~SArrayCache();
-		userFree(cache);
-	}
-}
-
-CScriptArray* CScriptArray::Create(asITypeInfo *ti, asUINT length)
-{
-	// Allocate the memory
-	void *mem = userAlloc(sizeof(CScriptArray));
-	if( mem == 0 )
-	{
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Out of memory");
-
-		return 0;
-	}
-
-	// Initialize the object
-	CScriptArray *a = new(mem) CScriptArray(length, ti);
-
-	return a;
-}
-
-CScriptArray* CScriptArray::Create(asITypeInfo *ti, void *initList)
-{
-	// Allocate the memory
-	void *mem = userAlloc(sizeof(CScriptArray));
-	if( mem == 0 )
-	{
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Out of memory");
-
-		return 0;
-	}
-
-	// Initialize the object
-	CScriptArray *a = new(mem) CScriptArray(ti, initList);
-
-	return a;
-}
-
-CScriptArray* CScriptArray::Create(asITypeInfo *ti, asUINT length, void *defVal)
-{
-	// Allocate the memory
-	void *mem = userAlloc(sizeof(CScriptArray));
-	if( mem == 0 )
-	{
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Out of memory");
-
-		return 0;
-	}
-
-	// Initialize the object
-	CScriptArray *a = new(mem) CScriptArray(length, defVal, ti);
-
-	return a;
-}
-
-CScriptArray* CScriptArray::Create(asITypeInfo *ti)
-{
-	return CScriptArray::Create(ti, asUINT(0));
-}
-
-// This optional callback is called when the template type is first used by the compiler.
-// It allows the application to validate if the template can be instantiated for the requested
-// subtype at compile time, instead of at runtime. The output argument dontGarbageCollect
-// allow the callback to tell the engine if the template instance type shouldn't be garbage collected,
-// i.e. no asOBJ_GC flag.
-static bool ScriptArrayTemplateCallback(asITypeInfo *ti, bool &dontGarbageCollect)
-{
-	// Make sure the subtype can be instantiated with a default factory/constructor,
-	// otherwise we won't be able to instantiate the elements.
-	int typeId = ti->GetSubTypeId();
-	if( typeId == asTYPEID_VOID )
-		return false;
-	if( (typeId & asTYPEID_MASK_OBJECT) && !(typeId & asTYPEID_OBJHANDLE) )
-	{
-		asITypeInfo *subtype = ti->GetEngine()->GetTypeInfoById(typeId);
-		asDWORD flags = subtype->GetFlags();
-		if( (flags & asOBJ_VALUE) && !(flags & asOBJ_POD) )
-		{
-			// Verify that there is a default constructor
-			bool found = false;
-			for( asUINT n = 0; n < subtype->GetBehaviourCount(); n++ )
-			{
-				asEBehaviours beh;
-				asIScriptFunction *func = subtype->GetBehaviourByIndex(n, &beh);
-				if( beh != asBEHAVE_CONSTRUCT ) continue;
-
-				if( func->GetParamCount() == 0 )
-				{
-					// Found the default constructor
-					found = true;
-					break;
-				}
-			}
-
-			if( !found )
-			{
-				// There is no default constructor
-				// TODO: Should format the message to give the name of the subtype for better understanding
-				ti->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default constructor");
-				return false;
-			}
-		}
-		else if( (flags & asOBJ_REF) )
-		{
-			bool found = false;
-
-			// If value assignment for ref type has been disabled then the array
-			// can be created if the type has a default factory function
-			if( !ti->GetEngine()->GetEngineProperty(asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE) )
-			{
-				// Verify that there is a default factory
-				for( asUINT n = 0; n < subtype->GetFactoryCount(); n++ )
-				{
-					asIScriptFunction *func = subtype->GetFactoryByIndex(n);
-					if( func->GetParamCount() == 0 )
-					{
-						// Found the default factory
-						found = true;
-						break;
-					}
-				}
-			}
-
-			if( !found )
-			{
-				// No default factory
-				// TODO: Should format the message to give the name of the subtype for better understanding
-				ti->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default factory");
-				return false;
-			}
-		}
-
-		// If the object type is not garbage collected then the array also doesn't need to be
-		if( !(flags & asOBJ_GC) )
-			dontGarbageCollect = true;
-	}
-	else if( !(typeId & asTYPEID_OBJHANDLE) )
-	{
-		// Arrays with primitives cannot form circular references,
-		// thus there is no need to garbage collect them
-		dontGarbageCollect = true;
-	}
-	else
-	{
-		assert( typeId & asTYPEID_OBJHANDLE );
-
-		// It is not necessary to set the array as garbage collected for all handle types.
-		// If it is possible to determine that the handle cannot refer to an object type
-		// that can potentially form a circular reference with the array then it is not 
-		// necessary to make the array garbage collected.
-		asITypeInfo *subtype = ti->GetEngine()->GetTypeInfoById(typeId);
-		asDWORD flags = subtype->GetFlags();
-		if( !(flags & asOBJ_GC) )
-		{
-			if( (flags & asOBJ_SCRIPT_OBJECT) )
-			{
-				// Even if a script class is by itself not garbage collected, it is possible
-				// that classes that derive from it may be, so it is not possible to know 
-				// that no circular reference can occur.
-				if( (flags & asOBJ_NOINHERIT) )
-				{
-					// A script class declared as final cannot be inherited from, thus
-					// we can be certain that the object cannot be garbage collected.
-					dontGarbageCollect = true;
-				}
-			}
-			else
-			{
-				// For application registered classes we assume the application knows
-				// what it is doing and don't mark the array as garbage collected unless
-				// the type is also garbage collected.
-				dontGarbageCollect = true;
-			}
-		}
-	}
-
-	// The type is ok
-	return true;
-}
-
-// Registers the template array type
-void RegisterScriptArray(asIScriptEngine *engine, bool defaultArray)
-{
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") == 0 )
-		RegisterScriptArray_Native(engine);
-	else
-		RegisterScriptArray_Generic(engine);
-
-	if( defaultArray )
-	{
-		int r = engine->RegisterDefaultArrayType("array<T>"); assert( r >= 0 );
-		UNUSED_VAR(r);
-	}
-}
-
-static void RegisterScriptArray_Native(asIScriptEngine *engine)
-{
-	int r = 0;
-	UNUSED_VAR(r);
-
-	// Register the object type user data clean up
-	engine->SetTypeInfoUserDataCleanupCallback(CleanupTypeInfoArrayCache, ARRAY_CACHE);
-
-	// Register the array type as a template
-	r = engine->RegisterObjectType("array<class T>", 0, asOBJ_REF | asOBJ_GC | asOBJ_TEMPLATE); assert( r >= 0 );
-
-	// Register a callback for validating the subtype before it is used
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptArrayTemplateCallback), asCALL_CDECL); assert( r >= 0 );
-
-	// Templates receive the object type as the first parameter. To the script writer this is hidden
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in)", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length)", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*, asUINT), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length, const T &in value)", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*, asUINT, void *), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
-
-	// Register the factory that will be used for initialization lists
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_LIST_FACTORY, "array<T>@ f(int&in type, int&in list) {repeat T}", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*, void*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
-
-	// The memory management methods
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptArray,AddRef), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptArray,Release), asCALL_THISCALL); assert( r >= 0 );
-
-	// The index operator returns the template subtype
-	r = engine->RegisterObjectMethod("array<T>", "T &opIndex(uint index)", asMETHODPR(CScriptArray, At, (asUINT), void*), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "const T &opIndex(uint index) const", asMETHODPR(CScriptArray, At, (asUINT) const, const void*), asCALL_THISCALL); assert( r >= 0 );
-
-	// The assignment operator
-	r = engine->RegisterObjectMethod("array<T>", "array<T> &opAssign(const array<T>&in)", asMETHOD(CScriptArray, operator=), asCALL_THISCALL); assert( r >= 0 );
-
-	// Other methods
-	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const T&in value)", asMETHODPR(CScriptArray, InsertAt, (asUINT, void *), void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const array<T>& arr)", asMETHODPR(CScriptArray, InsertAt, (asUINT, const CScriptArray &), void), asCALL_THISCALL); assert(r >= 0);
-	r = engine->RegisterObjectMethod("array<T>", "void insertLast(const T&in value)", asMETHOD(CScriptArray, InsertLast), asCALL_THISCALL); assert(r >= 0);
-	r = engine->RegisterObjectMethod("array<T>", "void removeAt(uint index)", asMETHOD(CScriptArray, RemoveAt), asCALL_THISCALL); assert(r >= 0);
-	r = engine->RegisterObjectMethod("array<T>", "void removeLast()", asMETHOD(CScriptArray, RemoveLast), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void removeRange(uint start, uint count)", asMETHOD(CScriptArray, RemoveRange), asCALL_THISCALL); assert(r >= 0);
-	// TODO: Should length() and resize() be deprecated as the property accessors do the same thing?
-	r = engine->RegisterObjectMethod("array<T>", "uint length() const", asMETHOD(CScriptArray, GetSize), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void reserve(uint length)", asMETHOD(CScriptArray, Reserve), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void resize(uint length)", asMETHODPR(CScriptArray, Resize, (asUINT), void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortAsc()", asMETHODPR(CScriptArray, SortAsc, (), void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortAsc(uint startAt, uint count)", asMETHODPR(CScriptArray, SortAsc, (asUINT, asUINT), void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortDesc()", asMETHODPR(CScriptArray, SortDesc, (), void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortDesc(uint startAt, uint count)", asMETHODPR(CScriptArray, SortDesc, (asUINT, asUINT), void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void reverse()", asMETHOD(CScriptArray, Reverse), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "int find(const T&in value) const", asMETHODPR(CScriptArray, Find, (void*) const, int), asCALL_THISCALL); assert( r >= 0 );
-	// TODO: It should be "int find(const T&in value, uint startAt = 0) const"
-	r = engine->RegisterObjectMethod("array<T>", "int find(uint startAt, const T&in value) const", asMETHODPR(CScriptArray, Find, (asUINT, void*) const, int), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "int findByRef(const T&in value) const", asMETHODPR(CScriptArray, FindByRef, (void*) const, int), asCALL_THISCALL); assert( r >= 0 );
-	// TODO: It should be "int findByRef(const T&in value, uint startAt = 0) const"
-	r = engine->RegisterObjectMethod("array<T>", "int findByRef(uint startAt, const T&in value) const", asMETHODPR(CScriptArray, FindByRef, (asUINT, void*) const, int), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "bool opEquals(const array<T>&in) const", asMETHOD(CScriptArray, operator==), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "bool isEmpty() const", asMETHOD(CScriptArray, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
-
-	// Register virtual properties
-	r = engine->RegisterObjectMethod("array<T>", "uint get_length() const", asMETHOD(CScriptArray, GetSize), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void set_length(uint)", asMETHODPR(CScriptArray, Resize, (asUINT), void), asCALL_THISCALL); assert( r >= 0 );
-
-	// Register GC behaviours in case the array needs to be garbage collected
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(CScriptArray, GetRefCount), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_SETGCFLAG, "void f()", asMETHOD(CScriptArray, SetFlag), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(CScriptArray, GetFlag), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptArray, EnumReferences), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptArray, ReleaseAllHandles), asCALL_THISCALL); assert( r >= 0 );
-
-#if AS_USE_STLNAMES == 1
-	// Same as length
-	r = engine->RegisterObjectMethod("array<T>", "uint size() const", asMETHOD(CScriptArray, GetSize), asCALL_THISCALL); assert( r >= 0 );
-	// Same as isEmpty
-	r = engine->RegisterObjectMethod("array<T>", "bool empty() const", asMETHOD(CScriptArray, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
-	// Same as insertLast
-	r = engine->RegisterObjectMethod("array<T>", "void push_back(const T&in)", asMETHOD(CScriptArray, InsertLast), asCALL_THISCALL); assert( r >= 0 );
-	// Same as removeLast
-	r = engine->RegisterObjectMethod("array<T>", "void pop_back()", asMETHOD(CScriptArray, RemoveLast), asCALL_THISCALL); assert( r >= 0 );
-	// Same as insertAt
-	r = engine->RegisterObjectMethod("array<T>", "void insert(uint index, const T&in value)", asMETHODPR(CScriptArray, InsertAt, (asUINT, void *), void), asCALL_THISCALL); assert(r >= 0);
-	r = engine->RegisterObjectMethod("array<T>", "void insert(uint index, const array<T>& arr)", asMETHODPR(CScriptArray, InsertAt, (asUINT, const CScriptArray &), void), asCALL_THISCALL); assert(r >= 0);
-	// Same as removeAt
-	r = engine->RegisterObjectMethod("array<T>", "void erase(uint)", asMETHOD(CScriptArray, RemoveAt), asCALL_THISCALL); assert( r >= 0 );
-#endif
-}
-
-CScriptArray &CScriptArray::operator=(const CScriptArray &other)
-{
-	// Only perform the copy if the array types are the same
-	if( &other != this &&
-		other.GetArrayObjectType() == GetArrayObjectType() )
-	{
-		// Make sure the arrays are of the same size
-		Resize(other.buffer->numElements);
-
-		// Copy the value of each element
-		CopyBuffer(buffer, other.buffer);
-	}
-
-	return *this;
-}
-
-CScriptArray::CScriptArray(asITypeInfo *ti, void *buf)
-{
-	// The object type should be the template instance of the array
-	assert( ti && string(ti->GetName()) == "array" );
-
-	refCount = 1;
-	gcFlag = false;
-	objType = ti;
-	objType->AddRef();
-	buffer = 0;
-
-	Precache();
-
-	asIScriptEngine *engine = ti->GetEngine();
-
-	// Determine element size
-	if( subTypeId & asTYPEID_MASK_OBJECT )
-		elementSize = sizeof(asPWORD);
-	else
-		elementSize = engine->GetSizeOfPrimitiveType(subTypeId);
-
-	// Determine the initial size from the buffer
-	asUINT length = *(asUINT*)buf;
-
-	// Make sure the array size isn't too large for us to handle
-	if( !CheckMaxSize(length) )
-	{
-		// Don't continue with the initialization
-		return;
-	}
-
-	// Copy the values of the array elements from the buffer
-	if( (ti->GetSubTypeId() & asTYPEID_MASK_OBJECT) == 0 )
-	{
-		CreateBuffer(&buffer, length);
-
-		// Copy the values of the primitive type into the internal buffer
-		if( length > 0 )
-			memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
-	}
-	else if( ti->GetSubTypeId() & asTYPEID_OBJHANDLE )
-	{
-		CreateBuffer(&buffer, length);
-
-		// Copy the handles into the internal buffer
-		if( length > 0 )
-			memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
-
-		// With object handles it is safe to clear the memory in the received buffer
-		// instead of increasing the ref count. It will save time both by avoiding the
-		// call the increase ref, and also relieve the engine from having to release
-		// its references too
-		memset((((asUINT*)buf)+1), 0, length * elementSize);
-	}
-	else if( ti->GetSubType()->GetFlags() & asOBJ_REF )
-	{
-		// Only allocate the buffer, but not the objects
-		subTypeId |= asTYPEID_OBJHANDLE;
-		CreateBuffer(&buffer, length);
-		subTypeId &= ~asTYPEID_OBJHANDLE;
-
-		// Copy the handles into the internal buffer
-		if( length > 0 )
-			memcpy(buffer->data, (((asUINT*)buf)+1), length * elementSize);
-
-		// For ref types we can do the same as for handles, as they are
-		// implicitly stored as handles.
-		memset((((asUINT*)buf)+1), 0, length * elementSize);
-	}
-	else
-	{
-		// TODO: Optimize by calling the copy constructor of the object instead of
-		//       constructing with the default constructor and then assigning the value
-		// TODO: With C++11 ideally we should be calling the move constructor, instead
-		//       of the copy constructor as the engine will just discard the objects in the
-		//       buffer afterwards.
-		CreateBuffer(&buffer, length);
-
-		// For value types we need to call the opAssign for each individual object
-		for( asUINT n = 0; n < length; n++ )
-		{
-			void *obj = At(n);
-			asBYTE *srcObj = (asBYTE*)buf;
-			srcObj += 4 + n*ti->GetSubType()->GetSize();
-			engine->AssignScriptObject(obj, srcObj, ti->GetSubType());
-		}
-	}
-
-	// Notify the GC of the successful creation
-	if( objType->GetFlags() & asOBJ_GC )
-		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
-}
-
-CScriptArray::CScriptArray(asUINT length, asITypeInfo *ti)
-{
-	// The object type should be the template instance of the array
-	assert( ti && string(ti->GetName()) == "array" );
-
-	refCount = 1;
-	gcFlag = false;
-	objType = ti;
-	objType->AddRef();
-	buffer = 0;
-
-	Precache();
-
-	// Determine element size
-	if( subTypeId & asTYPEID_MASK_OBJECT )
-		elementSize = sizeof(asPWORD);
-	else
-		elementSize = objType->GetEngine()->GetSizeOfPrimitiveType(subTypeId);
-
-	// Make sure the array size isn't too large for us to handle
-	if( !CheckMaxSize(length) )
-	{
-		// Don't continue with the initialization
-		return;
-	}
-
-	CreateBuffer(&buffer, length);
-
-	// Notify the GC of the successful creation
-	if( objType->GetFlags() & asOBJ_GC )
-		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
-}
-
-CScriptArray::CScriptArray(const CScriptArray &other)
-{
-	refCount = 1;
-	gcFlag = false;
-	objType = other.objType;
-	objType->AddRef();
-	buffer = 0;
-
-	Precache();
-
-	elementSize = other.elementSize;
-
-	if( objType->GetFlags() & asOBJ_GC )
-		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
-
-	CreateBuffer(&buffer, 0);
-
-	// Copy the content
-	*this = other;
-}
-
-CScriptArray::CScriptArray(asUINT length, void *defVal, asITypeInfo *ti)
-{
-	// The object type should be the template instance of the array
-	assert( ti && string(ti->GetName()) == "array" );
-
-	refCount = 1;
-	gcFlag = false;
-	objType = ti;
-	objType->AddRef();
-	buffer = 0;
-
-	Precache();
-
-	// Determine element size
-	if( subTypeId & asTYPEID_MASK_OBJECT )
-		elementSize = sizeof(asPWORD);
-	else
-		elementSize = objType->GetEngine()->GetSizeOfPrimitiveType(subTypeId);
-
-	// Make sure the array size isn't too large for us to handle
-	if( !CheckMaxSize(length) )
-	{
-		// Don't continue with the initialization
-		return;
-	}
-
-	CreateBuffer(&buffer, length);
-
-	// Notify the GC of the successful creation
-	if( objType->GetFlags() & asOBJ_GC )
-		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
-
-	// Initialize the elements with the default value
-	for( asUINT n = 0; n < GetSize(); n++ )
-		SetValue(n, defVal);
-}
-
-void CScriptArray::SetValue(asUINT index, void *value)
-{
-	// At() will take care of the out-of-bounds checking, though
-	// if called from the application then nothing will be done
-	void *ptr = At(index);
-	if( ptr == 0 ) return;
-
-	if( (subTypeId & ~asTYPEID_MASK_SEQNBR) && !(subTypeId & asTYPEID_OBJHANDLE) )
-		objType->GetEngine()->AssignScriptObject(ptr, value, objType->GetSubType());
-	else if( subTypeId & asTYPEID_OBJHANDLE )
-	{
-		void *tmp = *(void**)ptr;
-		*(void**)ptr = *(void**)value;
-		objType->GetEngine()->AddRefScriptObject(*(void**)value, objType->GetSubType());
-		if( tmp )
-			objType->GetEngine()->ReleaseScriptObject(tmp, objType->GetSubType());
-	}
-	else if( subTypeId == asTYPEID_BOOL ||
-			 subTypeId == asTYPEID_INT8 ||
-			 subTypeId == asTYPEID_UINT8 )
-		*(char*)ptr = *(char*)value;
-	else if( subTypeId == asTYPEID_INT16 ||
-			 subTypeId == asTYPEID_UINT16 )
-		*(short*)ptr = *(short*)value;
-	else if( subTypeId == asTYPEID_INT32 ||
-			 subTypeId == asTYPEID_UINT32 ||
-			 subTypeId == asTYPEID_FLOAT ||
-			 subTypeId > asTYPEID_DOUBLE ) // enums have a type id larger than doubles
-		*(int*)ptr = *(int*)value;
-	else if( subTypeId == asTYPEID_INT64 ||
-			 subTypeId == asTYPEID_UINT64 ||
-			 subTypeId == asTYPEID_DOUBLE )
-		*(double*)ptr = *(double*)value;
-}
-
-CScriptArray::~CScriptArray()
-{
-	if( buffer )
-	{
-		DeleteBuffer(buffer);
-		buffer = 0;
-	}
-	if( objType ) objType->Release();
-}
-
-asUINT CScriptArray::GetSize() const
-{
-	return buffer->numElements;
-}
-
-bool CScriptArray::IsEmpty() const
-{
-	return buffer->numElements == 0;
-}
-
-void CScriptArray::Reserve(asUINT maxElements)
-{
-	if( maxElements <= buffer->maxElements )
-		return;
-
-	if( !CheckMaxSize(maxElements) )
-		return;
-
-	// Allocate memory for the buffer
-	SArrayBuffer *newBuffer = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1 + elementSize*maxElements));
-	if( newBuffer )
-	{
-		newBuffer->numElements = buffer->numElements;
-		newBuffer->maxElements = maxElements;
-	}
-	else
-	{
-		// Out of memory
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Out of memory");
-		return;
-	}
-
-	// As objects in arrays of objects are not stored inline, it is safe to use memcpy here
-	// since we're just copying the pointers to objects and not the actual objects.
-	memcpy(newBuffer->data, buffer->data, buffer->numElements*elementSize);
-
-	// Release the old buffer
-	userFree(buffer);
-
-	buffer = newBuffer;
-}
-
-void CScriptArray::Resize(asUINT numElements)
-{
-	if( !CheckMaxSize(numElements) )
-		return;
-
-	Resize((int)numElements - (int)buffer->numElements, (asUINT)-1);
-}
-
-void CScriptArray::RemoveRange(asUINT start, asUINT count)
-{
-	if (count == 0)
-		return;
-
-	if( buffer == 0 || start > buffer->numElements )
-	{
-		// If this is called from a script we raise a script exception
-		asIScriptContext *ctx = asGetActiveContext();
-		if (ctx)
-			ctx->SetException("Index out of bounds");
-		return;
-	}
-
-	// Cap count to the end of the array
-	if (start + count > buffer->numElements)
-		count = buffer->numElements - start;
-
-	// Destroy the elements that are being removed
-	Destruct(buffer, start, start + count);
-
-	// Compact the elements
-	// As objects in arrays of objects are not stored inline, it is safe to use memmove here
-	// since we're just copying the pointers to objects and not the actual objects.
-	memmove(buffer->data + start*elementSize, buffer->data + (start + count)*elementSize, (buffer->numElements - count)*elementSize);
-	buffer->numElements -= count;
-}
-
-// Internal
-void CScriptArray::Resize(int delta, asUINT at)
-{
-	if( delta < 0 )
-	{
-		if( -delta > (int)buffer->numElements )
-			delta = -(int)buffer->numElements;
-		if( at > buffer->numElements + delta )
-			at = buffer->numElements + delta;
-	}
-	else if( delta > 0 )
-	{
-		// Make sure the array size isn't too large for us to handle
-		if( delta > 0 && !CheckMaxSize(buffer->numElements + delta) )
-			return;
-
-		if( at > buffer->numElements )
-			at = buffer->numElements;
-	}
-
-	if( delta == 0 ) return;
-
-	if( buffer->maxElements < buffer->numElements + delta )
-	{
-		// Allocate memory for the buffer
-		SArrayBuffer *newBuffer = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1 + elementSize*(buffer->numElements + delta)));
-		if( newBuffer )
-		{
-			newBuffer->numElements = buffer->numElements + delta;
-			newBuffer->maxElements = newBuffer->numElements;
-		}
-		else
-		{
-			// Out of memory
-			asIScriptContext *ctx = asGetActiveContext();
-			if( ctx )
-				ctx->SetException("Out of memory");
-			return;
-		}
-
-		// As objects in arrays of objects are not stored inline, it is safe to use memcpy here
-		// since we're just copying the pointers to objects and not the actual objects.
-		memcpy(newBuffer->data, buffer->data, at*elementSize);
-		if( at < buffer->numElements )
-			memcpy(newBuffer->data + (at+delta)*elementSize, buffer->data + at*elementSize, (buffer->numElements-at)*elementSize);
-
-		// Initialize the new elements with default values
-		Construct(newBuffer, at, at+delta);
-
-		// Release the old buffer
-		userFree(buffer);
-
-		buffer = newBuffer;
-	}
-	else if( delta < 0 )
-	{
-		Destruct(buffer, at, at-delta);
-		// As objects in arrays of objects are not stored inline, it is safe to use memmove here
-		// since we're just copying the pointers to objects and not the actual objects.
-		memmove(buffer->data + at*elementSize, buffer->data + (at-delta)*elementSize, (buffer->numElements - (at-delta))*elementSize);
-		buffer->numElements += delta;
-	}
-	else
-	{
-		// As objects in arrays of objects are not stored inline, it is safe to use memmove here
-		// since we're just copying the pointers to objects and not the actual objects.
-		memmove(buffer->data + (at+delta)*elementSize, buffer->data + at*elementSize, (buffer->numElements - at)*elementSize);
-		Construct(buffer, at, at+delta);
-		buffer->numElements += delta;
-	}
-}
-
-// internal
-bool CScriptArray::CheckMaxSize(asUINT numElements)
-{
-	// This code makes sure the size of the buffer that is allocated
-	// for the array doesn't overflow and becomes smaller than requested
-
-	asUINT maxSize = 0xFFFFFFFFul - sizeof(SArrayBuffer) + 1;
-	if( elementSize > 0 )
-		maxSize /= elementSize;
-
-	if( numElements > maxSize )
-	{
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Too large array size");
-
-		return false;
-	}
-
-	// OK
-	return true;
-}
-
-asITypeInfo *CScriptArray::GetArrayObjectType() const
-{
-	return objType;
-}
-
-int CScriptArray::GetArrayTypeId() const
-{
-	return objType->GetTypeId();
-}
-
-int CScriptArray::GetElementTypeId() const
-{
-	return subTypeId;
-}
-
-void CScriptArray::InsertAt(asUINT index, void *value)
-{
-	if( index > buffer->numElements )
-	{
-		// If this is called from a script we raise a script exception
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Index out of bounds");
-		return;
-	}
-
-	// Make room for the new element
-	Resize(1, index);
-
-	// Set the value of the new element
-	SetValue(index, value);
-}
-
-void CScriptArray::InsertAt(asUINT index, const CScriptArray &arr)
-{
-	if (index > buffer->numElements)
-	{
-		asIScriptContext *ctx = asGetActiveContext();
-		if (ctx)
-			ctx->SetException("Index out of bounds");
-		return;
-	}
-
-	if (objType != arr.objType)
-	{
-		// This shouldn't really be possible to happen when
-		// called from a script, but let's check for it anyway
-		asIScriptContext *ctx = asGetActiveContext();
-		if (ctx)
-			ctx->SetException("Mismatching array types");
-		return;
-	}
-
-	asUINT elements = arr.GetSize();
-	Resize(elements, index);
-	if (&arr != this)
-	{
-		for (asUINT n = 0; n < arr.GetSize(); n++)
-		{
-			// This const cast is allowed, since we know the
-			// value will only be used to make a copy of it
-			void *value = const_cast<void*>(arr.At(n));
-			SetValue(index + n, value);
-		}
-	}
-	else
-	{
-		// The array that is being inserted is the same as this one.
-		// So we should iterate over the elements before the index,
-		// and then the elements after
-		for (asUINT n = 0; n < index; n++)
-		{
-			// This const cast is allowed, since we know the
-			// value will only be used to make a copy of it
-			void *value = const_cast<void*>(arr.At(n));
-			SetValue(index + n, value);
-		}
-
-		for (asUINT n = index + elements, m = 0; n < arr.GetSize(); n++, m++)
-		{
-			// This const cast is allowed, since we know the
-			// value will only be used to make a copy of it
-			void *value = const_cast<void*>(arr.At(n));
-			SetValue(index + index + m, value);
-		}
-	}
-}
-
-void CScriptArray::InsertLast(void *value)
-{
-	InsertAt(buffer->numElements, value);
-}
-
-void CScriptArray::RemoveAt(asUINT index)
-{
-	if( index >= buffer->numElements )
-	{
-		// If this is called from a script we raise a script exception
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Index out of bounds");
-		return;
-	}
-
-	// Remove the element
-	Resize(-1, index);
-}
-
-void CScriptArray::RemoveLast()
-{
-	RemoveAt(buffer->numElements-1);
-}
-
-// Return a pointer to the array element. Returns 0 if the index is out of bounds
-const void *CScriptArray::At(asUINT index) const
-{
-	if( buffer == 0 || index >= buffer->numElements )
-	{
-		// If this is called from a script we raise a script exception
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Index out of bounds");
-		return 0;
-	}
-
-	if( (subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
-		return *(void**)(buffer->data + elementSize*index);
-	else
-		return buffer->data + elementSize*index;
-}
-void *CScriptArray::At(asUINT index)
-{
-	return const_cast<void*>(const_cast<const CScriptArray *>(this)->At(index));
-}
-
-void *CScriptArray::GetBuffer()
-{
-	return buffer->data;
-}
-
-
-// internal
-void CScriptArray::CreateBuffer(SArrayBuffer **buf, asUINT numElements)
-{
-	*buf = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1+elementSize*numElements));
-
-	if( *buf )
-	{
-		(*buf)->numElements = numElements;
-		(*buf)->maxElements = numElements;
-		Construct(*buf, 0, numElements);
-	}
-	else
-	{
-		// Oops, out of memory
-		asIScriptContext *ctx = asGetActiveContext();
-		if( ctx )
-			ctx->SetException("Out of memory");
-	}
-}
-
-// internal
-void CScriptArray::DeleteBuffer(SArrayBuffer *buf)
-{
-	Destruct(buf, 0, buf->numElements);
-
-	// Free the buffer
-	userFree(buf);
-}
-
-// internal
-void CScriptArray::Construct(SArrayBuffer *buf, asUINT start, asUINT end)
-{
-	if( (subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
-	{
-		// Create an object using the default constructor/factory for each element
-		void **max = (void**)(buf->data + end * sizeof(void*));
-		void **d = (void**)(buf->data + start * sizeof(void*));
-
-		asIScriptEngine *engine = objType->GetEngine();
-		asITypeInfo *subType = objType->GetSubType();
-
-		for( ; d < max; d++ )
-		{
-			*d = (void*)engine->CreateScriptObject(subType);
-			if( *d == 0 )
-			{
-				// Set the remaining entries to null so the destructor 
-				// won't attempt to destroy invalid objects later
-				memset(d, 0, sizeof(void*)*(max-d));
-
-				// There is no need to set an exception on the context,
-				// as CreateScriptObject has already done that
-				return;
-			}
-		}
-	}
-	else
-	{
-		// Set all elements to zero whether they are handles or primitives
-		void *d = (void*)(buf->data + start * elementSize);
-		memset(d, 0, (end-start)*elementSize);
-	}
-}
-
-// internal
-void CScriptArray::Destruct(SArrayBuffer *buf, asUINT start, asUINT end)
-{
-	if( subTypeId & asTYPEID_MASK_OBJECT )
-	{
-		asIScriptEngine *engine = objType->GetEngine();
-
-		void **max = (void**)(buf->data + end * sizeof(void*));
-		void **d   = (void**)(buf->data + start * sizeof(void*));
-
-		for( ; d < max; d++ )
-		{
-			if( *d )
-				engine->ReleaseScriptObject(*d, objType->GetSubType());
-		}
-	}
-}
-
-
-// internal
-bool CScriptArray::Less(const void *a, const void *b, bool asc, asIScriptContext *ctx, SArrayCache *cache)
-{
-	if( !asc )
-	{
-		// Swap items
-		const void *TEMP = a;
-		a = b;
-		b = TEMP;
-	}
-
-	if( !(subTypeId & ~asTYPEID_MASK_SEQNBR) )
-	{
-		// Simple compare of values
-		switch( subTypeId )
-		{
-			#define COMPARE(T) *((T*)a) < *((T*)b)
-			case asTYPEID_BOOL: return COMPARE(bool);
-			case asTYPEID_INT8: return COMPARE(signed char);
-			case asTYPEID_UINT8: return COMPARE(unsigned char);
-			case asTYPEID_INT16: return COMPARE(signed short);
-			case asTYPEID_UINT16: return COMPARE(unsigned short);
-			case asTYPEID_INT32: return COMPARE(signed int);
-			case asTYPEID_UINT32: return COMPARE(unsigned int);
-			case asTYPEID_FLOAT: return COMPARE(float);
-			case asTYPEID_DOUBLE: return COMPARE(double);
-			default: return COMPARE(signed int); // All enums fall in this case
-			#undef COMPARE
-		}
-	}
-	else
-	{
-		int r = 0;
-
-		if( subTypeId & asTYPEID_OBJHANDLE )
-		{
-			// Allow sort to work even if the array contains null handles
-			if( *(void**)a == 0 ) return true;
-			if( *(void**)b == 0 ) return false;
-		}
-
-		// Execute object opCmp
-		if( cache && cache->cmpFunc )
-		{
-			// TODO: Add proper error handling
-			r = ctx->Prepare(cache->cmpFunc); assert(r >= 0);
-
-			if( subTypeId & asTYPEID_OBJHANDLE )
-			{
-				r = ctx->SetObject(*((void**)a)); assert(r >= 0);
-				r = ctx->SetArgObject(0, *((void**)b)); assert(r >= 0);
-			}
-			else
-			{
-				r = ctx->SetObject((void*)a); assert(r >= 0);
-				r = ctx->SetArgObject(0, (void*)b); assert(r >= 0);
-			}
-
-			r = ctx->Execute();
-
-			if( r == asEXECUTION_FINISHED )
-			{
-				return (int)ctx->GetReturnDWord() < 0;
-			}
-		}
-	}
-
-	return false;
-}
-
-void CScriptArray::Reverse()
-{
-	asUINT size = GetSize();
-
-	if( size >= 2 )
-	{
-		asBYTE TEMP[16];
-
-		for( asUINT i = 0; i < size / 2; i++ )
-		{
-			Copy(TEMP, GetArrayItemPointer(i));
-			Copy(GetArrayItemPointer(i), GetArrayItemPointer(size - i - 1));
-			Copy(GetArrayItemPointer(size - i - 1), TEMP);
-		}
-	}
-}
-
-bool CScriptArray::operator==(const CScriptArray &other) const
-{
-	if( objType != other.objType )
-		return false;
-
-	if( GetSize() != other.GetSize() )
-		return false;
-
-	asIScriptContext *cmpContext = 0;
-	bool isNested = false;
-
-	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
-	{
-		// Try to reuse the active context
-		cmpContext = asGetActiveContext();
-		if( cmpContext )
-		{
-			if( cmpContext->GetEngine() == objType->GetEngine() && cmpContext->PushState() >= 0 )
-				isNested = true;
-			else
-				cmpContext = 0;
-		}
-		if( cmpContext == 0 )
-		{
-			// TODO: Ideally this context would be retrieved from a pool, so we don't have to
-			//       create a new one everytime. We could keep a context with the array object
-			//       but that would consume a lot of resources as each context is quite heavy.
-			cmpContext = objType->GetEngine()->CreateContext();
-		}
-	}
-
-	// Check if all elements are equal
-	bool isEqual = true;
-	SArrayCache *cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
-	for( asUINT n = 0; n < GetSize(); n++ )
-		if( !Equals(At(n), other.At(n), cmpContext, cache) )
-		{
-			isEqual = false;
-			break;
-		}
-
-	if( cmpContext )
-	{
-		if( isNested )
-		{
-			asEContextState state = cmpContext->GetState();
-			cmpContext->PopState();
-			if( state == asEXECUTION_ABORTED )
-				cmpContext->Abort();
-		}
-		else
-			cmpContext->Release();
-	}
-
-	return isEqual;
-}
-
-// internal
-bool CScriptArray::Equals(const void *a, const void *b, asIScriptContext *ctx, SArrayCache *cache) const
-{
-	if( !(subTypeId & ~asTYPEID_MASK_SEQNBR) )
-	{
-		// Simple compare of values
-		switch( subTypeId )
-		{
-			#define COMPARE(T) *((T*)a) == *((T*)b)
-			case asTYPEID_BOOL: return COMPARE(bool);
-			case asTYPEID_INT8: return COMPARE(signed char);
-			case asTYPEID_UINT8: return COMPARE(unsigned char);
-			case asTYPEID_INT16: return COMPARE(signed short);
-			case asTYPEID_UINT16: return COMPARE(unsigned short);
-			case asTYPEID_INT32: return COMPARE(signed int);
-			case asTYPEID_UINT32: return COMPARE(unsigned int);
-			case asTYPEID_FLOAT: return COMPARE(float);
-			case asTYPEID_DOUBLE: return COMPARE(double);
-			default: return COMPARE(signed int); // All enums fall here
-			#undef COMPARE
-		}
-	}
-	else
-	{
-		int r = 0;
-
-		if( subTypeId & asTYPEID_OBJHANDLE )
-		{
-			// Allow the find to work even if the array contains null handles
-			if( *(void**)a == *(void**)b ) return true;
-		}
-
-		// Execute object opEquals if available
-		if( cache && cache->eqFunc )
-		{
-			// TODO: Add proper error handling
-			r = ctx->Prepare(cache->eqFunc); assert(r >= 0);
-
-			if( subTypeId & asTYPEID_OBJHANDLE )
-			{
-				r = ctx->SetObject(*((void**)a)); assert(r >= 0);
-				r = ctx->SetArgObject(0, *((void**)b)); assert(r >= 0);
-			}
-			else
-			{
-				r = ctx->SetObject((void*)a); assert(r >= 0);
-				r = ctx->SetArgObject(0, (void*)b); assert(r >= 0);
-			}
-
-			r = ctx->Execute();
-
-			if( r == asEXECUTION_FINISHED )
-				return ctx->GetReturnByte() != 0;
-
-			return false;
-		}
-
-		// Execute object opCmp if available
-		if( cache && cache->cmpFunc )
-		{
-			// TODO: Add proper error handling
-			r = ctx->Prepare(cache->cmpFunc); assert(r >= 0);
-
-			if( subTypeId & asTYPEID_OBJHANDLE )
-			{
-				r = ctx->SetObject(*((void**)a)); assert(r >= 0);
-				r = ctx->SetArgObject(0, *((void**)b)); assert(r >= 0);
-			}
-			else
-			{
-				r = ctx->SetObject((void*)a); assert(r >= 0);
-				r = ctx->SetArgObject(0, (void*)b); assert(r >= 0);
-			}
-
-			r = ctx->Execute();
-
-			if( r == asEXECUTION_FINISHED )
-				return (int)ctx->GetReturnDWord() == 0;
-
-			return false;
-		}
-	}
-
-	return false;
-}
-
-int CScriptArray::FindByRef(void *ref) const
-{
-	return FindByRef(0, ref);
-}
-
-int CScriptArray::FindByRef(asUINT startAt, void *ref) const
-{
-	// Find the matching element by its reference
-	asUINT size = GetSize();
-	if( subTypeId & asTYPEID_OBJHANDLE )
-	{
-		// Dereference the pointer
-		ref = *(void**)ref;
-		for( asUINT i = startAt; i < size; i++ )
-		{
-			if( *(void**)At(i) == ref )
-				return i;
-		}
-	}
-	else
-	{
-		// Compare the reference directly
-		for( asUINT i = startAt; i < size; i++ )
-		{
-			if( At(i) == ref )
-				return i;
-		}
-	}
-
-	return -1;
-}
-
-int CScriptArray::Find(void *value) const
-{
-	return Find(0, value);
-}
-
-int CScriptArray::Find(asUINT startAt, void *value) const
-{
-	// Check if the subtype really supports find()
-	// TODO: Can't this be done at compile time too by the template callback
-	SArrayCache *cache = 0;
-	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
-	{
-		cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
-		if( !cache || (cache->cmpFunc == 0 && cache->eqFunc == 0) )
-		{
-			asIScriptContext *ctx = asGetActiveContext();
-			asITypeInfo* subType = objType->GetEngine()->GetTypeInfoById(subTypeId);
-
-			// Throw an exception
-			if( ctx )
-			{
-				char tmp[512];
-
-				if( cache && cache->eqFuncReturnCode == asMULTIPLE_FUNCTIONS )
-#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
-					sprintf_s(tmp, 512, "Type '%s' has multiple matching opEquals or opCmp methods", subType->GetName());
-#else
-					sprintf(tmp, "Type '%s' has multiple matching opEquals or opCmp methods", subType->GetName());
-#endif
-				else
-#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
-					sprintf_s(tmp, 512, "Type '%s' does not have a matching opEquals or opCmp method", subType->GetName());
-#else
-					sprintf(tmp, "Type '%s' does not have a matching opEquals or opCmp method", subType->GetName());
-#endif
-				ctx->SetException(tmp);
-			}
-
-			return -1;
-		}
-	}
-
-	asIScriptContext *cmpContext = 0;
-	bool isNested = false;
-
-	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
-	{
-		// Try to reuse the active context
-		cmpContext = asGetActiveContext();
-		if( cmpContext )
-		{
-			if( cmpContext->GetEngine() == objType->GetEngine() && cmpContext->PushState() >= 0 )
-				isNested = true;
-			else
-				cmpContext = 0;
-		}
-		if( cmpContext == 0 )
-		{
-			// TODO: Ideally this context would be retrieved from a pool, so we don't have to
-			//       create a new one everytime. We could keep a context with the array object
-			//       but that would consume a lot of resources as each context is quite heavy.
-			cmpContext = objType->GetEngine()->CreateContext();
-		}
-	}
-
-	// Find the matching element
-	int ret = -1;
-	asUINT size = GetSize();
-
-	for( asUINT i = startAt; i < size; i++ )
-	{
-		// value passed by reference
-		if( Equals(At(i), value, cmpContext, cache) )
-		{
-			ret = (int)i;
-			break;
-		}
-	}
-
-	if( cmpContext )
-	{
-		if( isNested )
-		{
-			asEContextState state = cmpContext->GetState();
-			cmpContext->PopState();
-			if( state == asEXECUTION_ABORTED )
-				cmpContext->Abort();
-		}
-		else
-			cmpContext->Release();
-	}
-
-	return ret;
-}
-
-
-
-// internal
-// Copy object handle or primitive value
-// Even in arrays of objects the objects are allocated on 
-// the heap and the array stores the pointers to the objects
-void CScriptArray::Copy(void *dst, void *src)
-{
-	memcpy(dst, src, elementSize);
-}
-
-
-// internal
-// Return pointer to array item (object handle or primitive value)
-void *CScriptArray::GetArrayItemPointer(int index)
-{
-	return buffer->data + index * elementSize;
-}
-
-// internal
-// Return pointer to data in buffer (object or primitive)
-void *CScriptArray::GetDataPointer(void *buf)
-{
-	if ((subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
-	{
-		// Real address of object
-		return reinterpret_cast<void*>(*(size_t*)buf);
-	}
-	else
-	{
-		// Primitive is just a raw data
-		return buf;
-	}
-}
-
-
-// Sort ascending
-void CScriptArray::SortAsc()
-{
-	Sort(0, GetSize(), true);
-}
-
-// Sort ascending
-void CScriptArray::SortAsc(asUINT startAt, asUINT count)
-{
-	Sort(startAt, count, true);
-}
-
-// Sort descending
-void CScriptArray::SortDesc()
-{
-	Sort(0, GetSize(), false);
-}
-
-// Sort descending
-void CScriptArray::SortDesc(asUINT startAt, asUINT count)
-{
-	Sort(startAt, count, false);
-}
-
-
-// internal
-void CScriptArray::Sort(asUINT startAt, asUINT count, bool asc)
-{
-	// Subtype isn't primitive and doesn't have opCmp
-	SArrayCache *cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
-	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
-	{
-		if( !cache || cache->cmpFunc == 0 )
-		{
-			asIScriptContext *ctx = asGetActiveContext();
-			asITypeInfo* subType = objType->GetEngine()->GetTypeInfoById(subTypeId);
-
-			// Throw an exception
-			if( ctx )
-			{
-				char tmp[512];
-
-				if( cache && cache->cmpFuncReturnCode == asMULTIPLE_FUNCTIONS )
-#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
-					sprintf_s(tmp, 512, "Type '%s' has multiple matching opCmp methods", subType->GetName());
-#else
-					sprintf(tmp, "Type '%s' has multiple matching opCmp methods", subType->GetName());
-#endif
-				else
-#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
-					sprintf_s(tmp, 512, "Type '%s' does not have a matching opCmp method", subType->GetName());
-#else
-					sprintf(tmp, "Type '%s' does not have a matching opCmp method", subType->GetName());
-#endif
-
-				ctx->SetException(tmp);
-			}
-
-			return;
-		}
-	}
-
-	// No need to sort
-	if( count < 2 )
-	{
-		return;
-	}
-
-	int start = startAt;
-	int end = startAt + count;
-
-	// Check if we could access invalid item while sorting
-	if( start >= (int)buffer->numElements || end > (int)buffer->numElements )
-	{
-		asIScriptContext *ctx = asGetActiveContext();
-
-		// Throw an exception
-		if( ctx )
-		{
-			ctx->SetException("Index out of bounds");
-		}
-
-		return;
-	}
-
-	asBYTE tmp[16];
-	asIScriptContext *cmpContext = 0;
-	bool isNested = false;
-
-	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
-	{
-		// Try to reuse the active context
-		cmpContext = asGetActiveContext();
-		if( cmpContext )
-		{
-			if( cmpContext->GetEngine() == objType->GetEngine() && cmpContext->PushState() >= 0 )
-				isNested = true;
-			else
-				cmpContext = 0;
-		}
-		if( cmpContext == 0 )
-		{
-			// TODO: Ideally this context would be retrieved from a pool, so we don't have to
-			//       create a new one everytime. We could keep a context with the array object
-			//       but that would consume a lot of resources as each context is quite heavy.
-			cmpContext = objType->GetEngine()->CreateContext();
-		}
-	}
-
-	// Insertion sort
-	for( int i = start + 1; i < end; i++ )
-	{
-		Copy(tmp, GetArrayItemPointer(i));
-
-		int j = i - 1;
-
-		while( j >= start && Less(GetDataPointer(tmp), At(j), asc, cmpContext, cache) )
-		{
-			Copy(GetArrayItemPointer(j + 1), GetArrayItemPointer(j));
-			j--;
-		}
-
-		Copy(GetArrayItemPointer(j + 1), tmp);
-	}
-
-	if( cmpContext )
-	{
-		if( isNested )
-		{
-			asEContextState state = cmpContext->GetState();
-			cmpContext->PopState();
-			if( state == asEXECUTION_ABORTED )
-				cmpContext->Abort();
-		}
-		else
-			cmpContext->Release();
-	}
-}
-
-// internal
-void CScriptArray::CopyBuffer(SArrayBuffer *dst, SArrayBuffer *src)
-{
-	asIScriptEngine *engine = objType->GetEngine();
-	if( subTypeId & asTYPEID_OBJHANDLE )
-	{
-		// Copy the references and increase the reference counters
-		if( dst->numElements > 0 && src->numElements > 0 )
-		{
-			int count = dst->numElements > src->numElements ? src->numElements : dst->numElements;
-
-			void **max = (void**)(dst->data + count * sizeof(void*));
-			void **d   = (void**)dst->data;
-			void **s   = (void**)src->data;
-
-			for( ; d < max; d++, s++ )
-			{
-				void *tmp = *d;
-				*d = *s;
-				if( *d )
-					engine->AddRefScriptObject(*d, objType->GetSubType());
-				// Release the old ref after incrementing the new to avoid problem incase it is the same ref
-				if( tmp )
-					engine->ReleaseScriptObject(tmp, objType->GetSubType());
-			}
-		}
-	}
-	else
-	{
-		if( dst->numElements > 0 && src->numElements > 0 )
-		{
-			int count = dst->numElements > src->numElements ? src->numElements : dst->numElements;
-			if( subTypeId & asTYPEID_MASK_OBJECT )
-			{
-				// Call the assignment operator on all of the objects
-				void **max = (void**)(dst->data + count * sizeof(void*));
-				void **d   = (void**)dst->data;
-				void **s   = (void**)src->data;
-
-				asITypeInfo *subType = objType->GetSubType();
-				for( ; d < max; d++, s++ )
-					engine->AssignScriptObject(*d, *s, subType);
-			}
-			else
-			{
-				// Primitives are copied byte for byte
-				memcpy(dst->data, src->data, count*elementSize);
-			}
-		}
-	}
-}
-
-// internal
-// Precache some info
-void CScriptArray::Precache()
-{
-	subTypeId = objType->GetSubTypeId();
-
-	// Check if it is an array of objects. Only for these do we need to cache anything
-	// Type ids for primitives and enums only has the sequence number part
-	if( !(subTypeId & ~asTYPEID_MASK_SEQNBR) )
-		return;
-
-	// The opCmp and opEquals methods are cached because the searching for the
-	// methods is quite time consuming if a lot of array objects are created.
-
-	// First check if a cache already exists for this array type
-	SArrayCache *cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
-	if( cache ) return;
-
-	// We need to make sure the cache is created only once, even
-	// if multiple threads reach the same point at the same time
-	asAcquireExclusiveLock();
-
-	// Now that we got the lock, we need to check again to make sure the
-	// cache wasn't created while we were waiting for the lock
-	cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
-	if( cache )
-	{
-		asReleaseExclusiveLock();
-		return;
-	}
-
-	// Create the cache
-	cache = reinterpret_cast<SArrayCache*>(userAlloc(sizeof(SArrayCache)));
-	memset(cache, 0, sizeof(SArrayCache));
-
-	// If the sub type is a handle to const, then the methods must be const too
-	bool mustBeConst = (subTypeId & asTYPEID_HANDLETOCONST) ? true : false;
-
-	asITypeInfo *subType = objType->GetEngine()->GetTypeInfoById(subTypeId);
-	if( subType )
-	{
-		for( asUINT i = 0; i < subType->GetMethodCount(); i++ )
-		{
-			asIScriptFunction *func = subType->GetMethodByIndex(i);
-
-			if( func->GetParamCount() == 1 && (!mustBeConst || func->IsReadOnly()) )
-			{
-				asDWORD flags = 0;
-				int returnTypeId = func->GetReturnTypeId(&flags);
-
-				// The method must not return a reference
-				if( flags != asTM_NONE )
-					continue;
-
-				// opCmp returns an int and opEquals returns a bool
-				bool isCmp = false, isEq = false;
-				if( returnTypeId == asTYPEID_INT32 && strcmp(func->GetName(), "opCmp") == 0 )
-					isCmp = true;
-				if( returnTypeId == asTYPEID_BOOL && strcmp(func->GetName(), "opEquals") == 0 )
-					isEq = true;
-
-				if( !isCmp && !isEq )
-					continue;
-
-				// The parameter must either be a reference to the subtype or a handle to the subtype
-				int paramTypeId;
-				func->GetParam(0, &paramTypeId, &flags);
-
-				if( (paramTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) != (subTypeId &  ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) )
-					continue;
-
-				if( (flags & asTM_INREF) )
-				{
-					if( (paramTypeId & asTYPEID_OBJHANDLE) || (mustBeConst && !(flags & asTM_CONST)) )
-						continue;
-				}
-				else if( paramTypeId & asTYPEID_OBJHANDLE )
-				{
-					if( mustBeConst && !(paramTypeId & asTYPEID_HANDLETOCONST) )
-						continue;
-				}
-				else
-					continue;
-
-				if( isCmp )
-				{
-					if( cache->cmpFunc || cache->cmpFuncReturnCode )
-					{
-						cache->cmpFunc = 0;
-						cache->cmpFuncReturnCode = asMULTIPLE_FUNCTIONS;
-					}
-					else
-						cache->cmpFunc = func;
-				}
-				else if( isEq )
-				{
-					if( cache->eqFunc || cache->eqFuncReturnCode )
-					{
-						cache->eqFunc = 0;
-						cache->eqFuncReturnCode = asMULTIPLE_FUNCTIONS;
-					}
-					else
-						cache->eqFunc = func;
-				}
-			}
-		}
-	}
-
-	if( cache->eqFunc == 0 && cache->eqFuncReturnCode == 0 )
-		cache->eqFuncReturnCode = asNO_FUNCTION;
-	if( cache->cmpFunc == 0 && cache->cmpFuncReturnCode == 0 )
-		cache->cmpFuncReturnCode = asNO_FUNCTION;
-
-	// Set the user data only at the end so others that retrieve it will know it is complete
-	objType->SetUserData(cache, ARRAY_CACHE);
-
-	asReleaseExclusiveLock();
-}
-
-// GC behaviour
-void CScriptArray::EnumReferences(asIScriptEngine *engine)
-{
-	// TODO: If garbage collection can be done from a separate thread, then this method must be
-	//       protected so that it doesn't get lost during the iteration if the array is modified
-
-	// If the array is holding handles, then we need to notify the GC of them
-	if( subTypeId & asTYPEID_MASK_OBJECT )
-	{
-		void **d = (void**)buffer->data;
-		for( asUINT n = 0; n < buffer->numElements; n++ )
-		{
-			if( d[n] )
-				engine->GCEnumCallback(d[n]);
-		}
-	}
-}
-
-// GC behaviour
-void CScriptArray::ReleaseAllHandles(asIScriptEngine *)
-{
-	// Resizing to zero will release everything
-	Resize(0);
-}
-
-void CScriptArray::AddRef() const
-{
-	// Clear the GC flag then increase the counter
-	gcFlag = false;
-	refCount.fetch_add(1);
-}
-
-void CScriptArray::Release() const
-{
-	// Clearing the GC flag then descrease the counter
-	gcFlag = false;
-	if( refCount.fetch_sub(1) == 1 )
-	{
-		// When reaching 0 no more references to this instance
-		// exists and the object should be destroyed
-		this->~CScriptArray();
-		userFree(const_cast<CScriptArray*>(this));
-	}
-}
-
-// GC behaviour
-int CScriptArray::GetRefCount()
-{
-	return refCount;
-}
-
-// GC behaviour
-void CScriptArray::SetFlag()
-{
-	gcFlag = true;
-}
-
-// GC behaviour
-bool CScriptArray::GetFlag()
-{
-	return gcFlag;
-}
-
-//--------------------------------------------
-// Generic calling conventions
-
-static void ScriptArrayFactory_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
-
-	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti);
-}
-
-static void ScriptArrayFactory2_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
-	asUINT length = gen->GetArgDWord(1);
-
-	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti, length);
-}
-
-static void ScriptArrayListFactory_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
-	void *buf = gen->GetArgAddress(1);
-
-	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti, buf);
-}
-
-static void ScriptArrayFactoryDefVal_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
-	asUINT length = gen->GetArgDWord(1);
-	void *defVal = gen->GetArgAddress(2);
-
-	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti, length, defVal);
-}
-
-static void ScriptArrayTemplateCallback_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
-	bool *dontGarbageCollect = *(bool**)gen->GetAddressOfArg(1);
-	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = ScriptArrayTemplateCallback(ti, *dontGarbageCollect);
-}
-
-static void ScriptArrayAssignment_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *other = (CScriptArray*)gen->GetArgObject(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	*self = *other;
-	gen->SetReturnObject(self);
-}
-
-static void ScriptArrayEquals_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *other = (CScriptArray*)gen->GetArgObject(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	gen->SetReturnByte(self->operator==(*other));
-}
-
-static void ScriptArrayFind_Generic(asIScriptGeneric *gen)
-{
-	void *value = gen->GetArgAddress(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	gen->SetReturnDWord(self->Find(value));
-}
-
-static void ScriptArrayFind2_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	void *value = gen->GetArgAddress(1);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	gen->SetReturnDWord(self->Find(index, value));
-}
-
-static void ScriptArrayFindByRef_Generic(asIScriptGeneric *gen)
-{
-	void *value = gen->GetArgAddress(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	gen->SetReturnDWord(self->FindByRef(value));
-}
-
-static void ScriptArrayFindByRef2_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	void *value = gen->GetArgAddress(1);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	gen->SetReturnDWord(self->FindByRef(index, value));
-}
-
-static void ScriptArrayAt_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-
-	gen->SetReturnAddress(self->At(index));
-}
-
-static void ScriptArrayInsertAt_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	void *value = gen->GetArgAddress(1);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->InsertAt(index, value);
-}
-
-static void ScriptArrayInsertAtArray_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	CScriptArray *array = (CScriptArray*)gen->GetArgAddress(1);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->InsertAt(index, *array);
-}
-
-static void ScriptArrayRemoveAt_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->RemoveAt(index);
-}
-
-static void ScriptArrayRemoveRange_Generic(asIScriptGeneric *gen)
-{
-	asUINT start = gen->GetArgDWord(0);
-	asUINT count = gen->GetArgDWord(1);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->RemoveRange(start, count);
-}
-
-static void ScriptArrayInsertLast_Generic(asIScriptGeneric *gen)
-{
-	void *value = gen->GetArgAddress(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->InsertLast(value);
-}
-
-static void ScriptArrayRemoveLast_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->RemoveLast();
-}
-
-static void ScriptArrayLength_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-
-	gen->SetReturnDWord(self->GetSize());
-}
-
-static void ScriptArrayResize_Generic(asIScriptGeneric *gen)
-{
-	asUINT size = gen->GetArgDWord(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-
-	self->Resize(size);
-}
-
-static void ScriptArrayReserve_Generic(asIScriptGeneric *gen)
-{
-	asUINT size = gen->GetArgDWord(0);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->Reserve(size);
-}
-
-static void ScriptArraySortAsc_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->SortAsc();
-}
-
-static void ScriptArrayReverse_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->Reverse();
-}
-
-static void ScriptArrayIsEmpty_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = self->IsEmpty();
-}
-
-static void ScriptArraySortAsc2_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	asUINT count = gen->GetArgDWord(1);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->SortAsc(index, count);
-}
-
-static void ScriptArraySortDesc_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->SortDesc();
-}
-
-static void ScriptArraySortDesc2_Generic(asIScriptGeneric *gen)
-{
-	asUINT index = gen->GetArgDWord(0);
-	asUINT count = gen->GetArgDWord(1);
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->SortDesc(index, count);
-}
-
-static void ScriptArrayAddRef_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->AddRef();
-}
-
-static void ScriptArrayRelease_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->Release();
-}
-
-static void ScriptArrayGetRefCount_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	*reinterpret_cast<int*>(gen->GetAddressOfReturnLocation()) = self->GetRefCount();
-}
-
-static void ScriptArraySetFlag_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	self->SetFlag();
-}
-
-static void ScriptArrayGetFlag_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = self->GetFlag();
-}
-
-static void ScriptArrayEnumReferences_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->EnumReferences(engine);
-}
-
-static void ScriptArrayReleaseAllHandles_Generic(asIScriptGeneric *gen)
-{
-	CScriptArray *self = (CScriptArray*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->ReleaseAllHandles(engine);
-}
-
-static void RegisterScriptArray_Generic(asIScriptEngine *engine)
-{
-	int r = 0;
-	UNUSED_VAR(r);
-
-	engine->SetTypeInfoUserDataCleanupCallback(CleanupTypeInfoArrayCache, ARRAY_CACHE);
-
-	r = engine->RegisterObjectType("array<class T>", 0, asOBJ_REF | asOBJ_GC | asOBJ_TEMPLATE); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptArrayTemplateCallback_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in)", asFUNCTION(ScriptArrayFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length)", asFUNCTION(ScriptArrayFactory2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length, const T &in value)", asFUNCTION(ScriptArrayFactoryDefVal_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_LIST_FACTORY, "array<T>@ f(int&in, int&in) {repeat T}", asFUNCTION(ScriptArrayListFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptArrayAddRef_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptArrayRelease_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "T &opIndex(uint index)", asFUNCTION(ScriptArrayAt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "const T &opIndex(uint index) const", asFUNCTION(ScriptArrayAt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "array<T> &opAssign(const array<T>&in)", asFUNCTION(ScriptArrayAssignment_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const T&in value)", asFUNCTION(ScriptArrayInsertAt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const array<T>& arr)", asFUNCTION(ScriptArrayInsertAtArray_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("array<T>", "void insertLast(const T&in value)", asFUNCTION(ScriptArrayInsertLast_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("array<T>", "void removeAt(uint index)", asFUNCTION(ScriptArrayRemoveAt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void removeLast()", asFUNCTION(ScriptArrayRemoveLast_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void removeRange(uint start, uint count)", asFUNCTION(ScriptArrayRemoveRange_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("array<T>", "uint length() const", asFUNCTION(ScriptArrayLength_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void reserve(uint length)", asFUNCTION(ScriptArrayReserve_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void resize(uint length)", asFUNCTION(ScriptArrayResize_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortAsc()", asFUNCTION(ScriptArraySortAsc_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortAsc(uint startAt, uint count)", asFUNCTION(ScriptArraySortAsc2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortDesc()", asFUNCTION(ScriptArraySortDesc_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void sortDesc(uint startAt, uint count)", asFUNCTION(ScriptArraySortDesc2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void reverse()", asFUNCTION(ScriptArrayReverse_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "int find(const T&in value) const", asFUNCTION(ScriptArrayFind_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "int find(uint startAt, const T&in value) const", asFUNCTION(ScriptArrayFind2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "int findByRef(const T&in value) const", asFUNCTION(ScriptArrayFindByRef_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "int findByRef(uint startAt, const T&in value) const", asFUNCTION(ScriptArrayFindByRef2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "bool opEquals(const array<T>&in) const", asFUNCTION(ScriptArrayEquals_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "bool isEmpty() const", asFUNCTION(ScriptArrayIsEmpty_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "uint get_length() const", asFUNCTION(ScriptArrayLength_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("array<T>", "void set_length(uint)", asFUNCTION(ScriptArrayResize_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptArrayGetRefCount_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptArraySetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptArrayGetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptArrayEnumReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptArrayReleaseAllHandles_Generic), asCALL_GENERIC); assert( r >= 0 );
-}
-
-END_AS_NAMESPACE
+#include <new>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdio.h> // sprintf
+#include <string>
+#include <algorithm> // std::sort
+
+#include "scriptarray.h"
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+// This macro is used to avoid warnings about unused variables.
+// Usually where the variables are only used in debug mode.
+#define UNUSED_VAR(x) (void)(x)
+
+// Set the default memory routines
+// Use the angelscript engine's memory routines by default
+static asALLOCFUNC_t userAlloc = asAllocMem;
+static asFREEFUNC_t  userFree  = asFreeMem;
+
+// Allows the application to set which memory routines should be used by the array object
+void CScriptArray::SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc)
+{
+	userAlloc = allocFunc;
+	userFree = freeFunc;
+}
+
+static void RegisterScriptArray_Native(asIScriptEngine *engine);
+static void RegisterScriptArray_Generic(asIScriptEngine *engine);
+
+struct SArrayBuffer
+{
+	asDWORD maxElements;
+	asDWORD numElements;
+	asBYTE  data[1];
+};
+
+struct SArrayCache
+{
+	asIScriptFunction *cmpFunc;
+	asIScriptFunction *eqFunc;
+	int cmpFuncReturnCode; // To allow better error message in case of multiple matches
+	int eqFuncReturnCode;
+};
+
+// We just define a number here that we assume nobody else is using for
+// object type user data. The add-ons have reserved the numbers 1000
+// through 1999 for this purpose, so we should be fine.
+const asPWORD ARRAY_CACHE = 1000;
+
+static void CleanupTypeInfoArrayCache(asITypeInfo *type)
+{
+	SArrayCache *cache = reinterpret_cast<SArrayCache*>(type->GetUserData(ARRAY_CACHE));
+	if( cache )
+	{
+		cache->~SArrayCache();
+		userFree(cache);
+	}
+}
+
+CScriptArray* CScriptArray::Create(asITypeInfo *ti, asUINT length)
+{
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptArray));
+	if( mem == 0 )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptArray *a = new(mem) CScriptArray(length, ti);
+
+	return a;
+}
+
+CScriptArray* CScriptArray::Create(asITypeInfo *ti, void *initList)
+{
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptArray));
+	if( mem == 0 )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptArray *a = new(mem) CScriptArray(ti, initList);
+
+	return a;
+}
+
+CScriptArray* CScriptArray::Create(asITypeInfo *ti, asUINT length, void *defVal)
+{
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptArray));
+	if( mem == 0 )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptArray *a = new(mem) CScriptArray(length, defVal, ti);
+
+	return a;
+}
+
+CScriptArray* CScriptArray::Create(asITypeInfo *ti)
+{
+	return CScriptArray::Create(ti, asUINT(0));
+}
+
+// This optional callback is called when the template type is first used by the compiler.
+// It allows the application to validate if the template can be instantiated for the requested
+// subtype at compile time, instead of at runtime. The output argument dontGarbageCollect
+// allow the callback to tell the engine if the template instance type shouldn't be garbage collected,
+// i.e. no asOBJ_GC flag.
+static bool ScriptArrayTemplateCallback(asITypeInfo *ti, bool &dontGarbageCollect)
+{
+	// Make sure the subtype can be instantiated with a default factory/constructor,
+	// otherwise we won't be able to instantiate the elements.
+	int typeId = ti->GetSubTypeId();
+	if( typeId == asTYPEID_VOID )
+		return false;
+	if( (typeId & asTYPEID_MASK_OBJECT) && !(typeId & asTYPEID_OBJHANDLE) )
+	{
+		asITypeInfo *subtype = ti->GetEngine()->GetTypeInfoById(typeId);
+		asDWORD flags = subtype->GetFlags();
+		if( (flags & asOBJ_VALUE) && !(flags & asOBJ_POD) )
+		{
+			// Verify that there is a default constructor
+			bool found = false;
+			for( asUINT n = 0; n < subtype->GetBehaviourCount(); n++ )
+			{
+				asEBehaviours beh;
+				asIScriptFunction *func = subtype->GetBehaviourByIndex(n, &beh);
+				if( beh != asBEHAVE_CONSTRUCT ) continue;
+
+				if( func->GetParamCount() == 0 )
+				{
+					// Found the default constructor
+					found = true;
+					break;
+				}
+			}
+
+			if( !found )
+			{
+				// There is no default constructor
+				// TODO: Should format the message to give the name of the subtype for better understanding
+				ti->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default constructor");
+				return false;
+			}
+		}
+		else if( (flags & asOBJ_REF) )
+		{
+			bool found = false;
+
+			// If value assignment for ref type has been disabled then the array
+			// can be created if the type has a default factory function
+			if( !ti->GetEngine()->GetEngineProperty(asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE) )
+			{
+				// Verify that there is a default factory
+				for( asUINT n = 0; n < subtype->GetFactoryCount(); n++ )
+				{
+					asIScriptFunction *func = subtype->GetFactoryByIndex(n);
+					if( func->GetParamCount() == 0 )
+					{
+						// Found the default factory
+						found = true;
+						break;
+					}
+				}
+			}
+
+			if( !found )
+			{
+				// No default factory
+				// TODO: Should format the message to give the name of the subtype for better understanding
+				ti->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default factory");
+				return false;
+			}
+		}
+
+		// If the object type is not garbage collected then the array also doesn't need to be
+		if( !(flags & asOBJ_GC) )
+			dontGarbageCollect = true;
+	}
+	else if( !(typeId & asTYPEID_OBJHANDLE) )
+	{
+		// Arrays with primitives cannot form circular references,
+		// thus there is no need to garbage collect them
+		dontGarbageCollect = true;
+	}
+	else
+	{
+		assert( typeId & asTYPEID_OBJHANDLE );
+
+		// It is not necessary to set the array as garbage collected for all handle types.
+		// If it is possible to determine that the handle cannot refer to an object type
+		// that can potentially form a circular reference with the array then it is not
+		// necessary to make the array garbage collected.
+		asITypeInfo *subtype = ti->GetEngine()->GetTypeInfoById(typeId);
+		asDWORD flags = subtype->GetFlags();
+		if( !(flags & asOBJ_GC) )
+		{
+			if( (flags & asOBJ_SCRIPT_OBJECT) )
+			{
+				// Even if a script class is by itself not garbage collected, it is possible
+				// that classes that derive from it may be, so it is not possible to know
+				// that no circular reference can occur.
+				if( (flags & asOBJ_NOINHERIT) )
+				{
+					// A script class declared as final cannot be inherited from, thus
+					// we can be certain that the object cannot be garbage collected.
+					dontGarbageCollect = true;
+				}
+			}
+			else
+			{
+				// For application registered classes we assume the application knows
+				// what it is doing and don't mark the array as garbage collected unless
+				// the type is also garbage collected.
+				dontGarbageCollect = true;
+			}
+		}
+	}
+
+	// The type is ok
+	return true;
+}
+
+// Registers the template array type
+void RegisterScriptArray(asIScriptEngine *engine, bool defaultArray)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") == 0 )
+		RegisterScriptArray_Native(engine);
+	else
+		RegisterScriptArray_Generic(engine);
+
+	if( defaultArray )
+	{
+		int r = engine->RegisterDefaultArrayType("array<T>"); assert( r >= 0 );
+		UNUSED_VAR(r);
+	}
+}
+
+static void RegisterScriptArray_Native(asIScriptEngine *engine)
+{
+	int r = 0;
+	UNUSED_VAR(r);
+
+	// Register the object type user data clean up
+	engine->SetTypeInfoUserDataCleanupCallback(CleanupTypeInfoArrayCache, ARRAY_CACHE);
+
+	// Register the array type as a template
+	r = engine->RegisterObjectType("array<class T>", 0, asOBJ_REF | asOBJ_GC | asOBJ_TEMPLATE); assert( r >= 0 );
+
+	// Register a callback for validating the subtype before it is used
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptArrayTemplateCallback), asCALL_CDECL); assert( r >= 0 );
+
+	// Templates receive the object type as the first parameter. To the script writer this is hidden
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in)", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length) explicit", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*, asUINT), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length, const T &in value)", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*, asUINT, void *), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+
+	// Register the factory that will be used for initialization lists
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_LIST_FACTORY, "array<T>@ f(int&in type, int&in list) {repeat T}", asFUNCTIONPR(CScriptArray::Create, (asITypeInfo*, void*), CScriptArray*), asCALL_CDECL); assert( r >= 0 );
+
+	// The memory management methods
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptArray,AddRef), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptArray,Release), asCALL_THISCALL); assert( r >= 0 );
+
+	// The index operator returns the template subtype
+	r = engine->RegisterObjectMethod("array<T>", "T &opIndex(uint index)", asMETHODPR(CScriptArray, At, (asUINT), void*), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "const T &opIndex(uint index) const", asMETHODPR(CScriptArray, At, (asUINT) const, const void*), asCALL_THISCALL); assert( r >= 0 );
+
+	// The assignment operator
+	r = engine->RegisterObjectMethod("array<T>", "array<T> &opAssign(const array<T>&in)", asMETHOD(CScriptArray, operator=), asCALL_THISCALL); assert( r >= 0 );
+
+	// Other methods
+	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const T&in value)", asMETHODPR(CScriptArray, InsertAt, (asUINT, void *), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const array<T>& arr)", asMETHODPR(CScriptArray, InsertAt, (asUINT, const CScriptArray &), void), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("array<T>", "void insertLast(const T&in value)", asMETHOD(CScriptArray, InsertLast), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("array<T>", "void removeAt(uint index)", asMETHOD(CScriptArray, RemoveAt), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("array<T>", "void removeLast()", asMETHOD(CScriptArray, RemoveLast), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void removeRange(uint start, uint count)", asMETHOD(CScriptArray, RemoveRange), asCALL_THISCALL); assert(r >= 0);
+	// TODO: Should length() and resize() be deprecated as the property accessors do the same thing?
+	// TODO: Register as size() for consistency with other types
+#if AS_USE_ACCESSORS != 1
+	r = engine->RegisterObjectMethod("array<T>", "uint length() const", asMETHOD(CScriptArray, GetSize), asCALL_THISCALL); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectMethod("array<T>", "void reserve(uint length)", asMETHOD(CScriptArray, Reserve), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void resize(uint length)", asMETHODPR(CScriptArray, Resize, (asUINT), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortAsc()", asMETHODPR(CScriptArray, SortAsc, (), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortAsc(uint startAt, uint count)", asMETHODPR(CScriptArray, SortAsc, (asUINT, asUINT), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortDesc()", asMETHODPR(CScriptArray, SortDesc, (), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortDesc(uint startAt, uint count)", asMETHODPR(CScriptArray, SortDesc, (asUINT, asUINT), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void reverse()", asMETHOD(CScriptArray, Reverse), asCALL_THISCALL); assert( r >= 0 );
+	// The token 'if_handle_then_const' tells the engine that if the type T is a handle, then it should refer to a read-only object
+	r = engine->RegisterObjectMethod("array<T>", "int find(const T&in if_handle_then_const value) const", asMETHODPR(CScriptArray, Find, (void*) const, int), asCALL_THISCALL); assert( r >= 0 );
+	// TODO: It should be "int find(const T&in value, uint startAt = 0) const"
+	r = engine->RegisterObjectMethod("array<T>", "int find(uint startAt, const T&in if_handle_then_const value) const", asMETHODPR(CScriptArray, Find, (asUINT, void*) const, int), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "int findByRef(const T&in if_handle_then_const value) const", asMETHODPR(CScriptArray, FindByRef, (void*) const, int), asCALL_THISCALL); assert( r >= 0 );
+	// TODO: It should be "int findByRef(const T&in value, uint startAt = 0) const"
+	r = engine->RegisterObjectMethod("array<T>", "int findByRef(uint startAt, const T&in if_handle_then_const value) const", asMETHODPR(CScriptArray, FindByRef, (asUINT, void*) const, int), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "bool opEquals(const array<T>&in) const", asMETHOD(CScriptArray, operator==), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "bool isEmpty() const", asMETHOD(CScriptArray, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
+
+	// Sort with callback for comparison
+	r = engine->RegisterFuncdef("bool array<T>::less(const T&in if_handle_then_const a, const T&in if_handle_then_const b)");
+	r = engine->RegisterObjectMethod("array<T>", "void sort(const less &in, uint startAt = 0, uint count = uint(-1))", asMETHODPR(CScriptArray, Sort, (asIScriptFunction*, asUINT, asUINT), void), asCALL_THISCALL); assert(r >= 0);
+
+#if AS_USE_STLNAMES != 1 && AS_USE_ACCESSORS == 1
+	// Register virtual properties
+	r = engine->RegisterObjectMethod("array<T>", "uint get_length() const property", asMETHOD(CScriptArray, GetSize), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void set_length(uint) property", asMETHODPR(CScriptArray, Resize, (asUINT), void), asCALL_THISCALL); assert( r >= 0 );
+#endif
+
+	// Register GC behaviours in case the array needs to be garbage collected
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(CScriptArray, GetRefCount), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_SETGCFLAG, "void f()", asMETHOD(CScriptArray, SetFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(CScriptArray, GetFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptArray, EnumReferences), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptArray, ReleaseAllHandles), asCALL_THISCALL); assert( r >= 0 );
+
+#if AS_USE_STLNAMES == 1
+	// Same as length
+	r = engine->RegisterObjectMethod("array<T>", "uint size() const", asMETHOD(CScriptArray, GetSize), asCALL_THISCALL); assert( r >= 0 );
+	// Same as isEmpty
+	r = engine->RegisterObjectMethod("array<T>", "bool empty() const", asMETHOD(CScriptArray, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
+	// Same as insertLast
+	r = engine->RegisterObjectMethod("array<T>", "void push_back(const T&in)", asMETHOD(CScriptArray, InsertLast), asCALL_THISCALL); assert( r >= 0 );
+	// Same as removeLast
+	r = engine->RegisterObjectMethod("array<T>", "void pop_back()", asMETHOD(CScriptArray, RemoveLast), asCALL_THISCALL); assert( r >= 0 );
+	// Same as insertAt
+	r = engine->RegisterObjectMethod("array<T>", "void insert(uint index, const T&in value)", asMETHODPR(CScriptArray, InsertAt, (asUINT, void *), void), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("array<T>", "void insert(uint index, const array<T>& arr)", asMETHODPR(CScriptArray, InsertAt, (asUINT, const CScriptArray &), void), asCALL_THISCALL); assert(r >= 0);
+	// Same as removeAt
+	r = engine->RegisterObjectMethod("array<T>", "void erase(uint)", asMETHOD(CScriptArray, RemoveAt), asCALL_THISCALL); assert( r >= 0 );
+#endif
+}
+
+CScriptArray &CScriptArray::operator=(const CScriptArray &other)
+{
+	// Only perform the copy if the array types are the same
+	if( &other != this &&
+		other.GetArrayObjectType() == GetArrayObjectType() )
+	{
+		// Make sure the arrays are of the same size
+		Resize(other.buffer->numElements);
+
+		// Copy the value of each element
+		CopyBuffer(buffer, other.buffer);
+	}
+
+	return *this;
+}
+
+CScriptArray::CScriptArray(asITypeInfo *ti, void *buf)
+{
+	// The object type should be the template instance of the array
+	assert( ti && string(ti->GetName()) == "array" );
+
+	refCount = 1;
+	gcFlag = false;
+	objType = ti;
+	objType->AddRef();
+	buffer = 0;
+
+	Precache();
+
+	asIScriptEngine *engine = ti->GetEngine();
+
+	// Determine element size
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+		elementSize = sizeof(asPWORD);
+	else
+		elementSize = engine->GetSizeOfPrimitiveType(subTypeId);
+
+	// Determine the initial size from the buffer
+	asUINT length = *(asUINT*)buf;
+
+	// Make sure the array size isn't too large for us to handle
+	if( !CheckMaxSize(length) )
+	{
+		// Don't continue with the initialization
+		return;
+	}
+
+	// Copy the values of the array elements from the buffer
+	if( (ti->GetSubTypeId() & asTYPEID_MASK_OBJECT) == 0 )
+	{
+		CreateBuffer(&buffer, length);
+
+		// Copy the values of the primitive type into the internal buffer
+		if( length > 0 )
+			memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
+	}
+	else if( ti->GetSubTypeId() & asTYPEID_OBJHANDLE )
+	{
+		CreateBuffer(&buffer, length);
+
+		// Copy the handles into the internal buffer
+		if( length > 0 )
+			memcpy(At(0), (((asUINT*)buf)+1), length * elementSize);
+
+		// With object handles it is safe to clear the memory in the received buffer
+		// instead of increasing the ref count. It will save time both by avoiding the
+		// call the increase ref, and also relieve the engine from having to release
+		// its references too
+		memset((((asUINT*)buf)+1), 0, length * elementSize);
+	}
+	else if( ti->GetSubType()->GetFlags() & asOBJ_REF )
+	{
+		// Only allocate the buffer, but not the objects
+		subTypeId |= asTYPEID_OBJHANDLE;
+		CreateBuffer(&buffer, length);
+		subTypeId &= ~asTYPEID_OBJHANDLE;
+
+		// Copy the handles into the internal buffer
+		if( length > 0 )
+			memcpy(buffer->data, (((asUINT*)buf)+1), length * elementSize);
+
+		// For ref types we can do the same as for handles, as they are
+		// implicitly stored as handles.
+		memset((((asUINT*)buf)+1), 0, length * elementSize);
+	}
+	else
+	{
+		// TODO: Optimize by calling the copy constructor of the object instead of
+		//       constructing with the default constructor and then assigning the value
+		// TODO: With C++11 ideally we should be calling the move constructor, instead
+		//       of the copy constructor as the engine will just discard the objects in the
+		//       buffer afterwards.
+		CreateBuffer(&buffer, length);
+
+		// For value types we need to call the opAssign for each individual object
+		for( asUINT n = 0; n < length; n++ )
+		{
+			void *obj = At(n);
+			asBYTE *srcObj = (asBYTE*)buf;
+			srcObj += 4 + n*ti->GetSubType()->GetSize();
+			engine->AssignScriptObject(obj, srcObj, ti->GetSubType());
+		}
+	}
+
+	// Notify the GC of the successful creation
+	if( objType->GetFlags() & asOBJ_GC )
+		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
+}
+
+CScriptArray::CScriptArray(asUINT length, asITypeInfo *ti)
+{
+	// The object type should be the template instance of the array
+	assert( ti && string(ti->GetName()) == "array" );
+
+	refCount = 1;
+	gcFlag = false;
+	objType = ti;
+	objType->AddRef();
+	buffer = 0;
+
+	Precache();
+
+	// Determine element size
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+		elementSize = sizeof(asPWORD);
+	else
+		elementSize = objType->GetEngine()->GetSizeOfPrimitiveType(subTypeId);
+
+	// Make sure the array size isn't too large for us to handle
+	if( !CheckMaxSize(length) )
+	{
+		// Don't continue with the initialization
+		return;
+	}
+
+	CreateBuffer(&buffer, length);
+
+	// Notify the GC of the successful creation
+	if( objType->GetFlags() & asOBJ_GC )
+		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
+}
+
+CScriptArray::CScriptArray(const CScriptArray &other)
+{
+	refCount = 1;
+	gcFlag = false;
+	objType = other.objType;
+	objType->AddRef();
+	buffer = 0;
+
+	Precache();
+
+	elementSize = other.elementSize;
+
+	if( objType->GetFlags() & asOBJ_GC )
+		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
+
+	CreateBuffer(&buffer, 0);
+
+	// Copy the content
+	*this = other;
+}
+
+CScriptArray::CScriptArray(asUINT length, void *defVal, asITypeInfo *ti)
+{
+	// The object type should be the template instance of the array
+	assert( ti && string(ti->GetName()) == "array" );
+
+	refCount = 1;
+	gcFlag = false;
+	objType = ti;
+	objType->AddRef();
+	buffer = 0;
+
+	Precache();
+
+	// Determine element size
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+		elementSize = sizeof(asPWORD);
+	else
+		elementSize = objType->GetEngine()->GetSizeOfPrimitiveType(subTypeId);
+
+	// Make sure the array size isn't too large for us to handle
+	if( !CheckMaxSize(length) )
+	{
+		// Don't continue with the initialization
+		return;
+	}
+
+	CreateBuffer(&buffer, length);
+
+	// Notify the GC of the successful creation
+	if( objType->GetFlags() & asOBJ_GC )
+		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
+
+	// Initialize the elements with the default value
+	for( asUINT n = 0; n < GetSize(); n++ )
+		SetValue(n, defVal);
+}
+
+void CScriptArray::SetValue(asUINT index, void *value)
+{
+	// At() will take care of the out-of-bounds checking, though
+	// if called from the application then nothing will be done
+	void *ptr = At(index);
+	if( ptr == 0 ) return;
+
+	if ((subTypeId & ~asTYPEID_MASK_SEQNBR) && !(subTypeId & asTYPEID_OBJHANDLE))
+	{
+		asITypeInfo *subType = objType->GetSubType();
+		if (subType->GetFlags() & asOBJ_ASHANDLE)
+		{
+			// For objects that should work as handles we must use the opHndlAssign method
+			// TODO: Must support alternative syntaxes as well
+			// TODO: Move the lookup of the opHndlAssign method to Precache() so it is only done once
+			string decl = string(subType->GetName()) + "& opHndlAssign(const " + string(subType->GetName()) + "&in)";
+			asIScriptFunction* func = subType->GetMethodByDecl(decl.c_str());
+			if (func)
+			{
+				// TODO: Reuse active context if existing
+				asIScriptEngine* engine = objType->GetEngine();
+				asIScriptContext* ctx = engine->RequestContext();
+				ctx->Prepare(func);
+				ctx->SetObject(ptr);
+				ctx->SetArgAddress(0, value);
+				// TODO: Handle errors
+				ctx->Execute();
+				engine->ReturnContext(ctx);
+			}
+			else
+			{
+				// opHndlAssign doesn't exist, so try ordinary value assign instead
+				objType->GetEngine()->AssignScriptObject(ptr, value, subType);
+			}
+		}
+		else
+			objType->GetEngine()->AssignScriptObject(ptr, value, subType);
+	}
+	else if( subTypeId & asTYPEID_OBJHANDLE )
+	{
+		void *tmp = *(void**)ptr;
+		*(void**)ptr = *(void**)value;
+		objType->GetEngine()->AddRefScriptObject(*(void**)value, objType->GetSubType());
+		if( tmp )
+			objType->GetEngine()->ReleaseScriptObject(tmp, objType->GetSubType());
+	}
+	else if( subTypeId == asTYPEID_BOOL ||
+			 subTypeId == asTYPEID_INT8 ||
+			 subTypeId == asTYPEID_UINT8 )
+		*(char*)ptr = *(char*)value;
+	else if( subTypeId == asTYPEID_INT16 ||
+			 subTypeId == asTYPEID_UINT16 )
+		*(short*)ptr = *(short*)value;
+	else if( subTypeId == asTYPEID_INT32 ||
+			 subTypeId == asTYPEID_UINT32 ||
+			 subTypeId == asTYPEID_FLOAT ||
+			 subTypeId > asTYPEID_DOUBLE ) // enums have a type id larger than doubles
+		*(int*)ptr = *(int*)value;
+	else if( subTypeId == asTYPEID_INT64 ||
+			 subTypeId == asTYPEID_UINT64 ||
+			 subTypeId == asTYPEID_DOUBLE )
+		*(double*)ptr = *(double*)value;
+}
+
+CScriptArray::~CScriptArray()
+{
+	if( buffer )
+	{
+		DeleteBuffer(buffer);
+		buffer = 0;
+	}
+	if( objType ) objType->Release();
+}
+
+asUINT CScriptArray::GetSize() const
+{
+	return buffer->numElements;
+}
+
+bool CScriptArray::IsEmpty() const
+{
+	return buffer->numElements == 0;
+}
+
+void CScriptArray::Reserve(asUINT maxElements)
+{
+	if( maxElements <= buffer->maxElements )
+		return;
+
+	if( !CheckMaxSize(maxElements) )
+		return;
+
+	// Allocate memory for the buffer
+	SArrayBuffer *newBuffer = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1 + elementSize*maxElements));
+	if( newBuffer )
+	{
+		newBuffer->numElements = buffer->numElements;
+		newBuffer->maxElements = maxElements;
+	}
+	else
+	{
+		// Out of memory
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+		return;
+	}
+
+	// As objects in arrays of objects are not stored inline, it is safe to use memcpy here
+	// since we're just copying the pointers to objects and not the actual objects.
+	memcpy(newBuffer->data, buffer->data, buffer->numElements*elementSize);
+
+	// Release the old buffer
+	userFree(buffer);
+
+	buffer = newBuffer;
+}
+
+void CScriptArray::Resize(asUINT numElements)
+{
+	if( !CheckMaxSize(numElements) )
+		return;
+
+	Resize((int)numElements - (int)buffer->numElements, (asUINT)-1);
+}
+
+void CScriptArray::RemoveRange(asUINT start, asUINT count)
+{
+	if (count == 0)
+		return;
+
+	if( buffer == 0 || start > buffer->numElements )
+	{
+		// If this is called from a script we raise a script exception
+		asIScriptContext *ctx = asGetActiveContext();
+		if (ctx)
+			ctx->SetException("Index out of bounds");
+		return;
+	}
+
+	// Cap count to the end of the array
+	if (start + count > buffer->numElements)
+		count = buffer->numElements - start;
+
+	// Destroy the elements that are being removed
+	Destruct(buffer, start, start + count);
+
+	// Compact the elements
+	// As objects in arrays of objects are not stored inline, it is safe to use memmove here
+	// since we're just copying the pointers to objects and not the actual objects.
+	memmove(buffer->data + start*elementSize, buffer->data + (start + count)*elementSize, (buffer->numElements - start - count)*elementSize);
+	buffer->numElements -= count;
+}
+
+// Internal
+void CScriptArray::Resize(int delta, asUINT at)
+{
+	if( delta < 0 )
+	{
+		if( -delta > (int)buffer->numElements )
+			delta = -(int)buffer->numElements;
+		if( at > buffer->numElements + delta )
+			at = buffer->numElements + delta;
+	}
+	else if( delta > 0 )
+	{
+		// Make sure the array size isn't too large for us to handle
+		if( delta > 0 && !CheckMaxSize(buffer->numElements + delta) )
+			return;
+
+		if( at > buffer->numElements )
+			at = buffer->numElements;
+	}
+
+	if( delta == 0 ) return;
+
+	if( buffer->maxElements < buffer->numElements + delta )
+	{
+		// Allocate memory for the buffer
+		SArrayBuffer *newBuffer = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1 + elementSize*(buffer->numElements + delta)));
+		if( newBuffer )
+		{
+			newBuffer->numElements = buffer->numElements + delta;
+			newBuffer->maxElements = newBuffer->numElements;
+		}
+		else
+		{
+			// Out of memory
+			asIScriptContext *ctx = asGetActiveContext();
+			if( ctx )
+				ctx->SetException("Out of memory");
+			return;
+		}
+
+		// As objects in arrays of objects are not stored inline, it is safe to use memcpy here
+		// since we're just copying the pointers to objects and not the actual objects.
+		memcpy(newBuffer->data, buffer->data, at*elementSize);
+		if( at < buffer->numElements )
+			memcpy(newBuffer->data + (at+delta)*elementSize, buffer->data + at*elementSize, (buffer->numElements-at)*elementSize);
+
+		// Initialize the new elements with default values
+		Construct(newBuffer, at, at+delta);
+
+		// Release the old buffer
+		userFree(buffer);
+
+		buffer = newBuffer;
+	}
+	else if( delta < 0 )
+	{
+		Destruct(buffer, at, at-delta);
+		// As objects in arrays of objects are not stored inline, it is safe to use memmove here
+		// since we're just copying the pointers to objects and not the actual objects.
+		memmove(buffer->data + at*elementSize, buffer->data + (at-delta)*elementSize, (buffer->numElements - (at-delta))*elementSize);
+		buffer->numElements += delta;
+	}
+	else
+	{
+		// As objects in arrays of objects are not stored inline, it is safe to use memmove here
+		// since we're just copying the pointers to objects and not the actual objects.
+		memmove(buffer->data + (at+delta)*elementSize, buffer->data + at*elementSize, (buffer->numElements - at)*elementSize);
+		Construct(buffer, at, at+delta);
+		buffer->numElements += delta;
+	}
+}
+
+// internal
+bool CScriptArray::CheckMaxSize(asUINT numElements)
+{
+	// This code makes sure the size of the buffer that is allocated
+	// for the array doesn't overflow and becomes smaller than requested
+
+	asUINT maxSize = 0xFFFFFFFFul - sizeof(SArrayBuffer) + 1;
+	if( elementSize > 0 )
+		maxSize /= elementSize;
+
+	if( numElements > maxSize )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Too large array size");
+
+		return false;
+	}
+
+	// OK
+	return true;
+}
+
+asITypeInfo *CScriptArray::GetArrayObjectType() const
+{
+	return objType;
+}
+
+int CScriptArray::GetArrayTypeId() const
+{
+	return objType->GetTypeId();
+}
+
+int CScriptArray::GetElementTypeId() const
+{
+	return subTypeId;
+}
+
+void CScriptArray::InsertAt(asUINT index, void *value)
+{
+	if( index > buffer->numElements )
+	{
+		// If this is called from a script we raise a script exception
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Index out of bounds");
+		return;
+	}
+
+	// Make room for the new element
+	Resize(1, index);
+
+	// Set the value of the new element
+	SetValue(index, value);
+}
+
+void CScriptArray::InsertAt(asUINT index, const CScriptArray &arr)
+{
+	if (index > buffer->numElements)
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if (ctx)
+			ctx->SetException("Index out of bounds");
+		return;
+	}
+
+	if (objType != arr.objType)
+	{
+		// This shouldn't really be possible to happen when
+		// called from a script, but let's check for it anyway
+		asIScriptContext *ctx = asGetActiveContext();
+		if (ctx)
+			ctx->SetException("Mismatching array types");
+		return;
+	}
+
+	asUINT elements = arr.GetSize();
+	Resize(elements, index);
+	if (&arr != this)
+	{
+		for (asUINT n = 0; n < arr.GetSize(); n++)
+		{
+			// This const cast is allowed, since we know the
+			// value will only be used to make a copy of it
+			void *value = const_cast<void*>(arr.At(n));
+			SetValue(index + n, value);
+		}
+	}
+	else
+	{
+		// The array that is being inserted is the same as this one.
+		// So we should iterate over the elements before the index,
+		// and then the elements after
+		for (asUINT n = 0; n < index; n++)
+		{
+			// This const cast is allowed, since we know the
+			// value will only be used to make a copy of it
+			void *value = const_cast<void*>(arr.At(n));
+			SetValue(index + n, value);
+		}
+
+		for (asUINT n = index + elements, m = 0; n < arr.GetSize(); n++, m++)
+		{
+			// This const cast is allowed, since we know the
+			// value will only be used to make a copy of it
+			void *value = const_cast<void*>(arr.At(n));
+			SetValue(index + index + m, value);
+		}
+	}
+}
+
+void CScriptArray::InsertLast(void *value)
+{
+	InsertAt(buffer->numElements, value);
+}
+
+void CScriptArray::RemoveAt(asUINT index)
+{
+	if( index >= buffer->numElements )
+	{
+		// If this is called from a script we raise a script exception
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Index out of bounds");
+		return;
+	}
+
+	// Remove the element
+	Resize(-1, index);
+}
+
+void CScriptArray::RemoveLast()
+{
+	RemoveAt(buffer->numElements-1);
+}
+
+// Return a pointer to the array element. Returns 0 if the index is out of bounds
+const void *CScriptArray::At(asUINT index) const
+{
+	if( buffer == 0 || index >= buffer->numElements )
+	{
+		// If this is called from a script we raise a script exception
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Index out of bounds");
+		return 0;
+	}
+
+	if( (subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
+		return *(void**)(buffer->data + elementSize*index);
+	else
+		return buffer->data + elementSize*index;
+}
+void *CScriptArray::At(asUINT index)
+{
+	return const_cast<void*>(const_cast<const CScriptArray *>(this)->At(index));
+}
+
+void *CScriptArray::GetBuffer()
+{
+	return buffer->data;
+}
+
+
+// internal
+void CScriptArray::CreateBuffer(SArrayBuffer **buf, asUINT numElements)
+{
+	*buf = reinterpret_cast<SArrayBuffer*>(userAlloc(sizeof(SArrayBuffer)-1+elementSize*numElements));
+
+	if( *buf )
+	{
+		(*buf)->numElements = numElements;
+		(*buf)->maxElements = numElements;
+		Construct(*buf, 0, numElements);
+	}
+	else
+	{
+		// Oops, out of memory
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+	}
+}
+
+// internal
+void CScriptArray::DeleteBuffer(SArrayBuffer *buf)
+{
+	Destruct(buf, 0, buf->numElements);
+
+	// Free the buffer
+	userFree(buf);
+}
+
+// internal
+void CScriptArray::Construct(SArrayBuffer *buf, asUINT start, asUINT end)
+{
+	if( (subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
+	{
+		// Create an object using the default constructor/factory for each element
+		void **max = (void**)(buf->data + end * sizeof(void*));
+		void **d = (void**)(buf->data + start * sizeof(void*));
+
+		asIScriptEngine *engine = objType->GetEngine();
+		asITypeInfo *subType = objType->GetSubType();
+
+		for( ; d < max; d++ )
+		{
+			*d = (void*)engine->CreateScriptObject(subType);
+			if( *d == 0 )
+			{
+				// Set the remaining entries to null so the destructor
+				// won't attempt to destroy invalid objects later
+				memset(d, 0, sizeof(void*)*(max-d));
+
+				// There is no need to set an exception on the context,
+				// as CreateScriptObject has already done that
+				return;
+			}
+		}
+	}
+	else
+	{
+		// Set all elements to zero whether they are handles or primitives
+		void *d = (void*)(buf->data + start * elementSize);
+		memset(d, 0, (end-start)*elementSize);
+	}
+}
+
+// internal
+void CScriptArray::Destruct(SArrayBuffer *buf, asUINT start, asUINT end)
+{
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+	{
+		asIScriptEngine *engine = objType->GetEngine();
+
+		void **max = (void**)(buf->data + end * sizeof(void*));
+		void **d   = (void**)(buf->data + start * sizeof(void*));
+
+		for( ; d < max; d++ )
+		{
+			if( *d )
+				engine->ReleaseScriptObject(*d, objType->GetSubType());
+		}
+	}
+}
+
+
+// internal
+bool CScriptArray::Less(const void *a, const void *b, bool asc)
+{
+	if( !asc )
+	{
+		// Swap items
+		const void *TEMP = a;
+		a = b;
+		b = TEMP;
+	}
+
+	if( !(subTypeId & ~asTYPEID_MASK_SEQNBR) )
+	{
+		// Simple compare of values
+		switch( subTypeId )
+		{
+			#define COMPARE(T) *((T*)a) < *((T*)b)
+			case asTYPEID_BOOL:   return COMPARE(bool);
+			case asTYPEID_INT8:   return COMPARE(asINT8);
+			case asTYPEID_INT16:  return COMPARE(asINT16);
+			case asTYPEID_INT32:  return COMPARE(asINT32);
+			case asTYPEID_INT64:  return COMPARE(asINT64);
+			case asTYPEID_UINT8:  return COMPARE(asBYTE);
+			case asTYPEID_UINT16: return COMPARE(asWORD);
+			case asTYPEID_UINT32: return COMPARE(asDWORD);
+			case asTYPEID_UINT64: return COMPARE(asQWORD);
+			case asTYPEID_FLOAT:  return COMPARE(float);
+			case asTYPEID_DOUBLE: return COMPARE(double);
+			default: return COMPARE(signed int); // All enums fall in this case
+			#undef COMPARE
+		}
+	}
+
+	return false;
+}
+
+void CScriptArray::Reverse()
+{
+	asUINT size = GetSize();
+
+	if( size >= 2 )
+	{
+		asBYTE TEMP[16];
+
+		for( asUINT i = 0; i < size / 2; i++ )
+		{
+			Copy(TEMP, GetArrayItemPointer(i));
+			Copy(GetArrayItemPointer(i), GetArrayItemPointer(size - i - 1));
+			Copy(GetArrayItemPointer(size - i - 1), TEMP);
+		}
+	}
+}
+
+bool CScriptArray::operator==(const CScriptArray &other) const
+{
+	if( objType != other.objType )
+		return false;
+
+	if( GetSize() != other.GetSize() )
+		return false;
+
+	asIScriptContext *cmpContext = 0;
+	bool isNested = false;
+
+	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
+	{
+		// Try to reuse the active context
+		cmpContext = asGetActiveContext();
+		if( cmpContext )
+		{
+			if( cmpContext->GetEngine() == objType->GetEngine() && cmpContext->PushState() >= 0 )
+				isNested = true;
+			else
+				cmpContext = 0;
+		}
+		if( cmpContext == 0 )
+		{
+			// TODO: Ideally this context would be retrieved from a pool, so we don't have to
+			//       create a new one everytime. We could keep a context with the array object
+			//       but that would consume a lot of resources as each context is quite heavy.
+			cmpContext = objType->GetEngine()->CreateContext();
+		}
+	}
+
+	// Check if all elements are equal
+	bool isEqual = true;
+	SArrayCache *cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
+	for( asUINT n = 0; n < GetSize(); n++ )
+		if( !Equals(At(n), other.At(n), cmpContext, cache) )
+		{
+			isEqual = false;
+			break;
+		}
+
+	if( cmpContext )
+	{
+		if( isNested )
+		{
+			asEContextState state = cmpContext->GetState();
+			cmpContext->PopState();
+			if( state == asEXECUTION_ABORTED )
+				cmpContext->Abort();
+		}
+		else
+			cmpContext->Release();
+	}
+
+	return isEqual;
+}
+
+// internal
+bool CScriptArray::Equals(const void *a, const void *b, asIScriptContext *ctx, SArrayCache *cache) const
+{
+	if( !(subTypeId & ~asTYPEID_MASK_SEQNBR) )
+	{
+		// Simple compare of values
+		switch( subTypeId )
+		{
+			#define COMPARE(T) *((T*)a) == *((T*)b)
+			case asTYPEID_BOOL:   return COMPARE(bool);
+			case asTYPEID_INT8:   return COMPARE(asINT8);
+			case asTYPEID_INT16:  return COMPARE(asINT16);
+			case asTYPEID_INT32:  return COMPARE(asINT32);
+			case asTYPEID_INT64:  return COMPARE(asINT64);
+			case asTYPEID_UINT8:  return COMPARE(asBYTE);
+			case asTYPEID_UINT16: return COMPARE(asWORD);
+			case asTYPEID_UINT32: return COMPARE(asDWORD);
+			case asTYPEID_UINT64: return COMPARE(asQWORD);
+			case asTYPEID_FLOAT:  return COMPARE(float);
+			case asTYPEID_DOUBLE: return COMPARE(double);
+			default: return COMPARE(signed int); // All enums fall here. TODO: update this when enums can have different sizes and types
+			#undef COMPARE
+		}
+	}
+	else
+	{
+		int r = 0;
+
+		if( subTypeId & asTYPEID_OBJHANDLE )
+		{
+			// Allow the find to work even if the array contains null handles
+			if( *(void**)a == *(void**)b ) return true;
+		}
+
+		// Execute object opEquals if available
+		if( cache && cache->eqFunc )
+		{
+			// TODO: Add proper error handling
+			r = ctx->Prepare(cache->eqFunc); assert(r >= 0);
+
+			if( subTypeId & asTYPEID_OBJHANDLE )
+			{
+				r = ctx->SetObject(*((void**)a)); assert(r >= 0);
+				r = ctx->SetArgObject(0, *((void**)b)); assert(r >= 0);
+			}
+			else
+			{
+				r = ctx->SetObject((void*)a); assert(r >= 0);
+				r = ctx->SetArgObject(0, (void*)b); assert(r >= 0);
+			}
+
+			r = ctx->Execute();
+
+			if( r == asEXECUTION_FINISHED )
+				return ctx->GetReturnByte() != 0;
+
+			return false;
+		}
+
+		// Execute object opCmp if available
+		if( cache && cache->cmpFunc )
+		{
+			// TODO: Add proper error handling
+			r = ctx->Prepare(cache->cmpFunc); assert(r >= 0);
+
+			if( subTypeId & asTYPEID_OBJHANDLE )
+			{
+				r = ctx->SetObject(*((void**)a)); assert(r >= 0);
+				r = ctx->SetArgObject(0, *((void**)b)); assert(r >= 0);
+			}
+			else
+			{
+				r = ctx->SetObject((void*)a); assert(r >= 0);
+				r = ctx->SetArgObject(0, (void*)b); assert(r >= 0);
+			}
+
+			r = ctx->Execute();
+
+			if( r == asEXECUTION_FINISHED )
+				return (int)ctx->GetReturnDWord() == 0;
+
+			return false;
+		}
+	}
+
+	return false;
+}
+
+int CScriptArray::FindByRef(void *ref) const
+{
+	return FindByRef(0, ref);
+}
+
+int CScriptArray::FindByRef(asUINT startAt, void *ref) const
+{
+	// Find the matching element by its reference
+	asUINT size = GetSize();
+	if( subTypeId & asTYPEID_OBJHANDLE )
+	{
+		// Dereference the pointer
+		ref = *(void**)ref;
+		for( asUINT i = startAt; i < size; i++ )
+		{
+			if( *(void**)At(i) == ref )
+				return i;
+		}
+	}
+	else
+	{
+		// Compare the reference directly
+		for( asUINT i = startAt; i < size; i++ )
+		{
+			if( At(i) == ref )
+				return i;
+		}
+	}
+
+	return -1;
+}
+
+int CScriptArray::Find(void *value) const
+{
+	return Find(0, value);
+}
+
+int CScriptArray::Find(asUINT startAt, void *value) const
+{
+	// Check if the subtype really supports find()
+	// TODO: Can't this be done at compile time too by the template callback
+	SArrayCache *cache = 0;
+	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
+	{
+		cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
+		if( !cache || (cache->cmpFunc == 0 && cache->eqFunc == 0) )
+		{
+			asIScriptContext *ctx = asGetActiveContext();
+			asITypeInfo* subType = objType->GetEngine()->GetTypeInfoById(subTypeId);
+
+			// Throw an exception
+			if( ctx )
+			{
+				char tmp[512];
+
+				if( cache && cache->eqFuncReturnCode == asMULTIPLE_FUNCTIONS )
+#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
+					sprintf_s(tmp, 512, "Type '%s' has multiple matching opEquals or opCmp methods", subType->GetName());
+#else
+					sprintf(tmp, "Type '%s' has multiple matching opEquals or opCmp methods", subType->GetName());
+#endif
+				else
+#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
+					sprintf_s(tmp, 512, "Type '%s' does not have a matching opEquals or opCmp method", subType->GetName());
+#else
+					sprintf(tmp, "Type '%s' does not have a matching opEquals or opCmp method", subType->GetName());
+#endif
+				ctx->SetException(tmp);
+			}
+
+			return -1;
+		}
+	}
+
+	asIScriptContext *cmpContext = 0;
+	bool isNested = false;
+
+	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
+	{
+		// Try to reuse the active context
+		cmpContext = asGetActiveContext();
+		if( cmpContext )
+		{
+			if( cmpContext->GetEngine() == objType->GetEngine() && cmpContext->PushState() >= 0 )
+				isNested = true;
+			else
+				cmpContext = 0;
+		}
+		if( cmpContext == 0 )
+		{
+			// TODO: Ideally this context would be retrieved from a pool, so we don't have to
+			//       create a new one everytime. We could keep a context with the array object
+			//       but that would consume a lot of resources as each context is quite heavy.
+			cmpContext = objType->GetEngine()->CreateContext();
+		}
+	}
+
+	// Find the matching element
+	int ret = -1;
+	asUINT size = GetSize();
+
+	for( asUINT i = startAt; i < size; i++ )
+	{
+		// value passed by reference
+		if( Equals(At(i), value, cmpContext, cache) )
+		{
+			ret = (int)i;
+			break;
+		}
+	}
+
+	if( cmpContext )
+	{
+		if( isNested )
+		{
+			asEContextState state = cmpContext->GetState();
+			cmpContext->PopState();
+			if( state == asEXECUTION_ABORTED )
+				cmpContext->Abort();
+		}
+		else
+			cmpContext->Release();
+	}
+
+	return ret;
+}
+
+
+
+// internal
+// Copy object handle or primitive value
+// Even in arrays of objects the objects are allocated on
+// the heap and the array stores the pointers to the objects
+void CScriptArray::Copy(void *dst, void *src)
+{
+	memcpy(dst, src, elementSize);
+}
+
+
+// internal
+// Swap two elements
+// Even in arrays of objects the objects are allocated on 
+// the heap and the array stores the pointers to the objects.
+void CScriptArray::Swap(void* a, void* b)
+{
+	asBYTE tmp[16];
+	Copy(tmp, a);
+	Copy(a, b);
+	Copy(b, tmp);
+}
+
+
+// internal
+// Return pointer to array item (object handle or primitive value)
+void *CScriptArray::GetArrayItemPointer(int index)
+{
+	return buffer->data + index * elementSize;
+}
+
+// internal
+// Return pointer to data in buffer (object or primitive)
+void *CScriptArray::GetDataPointer(void *buf)
+{
+	if ((subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
+	{
+		// Real address of object
+		return reinterpret_cast<void*>(*(size_t*)buf);
+	}
+	else
+	{
+		// Primitive is just a raw data
+		return buf;
+	}
+}
+
+
+// Sort ascending
+void CScriptArray::SortAsc()
+{
+	Sort(0, GetSize(), true);
+}
+
+// Sort ascending
+void CScriptArray::SortAsc(asUINT startAt, asUINT count)
+{
+	Sort(startAt, count, true);
+}
+
+// Sort descending
+void CScriptArray::SortDesc()
+{
+	Sort(0, GetSize(), false);
+}
+
+// Sort descending
+void CScriptArray::SortDesc(asUINT startAt, asUINT count)
+{
+	Sort(startAt, count, false);
+}
+
+
+// internal
+void CScriptArray::Sort(asUINT startAt, asUINT count, bool asc)
+{
+	// Subtype isn't primitive and doesn't have opCmp
+	SArrayCache *cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
+	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
+	{
+		if( !cache || cache->cmpFunc == 0 )
+		{
+			asIScriptContext *ctx = asGetActiveContext();
+			asITypeInfo* subType = objType->GetEngine()->GetTypeInfoById(subTypeId);
+
+			// Throw an exception
+			if( ctx )
+			{
+				char tmp[512];
+
+				if( cache && cache->cmpFuncReturnCode == asMULTIPLE_FUNCTIONS )
+#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
+					sprintf_s(tmp, 512, "Type '%s' has multiple matching opCmp methods", subType->GetName());
+#else
+					sprintf(tmp, "Type '%s' has multiple matching opCmp methods", subType->GetName());
+#endif
+				else
+#if defined(_MSC_VER) && _MSC_VER >= 1500 && !defined(__S3E__)
+					sprintf_s(tmp, 512, "Type '%s' does not have a matching opCmp method", subType->GetName());
+#else
+					sprintf(tmp, "Type '%s' does not have a matching opCmp method", subType->GetName());
+#endif
+
+				ctx->SetException(tmp);
+			}
+
+			return;
+		}
+	}
+
+	// No need to sort
+	if( count < 2 )
+	{
+		return;
+	}
+
+	int start = startAt;
+	int end = startAt + count;
+
+	// Check if we could access invalid item while sorting
+	if( start >= (int)buffer->numElements || end > (int)buffer->numElements )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+
+		// Throw an exception
+		if( ctx )
+		{
+			ctx->SetException("Index out of bounds");
+		}
+
+		return;
+	}
+
+	if( subTypeId & ~asTYPEID_MASK_SEQNBR )
+	{
+		asIScriptContext *cmpContext = 0;
+		bool isNested = false;
+
+		// Try to reuse the active context
+		cmpContext = asGetActiveContext();
+		if( cmpContext )
+		{
+			if( cmpContext->GetEngine() == objType->GetEngine() && cmpContext->PushState() >= 0 )
+				isNested = true;
+			else
+				cmpContext = 0;
+		}
+		if( cmpContext == 0 )
+			cmpContext = objType->GetEngine()->RequestContext();
+
+		// Do the sorting
+		struct {
+			bool               asc;
+			asIScriptContext  *cmpContext;
+			asIScriptFunction *cmpFunc;
+			bool operator()(void *a, void *b) const
+			{
+				if( !asc )
+				{
+					// Swap items
+					void *TEMP = a;
+					a = b;
+					b = TEMP;
+				}
+
+				int r = 0;
+
+				// Allow sort to work even if the array contains null handles
+				if( a == 0 ) return true;
+				if( b == 0 ) return false;
+
+				// Execute object opCmp
+				if( cmpFunc )
+				{
+					// TODO: Add proper error handling
+					r = cmpContext->Prepare(cmpFunc); assert(r >= 0);
+					r = cmpContext->SetObject(a); assert(r >= 0);
+					r = cmpContext->SetArgObject(0, b); assert(r >= 0);
+					r = cmpContext->Execute();
+
+					if( r == asEXECUTION_FINISHED )
+					{
+						return (int)cmpContext->GetReturnDWord() < 0;
+					}
+				}
+
+				return false;
+			}
+		} customLess = {asc, cmpContext, cache ? cache->cmpFunc : 0};
+		std::sort((void**)GetArrayItemPointer(start), (void**)GetArrayItemPointer(end), customLess);
+
+		// Clean up
+		if( cmpContext )
+		{
+			if( isNested )
+			{
+				asEContextState state = cmpContext->GetState();
+				cmpContext->PopState();
+				if( state == asEXECUTION_ABORTED )
+					cmpContext->Abort();
+			}
+			else
+				objType->GetEngine()->ReturnContext(cmpContext);
+		}
+	}
+	else
+	{
+		// TODO: Use std::sort for primitive types too
+
+		// Insertion sort
+		asBYTE tmp[16];
+		for( int i = start + 1; i < end; i++ )
+		{
+			Copy(tmp, GetArrayItemPointer(i));
+
+			int j = i - 1;
+
+			while( j >= start && Less(GetDataPointer(tmp), At(j), asc) )
+			{
+				Copy(GetArrayItemPointer(j + 1), GetArrayItemPointer(j));
+				j--;
+			}
+
+			Copy(GetArrayItemPointer(j + 1), tmp);
+		}
+	}
+}
+
+// Sort with script callback for comparing elements
+void CScriptArray::Sort(asIScriptFunction *func, asUINT startAt, asUINT count)
+{
+	// No need to sort
+	if (count < 2)
+		return;
+
+	// Check if we could access invalid item while sorting
+	asUINT start = startAt;
+	asUINT end = asQWORD(startAt) + asQWORD(count) >= (asQWORD(1)<<32) ? 0xFFFFFFFF : startAt + count;
+	if (end > buffer->numElements)
+		end = buffer->numElements;
+
+	if (start >= buffer->numElements)
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+
+		// Throw an exception
+		if (ctx)
+			ctx->SetException("Index out of bounds");
+
+		return;
+	}
+
+	asIScriptContext *cmpContext = 0;
+	bool isNested = false;
+
+	// Try to reuse the active context
+	cmpContext = asGetActiveContext();
+	if (cmpContext)
+	{
+		if (cmpContext->GetEngine() == objType->GetEngine() && cmpContext->PushState() >= 0)
+			isNested = true;
+		else
+			cmpContext = 0;
+	}
+	if (cmpContext == 0)
+		cmpContext = objType->GetEngine()->RequestContext();
+
+	// TODO: Security issue: If the array is accessed from the callback while the sort is going on the result may be unpredictable
+	//       For example, the callback resizes the array in the middle of the sort
+	//       Possible solution: set a lock flag on the array, and prohibit modifications while the lock flag is set
+
+	// Bubble sort
+	// TODO: optimize: Use an efficient sort algorithm
+	for (asUINT i = start; i+1 < end; i++)
+	{
+		asUINT best = i;
+		for (asUINT j = i + 1; j < end; j++)
+		{
+			cmpContext->Prepare(func);
+			cmpContext->SetArgAddress(0, At(j));
+			cmpContext->SetArgAddress(1, At(best));
+			int r = cmpContext->Execute();
+			if (r != asEXECUTION_FINISHED)
+				break;
+			if (*(bool*)(cmpContext->GetAddressOfReturnValue()))
+				best = j;
+		}
+
+		// With Swap we guarantee that the array always sees all references
+		// if the GC calls the EnumReferences in the middle of the sorting
+		if( best != i )
+			Swap(GetArrayItemPointer(i), GetArrayItemPointer(best));
+	}
+
+	if (cmpContext)
+	{
+		if (isNested)
+		{
+			asEContextState state = cmpContext->GetState();
+			cmpContext->PopState();
+			if (state == asEXECUTION_ABORTED)
+				cmpContext->Abort();
+		}
+		else
+			objType->GetEngine()->ReturnContext(cmpContext);
+	}
+}
+
+// internal
+void CScriptArray::CopyBuffer(SArrayBuffer *dst, SArrayBuffer *src)
+{
+	asIScriptEngine *engine = objType->GetEngine();
+	if( subTypeId & asTYPEID_OBJHANDLE )
+	{
+		// Copy the references and increase the reference counters
+		if( dst->numElements > 0 && src->numElements > 0 )
+		{
+			int count = dst->numElements > src->numElements ? src->numElements : dst->numElements;
+
+			void **max = (void**)(dst->data + count * sizeof(void*));
+			void **d   = (void**)dst->data;
+			void **s   = (void**)src->data;
+
+			for( ; d < max; d++, s++ )
+			{
+				void *tmp = *d;
+				*d = *s;
+				if( *d )
+					engine->AddRefScriptObject(*d, objType->GetSubType());
+				// Release the old ref after incrementing the new to avoid problem incase it is the same ref
+				if( tmp )
+					engine->ReleaseScriptObject(tmp, objType->GetSubType());
+			}
+		}
+	}
+	else
+	{
+		if( dst->numElements > 0 && src->numElements > 0 )
+		{
+			int count = dst->numElements > src->numElements ? src->numElements : dst->numElements;
+			if( subTypeId & asTYPEID_MASK_OBJECT )
+			{
+				// Call the assignment operator on all of the objects
+				void **max = (void**)(dst->data + count * sizeof(void*));
+				void **d   = (void**)dst->data;
+				void **s   = (void**)src->data;
+
+				asITypeInfo *subType = objType->GetSubType();
+				if (subType->GetFlags() & asOBJ_ASHANDLE)
+				{
+					// For objects that should work as handles we must use the opHndlAssign method
+					// TODO: Must support alternative syntaxes as well
+					// TODO: Move the lookup of the opHndlAssign method to Precache() so it is only done once
+					string decl = string(subType->GetName()) + "& opHndlAssign(const " + string(subType->GetName()) + "&in)";
+					asIScriptFunction *func = subType->GetMethodByDecl(decl.c_str());
+					if (func)
+					{
+						// TODO: Reuse active context if existing
+						asIScriptContext* ctx = engine->RequestContext();
+						for (; d < max; d++, s++)
+						{
+							ctx->Prepare(func);
+							ctx->SetObject(*d);
+							ctx->SetArgAddress(0, *s);
+							// TODO: Handle errors
+							ctx->Execute();
+						}
+						engine->ReturnContext(ctx);
+					}
+					else
+					{
+						// opHndlAssign doesn't exist, so try ordinary value assign instead
+						for (; d < max; d++, s++)
+							engine->AssignScriptObject(*d, *s, subType);
+					}
+				}
+				else
+					for( ; d < max; d++, s++ )
+						engine->AssignScriptObject(*d, *s, subType);
+			}
+			else
+			{
+				// Primitives are copied byte for byte
+				memcpy(dst->data, src->data, count*elementSize);
+			}
+		}
+	}
+}
+
+// internal
+// Precache some info
+void CScriptArray::Precache()
+{
+	subTypeId = objType->GetSubTypeId();
+
+	// Check if it is an array of objects. Only for these do we need to cache anything
+	// Type ids for primitives and enums only has the sequence number part
+	if( !(subTypeId & ~asTYPEID_MASK_SEQNBR) )
+		return;
+
+	// The opCmp and opEquals methods are cached because the searching for the
+	// methods is quite time consuming if a lot of array objects are created.
+
+	// First check if a cache already exists for this array type
+	SArrayCache *cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
+	if( cache ) return;
+
+	// We need to make sure the cache is created only once, even
+	// if multiple threads reach the same point at the same time
+	asAcquireExclusiveLock();
+
+	// Now that we got the lock, we need to check again to make sure the
+	// cache wasn't created while we were waiting for the lock
+	cache = reinterpret_cast<SArrayCache*>(objType->GetUserData(ARRAY_CACHE));
+	if( cache )
+	{
+		asReleaseExclusiveLock();
+		return;
+	}
+
+	// Create the cache
+	cache = reinterpret_cast<SArrayCache*>(userAlloc(sizeof(SArrayCache)));
+	if( !cache )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+		asReleaseExclusiveLock();
+		return;
+	}
+	memset(cache, 0, sizeof(SArrayCache));
+
+	// If the sub type is a handle to const, then the methods must be const too
+	bool mustBeConst = (subTypeId & asTYPEID_HANDLETOCONST) ? true : false;
+
+	asITypeInfo *subType = objType->GetEngine()->GetTypeInfoById(subTypeId);
+	if( subType )
+	{
+		for( asUINT i = 0; i < subType->GetMethodCount(); i++ )
+		{
+			asIScriptFunction *func = subType->GetMethodByIndex(i);
+
+			if( func->GetParamCount() == 1 && (!mustBeConst || func->IsReadOnly()) )
+			{
+				asDWORD flags = 0;
+				int returnTypeId = func->GetReturnTypeId(&flags);
+
+				// The method must not return a reference
+				if( flags != asTM_NONE )
+					continue;
+
+				// opCmp returns an int and opEquals returns a bool
+				bool isCmp = false, isEq = false;
+				if( returnTypeId == asTYPEID_INT32 && strcmp(func->GetName(), "opCmp") == 0 )
+					isCmp = true;
+				if( returnTypeId == asTYPEID_BOOL && strcmp(func->GetName(), "opEquals") == 0 )
+					isEq = true;
+
+				if( !isCmp && !isEq )
+					continue;
+
+				// The parameter must either be a reference to the subtype or a handle to the subtype
+				int paramTypeId;
+				func->GetParam(0, &paramTypeId, &flags);
+
+				if( (paramTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) != (subTypeId &  ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) )
+					continue;
+
+				if( (flags & asTM_INREF) )
+				{
+					if( (paramTypeId & asTYPEID_OBJHANDLE) || (mustBeConst && !(flags & asTM_CONST)) )
+						continue;
+				}
+				else if( paramTypeId & asTYPEID_OBJHANDLE )
+				{
+					if( mustBeConst && !(paramTypeId & asTYPEID_HANDLETOCONST) )
+						continue;
+				}
+				else
+					continue;
+
+				if( isCmp )
+				{
+					if( cache->cmpFunc || cache->cmpFuncReturnCode )
+					{
+						cache->cmpFunc = 0;
+						cache->cmpFuncReturnCode = asMULTIPLE_FUNCTIONS;
+					}
+					else
+						cache->cmpFunc = func;
+				}
+				else if( isEq )
+				{
+					if( cache->eqFunc || cache->eqFuncReturnCode )
+					{
+						cache->eqFunc = 0;
+						cache->eqFuncReturnCode = asMULTIPLE_FUNCTIONS;
+					}
+					else
+						cache->eqFunc = func;
+				}
+			}
+		}
+	}
+
+	if( cache->eqFunc == 0 && cache->eqFuncReturnCode == 0 )
+		cache->eqFuncReturnCode = asNO_FUNCTION;
+	if( cache->cmpFunc == 0 && cache->cmpFuncReturnCode == 0 )
+		cache->cmpFuncReturnCode = asNO_FUNCTION;
+
+	// Set the user data only at the end so others that retrieve it will know it is complete
+	objType->SetUserData(cache, ARRAY_CACHE);
+
+	asReleaseExclusiveLock();
+}
+
+// GC behaviour
+void CScriptArray::EnumReferences(asIScriptEngine *engine)
+{
+	// TODO: If garbage collection can be done from a separate thread, then this method must be
+	//       protected so that it doesn't get lost during the iteration if the array is modified
+
+	// If the array is holding handles, then we need to notify the GC of them
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+	{
+		void **d = (void**)buffer->data;
+
+		asITypeInfo *subType = engine->GetTypeInfoById(subTypeId);
+		if ((subType->GetFlags() & asOBJ_REF))
+		{
+			// For reference types we need to notify the GC of each instance
+			for (asUINT n = 0; n < buffer->numElements; n++)
+			{
+				if (d[n])
+					engine->GCEnumCallback(d[n]);
+			}
+		}
+		else if ((subType->GetFlags() & asOBJ_VALUE) && (subType->GetFlags() & asOBJ_GC))
+		{
+			// For value types we need to forward the enum callback
+			// to the object so it can decide what to do
+			for (asUINT n = 0; n < buffer->numElements; n++)
+			{
+				if (d[n])
+					engine->ForwardGCEnumReferences(d[n], subType);
+			}
+		}
+	}
+}
+
+// GC behaviour
+void CScriptArray::ReleaseAllHandles(asIScriptEngine *)
+{
+	// Resizing to zero will release everything
+	Resize(0);
+}
+
+void CScriptArray::AddRef() const
+{
+	// Clear the GC flag then increase the counter
+	gcFlag = false;
+	asAtomicInc(refCount);
+}
+
+void CScriptArray::Release() const
+{
+	// Clearing the GC flag then descrease the counter
+	gcFlag = false;
+	if( asAtomicDec(refCount) == 0 )
+	{
+		// When reaching 0 no more references to this instance
+		// exists and the object should be destroyed
+		this->~CScriptArray();
+		userFree(const_cast<CScriptArray*>(this));
+	}
+}
+
+// GC behaviour
+int CScriptArray::GetRefCount()
+{
+	return refCount;
+}
+
+// GC behaviour
+void CScriptArray::SetFlag()
+{
+	gcFlag = true;
+}
+
+// GC behaviour
+bool CScriptArray::GetFlag()
+{
+	return gcFlag;
+}
+
+//--------------------------------------------
+// Generic calling conventions
+
+static void ScriptArrayFactory_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
+
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti);
+}
+
+static void ScriptArrayFactory2_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
+	asUINT length = gen->GetArgDWord(1);
+
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti, length);
+}
+
+static void ScriptArrayListFactory_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
+	void *buf = gen->GetArgAddress(1);
+
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti, buf);
+}
+
+static void ScriptArrayFactoryDefVal_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
+	asUINT length = gen->GetArgDWord(1);
+	void *defVal = gen->GetArgAddress(2);
+
+	*reinterpret_cast<CScriptArray**>(gen->GetAddressOfReturnLocation()) = CScriptArray::Create(ti, length, defVal);
+}
+
+static void ScriptArrayTemplateCallback_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *(asITypeInfo**)gen->GetAddressOfArg(0);
+	bool *dontGarbageCollect = *(bool**)gen->GetAddressOfArg(1);
+	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = ScriptArrayTemplateCallback(ti, *dontGarbageCollect);
+}
+
+static void ScriptArrayAssignment_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *other = (CScriptArray*)gen->GetArgObject(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	*self = *other;
+	gen->SetReturnObject(self);
+}
+
+static void ScriptArrayEquals_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *other = (CScriptArray*)gen->GetArgObject(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	gen->SetReturnByte(self->operator==(*other));
+}
+
+static void ScriptArrayFind_Generic(asIScriptGeneric *gen)
+{
+	void *value = gen->GetArgAddress(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	gen->SetReturnDWord(self->Find(value));
+}
+
+static void ScriptArrayFind2_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	void *value = gen->GetArgAddress(1);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	gen->SetReturnDWord(self->Find(index, value));
+}
+
+static void ScriptArrayFindByRef_Generic(asIScriptGeneric *gen)
+{
+	void *value = gen->GetArgAddress(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	gen->SetReturnDWord(self->FindByRef(value));
+}
+
+static void ScriptArrayFindByRef2_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	void *value = gen->GetArgAddress(1);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	gen->SetReturnDWord(self->FindByRef(index, value));
+}
+
+static void ScriptArrayAt_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+
+	gen->SetReturnAddress(self->At(index));
+}
+
+static void ScriptArrayInsertAt_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	void *value = gen->GetArgAddress(1);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->InsertAt(index, value);
+}
+
+static void ScriptArrayInsertAtArray_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	CScriptArray *array = (CScriptArray*)gen->GetArgAddress(1);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->InsertAt(index, *array);
+}
+
+static void ScriptArrayRemoveAt_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->RemoveAt(index);
+}
+
+static void ScriptArrayRemoveRange_Generic(asIScriptGeneric *gen)
+{
+	asUINT start = gen->GetArgDWord(0);
+	asUINT count = gen->GetArgDWord(1);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->RemoveRange(start, count);
+}
+
+static void ScriptArrayInsertLast_Generic(asIScriptGeneric *gen)
+{
+	void *value = gen->GetArgAddress(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->InsertLast(value);
+}
+
+static void ScriptArrayRemoveLast_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->RemoveLast();
+}
+
+static void ScriptArrayLength_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+
+	gen->SetReturnDWord(self->GetSize());
+}
+
+static void ScriptArrayResize_Generic(asIScriptGeneric *gen)
+{
+	asUINT size = gen->GetArgDWord(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+
+	self->Resize(size);
+}
+
+static void ScriptArrayReserve_Generic(asIScriptGeneric *gen)
+{
+	asUINT size = gen->GetArgDWord(0);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->Reserve(size);
+}
+
+static void ScriptArraySortAsc_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->SortAsc();
+}
+
+static void ScriptArrayReverse_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->Reverse();
+}
+
+static void ScriptArrayIsEmpty_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = self->IsEmpty();
+}
+
+static void ScriptArraySortAsc2_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	asUINT count = gen->GetArgDWord(1);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->SortAsc(index, count);
+}
+
+static void ScriptArraySortDesc_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->SortDesc();
+}
+
+static void ScriptArraySortDesc2_Generic(asIScriptGeneric *gen)
+{
+	asUINT index = gen->GetArgDWord(0);
+	asUINT count = gen->GetArgDWord(1);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->SortDesc(index, count);
+}
+
+static void ScriptArraySortCallback_Generic(asIScriptGeneric *gen)
+{
+	asIScriptFunction *callback = (asIScriptFunction*)gen->GetArgAddress(0);
+	asUINT startAt = gen->GetArgDWord(1);
+	asUINT count = gen->GetArgDWord(2);
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->Sort(callback, startAt, count);
+}
+
+static void ScriptArrayAddRef_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->AddRef();
+}
+
+static void ScriptArrayRelease_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->Release();
+}
+
+static void ScriptArrayGetRefCount_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	*reinterpret_cast<int*>(gen->GetAddressOfReturnLocation()) = self->GetRefCount();
+}
+
+static void ScriptArraySetFlag_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	self->SetFlag();
+}
+
+static void ScriptArrayGetFlag_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = self->GetFlag();
+}
+
+static void ScriptArrayEnumReferences_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->EnumReferences(engine);
+}
+
+static void ScriptArrayReleaseAllHandles_Generic(asIScriptGeneric *gen)
+{
+	CScriptArray *self = (CScriptArray*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->ReleaseAllHandles(engine);
+}
+
+static void RegisterScriptArray_Generic(asIScriptEngine *engine)
+{
+	int r = 0;
+	UNUSED_VAR(r);
+
+	engine->SetTypeInfoUserDataCleanupCallback(CleanupTypeInfoArrayCache, ARRAY_CACHE);
+
+	r = engine->RegisterObjectType("array<class T>", 0, asOBJ_REF | asOBJ_GC | asOBJ_TEMPLATE); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptArrayTemplateCallback_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in)", asFUNCTION(ScriptArrayFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length) explicit", asFUNCTION(ScriptArrayFactory2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_FACTORY, "array<T>@ f(int&in, uint length, const T &in value)", asFUNCTION(ScriptArrayFactoryDefVal_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_LIST_FACTORY, "array<T>@ f(int&in, int&in) {repeat T}", asFUNCTION(ScriptArrayListFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptArrayAddRef_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptArrayRelease_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "T &opIndex(uint index)", asFUNCTION(ScriptArrayAt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "const T &opIndex(uint index) const", asFUNCTION(ScriptArrayAt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "array<T> &opAssign(const array<T>&in)", asFUNCTION(ScriptArrayAssignment_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const T&in value)", asFUNCTION(ScriptArrayInsertAt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void insertAt(uint index, const array<T>& arr)", asFUNCTION(ScriptArrayInsertAtArray_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("array<T>", "void insertLast(const T&in value)", asFUNCTION(ScriptArrayInsertLast_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("array<T>", "void removeAt(uint index)", asFUNCTION(ScriptArrayRemoveAt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void removeLast()", asFUNCTION(ScriptArrayRemoveLast_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void removeRange(uint start, uint count)", asFUNCTION(ScriptArrayRemoveRange_Generic), asCALL_GENERIC); assert(r >= 0);
+#if AS_USE_ACCESSORS != 1
+	r = engine->RegisterObjectMethod("array<T>", "uint length() const", asFUNCTION(ScriptArrayLength_Generic), asCALL_GENERIC); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectMethod("array<T>", "void reserve(uint length)", asFUNCTION(ScriptArrayReserve_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void resize(uint length)", asFUNCTION(ScriptArrayResize_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortAsc()", asFUNCTION(ScriptArraySortAsc_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortAsc(uint startAt, uint count)", asFUNCTION(ScriptArraySortAsc2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortDesc()", asFUNCTION(ScriptArraySortDesc_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void sortDesc(uint startAt, uint count)", asFUNCTION(ScriptArraySortDesc2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void reverse()", asFUNCTION(ScriptArrayReverse_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "int find(const T&in if_handle_then_const value) const", asFUNCTION(ScriptArrayFind_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "int find(uint startAt, const T&in if_handle_then_const value) const", asFUNCTION(ScriptArrayFind2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "int findByRef(const T&in if_handle_then_const value) const", asFUNCTION(ScriptArrayFindByRef_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "int findByRef(uint startAt, const T&in if_handle_then_const value) const", asFUNCTION(ScriptArrayFindByRef2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "bool opEquals(const array<T>&in) const", asFUNCTION(ScriptArrayEquals_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "bool isEmpty() const", asFUNCTION(ScriptArrayIsEmpty_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterFuncdef("bool array<T>::less(const T&in if_handle_then_const a, const T&in if_handle_then_const b)");
+	r = engine->RegisterObjectMethod("array<T>", "void sort(const less &in, uint startAt = 0, uint count = uint(-1))", asFUNCTION(ScriptArraySortCallback_Generic), asCALL_GENERIC); assert(r >= 0);
+#if AS_USE_STLNAMES != 1 && AS_USE_ACCESSORS == 1
+	r = engine->RegisterObjectMethod("array<T>", "uint get_length() const property", asFUNCTION(ScriptArrayLength_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("array<T>", "void set_length(uint) property", asFUNCTION(ScriptArrayResize_Generic), asCALL_GENERIC); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptArrayGetRefCount_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptArraySetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptArrayGetFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptArrayEnumReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("array<T>", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptArrayReleaseAllHandles_Generic), asCALL_GENERIC); assert( r >= 0 );
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/addons/scriptarray.h b/Sources/AngelScript/add_on/scriptarray/scriptarray.h
old mode 100755
new mode 100644
similarity index 90%
rename from Sources/AngelScript/addons/scriptarray.h
rename to Sources/AngelScript/add_on/scriptarray/scriptarray.h
index 19e0204f6..f48aa39de
--- a/Sources/AngelScript/addons/scriptarray.h
+++ b/Sources/AngelScript/add_on/scriptarray/scriptarray.h
@@ -1,138 +1,143 @@
-#ifndef SCRIPTARRAY_H
-#define SCRIPTARRAY_H
-
-#ifndef ANGELSCRIPT_H 
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-#include <atomic>
-
-// Sometimes it may be desired to use the same method names as used by C++ STL.
-// This may for example reduce time when converting code from script to C++ or
-// back.
-//
-//  0 = off
-//  1 = on
-
-#ifndef AS_USE_STLNAMES
-#define AS_USE_STLNAMES 0
-#endif
-
-BEGIN_AS_NAMESPACE
-
-struct SArrayBuffer;
-struct SArrayCache;
-
-class CScriptArray
-{
-public:
-	// Set the memory functions that should be used by all CScriptArrays
-	static void SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
-
-	// Factory functions
-	static CScriptArray *Create(asITypeInfo *ot);
-	static CScriptArray *Create(asITypeInfo *ot, asUINT length);
-	static CScriptArray *Create(asITypeInfo *ot, asUINT length, void *defaultValue);
-	static CScriptArray *Create(asITypeInfo *ot, void *listBuffer);
-
-	// Memory management
-	void AddRef() const;
-	void Release() const;
-
-	// Type information
-	asITypeInfo *GetArrayObjectType() const;
-	int          GetArrayTypeId() const;
-	int          GetElementTypeId() const;
-
-	// Get the current size
-	asUINT GetSize() const;
-
-	// Returns true if the array is empty
-	bool   IsEmpty() const;
-
-	// Pre-allocates memory for elements
-	void   Reserve(asUINT maxElements);
-
-	// Resize the array
-	void   Resize(asUINT numElements);
-
-	// Get a pointer to an element. Returns 0 if out of bounds
-	void       *At(asUINT index);
-	const void *At(asUINT index) const;
-
-	// Set value of an element. 
-	// The value arg should be a pointer to the value that will be copied to the element.
-	// Remember, if the array holds handles the value parameter should be the 
-	// address of the handle. The refCount of the object will also be incremented
-	void  SetValue(asUINT index, void *value);
-
-	// Copy the contents of one array to another (only if the types are the same)
-	CScriptArray &operator=(const CScriptArray&);
-
-	// Compare two arrays
-	bool operator==(const CScriptArray &) const;
-
-	// Array manipulation
-	void InsertAt(asUINT index, void *value);
-	void InsertAt(asUINT index, const CScriptArray &arr);
-	void InsertLast(void *value);
-	void RemoveAt(asUINT index);
-	void RemoveLast();
-	void RemoveRange(asUINT start, asUINT count);
-	void SortAsc();
-	void SortDesc();
-	void SortAsc(asUINT startAt, asUINT count);
-	void SortDesc(asUINT startAt, asUINT count);
-	void Sort(asUINT startAt, asUINT count, bool asc);
-	void Reverse();
-	int  Find(void *value) const;
-	int  Find(asUINT startAt, void *value) const;
-	int  FindByRef(void *ref) const;
-	int  FindByRef(asUINT startAt, void *ref) const;
-
-	// Return the address of internal buffer for direct manipulation of elements
-	void *GetBuffer();
-
-	// GC methods
-	int  GetRefCount();
-	void SetFlag();
-	bool GetFlag();
-	void EnumReferences(asIScriptEngine *engine);
-	void ReleaseAllHandles(asIScriptEngine *engine);
-
-protected:
-	mutable std::atomic<int> refCount;
-	mutable bool    gcFlag;
-	asITypeInfo    *objType;
-	SArrayBuffer   *buffer;
-	int             elementSize;
-	int             subTypeId;
-
-	// Constructors
-	CScriptArray(asITypeInfo *ot, void *initBuf); // Called from script when initialized with list
-	CScriptArray(asUINT length, asITypeInfo *ot);
-	CScriptArray(asUINT length, void *defVal, asITypeInfo *ot);
-	CScriptArray(const CScriptArray &other);
-	virtual ~CScriptArray();
-
-	bool  Less(const void *a, const void *b, bool asc, asIScriptContext *ctx, SArrayCache *cache);
-	void *GetArrayItemPointer(int index);
-	void *GetDataPointer(void *buffer);
-	void  Copy(void *dst, void *src);
-	void  Precache();
-	bool  CheckMaxSize(asUINT numElements);
-	void  Resize(int delta, asUINT at);
-	void  CreateBuffer(SArrayBuffer **buf, asUINT numElements);
-	void  DeleteBuffer(SArrayBuffer *buf);
-	void  CopyBuffer(SArrayBuffer *dst, SArrayBuffer *src);
-	void  Construct(SArrayBuffer *buf, asUINT start, asUINT end);
-	void  Destruct(SArrayBuffer *buf, asUINT start, asUINT end);
-	bool  Equals(const void *a, const void *b, asIScriptContext *ctx, SArrayCache *cache) const;
-};
-
-void RegisterScriptArray(asIScriptEngine *engine, bool defaultArray);
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTARRAY_H
+#define SCRIPTARRAY_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+// Sometimes it may be desired to use the same method names as used by C++ STL.
+// This may for example reduce time when converting code from script to C++ or
+// back.
+//
+//  0 = off
+//  1 = on
+#ifndef AS_USE_STLNAMES
+#define AS_USE_STLNAMES 0
+#endif
+
+// Some prefer to use property accessors to get/set the length of the array
+// This option registers the accessors instead of the method length()
+#ifndef AS_USE_ACCESSORS
+#define AS_USE_ACCESSORS 0
+#endif
+
+BEGIN_AS_NAMESPACE
+
+struct SArrayBuffer;
+struct SArrayCache;
+
+class CScriptArray
+{
+public:
+	// Set the memory functions that should be used by all CScriptArrays
+	static void SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
+
+	// Factory functions
+	static CScriptArray *Create(asITypeInfo *ot);
+	static CScriptArray *Create(asITypeInfo *ot, asUINT length);
+	static CScriptArray *Create(asITypeInfo *ot, asUINT length, void *defaultValue);
+	static CScriptArray *Create(asITypeInfo *ot, void *listBuffer);
+
+	// Memory management
+	void AddRef() const;
+	void Release() const;
+
+	// Type information
+	asITypeInfo *GetArrayObjectType() const;
+	int          GetArrayTypeId() const;
+	int          GetElementTypeId() const;
+
+	// Get the current size
+	asUINT GetSize() const;
+
+	// Returns true if the array is empty
+	bool   IsEmpty() const;
+
+	// Pre-allocates memory for elements
+	void   Reserve(asUINT maxElements);
+
+	// Resize the array
+	void   Resize(asUINT numElements);
+
+	// Get a pointer to an element. Returns 0 if out of bounds
+	void       *At(asUINT index);
+	const void *At(asUINT index) const;
+
+	// Set value of an element. 
+	// The value arg should be a pointer to the value that will be copied to the element.
+	// Remember, if the array holds handles the value parameter should be the 
+	// address of the handle. The refCount of the object will also be incremented
+	void  SetValue(asUINT index, void *value);
+
+	// Copy the contents of one array to another (only if the types are the same)
+	CScriptArray &operator=(const CScriptArray&);
+
+	// Compare two arrays
+	bool operator==(const CScriptArray &) const;
+
+	// Array manipulation
+	void InsertAt(asUINT index, void *value);
+	void InsertAt(asUINT index, const CScriptArray &arr);
+	void InsertLast(void *value);
+	void RemoveAt(asUINT index);
+	void RemoveLast();
+	void RemoveRange(asUINT start, asUINT count);
+	void SortAsc();
+	void SortDesc();
+	void SortAsc(asUINT startAt, asUINT count);
+	void SortDesc(asUINT startAt, asUINT count);
+	void Sort(asUINT startAt, asUINT count, bool asc);
+	void Sort(asIScriptFunction *less, asUINT startAt, asUINT count);
+	void Reverse();
+	int  Find(void *value) const;
+	int  Find(asUINT startAt, void *value) const;
+	int  FindByRef(void *ref) const;
+	int  FindByRef(asUINT startAt, void *ref) const;
+
+	// Return the address of internal buffer for direct manipulation of elements
+	void *GetBuffer();
+
+	// GC methods
+	int  GetRefCount();
+	void SetFlag();
+	bool GetFlag();
+	void EnumReferences(asIScriptEngine *engine);
+	void ReleaseAllHandles(asIScriptEngine *engine);
+
+protected:
+	mutable int     refCount;
+	mutable bool    gcFlag;
+	asITypeInfo    *objType;
+	SArrayBuffer   *buffer;
+	int             elementSize;
+	int             subTypeId;
+
+	// Constructors
+	CScriptArray(asITypeInfo *ot, void *initBuf); // Called from script when initialized with list
+	CScriptArray(asUINT length, asITypeInfo *ot);
+	CScriptArray(asUINT length, void *defVal, asITypeInfo *ot);
+	CScriptArray(const CScriptArray &other);
+	virtual ~CScriptArray();
+
+	bool  Less(const void *a, const void *b, bool asc);
+	void *GetArrayItemPointer(int index);
+	void *GetDataPointer(void *buffer);
+	void  Copy(void *dst, void *src);
+	void  Swap(void *a, void *b);
+	void  Precache();
+	bool  CheckMaxSize(asUINT numElements);
+	void  Resize(int delta, asUINT at);
+	void  CreateBuffer(SArrayBuffer **buf, asUINT numElements);
+	void  DeleteBuffer(SArrayBuffer *buf);
+	void  CopyBuffer(SArrayBuffer *dst, SArrayBuffer *src);
+	void  Construct(SArrayBuffer *buf, asUINT start, asUINT end);
+	void  Destruct(SArrayBuffer *buf, asUINT start, asUINT end);
+	bool  Equals(const void *a, const void *b, asIScriptContext *ctx, SArrayCache *cache) const;
+};
+
+void RegisterScriptArray(asIScriptEngine *engine, bool defaultArray);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scriptbuilder.cpp b/Sources/AngelScript/add_on/scriptbuilder/scriptbuilder.cpp
old mode 100755
new mode 100644
similarity index 67%
rename from Sources/AngelScript/addons/scriptbuilder.cpp
rename to Sources/AngelScript/add_on/scriptbuilder/scriptbuilder.cpp
index c883dbaaa..597046e73
--- a/Sources/AngelScript/addons/scriptbuilder.cpp
+++ b/Sources/AngelScript/add_on/scriptbuilder/scriptbuilder.cpp
@@ -1,1027 +1,1188 @@
-#include "scriptbuilder.h"
-#include <vector>
-#include <assert.h>
-using namespace std;
-
-#include <stdio.h>
-#if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(__S3E__)
-#include <direct.h>
-#endif
-#ifdef _WIN32_WCE
-#include <windows.h> // For GetModuleFileName()
-#endif
-
-#if defined(__S3E__) || defined(__APPLE__) || defined(__GNUC__)
-#include <unistd.h> // For getcwd()
-#endif
-
-BEGIN_AS_NAMESPACE
-
-// Helper functions
-static string GetCurrentDir();
-static string GetAbsolutePath(const string &path);
-
-
-CScriptBuilder::CScriptBuilder()
-{
-	engine = 0;
-	module = 0;
-
-	includeCallback = 0;
-	callbackParam   = 0;
-}
-
-void CScriptBuilder::SetIncludeCallback(INCLUDECALLBACK_t callback, void *userParam)
-{
-	includeCallback = callback;
-	callbackParam   = userParam;
-}
-
-int CScriptBuilder::StartNewModule(asIScriptEngine *inEngine, const char *moduleName)
-{
-	if(inEngine == 0 ) return -1;
-
-	engine = inEngine;
-	module = inEngine->GetModule(moduleName, asGM_ALWAYS_CREATE);
-	if( module == 0 )
-		return -1;
-
-	ClearAll();
-
-	return 0;
-}
-
-asIScriptModule *CScriptBuilder::GetModule()
-{
-	return module;
-}
-
-unsigned int CScriptBuilder::GetSectionCount() const
-{
-	return (unsigned int)(includedScripts.size());
-}
-
-string CScriptBuilder::GetSectionName(unsigned int idx) const
-{
-	if( idx >= includedScripts.size() ) return "";
-
-#ifdef _WIN32
-	set<string, ci_less>::const_iterator it = includedScripts.begin();
-#else
-	set<string>::const_iterator it = includedScripts.begin();
-#endif
-	while( idx-- > 0 ) it++;
-	return *it;
-}
-
-// Returns 1 if the section was included
-// Returns 0 if the section was not included because it had already been included before
-// Returns <0 if there was an error
-int CScriptBuilder::AddSectionFromFile(const char *filename)
-{
-	// The file name stored in the set should be the fully resolved name because
-	// it is possible to name the same file in multiple ways using relative paths.
-	string fullpath = GetAbsolutePath(filename);
-
-	if( IncludeIfNotAlreadyIncluded(fullpath.c_str()) )
-	{
-		int r = LoadScriptSection(fullpath.c_str());
-		if( r < 0 )
-			return r;
-		else
-			return 1;
-	}
-
-	return 0;
-}
-
-// Returns 1 if the section was included
-// Returns 0 if the section was not included because it had already been included before
-// Returns <0 if there was an error
-int CScriptBuilder::AddSectionFromMemory(const char *sectionName, const char *scriptCode, unsigned int scriptLength, int lineOffset)
-{
-	if( IncludeIfNotAlreadyIncluded(sectionName) )
-	{
-		int r = ProcessScriptSection(scriptCode, scriptLength, sectionName, lineOffset);
-		if( r < 0 )
-			return r;
-		else
-			return 1;
-	}
-
-	return 0;
-}
-
-int CScriptBuilder::BuildModule()
-{
-	return Build();
-}
-
-void CScriptBuilder::DefineWord(const char *word)
-{
-	string sword = word;
-	if( definedWords.find(sword) == definedWords.end() )
-	{
-		definedWords.insert(sword);
-	}
-}
-
-void CScriptBuilder::ClearAll()
-{
-	includedScripts.clear();
-
-#if AS_PROCESS_METADATA == 1
-	currentClass = "";
-	currentNamespace = "";
-
-	foundDeclarations.clear();
-	typeMetadataMap.clear();
-	funcMetadataMap.clear();
-	varMetadataMap.clear();
-#endif
-}
-
-bool CScriptBuilder::IncludeIfNotAlreadyIncluded(const char *filename)
-{
-	string scriptFile = filename;
-	if( includedScripts.find(scriptFile) != includedScripts.end() )
-	{
-		// Already included
-		return false;
-	}
-
-	// Add the file to the set of included sections
-	includedScripts.insert(scriptFile);
-
-	return true;
-}
-
-int CScriptBuilder::LoadScriptSection(const char *filename)
-{
-	// Open the script file
-	string scriptFile = filename;
-#if _MSC_VER >= 1500 && !defined(__S3E__)
-	FILE *f = 0;
-	fopen_s(&f, scriptFile.c_str(), "rb");
-#else
-	FILE *f = fopen(scriptFile.c_str(), "rb");
-#endif
-	if( f == 0 )
-	{
-		// Write a message to the engine's message callback
-		string msg = "Failed to open script file '" + GetAbsolutePath(scriptFile) + "'";
-		engine->WriteMessage(filename, 0, 0, asMSGTYPE_ERROR, msg.c_str());
-
-		// TODO: Write the file where this one was included from
-
-		return -1;
-	}
-
-	// Determine size of the file
-	fseek(f, 0, SEEK_END);
-	int len = static_cast<int> (ftell(f));
-	fseek(f, 0, SEEK_SET);
-
-	// On Win32 it is possible to do the following instead
-	// int len = _filelength(_fileno(f));
-
-	// Read the entire file
-	string code;
-	size_t c = 0;
-	if( len > 0 )
-	{
-		code.resize(len);
-		c = fread(&code[0], len, 1, f);
-	}
-
-	fclose(f);
-
-	if( c == 0 && len > 0 )
-	{
-		// Write a message to the engine's message callback
-		string msg = "Failed to load script file '" + GetAbsolutePath(scriptFile) + "'";
-		engine->WriteMessage(filename, 0, 0, asMSGTYPE_ERROR, msg.c_str());
-		return -1;
-	}
-
-	// Process the script section even if it is zero length so that the name is registered
-	return ProcessScriptSection(code.c_str(), (unsigned int)(code.length()), filename, 0);
-}
-
-int CScriptBuilder::ProcessScriptSection(const char *script, unsigned int length, const char *sectionname, int lineOffset)
-{
-	vector<string> includes;
-
-	// Perform a superficial parsing of the script first to store the metadata
-	if( length )
-		modifiedScript.assign(script, length);
-	else
-		modifiedScript = script;
-
-	// First perform the checks for #if directives to exclude code that shouldn't be compiled
-	unsigned int pos = 0;
-	int nested = 0;
-	while( pos < modifiedScript.size() )
-	{
-		asUINT len = 0;
-		asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-		if( t == asTC_UNKNOWN && modifiedScript[pos] == '#' && (pos + 1 < modifiedScript.size()) )
-		{
-			int start = pos++;
-
-			// Is this an #if directive?
-			t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-
-			string token;
-			token.assign(&modifiedScript[pos], len);
-
-			pos += len;
-
-			if( token == "if" )
-			{
-				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-				if( t == asTC_WHITESPACE )
-				{
-					pos += len;
-					t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-				}
-
-				if( t == asTC_IDENTIFIER )
-				{
-					string word;
-					word.assign(&modifiedScript[pos], len);
-
-					// Overwrite the #if directive with space characters to avoid compiler error
-					pos += len;
-					OverwriteCode(start, pos-start);
-
-					// Has this identifier been defined by the application or not?
-					if( definedWords.find(word) == definedWords.end() )
-					{
-						// Exclude all the code until and including the #endif
-						pos = ExcludeCode(pos);
-					}
-					else
-					{
-						nested++;
-					}
-				}
-			}
-			else if( token == "endif" )
-			{
-				// Only remove the #endif if there was a matching #if
-				if( nested > 0 )
-				{
-					OverwriteCode(start, pos-start);
-					nested--;
-				}
-			}
-		}
-		else
-			pos += len;
-	}
-
-#if AS_PROCESS_METADATA == 1
-	// Preallocate memory
-	string metadata, declaration;
-	metadata.reserve(500);
-	declaration.reserve(100);
-#endif
-
-	// Then check for meta data and #include directives
-	pos = 0;
-	while( pos < modifiedScript.size() )
-	{
-		asUINT len = 0;
-		asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-		if( t == asTC_COMMENT || t == asTC_WHITESPACE )
-		{
-			pos += len;
-			continue;
-		}
-
-#if AS_PROCESS_METADATA == 1
-		// Check if class
-		if( currentClass == "" && modifiedScript.substr(pos,len) == "class" )
-		{
-			// Get the identifier after "class"
-			do
-			{
-				pos += len;
-				if( pos >= modifiedScript.size() )
-				{
-					t = asTC_UNKNOWN;
-					break;
-				}
-				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-			} while(t == asTC_COMMENT || t == asTC_WHITESPACE);
-
-			if( t == asTC_IDENTIFIER )
-			{
-				currentClass = modifiedScript.substr(pos,len);
-
-				// Search until first { is encountered
-				while( pos < modifiedScript.length() )
-				{
-					engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-
-					// If start of class section encountered stop
-					if( modifiedScript[pos] == '{' )
-					{
-						pos += len;
-						break;
-					}
-
-					// Check next symbol
-					pos += len;
-				}
-			}
-
-			continue;
-		}
-
-		// Check if end of class
-		if( currentClass != "" && modifiedScript[pos] == '}' )
-		{
-			currentClass = "";
-			pos += len;
-			continue;
-		}
-
-		// Check if namespace
-		if( modifiedScript.substr(pos,len) == "namespace" )
-		{
-			// Get the identifier after "namespace"
-			do
-			{
-				pos += len;
-				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-			} while(t == asTC_COMMENT || t == asTC_WHITESPACE);
-
-			if( currentNamespace != "" )
-				currentNamespace += "::";
-			currentNamespace += modifiedScript.substr(pos,len);
-
-			// Search until first { is encountered
-			while( pos < modifiedScript.length() )
-			{
-				engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-
-				// If start of namespace section encountered stop
-				if( modifiedScript[pos] == '{' )
-				{
-					pos += len;
-					break;
-				}
-
-				// Check next symbol
-				pos += len;
-			}
-
-			continue;
-		}
-
-		// Check if end of namespace
-		if( currentNamespace != "" && modifiedScript[pos] == '}' )
-		{
-			size_t found = currentNamespace.rfind( "::" );
-			if( found != string::npos )
-			{
-				currentNamespace.erase( found );
-			}
-			else
-			{
-				currentNamespace = "";
-			}
-			pos += len;
-			continue;
-		}
-
-		// Is this the start of metadata?
-		if( modifiedScript[pos] == '[' )
-		{
-			// Get the metadata string
-			pos = ExtractMetadataString(pos, metadata);
-
-			// Determine what this metadata is for
-			int type;
-			ExtractDeclaration(pos, declaration, type);
-
-			// Store away the declaration in a map for lookup after the build has completed
-			if( type > 0 )
-			{
-				SMetadataDecl decl(metadata, declaration, type, currentClass, currentNamespace);
-				foundDeclarations.push_back(decl);
-			}
-		}
-		else
-#endif
-		// Is this a preprocessor directive?
-		if( modifiedScript[pos] == '#' && (pos + 1 < modifiedScript.size()) )
-		{
-			int start = pos++;
-
-			t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-			if( t == asTC_IDENTIFIER )
-			{
-				string token;
-				token.assign(&modifiedScript[pos], len);
-				if( token == "include" )
-				{
-					pos += len;
-					t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-					if( t == asTC_WHITESPACE )
-					{
-						pos += len;
-						t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-					}
-
-					if( t == asTC_VALUE && len > 2 && (modifiedScript[pos] == '"' || modifiedScript[pos] == '\'') )
-					{
-						// Get the include file
-						string includefile;
-						includefile.assign(&modifiedScript[pos+1], len-2);
-						pos += len;
-
-						// Store it for later processing
-						includes.push_back(includefile);
-
-						// Overwrite the include directive with space characters to avoid compiler error
-						OverwriteCode(start, pos-start);
-					}
-				}
-			}
-		}
-		// Don't search for metadata/includes within statement blocks or between tokens in statements
-		else
-		{
-			pos = SkipStatement(pos);
-		}
-	}
-
-	// Build the actual script
-	engine->SetEngineProperty(asEP_COPY_SCRIPT_SECTIONS, true);
-	module->AddScriptSection(sectionname, modifiedScript.c_str(), modifiedScript.size(), lineOffset);
-
-	if( includes.size() > 0 )
-	{
-		// If the callback has been set, then call it for each included file
-		if( includeCallback )
-		{
-			for( int n = 0; n < (int)includes.size(); n++ )
-			{
-				int r = includeCallback(includes[n].c_str(), sectionname, this, callbackParam);
-				if( r < 0 )
-					return r;
-			}
-		}
-		else
-		{
-			// By default we try to load the included file from the relative directory of the current file
-
-			// Determine the path of the current script so that we can resolve relative paths for includes
-			string path = sectionname;
-			size_t posOfSlash = path.find_last_of("/\\");
-			if( posOfSlash != string::npos )
-				path.resize(posOfSlash+1);
-			else
-				path = "";
-
-			// Load the included scripts
-			for( int n = 0; n < (int)includes.size(); n++ )
-			{
-				// If the include is a relative path, then prepend the path of the originating script
-				if( includes[n].find_first_of("/\\") != 0 &&
-					includes[n].find_first_of(":") == string::npos )
-				{
-					includes[n] = path + includes[n];
-				}
-
-				// Include the script section
-				int r = AddSectionFromFile(includes[n].c_str());
-				if( r < 0 )
-					return r;
-			}
-		}
-	}
-
-	return 0;
-}
-
-int CScriptBuilder::Build()
-{
-	int r = module->Build();
-	if( r < 0 )
-		return r;
-
-#if AS_PROCESS_METADATA == 1
-	// After the script has been built, the metadata strings should be
-	// stored for later lookup by function id, type id, and variable index
-	for( int n = 0; n < (int)foundDeclarations.size(); n++ )
-	{
-		SMetadataDecl *decl = &foundDeclarations[n];
-		module->SetDefaultNamespace(decl->nameSpace.c_str());
-		if( decl->type == 1 )
-		{
-			// Find the type id
-			int typeId = module->GetTypeIdByDecl(decl->declaration.c_str());
-			assert( typeId >= 0 );
-			if( typeId >= 0 )
-				typeMetadataMap.insert(map<int, string>::value_type(typeId, decl->metadata));
-		}
-		else if( decl->type == 2 )
-		{
-			if( decl->parentClass == "" )
-			{
-				// Find the function id
-				asIScriptFunction *func = module->GetFunctionByDecl(decl->declaration.c_str());
-				assert( func );
-				if( func )
-					funcMetadataMap.insert(map<int, string>::value_type(func->GetId(), decl->metadata));
-			}
-			else
-			{
-				// Find the method id
-				int typeId = module->GetTypeIdByDecl(decl->parentClass.c_str());
-				assert( typeId > 0 );
-				map<int, SClassMetadata>::iterator it = classMetadataMap.find(typeId);
-				if( it == classMetadataMap.end() )
-				{
-					classMetadataMap.insert(map<int, SClassMetadata>::value_type(typeId, SClassMetadata(decl->parentClass)));
-					it = classMetadataMap.find(typeId);
-				}
-
-				asITypeInfo *type = engine->GetTypeInfoById(typeId);
-				asIScriptFunction *func = type->GetMethodByDecl(decl->declaration.c_str());
-				assert( func );
-				if( func )
-					it->second.funcMetadataMap.insert(map<int, string>::value_type(func->GetId(), decl->metadata));
-			}
-		}
-		else if( decl->type == 4 )
-		{
-			if( decl->parentClass == "" )
-			{
-				// Find the global virtual property accessors
-				asIScriptFunction *func = module->GetFunctionByName(("get_" + decl->declaration).c_str());
-				if( func )
-					funcMetadataMap.insert(map<int, string>::value_type(func->GetId(), decl->metadata));
-				func = module->GetFunctionByName(("set_" + decl->declaration).c_str());
-				if( func )
-					funcMetadataMap.insert(map<int, string>::value_type(func->GetId(), decl->metadata));
-			}
-			else
-			{
-				// Find the method virtual property accessors
-				int typeId = module->GetTypeIdByDecl(decl->parentClass.c_str());
-				assert( typeId > 0 );
-				map<int, SClassMetadata>::iterator it = classMetadataMap.find(typeId);
-				if( it == classMetadataMap.end() )
-				{
-					classMetadataMap.insert(map<int, SClassMetadata>::value_type(typeId, SClassMetadata(decl->parentClass)));
-					it = classMetadataMap.find(typeId);
-				}
-
-				asITypeInfo *type = engine->GetTypeInfoById(typeId);
-				asIScriptFunction *func = type->GetMethodByName(("get_" + decl->declaration).c_str());
-				if( func )
-					it->second.funcMetadataMap.insert(map<int, string>::value_type(func->GetId(), decl->metadata));
-				func = type->GetMethodByName(("set_" + decl->declaration).c_str());
-				if( func )
-					it->second.funcMetadataMap.insert(map<int, string>::value_type(func->GetId(), decl->metadata));
-
-			}
-		}
-		else if( decl->type == 3 )
-		{
-			if( decl->parentClass == "" )
-			{
-				// Find the global variable index
-				int varIdx = module->GetGlobalVarIndexByName(decl->declaration.c_str());
-				assert( varIdx >= 0 );
-				if( varIdx >= 0 )
-					varMetadataMap.insert(map<int, string>::value_type(varIdx, decl->metadata));
-			}
-			else
-			{
-				int typeId = module->GetTypeIdByDecl(decl->parentClass.c_str());
-				assert( typeId > 0 );
-
-				// Add the classes if needed
-				map<int, SClassMetadata>::iterator it = classMetadataMap.find(typeId);
-				if( it == classMetadataMap.end() )
-				{
-					classMetadataMap.insert(map<int, SClassMetadata>::value_type(typeId, SClassMetadata(decl->parentClass)));
-					it = classMetadataMap.find(typeId);
-				}
-
-				// Add the variable to class
-				asITypeInfo *objectType = engine->GetTypeInfoById(typeId);
-				int idx = -1;
-
-				// Search through all properties to get proper declaration
-				for( asUINT i = 0; i < (asUINT)objectType->GetPropertyCount(); ++i )
-				{
-					const char *name;
-					objectType->GetProperty(i, &name);
-					if( decl->declaration == name )
-					{
-						idx = i;
-						break;
-					}
-				}
-
-				// If found, add it
-				assert( idx >= 0 );
-				if( idx >= 0 ) it->second.varMetadataMap.insert(map<int, string>::value_type(idx, decl->metadata));
-			}
-		}
-	}
-	module->SetDefaultNamespace("");
-#endif
-
-	return 0;
-}
-
-int CScriptBuilder::SkipStatement(int pos)
-{
-	asUINT len = 0;
-
-	// Skip until ; or { whichever comes first
-	while( pos < (int)modifiedScript.length() && modifiedScript[pos] != ';' && modifiedScript[pos] != '{' )
-	{
-		engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-		pos += len;
-	}
-
-	// Skip entire statement block
-	if( pos < (int)modifiedScript.length() && modifiedScript[pos] == '{' )
-	{
-		pos += 1;
-
-		// Find the end of the statement block
-		int level = 1;
-		while( level > 0 && pos < (int)modifiedScript.size() )
-		{
-			asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-			if( t == asTC_KEYWORD )
-			{
-				if( modifiedScript[pos] == '{' )
-					level++;
-				else if( modifiedScript[pos] == '}' )
-					level--;
-			}
-
-			pos += len;
-		}
-	}
-	else
-		pos += 1;
-
-	return pos;
-}
-
-// Overwrite all code with blanks until the matching #endif
-int CScriptBuilder::ExcludeCode(int pos)
-{
-	asUINT len = 0;
-	int nested = 0;
-	while( pos < (int)modifiedScript.size() )
-	{
-		engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-		if( modifiedScript[pos] == '#' )
-		{
-			modifiedScript[pos] = ' ';
-			pos++;
-
-			// Is it an #if or #endif directive?
-			engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-			string token;
-			token.assign(&modifiedScript[pos], len);
-			OverwriteCode(pos, len);
-
-			if( token == "if" )
-			{
-				nested++;
-			}
-			else if( token == "endif" )
-			{
-				if( nested-- == 0 )
-				{
-					pos += len;
-					break;
-				}
-			}
-		}
-		else if( modifiedScript[pos] != '\n' )
-		{
-			OverwriteCode(pos, len);
-		}
-		pos += len;
-	}
-
-	return pos;
-}
-
-// Overwrite all characters except line breaks with blanks
-void CScriptBuilder::OverwriteCode(int start, int len)
-{
-	char *code = &modifiedScript[start];
-	for( int n = 0; n < len; n++ )
-	{
-		if( *code != '\n' )
-			*code = ' ';
-		code++;
-	}
-}
-
-#if AS_PROCESS_METADATA == 1
-int CScriptBuilder::ExtractMetadataString(int pos, string &metadata)
-{
-	metadata = "";
-
-	// Overwrite the metadata with space characters to allow compilation
-	modifiedScript[pos] = ' ';
-
-	// Skip opening brackets
-	pos += 1;
-
-	int level = 1;
-	asUINT len = 0;
-	while( level > 0 && pos < (int)modifiedScript.size() )
-	{
-		asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-		if( t == asTC_KEYWORD )
-		{
-			if( modifiedScript[pos] == '[' )
-				level++;
-			else if( modifiedScript[pos] == ']' )
-				level--;
-		}
-
-		// Copy the metadata to our buffer
-		if( level > 0 )
-			metadata.append(&modifiedScript[pos], len);
-
-		// Overwrite the metadata with space characters to allow compilation
-		if( t != asTC_WHITESPACE )
-			OverwriteCode(pos, len);
-
-		pos += len;
-	}
-
-	return pos;
-}
-
-int CScriptBuilder::ExtractDeclaration(int pos, string &declaration, int &type)
-{
-	declaration = "";
-	type = 0;
-
-	int start = pos;
-
-	std::string token;
-	asUINT len = 0;
-	asETokenClass t = asTC_WHITESPACE;
-
-	// Skip white spaces and comments
-	do
-	{
-		pos += len;
-		t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-	} while ( t == asTC_WHITESPACE || t == asTC_COMMENT );
-
-	// We're expecting, either a class, interface, function, or variable declaration
-	if( t == asTC_KEYWORD || t == asTC_IDENTIFIER )
-	{
-		token.assign(&modifiedScript[pos], len);
-		if( token == "interface" || token == "class" )
-		{
-			// Skip white spaces and comments
-			do
-			{
-				pos += len;
-				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-			} while ( t == asTC_WHITESPACE || t == asTC_COMMENT );
-
-			if( t == asTC_IDENTIFIER )
-			{
-				type = 1;
-				declaration.assign(&modifiedScript[pos], len);
-				pos += len;
-				return pos;
-			}
-		}
-		else
-		{
-			// For function declarations, store everything up to the start of the statement block
-
-			// For variable declaration store just the name as there can only be one
-
-			// We'll only know if the declaration is a variable or function declaration when we see the statement block, or absense of a statement block.
-			bool hasParenthesis = false;
-			declaration.append(&modifiedScript[pos], len);
-			pos += len;
-			string name;
-			for(; pos < (int)modifiedScript.size();)
-			{
-				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
-				if( t == asTC_KEYWORD )
-				{
-					token.assign(&modifiedScript[pos], len);
-					if( token == "{" )
-					{
-						if( hasParenthesis )
-						{
-							// We've found the end of a function signature
-							type = 2;
-						}
-						else
-						{
-							// We've found a virtual property. Just keep the name
-							declaration = name;
-							type = 4;
-						}
-						return pos;
-					}
-					if( token == "=" || token == ";" )
-					{
-						// Substitute the declaration with just the name
-						declaration = name;
-						type = 3;
-						return pos;
-					}
-					else if( token == "(" )
-					{
-						// This is the first parenthesis we encounter. If the parenthesis isn't followed
-						// by a statement block, then this is a variable declaration, in which case we
-						// should only store the type and name of the variable, not the initialization parameters.
-						hasParenthesis = true;
-					}
-				}
-				else if( t == asTC_IDENTIFIER )
-				{
-					name.assign(&modifiedScript[pos], len);
-				}
-
-				declaration.append(&modifiedScript[pos], len);
-				pos += len;
-			}
-		}
-	}
-
-	return start;
-}
-
-const char *CScriptBuilder::GetMetadataStringForType(int typeId)
-{
-	map<int,string>::iterator it = typeMetadataMap.find(typeId);
-	if( it != typeMetadataMap.end() )
-		return it->second.c_str();
-
-	return "";
-}
-
-const char *CScriptBuilder::GetMetadataStringForFunc(asIScriptFunction *func)
-{
-	if( func )
-	{
-		map<int,string>::iterator it = funcMetadataMap.find(func->GetId());
-		if( it != funcMetadataMap.end() )
-			return it->second.c_str();
-	}
-
-	return "";
-}
-
-const char *CScriptBuilder::GetMetadataStringForVar(int varIdx)
-{
-	map<int,string>::iterator it = varMetadataMap.find(varIdx);
-	if( it != varMetadataMap.end() )
-		return it->second.c_str();
-
-	return "";
-}
-
-const char *CScriptBuilder::GetMetadataStringForTypeProperty(int typeId, int varIdx)
-{
-	map<int, SClassMetadata>::iterator typeIt = classMetadataMap.find(typeId);
-	if(typeIt == classMetadataMap.end()) return "";
-
-	map<int, string>::iterator propIt = typeIt->second.varMetadataMap.find(varIdx);
-	if(propIt == typeIt->second.varMetadataMap.end()) return "";
-
-	return propIt->second.c_str();
-}
-
-const char *CScriptBuilder::GetMetadataStringForTypeMethod(int typeId, asIScriptFunction *method)
-{
-	if( method )
-	{
-		map<int, SClassMetadata>::iterator typeIt = classMetadataMap.find(typeId);
-		if(typeIt == classMetadataMap.end()) return "";
-
-		map<int, string>::iterator methodIt = typeIt->second.funcMetadataMap.find(method->GetId());
-		if(methodIt == typeIt->second.funcMetadataMap.end()) return "";
-
-		return methodIt->second.c_str();
-	}
-
-	return "";
-}
-#endif
-
-string GetAbsolutePath(const string &file)
-{
-	string str = file;
-
-	// If this is a relative path, complement it with the current path
-	if( !((str.length() > 0 && (str[0] == '/' || str[0] == '\\')) ||
-		  str.find(":") != string::npos) )
-	{
-		str = GetCurrentDir() + "/" + str;
-	}
-
-	// Replace backslashes for forward slashes
-	size_t pos = 0;
-	while( (pos = str.find("\\", pos)) != string::npos )
-		str[pos] = '/';
-
-	// Replace /./ with /
-	pos = 0;
-	while( (pos = str.find("/./", pos)) != string::npos )
-		str.erase(pos+1, 2);
-
-	// For each /../ remove the parent dir and the /../
-	pos = 0;
-	while( (pos = str.find("/../")) != string::npos )
-	{
-		size_t pos2 = str.rfind("/", pos-1);
-		if( pos2 != string::npos )
-			str.erase(pos2, pos+3-pos2);
-		else
-		{
-			// The path is invalid
-			break;
-		}
-	}
-
-	return str;
-}
-
-string GetCurrentDir()
-{
-	char buffer[1024];
-#if defined(_MSC_VER) || defined(_WIN32)
-	#ifdef _WIN32_WCE
-	static TCHAR apppath[MAX_PATH] = TEXT("");
-	if (!apppath[0])
-	{
-		GetModuleFileName(NULL, apppath, MAX_PATH);
-
-		int appLen = _tcslen(apppath);
-
-		// Look for the last backslash in the path, which would be the end
-		// of the path itself and the start of the filename.  We only want
-		// the path part of the exe's full-path filename
-		// Safety is that we make sure not to walk off the front of the
-		// array (in case the path is nothing more than a filename)
-		while (appLen > 1)
-		{
-			if (apppath[appLen-1] == TEXT('\\'))
-				break;
-			appLen--;
-		}
-
-		// Terminate the string after the trailing backslash
-		apppath[appLen] = TEXT('\0');
-	}
-		#ifdef _UNICODE
-	wcstombs(buffer, apppath, min(1024, wcslen(apppath)*sizeof(wchar_t)));
-		#else
-	memcpy(buffer, apppath, min(1024, strlen(apppath)));
-		#endif
-
-	return buffer;
-	#elif defined(__S3E__)
-	// Marmalade uses its own portable C library
-	return getcwd(buffer, (int)1024);
-	#elif _XBOX_VER >= 200
-	// XBox 360 doesn't support the getcwd function, just use the root folder
-	return "game:/";
-	#elif defined(_M_ARM)
-	// TODO: How to determine current working dir on Windows Phone?
-	return "";
-	#else
-	return _getcwd(buffer, (int)1024);
-	#endif // _MSC_VER
-#elif defined(__APPLE__) || defined(__linux__) || defined(__sun)
-	return getcwd(buffer, 1024);
-#else
-	return "";
-#endif
-}
-
-END_AS_NAMESPACE
-
-
+#include "scriptbuilder.h"
+#include <vector>
+#include <assert.h>
+using namespace std;
+
+#include <stdio.h>
+#if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(__S3E__)
+#include <direct.h>
+#endif
+#ifdef _WIN32_WCE
+#include <windows.h> // For GetModuleFileName()
+#endif
+
+#if defined(__S3E__) || defined(__APPLE__) || defined(__GNUC__)
+#include <unistd.h> // For getcwd()
+#endif
+
+BEGIN_AS_NAMESPACE
+
+// Helper functions
+static string GetCurrentDir();
+static string GetAbsolutePath(const string &path);
+
+
+CScriptBuilder::CScriptBuilder()
+{
+	engine = 0;
+	module = 0;
+
+	includeCallback = 0;
+	includeParam = 0;
+
+	pragmaCallback = 0;
+	pragmaParam = 0;
+}
+
+void CScriptBuilder::SetIncludeCallback(INCLUDECALLBACK_t callback, void *userParam)
+{
+	includeCallback = callback;
+	includeParam   = userParam;
+}
+
+void CScriptBuilder::SetPragmaCallback(PRAGMACALLBACK_t callback, void *userParam)
+{
+	pragmaCallback = callback;
+	pragmaParam = userParam;
+}
+
+int CScriptBuilder::StartNewModule(asIScriptEngine *inEngine, const char *moduleName)
+{
+	if(inEngine == 0 ) return -1;
+
+	engine = inEngine;
+	module = inEngine->GetModule(moduleName, asGM_ALWAYS_CREATE);
+	if( module == 0 )
+		return -1;
+
+	ClearAll();
+
+	return 0;
+}
+
+asIScriptEngine *CScriptBuilder::GetEngine()
+{
+	return engine;
+}
+
+asIScriptModule *CScriptBuilder::GetModule()
+{
+	return module;
+}
+
+unsigned int CScriptBuilder::GetSectionCount() const
+{
+	return (unsigned int)(includedScripts.size());
+}
+
+string CScriptBuilder::GetSectionName(unsigned int idx) const
+{
+	if( idx >= includedScripts.size() ) return "";
+
+#ifdef _WIN32
+	set<string, ci_less>::const_iterator it = includedScripts.begin();
+#else
+	set<string>::const_iterator it = includedScripts.begin();
+#endif
+	while( idx-- > 0 ) it++;
+	return *it;
+}
+
+// Returns 1 if the section was included
+// Returns 0 if the section was not included because it had already been included before
+// Returns <0 if there was an error
+int CScriptBuilder::AddSectionFromFile(const char *filename)
+{
+	// The file name stored in the set should be the fully resolved name because
+	// it is possible to name the same file in multiple ways using relative paths.
+	string fullpath = GetAbsolutePath(filename);
+
+	if( IncludeIfNotAlreadyIncluded(fullpath.c_str()) )
+	{
+		int r = LoadScriptSection(fullpath.c_str());
+		if( r < 0 )
+			return r;
+		else
+			return 1;
+	}
+
+	return 0;
+}
+
+// Returns 1 if the section was included
+// Returns 0 if the section was not included because it had already been included before
+// Returns <0 if there was an error
+int CScriptBuilder::AddSectionFromMemory(const char *sectionName, const char *scriptCode, unsigned int scriptLength, int lineOffset)
+{
+	if( IncludeIfNotAlreadyIncluded(sectionName) )
+	{
+		int r = ProcessScriptSection(scriptCode, scriptLength, sectionName, lineOffset);
+		if( r < 0 )
+			return r;
+		else
+			return 1;
+	}
+
+	return 0;
+}
+
+int CScriptBuilder::BuildModule()
+{
+	return Build();
+}
+
+void CScriptBuilder::DefineWord(const char *word)
+{
+	string sword = word;
+	if( definedWords.find(sword) == definedWords.end() )
+	{
+		definedWords.insert(sword);
+	}
+}
+
+void CScriptBuilder::ClearAll()
+{
+	includedScripts.clear();
+
+#if AS_PROCESS_METADATA == 1
+	currentClass = "";
+	currentNamespace = "";
+
+	foundDeclarations.clear();
+	typeMetadataMap.clear();
+	funcMetadataMap.clear();
+	varMetadataMap.clear();
+#endif
+}
+
+bool CScriptBuilder::IncludeIfNotAlreadyIncluded(const char *filename)
+{
+	string scriptFile = filename;
+	if( includedScripts.find(scriptFile) != includedScripts.end() )
+	{
+		// Already included
+		return false;
+	}
+
+	// Add the file to the set of included sections
+	includedScripts.insert(scriptFile);
+
+	return true;
+}
+
+int CScriptBuilder::LoadScriptSection(const char *filename)
+{
+	// Open the script file
+	string scriptFile = filename;
+#if _MSC_VER >= 1500 && !defined(__S3E__)
+	FILE *f = 0;
+	fopen_s(&f, scriptFile.c_str(), "rb");
+#else
+	FILE *f = fopen(scriptFile.c_str(), "rb");
+#endif
+	if( f == 0 )
+	{
+		// Write a message to the engine's message callback
+		string msg = "Failed to open script file '" + GetAbsolutePath(scriptFile) + "'";
+		engine->WriteMessage(filename, 0, 0, asMSGTYPE_ERROR, msg.c_str());
+
+		// TODO: Write the file where this one was included from
+
+		return -1;
+	}
+
+	// Determine size of the file
+	fseek(f, 0, SEEK_END);
+	int len = ftell(f);
+	fseek(f, 0, SEEK_SET);
+
+	// On Win32 it is possible to do the following instead
+	// int len = _filelength(_fileno(f));
+
+	// Read the entire file
+	string code;
+	size_t c = 0;
+	if( len > 0 )
+	{
+		code.resize(len);
+		c = fread(&code[0], len, 1, f);
+	}
+
+	fclose(f);
+
+	if( c == 0 && len > 0 )
+	{
+		// Write a message to the engine's message callback
+		string msg = "Failed to load script file '" + GetAbsolutePath(scriptFile) + "'";
+		engine->WriteMessage(filename, 0, 0, asMSGTYPE_ERROR, msg.c_str());
+		return -1;
+	}
+
+	// Process the script section even if it is zero length so that the name is registered
+	return ProcessScriptSection(code.c_str(), (unsigned int)(code.length()), filename, 0);
+}
+
+int CScriptBuilder::ProcessScriptSection(const char *script, unsigned int length, const char *sectionname, int lineOffset)
+{
+	vector<string> includes;
+
+	// Perform a superficial parsing of the script first to store the metadata
+	if( length )
+		modifiedScript.assign(script, length);
+	else
+		modifiedScript = script;
+
+	// First perform the checks for #if directives to exclude code that shouldn't be compiled
+	unsigned int pos = 0;
+	int nested = 0;
+	while( pos < modifiedScript.size() )
+	{
+		asUINT len = 0;
+		asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+		if( t == asTC_UNKNOWN && modifiedScript[pos] == '#' && (pos + 1 < modifiedScript.size()) )
+		{
+			int start = pos++;
+
+			// Is this an #if directive?
+			t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+
+			string token;
+			token.assign(&modifiedScript[pos], len);
+
+			pos += len;
+
+			if( token == "if" )
+			{
+				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+				if( t == asTC_WHITESPACE )
+				{
+					pos += len;
+					t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+				}
+
+				if( t == asTC_IDENTIFIER )
+				{
+					string word;
+					word.assign(&modifiedScript[pos], len);
+
+					// Overwrite the #if directive with space characters to avoid compiler error
+					pos += len;
+					OverwriteCode(start, pos-start);
+
+					// Has this identifier been defined by the application or not?
+					if( definedWords.find(word) == definedWords.end() )
+					{
+						// Exclude all the code until and including the #endif
+						pos = ExcludeCode(pos);
+					}
+					else
+					{
+						nested++;
+					}
+				}
+			}
+			else if( token == "endif" )
+			{
+				// Only remove the #endif if there was a matching #if
+				if( nested > 0 )
+				{
+					OverwriteCode(start, pos-start);
+					nested--;
+				}
+			}
+		}
+		else
+			pos += len;
+	}
+
+#if AS_PROCESS_METADATA == 1
+	// Preallocate memory
+	string name, declaration;
+	vector<string> metadata;
+	declaration.reserve(100);
+#endif
+
+	// Then check for meta data and pre-processor directives
+	pos = 0;
+	while( pos < modifiedScript.size() )
+	{
+		asUINT len = 0;
+		asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+		if( t == asTC_COMMENT || t == asTC_WHITESPACE )
+		{
+			pos += len;
+			continue;
+		}
+		string token;
+		token.assign(&modifiedScript[pos], len);
+
+#if AS_PROCESS_METADATA == 1
+		// Skip possible decorators before class and interface declarations
+		if (token == "shared" || token == "abstract" || token == "mixin" || token == "external")
+		{
+			pos += len;
+			continue;
+		}
+
+		// Check if class or interface so the metadata for members can be gathered
+		if( currentClass == "" && (token == "class" || token == "interface") )
+		{
+			// Get the identifier after "class"
+			do
+			{
+				pos += len;
+				if( pos >= modifiedScript.size() )
+				{
+					t = asTC_UNKNOWN;
+					break;
+				}
+				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+			} while(t == asTC_COMMENT || t == asTC_WHITESPACE);
+
+			if( t == asTC_IDENTIFIER )
+			{
+				currentClass = modifiedScript.substr(pos,len);
+
+				// Search until first { or ; is encountered
+				while( pos < modifiedScript.length() )
+				{
+					engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+
+					// If start of class section encountered stop
+					if( modifiedScript[pos] == '{' )
+					{
+						pos += len;
+						break;
+					}
+					else if (modifiedScript[pos] == ';')
+					{
+						// The class declaration has ended and there are no children
+						currentClass = "";
+						pos += len;
+						break;
+					}
+
+					// Check next symbol
+					pos += len;
+				}
+			}
+
+			continue;
+		}
+
+		// Check if end of class
+		if( currentClass != "" && token == "}" )
+		{
+			currentClass = "";
+			pos += len;
+			continue;
+		}
+
+		// Check if namespace so the metadata for members can be gathered
+		if( token == "namespace" )
+		{
+			// Get the identifier after "namespace"
+			do
+			{
+				pos += len;
+				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+			} while(t == asTC_COMMENT || t == asTC_WHITESPACE);
+
+			if( currentNamespace != "" )
+				currentNamespace += "::";
+			currentNamespace += modifiedScript.substr(pos,len);
+
+			// Search until first { is encountered
+			while( pos < modifiedScript.length() )
+			{
+				engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+
+				// If start of namespace section encountered stop
+				if( modifiedScript[pos] == '{' )
+				{
+					pos += len;
+					break;
+				}
+
+				// Check next symbol
+				pos += len;
+			}
+
+			continue;
+		}
+
+		// Check if end of namespace
+		if( currentNamespace != "" && token == "}" )
+		{
+			size_t found = currentNamespace.rfind( "::" );
+			if( found != string::npos )
+			{
+				currentNamespace.erase( found );
+			}
+			else
+			{
+				currentNamespace = "";
+			}
+			pos += len;
+			continue;
+		}
+
+		// Is this the start of metadata?
+		if( token == "[" )
+		{
+			// Get the metadata string
+			pos = ExtractMetadata(pos, metadata);
+
+			// Determine what this metadata is for
+			int type;
+			ExtractDeclaration(pos, name, declaration, type);
+
+			// Store away the declaration in a map for lookup after the build has completed
+			if( type > 0 )
+			{
+				SMetadataDecl decl(metadata, name, declaration, type, currentClass, currentNamespace);
+				foundDeclarations.push_back(decl);
+			}
+		}
+		else
+#endif
+		// Is this a preprocessor directive?
+		if( token == "#" && (pos + 1 < modifiedScript.size()) )
+		{
+			int start = pos++;
+
+			t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+			if (t == asTC_IDENTIFIER)
+			{
+				token.assign(&modifiedScript[pos], len);
+				if (token == "include")
+				{
+					pos += len;
+					t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+					if (t == asTC_WHITESPACE)
+					{
+						pos += len;
+						t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+					}
+
+					if (t == asTC_VALUE && len > 2 && (modifiedScript[pos] == '"' || modifiedScript[pos] == '\''))
+					{
+						// Get the include file
+						string includefile;
+						includefile.assign(&modifiedScript[pos + 1], len - 2);
+						pos += len;
+
+						// Store it for later processing
+						includes.push_back(includefile);
+
+						// Overwrite the include directive with space characters to avoid compiler error
+						OverwriteCode(start, pos - start);
+					}
+				}
+				else if (token == "pragma")
+				{
+					// Read until the end of the line
+					pos += len;
+					for (; pos < modifiedScript.size() && modifiedScript[pos] != '\n'; pos++);
+
+					// Call the pragma callback
+					string pragmaText(&modifiedScript[start + 7], pos - start - 7);
+					int r = pragmaCallback ? pragmaCallback(pragmaText, *this, pragmaParam) : -1;
+					if (r < 0)
+					{
+						// TODO: Report the correct line number
+						engine->WriteMessage(sectionname, 0, 0, asMSGTYPE_ERROR, "Invalid #pragma directive");
+						return r;
+					}
+
+					// Overwrite the pragma directive with space characters to avoid compiler error
+					OverwriteCode(start, pos - start);
+				}
+			}
+			else
+			{
+				// Check for lines starting with #!, e.g. shebang interpreter directive. These will be treated as comments and removed by the preprocessor
+				if (modifiedScript[pos] == '!')
+				{
+					// Read until the end of the line
+					pos += len;
+					for (; pos < modifiedScript.size() && modifiedScript[pos] != '\n'; pos++);
+
+					// Overwrite the directive with space characters to avoid compiler error
+					OverwriteCode(start, pos - start);
+				}
+			}
+		}
+		// Don't search for metadata/includes within statement blocks or between tokens in statements
+		else
+		{
+			pos = SkipStatement(pos);
+		}
+	}
+
+	// Build the actual script
+	engine->SetEngineProperty(asEP_COPY_SCRIPT_SECTIONS, true);
+	module->AddScriptSection(sectionname, modifiedScript.c_str(), modifiedScript.size(), lineOffset);
+
+	if( includes.size() > 0 )
+	{
+		// If the callback has been set, then call it for each included file
+		if( includeCallback )
+		{
+			for( int n = 0; n < (int)includes.size(); n++ )
+			{
+				int r = includeCallback(includes[n].c_str(), sectionname, this, includeParam);
+				if( r < 0 )
+					return r;
+			}
+		}
+		else
+		{
+			// By default we try to load the included file from the relative directory of the current file
+
+			// Determine the path of the current script so that we can resolve relative paths for includes
+			string path = sectionname;
+			size_t posOfSlash = path.find_last_of("/\\");
+			if( posOfSlash != string::npos )
+				path.resize(posOfSlash+1);
+			else
+				path = "";
+
+			// Load the included scripts
+			for( int n = 0; n < (int)includes.size(); n++ )
+			{
+				// If the include is a relative path, then prepend the path of the originating script
+				if( includes[n].find_first_of("/\\") != 0 &&
+					includes[n].find_first_of(":") == string::npos )
+				{
+					includes[n] = path + includes[n];
+				}
+
+				// Include the script section
+				int r = AddSectionFromFile(includes[n].c_str());
+				if( r < 0 )
+					return r;
+			}
+		}
+	}
+
+	return 0;
+}
+
+int CScriptBuilder::Build()
+{
+	int r = module->Build();
+	if( r < 0 )
+		return r;
+
+#if AS_PROCESS_METADATA == 1
+	// After the script has been built, the metadata strings should be
+	// stored for later lookup by function id, type id, and variable index
+	for( int n = 0; n < (int)foundDeclarations.size(); n++ )
+	{
+		SMetadataDecl *decl = &foundDeclarations[n];
+		module->SetDefaultNamespace(decl->nameSpace.c_str());
+		if( decl->type == MDT_TYPE )
+		{
+			// Find the type id
+			int typeId = module->GetTypeIdByDecl(decl->declaration.c_str());
+			assert( typeId >= 0 );
+			if( typeId >= 0 )
+				typeMetadataMap.insert(map<int, vector<string> >::value_type(typeId, decl->metadata));
+		}
+		else if( decl->type == MDT_FUNC )
+		{
+			if( decl->parentClass == "" )
+			{
+				// Find the function id
+				asIScriptFunction *func = module->GetFunctionByDecl(decl->declaration.c_str());
+				assert( func );
+				if( func )
+					funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+			}
+			else
+			{
+				// Find the method id
+				int typeId = module->GetTypeIdByDecl(decl->parentClass.c_str());
+				assert( typeId > 0 );
+				map<int, SClassMetadata>::iterator it = classMetadataMap.find(typeId);
+				if( it == classMetadataMap.end() )
+				{
+					classMetadataMap.insert(map<int, SClassMetadata>::value_type(typeId, SClassMetadata(decl->parentClass)));
+					it = classMetadataMap.find(typeId);
+				}
+
+				asITypeInfo *type = engine->GetTypeInfoById(typeId);
+				asIScriptFunction *func = type->GetMethodByDecl(decl->declaration.c_str());
+				assert( func );
+				if( func )
+					it->second.funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+			}
+		}
+		else if( decl->type == MDT_VIRTPROP )
+		{
+			if( decl->parentClass == "" )
+			{
+				// Find the global virtual property accessors
+				asIScriptFunction *func = module->GetFunctionByName(("get_" + decl->declaration).c_str());
+				if( func )
+					funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+				func = module->GetFunctionByName(("set_" + decl->declaration).c_str());
+				if( func )
+					funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+			}
+			else
+			{
+				// Find the method virtual property accessors
+				int typeId = module->GetTypeIdByDecl(decl->parentClass.c_str());
+				assert( typeId > 0 );
+				map<int, SClassMetadata>::iterator it = classMetadataMap.find(typeId);
+				if( it == classMetadataMap.end() )
+				{
+					classMetadataMap.insert(map<int, SClassMetadata>::value_type(typeId, SClassMetadata(decl->parentClass)));
+					it = classMetadataMap.find(typeId);
+				}
+
+				asITypeInfo *type = engine->GetTypeInfoById(typeId);
+				asIScriptFunction *func = type->GetMethodByName(("get_" + decl->declaration).c_str());
+				if( func )
+					it->second.funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+				func = type->GetMethodByName(("set_" + decl->declaration).c_str());
+				if( func )
+					it->second.funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+			}
+		}
+		else if( decl->type == MDT_VAR )
+		{
+			if( decl->parentClass == "" )
+			{
+				// Find the global variable index
+				int varIdx = module->GetGlobalVarIndexByName(decl->declaration.c_str());
+				assert( varIdx >= 0 );
+				if( varIdx >= 0 )
+					varMetadataMap.insert(map<int, vector<string> >::value_type(varIdx, decl->metadata));
+			}
+			else
+			{
+				int typeId = module->GetTypeIdByDecl(decl->parentClass.c_str());
+				assert( typeId > 0 );
+
+				// Add the classes if needed
+				map<int, SClassMetadata>::iterator it = classMetadataMap.find(typeId);
+				if( it == classMetadataMap.end() )
+				{
+					classMetadataMap.insert(map<int, SClassMetadata>::value_type(typeId, SClassMetadata(decl->parentClass)));
+					it = classMetadataMap.find(typeId);
+				}
+
+				// Add the variable to class
+				asITypeInfo *objectType = engine->GetTypeInfoById(typeId);
+				int idx = -1;
+
+				// Search through all properties to get proper declaration
+				for( asUINT i = 0; i < (asUINT)objectType->GetPropertyCount(); ++i )
+				{
+					const char *name;
+					objectType->GetProperty(i, &name);
+					if( decl->declaration == name )
+					{
+						idx = i;
+						break;
+					}
+				}
+
+				// If found, add it
+				assert( idx >= 0 );
+				if( idx >= 0 ) it->second.varMetadataMap.insert(map<int, vector<string> >::value_type(idx, decl->metadata));
+			}
+		}
+		else if (decl->type == MDT_FUNC_OR_VAR)
+		{
+			if (decl->parentClass == "")
+			{
+				// Find the global variable index
+				int varIdx = module->GetGlobalVarIndexByName(decl->name.c_str());
+				if (varIdx >= 0)
+					varMetadataMap.insert(map<int, vector<string> >::value_type(varIdx, decl->metadata));
+				else
+				{
+					asIScriptFunction *func = module->GetFunctionByDecl(decl->declaration.c_str());
+					assert(func);
+					if (func)
+						funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+				}
+			}
+			else
+			{
+				int typeId = module->GetTypeIdByDecl(decl->parentClass.c_str());
+				assert(typeId > 0);
+
+				// Add the classes if needed
+				map<int, SClassMetadata>::iterator it = classMetadataMap.find(typeId);
+				if (it == classMetadataMap.end())
+				{
+					classMetadataMap.insert(map<int, SClassMetadata>::value_type(typeId, SClassMetadata(decl->parentClass)));
+					it = classMetadataMap.find(typeId);
+				}
+
+				// Add the variable to class
+				asITypeInfo *objectType = engine->GetTypeInfoById(typeId);
+				int idx = -1;
+
+				// Search through all properties to get proper declaration
+				for (asUINT i = 0; i < (asUINT)objectType->GetPropertyCount(); ++i)
+				{
+					const char *name;
+					objectType->GetProperty(i, &name);
+					if (decl->name == name)
+					{
+						idx = i;
+						break;
+					}
+				}
+
+				// If found, add it
+				if (idx >= 0) 
+					it->second.varMetadataMap.insert(map<int, vector<string> >::value_type(idx, decl->metadata));
+				else
+				{
+					// Look for the matching method instead
+					asITypeInfo *type = engine->GetTypeInfoById(typeId);
+					asIScriptFunction *func = type->GetMethodByDecl(decl->declaration.c_str());
+					assert(func);
+					if (func)
+						it->second.funcMetadataMap.insert(map<int, vector<string> >::value_type(func->GetId(), decl->metadata));
+				}
+			}
+		}
+	}
+	module->SetDefaultNamespace("");
+#endif
+
+	return 0;
+}
+
+int CScriptBuilder::SkipStatement(int pos)
+{
+	asUINT len = 0;
+
+	// Skip until ; or { whichever comes first
+	while( pos < (int)modifiedScript.length() && modifiedScript[pos] != ';' && modifiedScript[pos] != '{' )
+	{
+		engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+		pos += len;
+	}
+
+	// Skip entire statement block
+	if( pos < (int)modifiedScript.length() && modifiedScript[pos] == '{' )
+	{
+		pos += 1;
+
+		// Find the end of the statement block
+		int level = 1;
+		while( level > 0 && pos < (int)modifiedScript.size() )
+		{
+			asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+			if( t == asTC_KEYWORD )
+			{
+				if( modifiedScript[pos] == '{' )
+					level++;
+				else if( modifiedScript[pos] == '}' )
+					level--;
+			}
+
+			pos += len;
+		}
+	}
+	else
+		pos += 1;
+
+	return pos;
+}
+
+// Overwrite all code with blanks until the matching #endif
+int CScriptBuilder::ExcludeCode(int pos)
+{
+	asUINT len = 0;
+	int nested = 0;
+	while( pos < (int)modifiedScript.size() )
+	{
+		engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+		if( modifiedScript[pos] == '#' )
+		{
+			modifiedScript[pos] = ' ';
+			pos++;
+
+			// Is it an #if or #endif directive?
+			engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+			string token;
+			token.assign(&modifiedScript[pos], len);
+			OverwriteCode(pos, len);
+
+			if( token == "if" )
+			{
+				nested++;
+			}
+			else if( token == "endif" )
+			{
+				if( nested-- == 0 )
+				{
+					pos += len;
+					break;
+				}
+			}
+		}
+		else if( modifiedScript[pos] != '\n' )
+		{
+			OverwriteCode(pos, len);
+		}
+		pos += len;
+	}
+
+	return pos;
+}
+
+// Overwrite all characters except line breaks with blanks
+void CScriptBuilder::OverwriteCode(int start, int len)
+{
+	char *code = &modifiedScript[start];
+	for( int n = 0; n < len; n++ )
+	{
+		if( *code != '\n' )
+			*code = ' ';
+		code++;
+	}
+}
+
+#if AS_PROCESS_METADATA == 1
+int CScriptBuilder::ExtractMetadata(int pos, vector<string> &metadata)
+{
+	metadata.clear();
+
+	// Extract all metadata. They can be separated by whitespace and comments
+	for (;;)
+	{
+		string metadataString = "";
+
+		// Overwrite the metadata with space characters to allow compilation
+		modifiedScript[pos] = ' ';
+
+		// Skip opening brackets
+		pos += 1;
+
+		int level = 1;
+		asUINT len = 0;
+		while (level > 0 && pos < (int)modifiedScript.size())
+		{
+			asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+			if (t == asTC_KEYWORD)
+			{
+				if (modifiedScript[pos] == '[')
+					level++;
+				else if (modifiedScript[pos] == ']')
+					level--;
+			}
+
+			// Copy the metadata to our buffer
+			if (level > 0)
+				metadataString.append(&modifiedScript[pos], len);
+
+			// Overwrite the metadata with space characters to allow compilation
+			if (t != asTC_WHITESPACE)
+				OverwriteCode(pos, len);
+
+			pos += len;
+		}
+
+		metadata.push_back(metadataString);
+
+		// Check for more metadata. Possibly separated by comments
+		asETokenClass t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+		while (t == asTC_COMMENT || t == asTC_WHITESPACE)
+		{
+			pos += len;
+			t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+		}
+
+		if (modifiedScript[pos] != '[')
+			break;
+	}
+
+	return pos;
+}
+
+int CScriptBuilder::ExtractDeclaration(int pos, string &name, string &declaration, int &type)
+{
+	declaration = "";
+	type = 0;
+
+	int start = pos;
+
+	std::string token;
+	asUINT len = 0;
+	asETokenClass t = asTC_WHITESPACE;
+
+	// Skip white spaces, comments, and leading decorators
+	do
+	{
+		pos += len;
+		t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+		token.assign(&modifiedScript[pos], len);
+	} while ( t == asTC_WHITESPACE || t == asTC_COMMENT || 
+	          token == "private" || token == "protected" || 
+	          token == "shared" || token == "external" || 
+	          token == "final" || token == "abstract" );
+
+	// We're expecting, either a class, interface, function, or variable declaration
+	if( t == asTC_KEYWORD || t == asTC_IDENTIFIER )
+	{
+		token.assign(&modifiedScript[pos], len);
+		if( token == "interface" || token == "class" || token == "enum" )
+		{
+			// Skip white spaces and comments
+			do
+			{
+				pos += len;
+				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+			} while ( t == asTC_WHITESPACE || t == asTC_COMMENT );
+
+			if( t == asTC_IDENTIFIER )
+			{
+				type = MDT_TYPE;
+				declaration.assign(&modifiedScript[pos], len);
+				pos += len;
+				return pos;
+			}
+		}
+		else
+		{
+			// For function declarations, store everything up to the start of the 
+			// statement block, except for succeeding decorators (final, override, etc)
+
+			// For variable declaration store just the name as there can only be one
+
+			// We'll only know if the declaration is a variable or function declaration
+			// when we see the statement block, or absense of a statement block.
+			bool hasParenthesis = false;
+			int nestedParenthesis = 0;
+			declaration.append(&modifiedScript[pos], len);
+			pos += len;
+			for(; pos < (int)modifiedScript.size();)
+			{
+				t = engine->ParseToken(&modifiedScript[pos], modifiedScript.size() - pos, &len);
+				token.assign(&modifiedScript[pos], len);
+				if (t == asTC_KEYWORD)
+				{
+					if (token == "{" && nestedParenthesis == 0)
+					{
+						if (hasParenthesis)
+						{
+							// We've found the end of a function signature
+							type = MDT_FUNC;
+						}
+						else
+						{
+							// We've found a virtual property. Just keep the name
+							declaration = name;
+							type = MDT_VIRTPROP;
+						}
+						return pos;
+					}
+					if ((token == "=" && !hasParenthesis) || token == ";")
+					{
+						if (hasParenthesis)
+						{
+							// The declaration is ambigous. It can be a variable with initialization, or a function prototype
+							type = MDT_FUNC_OR_VAR;
+						}
+						else
+						{
+							// Substitute the declaration with just the name
+							declaration = name;
+							type = MDT_VAR;
+						}
+						return pos;
+					}
+					else if (token == "(")
+					{
+						nestedParenthesis++;
+
+						// This is the first parenthesis we encounter. If the parenthesis isn't followed
+						// by a statement block, then this is a variable declaration, in which case we
+						// should only store the type and name of the variable, not the initialization parameters.
+						hasParenthesis = true;
+					}
+					else if (token == ")")
+					{
+						nestedParenthesis--;
+					}
+				}
+				else if( t == asTC_IDENTIFIER )
+				{
+					name = token;
+				}
+
+				// Skip trailing decorators
+				if( !hasParenthesis || nestedParenthesis > 0 || t != asTC_IDENTIFIER || (token != "final" && token != "override") )
+					declaration += token;
+
+				pos += len;
+			}
+		}
+	}
+
+	return start;
+}
+
+vector<string> CScriptBuilder::GetMetadataForType(int typeId)
+{
+	map<int,vector<string> >::iterator it = typeMetadataMap.find(typeId);
+	if( it != typeMetadataMap.end() )
+		return it->second;
+
+	return vector<string>();
+}
+
+vector<string> CScriptBuilder::GetMetadataForFunc(asIScriptFunction *func)
+{
+	if( func )
+	{
+		map<int,vector<string> >::iterator it = funcMetadataMap.find(func->GetId());
+		if( it != funcMetadataMap.end() )
+			return it->second;
+	}
+
+	return vector<string>();
+}
+
+vector<string> CScriptBuilder::GetMetadataForVar(int varIdx)
+{
+	map<int,vector<string> >::iterator it = varMetadataMap.find(varIdx);
+	if( it != varMetadataMap.end() )
+		return it->second;
+
+	return vector<string>();
+}
+
+vector<string> CScriptBuilder::GetMetadataForTypeProperty(int typeId, int varIdx)
+{
+	map<int, SClassMetadata>::iterator typeIt = classMetadataMap.find(typeId);
+	if(typeIt == classMetadataMap.end()) return vector<string>();
+
+	map<int, vector<string> >::iterator propIt = typeIt->second.varMetadataMap.find(varIdx);
+	if(propIt == typeIt->second.varMetadataMap.end()) return vector<string>();
+
+	return propIt->second;
+}
+
+vector<string> CScriptBuilder::GetMetadataForTypeMethod(int typeId, asIScriptFunction *method)
+{
+	if( method )
+	{
+		map<int, SClassMetadata>::iterator typeIt = classMetadataMap.find(typeId);
+		if (typeIt == classMetadataMap.end()) return vector<string>();
+
+		map<int, vector<string> >::iterator methodIt = typeIt->second.funcMetadataMap.find(method->GetId());
+		if(methodIt == typeIt->second.funcMetadataMap.end()) return vector<string>();
+
+		return methodIt->second;
+	}
+
+	return vector<string>();
+}
+#endif
+
+string GetAbsolutePath(const string &file)
+{
+	string str = file;
+
+	// If this is a relative path, complement it with the current path
+	if( !((str.length() > 0 && (str[0] == '/' || str[0] == '\\')) ||
+		  str.find(":") != string::npos) )
+	{
+		str = GetCurrentDir() + "/" + str;
+	}
+
+	// Replace backslashes for forward slashes
+	size_t pos = 0;
+	while( (pos = str.find("\\", pos)) != string::npos )
+		str[pos] = '/';
+
+	// Replace /./ with /
+	pos = 0;
+	while( (pos = str.find("/./", pos)) != string::npos )
+		str.erase(pos+1, 2);
+
+	// For each /../ remove the parent dir and the /../
+	pos = 0;
+	while( (pos = str.find("/../")) != string::npos )
+	{
+		size_t pos2 = str.rfind("/", pos-1);
+		if( pos2 != string::npos )
+			str.erase(pos2, pos+3-pos2);
+		else
+		{
+			// The path is invalid
+			break;
+		}
+	}
+
+	return str;
+}
+
+string GetCurrentDir()
+{
+	char buffer[1024];
+#if defined(_MSC_VER) || defined(_WIN32)
+	#ifdef _WIN32_WCE
+	static TCHAR apppath[MAX_PATH] = TEXT("");
+	if (!apppath[0])
+	{
+		GetModuleFileName(NULL, apppath, MAX_PATH);
+
+		int appLen = _tcslen(apppath);
+
+		// Look for the last backslash in the path, which would be the end
+		// of the path itself and the start of the filename.  We only want
+		// the path part of the exe's full-path filename
+		// Safety is that we make sure not to walk off the front of the
+		// array (in case the path is nothing more than a filename)
+		while (appLen > 1)
+		{
+			if (apppath[appLen-1] == TEXT('\\'))
+				break;
+			appLen--;
+		}
+
+		// Terminate the string after the trailing backslash
+		apppath[appLen] = TEXT('\0');
+	}
+		#ifdef _UNICODE
+	wcstombs(buffer, apppath, min(1024, wcslen(apppath)*sizeof(wchar_t)));
+		#else
+	memcpy(buffer, apppath, min(1024, strlen(apppath)));
+		#endif
+
+	return buffer;
+	#elif defined(__S3E__)
+	// Marmalade uses its own portable C library
+	return getcwd(buffer, (int)1024);
+	#elif _XBOX_VER >= 200
+	// XBox 360 doesn't support the getcwd function, just use the root folder
+	return "game:/";
+	#elif defined(_M_ARM)
+	// TODO: How to determine current working dir on Windows Phone?
+	return "";
+	#else
+	return _getcwd(buffer, (int)1024);
+	#endif // _MSC_VER
+#elif defined(__APPLE__) || defined(__linux__)
+	return getcwd(buffer, 1024);
+#else
+	return "";
+#endif
+}
+
+END_AS_NAMESPACE
+
+
diff --git a/Sources/AngelScript/addons/scriptbuilder.h b/Sources/AngelScript/add_on/scriptbuilder/scriptbuilder.h
old mode 100755
new mode 100644
similarity index 67%
rename from Sources/AngelScript/addons/scriptbuilder.h
rename to Sources/AngelScript/add_on/scriptbuilder/scriptbuilder.h
index 3e92a438f..c11f1b925
--- a/Sources/AngelScript/addons/scriptbuilder.h
+++ b/Sources/AngelScript/add_on/scriptbuilder/scriptbuilder.h
@@ -1,193 +1,216 @@
-#ifndef SCRIPTBUILDER_H
-#define SCRIPTBUILDER_H
-
-//---------------------------
-// Compilation settings
-//
-
-// Set this flag to turn on/off metadata processing
-//  0 = off
-//  1 = on
-#ifndef AS_PROCESS_METADATA
-#define AS_PROCESS_METADATA 1
-#endif
-
-// TODO: Implement flags for turning on/off include directives and conditional programming
-
-
-
-//---------------------------
-// Declaration
-//
-
-#ifndef ANGELSCRIPT_H
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-// disable the annoying warnings on MSVC 6
-#pragma warning (disable:4786)
-#endif
-
-#include <string>
-#include <map>
-#include <set>
-#include <vector>
-#include <string.h> // _strcmpi
-
-BEGIN_AS_NAMESPACE
-
-class CScriptBuilder;
-
-// This callback will be called for each #include directive encountered by the
-// builder. The callback should call the AddSectionFromFile or AddSectionFromMemory
-// to add the included section to the script. If the include cannot be resolved
-// then the function should return a negative value to abort the compilation.
-typedef int (*INCLUDECALLBACK_t)(const char *include, const char *from, CScriptBuilder *builder, void *userParam);
-
-// Helper class for loading and pre-processing script files to
-// support include directives and metadata declarations
-class CScriptBuilder
-{
-public:
-	CScriptBuilder();
-
-	// Start a new module
-	int StartNewModule(asIScriptEngine *engine, const char *moduleName);
-
-	// Load a script section from a file on disk
-	// Returns  1 if the file was included
-	//          0 if the file had already been included before
-	//         <0 on error
-	int AddSectionFromFile(const char *filename);
-
-	// Load a script section from memory
-	// Returns  1 if the section was included
-	//          0 if a section with the same name had already been included before
-	//         <0 on error
-	int AddSectionFromMemory(const char *sectionName,
-							 const char *scriptCode,
-							 unsigned int scriptLength = 0,
-							 int lineOffset = 0);
-
-	// Build the added script sections
-	int BuildModule();
-
-	// Returns the current module
-	asIScriptModule *GetModule();
-
-	// Register the callback for resolving include directive
-	void SetIncludeCallback(INCLUDECALLBACK_t callback, void *userParam);
-
-	// Add a pre-processor define for conditional compilation
-	void DefineWord(const char *word);
-
-	// Enumerate included script sections
-	unsigned int GetSectionCount() const;
-	std::string  GetSectionName(unsigned int idx) const;
-
-#if AS_PROCESS_METADATA == 1
-	// Get metadata declared for class types and interfaces
-	const char *GetMetadataStringForType(int typeId);
-
-	// Get metadata declared for functions
-	const char *GetMetadataStringForFunc(asIScriptFunction *func);
-
-	// Get metadata declared for global variables
-	const char *GetMetadataStringForVar(int varIdx);
-
-	// Get metadata declared for class variables
-	const char *GetMetadataStringForTypeProperty(int typeId, int varIdx);
-
-	// Get metadata declared for class functions
-	const char *GetMetadataStringForTypeMethod(int typeId, asIScriptFunction *method);
-#endif
-
-protected:
-	void ClearAll();
-	int  Build();
-	int  ProcessScriptSection(const char *script, unsigned int length, const char *sectionname, int lineOffset);
-    // yvt: changed to virtual function
-	virtual int LoadScriptSection(const char *filename);
-	bool IncludeIfNotAlreadyIncluded(const char *filename);
-
-	int  SkipStatement(int pos);
-
-	int  ExcludeCode(int start);
-	void OverwriteCode(int start, int len);
-
-	asIScriptEngine           *engine;
-	asIScriptModule           *module;
-	std::string                modifiedScript;
-
-	INCLUDECALLBACK_t  includeCallback;
-	void              *callbackParam;
-
-#if AS_PROCESS_METADATA == 1
-	int  ExtractMetadataString(int pos, std::string &outMetadata);
-	int  ExtractDeclaration(int pos, std::string &outDeclaration, int &outType);
-
-	// Temporary structure for storing metadata and declaration
-	struct SMetadataDecl
-	{
-		SMetadataDecl(std::string m, std::string d, int t, std::string c, std::string ns) : metadata(m), declaration(d), type(t), parentClass(c), nameSpace(ns) {}
-		std::string metadata;
-		std::string declaration;
-		int         type;
-		std::string parentClass;
-		std::string nameSpace;
-	};
-	std::vector<SMetadataDecl> foundDeclarations;
-	std::string currentClass;
-	std::string currentNamespace;
-
-	// Storage of metadata for global declarations
-	std::map<int, std::string> typeMetadataMap;
-	std::map<int, std::string> funcMetadataMap;
-	std::map<int, std::string> varMetadataMap;
-
-	// Storage of metadata for class member declarations
-	struct SClassMetadata
-	{
-		SClassMetadata(const std::string& aName) : className(aName) {}
-		std::string className;
-		std::map<int, std::string> funcMetadataMap;
-		std::map<int, std::string> varMetadataMap;
-	};
-	std::map<int, SClassMetadata> classMetadataMap;
-
-#endif
-
-#ifdef _WIN32
-	// On Windows the filenames are case insensitive so the comparisons to
-	// avoid duplicate includes must also be case insensitive. True case insensitive
-	// is not easy as it must be language aware, but a simple implementation such
-	// as strcmpi should suffice in almost all cases.
-	//
-	// ref: http://www.gotw.ca/gotw/029.htm
-	// ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd317761(v=vs.85).aspx
-	// ref: http://site.icu-project.org/
-
-	// TODO: Strings by default are treated as UTF8 encoded. If the application choses to
-	//       use a different encoding, the comparison algorithm should be adjusted as well
-
-	struct ci_less
-	{
-		bool operator()(const std::string &a, const std::string &b) const
-		{
-			return _strcmpi(a.c_str(), b.c_str()) < 0;
-		}
-	};
-	std::set<std::string, ci_less> includedScripts;
-#else
-	std::set<std::string>      includedScripts;
-#endif
-
-	std::set<std::string>      definedWords;
-};
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTBUILDER_H
+#define SCRIPTBUILDER_H
+
+//---------------------------
+// Compilation settings
+//
+
+// Set this flag to turn on/off metadata processing
+//  0 = off
+//  1 = on
+#ifndef AS_PROCESS_METADATA
+#define AS_PROCESS_METADATA 1
+#endif
+
+// TODO: Implement flags for turning on/off include directives and conditional programming
+
+
+
+//---------------------------
+// Declaration
+//
+
+#ifndef ANGELSCRIPT_H
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+// disable the annoying warnings on MSVC 6
+#pragma warning (disable:4786)
+#endif
+
+#include <string>
+#include <map>
+#include <set>
+#include <vector>
+#include <string.h> // _strcmpi
+
+BEGIN_AS_NAMESPACE
+
+class CScriptBuilder;
+
+// This callback will be called for each #include directive encountered by the
+// builder. The callback should call the AddSectionFromFile or AddSectionFromMemory
+// to add the included section to the script. If the include cannot be resolved
+// then the function should return a negative value to abort the compilation.
+typedef int (*INCLUDECALLBACK_t)(const char *include, const char *from, CScriptBuilder *builder, void *userParam);
+
+// This callback will be called for each #pragma directive encountered by the builder.
+// The application can interpret the pragmaText and decide what do to based on that.
+// If the callback returns a negative value the builder will report an error and abort the compilation.
+typedef int(*PRAGMACALLBACK_t)(const std::string &pragmaText, CScriptBuilder &builder, void *userParam);
+
+// Helper class for loading and pre-processing script files to
+// support include directives and metadata declarations
+class CScriptBuilder
+{
+public:
+	CScriptBuilder();
+
+	// Start a new module
+	int StartNewModule(asIScriptEngine *engine, const char *moduleName);
+
+	// Load a script section from a file on disk
+	// Returns  1 if the file was included
+	//          0 if the file had already been included before
+	//         <0 on error
+	int AddSectionFromFile(const char *filename);
+
+	// Load a script section from memory
+	// Returns  1 if the section was included
+	//          0 if a section with the same name had already been included before
+	//         <0 on error
+	int AddSectionFromMemory(const char *sectionName,
+							 const char *scriptCode,
+							 unsigned int scriptLength = 0,
+							 int lineOffset = 0);
+
+	// Build the added script sections
+	int BuildModule();
+
+	// Returns the engine
+	asIScriptEngine *GetEngine();
+
+	// Returns the current module
+	asIScriptModule *GetModule();
+
+	// Register the callback for resolving include directive
+	void SetIncludeCallback(INCLUDECALLBACK_t callback, void *userParam);
+
+	// Register the callback for resolving pragma directive
+	void SetPragmaCallback(PRAGMACALLBACK_t callback, void *userParam);
+
+	// Add a pre-processor define for conditional compilation
+	void DefineWord(const char *word);
+
+	// Enumerate included script sections
+	unsigned int GetSectionCount() const;
+	std::string  GetSectionName(unsigned int idx) const;
+
+#if AS_PROCESS_METADATA == 1
+	// Get metadata declared for classes, interfaces, and enums
+	std::vector<std::string> GetMetadataForType(int typeId);
+
+	// Get metadata declared for functions
+	std::vector<std::string> GetMetadataForFunc(asIScriptFunction *func);
+
+	// Get metadata declared for global variables
+	std::vector<std::string> GetMetadataForVar(int varIdx);
+
+	// Get metadata declared for class variables
+	std::vector<std::string> GetMetadataForTypeProperty(int typeId, int varIdx);
+
+	// Get metadata declared for class methods
+	std::vector<std::string> GetMetadataForTypeMethod(int typeId, asIScriptFunction *method);
+#endif
+
+protected:
+	void ClearAll();
+	int  Build();
+	int  ProcessScriptSection(const char *script, unsigned int length, const char *sectionname, int lineOffset);
+	int  LoadScriptSection(const char *filename);
+	bool IncludeIfNotAlreadyIncluded(const char *filename);
+
+	int  SkipStatement(int pos);
+
+	int  ExcludeCode(int start);
+	void OverwriteCode(int start, int len);
+
+	asIScriptEngine           *engine;
+	asIScriptModule           *module;
+	std::string                modifiedScript;
+
+	INCLUDECALLBACK_t  includeCallback;
+	void              *includeParam;
+
+	PRAGMACALLBACK_t  pragmaCallback;
+	void             *pragmaParam;
+
+#if AS_PROCESS_METADATA == 1
+	int  ExtractMetadata(int pos, std::vector<std::string> &outMetadata);
+	int  ExtractDeclaration(int pos, std::string &outName, std::string &outDeclaration, int &outType);
+
+	enum METADATATYPE
+	{
+		MDT_TYPE = 1,
+		MDT_FUNC = 2,
+		MDT_VAR = 3,
+		MDT_VIRTPROP = 4,
+		MDT_FUNC_OR_VAR = 5
+	};
+
+	// Temporary structure for storing metadata and declaration
+	struct SMetadataDecl
+	{
+		SMetadataDecl(std::vector<std::string> m, std::string n, std::string d, int t, std::string c, std::string ns) : metadata(m), name(n), declaration(d), type(t), parentClass(c), nameSpace(ns) {}
+		std::vector<std::string> metadata;
+		std::string              name;
+		std::string              declaration;
+		int                      type;
+		std::string              parentClass;
+		std::string              nameSpace;
+	};
+	std::vector<SMetadataDecl> foundDeclarations;
+	std::string currentClass;
+	std::string currentNamespace;
+
+	// Storage of metadata for global declarations
+	std::map<int, std::vector<std::string> > typeMetadataMap;
+	std::map<int, std::vector<std::string> > funcMetadataMap;
+	std::map<int, std::vector<std::string> > varMetadataMap;
+
+	// Storage of metadata for class member declarations
+	struct SClassMetadata
+	{
+		SClassMetadata(const std::string& aName) : className(aName) {}
+		std::string className;
+		std::map<int, std::vector<std::string> > funcMetadataMap;
+		std::map<int, std::vector<std::string> > varMetadataMap;
+	};
+	std::map<int, SClassMetadata> classMetadataMap;
+
+#endif
+
+#ifdef _WIN32
+	// On Windows the filenames are case insensitive so the comparisons to
+	// avoid duplicate includes must also be case insensitive. True case insensitive
+	// is not easy as it must be language aware, but a simple implementation such
+	// as strcmpi should suffice in almost all cases.
+	//
+	// ref: http://www.gotw.ca/gotw/029.htm
+	// ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd317761(v=vs.85).aspx
+	// ref: http://site.icu-project.org/
+
+	// TODO: Strings by default are treated as UTF8 encoded. If the application choses to
+	//       use a different encoding, the comparison algorithm should be adjusted as well
+
+	struct ci_less
+	{
+		bool operator()(const std::string &a, const std::string &b) const
+		{
+			return _stricmp(a.c_str(), b.c_str()) < 0;
+		}
+	};
+	std::set<std::string, ci_less> includedScripts;
+#else
+	std::set<std::string>      includedScripts;
+#endif
+
+	std::set<std::string>      definedWords;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scriptdictionary.cpp b/Sources/AngelScript/add_on/scriptdictionary/scriptdictionary.cpp
old mode 100755
new mode 100644
similarity index 90%
rename from Sources/AngelScript/addons/scriptdictionary.cpp
rename to Sources/AngelScript/add_on/scriptdictionary/scriptdictionary.cpp
index 1b896812d..4e0c91833
--- a/Sources/AngelScript/addons/scriptdictionary.cpp
+++ b/Sources/AngelScript/add_on/scriptdictionary/scriptdictionary.cpp
@@ -1,1222 +1,1299 @@
-#include <assert.h>
-#include <string.h>
-#include "scriptdictionary.h"
-#include "scriptarray.h"
-
-BEGIN_AS_NAMESPACE
-
-using namespace std;
-
-//------------------------------------------------------------------------
-// Object types are cached as user data to avoid costly runtime lookups
-
-// We just define a number here that we assume nobody else is using for
-// object type user data. The add-ons have reserved the numbers 1000
-// through 1999 for this purpose, so we should be fine.
-const asPWORD DICTIONARY_CACHE = 1003;
-
-// This cache holds the object type of the dictionary type and array type
-// so it isn't necessary to look this up each time the dictionary or array
-// is created.
-struct SDictionaryCache
-{
-	asITypeInfo *dictType;
-	asITypeInfo *arrayType;
-
-	// This is called from RegisterScriptDictionary
-	static void Setup(asIScriptEngine *engine)
-	{
-		SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
-		if( cache == 0 )
-		{
-			cache = new SDictionaryCache;
-			engine->SetUserData(cache, DICTIONARY_CACHE);
-			engine->SetEngineUserDataCleanupCallback(SDictionaryCache::Cleanup, DICTIONARY_CACHE);
-
-			cache->dictType = engine->GetTypeInfoByName("dictionary");
-			cache->arrayType = engine->GetTypeInfoByDecl("array<string>");
-		}
-	}
-
-	// This is called from the engine when shutting down
-	static void Cleanup(asIScriptEngine *engine)
-	{
-		SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
-		if( cache )
-			delete cache;
-	}
-};
-
-//--------------------------------------------------------------------------
-// CScriptDictionary implementation
-
-CScriptDictionary *CScriptDictionary::Create(asIScriptEngine *engine)
-{
-	// Use the custom memory routine from AngelScript to allow application to better control how much memory is used
-	CScriptDictionary *obj = (CScriptDictionary*)asAllocMem(sizeof(CScriptDictionary));
-	new(obj) CScriptDictionary(engine);
-	return obj;
-}
-
-CScriptDictionary *CScriptDictionary::Create(asBYTE *buffer)
-{
-	// Use the custom memory routine from AngelScript to allow application to better control how much memory is used
-	CScriptDictionary *obj = (CScriptDictionary*)asAllocMem(sizeof(CScriptDictionary));
-	new(obj) CScriptDictionary(buffer);
-	return obj;
-}
-
-CScriptDictionary::CScriptDictionary(asIScriptEngine *engine)
-{
-	Init(engine);
-}
-
-void CScriptDictionary::Init(asIScriptEngine *e)
-{
-	// We start with one reference
-	refCount = 1;
-	gcFlag = false;
-
-	// Keep a reference to the engine for as long as we live
-	// We don't increment the reference counter, because the 
-	// engine will hold a pointer to the object in the GC.
-	engine = e;
-
-	// The dictionary object type is cached to avoid dynamically parsing it each time
-	SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
-
-	// Notify the garbage collector of this object
-	engine->NotifyGarbageCollectorOfNewObject(this, cache->dictType);
-}
-
-CScriptDictionary::CScriptDictionary(asBYTE *buffer)
-{
-	// This constructor will always be called from a script
-	// so we can get the engine from the active context
-	asIScriptContext *ctx = asGetActiveContext();
-	Init(ctx->GetEngine());
-
-	// Initialize the dictionary from the buffer
-	asUINT length = *(asUINT*)buffer;
-	buffer += 4;
-
-	while( length-- )
-	{
-		// Align the buffer pointer on a 4 byte boundary in 
-		// case previous value was smaller than 4 bytes
-		if( asPWORD(buffer) & 0x3 )
-			buffer += 4 - (asPWORD(buffer) & 0x3);
-
-		// Get the name value pair from the buffer and insert it in the dictionary
-		dictKey_t name = *(dictKey_t*)buffer;
-		buffer += sizeof(dictKey_t);
-
-		// Get the type id of the value
-		int typeId = *(int*)buffer;
-		buffer += sizeof(int);
-
-		// Depending on the type id, the value will inline in the buffer or a pointer
-		void *ref = (void*)buffer;
-
-		if( typeId >= asTYPEID_INT8 && typeId <= asTYPEID_DOUBLE )
-		{
-			// Convert primitive values to either int64 or double, so we can use the overloaded Set methods
-			asINT64 i64;
-			double d;
-			switch( typeId )
-			{
-			case asTYPEID_INT8:   i64 = *(char*)          ref; break;
-			case asTYPEID_INT16:  i64 = *(short*)         ref; break;
-			case asTYPEID_INT32:  i64 = *(int*)           ref; break;
-			case asTYPEID_INT64:  i64 = *(asINT64*)       ref; break;
-			case asTYPEID_UINT8:  i64 = *(unsigned char*) ref; break;
-			case asTYPEID_UINT16: i64 = *(unsigned short*)ref; break;
-			case asTYPEID_UINT32: i64 = *(unsigned int*)  ref; break;
-			case asTYPEID_UINT64: i64 = *(asINT64*)       ref; break;
-			case asTYPEID_FLOAT:  d   = *(float*)         ref; break;
-			case asTYPEID_DOUBLE: d   = *(double*)        ref; break;
-			}
-			
-			if( typeId >= asTYPEID_FLOAT )
-				Set(name, d);
-			else
-				Set(name, i64);
-		}
-		else
-		{
-			if( (typeId & asTYPEID_MASK_OBJECT) && 
-				!(typeId & asTYPEID_OBJHANDLE) && 
-				(engine->GetTypeInfoById(typeId)->GetFlags() & asOBJ_REF) )
-			{
-				// Dereference the pointer to get the reference to the actual object
-				ref = *(void**)ref;
-			}
-
-			Set(name, ref, typeId);
-		}
-
-		// Advance the buffer pointer with the size of the value
-		if( typeId & asTYPEID_MASK_OBJECT )
-		{
-			asITypeInfo *ti = engine->GetTypeInfoById(typeId);
-			if( ti->GetFlags() & asOBJ_VALUE )
-				buffer += ti->GetSize();
-			else
-				buffer += sizeof(void*);
-		}
-		else if( typeId == 0 )
-		{
-			// null pointer
-			buffer += sizeof(void*);
-		}
-		else
-		{
-			buffer += engine->GetSizeOfPrimitiveType(typeId);
-		}
-	}
-}
-
-CScriptDictionary::~CScriptDictionary()
-{
-	// Delete all keys and values
-	DeleteAll();
-}
-
-void CScriptDictionary::AddRef() const
-{
-	// We need to clear the GC flag
-	gcFlag = false;
-	refCount.fetch_add(1);
-}
-
-void CScriptDictionary::Release() const
-{
-	// We need to clear the GC flag
-	gcFlag = false;
-	if( refCount.fetch_sub(1) == 1 )
-	{
-		this->~CScriptDictionary();
-		asFreeMem(const_cast<CScriptDictionary*>(this));
-	}
-}
-
-int CScriptDictionary::GetRefCount()
-{
-	return refCount;
-}
-
-void CScriptDictionary::SetGCFlag()
-{
-	gcFlag = true;
-}
-
-bool CScriptDictionary::GetGCFlag()
-{
-	return gcFlag;
-}
-
-void CScriptDictionary::EnumReferences(asIScriptEngine *inEngine)
-{
-	// TODO: If garbage collection can be done from a separate thread, then this method must be
-	//       protected so that it doesn't get lost during the iteration if the dictionary is modified
-
-	// Call the gc enum callback for each of the objects
-	dictMap_t::iterator it;
-	for( it = dict.begin(); it != dict.end(); it++ )
-	{
-		if( it->second.m_typeId & asTYPEID_MASK_OBJECT )
-			inEngine->GCEnumCallback(it->second.m_valueObj);
-	}
-}
-
-void CScriptDictionary::ReleaseAllReferences(asIScriptEngine * /*engine*/)
-{
-	// We're being told to release all references in 
-	// order to break circular references for dead objects
-	DeleteAll();
-}
-
-CScriptDictionary &CScriptDictionary::operator =(const CScriptDictionary &other)
-{
-	// Clear everything we had before
-	DeleteAll();
-
-	// Do a shallow copy of the dictionary
-	dictMap_t::const_iterator it;
-	for( it = other.dict.begin(); it != other.dict.end(); it++ )
-	{
-		if( it->second.m_typeId & asTYPEID_OBJHANDLE )
-			Set(it->first, (void*)&it->second.m_valueObj, it->second.m_typeId);
-		else if( it->second.m_typeId & asTYPEID_MASK_OBJECT )
-			Set(it->first, (void*)it->second.m_valueObj, it->second.m_typeId);
-		else
-			Set(it->first, (void*)&it->second.m_valueInt, it->second.m_typeId);
-	}
-
-	return *this;
-}
-
-CScriptDictValue *CScriptDictionary::operator[](const dictKey_t &key)
-{
-	// Return the existing value if it exists, else insert an empty value
-	return &dict[key];
-}
-
-const CScriptDictValue *CScriptDictionary::operator[](const dictKey_t &key) const
-{
-	// Return the existing value if it exists
-	dictMap_t::const_iterator it;
-	it = dict.find(key);
-	if( it != dict.end() )
-		return &it->second;
-
-	// Else raise an exception
-	asIScriptContext *ctx = asGetActiveContext();
-	if( ctx )
-		ctx->SetException("Invalid access to non-existing value");
-
-	return 0;
-}
-
-void CScriptDictionary::Set(const dictKey_t &key, void *value, int typeId)
-{
-	dictMap_t::iterator it;
-	it = dict.find(key);
-	if( it == dict.end() )
-		it = dict.insert(dictMap_t::value_type(key, CScriptDictValue())).first;
-
-	it->second.Set(engine, value, typeId);
-}
-
-// This overloaded method is implemented so that all integer and
-// unsigned integers types will be stored in the dictionary as int64
-// through implicit conversions. This simplifies the management of the
-// numeric types when the script retrieves the stored value using a 
-// different type.
-void CScriptDictionary::Set(const dictKey_t &key, const asINT64 &value)
-{
-	Set(key, const_cast<asINT64*>(&value), asTYPEID_INT64);
-}
-
-// This overloaded method is implemented so that all floating point types 
-// will be stored in the dictionary as double through implicit conversions. 
-// This simplifies the management of the numeric types when the script 
-// retrieves the stored value using a different type.
-void CScriptDictionary::Set(const dictKey_t &key, const double &value)
-{
-	Set(key, const_cast<double*>(&value), asTYPEID_DOUBLE);
-}
-
-// Returns true if the value was successfully retrieved
-bool CScriptDictionary::Get(const dictKey_t &key, void *value, int typeId) const
-{
-	dictMap_t::const_iterator it;
-	it = dict.find(key);
-	if( it != dict.end() )
-		return it->second.Get(engine, value, typeId);
-
-	// AngelScript has already initialized the value with a default value,
-	// so we don't have to do anything if we don't find the element, or if 
-	// the element is incompatible with the requested type.
-
-	return false;
-}
-
-// Returns the type id of the stored value
-int CScriptDictionary::GetTypeId(const dictKey_t &key) const
-{
-	dictMap_t::const_iterator it;
-	it = dict.find(key);
-	if( it != dict.end() )
-		return it->second.m_typeId;
-
-	return -1;
-}
-
-bool CScriptDictionary::Get(const dictKey_t &key, asINT64 &value) const
-{
-	return Get(key, &value, asTYPEID_INT64);
-}
-
-bool CScriptDictionary::Get(const dictKey_t &key, double &value) const
-{
-	return Get(key, &value, asTYPEID_DOUBLE);
-}
-
-bool CScriptDictionary::Exists(const dictKey_t &key) const
-{
-	dictMap_t::const_iterator it;
-	it = dict.find(key);
-	if( it != dict.end() )
-		return true;
-
-	return false;
-}
-
-bool CScriptDictionary::IsEmpty() const
-{
-	if( dict.size() == 0 )
-		return true;
-
-	return false;
-}
-
-asUINT CScriptDictionary::GetSize() const
-{
-	return asUINT(dict.size());
-}
-
-bool CScriptDictionary::Delete(const dictKey_t &key)
-{
-	dictMap_t::iterator it;
-	it = dict.find(key);
-	if( it != dict.end() )
-	{
-		it->second.FreeValue(engine);
-		dict.erase(it);
-		return true;
-	}
-
-	return false;
-}
-
-void CScriptDictionary::DeleteAll()
-{
-	dictMap_t::iterator it;
-	for( it = dict.begin(); it != dict.end(); it++ )
-		it->second.FreeValue(engine);
-
-	dict.clear();
-}
-
-CScriptArray* CScriptDictionary::GetKeys() const
-{
-	// Retrieve the object type for the array<string> from the cache
-	SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
-	asITypeInfo *ti = cache->arrayType;
-
-	// Create the array object
-	CScriptArray *array = CScriptArray::Create(ti, asUINT(dict.size()));
-	long current = -1;
-	dictMap_t::const_iterator it;
-	for( it = dict.begin(); it != dict.end(); it++ )
-	{
-		current++;
-		*(dictKey_t*)array->At(static_cast<asUINT> (current)) = it->first;
-	}
-
-	return array;
-}
-
-//--------------------------------------------------------------------------
-// Generic wrappers
-
-void ScriptDictionaryFactory_Generic(asIScriptGeneric *gen)
-{
-	*(CScriptDictionary**)gen->GetAddressOfReturnLocation() = CScriptDictionary::Create(gen->GetEngine());
-}
-
-void ScriptDictionaryListFactory_Generic(asIScriptGeneric *gen)
-{
-	asBYTE *buffer = (asBYTE*)gen->GetArgAddress(0);
-	*(CScriptDictionary**)gen->GetAddressOfReturnLocation() = CScriptDictionary::Create(buffer);
-}
-
-void ScriptDictionaryAddRef_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dict->AddRef();
-}
-
-void ScriptDictionaryRelease_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dict->Release();
-}
-
-void ScriptDictionaryAssign_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	CScriptDictionary *other = *(CScriptDictionary**)gen->GetAddressOfArg(0);
-	*dict = *other;
-	*(CScriptDictionary**)gen->GetAddressOfReturnLocation() = dict;
-}
-
-void ScriptDictionarySet_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	void *ref = *(void**)gen->GetAddressOfArg(1);
-	int typeId = gen->GetArgTypeId(1);
-	dict->Set(*key, ref, typeId);
-}
-
-void ScriptDictionarySetInt_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	void *ref = *(void**)gen->GetAddressOfArg(1);
-	dict->Set(*key, *(asINT64*)ref);
-}
-
-void ScriptDictionarySetFlt_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	void *ref = *(void**)gen->GetAddressOfArg(1);
-	dict->Set(*key, *(double*)ref);
-}
-
-void ScriptDictionaryGet_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	void *ref = *(void**)gen->GetAddressOfArg(1);
-	int typeId = gen->GetArgTypeId(1);
-	*(bool*)gen->GetAddressOfReturnLocation() = dict->Get(*key, ref, typeId);
-}
-
-void ScriptDictionaryGetInt_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	void *ref = *(void**)gen->GetAddressOfArg(1);
-	*(bool*)gen->GetAddressOfReturnLocation() = dict->Get(*key, *(asINT64*)ref);
-}
-
-void ScriptDictionaryGetFlt_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	void *ref = *(void**)gen->GetAddressOfArg(1);
-	*(bool*)gen->GetAddressOfReturnLocation() = dict->Get(*key, *(double*)ref);
-}
-
-void ScriptDictionaryExists_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	bool ret = dict->Exists(*key);
-	*(bool*)gen->GetAddressOfReturnLocation() = ret;
-}
-
-void ScriptDictionaryIsEmpty_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	bool ret = dict->IsEmpty();
-	*(bool*)gen->GetAddressOfReturnLocation() = ret;
-}
-
-void ScriptDictionaryGetSize_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	asUINT ret = dict->GetSize();
-	*(asUINT*)gen->GetAddressOfReturnLocation() = ret;
-}
-
-void ScriptDictionaryDelete_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	*(bool*)gen->GetAddressOfReturnLocation() = dict->Delete(*key);
-}
-
-void ScriptDictionaryDeleteAll_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
-	dict->DeleteAll();
-}
-
-static void ScriptDictionaryGetRefCount_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
-	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
-}
-
-static void ScriptDictionarySetGCFlag_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
-	self->SetGCFlag();
-}
-
-static void ScriptDictionaryGetGCFlag_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
-	*(bool*)gen->GetAddressOfReturnLocation() = self->GetGCFlag();
-}
-
-static void ScriptDictionaryEnumReferences_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->EnumReferences(engine);
-}
-
-static void ScriptDictionaryReleaseAllReferences_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->ReleaseAllReferences(engine);
-}
-
-static void CScriptDictionaryGetKeys_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
-	*(CScriptArray**)gen->GetAddressOfReturnLocation() = self->GetKeys();
-}
-
-static void CScriptDictionary_opIndex_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = self->operator[](*key);
-}
-
-static void CScriptDictionary_opIndex_const_Generic(asIScriptGeneric *gen)
-{
-	const CScriptDictionary *self = (const CScriptDictionary*)gen->GetObject();
-	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
-	*(const CScriptDictValue**)gen->GetAddressOfReturnLocation() = self->operator[](*key);
-}
-
-
-//-------------------------------------------------------------------------
-// CScriptDictValue
-
-CScriptDictValue::CScriptDictValue()
-{
-	m_valueObj = 0;
-	m_typeId   = 0;
-}
-
-CScriptDictValue::CScriptDictValue(asIScriptEngine *engine, void *value, int typeId)
-{
-	m_valueObj = 0;
-	m_typeId   = 0;
-	Set(engine, value, typeId);
-}
-
-CScriptDictValue::~CScriptDictValue()
-{
-	// Must not hold an object when destroyed, as then the object will never be freed
-	assert( (m_typeId & asTYPEID_MASK_OBJECT) == 0 );
-}
-
-void CScriptDictValue::FreeValue(asIScriptEngine *engine)
-{
-	// If it is a handle or a ref counted object, call release
-	if( m_typeId & asTYPEID_MASK_OBJECT )
-	{
-		// Let the engine release the object
-		engine->ReleaseScriptObject(m_valueObj, engine->GetTypeInfoById(m_typeId));
-		m_valueObj = 0;
-		m_typeId = 0;
-	}
-
-	// For primitives, there's nothing to do
-}
-
-void CScriptDictValue::Set(asIScriptEngine *engine, void *value, int typeId)
-{
-	FreeValue(engine);
-
-	m_typeId = typeId;
-	if( typeId & asTYPEID_OBJHANDLE )
-	{
-		// We're receiving a reference to the handle, so we need to dereference it
-		m_valueObj = *(void**)value;
-		engine->AddRefScriptObject(m_valueObj, engine->GetTypeInfoById(typeId));
-	}
-	else if( typeId & asTYPEID_MASK_OBJECT )
-	{
-		// Create a copy of the object
-		m_valueObj = engine->CreateScriptObjectCopy(value, engine->GetTypeInfoById(typeId));
-	}
-	else
-	{
-		// Copy the primitive value
-		// We receive a pointer to the value.
-		int size = engine->GetSizeOfPrimitiveType(typeId);
-		memcpy(&m_valueInt, value, size);
-	}
-}
-
-void CScriptDictValue::Set(asIScriptEngine *engine, CScriptDictValue &value)
-{
-	if( value.m_typeId & asTYPEID_OBJHANDLE )
-		Set(engine, (void*)&value.m_valueObj, value.m_typeId);
-	else if( value.m_typeId & asTYPEID_MASK_OBJECT )
-		Set(engine, (void*)value.m_valueObj, value.m_typeId);
-	else
-		Set(engine, (void*)&value.m_valueInt, value.m_typeId);
-}
-
-// This overloaded method is implemented so that all integer and
-// unsigned integers types will be stored in the dictionary as int64
-// through implicit conversions. This simplifies the management of the
-// numeric types when the script retrieves the stored value using a 
-// different type.
-void CScriptDictValue::Set(asIScriptEngine *engine, const asINT64 &value)
-{
-	Set(engine, const_cast<asINT64*>(&value), asTYPEID_INT64);
-}
-
-// This overloaded method is implemented so that all floating point types 
-// will be stored in the dictionary as double through implicit conversions. 
-// This simplifies the management of the numeric types when the script 
-// retrieves the stored value using a different type.
-void CScriptDictValue::Set(asIScriptEngine *engine, const double &value)
-{
-	Set(engine, const_cast<double*>(&value), asTYPEID_DOUBLE);
-}
-
-bool CScriptDictValue::Get(asIScriptEngine *engine, void *value, int typeId) const
-{
-	// Return the value
-	if( typeId & asTYPEID_OBJHANDLE )
-	{
-		// A handle can be retrieved if the stored type is a handle of same or compatible type
-		// or if the stored type is an object that implements the interface that the handle refer to.
-		if( (m_typeId & asTYPEID_MASK_OBJECT) )
-		{
-			// Don't allow the get if the stored handle is to a const, but the desired handle is not
-			if( (m_typeId & asTYPEID_HANDLETOCONST) && !(typeId & asTYPEID_HANDLETOCONST) )
-				return false;
-
-			// RefCastObject will increment the refcount if successful
-			engine->RefCastObject(m_valueObj, engine->GetTypeInfoById(m_typeId), engine->GetTypeInfoById(typeId), reinterpret_cast<void**>(value));
-
-			return true;
-		}
-	}
-	else if( typeId & asTYPEID_MASK_OBJECT )
-	{
-		// Verify that the copy can be made
-		bool isCompatible = false;
-
-		// Allow a handle to be value assigned if the wanted type is not a handle
-		if( (m_typeId & ~asTYPEID_OBJHANDLE) == typeId && m_valueObj != 0 )
-			isCompatible = true;
-
-		// Copy the object into the given reference
-		if( isCompatible )
-		{
-			engine->AssignScriptObject(value, m_valueObj, engine->GetTypeInfoById(typeId));
-
-			return true;
-		}
-	}
-	else
-	{
-		if( m_typeId == typeId )
-		{
-			int size = engine->GetSizeOfPrimitiveType(typeId);
-			memcpy(value, &m_valueInt, size);
-			return true;
-		}
-
-		// We know all numbers are stored as either int64 or double, since we register overloaded functions for those
-		// Only bool and enums needs to be treated separately
-		if( typeId == asTYPEID_DOUBLE )
-		{
-			if( m_typeId == asTYPEID_INT64 )
-				*(double*)value = double(m_valueInt);
-			else if (m_typeId == asTYPEID_BOOL)
-			{
-				// Use memcpy instead of type cast to make sure the code is endianess agnostic
-				char localValue;
-				memcpy(&localValue, &m_valueInt, sizeof(char));
-				*(double*)value = localValue ? 1.0 : 0.0;
-			}
-			else if (m_typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0)
-			{
-				// Use memcpy instead of type cast to make sure the code is endianess agnostic
-				int localValue;
-				memcpy(&localValue, &m_valueInt, sizeof(int));
-				*(double*)value = double(localValue); // enums are 32bit
-			}
-			else
-			{
-				// The stored type is an object
-				// TODO: Check if the object has a conversion operator to a primitive value
-				*(double*)value = 0;
-			}
-			return true;
-		}
-		else if( typeId == asTYPEID_INT64 )
-		{
-			if( m_typeId == asTYPEID_DOUBLE )
-				*(asINT64*)value = asINT64(m_valueFlt);
-			else if (m_typeId == asTYPEID_BOOL)
-			{
-				// Use memcpy instead of type cast to make sure the code is endianess agnostic
-				char localValue;
-				memcpy(&localValue, &m_valueInt, sizeof(char));
-				*(asINT64*)value = localValue ? 1 : 0;
-			}
-			else if (m_typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0)
-			{
-				// Use memcpy instead of type cast to make sure the code is endianess agnostic
-				int localValue;
-				memcpy(&localValue, &m_valueInt, sizeof(int));
-				*(asINT64*)value = localValue; // enums are 32bit
-			}
-			else
-			{
-				// The stored type is an object
-				// TODO: Check if the object has a conversion operator to a primitive value
-				*(asINT64*)value = 0;
-			}
-			return true;
-		}
-		else if( typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0 )
-		{
-			// The desired type is an enum. These are always 32bit integers
-			if( m_typeId == asTYPEID_DOUBLE )
-				*(int*)value = int(m_valueFlt);
-			else if( m_typeId == asTYPEID_INT64 )
-				*(int*)value = int(m_valueInt);
-			else if (m_typeId == asTYPEID_BOOL)
-			{
-				// Use memcpy instead of type cast to make sure the code is endianess agnostic
-				char localValue;
-				memcpy(&localValue, &m_valueInt, sizeof(char));
-				*(int*)value = localValue ? 1 : 0;
-			}
-			else if (m_typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0)
-			{
-				// Use memcpy instead of type cast to make sure the code is endianess agnostic
-				int localValue;
-				memcpy(&localValue, &m_valueInt, sizeof(int));
-				*(int*)value = localValue; // enums are 32bit
-			}
-			else
-			{
-				// The stored type is an object
-				// TODO: Check if the object has a conversion operator to a primitive value
-				*(int*)value = 0;
-			}
-		}
-		else if( typeId == asTYPEID_BOOL )
-		{
-			if (m_typeId & asTYPEID_OBJHANDLE)
-			{
-				// TODO: Check if the object has a conversion operator to a primitive value
-				*(bool*)value = m_valueObj ? true : false;
-			}
-			else if( m_typeId & asTYPEID_MASK_OBJECT )
-			{
-				// TODO: Check if the object has a conversion operator to a primitive value
-				*(bool*)value = true;
-			}
-			else
-			{
-				// Compare only the bytes that were actually set
-				asQWORD zero = 0;
-				int size = engine->GetSizeOfPrimitiveType(m_typeId);
-				*(bool*)value = memcmp(&m_valueInt, &zero, size) == 0 ? false : true;
-			}
-		}
-	}
-
-	// It was not possible to retrieve the value using the desired typeId
-	return false;
-}
-
-const void * CScriptDictValue::GetAddressOfValue() const
-{
-	if( (m_typeId & asTYPEID_MASK_OBJECT) && !(m_typeId & asTYPEID_OBJHANDLE) )
-	{
-		// Return the address to the object directly
-		return m_valueObj;
-	}
-	
-	// Return the address of the primitive or the pointer to the object
-	return reinterpret_cast<const void*>(&m_valueObj);
-}
-
-bool CScriptDictValue::Get(asIScriptEngine *engine, asINT64 &value) const
-{
-	return Get(engine, &value, asTYPEID_INT64);
-}
-
-bool CScriptDictValue::Get(asIScriptEngine *engine, double &value) const
-{
-	return Get(engine, &value, asTYPEID_DOUBLE);
-}
-
-int CScriptDictValue::GetTypeId() const
-{
-	return m_typeId;
-}
-
-static void CScriptDictValue_Construct(void *mem)
-{
-	new(mem) CScriptDictValue();
-}
-
-static void CScriptDictValue_Destruct(CScriptDictValue *obj)
-{
-	asIScriptContext *ctx = asGetActiveContext();
-	if( ctx )
-	{
-		asIScriptEngine *engine = ctx->GetEngine();
-		obj->FreeValue(engine);
-	}
-	obj->~CScriptDictValue();
-}
-
-static CScriptDictValue &CScriptDictValue_opAssign(void *ref, int typeId, CScriptDictValue *obj)
-{
-	asIScriptContext *ctx = asGetActiveContext();
-	if( ctx )
-	{
-		asIScriptEngine *engine = ctx->GetEngine();
-		obj->Set(engine, ref, typeId);
-	}
-	return *obj;
-}
-
-static CScriptDictValue &CScriptDictValue_opAssign(const CScriptDictValue &other, CScriptDictValue *obj)
-{
-	asIScriptContext *ctx = asGetActiveContext();
-	if( ctx ) 
-	{
-		asIScriptEngine *engine = ctx->GetEngine();
-		obj->Set(engine, const_cast<CScriptDictValue&>(other));
-	}
-
-	return *obj;
-}
-
-static CScriptDictValue &CScriptDictValue_opAssign(double val, CScriptDictValue *obj)
-{
-	return CScriptDictValue_opAssign(&val, asTYPEID_DOUBLE, obj);
-}
-
-static CScriptDictValue &CScriptDictValue_opAssign(asINT64 val, CScriptDictValue *obj)
-{
-	return CScriptDictValue_opAssign(&val, asTYPEID_INT64, obj);
-}
-
-static void CScriptDictValue_opCast(void *ref, int typeId, CScriptDictValue *obj)
-{
-	asIScriptContext *ctx = asGetActiveContext();
-	if( ctx )
-	{
-		asIScriptEngine *engine = ctx->GetEngine();
-		obj->Get(engine, ref, typeId);
-	}
-}
-
-static asINT64 CScriptDictValue_opConvInt(CScriptDictValue *obj)
-{
-	asINT64 value;
-	CScriptDictValue_opCast(&value, asTYPEID_INT64, obj);
-	return value;
-}
-
-static double CScriptDictValue_opConvDouble(CScriptDictValue *obj)
-{
-	double value;
-	CScriptDictValue_opCast(&value, asTYPEID_DOUBLE, obj);
-	return value;
-}
-
-//-------------------------------------------------------------------
-// generic wrapper for CScriptDictValue
-
-static void CScriptDictValue_opConvDouble_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	double value;
-	self->Get(gen->GetEngine(), value);
-	*(double*)gen->GetAddressOfReturnLocation() = value;
-}
-
-static void CScriptDictValue_opConvInt_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	asINT64 value;
-	self->Get(gen->GetEngine(), value);
-	*(asINT64*)gen->GetAddressOfReturnLocation() = value;
-}
-
-static void CScriptDictValue_opCast_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	self->Get(gen->GetEngine(), gen->GetArgAddress(0), gen->GetArgTypeId(0));
-}
-
-static void CScriptDictValue_opAssign_int64_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign((asINT64)gen->GetArgQWord(0), self);
-}
-
-static void CScriptDictValue_opAssign_double_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign(gen->GetArgDouble(0), self);
-}
-
-static void CScriptDictValue_opAssign_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign(gen->GetArgAddress(0), gen->GetArgTypeId(0), self);
-}
-
-static void CScriptDictValue_opCopyAssign_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign(*reinterpret_cast<CScriptDictValue*>(gen->GetArgAddress(0)), self);
-}
-
-static void CScriptDictValue_Construct_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	CScriptDictValue_Construct(self);
-}
-
-static void CScriptDictValue_Destruct_Generic(asIScriptGeneric *gen)
-{
-	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
-	CScriptDictValue_Destruct(self);
-}
-
-//--------------------------------------------------------------------------
-// Register the type
-
-void RegisterScriptDictionary(asIScriptEngine *engine)
-{
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
-		RegisterScriptDictionary_Generic(engine);
-	else
-		RegisterScriptDictionary_Native(engine);
-}
-
-void RegisterScriptDictionary_Native(asIScriptEngine *engine)
-{
-	int r;
-
-	// The array<string> type must be available
-	assert( engine->GetTypeInfoByDecl("array<string>") );
-
-#if AS_CAN_USE_CPP11
-	// With C++11 it is possible to use asGetTypeTraits to automatically determine the correct flags that represents the C++ class
-	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asGetTypeTraits<CScriptDictValue>()); assert( r >= 0 );
-#else
-	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_APP_CLASS_CD); assert( r >= 0 );
-#endif
-	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(CScriptDictValue_Construct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(CScriptDictValue_Destruct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const dictionaryValue &in)", asFUNCTIONPR(CScriptDictValue_opAssign, (const CScriptDictValue &, CScriptDictValue *), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opHndlAssign(const ?&in)", asFUNCTIONPR(CScriptDictValue_opAssign, (void *, int, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const ?&in)", asFUNCTIONPR(CScriptDictValue_opAssign, (void *, int, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(double)", asFUNCTIONPR(CScriptDictValue_opAssign, (double, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(int64)", asFUNCTIONPR(CScriptDictValue_opAssign, (asINT64, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "void opCast(?&out)", asFUNCTIONPR(CScriptDictValue_opCast, (void *, int, CScriptDictValue*), void), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "void opConv(?&out)", asFUNCTIONPR(CScriptDictValue_opCast, (void *, int, CScriptDictValue*), void), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "int64 opConv()", asFUNCTIONPR(CScriptDictValue_opConvInt, (CScriptDictValue*), asINT64), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "double opConv()", asFUNCTIONPR(CScriptDictValue_opConvDouble, (CScriptDictValue*), double), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	
-	r = engine->RegisterObjectType("dictionary", sizeof(CScriptDictionary), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
-	// Use the generic interface to construct the object since we need the engine pointer, we could also have retrieved the engine pointer from the active context
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_FACTORY, "dictionary@ f()", asFUNCTION(ScriptDictionaryFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_LIST_FACTORY, "dictionary @f(int &in) {repeat {string, ?}}", asFUNCTION(ScriptDictionaryListFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptDictionary,AddRef), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptDictionary,Release), asCALL_THISCALL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "dictionary &opAssign(const dictionary &in)", asMETHODPR(CScriptDictionary, operator=, (const CScriptDictionary &), CScriptDictionary&), asCALL_THISCALL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const ?&in)", asMETHODPR(CScriptDictionary,Set,(const dictKey_t&,void*,int),void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, ?&out) const", asMETHODPR(CScriptDictionary,Get,(const dictKey_t&,void*,int) const,bool), asCALL_THISCALL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const int64&in)", asMETHODPR(CScriptDictionary,Set,(const dictKey_t&,const asINT64&),void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, int64&out) const", asMETHODPR(CScriptDictionary,Get,(const dictKey_t&,asINT64&) const,bool), asCALL_THISCALL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const double&in)", asMETHODPR(CScriptDictionary,Set,(const dictKey_t&,const double&),void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, double&out) const", asMETHODPR(CScriptDictionary,Get,(const dictKey_t&,double&) const,bool), asCALL_THISCALL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "bool exists(const string &in) const", asMETHOD(CScriptDictionary,Exists), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool isEmpty() const", asMETHOD(CScriptDictionary, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "uint getSize() const", asMETHOD(CScriptDictionary, GetSize), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool delete(const string &in)", asMETHOD(CScriptDictionary,Delete), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "void deleteAll()", asMETHOD(CScriptDictionary,DeleteAll), asCALL_THISCALL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "array<string> @getKeys() const", asMETHOD(CScriptDictionary,GetKeys), asCALL_THISCALL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "dictionaryValue &opIndex(const string &in)", asMETHODPR(CScriptDictionary, operator[], (const dictKey_t &), CScriptDictValue*), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "const dictionaryValue &opIndex(const string &in) const", asMETHODPR(CScriptDictionary, operator[], (const dictKey_t &) const, const CScriptDictValue*), asCALL_THISCALL); assert( r >= 0 );
-
-	// Register GC behaviours
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(CScriptDictionary,GetRefCount), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_SETGCFLAG, "void f()", asMETHOD(CScriptDictionary,SetGCFlag), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(CScriptDictionary,GetGCFlag), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptDictionary,EnumReferences), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptDictionary,ReleaseAllReferences), asCALL_THISCALL); assert( r >= 0 );
-
-#if AS_USE_STLNAMES == 1
-	// Same as isEmpty
-	r = engine->RegisterObjectMethod("dictionary", "bool empty() const", asMETHOD(CScriptDictionary, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
-	// Same as getSize
-	r = engine->RegisterObjectMethod("dictionary", "uint size() const", asMETHOD(CScriptDictionary, GetSize), asCALL_THISCALL); assert( r >= 0 );
-	// Same as delete
-	r = engine->RegisterObjectMethod("dictionary", "void erase(const string &in)", asMETHOD(CScriptDictionary,Delete), asCALL_THISCALL); assert( r >= 0 );
-	// Same as deleteAll
-	r = engine->RegisterObjectMethod("dictionary", "void clear()", asMETHOD(CScriptDictionary,DeleteAll), asCALL_THISCALL); assert( r >= 0 );
-#endif
-
-	// Cache some things the dictionary will need at runtime
-	SDictionaryCache::Setup(engine);
-}
-
-void RegisterScriptDictionary_Generic(asIScriptEngine *engine)
-{
-	int r;
-
-	// Register the cleanup callback for the object type cache
-	engine->SetEngineUserDataCleanupCallback(SDictionaryCache::Cleanup, DICTIONARY_CACHE);
-
-#if AS_CAN_USE_CPP11
-	// With C++11 it is possible to use asGetTypeTraits to automatically determine the correct flags that represents the C++ class
-	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asGetTypeTraits<CScriptDictValue>()); assert( r >= 0 );
-#else
-	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_APP_CLASS_CD); assert( r >= 0 );
-#endif
-	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(CScriptDictValue_Construct_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(CScriptDictValue_Destruct_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const dictionaryValue &in)", asFUNCTION(CScriptDictValue_opCopyAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opHndlAssign(const ?&in)", asFUNCTION(CScriptDictValue_opAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const ?&in)", asFUNCTION(CScriptDictValue_opAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(double)", asFUNCTION(CScriptDictValue_opAssign_double_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(int64)", asFUNCTION(CScriptDictValue_opAssign_int64_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "void opCast(?&out)", asFUNCTION(CScriptDictValue_opCast_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "void opConv(?&out)", asFUNCTION(CScriptDictValue_opCast_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "int64 opConv()", asFUNCTION(CScriptDictValue_opConvInt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionaryValue", "double opConv()", asFUNCTION(CScriptDictValue_opConvDouble_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectType("dictionary", sizeof(CScriptDictionary), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_FACTORY, "dictionary@ f()", asFUNCTION(ScriptDictionaryFactory_Generic), asCALL_GENERIC); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_LIST_FACTORY, "dictionary @f(int &in) {repeat {string, ?}}", asFUNCTION(ScriptDictionaryListFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptDictionaryAddRef_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptDictionaryRelease_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "dictionary &opAssign(const dictionary &in)", asFUNCTION(ScriptDictionaryAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const ?&in)", asFUNCTION(ScriptDictionarySet_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, ?&out) const", asFUNCTION(ScriptDictionaryGet_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const int64&in)", asFUNCTION(ScriptDictionarySetInt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, int64&out) const", asFUNCTION(ScriptDictionaryGetInt_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const double&in)", asFUNCTION(ScriptDictionarySetFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, double&out) const", asFUNCTION(ScriptDictionaryGetFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "bool exists(const string &in) const", asFUNCTION(ScriptDictionaryExists_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool isEmpty() const", asFUNCTION(ScriptDictionaryIsEmpty_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "uint getSize() const", asFUNCTION(ScriptDictionaryGetSize_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "bool delete(const string &in)", asFUNCTION(ScriptDictionaryDelete_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "void deleteAll()", asFUNCTION(ScriptDictionaryDeleteAll_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "array<string> @getKeys() const", asFUNCTION(CScriptDictionaryGetKeys_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("dictionary", "dictionaryValue &opIndex(const string &in)", asFUNCTION(CScriptDictionary_opIndex_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("dictionary", "const dictionaryValue &opIndex(const string &in) const", asFUNCTION(CScriptDictionary_opIndex_const_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Register GC behaviours
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptDictionaryGetRefCount_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptDictionarySetGCFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptDictionaryGetGCFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptDictionaryEnumReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptDictionaryReleaseAllReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Cache some things the dictionary will need at runtime
-	SDictionaryCache::Setup(engine);
-}
-
-//------------------------------------------------------------------
-// Iterator implementation
-
-CScriptDictionary::CIterator CScriptDictionary::begin() const
-{
-	return CIterator(*this, dict.begin());
-}
-
-CScriptDictionary::CIterator CScriptDictionary::end() const
-{
-	return CIterator(*this, dict.end());
-}
-
-CScriptDictionary::CIterator CScriptDictionary::find(const dictKey_t &key) const
-{
-	return CIterator(*this, dict.find(key));
-}
-
-CScriptDictionary::CIterator::CIterator(
-		const CScriptDictionary &dict,
-		dictMap_t::const_iterator it)
-	: m_it(it), m_dict(dict)
-{}
-
-void CScriptDictionary::CIterator::operator++() 
-{ 
-	++m_it; 
-}
-
-void CScriptDictionary::CIterator::operator++(int) 
-{ 
-	++m_it;
-
-	// Normally the post increment would return a copy of the object with the original state,
-	// but it is rarely used so we skip this extra copy to avoid unnecessary overhead
-}
-
-CScriptDictionary::CIterator &CScriptDictionary::CIterator::operator*()
-{
-	return *this;
-}
-
-bool CScriptDictionary::CIterator::operator==(const CIterator &other) const 
-{ 
-	return m_it == other.m_it;
-}
-
-bool CScriptDictionary::CIterator::operator!=(const CIterator &other) const 
-{ 
-	return m_it != other.m_it; 
-}
-
-const dictKey_t &CScriptDictionary::CIterator::GetKey() const 
-{ 
-	return m_it->first; 
-}
-
-int CScriptDictionary::CIterator::GetTypeId() const
-{ 
-	return m_it->second.m_typeId; 
-}
-
-bool CScriptDictionary::CIterator::GetValue(asINT64 &value) const
-{ 
-	return m_it->second.Get(m_dict.engine, &value, asTYPEID_INT64); 
-}
-
-bool CScriptDictionary::CIterator::GetValue(double &value) const
-{ 
-	return m_it->second.Get(m_dict.engine, &value, asTYPEID_DOUBLE); 
-}
-
-bool CScriptDictionary::CIterator::GetValue(void *value, int typeId) const
-{ 
-	return m_it->second.Get(m_dict.engine, value, typeId); 
-}
-
-const void *CScriptDictionary::CIterator::GetAddressOfValue() const
-{
-	return m_it->second.GetAddressOfValue();
-}
-
-END_AS_NAMESPACE
-
-
+#include <assert.h>
+#include <string.h>
+#include "scriptdictionary.h"
+#include "../scriptarray/scriptarray.h"
+
+BEGIN_AS_NAMESPACE
+
+using namespace std;
+
+//------------------------------------------------------------------------
+// Object types are cached as user data to avoid costly runtime lookups
+
+// We just define a number here that we assume nobody else is using for
+// object type user data. The add-ons have reserved the numbers 1000
+// through 1999 for this purpose, so we should be fine.
+const asPWORD DICTIONARY_CACHE = 1003;
+
+// This cache holds the object type of the dictionary type and array type
+// so it isn't necessary to look this up each time the dictionary or array
+// is created.
+struct SDictionaryCache
+{
+	asITypeInfo *dictType;
+	asITypeInfo *arrayType;
+	asITypeInfo *keyType;
+
+	// This is called from RegisterScriptDictionary
+	static void Setup(asIScriptEngine *engine)
+	{
+		SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
+		if( cache == 0 )
+		{
+			cache = new SDictionaryCache;
+			engine->SetUserData(cache, DICTIONARY_CACHE);
+			engine->SetEngineUserDataCleanupCallback(SDictionaryCache::Cleanup, DICTIONARY_CACHE);
+
+			cache->dictType = engine->GetTypeInfoByName("dictionary");
+			cache->arrayType = engine->GetTypeInfoByDecl("array<string>");
+			cache->keyType = engine->GetTypeInfoByDecl("string");
+		}
+	}
+
+	// This is called from the engine when shutting down
+	static void Cleanup(asIScriptEngine *engine)
+	{
+		SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
+		if( cache )
+			delete cache;
+	}
+};
+
+//--------------------------------------------------------------------------
+// CScriptDictionary implementation
+
+CScriptDictionary *CScriptDictionary::Create(asIScriptEngine *engine)
+{
+	// Use the custom memory routine from AngelScript to allow application to better control how much memory is used
+	CScriptDictionary *obj = (CScriptDictionary*)asAllocMem(sizeof(CScriptDictionary));
+	new(obj) CScriptDictionary(engine);
+	return obj;
+}
+
+CScriptDictionary *CScriptDictionary::Create(asBYTE *buffer)
+{
+	// Use the custom memory routine from AngelScript to allow application to better control how much memory is used
+	CScriptDictionary *obj = (CScriptDictionary*)asAllocMem(sizeof(CScriptDictionary));
+	new(obj) CScriptDictionary(buffer);
+	return obj;
+}
+
+CScriptDictionary::CScriptDictionary(asIScriptEngine *engine)
+{
+	Init(engine);
+}
+
+void CScriptDictionary::Init(asIScriptEngine *e)
+{
+	// We start with one reference
+	refCount = 1;
+	gcFlag = false;
+
+	// Keep a reference to the engine for as long as we live
+	// We don't increment the reference counter, because the
+	// engine will hold a pointer to the object in the GC.
+	engine = e;
+
+	// The dictionary object type is cached to avoid dynamically parsing it each time
+	SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
+
+	// Notify the garbage collector of this object
+	engine->NotifyGarbageCollectorOfNewObject(this, cache->dictType);
+}
+
+CScriptDictionary::CScriptDictionary(asBYTE *buffer)
+{
+	// This constructor will always be called from a script
+	// so we can get the engine from the active context
+	asIScriptContext *ctx = asGetActiveContext();
+	Init(ctx->GetEngine());
+
+	// Determine if the dictionary key type is registered as reference type or value type
+	SDictionaryCache& cache = *reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
+	bool keyAsRef = cache.keyType->GetFlags() & asOBJ_REF ? true : false;
+
+	// Initialize the dictionary from the buffer
+	asUINT length = *(asUINT*)buffer;
+	buffer += 4;
+
+	while( length-- )
+	{
+		// Align the buffer pointer on a 4 byte boundary in
+		// case previous value was smaller than 4 bytes
+		if( asPWORD(buffer) & 0x3 )
+			buffer += 4 - (asPWORD(buffer) & 0x3);
+
+		// Get the name value pair from the buffer and insert it in the dictionary
+		dictKey_t name;
+		if (keyAsRef)
+		{
+			name = **(dictKey_t**)buffer;
+			buffer += sizeof(dictKey_t*);
+		}
+		else
+		{
+			name = *(dictKey_t*)buffer;
+			buffer += sizeof(dictKey_t);
+		}
+
+		// Get the type id of the value
+		int typeId = *(int*)buffer;
+		buffer += sizeof(int);
+
+		// Depending on the type id, the value will inline in the buffer or a pointer
+		void *ref = (void*)buffer;
+
+		if( typeId >= asTYPEID_INT8 && typeId <= asTYPEID_DOUBLE )
+		{
+			// Convert primitive values to either int64 or double, so we can use the overloaded Set methods
+			asINT64 i64;
+			double d;
+			switch( typeId )
+			{
+			case asTYPEID_INT8:   i64 = *(char*)          ref; break;
+			case asTYPEID_INT16:  i64 = *(short*)         ref; break;
+			case asTYPEID_INT32:  i64 = *(int*)           ref; break;
+			case asTYPEID_INT64:  i64 = *(asINT64*)       ref; break;
+			case asTYPEID_UINT8:  i64 = *(unsigned char*) ref; break;
+			case asTYPEID_UINT16: i64 = *(unsigned short*)ref; break;
+			case asTYPEID_UINT32: i64 = *(unsigned int*)  ref; break;
+			case asTYPEID_UINT64: i64 = *(asINT64*)       ref; break;
+			case asTYPEID_FLOAT:  d   = *(float*)         ref; break;
+			case asTYPEID_DOUBLE: d   = *(double*)        ref; break;
+			}
+
+			if( typeId >= asTYPEID_FLOAT )
+				Set(name, d);
+			else
+				Set(name, i64);
+		}
+		else
+		{
+			if( (typeId & asTYPEID_MASK_OBJECT) &&
+				!(typeId & asTYPEID_OBJHANDLE) &&
+				(engine->GetTypeInfoById(typeId)->GetFlags() & asOBJ_REF) )
+			{
+				// Dereference the pointer to get the reference to the actual object
+				ref = *(void**)ref;
+			}
+
+			Set(name, ref, typeId);
+		}
+
+		// Advance the buffer pointer with the size of the value
+		if( typeId & asTYPEID_MASK_OBJECT )
+		{
+			asITypeInfo *ti = engine->GetTypeInfoById(typeId);
+			if( ti->GetFlags() & asOBJ_VALUE )
+				buffer += ti->GetSize();
+			else
+				buffer += sizeof(void*);
+		}
+		else if( typeId == 0 )
+		{
+			// null pointer
+			buffer += sizeof(void*);
+		}
+		else
+		{
+			buffer += engine->GetSizeOfPrimitiveType(typeId);
+		}
+	}
+}
+
+CScriptDictionary::~CScriptDictionary()
+{
+	// Delete all keys and values
+	DeleteAll();
+}
+
+void CScriptDictionary::AddRef() const
+{
+	// We need to clear the GC flag
+	gcFlag = false;
+	asAtomicInc(refCount);
+}
+
+void CScriptDictionary::Release() const
+{
+	// We need to clear the GC flag
+	gcFlag = false;
+	if( asAtomicDec(refCount) == 0 )
+	{
+		this->~CScriptDictionary();
+		asFreeMem(const_cast<CScriptDictionary*>(this));
+	}
+}
+
+int CScriptDictionary::GetRefCount()
+{
+	return refCount;
+}
+
+void CScriptDictionary::SetGCFlag()
+{
+	gcFlag = true;
+}
+
+bool CScriptDictionary::GetGCFlag()
+{
+	return gcFlag;
+}
+
+void CScriptDictionary::EnumReferences(asIScriptEngine *inEngine)
+{
+	// TODO: If garbage collection can be done from a separate thread, then this method must be
+	//       protected so that it doesn't get lost during the iteration if the dictionary is modified
+
+	// Call the gc enum callback for each of the objects
+	dictMap_t::iterator it;
+	for( it = dict.begin(); it != dict.end(); it++ )
+	{
+		if (it->second.m_typeId & asTYPEID_MASK_OBJECT)
+		{
+			asITypeInfo *subType = engine->GetTypeInfoById(it->second.m_typeId);
+			if ((subType->GetFlags() & asOBJ_VALUE) && (subType->GetFlags() & asOBJ_GC))
+			{
+				// For value types we need to forward the enum callback
+				// to the object so it can decide what to do
+				engine->ForwardGCEnumReferences(it->second.m_valueObj, subType);
+			}
+			else
+			{
+				// For others, simply notify the GC about the reference
+				inEngine->GCEnumCallback(it->second.m_valueObj);
+			}
+		}
+	}
+}
+
+void CScriptDictionary::ReleaseAllReferences(asIScriptEngine * /*engine*/)
+{
+	// We're being told to release all references in
+	// order to break circular references for dead objects
+	DeleteAll();
+}
+
+CScriptDictionary &CScriptDictionary::operator =(const CScriptDictionary &other)
+{
+	// Clear everything we had before
+	DeleteAll();
+
+	// Do a shallow copy of the dictionary
+	dictMap_t::const_iterator it;
+	for( it = other.dict.begin(); it != other.dict.end(); it++ )
+	{
+		if( it->second.m_typeId & asTYPEID_OBJHANDLE )
+			Set(it->first, (void*)&it->second.m_valueObj, it->second.m_typeId);
+		else if( it->second.m_typeId & asTYPEID_MASK_OBJECT )
+			Set(it->first, (void*)it->second.m_valueObj, it->second.m_typeId);
+		else
+			Set(it->first, (void*)&it->second.m_valueInt, it->second.m_typeId);
+	}
+
+	return *this;
+}
+
+CScriptDictValue *CScriptDictionary::operator[](const dictKey_t &key)
+{
+	// Return the existing value if it exists, else insert an empty value
+	return &dict[key];
+}
+
+const CScriptDictValue *CScriptDictionary::operator[](const dictKey_t &key) const
+{
+	// Return the existing value if it exists
+	dictMap_t::const_iterator it;
+	it = dict.find(key);
+	if( it != dict.end() )
+		return &it->second;
+
+	// Else raise an exception
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+		ctx->SetException("Invalid access to non-existing value");
+
+	return 0;
+}
+
+void CScriptDictionary::Set(const dictKey_t &key, void *value, int typeId)
+{
+	dictMap_t::iterator it;
+	it = dict.find(key);
+	if( it == dict.end() )
+		it = dict.insert(dictMap_t::value_type(key, CScriptDictValue())).first;
+
+	it->second.Set(engine, value, typeId);
+}
+
+// This overloaded method is implemented so that all integer and
+// unsigned integers types will be stored in the dictionary as int64
+// through implicit conversions. This simplifies the management of the
+// numeric types when the script retrieves the stored value using a
+// different type.
+void CScriptDictionary::Set(const dictKey_t &key, const asINT64 &value)
+{
+	Set(key, const_cast<asINT64*>(&value), asTYPEID_INT64);
+}
+
+// This overloaded method is implemented so that all floating point types
+// will be stored in the dictionary as double through implicit conversions.
+// This simplifies the management of the numeric types when the script
+// retrieves the stored value using a different type.
+void CScriptDictionary::Set(const dictKey_t &key, const double &value)
+{
+	Set(key, const_cast<double*>(&value), asTYPEID_DOUBLE);
+}
+
+// Returns true if the value was successfully retrieved
+bool CScriptDictionary::Get(const dictKey_t &key, void *value, int typeId) const
+{
+	dictMap_t::const_iterator it;
+	it = dict.find(key);
+	if( it != dict.end() )
+		return it->second.Get(engine, value, typeId);
+
+	// AngelScript has already initialized the value with a default value,
+	// so we don't have to do anything if we don't find the element, or if
+	// the element is incompatible with the requested type.
+
+	return false;
+}
+
+// Returns the type id of the stored value
+int CScriptDictionary::GetTypeId(const dictKey_t &key) const
+{
+	dictMap_t::const_iterator it;
+	it = dict.find(key);
+	if( it != dict.end() )
+		return it->second.m_typeId;
+
+	return -1;
+}
+
+bool CScriptDictionary::Get(const dictKey_t &key, asINT64 &value) const
+{
+	return Get(key, &value, asTYPEID_INT64);
+}
+
+bool CScriptDictionary::Get(const dictKey_t &key, double &value) const
+{
+	return Get(key, &value, asTYPEID_DOUBLE);
+}
+
+bool CScriptDictionary::Exists(const dictKey_t &key) const
+{
+	dictMap_t::const_iterator it;
+	it = dict.find(key);
+	if( it != dict.end() )
+		return true;
+
+	return false;
+}
+
+bool CScriptDictionary::IsEmpty() const
+{
+	if( dict.size() == 0 )
+		return true;
+
+	return false;
+}
+
+asUINT CScriptDictionary::GetSize() const
+{
+	return asUINT(dict.size());
+}
+
+bool CScriptDictionary::Delete(const dictKey_t &key)
+{
+	dictMap_t::iterator it;
+	it = dict.find(key);
+	if( it != dict.end() )
+	{
+		it->second.FreeValue(engine);
+		dict.erase(it);
+		return true;
+	}
+
+	return false;
+}
+
+void CScriptDictionary::DeleteAll()
+{
+	dictMap_t::iterator it;
+	for( it = dict.begin(); it != dict.end(); it++ )
+		it->second.FreeValue(engine);
+
+	dict.clear();
+}
+
+CScriptArray* CScriptDictionary::GetKeys() const
+{
+	// Retrieve the object type for the array<string> from the cache
+	SDictionaryCache *cache = reinterpret_cast<SDictionaryCache*>(engine->GetUserData(DICTIONARY_CACHE));
+	asITypeInfo *ti = cache->arrayType;
+
+	// Create the array object
+	CScriptArray *array = CScriptArray::Create(ti, asUINT(dict.size()));
+	long current = -1;
+	dictMap_t::const_iterator it;
+	for( it = dict.begin(); it != dict.end(); it++ )
+	{
+		current++;
+		*(dictKey_t*)array->At(current) = it->first;
+	}
+
+	return array;
+}
+
+//--------------------------------------------------------------------------
+// Generic wrappers
+
+void ScriptDictionaryFactory_Generic(asIScriptGeneric *gen)
+{
+	*(CScriptDictionary**)gen->GetAddressOfReturnLocation() = CScriptDictionary::Create(gen->GetEngine());
+}
+
+void ScriptDictionaryListFactory_Generic(asIScriptGeneric *gen)
+{
+	asBYTE *buffer = (asBYTE*)gen->GetArgAddress(0);
+	*(CScriptDictionary**)gen->GetAddressOfReturnLocation() = CScriptDictionary::Create(buffer);
+}
+
+void ScriptDictionaryAddRef_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dict->AddRef();
+}
+
+void ScriptDictionaryRelease_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dict->Release();
+}
+
+void ScriptDictionaryAssign_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	CScriptDictionary *other = *(CScriptDictionary**)gen->GetAddressOfArg(0);
+	*dict = *other;
+	*(CScriptDictionary**)gen->GetAddressOfReturnLocation() = dict;
+}
+
+void ScriptDictionarySet_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	void *ref = *(void**)gen->GetAddressOfArg(1);
+	int typeId = gen->GetArgTypeId(1);
+	dict->Set(*key, ref, typeId);
+}
+
+void ScriptDictionarySetInt_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	void *ref = *(void**)gen->GetAddressOfArg(1);
+	dict->Set(*key, *(asINT64*)ref);
+}
+
+void ScriptDictionarySetFlt_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	void *ref = *(void**)gen->GetAddressOfArg(1);
+	dict->Set(*key, *(double*)ref);
+}
+
+void ScriptDictionaryGet_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	void *ref = *(void**)gen->GetAddressOfArg(1);
+	int typeId = gen->GetArgTypeId(1);
+	*(bool*)gen->GetAddressOfReturnLocation() = dict->Get(*key, ref, typeId);
+}
+
+void ScriptDictionaryGetInt_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	void *ref = *(void**)gen->GetAddressOfArg(1);
+	*(bool*)gen->GetAddressOfReturnLocation() = dict->Get(*key, *(asINT64*)ref);
+}
+
+void ScriptDictionaryGetFlt_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	void *ref = *(void**)gen->GetAddressOfArg(1);
+	*(bool*)gen->GetAddressOfReturnLocation() = dict->Get(*key, *(double*)ref);
+}
+
+void ScriptDictionaryExists_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	bool ret = dict->Exists(*key);
+	*(bool*)gen->GetAddressOfReturnLocation() = ret;
+}
+
+void ScriptDictionaryIsEmpty_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	bool ret = dict->IsEmpty();
+	*(bool*)gen->GetAddressOfReturnLocation() = ret;
+}
+
+void ScriptDictionaryGetSize_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	asUINT ret = dict->GetSize();
+	*(asUINT*)gen->GetAddressOfReturnLocation() = ret;
+}
+
+void ScriptDictionaryDelete_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	*(bool*)gen->GetAddressOfReturnLocation() = dict->Delete(*key);
+}
+
+void ScriptDictionaryDeleteAll_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *dict = (CScriptDictionary*)gen->GetObject();
+	dict->DeleteAll();
+}
+
+static void ScriptDictionaryGetRefCount_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
+	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
+}
+
+static void ScriptDictionarySetGCFlag_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
+	self->SetGCFlag();
+}
+
+static void ScriptDictionaryGetGCFlag_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
+	*(bool*)gen->GetAddressOfReturnLocation() = self->GetGCFlag();
+}
+
+static void ScriptDictionaryEnumReferences_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->EnumReferences(engine);
+}
+
+static void ScriptDictionaryReleaseAllReferences_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->ReleaseAllReferences(engine);
+}
+
+static void CScriptDictionaryGetKeys_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
+	*(CScriptArray**)gen->GetAddressOfReturnLocation() = self->GetKeys();
+}
+
+static void CScriptDictionary_opIndex_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictionary *self = (CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = self->operator[](*key);
+}
+
+static void CScriptDictionary_opIndex_const_Generic(asIScriptGeneric *gen)
+{
+	const CScriptDictionary *self = (const CScriptDictionary*)gen->GetObject();
+	dictKey_t *key = *(dictKey_t**)gen->GetAddressOfArg(0);
+	*(const CScriptDictValue**)gen->GetAddressOfReturnLocation() = self->operator[](*key);
+}
+
+
+//-------------------------------------------------------------------------
+// CScriptDictValue
+
+CScriptDictValue::CScriptDictValue()
+{
+	m_valueObj = 0;
+	m_typeId   = 0;
+}
+
+CScriptDictValue::CScriptDictValue(asIScriptEngine *engine, void *value, int typeId)
+{
+	m_valueObj = 0;
+	m_typeId   = 0;
+	Set(engine, value, typeId);
+}
+
+CScriptDictValue::~CScriptDictValue()
+{
+	if (m_valueObj && m_typeId)
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if (ctx)
+			FreeValue(ctx->GetEngine());
+		else
+		{
+			// Must not hold an object when destroyed, as then the object will never be freed
+			assert((m_typeId & asTYPEID_MASK_OBJECT) == 0);
+		}
+	}
+}
+
+void CScriptDictValue::FreeValue(asIScriptEngine *engine)
+{
+	// If it is a handle or a ref counted object, call release
+	if( m_typeId & asTYPEID_MASK_OBJECT )
+	{
+		// Let the engine release the object
+		engine->ReleaseScriptObject(m_valueObj, engine->GetTypeInfoById(m_typeId));
+		m_valueObj = 0;
+		m_typeId = 0;
+	}
+
+	// For primitives, there's nothing to do
+}
+
+void CScriptDictValue::EnumReferences(asIScriptEngine *inEngine)
+{
+	// If we're holding a reference, we'll notify the garbage collector of it
+	if (m_valueObj)
+		inEngine->GCEnumCallback(m_valueObj);
+
+	// The object type itself is also garbage collected
+	if (m_typeId)
+		inEngine->GCEnumCallback(inEngine->GetTypeInfoById(m_typeId));
+}
+
+void CScriptDictValue::Set(asIScriptEngine *engine, void *value, int typeId)
+{
+	FreeValue(engine);
+
+	m_typeId = typeId;
+	if( typeId & asTYPEID_OBJHANDLE )
+	{
+		// We're receiving a reference to the handle, so we need to dereference it
+		m_valueObj = *(void**)value;
+		engine->AddRefScriptObject(m_valueObj, engine->GetTypeInfoById(typeId));
+	}
+	else if( typeId & asTYPEID_MASK_OBJECT )
+	{
+		// Create a copy of the object
+		m_valueObj = engine->CreateScriptObjectCopy(value, engine->GetTypeInfoById(typeId));
+		if( m_valueObj == 0 )
+		{
+			asIScriptContext *ctx = asGetActiveContext();
+			if( ctx )
+				ctx->SetException("Cannot create copy of object");
+		}
+	}
+	else
+	{
+		// Copy the primitive value
+		// We receive a pointer to the value.
+		int size = engine->GetSizeOfPrimitiveType(typeId);
+		memcpy(&m_valueInt, value, size);
+	}
+}
+
+void CScriptDictValue::Set(asIScriptEngine *engine, CScriptDictValue &value)
+{
+	if( value.m_typeId & asTYPEID_OBJHANDLE )
+		Set(engine, (void*)&value.m_valueObj, value.m_typeId);
+	else if( value.m_typeId & asTYPEID_MASK_OBJECT )
+		Set(engine, (void*)value.m_valueObj, value.m_typeId);
+	else
+		Set(engine, (void*)&value.m_valueInt, value.m_typeId);
+}
+
+// This overloaded method is implemented so that all integer and
+// unsigned integers types will be stored in the dictionary as int64
+// through implicit conversions. This simplifies the management of the
+// numeric types when the script retrieves the stored value using a
+// different type.
+void CScriptDictValue::Set(asIScriptEngine *engine, const asINT64 &value)
+{
+	Set(engine, const_cast<asINT64*>(&value), asTYPEID_INT64);
+}
+
+// This overloaded method is implemented so that all floating point types
+// will be stored in the dictionary as double through implicit conversions.
+// This simplifies the management of the numeric types when the script
+// retrieves the stored value using a different type.
+void CScriptDictValue::Set(asIScriptEngine *engine, const double &value)
+{
+	Set(engine, const_cast<double*>(&value), asTYPEID_DOUBLE);
+}
+
+bool CScriptDictValue::Get(asIScriptEngine *engine, void *value, int typeId) const
+{
+	// Return the value
+	if( typeId & asTYPEID_OBJHANDLE )
+	{
+		// A handle can be retrieved if the stored type is a handle of same or compatible type
+		// or if the stored type is an object that implements the interface that the handle refer to.
+		if( (m_typeId & asTYPEID_MASK_OBJECT) )
+		{
+			// Don't allow the get if the stored handle is to a const, but the desired handle is not
+			if( (m_typeId & asTYPEID_HANDLETOCONST) && !(typeId & asTYPEID_HANDLETOCONST) )
+				return false;
+
+			// RefCastObject will increment the refcount if successful
+			engine->RefCastObject(m_valueObj, engine->GetTypeInfoById(m_typeId), engine->GetTypeInfoById(typeId), reinterpret_cast<void**>(value));
+
+			return true;
+		}
+	}
+	else if( typeId & asTYPEID_MASK_OBJECT )
+	{
+		// Verify that the copy can be made
+		bool isCompatible = false;
+
+		// Allow a handle to be value assigned if the wanted type is not a handle
+		if( (m_typeId & ~(asTYPEID_OBJHANDLE | asTYPEID_HANDLETOCONST) ) == typeId && m_valueObj != 0 )
+			isCompatible = true;
+
+		// Copy the object into the given reference
+		if( isCompatible )
+		{
+			engine->AssignScriptObject(value, m_valueObj, engine->GetTypeInfoById(typeId));
+
+			return true;
+		}
+	}
+	else
+	{
+		if( m_typeId == typeId )
+		{
+			int size = engine->GetSizeOfPrimitiveType(typeId);
+			memcpy(value, &m_valueInt, size);
+			return true;
+		}
+
+		// We know all numbers are stored as either int64 or double, since we register overloaded functions for those
+		// Only bool and enums needs to be treated separately
+		if( typeId == asTYPEID_DOUBLE )
+		{
+			if( m_typeId == asTYPEID_INT64 )
+				*(double*)value = double(m_valueInt);
+			else if (m_typeId == asTYPEID_BOOL)
+			{
+				// Use memcpy instead of type cast to make sure the code is endianess agnostic
+				char localValue;
+				memcpy(&localValue, &m_valueInt, sizeof(char));
+				*(double*)value = localValue ? 1.0 : 0.0;
+			}
+			else if (m_typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0)
+			{
+				// Use memcpy instead of type cast to make sure the code is endianess agnostic
+				int localValue;
+				memcpy(&localValue, &m_valueInt, sizeof(int));
+				*(double*)value = double(localValue); // enums are 32bit
+			}
+			else
+			{
+				// The stored type is an object
+				// TODO: Check if the object has a conversion operator to a primitive value
+				*(double*)value = 0;
+				return false;
+			}
+			return true;
+		}
+		else if( typeId == asTYPEID_INT64 )
+		{
+			if( m_typeId == asTYPEID_DOUBLE )
+				*(asINT64*)value = asINT64(m_valueFlt);
+			else if (m_typeId == asTYPEID_BOOL)
+			{
+				// Use memcpy instead of type cast to make sure the code is endianess agnostic
+				char localValue;
+				memcpy(&localValue, &m_valueInt, sizeof(char));
+				*(asINT64*)value = localValue ? 1 : 0;
+			}
+			else if (m_typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0)
+			{
+				// Use memcpy instead of type cast to make sure the code is endianess agnostic
+				int localValue;
+				memcpy(&localValue, &m_valueInt, sizeof(int));
+				*(asINT64*)value = localValue; // enums are 32bit
+			}
+			else
+			{
+				// The stored type is an object
+				// TODO: Check if the object has a conversion operator to a primitive value
+				*(asINT64*)value = 0;
+				return false;
+			}
+			return true;
+		}
+		else if( typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0 )
+		{
+			// The desired type is an enum. These are always 32bit integers
+			if( m_typeId == asTYPEID_DOUBLE )
+				*(int*)value = int(m_valueFlt);
+			else if( m_typeId == asTYPEID_INT64 )
+				*(int*)value = int(m_valueInt);
+			else if (m_typeId == asTYPEID_BOOL)
+			{
+				// Use memcpy instead of type cast to make sure the code is endianess agnostic
+				char localValue;
+				memcpy(&localValue, &m_valueInt, sizeof(char));
+				*(int*)value = localValue ? 1 : 0;
+			}
+			else if (m_typeId > asTYPEID_DOUBLE && (m_typeId & asTYPEID_MASK_OBJECT) == 0)
+			{
+				// Use memcpy instead of type cast to make sure the code is endianess agnostic
+				int localValue;
+				memcpy(&localValue, &m_valueInt, sizeof(int));
+				*(int*)value = localValue; // enums are 32bit
+			}
+			else
+			{
+				// The stored type is an object
+				// TODO: Check if the object has a conversion operator to a primitive value
+				*(int*)value = 0;
+				return false;
+			}
+			return true;
+		}
+		else if( typeId == asTYPEID_BOOL )
+		{
+			if (m_typeId & asTYPEID_OBJHANDLE)
+			{
+				// TODO: Check if the object has a conversion operator to a primitive value
+				*(bool*)value = m_valueObj ? true : false;
+			}
+			else if( m_typeId & asTYPEID_MASK_OBJECT )
+			{
+				// TODO: Check if the object has a conversion operator to a primitive value
+				*(bool*)value = true;
+			}
+			else
+			{
+				// Compare only the bytes that were actually set
+				asQWORD zero = 0;
+				int size = engine->GetSizeOfPrimitiveType(m_typeId);
+				*(bool*)value = memcmp(&m_valueInt, &zero, size) == 0 ? false : true;
+			}
+			return true;
+		}
+	}
+
+	// It was not possible to retrieve the value using the desired typeId
+	return false;
+}
+
+const void * CScriptDictValue::GetAddressOfValue() const
+{
+	if( (m_typeId & asTYPEID_MASK_OBJECT) && !(m_typeId & asTYPEID_OBJHANDLE) )
+	{
+		// Return the address to the object directly
+		return m_valueObj;
+	}
+
+	// Return the address of the primitive or the pointer to the object
+	return reinterpret_cast<const void*>(&m_valueObj);
+}
+
+bool CScriptDictValue::Get(asIScriptEngine *engine, asINT64 &value) const
+{
+	return Get(engine, &value, asTYPEID_INT64);
+}
+
+bool CScriptDictValue::Get(asIScriptEngine *engine, double &value) const
+{
+	return Get(engine, &value, asTYPEID_DOUBLE);
+}
+
+int CScriptDictValue::GetTypeId() const
+{
+	return m_typeId;
+}
+
+static void CScriptDictValue_Construct(void *mem)
+{
+	new(mem) CScriptDictValue();
+}
+
+static void CScriptDictValue_Destruct(CScriptDictValue *obj)
+{
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+	{
+		asIScriptEngine *engine = ctx->GetEngine();
+		obj->FreeValue(engine);
+	}
+	obj->~CScriptDictValue();
+}
+
+static CScriptDictValue &CScriptDictValue_opAssign(void *ref, int typeId, CScriptDictValue *obj)
+{
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+	{
+		asIScriptEngine *engine = ctx->GetEngine();
+		obj->Set(engine, ref, typeId);
+	}
+	return *obj;
+}
+
+static CScriptDictValue &CScriptDictValue_opAssign(const CScriptDictValue &other, CScriptDictValue *obj)
+{
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+	{
+		asIScriptEngine *engine = ctx->GetEngine();
+		obj->Set(engine, const_cast<CScriptDictValue&>(other));
+	}
+
+	return *obj;
+}
+
+static CScriptDictValue &CScriptDictValue_opAssign(double val, CScriptDictValue *obj)
+{
+	return CScriptDictValue_opAssign(&val, asTYPEID_DOUBLE, obj);
+}
+
+static CScriptDictValue &CScriptDictValue_opAssign(asINT64 val, CScriptDictValue *obj)
+{
+	return CScriptDictValue_opAssign(&val, asTYPEID_INT64, obj);
+}
+
+static void CScriptDictValue_opCast(void *ref, int typeId, CScriptDictValue *obj)
+{
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx )
+	{
+		asIScriptEngine *engine = ctx->GetEngine();
+		obj->Get(engine, ref, typeId);
+	}
+}
+
+static asINT64 CScriptDictValue_opConvInt(CScriptDictValue *obj)
+{
+	asINT64 value;
+	CScriptDictValue_opCast(&value, asTYPEID_INT64, obj);
+	return value;
+}
+
+static double CScriptDictValue_opConvDouble(CScriptDictValue *obj)
+{
+	double value;
+	CScriptDictValue_opCast(&value, asTYPEID_DOUBLE, obj);
+	return value;
+}
+
+//-------------------------------------------------------------------
+// generic wrapper for CScriptDictValue
+
+static void CScriptDictValue_opConvDouble_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	double value;
+	self->Get(gen->GetEngine(), value);
+	*(double*)gen->GetAddressOfReturnLocation() = value;
+}
+
+static void CScriptDictValue_opConvInt_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	asINT64 value;
+	self->Get(gen->GetEngine(), value);
+	*(asINT64*)gen->GetAddressOfReturnLocation() = value;
+}
+
+static void CScriptDictValue_opCast_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	self->Get(gen->GetEngine(), gen->GetArgAddress(0), gen->GetArgTypeId(0));
+}
+
+static void CScriptDictValue_opAssign_int64_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign((asINT64)gen->GetArgQWord(0), self);
+}
+
+static void CScriptDictValue_opAssign_double_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign(gen->GetArgDouble(0), self);
+}
+
+static void CScriptDictValue_opAssign_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign(gen->GetArgAddress(0), gen->GetArgTypeId(0), self);
+}
+
+static void CScriptDictValue_opCopyAssign_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	*(CScriptDictValue**)gen->GetAddressOfReturnLocation() = &CScriptDictValue_opAssign(*reinterpret_cast<CScriptDictValue*>(gen->GetArgAddress(0)), self);
+}
+
+static void CScriptDictValue_Construct_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	CScriptDictValue_Construct(self);
+}
+
+static void CScriptDictValue_Destruct_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	CScriptDictValue_Destruct(self);
+}
+
+static void CScriptDictValue_EnumReferences_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	self->EnumReferences(gen->GetEngine());
+}
+
+static void CScriptDictValue_FreeValue_Generic(asIScriptGeneric *gen)
+{
+	CScriptDictValue *self = (CScriptDictValue*)gen->GetObject();
+	self->FreeValue(gen->GetEngine());
+}
+
+//--------------------------------------------------------------------------
+// Register the type
+
+void RegisterScriptDictionary(asIScriptEngine *engine)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+		RegisterScriptDictionary_Generic(engine);
+	else
+		RegisterScriptDictionary_Native(engine);
+}
+
+void RegisterScriptDictionary_Native(asIScriptEngine *engine)
+{
+	int r;
+
+	// The array<string> type must be available
+	assert( engine->GetTypeInfoByDecl("array<string>") );
+
+#if AS_CAN_USE_CPP11
+	// With C++11 it is possible to use asGetTypeTraits to automatically determine the correct flags that represents the C++ class
+	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asGetTypeTraits<CScriptDictValue>()); assert( r >= 0 );
+#else
+	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CD); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(CScriptDictValue_Construct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(CScriptDictValue_Destruct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptDictValue, EnumReferences), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptDictValue, FreeValue), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const dictionaryValue &in)", asFUNCTIONPR(CScriptDictValue_opAssign, (const CScriptDictValue &, CScriptDictValue *), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opHndlAssign(const ?&in)", asFUNCTIONPR(CScriptDictValue_opAssign, (void *, int, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opHndlAssign(const dictionaryValue &in)", asFUNCTIONPR(CScriptDictValue_opAssign, (const CScriptDictValue &, CScriptDictValue *), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert(r >= 0);
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const ?&in)", asFUNCTIONPR(CScriptDictValue_opAssign, (void *, int, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(double)", asFUNCTIONPR(CScriptDictValue_opAssign, (double, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(int64)", asFUNCTIONPR(CScriptDictValue_opAssign, (asINT64, CScriptDictValue*), CScriptDictValue &), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "void opCast(?&out)", asFUNCTIONPR(CScriptDictValue_opCast, (void *, int, CScriptDictValue*), void), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "void opConv(?&out)", asFUNCTIONPR(CScriptDictValue_opCast, (void *, int, CScriptDictValue*), void), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "int64 opConv()", asFUNCTIONPR(CScriptDictValue_opConvInt, (CScriptDictValue*), asINT64), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "double opConv()", asFUNCTIONPR(CScriptDictValue_opConvDouble, (CScriptDictValue*), double), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	r = engine->RegisterObjectType("dictionary", sizeof(CScriptDictionary), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
+	// Use the generic interface to construct the object since we need the engine pointer, we could also have retrieved the engine pointer from the active context
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_FACTORY, "dictionary@ f()", asFUNCTION(ScriptDictionaryFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_LIST_FACTORY, "dictionary @f(int &in) {repeat {string, ?}}", asFUNCTION(ScriptDictionaryListFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptDictionary,AddRef), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptDictionary,Release), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "dictionary &opAssign(const dictionary &in)", asMETHODPR(CScriptDictionary, operator=, (const CScriptDictionary &), CScriptDictionary&), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const ?&in)", asMETHODPR(CScriptDictionary,Set,(const dictKey_t&,void*,int),void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, ?&out) const", asMETHODPR(CScriptDictionary,Get,(const dictKey_t&,void*,int) const,bool), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const int64&in)", asMETHODPR(CScriptDictionary,Set,(const dictKey_t&,const asINT64&),void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, int64&out) const", asMETHODPR(CScriptDictionary,Get,(const dictKey_t&,asINT64&) const,bool), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const double&in)", asMETHODPR(CScriptDictionary,Set,(const dictKey_t&,const double&),void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, double&out) const", asMETHODPR(CScriptDictionary,Get,(const dictKey_t&,double&) const,bool), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "bool exists(const string &in) const", asMETHOD(CScriptDictionary,Exists), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool isEmpty() const", asMETHOD(CScriptDictionary, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "uint getSize() const", asMETHOD(CScriptDictionary, GetSize), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool delete(const string &in)", asMETHOD(CScriptDictionary,Delete), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "void deleteAll()", asMETHOD(CScriptDictionary,DeleteAll), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "array<string> @getKeys() const", asMETHOD(CScriptDictionary,GetKeys), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "dictionaryValue &opIndex(const string &in)", asMETHODPR(CScriptDictionary, operator[], (const dictKey_t &), CScriptDictValue*), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "const dictionaryValue &opIndex(const string &in) const", asMETHODPR(CScriptDictionary, operator[], (const dictKey_t &) const, const CScriptDictValue*), asCALL_THISCALL); assert( r >= 0 );
+
+	// Register GC behaviours
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(CScriptDictionary,GetRefCount), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_SETGCFLAG, "void f()", asMETHOD(CScriptDictionary,SetGCFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(CScriptDictionary,GetGCFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptDictionary,EnumReferences), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptDictionary,ReleaseAllReferences), asCALL_THISCALL); assert( r >= 0 );
+
+#if AS_USE_STLNAMES == 1
+	// Same as isEmpty
+	r = engine->RegisterObjectMethod("dictionary", "bool empty() const", asMETHOD(CScriptDictionary, IsEmpty), asCALL_THISCALL); assert( r >= 0 );
+	// Same as getSize
+	r = engine->RegisterObjectMethod("dictionary", "uint size() const", asMETHOD(CScriptDictionary, GetSize), asCALL_THISCALL); assert( r >= 0 );
+	// Same as delete
+	r = engine->RegisterObjectMethod("dictionary", "void erase(const string &in)", asMETHOD(CScriptDictionary,Delete), asCALL_THISCALL); assert( r >= 0 );
+	// Same as deleteAll
+	r = engine->RegisterObjectMethod("dictionary", "void clear()", asMETHOD(CScriptDictionary,DeleteAll), asCALL_THISCALL); assert( r >= 0 );
+#endif
+
+	// Cache some things the dictionary will need at runtime
+	SDictionaryCache::Setup(engine);
+}
+
+void RegisterScriptDictionary_Generic(asIScriptEngine *engine)
+{
+	int r;
+
+	// Register the cleanup callback for the object type cache
+	engine->SetEngineUserDataCleanupCallback(SDictionaryCache::Cleanup, DICTIONARY_CACHE);
+
+#if AS_CAN_USE_CPP11
+	// With C++11 it is possible to use asGetTypeTraits to automatically determine the correct flags that represents the C++ class
+	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asGetTypeTraits<CScriptDictValue>()); assert( r >= 0 );
+#else
+	r = engine->RegisterObjectType("dictionaryValue", sizeof(CScriptDictValue), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CD); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(CScriptDictValue_Construct_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(CScriptDictValue_Destruct_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(CScriptDictValue_EnumReferences_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectBehaviour("dictionaryValue", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(CScriptDictValue_FreeValue_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const dictionaryValue &in)", asFUNCTION(CScriptDictValue_opCopyAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opHndlAssign(const ?&in)", asFUNCTION(CScriptDictValue_opAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opHndlAssign(const dictionaryValue &in)", asFUNCTION(CScriptDictValue_opCopyAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(const ?&in)", asFUNCTION(CScriptDictValue_opAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(double)", asFUNCTION(CScriptDictValue_opAssign_double_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "dictionaryValue &opAssign(int64)", asFUNCTION(CScriptDictValue_opAssign_int64_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "void opCast(?&out)", asFUNCTION(CScriptDictValue_opCast_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "void opConv(?&out)", asFUNCTION(CScriptDictValue_opCast_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "int64 opConv()", asFUNCTION(CScriptDictValue_opConvInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionaryValue", "double opConv()", asFUNCTION(CScriptDictValue_opConvDouble_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectType("dictionary", sizeof(CScriptDictionary), asOBJ_REF | asOBJ_GC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_FACTORY, "dictionary@ f()", asFUNCTION(ScriptDictionaryFactory_Generic), asCALL_GENERIC); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_LIST_FACTORY, "dictionary @f(int &in) {repeat {string, ?}}", asFUNCTION(ScriptDictionaryListFactory_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptDictionaryAddRef_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptDictionaryRelease_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "dictionary &opAssign(const dictionary &in)", asFUNCTION(ScriptDictionaryAssign_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const ?&in)", asFUNCTION(ScriptDictionarySet_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, ?&out) const", asFUNCTION(ScriptDictionaryGet_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const int64&in)", asFUNCTION(ScriptDictionarySetInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, int64&out) const", asFUNCTION(ScriptDictionaryGetInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "void set(const string &in, const double&in)", asFUNCTION(ScriptDictionarySetFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool get(const string &in, double&out) const", asFUNCTION(ScriptDictionaryGetFlt_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "bool exists(const string &in) const", asFUNCTION(ScriptDictionaryExists_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool isEmpty() const", asFUNCTION(ScriptDictionaryIsEmpty_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "uint getSize() const", asFUNCTION(ScriptDictionaryGetSize_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "bool delete(const string &in)", asFUNCTION(ScriptDictionaryDelete_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "void deleteAll()", asFUNCTION(ScriptDictionaryDeleteAll_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "array<string> @getKeys() const", asFUNCTION(CScriptDictionaryGetKeys_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("dictionary", "dictionaryValue &opIndex(const string &in)", asFUNCTION(CScriptDictionary_opIndex_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("dictionary", "const dictionaryValue &opIndex(const string &in) const", asFUNCTION(CScriptDictionary_opIndex_const_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Register GC behaviours
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptDictionaryGetRefCount_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptDictionarySetGCFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptDictionaryGetGCFlag_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptDictionaryEnumReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("dictionary", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptDictionaryReleaseAllReferences_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Cache some things the dictionary will need at runtime
+	SDictionaryCache::Setup(engine);
+}
+
+//------------------------------------------------------------------
+// Iterator implementation
+
+CScriptDictionary::CIterator CScriptDictionary::begin() const
+{
+	return CIterator(*this, dict.begin());
+}
+
+CScriptDictionary::CIterator CScriptDictionary::end() const
+{
+	return CIterator(*this, dict.end());
+}
+
+CScriptDictionary::CIterator CScriptDictionary::find(const dictKey_t &key) const
+{
+	return CIterator(*this, dict.find(key));
+}
+
+CScriptDictionary::CIterator::CIterator(
+		const CScriptDictionary &dict,
+		dictMap_t::const_iterator it)
+	: m_it(it), m_dict(dict)
+{}
+
+void CScriptDictionary::CIterator::operator++()
+{
+	++m_it;
+}
+
+void CScriptDictionary::CIterator::operator++(int)
+{
+	++m_it;
+
+	// Normally the post increment would return a copy of the object with the original state,
+	// but it is rarely used so we skip this extra copy to avoid unnecessary overhead
+}
+
+CScriptDictionary::CIterator &CScriptDictionary::CIterator::operator*()
+{
+	return *this;
+}
+
+bool CScriptDictionary::CIterator::operator==(const CIterator &other) const
+{
+	return m_it == other.m_it;
+}
+
+bool CScriptDictionary::CIterator::operator!=(const CIterator &other) const
+{
+	return m_it != other.m_it;
+}
+
+const dictKey_t &CScriptDictionary::CIterator::GetKey() const
+{
+	return m_it->first;
+}
+
+int CScriptDictionary::CIterator::GetTypeId() const
+{
+	return m_it->second.m_typeId;
+}
+
+bool CScriptDictionary::CIterator::GetValue(asINT64 &value) const
+{
+	return m_it->second.Get(m_dict.engine, &value, asTYPEID_INT64);
+}
+
+bool CScriptDictionary::CIterator::GetValue(double &value) const
+{
+	return m_it->second.Get(m_dict.engine, &value, asTYPEID_DOUBLE);
+}
+
+bool CScriptDictionary::CIterator::GetValue(void *value, int typeId) const
+{
+	return m_it->second.Get(m_dict.engine, value, typeId);
+}
+
+const void *CScriptDictionary::CIterator::GetAddressOfValue() const
+{
+	return m_it->second.GetAddressOfValue();
+}
+
+END_AS_NAMESPACE
+
+
diff --git a/Sources/AngelScript/addons/scriptdictionary.h b/Sources/AngelScript/add_on/scriptdictionary/scriptdictionary.h
old mode 100755
new mode 100644
similarity index 91%
rename from Sources/AngelScript/addons/scriptdictionary.h
rename to Sources/AngelScript/add_on/scriptdictionary/scriptdictionary.h
index 70d46dcb9..d789db044
--- a/Sources/AngelScript/addons/scriptdictionary.h
+++ b/Sources/AngelScript/add_on/scriptdictionary/scriptdictionary.h
@@ -1,242 +1,240 @@
-#ifndef SCRIPTDICTIONARY_H
-#define SCRIPTDICTIONARY_H
-
-// The dictionary class relies on the script string object, thus the script
-// string type must be registered with the engine before registering the
-// dictionary type
-
-#ifndef ANGELSCRIPT_H 
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-#include <atomic>
-
-// By default the CScriptDictionary use the std::string for the keys.
-// If the application uses a custom string type, then this typedef
-// can be changed accordingly. Remember, if the application uses
-// a ref counted string type, then further changes will be needed,
-// for example in the code for GetKeys() and the constructor that
-// takes an initialization list.
-#include <string>
-typedef std::string dictKey_t;
-
-// Forward declare CScriptDictValue so we can typedef the internal map type
-BEGIN_AS_NAMESPACE
-class CScriptDictValue;
-END_AS_NAMESPACE
-
-// C++11 introduced the std::unordered_map which is a hash map which is
-// is generally more performatic for lookups than the std::map which is a 
-// binary tree.
-// TODO: memory: The map allocator should use the asAllocMem and asFreeMem
-#if AS_CAN_USE_CPP11
-#include <unordered_map>
-typedef std::unordered_map<dictKey_t, AS_NAMESPACE_QUALIFIER CScriptDictValue> dictMap_t;
-#else
-#include <map>
-typedef std::map<dictKey_t, AS_NAMESPACE_QUALIFIER CScriptDictValue> dictMap_t;
-#endif
-
-
-#ifdef _MSC_VER
-// Turn off annoying warnings about truncated symbol names
-#pragma warning (disable:4786)
-#endif
-
-
-
-
-// Sometimes it may be desired to use the same method names as used by C++ STL.
-// This may for example reduce time when converting code from script to C++ or
-// back.
-//
-//  0 = off
-//  1 = on
-
-#ifndef AS_USE_STLNAMES
-#define AS_USE_STLNAMES 0
-#endif
-
-
-BEGIN_AS_NAMESPACE
-
-class CScriptArray;
-class CScriptDictionary;
-
-class CScriptDictValue
-{
-public:
-	// This class must not be declared as local variable in C++, because it needs 
-	// to receive the script engine pointer in all operations. The engine pointer
-	// is not kept as member in order to keep the size down
-	CScriptDictValue();
-	CScriptDictValue(asIScriptEngine *engine, void *value, int typeId);
-
-	// Destructor must not be called without first calling FreeValue, otherwise a memory leak will occur
-	~CScriptDictValue();
-
-	// Replace the stored value
-	void Set(asIScriptEngine *engine, void *value, int typeId);
-	void Set(asIScriptEngine *engine, const asINT64 &value);
-	void Set(asIScriptEngine *engine, const double &value);
-	void Set(asIScriptEngine *engine, CScriptDictValue &value);
-
-	// Gets the stored value. Returns false if the value isn't compatible with the informed typeId
-	bool Get(asIScriptEngine *engine, void *value, int typeId) const;
-	bool Get(asIScriptEngine *engine, asINT64 &value) const;
-	bool Get(asIScriptEngine *engine, double &value) const;
-
-	// Returns the address of the stored value for inspection
-	const void *GetAddressOfValue() const;
-
-	// Returns the type id of the stored value
-	int  GetTypeId() const;
-
-	// Free the stored value
-	void FreeValue(asIScriptEngine *engine);
-
-protected:
-	friend class CScriptDictionary;
-
-	union
-	{
-		asINT64 m_valueInt;
-		double  m_valueFlt;
-		void   *m_valueObj;
-	};
-	int m_typeId;
-};
-
-class CScriptDictionary
-{
-public:
-	// Factory functions
-	static CScriptDictionary *Create(asIScriptEngine *engine);
-
-	// Called from the script to instantiate a dictionary from an initialization list
-	static CScriptDictionary *Create(asBYTE *buffer);
-
-	// Reference counting
-	void AddRef() const;
-	void Release() const;
-
-	// Reassign the dictionary
-	CScriptDictionary &operator =(const CScriptDictionary &other);
-
-	// Sets a key/value pair
-	void Set(const dictKey_t &key, void *value, int typeId);
-	void Set(const dictKey_t &key, const asINT64 &value);
-	void Set(const dictKey_t &key, const double &value);
-
-	// Gets the stored value. Returns false if the value isn't compatible with the informed typeId
-	bool Get(const dictKey_t &key, void *value, int typeId) const;
-	bool Get(const dictKey_t &key, asINT64 &value) const;
-	bool Get(const dictKey_t &key, double &value) const;
-
-	// Index accessors. If the dictionary is not const it inserts the value if it doesn't already exist
-	// If the dictionary is const then a script exception is set if it doesn't exist and a null pointer is returned
-	CScriptDictValue *operator[](const dictKey_t &key);
-	const CScriptDictValue *operator[](const dictKey_t &key) const;
-
-	// Returns the type id of the stored value, or negative if it doesn't exist
-	int GetTypeId(const dictKey_t &key) const;
-
-	// Returns true if the key is set
-	bool Exists(const dictKey_t &key) const;
-
-	// Returns true if there are no key/value pairs in the dictionary
-	bool IsEmpty() const;
-
-	// Returns the number of key/value pairs in the dictionary
-	asUINT GetSize() const;
-
-	// Deletes the key
-	bool Delete(const dictKey_t &key);
-
-	// Deletes all keys
-	void DeleteAll();
-
-	// Get an array of all keys
-	CScriptArray *GetKeys() const;
-
-	// STL style iterator
-	class CIterator
-	{
-	public:
-		void operator++();    // Pre-increment
-		void operator++(int); // Post-increment
-
-		// This is needed to support C++11 range-for
-		CIterator &operator*();
-
-		bool operator==(const CIterator &other) const;
-		bool operator!=(const CIterator &other) const;
-
-		// Accessors
-		const dictKey_t &GetKey() const;
-		int              GetTypeId() const;
-		bool             GetValue(asINT64 &value) const;
-		bool             GetValue(double &value) const;
-		bool             GetValue(void *value, int typeId) const;
-		const void *     GetAddressOfValue() const;
-
-	protected:
-		friend class CScriptDictionary;
-
-		CIterator();
-		CIterator(const CScriptDictionary &dict,
-		          dictMap_t::const_iterator it);
-
-		CIterator &operator=(const CIterator &) {return *this;} // Not used
-
-		dictMap_t::const_iterator m_it;
-		const CScriptDictionary &m_dict;
-	};
-
-	CIterator begin() const;
-	CIterator end() const;
-	CIterator find(const dictKey_t &key) const;
-
-	// Garbage collections behaviours
-	int GetRefCount();
-	void SetGCFlag();
-	bool GetGCFlag();
-	void EnumReferences(asIScriptEngine *engine);
-	void ReleaseAllReferences(asIScriptEngine *engine);
-
-protected:
-	// Since the dictionary uses the asAllocMem and asFreeMem functions to allocate memory
-	// the constructors are made protected so that the application cannot allocate it 
-	// manually in a different way
-	CScriptDictionary(asIScriptEngine *engine);
-	CScriptDictionary(asBYTE *buffer);
-
-	// We don't want anyone to call the destructor directly, it should be called through the Release method
-	virtual ~CScriptDictionary();
-
-	// Cache the object types needed
-	void Init(asIScriptEngine *engine);
-
-	// Our properties
-	asIScriptEngine *engine;
-	mutable std::atomic<int> refCount;
-	mutable bool     gcFlag;
-	dictMap_t        dict;
-};
-
-// This function will determine the configuration of the engine
-// and use one of the two functions below to register the dictionary object
-void RegisterScriptDictionary(asIScriptEngine *engine);
-
-// Call this function to register the math functions
-// using native calling conventions
-void RegisterScriptDictionary_Native(asIScriptEngine *engine);
-
-// Use this one instead if native calling conventions
-// are not supported on the target platform
-void RegisterScriptDictionary_Generic(asIScriptEngine *engine);
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTDICTIONARY_H
+#define SCRIPTDICTIONARY_H
+
+// The dictionary class relies on the script string object, thus the script
+// string type must be registered with the engine before registering the
+// dictionary type
+
+#ifndef ANGELSCRIPT_H
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+// By default the CScriptDictionary use the std::string for the keys.
+// If the application uses a custom string type, then this typedef
+// can be changed accordingly.
+#include <string>
+typedef std::string dictKey_t;
+
+// Forward declare CScriptDictValue so we can typedef the internal map type
+BEGIN_AS_NAMESPACE
+class CScriptDictValue;
+END_AS_NAMESPACE
+
+// C++11 introduced the std::unordered_map which is a hash map which is
+// is generally more performatic for lookups than the std::map which is a
+// binary tree.
+// TODO: memory: The map allocator should use the asAllocMem and asFreeMem
+#if AS_CAN_USE_CPP11
+#include <unordered_map>
+typedef std::unordered_map<dictKey_t, AS_NAMESPACE_QUALIFIER CScriptDictValue> dictMap_t;
+#else
+#include <map>
+typedef std::map<dictKey_t, AS_NAMESPACE_QUALIFIER CScriptDictValue> dictMap_t;
+#endif
+
+
+#ifdef _MSC_VER
+// Turn off annoying warnings about truncated symbol names
+#pragma warning (disable:4786)
+#endif
+
+
+
+
+// Sometimes it may be desired to use the same method names as used by C++ STL.
+// This may for example reduce time when converting code from script to C++ or
+// back.
+//
+//  0 = off
+//  1 = on
+
+#ifndef AS_USE_STLNAMES
+#define AS_USE_STLNAMES 0
+#endif
+
+
+BEGIN_AS_NAMESPACE
+
+class CScriptArray;
+class CScriptDictionary;
+
+class CScriptDictValue
+{
+public:
+	// This class must not be declared as local variable in C++, because it needs
+	// to receive the script engine pointer in all operations. The engine pointer
+	// is not kept as member in order to keep the size down
+	CScriptDictValue();
+	CScriptDictValue(asIScriptEngine *engine, void *value, int typeId);
+
+	// Destructor must not be called without first calling FreeValue, otherwise a memory leak will occur
+	~CScriptDictValue();
+
+	// Replace the stored value
+	void Set(asIScriptEngine *engine, void *value, int typeId);
+	void Set(asIScriptEngine *engine, const asINT64 &value);
+	void Set(asIScriptEngine *engine, const double &value);
+	void Set(asIScriptEngine *engine, CScriptDictValue &value);
+
+	// Gets the stored value. Returns false if the value isn't compatible with the informed typeId
+	bool Get(asIScriptEngine *engine, void *value, int typeId) const;
+	bool Get(asIScriptEngine *engine, asINT64 &value) const;
+	bool Get(asIScriptEngine *engine, double &value) const;
+
+	// Returns the address of the stored value for inspection
+	const void *GetAddressOfValue() const;
+
+	// Returns the type id of the stored value
+	int  GetTypeId() const;
+
+	// Free the stored value
+	void FreeValue(asIScriptEngine *engine);
+
+	// GC callback
+	void EnumReferences(asIScriptEngine *engine);
+
+protected:
+	friend class CScriptDictionary;
+
+	union
+	{
+		asINT64 m_valueInt;
+		double  m_valueFlt;
+		void   *m_valueObj;
+	};
+	int m_typeId;
+};
+
+class CScriptDictionary
+{
+public:
+	// Factory functions
+	static CScriptDictionary *Create(asIScriptEngine *engine);
+
+	// Called from the script to instantiate a dictionary from an initialization list
+	static CScriptDictionary *Create(asBYTE *buffer);
+
+	// Reference counting
+	void AddRef() const;
+	void Release() const;
+
+	// Reassign the dictionary
+	CScriptDictionary &operator =(const CScriptDictionary &other);
+
+	// Sets a key/value pair
+	void Set(const dictKey_t &key, void *value, int typeId);
+	void Set(const dictKey_t &key, const asINT64 &value);
+	void Set(const dictKey_t &key, const double &value);
+
+	// Gets the stored value. Returns false if the value isn't compatible with the informed typeId
+	bool Get(const dictKey_t &key, void *value, int typeId) const;
+	bool Get(const dictKey_t &key, asINT64 &value) const;
+	bool Get(const dictKey_t &key, double &value) const;
+
+	// Index accessors. If the dictionary is not const it inserts the value if it doesn't already exist
+	// If the dictionary is const then a script exception is set if it doesn't exist and a null pointer is returned
+	CScriptDictValue *operator[](const dictKey_t &key);
+	const CScriptDictValue *operator[](const dictKey_t &key) const;
+
+	// Returns the type id of the stored value, or negative if it doesn't exist
+	int GetTypeId(const dictKey_t &key) const;
+
+	// Returns true if the key is set
+	bool Exists(const dictKey_t &key) const;
+
+	// Returns true if there are no key/value pairs in the dictionary
+	bool IsEmpty() const;
+
+	// Returns the number of key/value pairs in the dictionary
+	asUINT GetSize() const;
+
+	// Deletes the key
+	bool Delete(const dictKey_t &key);
+
+	// Deletes all keys
+	void DeleteAll();
+
+	// Get an array of all keys
+	CScriptArray *GetKeys() const;
+
+	// STL style iterator
+	class CIterator
+	{
+	public:
+		void operator++();    // Pre-increment
+		void operator++(int); // Post-increment
+
+		// This is needed to support C++11 range-for
+		CIterator &operator*();
+
+		bool operator==(const CIterator &other) const;
+		bool operator!=(const CIterator &other) const;
+
+		// Accessors
+		const dictKey_t &GetKey() const;
+		int              GetTypeId() const;
+		bool             GetValue(asINT64 &value) const;
+		bool             GetValue(double &value) const;
+		bool             GetValue(void *value, int typeId) const;
+		const void *     GetAddressOfValue() const;
+
+	protected:
+		friend class CScriptDictionary;
+
+		CIterator();
+		CIterator(const CScriptDictionary &dict,
+		          dictMap_t::const_iterator it);
+
+		CIterator &operator=(const CIterator &) {return *this;} // Not used
+
+		dictMap_t::const_iterator m_it;
+		const CScriptDictionary &m_dict;
+	};
+
+	CIterator begin() const;
+	CIterator end() const;
+	CIterator find(const dictKey_t &key) const;
+
+	// Garbage collections behaviours
+	int GetRefCount();
+	void SetGCFlag();
+	bool GetGCFlag();
+	void EnumReferences(asIScriptEngine *engine);
+	void ReleaseAllReferences(asIScriptEngine *engine);
+
+protected:
+	// Since the dictionary uses the asAllocMem and asFreeMem functions to allocate memory
+	// the constructors are made protected so that the application cannot allocate it
+	// manually in a different way
+	CScriptDictionary(asIScriptEngine *engine);
+	CScriptDictionary(asBYTE *buffer);
+
+	// We don't want anyone to call the destructor directly, it should be called through the Release method
+	virtual ~CScriptDictionary();
+
+	// Cache the object types needed
+	void Init(asIScriptEngine *engine);
+
+	// Our properties
+	asIScriptEngine *engine;
+	mutable int      refCount;
+	mutable bool     gcFlag;
+	dictMap_t        dict;
+};
+
+// This function will determine the configuration of the engine
+// and use one of the two functions below to register the dictionary object
+void RegisterScriptDictionary(asIScriptEngine *engine);
+
+// Call this function to register the math functions
+// using native calling conventions
+void RegisterScriptDictionary_Native(asIScriptEngine *engine);
+
+// Use this one instead if native calling conventions
+// are not supported on the target platform
+void RegisterScriptDictionary_Generic(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/add_on/scriptfile/scriptfile.cpp b/Sources/AngelScript/add_on/scriptfile/scriptfile.cpp
new file mode 100644
index 000000000..5c4e26c7c
--- /dev/null
+++ b/Sources/AngelScript/add_on/scriptfile/scriptfile.cpp
@@ -0,0 +1,660 @@
+#include "scriptfile.h"
+#include <new>
+#include <assert.h>
+#include <string>
+#include <string.h>
+#include <stdio.h>
+
+#ifdef _WIN32_WCE
+#include <windows.h> // For GetModuleFileName
+#ifdef GetObject
+#undef GetObject
+#endif
+#endif
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+CScriptFile *ScriptFile_Factory()
+{
+	return new CScriptFile();
+}
+
+void ScriptFile_Factory_Generic(asIScriptGeneric *gen)
+{
+	*(CScriptFile**)gen->GetAddressOfReturnLocation()	= ScriptFile_Factory();
+}
+
+void ScriptFile_AddRef_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	file->AddRef();
+}
+
+void ScriptFile_Release_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	file->Release();
+}
+
+void ScriptFile_Open_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	std::string *f = (std::string*)gen->GetArgAddress(0);
+	std::string *m = (std::string*)gen->GetArgAddress(1);
+	int r = file->Open(*f, *m);
+	gen->SetReturnDWord(r);
+}
+
+void ScriptFile_Close_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	int r = file->Close();
+	gen->SetReturnDWord(r);
+}
+
+void ScriptFile_GetSize_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	int r = file->GetSize();
+	gen->SetReturnDWord(r);
+}
+
+void ScriptFile_ReadString_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	int len = gen->GetArgDWord(0);
+	string str = file->ReadString(len);
+	gen->SetReturnObject(&str);
+}
+
+void ScriptFile_ReadLine_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	std::string str = file->ReadLine();
+	gen->SetReturnObject(&str);
+}
+
+void ScriptFile_ReadInt_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	asUINT bytes = *(asUINT*)gen->GetAddressOfArg(0);
+	*(asINT64*)gen->GetAddressOfReturnLocation() = file->ReadInt(bytes);
+}
+
+void ScriptFile_ReadUInt_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	asUINT bytes = *(asUINT*)gen->GetAddressOfArg(0);
+	*(asQWORD*)gen->GetAddressOfReturnLocation() = file->ReadUInt(bytes);
+}
+
+void ScriptFile_ReadFloat_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	*(float*)gen->GetAddressOfReturnLocation() = file->ReadFloat();
+}
+
+void ScriptFile_ReadDouble_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	*(double*)gen->GetAddressOfReturnLocation() = file->ReadDouble();
+}
+
+void ScriptFile_WriteString_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	std::string *str = (std::string*)gen->GetArgAddress(0);
+	gen->SetReturnDWord(file->WriteString(*str));
+}
+
+void ScriptFile_WriteInt_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	asINT64 val = *(asINT64*)gen->GetAddressOfArg(0);
+	asUINT bytes = *(asUINT*)gen->GetAddressOfArg(1);
+	*(int*)gen->GetAddressOfReturnLocation() = file->WriteInt(val, bytes);
+}
+
+void ScriptFile_WriteUInt_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	asQWORD val = *(asQWORD*)gen->GetAddressOfArg(0);
+	asUINT bytes = *(asUINT*)gen->GetAddressOfArg(1);
+	*(int*)gen->GetAddressOfReturnLocation() = file->WriteUInt(val, bytes);
+}
+
+void ScriptFile_WriteFloat_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	float val = *(float*)gen->GetAddressOfArg(0);
+	*(int*)gen->GetAddressOfReturnLocation() = file->WriteFloat(val);
+}
+
+void ScriptFile_WriteDouble_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	double val = *(double*)gen->GetAddressOfArg(0);
+	*(int*)gen->GetAddressOfReturnLocation() = file->WriteDouble(val);
+}
+
+void ScriptFile_IsEOF_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	bool r = file->IsEOF();
+	gen->SetReturnByte(r);
+}
+
+void ScriptFile_GetPos_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	gen->SetReturnDWord(file->GetPos());
+}
+
+void ScriptFile_SetPos_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	int pos = (int)gen->GetArgDWord(0);
+	gen->SetReturnDWord(file->SetPos(pos));
+}
+
+void ScriptFile_MovePos_Generic(asIScriptGeneric *gen)
+{
+	CScriptFile *file = (CScriptFile*)gen->GetObject();
+	int delta = (int)gen->GetArgDWord(0);
+	gen->SetReturnDWord(file->MovePos(delta));
+}
+
+void RegisterScriptFile_Native(asIScriptEngine *engine)
+{
+    int r;
+
+    r = engine->RegisterObjectType("file", 0, asOBJ_REF); assert( r >= 0 );
+    r = engine->RegisterObjectBehaviour("file", asBEHAVE_FACTORY, "file @f()", asFUNCTION(ScriptFile_Factory), asCALL_CDECL); assert( r >= 0 );
+    r = engine->RegisterObjectBehaviour("file", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptFile,AddRef), asCALL_THISCALL); assert( r >= 0 );
+    r = engine->RegisterObjectBehaviour("file", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptFile,Release), asCALL_THISCALL); assert( r >= 0 );
+
+    r = engine->RegisterObjectMethod("file", "int open(const string &in, const string &in)", asMETHOD(CScriptFile,Open), asCALL_THISCALL); assert( r >= 0 );
+    r = engine->RegisterObjectMethod("file", "int close()", asMETHOD(CScriptFile,Close), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int getSize() const", asMETHOD(CScriptFile,GetSize), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "bool isEndOfFile() const", asMETHOD(CScriptFile,IsEOF), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "string readString(uint)", asMETHOD(CScriptFile,ReadString), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "string readLine()", asMETHOD(CScriptFile,ReadLine), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int64 readInt(uint)", asMETHOD(CScriptFile,ReadInt), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "uint64 readUInt(uint)", asMETHOD(CScriptFile,ReadUInt), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "float readFloat()", asMETHOD(CScriptFile,ReadFloat), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "double readDouble()", asMETHOD(CScriptFile,ReadDouble), asCALL_THISCALL); assert( r >= 0 );
+#if AS_WRITE_OPS == 1
+	r = engine->RegisterObjectMethod("file", "int writeString(const string &in)", asMETHOD(CScriptFile,WriteString), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeInt(int64, uint)", asMETHOD(CScriptFile,WriteInt), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeUInt(uint64, uint)", asMETHOD(CScriptFile,WriteUInt), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeFloat(float)", asMETHOD(CScriptFile,WriteFloat), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeDouble(double)", asMETHOD(CScriptFile,WriteDouble), asCALL_THISCALL); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectMethod("file", "int getPos() const", asMETHOD(CScriptFile,GetPos), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int setPos(int)", asMETHOD(CScriptFile,SetPos), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int movePos(int)", asMETHOD(CScriptFile,MovePos), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectProperty("file", "bool mostSignificantByteFirst", asOFFSET(CScriptFile, mostSignificantByteFirst)); assert( r >= 0 );
+}
+
+void RegisterScriptFile_Generic(asIScriptEngine *engine)
+{
+	int r;
+
+	r = engine->RegisterObjectType("file", 0, asOBJ_REF); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("file", asBEHAVE_FACTORY, "file @f()", asFUNCTION(ScriptFile_Factory_Generic), asCALL_GENERIC); assert( r >= 0 );
+    r = engine->RegisterObjectBehaviour("file", asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptFile_AddRef_Generic), asCALL_GENERIC); assert( r >= 0 );
+    r = engine->RegisterObjectBehaviour("file", asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptFile_Release_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+    r = engine->RegisterObjectMethod("file", "int open(const string &in, const string &in)", asFUNCTION(ScriptFile_Open_Generic), asCALL_GENERIC); assert( r >= 0 );
+    r = engine->RegisterObjectMethod("file", "int close()", asFUNCTION(ScriptFile_Close_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int getSize() const", asFUNCTION(ScriptFile_GetSize_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "bool isEndOfFile() const", asFUNCTION(ScriptFile_IsEOF_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "string readString(uint)", asFUNCTION(ScriptFile_ReadString_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "string readLine()", asFUNCTION(ScriptFile_ReadLine_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int64 readInt(uint)", asFUNCTION(ScriptFile_ReadInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "uint64 readUInt(uint)", asFUNCTION(ScriptFile_ReadUInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "float readFloat()", asFUNCTION(ScriptFile_ReadFloat_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "double readDouble()", asFUNCTION(ScriptFile_ReadDouble_Generic), asCALL_GENERIC); assert( r >= 0 );
+#if AS_WRITE_OPS == 1
+	r = engine->RegisterObjectMethod("file", "int writeString(const string &in)", asFUNCTION(ScriptFile_WriteString_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeInt(int64, uint)", asFUNCTION(ScriptFile_WriteInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeUInt(uint64, uint)", asFUNCTION(ScriptFile_WriteUInt_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeFloat(float)", asFUNCTION(ScriptFile_WriteFloat_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int writeDouble(double)", asFUNCTION(ScriptFile_WriteDouble_Generic), asCALL_GENERIC); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectMethod("file", "int getPos() const", asFUNCTION(ScriptFile_GetPos_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int setPos(int)", asFUNCTION(ScriptFile_SetPos_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("file", "int movePos(int)", asFUNCTION(ScriptFile_MovePos_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectProperty("file", "bool mostSignificantByteFirst", asOFFSET(CScriptFile, mostSignificantByteFirst)); assert( r >= 0 );
+}
+
+void RegisterScriptFile(asIScriptEngine *engine)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+		RegisterScriptFile_Generic(engine);
+	else
+		RegisterScriptFile_Native(engine);
+}
+
+CScriptFile::CScriptFile()
+{
+	refCount = 1;
+	file = 0;
+	mostSignificantByteFirst = false;
+}
+
+CScriptFile::~CScriptFile()
+{
+	Close();
+}
+
+void CScriptFile::AddRef() const
+{
+	asAtomicInc(refCount);
+}
+
+void CScriptFile::Release() const
+{
+	if( asAtomicDec(refCount) == 0 )
+		delete this;
+}
+
+int CScriptFile::Open(const std::string &filename, const std::string &mode)
+{
+	// Close the previously opened file handle
+	if( file )
+		Close();
+
+	std::string myFilename = filename;
+
+	// Validate the mode
+	string m;
+#if AS_WRITE_OPS == 1
+	if( mode != "r" && mode != "w" && mode != "a" )
+#else
+	if( mode != "r" )
+#endif
+		return -1;
+	else
+		m = mode;
+
+#ifdef _WIN32_WCE
+	// no relative pathing on CE
+	char buf[MAX_PATH];
+	static TCHAR apppath[MAX_PATH] = TEXT("");
+	if (!apppath[0])
+	{
+		GetModuleFileName(NULL, apppath, MAX_PATH);
+
+		int appLen = _tcslen(apppath);
+		while (appLen > 1)
+		{
+			if (apppath[appLen-1] == TEXT('\\'))
+				break;
+			appLen--;
+		}
+
+		// Terminate the string after the trailing backslash
+		apppath[appLen] = TEXT('\0');
+	}
+#ifdef _UNICODE
+	wcstombs(buf, apppath, wcslen(apppath)+1);
+#else
+	memcpy(buf, apppath, strlen(apppath));
+#endif
+	myFilename = buf + myFilename;
+#endif
+
+
+	// By default windows translates "\r\n" to "\n", but we want to read the file as-is.
+	m += "b";
+
+	// Open the file
+#if _MSC_VER >= 1400 && !defined(__S3E__) 
+	// MSVC 8.0 / 2005 introduced new functions 
+	// Marmalade doesn't use these, even though it uses the MSVC compiler
+	fopen_s(&file, myFilename.c_str(), m.c_str());
+#else
+	file = fopen(myFilename.c_str(), m.c_str());
+#endif
+	if( file == 0 )
+		return -1;
+
+	return 0;
+}
+
+int CScriptFile::Close()
+{
+	if( file == 0 )
+		return -1;
+
+	fclose(file);
+	file = 0;
+
+	return 0;
+}
+
+int CScriptFile::GetSize() const
+{
+	if( file == 0 )
+		return -1;
+
+	int pos = ftell(file);
+	fseek(file, 0, SEEK_END);
+	int size = ftell(file);
+	fseek(file, pos, SEEK_SET);
+
+	return size;
+}
+
+int CScriptFile::GetPos() const
+{
+	if( file == 0 )
+		return -1;
+
+	return ftell(file);
+}
+ 
+int CScriptFile::SetPos(int pos)
+{
+	if( file == 0 )
+		return -1;
+
+	int r = fseek(file, pos, SEEK_SET);
+
+	// Return -1 on error
+	return r ? -1 : 0;
+}
+
+int CScriptFile::MovePos(int delta)
+{
+	if( file == 0 )
+		return -1;
+
+	int r = fseek(file, delta, SEEK_CUR);
+
+	// Return -1 on error
+	return r ? -1 : 0;
+}
+
+string CScriptFile::ReadString(unsigned int length)
+{
+	if( file == 0 )
+		return "";
+
+	// Read the string
+	string str;
+	str.resize(length);
+	int size = (int)fread(&str[0], 1, length, file); 
+	str.resize(size);
+
+	return str;
+}
+
+string CScriptFile::ReadLine()
+{
+	if( file == 0 )
+		return "";
+
+	// Read until the first new-line character
+	string str;
+	char buf[256];
+
+	do
+	{
+		// Get the current position so we can determine how many characters were read
+		int start = ftell(file);
+
+		// Set the last byte to something different that 0, so that we can check if the buffer was filled up
+		buf[255] = 1;
+
+		// Read the line (or first 255 characters, which ever comes first)
+		char *r = fgets(buf, 256, file);
+		if( r == 0 ) break;
+		
+		// Get the position after the read
+		int end = ftell(file);
+
+		// Add the read characters to the output buffer
+		str.append(buf, end-start);
+	}
+	while( !feof(file) && buf[255] == 0 && buf[254] != '\n' );
+
+	return str;
+}
+
+asINT64 CScriptFile::ReadInt(asUINT bytes)
+{
+	if( file == 0 )
+		return 0;
+
+	if( bytes > 8 ) bytes = 8;
+	if( bytes == 0 ) return 0;
+
+	unsigned char buf[8];
+	size_t r = fread(buf, bytes, 1, file);
+	if( r == 0 ) return 0;
+
+	asINT64 val = 0;
+	if( mostSignificantByteFirst )
+	{
+		unsigned int n = 0;
+		for( ; n < bytes; n++ )
+			val |= asQWORD(buf[n]) << ((bytes-n-1)*8);
+
+		// Check the most significant byte to determine if the rest 
+		// of the qword must be filled to give a negative value
+		if( buf[0] & 0x80 )
+			for( ; n < 8; n++ )
+				val |= asQWORD(0xFF) << (n*8);
+	}
+	else
+	{
+		unsigned int n = 0;
+		for( ; n < bytes; n++ )
+			val |= asQWORD(buf[n]) << (n*8);
+
+		// Check the most significant byte to determine if the rest 
+		// of the qword must be filled to give a negative value
+		if( buf[bytes-1] & 0x80 )
+			for( ; n < 8; n++ )
+				val |= asQWORD(0xFF) << (n*8);
+	}
+
+	return val;
+}
+
+asQWORD CScriptFile::ReadUInt(asUINT bytes)
+{
+	if( file == 0 )
+		return 0;
+
+	if( bytes > 8 ) bytes = 8;
+	if( bytes == 0 ) return 0;
+
+	unsigned char buf[8];
+	size_t r = fread(buf, bytes, 1, file);
+	if( r == 0 ) return 0;
+
+	asQWORD val = 0;
+	if( mostSignificantByteFirst )
+	{
+		unsigned int n = 0;
+		for( ; n < bytes; n++ )
+			val |= asQWORD(buf[n]) << ((bytes-n-1)*8);
+	}
+	else
+	{
+		unsigned int n = 0;
+		for( ; n < bytes; n++ )
+			val |= asQWORD(buf[n]) << (n*8);
+	}
+
+	return val;
+}
+
+float CScriptFile::ReadFloat()
+{
+	if( file == 0 )
+		return 0;
+
+	unsigned char buf[4];
+	size_t r = fread(buf, 4, 1, file);
+	if( r == 0 ) return 0;
+
+	asUINT val = 0;
+	if( mostSignificantByteFirst )
+	{
+		unsigned int n = 0;
+		for( ; n < 4; n++ )
+			val |= asUINT(buf[n]) << ((3-n)*8);
+	}
+	else
+	{
+		unsigned int n = 0;
+		for( ; n < 4; n++ )
+			val |= asUINT(buf[n]) << (n*8);
+	}
+
+	return *reinterpret_cast<float*>(&val);
+}
+
+double CScriptFile::ReadDouble()
+{
+	if( file == 0 )
+		return 0;
+
+	unsigned char buf[8];
+	size_t r = fread(buf, 8, 1, file);
+	if( r == 0 ) return 0;
+
+	asQWORD val = 0;
+	if( mostSignificantByteFirst )
+	{
+		unsigned int n = 0;
+		for( ; n < 8; n++ )
+			val |= asQWORD(buf[n]) << ((7-n)*8);
+	}
+	else
+	{
+		unsigned int n = 0;
+		for( ; n < 8; n++ )
+			val |= asQWORD(buf[n]) << (n*8);
+	}
+
+	return *reinterpret_cast<double*>(&val);
+}
+
+bool CScriptFile::IsEOF() const
+{
+	if( file == 0 )
+		return true;
+
+	return feof(file) ? true : false;
+}
+
+#if AS_WRITE_OPS == 1
+int CScriptFile::WriteString(const std::string &str)
+{
+	if( file == 0 )
+		return -1;
+
+	// Write the entire string
+	size_t r = fwrite(&str[0], 1, str.length(), file);
+
+	return int(r);
+}
+
+int CScriptFile::WriteInt(asINT64 val, asUINT bytes)
+{
+	if( file == 0 )
+		return 0;
+
+	unsigned char buf[8];
+	if( mostSignificantByteFirst )
+	{
+		for( unsigned int n = 0; n < bytes; n++ )
+			buf[n] = (val >> ((bytes-n-1)*8)) & 0xFF;
+	}
+	else
+	{
+		for( unsigned int n = 0; n < bytes; n++ )
+			buf[n] = (val >> (n*8)) & 0xFF;
+	}
+
+	size_t r = fwrite(&buf, bytes, 1, file);
+	return int(r);
+}
+
+int CScriptFile::WriteUInt(asQWORD val, asUINT bytes)
+{
+	if( file == 0 )
+		return 0;
+
+	unsigned char buf[8];
+	if( mostSignificantByteFirst )
+	{
+		for( unsigned int n = 0; n < bytes; n++ )
+			buf[n] = (val >> ((bytes-n-1)*8)) & 0xFF;
+	}
+	else
+	{
+		for( unsigned int n = 0; n < bytes; n++ )
+			buf[n] = (val >> (n*8)) & 0xFF;
+	}
+
+	size_t r = fwrite(&buf, bytes, 1, file);
+	return int(r);
+}
+
+int CScriptFile::WriteFloat(float f)
+{
+	if( file == 0 )
+		return 0;
+
+	unsigned char buf[4];
+	asUINT val = *reinterpret_cast<asUINT*>(&f);
+	if( mostSignificantByteFirst )
+	{
+		for( unsigned int n = 0; n < 4; n++ )
+			buf[n] = (val >> ((3-n)*4)) & 0xFF;
+	}
+	else
+	{
+		for( unsigned int n = 0; n < 4; n++ )
+			buf[n] = (val >> (n*8)) & 0xFF;
+	}
+
+	size_t r = fwrite(&buf, 4, 1, file);
+	return int(r);
+}
+
+int CScriptFile::WriteDouble(double d)
+{
+	if( file == 0 )
+		return 0;
+
+	unsigned char buf[8];
+	asQWORD val = *reinterpret_cast<asQWORD*>(&d);
+	if( mostSignificantByteFirst )
+	{
+		for( unsigned int n = 0; n < 8; n++ )
+			buf[n] = (val >> ((7-n)*8)) & 0xFF;
+	}
+	else
+	{
+		for( unsigned int n = 0; n < 8; n++ )
+			buf[n] = (val >> (n*8)) & 0xFF;
+	}
+
+	size_t r = fwrite(&buf, 8, 1, file);
+	return int(r);
+}
+#endif
+
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/scriptfile/scriptfile.h b/Sources/AngelScript/add_on/scriptfile/scriptfile.h
new file mode 100644
index 000000000..748bba77c
--- /dev/null
+++ b/Sources/AngelScript/add_on/scriptfile/scriptfile.h
@@ -0,0 +1,101 @@
+//
+// CScriptFile
+//
+// This class encapsulates a FILE pointer in a reference counted class for
+// use within AngelScript.
+//
+
+#ifndef SCRIPTFILE_H
+#define SCRIPTFILE_H
+
+//---------------------------
+// Compilation settings
+//
+
+// Set this flag to turn on/off write support
+//  0 = off
+//  1 = on
+
+#ifndef AS_WRITE_OPS
+#define AS_WRITE_OPS 1
+#endif
+
+
+
+
+//---------------------------
+// Declaration
+//
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#include <string>
+#include <stdio.h>
+
+BEGIN_AS_NAMESPACE
+
+class CScriptFile
+{
+public:
+	CScriptFile();
+
+	void AddRef() const;
+	void Release() const;
+
+	// TODO: Implement the "r+", "w+" and "a+" modes
+	// mode = "r" -> open the file for reading
+	//        "w" -> open the file for writing (overwrites existing file)
+	//        "a" -> open the file for appending
+	int  Open(const std::string &filename, const std::string &mode);
+	int  Close();
+	int  GetSize() const;
+	bool IsEOF() const;
+
+	// Reading
+	std::string ReadString(unsigned int length);
+	std::string ReadLine();
+	asINT64     ReadInt(asUINT bytes);
+	asQWORD     ReadUInt(asUINT bytes);
+	float       ReadFloat();
+	double      ReadDouble();
+
+	// Writing
+	int WriteString(const std::string &str);
+	int WriteInt(asINT64 v, asUINT bytes);
+	int WriteUInt(asQWORD v, asUINT bytes);
+	int WriteFloat(float v);
+	int WriteDouble(double v);
+
+	// Cursor
+	int GetPos() const;
+	int SetPos(int pos);
+	int MovePos(int delta);
+
+	// Big-endian = most significant byte first
+	bool mostSignificantByteFirst;
+
+protected:
+	~CScriptFile();
+
+	mutable int refCount;
+	FILE       *file;
+};
+
+// This function will determine the configuration of the engine
+// and use one of the two functions below to register the file type
+void RegisterScriptFile(asIScriptEngine *engine);
+
+// Call this function to register the file type
+// using native calling conventions
+void RegisterScriptFile_Native(asIScriptEngine *engine);
+
+// Use this one instead if native calling conventions
+// are not supported on the target platform
+void RegisterScriptFile_Generic(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/add_on/scriptfile/scriptfilesystem.cpp b/Sources/AngelScript/add_on/scriptfile/scriptfilesystem.cpp
new file mode 100644
index 000000000..6af69f0da
--- /dev/null
+++ b/Sources/AngelScript/add_on/scriptfile/scriptfilesystem.cpp
@@ -0,0 +1,631 @@
+#include "scriptfilesystem.h"
+#include "../autowrapper/aswrappedcall.h"
+#include <string.h> // strstr()
+
+#if defined(_WIN32)
+#include <direct.h> // _getcwd
+#include <Windows.h> // FindFirstFile, GetFileAttributes
+
+#undef DeleteFile
+#undef CopyFile
+
+#else
+#include <unistd.h> // getcwd
+#include <dirent.h> // opendir, readdir, closedir
+#include <sys/stat.h> // stat
+#endif
+#include <assert.h> // assert
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+// TODO: The file system should have a way to allow the application to define in
+//       which sub directories it is allowed to make changes and/or read
+
+CScriptFileSystem *ScriptFileSystem_Factory()
+{
+	return new CScriptFileSystem();
+}
+
+void RegisterScriptFileSystem_Native(asIScriptEngine *engine)
+{
+	int r;
+
+	assert( engine->GetTypeInfoByName("string") );
+	assert( engine->GetTypeInfoByDecl("array<string>") );
+	assert( engine->GetTypeInfoByName("datetime") );
+
+	r = engine->RegisterObjectType("filesystem", 0, asOBJ_REF); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("filesystem", asBEHAVE_FACTORY, "filesystem @f()", asFUNCTION(ScriptFileSystem_Factory), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("filesystem", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptFileSystem,AddRef), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("filesystem", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptFileSystem,Release), asCALL_THISCALL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("filesystem", "bool changeCurrentPath(const string &in)", asMETHOD(CScriptFileSystem, ChangeCurrentPath), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "string getCurrentPath() const", asMETHOD(CScriptFileSystem, GetCurrentPath), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "array<string> @getDirs() const", asMETHOD(CScriptFileSystem, GetDirs), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "array<string> @getFiles() const", asMETHOD(CScriptFileSystem, GetFiles), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "bool isDir(const string &in) const", asMETHOD(CScriptFileSystem, IsDir), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "bool isLink(const string &in) const", asMETHOD(CScriptFileSystem, IsLink), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int64 getSize(const string &in) const", asMETHOD(CScriptFileSystem, GetSize), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int makeDir(const string &in)", asMETHOD(CScriptFileSystem, MakeDir), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int removeDir(const string &in)", asMETHOD(CScriptFileSystem, RemoveDir), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int deleteFile(const string &in)", asMETHOD(CScriptFileSystem, DeleteFile), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int copyFile(const string &in, const string &in)", asMETHOD(CScriptFileSystem, CopyFile), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int move(const string &in, const string &in)", asMETHOD(CScriptFileSystem, Move), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "datetime getCreateDateTime(const string &in) const", asMETHOD(CScriptFileSystem, GetCreateDateTime), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "datetime getModifyDateTime(const string &in) const", asMETHOD(CScriptFileSystem, GetModifyDateTime), asCALL_THISCALL); assert(r >= 0);
+}
+
+void RegisterScriptFileSystem_Generic(asIScriptEngine *engine)
+{
+	int r;
+
+	assert( engine->GetTypeInfoByName("string") );
+	assert( engine->GetTypeInfoByDecl("array<string>") );
+	assert( engine->GetTypeInfoByName("datetime") );
+
+	r = engine->RegisterObjectType("filesystem", 0, asOBJ_REF); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("filesystem", asBEHAVE_FACTORY, "filesystem @f()", WRAP_FN(ScriptFileSystem_Factory), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("filesystem", asBEHAVE_ADDREF, "void f()", WRAP_MFN(CScriptFileSystem,AddRef), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("filesystem", asBEHAVE_RELEASE, "void f()", WRAP_MFN(CScriptFileSystem,Release), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("filesystem", "bool changeCurrentPath(const string &in)", WRAP_MFN(CScriptFileSystem, ChangeCurrentPath), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "string getCurrentPath() const", WRAP_MFN(CScriptFileSystem, GetCurrentPath), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "array<string> @getDirs() const", WRAP_MFN(CScriptFileSystem, GetDirs), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "array<string> @getFiles() const", WRAP_MFN(CScriptFileSystem, GetFiles), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "bool isDir(const string &in) const", WRAP_MFN(CScriptFileSystem, IsDir), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("filesystem", "bool isLink(const string &in) const", WRAP_MFN(CScriptFileSystem, IsLink), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int64 getSize(const string &in) const", WRAP_MFN(CScriptFileSystem, GetSize), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int makeDir(const string &in)", WRAP_MFN(CScriptFileSystem, MakeDir), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int removeDir(const string &in)", WRAP_MFN(CScriptFileSystem, RemoveDir), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int deleteFile(const string &in)", WRAP_MFN(CScriptFileSystem, DeleteFile), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int copyFile(const string &in, const string &in)", WRAP_MFN(CScriptFileSystem, CopyFile), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "int move(const string &in, const string &in)", WRAP_MFN(CScriptFileSystem, Move), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "datetime getCreateDateTime(const string &in) const", WRAP_MFN(CScriptFileSystem, GetCreateDateTime), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("filesystem", "datetime getModifyDateTime(const string &in) const", WRAP_MFN(CScriptFileSystem, GetModifyDateTime), asCALL_GENERIC); assert(r >= 0);
+}
+
+void RegisterScriptFileSystem(asIScriptEngine *engine)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+		RegisterScriptFileSystem_Generic(engine);
+	else
+		RegisterScriptFileSystem_Native(engine);
+}
+
+CScriptFileSystem::CScriptFileSystem()
+{
+	refCount = 1;
+
+	// Gets the application's current working directory as the starting point
+	// TODO: Replace backslash with slash to keep a unified naming convention
+	char buffer[1000];
+#if defined(_WIN32)
+	currentPath = _getcwd(buffer, 1000);
+#else
+	currentPath = getcwd(buffer, 1000);
+#endif
+}
+
+CScriptFileSystem::~CScriptFileSystem()
+{
+}
+
+void CScriptFileSystem::AddRef() const
+{
+	asAtomicInc(refCount);
+}
+
+void CScriptFileSystem::Release() const
+{
+	if( asAtomicDec(refCount) == 0 )
+		delete this;
+}
+
+CScriptArray *CScriptFileSystem::GetFiles() const
+{
+	// Obtain a pointer to the engine
+	asIScriptContext *ctx = asGetActiveContext();
+	asIScriptEngine *engine = ctx->GetEngine();
+
+	// TODO: This should only be done once
+	// TODO: This assumes that CScriptArray was already registered
+	asITypeInfo *arrayType = engine->GetTypeInfoByDecl("array<string>");
+
+	// Create the array object
+	CScriptArray *array = CScriptArray::Create(arrayType);
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	string searchPattern = currentPath + "/*";
+	MultiByteToWideChar(CP_UTF8, 0, searchPattern.c_str(), -1, bufUTF16, 10000);
+
+	WIN32_FIND_DATAW ffd;
+	HANDLE hFind = FindFirstFileW(bufUTF16, &ffd);
+	if( INVALID_HANDLE_VALUE == hFind )
+		return array;
+
+	do
+	{
+		// Skip directories
+		if( (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
+			continue;
+
+		// Convert the file name back to UTF8
+		char bufUTF8[10000];
+		WideCharToMultiByte(CP_UTF8, 0, ffd.cFileName, -1, bufUTF8, 10000, 0, 0);
+
+		// Add the file to the array
+		array->Resize(array->GetSize()+1);
+		((string*)(array->At(array->GetSize()-1)))->assign(bufUTF8);
+	}
+	while( FindNextFileW(hFind, &ffd) != 0 );
+
+	FindClose(hFind);
+#else
+	dirent *ent = 0;
+	DIR *dir = opendir(currentPath.c_str());
+	while( (ent = readdir(dir)) != NULL )
+	{
+		const string filename = ent->d_name;
+
+		// Skip . and ..
+		if( filename[0] == '.' )
+			continue;
+
+		// Skip sub directories
+		const string fullname = currentPath + "/" + filename;
+		struct stat st;
+		if( stat(fullname.c_str(), &st) == -1 )
+			continue;
+		if( (st.st_mode & S_IFDIR) != 0 )
+			continue;
+
+		// Add the file to the array
+		array->Resize(array->GetSize()+1);
+		((string*)(array->At(array->GetSize()-1)))->assign(filename);
+	}
+	closedir(dir);
+#endif
+
+	return array;
+}
+
+CScriptArray *CScriptFileSystem::GetDirs() const
+{
+	// Obtain a pointer to the engine
+	asIScriptContext *ctx = asGetActiveContext();
+	asIScriptEngine *engine = ctx->GetEngine();
+
+	// TODO: This should only be done once
+	// TODO: This assumes that CScriptArray was already registered
+	asITypeInfo *arrayType = engine->GetTypeInfoByDecl("array<string>");
+
+	// Create the array object
+	CScriptArray *array = CScriptArray::Create(arrayType);
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	string searchPattern = currentPath + "/*";
+	MultiByteToWideChar(CP_UTF8, 0, searchPattern.c_str(), -1, bufUTF16, 10000);
+
+	WIN32_FIND_DATAW ffd;
+	HANDLE hFind = FindFirstFileW(bufUTF16, &ffd);
+	if( INVALID_HANDLE_VALUE == hFind )
+		return array;
+
+	do
+	{
+		// Skip files
+		if( !(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
+			continue;
+
+		// Convert the file name back to UTF8
+		char bufUTF8[10000];
+		WideCharToMultiByte(CP_UTF8, 0, ffd.cFileName, -1, bufUTF8, 10000, 0, 0);
+
+		if( strcmp(bufUTF8, ".") == 0 || strcmp(bufUTF8, "..") == 0 )
+			continue;
+
+		// Add the dir to the array
+		array->Resize(array->GetSize()+1);
+		((string*)(array->At(array->GetSize()-1)))->assign(bufUTF8);
+	}
+	while( FindNextFileW(hFind, &ffd) != 0 );
+
+	FindClose(hFind);
+#else
+	dirent *ent = 0;
+	DIR *dir = opendir(currentPath.c_str());
+	while( (ent = readdir(dir)) != NULL )
+	{
+		const string filename = ent->d_name;
+
+		// Skip . and ..
+		if( filename[0] == '.' )
+			continue;
+
+		// Skip files
+		const string fullname = currentPath + "/" + filename;
+		struct stat st;
+		if( stat(fullname.c_str(), &st) == -1 )
+			continue;
+		if( (st.st_mode & S_IFDIR) == 0 )
+			continue;
+
+		// Add the dir to the array
+		array->Resize(array->GetSize()+1);
+		((string*)(array->At(array->GetSize()-1)))->assign(filename);
+	}
+	closedir(dir);
+#endif
+
+	return array;
+}
+
+// Doesn't change anything if the new path is not valid
+bool CScriptFileSystem::ChangeCurrentPath(const string &path)
+{
+	string newPath;
+	if( path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0 )
+		newPath = path;
+	else
+		newPath = currentPath + "/" + path;
+
+	// TODO: Resolve internal /./ and /../
+	// TODO: Replace backslash with slash to keep a unified naming convention
+
+	// Remove trailing slashes from the path
+	while(newPath.length() && (newPath[newPath.length()-1] == '/' || newPath[newPath.length()-1] == '\\') )
+		newPath.resize(newPath.length()-1);
+
+	if (!IsDir(newPath))
+		return false;
+
+	currentPath = newPath;
+	return true;
+}
+
+bool CScriptFileSystem::IsDir(const string &path) const
+{
+	string search;
+	if( path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0 )
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Check if the path exists and is a directory
+	DWORD attrib = GetFileAttributesW(bufUTF16);
+	if( attrib == INVALID_FILE_ATTRIBUTES ||
+		!(attrib & FILE_ATTRIBUTE_DIRECTORY) )
+		return false;
+#else
+	// Check if the path exists and is a directory
+	struct stat st;
+	if( stat(search.c_str(), &st) == -1 )
+		return false;
+	if( (st.st_mode & S_IFDIR) == 0 )
+		return false;
+#endif
+
+	return true;
+}
+
+bool CScriptFileSystem::IsLink(const string &path) const
+{
+	string search;
+	if (path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0)
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Check if the path exists and is a link
+	DWORD attrib = GetFileAttributesW(bufUTF16);
+	if (attrib == INVALID_FILE_ATTRIBUTES ||
+		!(attrib & FILE_ATTRIBUTE_REPARSE_POINT))
+		return false;
+#else
+	// Check if the path exists and is a link
+	struct stat st;
+	if (stat(search.c_str(), &st) == -1)
+		return false;
+	if ((st.st_mode & S_IFLNK) == 0)
+		return false;
+#endif
+
+	return true;
+}
+
+asINT64 CScriptFileSystem::GetSize(const string &path) const
+{
+	string search;
+	if (path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0)
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Get the size of the file
+	LARGE_INTEGER largeInt;
+	HANDLE file = CreateFileW(bufUTF16, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	BOOL success = GetFileSizeEx(file, &largeInt);
+	CloseHandle(file);
+	if( !success )
+		return -1;
+	return asINT64(largeInt.QuadPart);
+#else
+	// Get the size of the file
+	struct stat st;
+	if (stat(search.c_str(), &st) == -1)
+		return -1;
+	return asINT64(st.st_size);
+#endif
+}
+
+// TODO: Should be able to return different codes for
+//       - directory exists
+//       - path not found
+//       - access denied
+// TODO: Should be able to define the permissions for the directory
+// TODO: Should support recursively creating directories
+int CScriptFileSystem::MakeDir(const string &path)
+{
+	string search;
+	if (path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0)
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Create the directory
+	BOOL success = CreateDirectoryW(bufUTF16, 0);
+	return success ? 0 : -1;
+#else
+	// Create the directory
+	int failure = mkdir(search.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+	return !failure ? 0 : -1;
+#endif
+}
+
+// TODO: Should be able to return different codes for
+//       - directory doesn't exist
+//       - directory is not empty
+//       - access denied
+// TODO: Should have an option to remove the directory and all content recursively
+int CScriptFileSystem::RemoveDir(const string &path)
+{
+	string search;
+	if (path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0)
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Remove the directory
+	BOOL success = RemoveDirectoryW(bufUTF16);
+	return success ? 0 : -1;
+#else
+	// Remove the directory
+	int failure = rmdir(search.c_str());
+	return !failure ? 0 : -1;
+#endif
+}
+
+int CScriptFileSystem::DeleteFile(const string &path)
+{
+	string search;
+	if (path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0)
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Remove the file
+	BOOL success = DeleteFileW(bufUTF16);
+	return success ? 0 : -1;
+#else
+	// Remove the file
+	int failure = unlink(search.c_str());
+	return !failure ? 0 : -1;
+#endif
+}
+
+int CScriptFileSystem::CopyFile(const string &source, const string &target)
+{
+	string search1;
+	if (source.find(":") != string::npos || source.find("/") == 0 || source.find("\\") == 0)
+		search1 = source;
+	else
+		search1 = currentPath + "/" + source;
+
+	string search2;
+	if (target.find(":") != string::npos || target.find("/") == 0 || target.find("\\") == 0)
+		search2 = target;
+	else
+		search2 = currentPath + "/" + target;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16_1[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search1.c_str(), -1, bufUTF16_1, 10000);
+
+	wchar_t bufUTF16_2[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search2.c_str(), -1, bufUTF16_2, 10000);
+
+	// Copy the file
+	BOOL success = CopyFileW(bufUTF16_1, bufUTF16_2, TRUE);
+	return success ? 0 : -1;
+#else
+	// Copy the file manually as there is no posix function for this
+	bool failure = false;
+	FILE *src = 0, *tgt = 0;
+	src = fopen(search1.c_str(), "r");
+	if (src == 0) failure = true;
+	if( !failure ) tgt = fopen(search2.c_str(), "w");
+	if (tgt == 0) failure = true;
+	char buf[1024];
+	size_t n;
+	while (!failure && (n = fread(buf, sizeof(char), sizeof(buf), src)) > 0)
+	{
+		if (fwrite(buf, sizeof(char), n, tgt) != n)
+			failure = true;
+	}
+	if (src) fclose(src);
+	if (tgt) fclose(tgt);
+	return !failure ? 0 : -1;
+#endif
+}
+
+int CScriptFileSystem::Move(const string &source, const string &target)
+{
+	string search1;
+	if (source.find(":") != string::npos || source.find("/") == 0 || source.find("\\") == 0)
+		search1 = source;
+	else
+		search1 = currentPath + "/" + source;
+
+	string search2;
+	if (target.find(":") != string::npos || target.find("/") == 0 || target.find("\\") == 0)
+		search2 = target;
+	else
+		search2 = currentPath + "/" + target;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16_1[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search1.c_str(), -1, bufUTF16_1, 10000);
+
+	wchar_t bufUTF16_2[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search2.c_str(), -1, bufUTF16_2, 10000);
+
+	// Move the file or directory
+	BOOL success = MoveFileW(bufUTF16_1, bufUTF16_2);
+	return success ? 0 : -1;
+#else
+	// Move the file or directory
+	int failure = rename(search1.c_str(), search2.c_str());
+	return !failure ? 0 : -1;
+#endif
+}
+
+string CScriptFileSystem::GetCurrentPath() const
+{
+	return currentPath;
+}
+
+CDateTime CScriptFileSystem::GetCreateDateTime(const string &path) const
+{
+	string search;
+	if (path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0)
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Get the create date/time of the file
+	FILETIME createTm;
+	HANDLE file = CreateFileW(bufUTF16, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	BOOL success = GetFileTime(file, &createTm, 0, 0);
+	CloseHandle(file);
+	if( !success )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Failed to get file creation date/time");
+		return CDateTime();
+	}
+	SYSTEMTIME tm;
+	FileTimeToSystemTime(&createTm, &tm);
+	return CDateTime(tm.wYear, tm.wMonth, tm.wDay, tm.wHour, tm.wMinute, tm.wSecond);
+#else
+	// Get the create date/time of the file
+	struct stat st;
+	if (stat(search.c_str(), &st) == -1)
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Failed to get file creation date/time");
+		return CDateTime();
+	}
+	tm *t = localtime(&st.st_ctime);
+	return CDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+#endif
+}
+
+CDateTime CScriptFileSystem::GetModifyDateTime(const string &path) const
+{
+	string search;
+	if (path.find(":") != string::npos || path.find("/") == 0 || path.find("\\") == 0)
+		search = path;
+	else
+		search = currentPath + "/" + path;
+
+#if defined(_WIN32)
+	// Windows uses UTF16 so it is necessary to convert the string
+	wchar_t bufUTF16[10000];
+	MultiByteToWideChar(CP_UTF8, 0, search.c_str(), -1, bufUTF16, 10000);
+
+	// Get the last modify date/time of the file
+	FILETIME modifyTm;
+	HANDLE file = CreateFileW(bufUTF16, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	BOOL success = GetFileTime(file, 0, 0, &modifyTm);
+	CloseHandle(file);
+	if( !success )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Failed to get file modify date/time");
+		return CDateTime();
+	}
+	SYSTEMTIME tm;
+	FileTimeToSystemTime(&modifyTm, &tm);
+	return CDateTime(tm.wYear, tm.wMonth, tm.wDay, tm.wHour, tm.wMinute, tm.wSecond);
+#else
+	// Get the last modify date/time of the file
+	struct stat st;
+	if (stat(search.c_str(), &st) == -1)
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Failed to get file modify date/time");
+		return CDateTime();
+	}
+	tm *t = localtime(&st.st_mtime);
+	return CDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+#endif
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/scriptfile/scriptfilesystem.h b/Sources/AngelScript/add_on/scriptfile/scriptfilesystem.h
new file mode 100644
index 000000000..5712d7ce6
--- /dev/null
+++ b/Sources/AngelScript/add_on/scriptfile/scriptfilesystem.h
@@ -0,0 +1,78 @@
+#ifndef AS_SCRIPTFILESYSTEM_H
+#define AS_SCRIPTFILESYSTEM_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#include <string>
+#include <stdio.h>
+
+#include "../scriptarray/scriptarray.h"
+#include "../datetime/datetime.h"
+
+BEGIN_AS_NAMESPACE
+
+class CScriptFileSystem
+{
+public:
+	CScriptFileSystem();
+
+	void AddRef() const;
+	void Release() const;
+
+	// Sets the current path that should be used in other calls when using relative paths
+	// It can use relative paths too, so moving up a directory is used by passing in ".."
+	bool ChangeCurrentPath(const std::string &path);
+	std::string GetCurrentPath() const;
+
+	// Returns true if the path is a directory. Input can be either a full path or a relative path.
+	// This method does not return the dirs '.' and '..'
+	bool IsDir(const std::string &path) const;
+
+	// Returns true if the path is a link. Input can be either a full path or a relative path
+	bool IsLink(const std::string &path) const;
+
+	// Returns the size of file. Input can be either a full path or a relative path
+	asINT64 GetSize(const std::string &path) const;
+
+	// Returns a list of the files in the current path
+	CScriptArray *GetFiles() const;
+
+	// Returns a list of the directories in the current path
+	CScriptArray *GetDirs() const;
+
+	// Creates a new directory. Returns 0 on success
+	int MakeDir(const std::string &path);
+
+	// Removes a directory. Will only remove the directory if it is empty. Returns 0 on success
+	int RemoveDir(const std::string &path);
+
+	// Deletes a file. Returns 0 on success
+	int DeleteFile(const std::string &path);
+
+	// Copies a file. Returns 0 on success
+	int CopyFile(const std::string &source, const std::string &target);
+
+	// Moves or renames a file or directory. Returns 0 on success
+	int Move(const std::string &source, const std::string &target);
+	
+	// Gets the date and time of the file/dir creation
+	CDateTime GetCreateDateTime(const std::string &path) const;
+
+	// Gets the date and time of the file/dir modification
+	CDateTime GetModifyDateTime(const std::string &path) const;
+
+protected:
+	~CScriptFileSystem();
+
+	mutable int refCount;
+	std::string currentPath;
+};
+
+void RegisterScriptFileSystem(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/add_on/scriptgrid/scriptgrid.cpp b/Sources/AngelScript/add_on/scriptgrid/scriptgrid.cpp
new file mode 100644
index 000000000..f636267e4
--- /dev/null
+++ b/Sources/AngelScript/add_on/scriptgrid/scriptgrid.cpp
@@ -0,0 +1,807 @@
+#include <new>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdio.h> // sprintf
+
+#include "scriptgrid.h"
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+// Set the default memory routines
+// Use the angelscript engine's memory routines by default
+static asALLOCFUNC_t userAlloc = asAllocMem;
+static asFREEFUNC_t  userFree  = asFreeMem;
+
+// Allows the application to set which memory routines should be used by the array object
+void CScriptGrid::SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc)
+{
+	userAlloc = allocFunc;
+	userFree = freeFunc;
+}
+
+static void RegisterScriptGrid_Native(asIScriptEngine *engine);
+
+struct SGridBuffer
+{
+	asDWORD width;
+	asDWORD height;
+	asBYTE  data[1];
+};
+
+CScriptGrid *CScriptGrid::Create(asITypeInfo *ti)
+{
+	return CScriptGrid::Create(ti, 0, 0);
+}
+
+CScriptGrid *CScriptGrid::Create(asITypeInfo *ti, asUINT w, asUINT h)
+{
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptGrid));
+	if( mem == 0 )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptGrid *a = new(mem) CScriptGrid(w, h, ti);
+
+	return a;
+}
+
+CScriptGrid *CScriptGrid::Create(asITypeInfo *ti, void *initList)
+{
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptGrid));
+	if( mem == 0 )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptGrid *a = new(mem) CScriptGrid(ti, initList);
+
+	return a;
+}
+
+CScriptGrid *CScriptGrid::Create(asITypeInfo *ti, asUINT w, asUINT h, void *defVal)
+{
+	// Allocate the memory
+	void *mem = userAlloc(sizeof(CScriptGrid));
+	if( mem == 0 )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+
+		return 0;
+	}
+
+	// Initialize the object
+	CScriptGrid *a = new(mem) CScriptGrid(w, h, defVal, ti);
+
+	return a;
+}
+
+// This optional callback is called when the template type is first used by the compiler.
+// It allows the application to validate if the template can be instantiated for the requested
+// subtype at compile time, instead of at runtime. The output argument dontGarbageCollect
+// allow the callback to tell the engine if the template instance type shouldn't be garbage collected,
+// i.e. no asOBJ_GC flag.
+static bool ScriptGridTemplateCallback(asITypeInfo *ti, bool &dontGarbageCollect)
+{
+	// Make sure the subtype can be instantiated with a default factory/constructor,
+	// otherwise we won't be able to instantiate the elements.
+	int typeId = ti->GetSubTypeId();
+	if( typeId == asTYPEID_VOID )
+		return false;
+	if( (typeId & asTYPEID_MASK_OBJECT) && !(typeId & asTYPEID_OBJHANDLE) )
+	{
+		asITypeInfo *subtype = ti->GetEngine()->GetTypeInfoById(typeId);
+		asDWORD flags = subtype->GetFlags();
+		if( (flags & asOBJ_VALUE) && !(flags & asOBJ_POD) )
+		{
+			// Verify that there is a default constructor
+			bool found = false;
+			for( asUINT n = 0; n < subtype->GetBehaviourCount(); n++ )
+			{
+				asEBehaviours beh;
+				asIScriptFunction *func = subtype->GetBehaviourByIndex(n, &beh);
+				if( beh != asBEHAVE_CONSTRUCT ) continue;
+
+				if( func->GetParamCount() == 0 )
+				{
+					// Found the default constructor
+					found = true;
+					break;
+				}
+			}
+
+			if( !found )
+			{
+				// There is no default constructor
+				ti->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default constructor");
+				return false;
+			}
+		}
+		else if( (flags & asOBJ_REF) )
+		{
+			bool found = false;
+
+			// If value assignment for ref type has been disabled then the array
+			// can be created if the type has a default factory function
+			if( !ti->GetEngine()->GetEngineProperty(asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE) )
+			{
+				// Verify that there is a default factory
+				for( asUINT n = 0; n < subtype->GetFactoryCount(); n++ )
+				{
+					asIScriptFunction *func = subtype->GetFactoryByIndex(n);
+					if( func->GetParamCount() == 0 )
+					{
+						// Found the default factory
+						found = true;
+						break;
+					}
+				}
+			}
+
+			if( !found )
+			{
+				// No default factory
+				ti->GetEngine()->WriteMessage("array", 0, 0, asMSGTYPE_ERROR, "The subtype has no default factory");
+				return false;
+			}
+		}
+
+		// If the object type is not garbage collected then the array also doesn't need to be
+		if( !(flags & asOBJ_GC) )
+			dontGarbageCollect = true;
+	}
+	else if( !(typeId & asTYPEID_OBJHANDLE) )
+	{
+		// Arrays with primitives cannot form circular references,
+		// thus there is no need to garbage collect them
+		dontGarbageCollect = true;
+	}
+	else
+	{
+		assert( typeId & asTYPEID_OBJHANDLE );
+
+		// It is not necessary to set the array as garbage collected for all handle types.
+		// If it is possible to determine that the handle cannot refer to an object type
+		// that can potentially form a circular reference with the array then it is not 
+		// necessary to make the array garbage collected.
+		asITypeInfo *subtype = ti->GetEngine()->GetTypeInfoById(typeId);
+		asDWORD flags = subtype->GetFlags();
+		if( !(flags & asOBJ_GC) )
+		{
+			if( (flags & asOBJ_SCRIPT_OBJECT) )
+			{
+				// Even if a script class is by itself not garbage collected, it is possible
+				// that classes that derive from it may be, so it is not possible to know 
+				// that no circular reference can occur.
+				if( (flags & asOBJ_NOINHERIT) )
+				{
+					// A script class declared as final cannot be inherited from, thus
+					// we can be certain that the object cannot be garbage collected.
+					dontGarbageCollect = true;
+				}
+			}
+			else
+			{
+				// For application registered classes we assume the application knows
+				// what it is doing and don't mark the array as garbage collected unless
+				// the type is also garbage collected.
+				dontGarbageCollect = true;
+			}
+		}
+	}
+
+	// The type is ok
+	return true;
+}
+
+// Registers the template array type
+void RegisterScriptGrid(asIScriptEngine *engine)
+{
+	// TODO: Implement the generic calling convention
+	RegisterScriptGrid_Native(engine);
+}
+
+static void RegisterScriptGrid_Native(asIScriptEngine *engine)
+{
+	int r;
+
+	// Register the grid type as a template
+	r = engine->RegisterObjectType("grid<class T>", 0, asOBJ_REF | asOBJ_GC | asOBJ_TEMPLATE); assert( r >= 0 );
+
+	// Register a callback for validating the subtype before it is used
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptGridTemplateCallback), asCALL_CDECL); assert( r >= 0 );
+
+	// Templates receive the object type as the first parameter. To the script writer this is hidden
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_FACTORY, "grid<T>@ f(int&in)", asFUNCTIONPR(CScriptGrid::Create, (asITypeInfo*), CScriptGrid*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_FACTORY, "grid<T>@ f(int&in, uint, uint)", asFUNCTIONPR(CScriptGrid::Create, (asITypeInfo*, asUINT, asUINT), CScriptGrid*), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_FACTORY, "grid<T>@ f(int&in, uint, uint, const T &in)", asFUNCTIONPR(CScriptGrid::Create, (asITypeInfo*, asUINT, asUINT, void *), CScriptGrid*), asCALL_CDECL); assert( r >= 0 );
+
+	// Register the factory that will be used for initialization lists
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_LIST_FACTORY, "grid<T>@ f(int&in type, int&in list) {repeat {repeat_same T}}", asFUNCTIONPR(CScriptGrid::Create, (asITypeInfo*, void*), CScriptGrid*), asCALL_CDECL); assert( r >= 0 );
+
+	// The memory management methods
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_ADDREF, "void f()", asMETHOD(CScriptGrid,AddRef), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_RELEASE, "void f()", asMETHOD(CScriptGrid,Release), asCALL_THISCALL); assert( r >= 0 );
+
+	// The index operator returns the template subtype
+	r = engine->RegisterObjectMethod("grid<T>", "T &opIndex(uint, uint)", asMETHODPR(CScriptGrid, At, (asUINT, asUINT), void*), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("grid<T>", "const T &opIndex(uint, uint) const", asMETHODPR(CScriptGrid, At, (asUINT, asUINT) const, const void*), asCALL_THISCALL); assert( r >= 0 );
+
+	// Other methods
+	r = engine->RegisterObjectMethod("grid<T>", "void resize(uint width, uint height)", asMETHODPR(CScriptGrid, Resize, (asUINT, asUINT), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("grid<T>", "uint width() const", asMETHOD(CScriptGrid, GetWidth), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("grid<T>", "uint height() const", asMETHOD(CScriptGrid, GetHeight), asCALL_THISCALL); assert( r >= 0 );
+
+	// Register GC behaviours in case the array needs to be garbage collected
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(CScriptGrid, GetRefCount), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_SETGCFLAG, "void f()", asMETHOD(CScriptGrid, SetFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(CScriptGrid, GetFlag), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptGrid, EnumReferences), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("grid<T>", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptGrid, ReleaseAllHandles), asCALL_THISCALL); assert( r >= 0 );
+}
+
+CScriptGrid::CScriptGrid(asITypeInfo *ti, void *buf)
+{
+	refCount = 1;
+	gcFlag = false;
+	objType = ti;
+	objType->AddRef();
+	buffer = 0;
+	subTypeId = objType->GetSubTypeId();
+
+	asIScriptEngine *engine = ti->GetEngine();
+
+	// Determine element size
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+		elementSize = sizeof(asPWORD);
+	else
+		elementSize = engine->GetSizeOfPrimitiveType(subTypeId);
+
+	// Determine the initial size from the buffer
+	asUINT height = *(asUINT*)buf;
+	asUINT width = height ? *(asUINT*)((char*)(buf)+4) : 0;
+
+	// Make sure the grid size isn't too large for us to handle
+	if( !CheckMaxSize(width, height) )
+	{
+		// Don't continue with the initialization
+		return;
+	}
+
+	// Skip the height value at the start of the buffer
+	buf = (asUINT*)(buf)+1;
+
+	// Copy the values of the grid elements from the buffer
+	if( (ti->GetSubTypeId() & asTYPEID_MASK_OBJECT) == 0 )
+	{
+		CreateBuffer(&buffer, width, height);
+
+		// Copy the values of the primitive type into the internal buffer
+		for( asUINT y = 0; y < height; y++ )
+		{
+			// Skip the length value at the start of each row
+			buf = (asUINT*)(buf)+1;
+
+			// Copy the line
+			if( width > 0 )
+				memcpy(At(0,y), buf, width*elementSize);
+
+			// Move to next line
+			buf = (char*)(buf) + width*elementSize;
+
+			// Align to 4 byte boundary
+			if( asPWORD(buf) & 0x3 )
+				buf = (char*)(buf) + 4 - (asPWORD(buf) & 0x3);
+		}
+	}
+	else if( ti->GetSubTypeId() & asTYPEID_OBJHANDLE )
+	{
+		CreateBuffer(&buffer, width, height);
+
+		// Copy the handles into the internal buffer
+		for( asUINT y = 0; y < height; y++ )
+		{
+			// Skip the length value at the start of each row
+			buf = (asUINT*)(buf)+1;
+
+			// Copy the line
+			if( width > 0 )
+				memcpy(At(0,y), buf, width*elementSize);
+
+			// With object handles it is safe to clear the memory in the received buffer
+			// instead of increasing the ref count. It will save time both by avoiding the
+			// call the increase ref, and also relieve the engine from having to release
+			// its references too
+			memset(buf, 0, width*elementSize);
+
+			// Move to next line
+			buf = (char*)(buf) + width*elementSize;
+
+			// Align to 4 byte boundary
+			if( asPWORD(buf) & 0x3 )
+				buf = (char*)(buf) + 4 - (asPWORD(buf) & 0x3);
+		}
+	}
+	else if( ti->GetSubType()->GetFlags() & asOBJ_REF )
+	{
+		// Only allocate the buffer, but not the objects
+		subTypeId |= asTYPEID_OBJHANDLE;
+		CreateBuffer(&buffer, width, height);
+		subTypeId &= ~asTYPEID_OBJHANDLE;
+
+		// Copy the handles into the internal buffer
+		for( asUINT y = 0; y < height; y++ )
+		{
+			// Skip the length value at the start of each row
+			buf = (asUINT*)(buf)+1;
+
+			// Copy the line
+			if( width > 0 )
+				memcpy(At(0,y), buf, width*elementSize);
+
+			// With object handles it is safe to clear the memory in the received buffer
+			// instead of increasing the ref count. It will save time both by avoiding the
+			// call the increase ref, and also relieve the engine from having to release
+			// its references too
+			memset(buf, 0, width*elementSize);
+
+			// Move to next line
+			buf = (char*)(buf) + width*elementSize;
+
+			// Align to 4 byte boundary
+			if( asPWORD(buf) & 0x3 )
+				buf = (char*)(buf) + 4 - (asPWORD(buf) & 0x3);
+		}
+	}
+	else
+	{
+		// TODO: Optimize by calling the copy constructor of the object instead of
+		//       constructing with the default constructor and then assigning the value
+		// TODO: With C++11 ideally we should be calling the move constructor, instead
+		//       of the copy constructor as the engine will just discard the objects in the
+		//       buffer afterwards.
+		CreateBuffer(&buffer, width, height);
+
+		// For value types we need to call the opAssign for each individual object
+		asITypeInfo *subType = ti->GetSubType();
+		asUINT subTypeSize = subType->GetSize();
+		for( asUINT y = 0;y < height; y++ )
+		{
+			// Skip the length value at the start of each row
+			buf = (asUINT*)(buf)+1;
+
+			// Call opAssign for each of the objects on the row
+			for( asUINT x = 0; x < width; x++ )
+			{
+				void *obj = At(x,y);
+				asBYTE *srcObj = (asBYTE*)(buf) + x*subTypeSize;
+				engine->AssignScriptObject(obj, srcObj, subType);
+			}
+
+			// Move to next line
+			buf = (char*)(buf) + width*subTypeSize;
+
+			// Align to 4 byte boundary
+			if( asPWORD(buf) & 0x3 )
+				buf = (char*)(buf) + 4 - (asPWORD(buf) & 0x3);
+		}
+	}
+
+	// Notify the GC of the successful creation
+	if( objType->GetFlags() & asOBJ_GC )
+		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
+}
+
+CScriptGrid::CScriptGrid(asUINT width, asUINT height, asITypeInfo *ti)
+{
+	refCount = 1;
+	gcFlag = false;
+	objType = ti;
+	objType->AddRef();
+	buffer = 0;
+	subTypeId = objType->GetSubTypeId();
+
+	// Determine element size
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+		elementSize = sizeof(asPWORD);
+	else
+		elementSize = objType->GetEngine()->GetSizeOfPrimitiveType(subTypeId);
+
+	// Make sure the array size isn't too large for us to handle
+	if( !CheckMaxSize(width, height) )
+	{
+		// Don't continue with the initialization
+		return;
+	}
+
+	CreateBuffer(&buffer, width, height);
+
+	// Notify the GC of the successful creation
+	if( objType->GetFlags() & asOBJ_GC )
+		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
+}
+
+void CScriptGrid::Resize(asUINT width, asUINT height)
+{
+	// Make sure the size isn't too large for us to handle
+	if( !CheckMaxSize(width, height) )
+		return;
+
+	// Create a new buffer
+	SGridBuffer *tmpBuffer = 0;
+	CreateBuffer(&tmpBuffer, width, height);
+	if( tmpBuffer == 0 )
+		return;
+
+	if( buffer )
+	{
+		// Copy the existing values to the new buffer
+		asUINT w = width > buffer->width ? buffer->width : width;
+		asUINT h = height > buffer->height ? buffer->height : height;
+		for( asUINT y = 0; y < h; y++ )
+			for( asUINT x = 0; x < w; x++ )
+				SetValue(tmpBuffer, x, y, At(buffer, x, y));
+
+		// Replace the internal buffer
+		DeleteBuffer(buffer);
+	}
+
+	buffer = tmpBuffer;
+}
+
+CScriptGrid::CScriptGrid(asUINT width, asUINT height, void *defVal, asITypeInfo *ti)
+{
+	refCount = 1;
+	gcFlag = false;
+	objType = ti;
+	objType->AddRef();
+	buffer = 0;
+	subTypeId = objType->GetSubTypeId();
+
+	// Determine element size
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+		elementSize = sizeof(asPWORD);
+	else
+		elementSize = objType->GetEngine()->GetSizeOfPrimitiveType(subTypeId);
+
+	// Make sure the array size isn't too large for us to handle
+	if( !CheckMaxSize(width, height) )
+	{
+		// Don't continue with the initialization
+		return;
+	}
+
+	CreateBuffer(&buffer, width, height);
+
+	// Notify the GC of the successful creation
+	if( objType->GetFlags() & asOBJ_GC )
+		objType->GetEngine()->NotifyGarbageCollectorOfNewObject(this, objType);
+
+	// Initialize the elements with the default value
+	for( asUINT y = 0; y < GetHeight(); y++ )
+		for( asUINT x = 0; x < GetWidth(); x++ )
+			SetValue(x, y, defVal);
+}
+
+void CScriptGrid::SetValue(asUINT x, asUINT y, void *value)
+{
+	SetValue(buffer, x, y, value);
+}
+
+void CScriptGrid::SetValue(SGridBuffer *buf, asUINT x, asUINT y, void *value)
+{
+	// At() will take care of the out-of-bounds checking, though
+	// if called from the application then nothing will be done
+	void *ptr = At(buf, x, y);
+	if( ptr == 0 ) return;
+
+	if( (subTypeId & ~asTYPEID_MASK_SEQNBR) && !(subTypeId & asTYPEID_OBJHANDLE) )
+		objType->GetEngine()->AssignScriptObject(ptr, value, objType->GetSubType());
+	else if( subTypeId & asTYPEID_OBJHANDLE )
+	{
+		void *tmp = *(void**)ptr;
+		*(void**)ptr = *(void**)value;
+		objType->GetEngine()->AddRefScriptObject(*(void**)value, objType->GetSubType());
+		if( tmp )
+			objType->GetEngine()->ReleaseScriptObject(tmp, objType->GetSubType());
+	}
+	else if( subTypeId == asTYPEID_BOOL ||
+			 subTypeId == asTYPEID_INT8 ||
+			 subTypeId == asTYPEID_UINT8 )
+		*(char*)ptr = *(char*)value;
+	else if( subTypeId == asTYPEID_INT16 ||
+			 subTypeId == asTYPEID_UINT16 )
+		*(short*)ptr = *(short*)value;
+	else if( subTypeId == asTYPEID_INT32 ||
+			 subTypeId == asTYPEID_UINT32 ||
+			 subTypeId == asTYPEID_FLOAT ||
+			 subTypeId > asTYPEID_DOUBLE ) // enums have a type id larger than doubles
+		*(int*)ptr = *(int*)value;
+	else if( subTypeId == asTYPEID_INT64 ||
+			 subTypeId == asTYPEID_UINT64 ||
+			 subTypeId == asTYPEID_DOUBLE )
+		*(double*)ptr = *(double*)value;
+}
+
+CScriptGrid::~CScriptGrid()
+{
+	if( buffer )
+	{
+		DeleteBuffer(buffer);
+		buffer = 0;
+	}
+	if( objType ) objType->Release();
+}
+
+asUINT CScriptGrid::GetWidth() const
+{
+	if( buffer )
+		return buffer->width;
+
+	return 0;
+}
+
+asUINT CScriptGrid::GetHeight() const
+{
+	if( buffer )
+		return buffer->height;
+
+	return 0;
+}
+
+// internal
+bool CScriptGrid::CheckMaxSize(asUINT width, asUINT height)
+{
+	// This code makes sure the size of the buffer that is allocated
+	// for the array doesn't overflow and becomes smaller than requested
+
+	asUINT maxSize = 0xFFFFFFFFul - sizeof(SGridBuffer) + 1;
+	if( elementSize > 0 )
+		maxSize /= elementSize;
+
+	asINT64 numElements  = width * height;
+
+	if( (numElements >> 32) || numElements > maxSize )
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Too large grid size");
+
+		return false;
+	}
+
+	// OK
+	return true;
+}
+
+asITypeInfo *CScriptGrid::GetGridObjectType() const
+{
+	return objType;
+}
+
+int CScriptGrid::GetGridTypeId() const
+{
+	return objType->GetTypeId();
+}
+
+int CScriptGrid::GetElementTypeId() const
+{
+	return subTypeId;
+}
+
+void *CScriptGrid::At(asUINT x, asUINT y)
+{
+	return At(buffer, x, y);
+}
+
+// Return a pointer to the array element. Returns 0 if the index is out of bounds
+void *CScriptGrid::At(SGridBuffer *buf, asUINT x, asUINT y)
+{
+	if( buf == 0 || x >= buf->width || y >= buf->height )
+	{
+		// If this is called from a script we raise a script exception
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Index out of bounds");
+		return 0;
+	}
+
+	asUINT index = x+y*buf->width;
+	if( (subTypeId & asTYPEID_MASK_OBJECT) && !(subTypeId & asTYPEID_OBJHANDLE) )
+		return *(void**)(buf->data + elementSize*index);
+	else
+		return buf->data + elementSize*index;
+}
+const void *CScriptGrid::At(asUINT x, asUINT y) const
+{
+	return const_cast<CScriptGrid*>(this)->At(const_cast<SGridBuffer*>(buffer), x, y);
+}
+
+
+// internal
+void CScriptGrid::CreateBuffer(SGridBuffer **buf, asUINT w, asUINT h)
+{
+	asUINT numElements = w * h;
+
+	*buf = reinterpret_cast<SGridBuffer*>(userAlloc(sizeof(SGridBuffer)-1+elementSize*numElements));
+
+	if( *buf )
+	{
+		(*buf)->width  = w;
+		(*buf)->height = h;
+		Construct(*buf);
+	}
+	else
+	{
+		// Oops, out of memory
+		asIScriptContext *ctx = asGetActiveContext();
+		if( ctx )
+			ctx->SetException("Out of memory");
+	}
+}
+
+// internal
+void CScriptGrid::DeleteBuffer(SGridBuffer *buf)
+{
+	assert( buf );
+
+	Destruct(buf);
+
+	// Free the buffer
+	userFree(buf);
+}
+
+// internal
+void CScriptGrid::Construct(SGridBuffer *buf)
+{
+	assert( buf );
+
+	if( subTypeId & asTYPEID_OBJHANDLE )
+	{
+		// Set all object handles to null
+		void *d = (void*)(buf->data);
+		memset(d, 0, (buf->width*buf->height)*sizeof(void*));
+	}
+	else if( subTypeId & asTYPEID_MASK_OBJECT )
+	{
+		void **max = (void**)(buf->data + (buf->width*buf->height) * sizeof(void*));
+		void **d = (void**)(buf->data);
+
+		asIScriptEngine *engine = objType->GetEngine();
+		asITypeInfo *subType = objType->GetSubType();
+
+		for( ; d < max; d++ )
+		{
+			*d = (void*)engine->CreateScriptObject(subType);
+			if( *d == 0 )
+			{
+				// Set the remaining entries to null so the destructor 
+				// won't attempt to destroy invalid objects later
+				memset(d, 0, sizeof(void*)*(max-d));
+
+				// There is no need to set an exception on the context,
+				// as CreateScriptObject has already done that
+				return;
+			}
+		}
+	}
+}
+
+// internal
+void CScriptGrid::Destruct(SGridBuffer *buf)
+{
+	assert( buf );
+
+	if( subTypeId & asTYPEID_MASK_OBJECT )
+	{
+		asIScriptEngine *engine = objType->GetEngine();
+
+		void **max = (void**)(buf->data + (buf->width*buf->height) * sizeof(void*));
+		void **d   = (void**)(buf->data);
+
+		for( ; d < max; d++ )
+		{
+			if( *d )
+				engine->ReleaseScriptObject(*d, objType->GetSubType());
+		}
+	}
+}
+
+// GC behaviour
+void CScriptGrid::EnumReferences(asIScriptEngine *engine)
+{
+	if( buffer == 0 ) return;
+
+	// If the grid is holding handles, then we need to notify the GC of them
+	if (subTypeId & asTYPEID_MASK_OBJECT)
+	{
+		asUINT numElements = buffer->width * buffer->height;
+		void **d = (void**)buffer->data;
+		asITypeInfo *subType = engine->GetTypeInfoById(subTypeId);
+		if ((subType->GetFlags() & asOBJ_REF))
+		{
+			// For reference types we need to notify the GC of each instance
+			for (asUINT n = 0; n < numElements; n++)
+			{
+				if (d[n])
+					engine->GCEnumCallback(d[n]);
+			}
+		}
+		else if ((subType->GetFlags() & asOBJ_VALUE) && (subType->GetFlags() & asOBJ_GC))
+		{
+			// For value types we need to forward the enum callback
+			// to the object so it can decide what to do
+			for (asUINT n = 0; n < numElements; n++)
+			{
+				if (d[n])
+					engine->ForwardGCEnumReferences(d[n], subType);
+			}
+		}
+	}
+}
+
+// GC behaviour
+void CScriptGrid::ReleaseAllHandles(asIScriptEngine*)
+{
+	if( buffer == 0 ) return;
+
+	DeleteBuffer(buffer);
+	buffer = 0;
+}
+
+void CScriptGrid::AddRef() const
+{
+	// Clear the GC flag then increase the counter
+	gcFlag = false;
+	asAtomicInc(refCount);
+}
+
+void CScriptGrid::Release() const
+{
+	// Clearing the GC flag then descrease the counter
+	gcFlag = false;
+	if( asAtomicDec(refCount) == 0 )
+	{
+		// When reaching 0 no more references to this instance
+		// exists and the object should be destroyed
+		this->~CScriptGrid();
+		userFree(const_cast<CScriptGrid*>(this));
+	}
+}
+
+// GC behaviour
+int CScriptGrid::GetRefCount()
+{
+	return refCount;
+}
+
+// GC behaviour
+void CScriptGrid::SetFlag()
+{
+	gcFlag = true;
+}
+
+// GC behaviour
+bool CScriptGrid::GetFlag()
+{
+	return gcFlag;
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/scriptgrid/scriptgrid.h b/Sources/AngelScript/add_on/scriptgrid/scriptgrid.h
new file mode 100644
index 000000000..feeb167f6
--- /dev/null
+++ b/Sources/AngelScript/add_on/scriptgrid/scriptgrid.h
@@ -0,0 +1,82 @@
+#ifndef SCRIPTGRID_H
+#define SCRIPTGRID_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+BEGIN_AS_NAMESPACE
+
+struct SGridBuffer;
+
+class CScriptGrid
+{
+public:
+	// Set the memory functions that should be used by all CScriptGrids
+	static void SetMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
+
+	// Factory functions
+	static CScriptGrid *Create(asITypeInfo *ot);
+	static CScriptGrid *Create(asITypeInfo *ot, asUINT width, asUINT height);
+	static CScriptGrid *Create(asITypeInfo *ot, asUINT width, asUINT height, void *defaultValue);
+	static CScriptGrid *Create(asITypeInfo *ot, void *listBuffer);
+
+	// Memory management
+	void AddRef() const;
+	void Release() const;
+
+	// Type information
+	asITypeInfo *GetGridObjectType() const;
+	int          GetGridTypeId() const;
+	int          GetElementTypeId() const;
+
+	// Size
+	asUINT GetWidth() const;
+	asUINT GetHeight() const;
+	void   Resize(asUINT width, asUINT height);
+
+	// Get a pointer to an element. Returns 0 if out of bounds
+	void       *At(asUINT x, asUINT y);
+	const void *At(asUINT x, asUINT y) const;
+
+	// Set value of an element
+	// Remember, if the grid holds handles the value parameter should be the 
+	// address of the handle. The refCount of the object will also be incremented
+	void  SetValue(asUINT x, asUINT y, void *value);
+
+	// GC methods
+	int  GetRefCount();
+	void SetFlag();
+	bool GetFlag();
+	void EnumReferences(asIScriptEngine *engine);
+	void ReleaseAllHandles(asIScriptEngine *engine);
+
+protected:
+	mutable int     refCount;
+	mutable bool    gcFlag;
+	asITypeInfo    *objType;
+	SGridBuffer    *buffer;
+	int             elementSize;
+	int             subTypeId;
+
+	// Constructors
+	CScriptGrid(asITypeInfo *ot, void *initBuf); // Called from script when initialized with list
+	CScriptGrid(asUINT w, asUINT h, asITypeInfo *ot);
+	CScriptGrid(asUINT w, asUINT h, void *defVal, asITypeInfo *ot);
+	virtual ~CScriptGrid();
+
+	bool  CheckMaxSize(asUINT x, asUINT y);
+	void  CreateBuffer(SGridBuffer **buf, asUINT w, asUINT h);
+	void  DeleteBuffer(SGridBuffer *buf);
+	void  Construct(SGridBuffer *buf);
+	void  Destruct(SGridBuffer *buf);
+	void  SetValue(SGridBuffer *buf, asUINT x, asUINT y, void *value);
+	void *At(SGridBuffer *buf, asUINT x, asUINT y);
+};
+
+void RegisterScriptGrid(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scripthandle.cpp b/Sources/AngelScript/add_on/scripthandle/scripthandle.cpp
old mode 100755
new mode 100644
similarity index 85%
rename from Sources/AngelScript/addons/scripthandle.cpp
rename to Sources/AngelScript/add_on/scripthandle/scripthandle.cpp
index 81ff4f607..1114b2bd3
--- a/Sources/AngelScript/addons/scripthandle.cpp
+++ b/Sources/AngelScript/add_on/scripthandle/scripthandle.cpp
@@ -1,329 +1,360 @@
-#include "scripthandle.h"
-#include <new>
-#include <assert.h>
-#include <string.h>
-
-BEGIN_AS_NAMESPACE
-
-static void Construct(CScriptHandle *self) { new(self) CScriptHandle(); }
-static void Construct(CScriptHandle *self, const CScriptHandle &o) { new(self) CScriptHandle(o); }
-// This one is not static because it needs to be friend with the CScriptHandle class
-void Construct(CScriptHandle *self, void *ref, int typeId) { new(self) CScriptHandle(ref, typeId); }
-static void Destruct(CScriptHandle *self) { self->~CScriptHandle(); }
-
-CScriptHandle::CScriptHandle()
-{
-	m_ref  = 0;
-	m_type = 0;
-}
-
-CScriptHandle::CScriptHandle(const CScriptHandle &other)
-{
-	m_ref  = other.m_ref;
-	m_type = other.m_type;
-
-	AddRefHandle();
-}
-
-CScriptHandle::CScriptHandle(void *ref, asITypeInfo *type)
-{
-	m_ref  = ref;
-	m_type = type;
-
-	AddRefHandle();
-}
-
-// This constructor shouldn't be called from the application 
-// directly as it requires an active script context
-CScriptHandle::CScriptHandle(void *ref, int typeId)
-{
-	m_ref  = 0;
-	m_type = 0;
-
-	Assign(ref, typeId);
-}
-
-CScriptHandle::~CScriptHandle()
-{
-	ReleaseHandle();
-}
-
-void CScriptHandle::ReleaseHandle()
-{
-	if( m_ref && m_type )
-	{
-		asIScriptEngine *engine = m_type->GetEngine();
-		engine->ReleaseScriptObject(m_ref, m_type);
-
-		engine->Release();
-
-		m_ref  = 0;
-		m_type = 0;
-	}
-}
-
-void CScriptHandle::AddRefHandle()
-{
-	if( m_ref && m_type )
-	{
-		asIScriptEngine *engine = m_type->GetEngine();
-		engine->AddRefScriptObject(m_ref, m_type);
-
-		// Hold on to the engine so it isn't destroyed while
-		// a reference to a script object is still held
-		engine->AddRef();
-	}
-}
-
-CScriptHandle &CScriptHandle::operator =(const CScriptHandle &other)
-{
-	Set(other.m_ref, other.m_type);
-
-	return *this;
-}
-
-void CScriptHandle::Set(void *ref, asITypeInfo *type)
-{
-	if( m_ref == ref ) return;
-
-	ReleaseHandle();
-
-	m_ref  = ref;
-	m_type = type;
-
-	AddRefHandle();
-}
-
-void *CScriptHandle::GetRef()
-{
-	return m_ref;
-}
-
-asITypeInfo *CScriptHandle::GetType() const
-{
-	return m_type;
-}
-
-int CScriptHandle::GetTypeId() const
-{
-	if( m_type == 0 ) return 0;
-
-	return m_type->GetTypeId() | asTYPEID_OBJHANDLE;
-}
-
-// This method shouldn't be called from the application 
-// directly as it requires an active script context
-CScriptHandle &CScriptHandle::Assign(void *ref, int typeId)
-{
-	// When receiving a null handle we just clear our memory
-	if( typeId == 0 )
-	{
-		Set(0, 0);
-		return *this;
-	}
-
-	// Dereference received handles to get the object
-	if( typeId & asTYPEID_OBJHANDLE )
-	{
-		// Store the actual reference
-		ref = *(void**)ref;
-		typeId &= ~asTYPEID_OBJHANDLE;
-	}
-
-	// Get the object type
-	asIScriptContext *ctx    = asGetActiveContext();
-	asIScriptEngine  *engine = ctx->GetEngine();
-	asITypeInfo      *type   = engine->GetTypeInfoById(typeId);
-
-	// If the argument is another CScriptHandle, we should copy the content instead
-	if( type && strcmp(type->GetName(), "ref") == 0 )
-	{
-		CScriptHandle *r = (CScriptHandle*)ref;
-		ref  = r->m_ref;
-		type = r->m_type;
-	}
-
-	Set(ref, type);
-
-	return *this;
-}
-
-bool CScriptHandle::operator==(const CScriptHandle &o) const
-{
-	if( m_ref  == o.m_ref &&
-		m_type == o.m_type )
-		return true;
-
-	// TODO: If type is not the same, we should attempt to do a dynamic cast,
-	//       which may change the pointer for application registered classes
-
-	return false;
-}
-
-bool CScriptHandle::operator!=(const CScriptHandle &o) const
-{
-	return !(*this == o);
-}
-
-bool CScriptHandle::Equals(void *ref, int typeId) const
-{
-	// Null handles are received as reference to a null handle
-	if( typeId == 0 )
-		ref = 0;
-
-	// Dereference handles to get the object
-	if( typeId & asTYPEID_OBJHANDLE )
-	{
-		// Compare the actual reference
-		ref = *(void**)ref;
-		typeId &= ~asTYPEID_OBJHANDLE;
-	}
-
-	// TODO: If typeId is not the same, we should attempt to do a dynamic cast, 
-	//       which may change the pointer for application registered classes
-
-	if( ref == m_ref ) return true;
-
-	return false;
-}
-
-// AngelScript: used as '@obj = cast<obj>(ref);'
-void CScriptHandle::Cast(void **outRef, int typeId)
-{
-	// If we hold a null handle, then just return null
-	if( m_type == 0 )
-	{
-		*outRef = 0;
-		return;
-	}
-	
-	// It is expected that the outRef is always a handle
-	assert( typeId & asTYPEID_OBJHANDLE );
-
-	// Compare the type id of the actual object
-	typeId &= ~asTYPEID_OBJHANDLE;
-	asIScriptEngine  *engine = m_type->GetEngine();
-	asITypeInfo      *type   = engine->GetTypeInfoById(typeId);
-
-	*outRef = 0;
-
-	// RefCastObject will increment the refCount of the returned object if successful
-	engine->RefCastObject(m_ref, m_type, type, outRef);
-}
-
-
-
-void RegisterScriptHandle_Native(asIScriptEngine *engine)
-{
-	int r;
-
-#if AS_CAN_USE_CPP11
-	// With C++11 it is possible to use asGetTypeTraits to automatically determine the flags that represent the C++ class
-	r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asGetTypeTraits<CScriptHandle>()); assert( r >= 0 );
-#else
-	r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
-#endif
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()", asFUNCTIONPR(Construct, (CScriptHandle *), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)", asFUNCTIONPR(Construct, (CScriptHandle *, const CScriptHandle &), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)", asFUNCTIONPR(Construct, (CScriptHandle *, void *, int), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()", asFUNCTIONPR(Destruct, (CScriptHandle *), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asMETHODPR(CScriptHandle, Cast, (void **, int), void), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)", asMETHOD(CScriptHandle, operator=), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)", asMETHOD(CScriptHandle, Assign), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const", asMETHODPR(CScriptHandle, operator==, (const CScriptHandle &) const, bool), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const", asMETHODPR(CScriptHandle, Equals, (void*, int) const, bool), asCALL_THISCALL); assert( r >= 0 );
-}
-
-void CScriptHandle_Construct_Generic(asIScriptGeneric *gen)
-{
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	new(self) CScriptHandle();
-}
-
-void CScriptHandle_ConstructCopy_Generic(asIScriptGeneric *gen)
-{
-	CScriptHandle *other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	new(self) CScriptHandle(*other);
-}
-
-void CScriptHandle_ConstructVar_Generic(asIScriptGeneric *gen)
-{
-	void *ref = gen->GetArgAddress(0);
-	int typeId = gen->GetArgTypeId(0);
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	Construct(self, ref, typeId);
-}
-
-void CScriptHandle_Destruct_Generic(asIScriptGeneric *gen)
-{
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	self->~CScriptHandle();
-}
-
-void CScriptHandle_Cast_Generic(asIScriptGeneric *gen)
-{
-	void **ref = reinterpret_cast<void**>(gen->GetArgAddress(0));
-	int typeId = gen->GetArgTypeId(0);
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	self->Cast(ref, typeId);
-}
-
-void CScriptHandle_Assign_Generic(asIScriptGeneric *gen)
-{
-	CScriptHandle *other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	*self = *other;
-	gen->SetReturnAddress(self);
-}
-
-void CScriptHandle_AssignVar_Generic(asIScriptGeneric *gen)
-{
-	void *ref = gen->GetArgAddress(0);
-	int typeId = gen->GetArgTypeId(0);
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	self->Assign(ref, typeId);
-	gen->SetReturnAddress(self);
-}
-
-void CScriptHandle_Equals_Generic(asIScriptGeneric *gen)
-{
-	CScriptHandle *other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	gen->SetReturnByte(*self == *other);
-}
-
-void CScriptHandle_EqualsVar_Generic(asIScriptGeneric *gen)
-{
-	void *ref = gen->GetArgAddress(0);
-	int typeId = gen->GetArgTypeId(0);
-	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
-	gen->SetReturnByte(self->Equals(ref, typeId));
-}
-
-void RegisterScriptHandle_Generic(asIScriptEngine *engine)
-{
-	int r;
-
-	r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(CScriptHandle_Construct_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)", asFUNCTION(CScriptHandle_ConstructCopy_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)", asFUNCTION(CScriptHandle_ConstructVar_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(CScriptHandle_Destruct_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asFUNCTION(CScriptHandle_Cast_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)", asFUNCTION(CScriptHandle_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)", asFUNCTION(CScriptHandle_AssignVar_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const", asFUNCTION(CScriptHandle_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const", asFUNCTION(CScriptHandle_EqualsVar_Generic), asCALL_GENERIC); assert( r >= 0 );
-}
-
-void RegisterScriptHandle(asIScriptEngine *engine)
-{
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
-		RegisterScriptHandle_Generic(engine);
-	else
-		RegisterScriptHandle_Native(engine);
-}
-
-
-END_AS_NAMESPACE
+#include "scripthandle.h"
+#include <new>
+#include <assert.h>
+#include <string.h>
+
+BEGIN_AS_NAMESPACE
+
+static void Construct(CScriptHandle *self) { new(self) CScriptHandle(); }
+static void Construct(CScriptHandle *self, const CScriptHandle &o) { new(self) CScriptHandle(o); }
+// This one is not static because it needs to be friend with the CScriptHandle class
+void Construct(CScriptHandle *self, void *ref, int typeId) { new(self) CScriptHandle(ref, typeId); }
+static void Destruct(CScriptHandle *self) { self->~CScriptHandle(); }
+
+CScriptHandle::CScriptHandle()
+{
+	m_ref  = 0;
+	m_type = 0;
+}
+
+CScriptHandle::CScriptHandle(const CScriptHandle &other)
+{
+	m_ref  = other.m_ref;
+	m_type = other.m_type;
+
+	AddRefHandle();
+}
+
+CScriptHandle::CScriptHandle(void *ref, asITypeInfo *type)
+{
+	m_ref  = ref;
+	m_type = type;
+
+	AddRefHandle();
+}
+
+// This constructor shouldn't be called from the application 
+// directly as it requires an active script context
+CScriptHandle::CScriptHandle(void *ref, int typeId)
+{
+	m_ref  = 0;
+	m_type = 0;
+
+	Assign(ref, typeId);
+}
+
+CScriptHandle::~CScriptHandle()
+{
+	ReleaseHandle();
+}
+
+void CScriptHandle::ReleaseHandle()
+{
+	if( m_ref && m_type )
+	{
+		asIScriptEngine *engine = m_type->GetEngine();
+		engine->ReleaseScriptObject(m_ref, m_type);
+
+		engine->Release();
+
+		m_ref  = 0;
+		m_type = 0;
+	}
+}
+
+void CScriptHandle::AddRefHandle()
+{
+	if( m_ref && m_type )
+	{
+		asIScriptEngine *engine = m_type->GetEngine();
+		engine->AddRefScriptObject(m_ref, m_type);
+
+		// Hold on to the engine so it isn't destroyed while
+		// a reference to a script object is still held
+		engine->AddRef();
+	}
+}
+
+CScriptHandle &CScriptHandle::operator =(const CScriptHandle &other)
+{
+	Set(other.m_ref, other.m_type);
+
+	return *this;
+}
+
+void CScriptHandle::Set(void *ref, asITypeInfo *type)
+{
+	if( m_ref == ref ) return;
+
+	ReleaseHandle();
+
+	m_ref  = ref;
+	m_type = type;
+
+	AddRefHandle();
+}
+
+void *CScriptHandle::GetRef()
+{
+	return m_ref;
+}
+
+asITypeInfo *CScriptHandle::GetType() const
+{
+	return m_type;
+}
+
+int CScriptHandle::GetTypeId() const
+{
+	if( m_type == 0 ) return 0;
+
+	return m_type->GetTypeId() | asTYPEID_OBJHANDLE;
+}
+
+// This method shouldn't be called from the application 
+// directly as it requires an active script context
+CScriptHandle &CScriptHandle::Assign(void *ref, int typeId)
+{
+	// When receiving a null handle we just clear our memory
+	if( typeId == 0 )
+	{
+		Set(0, 0);
+		return *this;
+	}
+
+	// Dereference received handles to get the object
+	if( typeId & asTYPEID_OBJHANDLE )
+	{
+		// Store the actual reference
+		ref = *(void**)ref;
+		typeId &= ~asTYPEID_OBJHANDLE;
+	}
+
+	// Get the object type
+	asIScriptContext *ctx    = asGetActiveContext();
+	asIScriptEngine  *engine = ctx->GetEngine();
+	asITypeInfo      *type   = engine->GetTypeInfoById(typeId);
+
+	// If the argument is another CScriptHandle, we should copy the content instead
+	if( type && strcmp(type->GetName(), "ref") == 0 )
+	{
+		CScriptHandle *r = (CScriptHandle*)ref;
+		ref  = r->m_ref;
+		type = r->m_type;
+	}
+
+	Set(ref, type);
+
+	return *this;
+}
+
+bool CScriptHandle::operator==(const CScriptHandle &o) const
+{
+	if( m_ref  == o.m_ref &&
+		m_type == o.m_type )
+		return true;
+
+	// TODO: If type is not the same, we should attempt to do a dynamic cast,
+	//       which may change the pointer for application registered classes
+
+	return false;
+}
+
+bool CScriptHandle::operator!=(const CScriptHandle &o) const
+{
+	return !(*this == o);
+}
+
+bool CScriptHandle::Equals(void *ref, int typeId) const
+{
+	// Null handles are received as reference to a null handle
+	if( typeId == 0 )
+		ref = 0;
+
+	// Dereference handles to get the object
+	if( typeId & asTYPEID_OBJHANDLE )
+	{
+		// Compare the actual reference
+		ref = *(void**)ref;
+		typeId &= ~asTYPEID_OBJHANDLE;
+	}
+
+	// TODO: If typeId is not the same, we should attempt to do a dynamic cast, 
+	//       which may change the pointer for application registered classes
+
+	if( ref == m_ref ) return true;
+
+	return false;
+}
+
+// AngelScript: used as '@obj = cast<obj>(ref);'
+void CScriptHandle::Cast(void **outRef, int typeId)
+{
+	// If we hold a null handle, then just return null
+	if( m_type == 0 )
+	{
+		*outRef = 0;
+		return;
+	}
+	
+	// It is expected that the outRef is always a handle
+	assert( typeId & asTYPEID_OBJHANDLE );
+
+	// Compare the type id of the actual object
+	typeId &= ~asTYPEID_OBJHANDLE;
+	asIScriptEngine  *engine = m_type->GetEngine();
+	asITypeInfo      *type   = engine->GetTypeInfoById(typeId);
+
+	*outRef = 0;
+
+	// RefCastObject will increment the refCount of the returned object if successful
+	engine->RefCastObject(m_ref, m_type, type, outRef);
+}
+
+void CScriptHandle::EnumReferences(asIScriptEngine *inEngine)
+{
+	// If we're holding a reference, we'll notify the garbage collector of it
+	if (m_ref)
+		inEngine->GCEnumCallback(m_ref);
+
+	// The object type itself is also garbage collected
+	if( m_type)
+		inEngine->GCEnumCallback(m_type);
+}
+
+void CScriptHandle::ReleaseReferences(asIScriptEngine * /*inEngine*/)
+{
+	// Simply clear the content to release the references
+	Set(0, 0);
+}
+
+void RegisterScriptHandle_Native(asIScriptEngine *engine)
+{
+	int r;
+
+#if AS_CAN_USE_CPP11
+	// With C++11 it is possible to use asGetTypeTraits to automatically determine the flags that represent the C++ class
+	r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asGetTypeTraits<CScriptHandle>()); assert( r >= 0 );
+#else
+	r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()", asFUNCTIONPR(Construct, (CScriptHandle *), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)", asFUNCTIONPR(Construct, (CScriptHandle *, const CScriptHandle &), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)", asFUNCTIONPR(Construct, (CScriptHandle *, void *, int), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()", asFUNCTIONPR(Destruct, (CScriptHandle *), void), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(CScriptHandle,EnumReferences), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(CScriptHandle, ReleaseReferences), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asMETHODPR(CScriptHandle, Cast, (void **, int), void), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)", asMETHOD(CScriptHandle, operator=), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)", asMETHOD(CScriptHandle, Assign), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const", asMETHODPR(CScriptHandle, operator==, (const CScriptHandle &) const, bool), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const", asMETHODPR(CScriptHandle, Equals, (void*, int) const, bool), asCALL_THISCALL); assert( r >= 0 );
+}
+
+void CScriptHandle_Construct_Generic(asIScriptGeneric *gen)
+{
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	new(self) CScriptHandle();
+}
+
+void CScriptHandle_ConstructCopy_Generic(asIScriptGeneric *gen)
+{
+	CScriptHandle *other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	new(self) CScriptHandle(*other);
+}
+
+void CScriptHandle_ConstructVar_Generic(asIScriptGeneric *gen)
+{
+	void *ref = gen->GetArgAddress(0);
+	int typeId = gen->GetArgTypeId(0);
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	Construct(self, ref, typeId);
+}
+
+void CScriptHandle_Destruct_Generic(asIScriptGeneric *gen)
+{
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	self->~CScriptHandle();
+}
+
+void CScriptHandle_Cast_Generic(asIScriptGeneric *gen)
+{
+	void **ref = reinterpret_cast<void**>(gen->GetArgAddress(0));
+	int typeId = gen->GetArgTypeId(0);
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	self->Cast(ref, typeId);
+}
+
+void CScriptHandle_Assign_Generic(asIScriptGeneric *gen)
+{
+	CScriptHandle *other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	*self = *other;
+	gen->SetReturnAddress(self);
+}
+
+void CScriptHandle_AssignVar_Generic(asIScriptGeneric *gen)
+{
+	void *ref = gen->GetArgAddress(0);
+	int typeId = gen->GetArgTypeId(0);
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	self->Assign(ref, typeId);
+	gen->SetReturnAddress(self);
+}
+
+void CScriptHandle_Equals_Generic(asIScriptGeneric *gen)
+{
+	CScriptHandle *other = reinterpret_cast<CScriptHandle*>(gen->GetArgAddress(0));
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	gen->SetReturnByte(*self == *other);
+}
+
+void CScriptHandle_EqualsVar_Generic(asIScriptGeneric *gen)
+{
+	void *ref = gen->GetArgAddress(0);
+	int typeId = gen->GetArgTypeId(0);
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	gen->SetReturnByte(self->Equals(ref, typeId));
+}
+
+void CScriptHandle_EnumReferences_Generic(asIScriptGeneric *gen)
+{
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	self->EnumReferences(gen->GetEngine());
+}
+
+void CScriptHandle_ReleaseReferences_Generic(asIScriptGeneric *gen)
+{
+	CScriptHandle *self = reinterpret_cast<CScriptHandle*>(gen->GetObject());
+	self->ReleaseReferences(gen->GetEngine());
+}
+
+void RegisterScriptHandle_Generic(asIScriptEngine *engine)
+{
+	int r;
+
+	r = engine->RegisterObjectType("ref", sizeof(CScriptHandle), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_GC | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f()", asFUNCTION(CScriptHandle_Construct_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ref &in)", asFUNCTION(CScriptHandle_ConstructCopy_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_CONSTRUCT, "void f(const ?&in)", asFUNCTION(CScriptHandle_ConstructVar_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(CScriptHandle_Destruct_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(CScriptHandle_EnumReferences_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectBehaviour("ref", asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(CScriptHandle_ReleaseReferences_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("ref", "void opCast(?&out)", asFUNCTION(CScriptHandle_Cast_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ref &in)", asFUNCTION(CScriptHandle_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "ref &opHndlAssign(const ?&in)", asFUNCTION(CScriptHandle_AssignVar_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ref &in) const", asFUNCTION(CScriptHandle_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("ref", "bool opEquals(const ?&in) const", asFUNCTION(CScriptHandle_EqualsVar_Generic), asCALL_GENERIC); assert( r >= 0 );
+}
+
+void RegisterScriptHandle(asIScriptEngine *engine)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+		RegisterScriptHandle_Generic(engine);
+	else
+		RegisterScriptHandle_Native(engine);
+}
+
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/addons/scripthandle.h b/Sources/AngelScript/add_on/scripthandle/scripthandle.h
old mode 100755
new mode 100644
similarity index 86%
rename from Sources/AngelScript/addons/scripthandle.h
rename to Sources/AngelScript/add_on/scripthandle/scripthandle.h
index f0973a826..47acb9dcd
--- a/Sources/AngelScript/addons/scripthandle.h
+++ b/Sources/AngelScript/add_on/scripthandle/scripthandle.h
@@ -1,65 +1,69 @@
-#ifndef SCRIPTHANDLE_H
-#define SCRIPTHANDLE_H
-
-#ifndef ANGELSCRIPT_H 
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-
-BEGIN_AS_NAMESPACE
-
-class CScriptHandle 
-{
-public:
-	// Constructors
-	CScriptHandle();
-	CScriptHandle(const CScriptHandle &other);
-	CScriptHandle(void *ref, asITypeInfo *type);
-	~CScriptHandle();
-
-	// Copy the stored value from another any object
-	CScriptHandle &operator=(const CScriptHandle &other);
-
-	// Set the reference
-	void Set(void *ref, asITypeInfo *type);
-
-	// Compare equalness
-	bool operator==(const CScriptHandle &o) const;
-	bool operator!=(const CScriptHandle &o) const;
-	bool Equals(void *ref, int typeId) const;
-
-	// Dynamic cast to desired handle type
-	void Cast(void **outRef, int typeId);
-
-	// Returns the type of the reference held
-	asITypeInfo *GetType() const;
-	int          GetTypeId() const;
-
-	// Get the reference
-	void *GetRef();
-
-protected:
-	// These functions need to have access to protected
-	// members in order to call them from the script engine
-	friend void Construct(CScriptHandle *self, void *ref, int typeId);
-	friend void RegisterScriptHandle_Native(asIScriptEngine *engine);
-	friend void CScriptHandle_AssignVar_Generic(asIScriptGeneric *gen);
-
-	void ReleaseHandle();
-	void AddRefHandle();
-
-	// These shouldn't be called directly by the 
-	// application as they requires an active context
-	CScriptHandle(void *ref, int typeId);
-	CScriptHandle &Assign(void *ref, int typeId);
-
-	void        *m_ref;
-	asITypeInfo *m_type;
-};
-
-void RegisterScriptHandle(asIScriptEngine *engine);
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTHANDLE_H
+#define SCRIPTHANDLE_H
+
+#ifndef ANGELSCRIPT_H
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+
+BEGIN_AS_NAMESPACE
+
+class CScriptHandle
+{
+public:
+	// Constructors
+	CScriptHandle();
+	CScriptHandle(const CScriptHandle &other);
+	CScriptHandle(void *ref, asITypeInfo *type);
+	~CScriptHandle();
+
+	// Copy the stored value from another any object
+	CScriptHandle &operator=(const CScriptHandle &other);
+
+	// Set the reference
+	void Set(void *ref, asITypeInfo *type);
+
+	// Compare equalness
+	bool operator==(const CScriptHandle &o) const;
+	bool operator!=(const CScriptHandle &o) const;
+	bool Equals(void *ref, int typeId) const;
+
+	// Dynamic cast to desired handle type
+	void Cast(void **outRef, int typeId);
+
+	// Returns the type of the reference held
+	asITypeInfo *GetType() const;
+	int          GetTypeId() const;
+
+	// Get the reference
+	void *GetRef();
+
+	// GC callback
+	void EnumReferences(asIScriptEngine *engine);
+	void ReleaseReferences(asIScriptEngine *engine);
+
+protected:
+	// These functions need to have access to protected
+	// members in order to call them from the script engine
+	friend void Construct(CScriptHandle *self, void *ref, int typeId);
+	friend void RegisterScriptHandle_Native(asIScriptEngine *engine);
+	friend void CScriptHandle_AssignVar_Generic(asIScriptGeneric *gen);
+
+	void ReleaseHandle();
+	void AddRefHandle();
+
+	// These shouldn't be called directly by the
+	// application as they requires an active context
+	CScriptHandle(void *ref, int typeId);
+	CScriptHandle &Assign(void *ref, int typeId);
+
+	void        *m_ref;
+	asITypeInfo *m_type;
+};
+
+void RegisterScriptHandle(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scripthelper.cpp b/Sources/AngelScript/add_on/scripthelper/scripthelper.cpp
old mode 100755
new mode 100644
similarity index 87%
rename from Sources/AngelScript/addons/scripthelper.cpp
rename to Sources/AngelScript/add_on/scripthelper/scripthelper.cpp
index d5687ebc3..d3c4e1c58
--- a/Sources/AngelScript/addons/scripthelper.cpp
+++ b/Sources/AngelScript/add_on/scripthelper/scripthelper.cpp
@@ -1,937 +1,996 @@
-#include <string.h>
-#include "scripthelper.h"
-#include <assert.h>
-#include <stdio.h>
-#include <fstream>
-#include <set>
-#include <stdlib.h>
-
-using namespace std;
-
-BEGIN_AS_NAMESPACE
-
-int CompareRelation(asIScriptEngine *engine, void *lobj, void *robj, int typeId, int &result)
-{
-    // TODO: If a lot of script objects are going to be compared, e.g. when sorting an array,
-    //       then the method id and context should be cached between calls.
-
-	int retval = -1;
-	asIScriptFunction *func = 0;
-
-	asITypeInfo *ti = engine->GetTypeInfoById(typeId);
-	if( ti )
-	{
-		// Check if the object type has a compatible opCmp method
-		for( asUINT n = 0; n < ti->GetMethodCount(); n++ )
-		{
-			asIScriptFunction *f = ti->GetMethodByIndex(n);
-			asDWORD flags;
-			if( strcmp(f->GetName(), "opCmp") == 0 &&
-				f->GetReturnTypeId(&flags) == asTYPEID_INT32 &&
-				flags == asTM_NONE &&
-				f->GetParamCount() == 1 )
-			{
-				int paramTypeId;
-				f->GetParam(0, &paramTypeId, &flags);
-
-				// The parameter must be an input reference of the same type
-				// If the reference is a inout reference, then it must also be read-only
-				if( !(flags & asTM_INREF) || typeId != paramTypeId || ((flags & asTM_OUTREF) && !(flags & asTM_CONST)) )
-					break;
-
-				// Found the method
-				func = f;
-				break;
-			}
-		}
-	}
-
-	if( func )
-	{
-		// Call the method
-		asIScriptContext *ctx = engine->CreateContext();
-		ctx->Prepare(func);
-		ctx->SetObject(lobj);
-		ctx->SetArgAddress(0, robj);
-		int r = ctx->Execute();
-		if( r == asEXECUTION_FINISHED )
-		{
-			result = (int)ctx->GetReturnDWord();
-
-			// The comparison was successful
-			retval = 0;
-		}
-		ctx->Release();
-	}
-
-	return retval;
-}
-
-int CompareEquality(asIScriptEngine *engine, void *lobj, void *robj, int typeId, bool &result)
-{
-    // TODO: If a lot of script objects are going to be compared, e.g. when searching for an
-	//       entry in a set, then the method and context should be cached between calls.
-
-	int retval = -1;
-	asIScriptFunction *func = 0;
-
-	asITypeInfo *ti = engine->GetTypeInfoById(typeId);
-	if( ti )
-	{
-		// Check if the object type has a compatible opEquals method
-		for( asUINT n = 0; n < ti->GetMethodCount(); n++ )
-		{
-			asIScriptFunction *f = ti->GetMethodByIndex(n);
-			asDWORD flags;
-			if( strcmp(f->GetName(), "opEquals") == 0 &&
-				f->GetReturnTypeId(&flags) == asTYPEID_BOOL &&
-				flags == asTM_NONE &&
-				f->GetParamCount() == 1 )
-			{
-				int paramTypeId;
-				f->GetParam(0, &paramTypeId, &flags);
-
-				// The parameter must be an input reference of the same type
-				// If the reference is a inout reference, then it must also be read-only
-				if( !(flags & asTM_INREF) || typeId != paramTypeId || ((flags & asTM_OUTREF) && !(flags & asTM_CONST)) )
-					break;
-
-				// Found the method
-				func = f;
-				break;
-			}
-		}
-	}
-
-	if( func )
-	{
-		// Call the method
-		asIScriptContext *ctx = engine->CreateContext();
-		ctx->Prepare(func);
-		ctx->SetObject(lobj);
-		ctx->SetArgAddress(0, robj);
-		int r = ctx->Execute();
-		if( r == asEXECUTION_FINISHED )
-		{
-			result = ctx->GetReturnByte() ? true : false;
-
-			// The comparison was successful
-			retval = 0;
-		}
-		ctx->Release();
-	}
-	else
-	{
-		// If the opEquals method doesn't exist, then we try with opCmp instead
-		int relation;
-		retval = CompareRelation(engine, lobj, robj, typeId, relation);
-		if( retval >= 0 )
-			result = relation == 0 ? true : false;
-	}
-
-	return retval;
-}
-
-int ExecuteString(asIScriptEngine *engine, const char *code, asIScriptModule *mod, asIScriptContext *ctx)
-{
-	return ExecuteString(engine, code, 0, asTYPEID_VOID, mod, ctx);
-}
-
-int ExecuteString(asIScriptEngine *engine, const char *code, void *ref, int refTypeId, asIScriptModule *mod, asIScriptContext *ctx)
-{
-	// Wrap the code in a function so that it can be compiled and executed
-	string funcCode = " ExecuteString() {\n";
-	funcCode += code;
-	funcCode += "\n;}";
-
-	// Determine the return type based on the type of the ref arg
-	funcCode = engine->GetTypeDeclaration(refTypeId, true) + funcCode;
-
-	// GetModule will free unused types, so to be on the safe side we'll hold on to a reference to the type
-	asITypeInfo *type = 0;
-	if( refTypeId & asTYPEID_MASK_OBJECT )
-	{
-		type = engine->GetTypeInfoById(refTypeId);
-		if( type )
-			type->AddRef();
-	}
-
-	// If no module was provided, get a dummy from the engine
-	asIScriptModule *execMod = mod ? mod : engine->GetModule("ExecuteString", asGM_ALWAYS_CREATE);
-
-	// Now it's ok to release the type
-	if( type )
-		type->Release();
-
-	// Compile the function that can be executed
-	asIScriptFunction *func = 0;
-	int r = execMod->CompileFunction("ExecuteString", funcCode.c_str(), -1, 0, &func);
-	if( r < 0 )
-		return r;
-
-	// If no context was provided, request a new one from the engine
-	asIScriptContext *execCtx = ctx ? ctx : engine->RequestContext();
-	r = execCtx->Prepare(func);
-	if( r < 0 )
-	{
-		func->Release();
-		if( !ctx ) execCtx->Release();
-		return r;
-	}
-
-	// Execute the function
-	r = execCtx->Execute();
-
-	// Unless the provided type was void retrieve it's value
-	if( ref != 0 && refTypeId != asTYPEID_VOID )
-	{
-		if( refTypeId & asTYPEID_OBJHANDLE )
-		{
-			// Expect the pointer to be null to start with
-			assert( *reinterpret_cast<void**>(ref) == 0 );
-			*reinterpret_cast<void**>(ref) = *reinterpret_cast<void**>(execCtx->GetAddressOfReturnValue());
-			engine->AddRefScriptObject(*reinterpret_cast<void**>(ref), engine->GetTypeInfoById(refTypeId));
-		}
-		else if( refTypeId & asTYPEID_MASK_OBJECT )
-		{
-			// Expect the pointer to point to a valid object
-			assert( *reinterpret_cast<void**>(ref) != 0 );
-			engine->AssignScriptObject(ref, execCtx->GetAddressOfReturnValue(), engine->GetTypeInfoById(refTypeId));
-		}
-		else
-		{
-			// Copy the primitive value
-			memcpy(ref, execCtx->GetAddressOfReturnValue(), engine->GetSizeOfPrimitiveType(refTypeId));
-		}
-	}
-
-	// Clean up
-	func->Release();
-	if( !ctx ) engine->ReturnContext(execCtx);
-
-	return r;
-}
-
-int WriteConfigToFile(asIScriptEngine *engine, const char *filename)
-{
-	ofstream strm;
-	strm.open(filename);
-
-	return WriteConfigToStream(engine, strm);
-}
-
-int WriteConfigToStream(asIScriptEngine *engine, ostream &strm)
-{
-	// A helper function for escaping quotes in default arguments
-	struct Escape
-	{
-		static string Quotes(const char *decl)
-		{
-			string str = decl;
-			size_t pos = 0;
-			for(;;)
-			{
-				// Find " characters
-				pos = str.find("\"",pos);
-				if( pos == string::npos )
-					break;
-
-				// Add a \ to escape them
-				str.insert(pos, "\\");
-				pos += 2;
-			}
-
-			return str;
-		}
-	};
-
-	int c, n;
-
-	asDWORD currAccessMask = 0;
-	string currNamespace = "";
-	engine->SetDefaultNamespace(currNamespace.c_str());
-
-	// Export the engine version, just for info
-	strm << "// AngelScript " << asGetLibraryVersion() << "\n";
-	strm << "// Lib options " <<  asGetLibraryOptions() << "\n";
-
-	// Export the relevant engine properties
-	strm << "// Engine properties\n";
-	for( n = 0; n < asEP_LAST_PROPERTY; n++ )
-		strm << "ep " << n << " " << engine->GetEngineProperty(asEEngineProp(n)) << "\n";
-
-	// Make sure the default array type is expanded to the template form
-	bool expandDefArrayToTempl = engine->GetEngineProperty(asEP_EXPAND_DEF_ARRAY_TO_TMPL) ? true : false;
-	engine->SetEngineProperty(asEP_EXPAND_DEF_ARRAY_TO_TMPL, true);
-
-	// Write enum types and their values
-	strm << "\n// Enums\n";
-	c = engine->GetEnumCount();
-	for( n = 0; n < c; n++ )
-	{
-		asITypeInfo *ti = engine->GetEnumByIndex(n);
-		asDWORD accessMask = ti->GetAccessMask();
-		if( accessMask != currAccessMask )
-		{
-			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-			currAccessMask = accessMask;
-		}
-		const char *nameSpace = ti->GetNamespace();
-		if( nameSpace != currNamespace )
-		{
-			strm << "namespace \"" << nameSpace << "\"\n";
-			currNamespace = nameSpace;
-			engine->SetDefaultNamespace(currNamespace.c_str());
-		}
-		const char *enumName = ti->GetName();
-		strm << "enum " << enumName << "\n";
-		for( asUINT m = 0; m < ti->GetEnumValueCount(); m++ )
-		{
-			const char *valName;
-			int val;
-			valName = ti->GetEnumValueByIndex(m, &val);
-			strm << "enumval " << enumName << " " << valName << " " << val << "\n";
-		}
-	}
-
-	// Enumerate all types
-	strm << "\n// Types\n";
-
-	// Keep a list of the template types, as the methods for these need to be exported first
-	set<asITypeInfo*> templateTypes;
-
-	c = engine->GetObjectTypeCount();
-	for( n = 0; n < c; n++ )
-	{
-		asITypeInfo *type = engine->GetObjectTypeByIndex(n);
-		asDWORD accessMask = type->GetAccessMask();
-		if( accessMask != currAccessMask )
-		{
-			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-			currAccessMask = accessMask;
-		}
-		const char *nameSpace = type->GetNamespace();
-		if( nameSpace != currNamespace )
-		{
-			strm << "namespace \"" << nameSpace << "\"\n";
-			currNamespace = nameSpace;
-			engine->SetDefaultNamespace(currNamespace.c_str());
-		}
-		if( type->GetFlags() & asOBJ_SCRIPT_OBJECT )
-		{
-			// This should only be interfaces
-			assert( type->GetSize() == 0 );
-
-			strm << "intf " << type->GetName() << "\n";
-		}
-		else
-		{
-			// Only the type flags are necessary. The application flags are application
-			// specific and doesn't matter to the offline compiler. The object size is also
-			// unnecessary for the offline compiler
-			strm << "objtype \"" << engine->GetTypeDeclaration(type->GetTypeId()) << "\" " << (unsigned int)(type->GetFlags() & asOBJ_MASK_VALID_FLAGS) << "\n";
-
-			// Store the template types (but not template instances)
-			if( (type->GetFlags() & asOBJ_TEMPLATE) && type->GetSubType() && (type->GetSubType()->GetFlags() & asOBJ_TEMPLATE_SUBTYPE) )
-				templateTypes.insert(type);
-		}
-	}
-
-	c = engine->GetTypedefCount();
-	for( n = 0; n < c; n++ )
-	{
-		asITypeInfo *ti = engine->GetTypedefByIndex(n);
-		const char *nameSpace = ti->GetNamespace();
-		if( nameSpace != currNamespace )
-		{
-			strm << "namespace \"" << nameSpace << "\"\n";
-			currNamespace = nameSpace;
-			engine->SetDefaultNamespace(currNamespace.c_str());
-		}
-		asDWORD accessMask = ti->GetAccessMask();
-		if( accessMask != currAccessMask )
-		{
-			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-			currAccessMask = accessMask;
-		}
-		strm << "typedef " << ti->GetName() << " \"" << engine->GetTypeDeclaration(ti->GetTypedefTypeId()) << "\"\n";
-	}
-
-	c = engine->GetFuncdefCount();
-	for( n = 0; n < c; n++ )
-	{
-		asITypeInfo *funcDef = engine->GetFuncdefByIndex(n);
-		asDWORD accessMask = funcDef->GetAccessMask();
-		const char *nameSpace = funcDef->GetNamespace();
-		// Child funcdefs do not have any namespace, as they belong to the parent object
-		if( nameSpace && nameSpace != currNamespace )
-		{
-			strm << "namespace \"" << nameSpace << "\"\n";
-			currNamespace = nameSpace;
-			engine->SetDefaultNamespace(currNamespace.c_str());
-		}
-		if( accessMask != currAccessMask )
-		{
-			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-			currAccessMask = accessMask;
-		}
-		strm << "funcdef \"" << funcDef->GetFuncdefSignature()->GetDeclaration() << "\"\n";
-	}
-
-	// A helper for writing object type members
-	struct TypeWriter
-	{
-		static void Write(asIScriptEngine *engine, ostream &strm, asITypeInfo *type, string &currNamespace, asDWORD &currAccessMask)
-		{
-			const char *nameSpace = type->GetNamespace();
-			if( nameSpace != currNamespace )
-			{
-				strm << "namespace \"" << nameSpace << "\"\n";
-				currNamespace = nameSpace;
-				engine->SetDefaultNamespace(currNamespace.c_str());
-			}
-			string typeDecl = engine->GetTypeDeclaration(type->GetTypeId());
-			if( type->GetFlags() & asOBJ_SCRIPT_OBJECT )
-			{
-				for( asUINT m = 0; m < type->GetMethodCount(); m++ )
-				{
-					asIScriptFunction *func = type->GetMethodByIndex(m);
-					asDWORD accessMask = func->GetAccessMask();
-					if( accessMask != currAccessMask )
-					{
-						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-						currAccessMask = accessMask;
-					}
-					strm << "intfmthd " << typeDecl.c_str() << " \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
-				}
-			}
-			else
-			{
-				asUINT m;
-				for( m = 0; m < type->GetFactoryCount(); m++ )
-				{
-					asIScriptFunction *func = type->GetFactoryByIndex(m);
-					asDWORD accessMask = func->GetAccessMask();
-					if( accessMask != currAccessMask )
-					{
-						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-						currAccessMask = accessMask;
-					}
-					strm << "objbeh \"" << typeDecl.c_str() << "\" " << asBEHAVE_FACTORY << " \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
-				}
-				for( m = 0; m < type->GetBehaviourCount(); m++ )
-				{
-					asEBehaviours beh;
-					asIScriptFunction *func = type->GetBehaviourByIndex(m, &beh);
-
-					if( beh == asBEHAVE_CONSTRUCT )
-						// Prefix 'void'
-						strm << "objbeh \"" << typeDecl.c_str() << "\" " << beh << " \"void " << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
-					else if( beh == asBEHAVE_DESTRUCT )
-						// Prefix 'void' and remove ~
-						strm << "objbeh \"" << typeDecl.c_str() << "\" " << beh << " \"void " << Escape::Quotes(func->GetDeclaration(false)).c_str()+1 << "\"\n";
-					else
-						strm << "objbeh \"" << typeDecl.c_str() << "\" " << beh << " \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
-				}
-				for( m = 0; m < type->GetMethodCount(); m++ )
-				{
-					asIScriptFunction *func = type->GetMethodByIndex(m);
-					asDWORD accessMask = func->GetAccessMask();
-					if( accessMask != currAccessMask )
-					{
-						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-						currAccessMask = accessMask;
-					}
-					strm << "objmthd \"" << typeDecl.c_str() << "\" \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
-				}
-				for( m = 0; m < type->GetPropertyCount(); m++ )
-				{
-					asDWORD accessMask;
-					type->GetProperty(m, 0, 0, 0, 0, 0, 0, &accessMask);
-					if( accessMask != currAccessMask )
-					{
-						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-						currAccessMask = accessMask;
-					}
-					strm << "objprop \"" << typeDecl.c_str() << "\" \"" << type->GetPropertyDeclaration(m) << "\"\n";
-				}
-			}
-		}
-	};
-
-	// Write the members of the template types, so they can be fully registered before any other type uses them
-	// TODO: Order the template types based on dependency to avoid failure if one type uses instances of another 
-	strm << "\n// Template type members\n";
-	for( set<asITypeInfo*>::iterator it = templateTypes.begin(); it != templateTypes.end(); ++it )
-	{
-		asITypeInfo *type = *it;
-		TypeWriter::Write(engine, strm, type, currNamespace, currAccessMask);
-	}
-
-	// Write the object types members
-	strm << "\n// Type members\n";
-
-	c = engine->GetObjectTypeCount();
-	for( n = 0; n < c; n++ )
-	{
-		asITypeInfo *type = engine->GetObjectTypeByIndex(n);
-		if( templateTypes.find(type) == templateTypes.end() )
-			TypeWriter::Write(engine, strm, type, currNamespace, currAccessMask);
-	}
-
-	// Write functions
-	strm << "\n// Functions\n";
-
-	c = engine->GetGlobalFunctionCount();
-	for( n = 0; n < c; n++ )
-	{
-		asIScriptFunction *func = engine->GetGlobalFunctionByIndex(n);
-		const char *nameSpace = func->GetNamespace();
-		if( nameSpace != currNamespace )
-		{
-			strm << "namespace \"" << nameSpace << "\"\n";
-			currNamespace = nameSpace;
-			engine->SetDefaultNamespace(currNamespace.c_str());
-		}
-		asDWORD accessMask = func->GetAccessMask();
-		if( accessMask != currAccessMask )
-		{
-			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-			currAccessMask = accessMask;
-		}
-		strm << "func \"" << Escape::Quotes(func->GetDeclaration()).c_str() << "\"\n";
-	}
-
-	// Write global properties
-	strm << "\n// Properties\n";
-
-	c = engine->GetGlobalPropertyCount();
-	for( n = 0; n < c; n++ )
-	{
-		const char *name;
-		int typeId;
-		bool isConst;
-		asDWORD accessMask;
-		const char *nameSpace;
-		engine->GetGlobalPropertyByIndex(n, &name, &nameSpace, &typeId, &isConst, 0, 0, &accessMask);
-		if( accessMask != currAccessMask )
-		{
-			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
-			currAccessMask = accessMask;
-		}
-		if( nameSpace != currNamespace )
-		{
-			strm << "namespace \"" << nameSpace << "\"\n";
-			currNamespace = nameSpace;
-			engine->SetDefaultNamespace(currNamespace.c_str());
-		}
-		strm << "prop \"" << (isConst ? "const " : "") << engine->GetTypeDeclaration(typeId) << " " << name << "\"\n";
-	}
-
-	engine->SetDefaultNamespace("");
-
-	// Write string factory
-	strm << "\n// String factory\n";
-	asDWORD flags = 0;
-	int typeId = engine->GetStringFactoryReturnTypeId(&flags);
-	if( typeId > 0 )
-		strm << "strfactory \"" << ((flags & asTM_CONST) ? "const " : "") << engine->GetTypeDeclaration(typeId) << ((flags & asTM_INOUTREF) ? "&" : "") << "\"\n";
-
-	// Write default array type
-	strm << "\n// Default array type\n";
-	typeId = engine->GetDefaultArrayTypeId();
-	if( typeId > 0 )
-		strm << "defarray \"" << engine->GetTypeDeclaration(typeId) << "\"\n";
-
-	// Restore original settings
-	engine->SetEngineProperty(asEP_EXPAND_DEF_ARRAY_TO_TMPL, expandDefArrayToTempl);
-
-	return 0;
-}
-
-int ConfigEngineFromStream(asIScriptEngine *engine, istream &strm, const char *configFile)
-{
-	int r;
-
-	// Some helper functions for parsing the configuration
-	struct in
-	{
-		static asETokenClass GetToken(asIScriptEngine *engine, string &token, const string &text, asUINT &pos)
-		{
-			asUINT len = 0;
-			asETokenClass t = engine->ParseToken(&text[pos], text.length() - pos, &len);
-			while( (t == asTC_WHITESPACE || t == asTC_COMMENT) && pos < text.length() )
-			{
-				pos += len;
-				t = engine->ParseToken(&text[pos], text.length() - pos, &len);
-			}
-
-			token.assign(&text[pos], len);
-
-			pos += len;
-
-			return t;
-		}
-
-		static void ReplaceSlashQuote(string &str)
-		{
-			size_t pos = 0;
-			for(;;)
-			{
-				// Search for \" in the string
-				pos = str.find("\\\"", pos);
-				if( pos == string::npos )
-					break;
-
-				// Remove the \ character
-				str.erase(pos, 1);
-			}
-		}
-
-		static asUINT GetLineNumber(const string &text, asUINT pos)
-		{
-			asUINT count = 1;
-			for( asUINT n = 0; n < pos; n++ )
-				if( text[n] == '\n' )
-					count++;
-
-			return count;
-		}
-	};
-
-	// Since we are only going to compile the script and never actually execute it,
-	// we turn off the initialization of global variables, so that the compiler can
-	// just register dummy types and functions for the application interface.
-	r = engine->SetEngineProperty(asEP_INIT_GLOBAL_VARS_AFTER_BUILD, false); assert( r >= 0 );
-
-	// Read the entire file
-	char buffer[1000];
-	string config;
-	do {
-		strm.getline(buffer, 1000);
-		config += buffer;
-		config += "\n";
-	} while( !strm.eof() );
-
-	// Process the configuration file and register each entity
-	asUINT pos  = 0;
-	while( pos < config.length() )
-	{
-		string token;
-		// TODO: The position where the initial token is found should be stored for error messages
-		in::GetToken(engine, token, config, pos);
-		if( token == "ep" )
-		{
-			string tmp;
-			in::GetToken(engine, tmp, config, pos);
-
-			asEEngineProp ep = asEEngineProp(atol(tmp.c_str()));
-
-			// Only set properties that affect the compiler
-			if( ep != asEP_COPY_SCRIPT_SECTIONS &&
-				ep != asEP_MAX_STACK_SIZE &&
-				ep != asEP_INIT_GLOBAL_VARS_AFTER_BUILD &&
-				ep != asEP_EXPAND_DEF_ARRAY_TO_TMPL &&
-				ep != asEP_AUTO_GARBAGE_COLLECT )
-			{
-				// Get the value for the property
-				in::GetToken(engine, tmp, config, pos);
-				stringstream s(tmp);
-				asPWORD value;
-
-				s >> value;
-
-				engine->SetEngineProperty(ep, value);
-			}
-		}
-		else if( token == "namespace" )
-		{
-			string ns;
-			in::GetToken(engine, ns, config, pos);
-			ns = ns.substr(1, ns.length() - 2);
-
-			r = engine->SetDefaultNamespace(ns.c_str());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to set namespace");
-				return -1;
-			}
-		}
-		else if( token == "access" )
-		{
-			string maskStr;
-			in::GetToken(engine, maskStr, config, pos);
-			asDWORD mask = static_cast<asDWORD> (strtoul(maskStr.c_str(), 0, 16));
-			engine->SetDefaultAccessMask(mask);
-		}
-		else if( token == "objtype" )
-		{
-			string name, flags;
-			in::GetToken(engine, name, config, pos);
-			name = name.substr(1, name.length() - 2);
-			in::GetToken(engine, flags, config, pos);
-
-			// The size of the value type doesn't matter, because the
-			// engine must adjust it anyway for different platforms
-			r = engine->RegisterObjectType(name.c_str(), (atol(flags.c_str()) & asOBJ_VALUE) ? 1 : 0, static_cast<asDWORD> (atol(flags.c_str())));
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register object type");
-				return -1;
-			}
-		}
-		else if( token == "objbeh" )
-		{
-			string name, behaviour, decl;
-			in::GetToken(engine, name, config, pos);
-			name = name.substr(1, name.length() - 2);
-			in::GetToken(engine, behaviour, config, pos);
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-			in::ReplaceSlashQuote(decl);
-
-			// Remove the $ that the engine prefixes the behaviours with
-			size_t n = decl.find("$");
-			if( n != string::npos )
-				decl[n] = ' ';
-
-			asEBehaviours behave = static_cast<asEBehaviours>(atol(behaviour.c_str()));
-			if( behave == asBEHAVE_TEMPLATE_CALLBACK )
-			{
-				// TODO: How can we let the compiler register this? Maybe through a plug-in system? Or maybe by implementing the callback as a script itself
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_WARNING, "Cannot register template callback without the actual implementation");
-			}
-			else
-			{
-				r = engine->RegisterObjectBehaviour(name.c_str(), behave, decl.c_str(), asFUNCTION(0), asCALL_GENERIC);
-				if( r < 0 )
-				{
-					engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register behaviour");
-					return -1;
-				}
-			}
-		}
-		else if( token == "objmthd" )
-		{
-			string name, decl;
-			in::GetToken(engine, name, config, pos);
-			name = name.substr(1, name.length() - 2);
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-			in::ReplaceSlashQuote(decl);
-
-			r = engine->RegisterObjectMethod(name.c_str(), decl.c_str(), asFUNCTION(0), asCALL_GENERIC);
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register object method");
-				return -1;
-			}
-		}
-		else if( token == "objprop" )
-		{
-			string name, decl;
-			in::GetToken(engine, name, config, pos);
-			name = name.substr(1, name.length() - 2);
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-
-			asITypeInfo *type = engine->GetTypeInfoById(engine->GetTypeIdByDecl(name.c_str()));
-			if( type == 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Type doesn't exist for property registration");
-				return -1;
-			}
-
-			// All properties must have different offsets in order to make them
-			// distinct, so we simply register them with an incremental offset
-			r = engine->RegisterObjectProperty(name.c_str(), decl.c_str(), type->GetPropertyCount());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register object property");
-				return -1;
-			}
-		}
-		else if( token == "intf" )
-		{
-			string name, size, flags;
-			in::GetToken(engine, name, config, pos);
-
-			r = engine->RegisterInterface(name.c_str());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register interface");
-				return -1;
-			}
-		}
-		else if( token == "intfmthd" )
-		{
-			string name, decl;
-			in::GetToken(engine, name, config, pos);
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-			in::ReplaceSlashQuote(decl);
-
-			r = engine->RegisterInterfaceMethod(name.c_str(), decl.c_str());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register interface method");
-				return -1;
-			}
-		}
-		else if( token == "func" )
-		{
-			string decl;
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-			in::ReplaceSlashQuote(decl);
-
-			r = engine->RegisterGlobalFunction(decl.c_str(), asFUNCTION(0), asCALL_GENERIC);
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register global function");
-				return -1;
-			}
-		}
-		else if( token == "prop" )
-		{
-			string decl;
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-
-			// All properties must have different offsets in order to make them
-			// distinct, so we simply register them with an incremental offset.
-			// The pointer must also be non-null so we add 1 to have a value.
-			r = engine->RegisterGlobalProperty(decl.c_str(), reinterpret_cast<void*>(asPWORD(engine->GetGlobalPropertyCount()+1)));
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register global property");
-				return -1;
-			}
-		}
-		else if( token == "strfactory" )
-		{
-			string type;
-			in::GetToken(engine, type, config, pos);
-			type = type.substr(1, type.length() - 2);
-
-			r = engine->RegisterStringFactory(type.c_str(), asFUNCTION(0), asCALL_GENERIC);
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register string factory");
-				return -1;
-			}
-		}
-		else if( token == "defarray" )
-		{
-			string type;
-			in::GetToken(engine, type, config, pos);
-			type = type.substr(1, type.length() - 2);
-
-			r = engine->RegisterDefaultArrayType(type.c_str());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register the default array type");
-				return -1;
-			}
-		}
-		else if( token == "enum" )
-		{
-			string type;
-			in::GetToken(engine, type, config, pos);
-
-			r = engine->RegisterEnum(type.c_str());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register enum type");
-				return -1;
-			}
-		}
-		else if( token == "enumval" )
-		{
-			string type, name, value;
-			in::GetToken(engine, type, config, pos);
-			in::GetToken(engine, name, config, pos);
-			in::GetToken(engine, value, config, pos);
-
-			r = engine->RegisterEnumValue(type.c_str(), name.c_str(), atoi(value.c_str()));
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register enum value");
-				return -1;
-			}
-		}
-		else if( token == "typedef" )
-		{
-			string type, decl;
-			in::GetToken(engine, type, config, pos);
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-
-			r = engine->RegisterTypedef(type.c_str(), decl.c_str());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register typedef");
-				return -1;
-			}
-		}
-		else if( token == "funcdef" )
-		{
-			string decl;
-			in::GetToken(engine, decl, config, pos);
-			decl = decl.substr(1, decl.length() - 2);
-
-			r = engine->RegisterFuncdef(decl.c_str());
-			if( r < 0 )
-			{
-				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register funcdef");
-				return -1;
-			}
-		}
-	}
-
-	return 0;
-}
-
-string GetExceptionInfo(asIScriptContext *ctx, bool showStack)
-{
-	if( ctx->GetState() != asEXECUTION_EXCEPTION ) return "";
-
-	stringstream text;
-
-	const asIScriptFunction *function = ctx->GetExceptionFunction();
-	text << "func: " << function->GetDeclaration() << "\n";
-	text << "modl: " << (function->GetModuleName() ? function->GetModuleName() : "") << "\n";
-	text << "sect: " << (function->GetScriptSectionName() ? function->GetScriptSectionName() : "") << "\n";
-	text << "line: " << ctx->GetExceptionLineNumber() << "\n";
-	text << "desc: " << ctx->GetExceptionString() << "\n";
-
-	if( showStack )
-	{
-		text << "--- call stack ---\n";
-		for( asUINT n = 1; n < ctx->GetCallstackSize(); n++ )
-		{
-			function = ctx->GetFunction(n);
-			if( function )
-			{
-				if( function->GetFuncType() == asFUNC_SCRIPT )
-				{
-					text << (function->GetScriptSectionName() ? function->GetScriptSectionName() : "") << " (" << ctx->GetLineNumber(n) << "): " << function->GetDeclaration() << "\n";
-				}
-				else
-				{
-					// The context is being reused by the application for a nested call
-					text << "{...application...}: " << function->GetDeclaration() << "\n";
-				}
-			}
-			else
-			{
-				// The context is being reused by the script engine for a nested call
-				text << "{...script engine...}\n";
-			}
-		}
-	}
-
-	return text.str();
-}
-
-END_AS_NAMESPACE
+#include <string.h>
+#include "scripthelper.h"
+#include <assert.h>
+#include <stdio.h>
+#include <fstream>
+#include <set>
+#include <stdlib.h>
+#include "../autowrapper/aswrappedcall.h"
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+int CompareRelation(asIScriptEngine *engine, void *lobj, void *robj, int typeId, int &result)
+{
+    // TODO: If a lot of script objects are going to be compared, e.g. when sorting an array,
+    //       then the method id and context should be cached between calls.
+
+	int retval = -1;
+	asIScriptFunction *func = 0;
+
+	asITypeInfo *ti = engine->GetTypeInfoById(typeId);
+	if( ti )
+	{
+		// Check if the object type has a compatible opCmp method
+		for( asUINT n = 0; n < ti->GetMethodCount(); n++ )
+		{
+			asIScriptFunction *f = ti->GetMethodByIndex(n);
+			asDWORD flags;
+			if( strcmp(f->GetName(), "opCmp") == 0 &&
+				f->GetReturnTypeId(&flags) == asTYPEID_INT32 &&
+				flags == asTM_NONE &&
+				f->GetParamCount() == 1 )
+			{
+				int paramTypeId;
+				f->GetParam(0, &paramTypeId, &flags);
+
+				// The parameter must be an input reference of the same type
+				// If the reference is a inout reference, then it must also be read-only
+				if( !(flags & asTM_INREF) || typeId != paramTypeId || ((flags & asTM_OUTREF) && !(flags & asTM_CONST)) )
+					break;
+
+				// Found the method
+				func = f;
+				break;
+			}
+		}
+	}
+
+	if( func )
+	{
+		// Call the method
+		asIScriptContext *ctx = engine->CreateContext();
+		ctx->Prepare(func);
+		ctx->SetObject(lobj);
+		ctx->SetArgAddress(0, robj);
+		int r = ctx->Execute();
+		if( r == asEXECUTION_FINISHED )
+		{
+			result = (int)ctx->GetReturnDWord();
+
+			// The comparison was successful
+			retval = 0;
+		}
+		ctx->Release();
+	}
+
+	return retval;
+}
+
+int CompareEquality(asIScriptEngine *engine, void *lobj, void *robj, int typeId, bool &result)
+{
+    // TODO: If a lot of script objects are going to be compared, e.g. when searching for an
+	//       entry in a set, then the method and context should be cached between calls.
+
+	int retval = -1;
+	asIScriptFunction *func = 0;
+
+	asITypeInfo *ti = engine->GetTypeInfoById(typeId);
+	if( ti )
+	{
+		// Check if the object type has a compatible opEquals method
+		for( asUINT n = 0; n < ti->GetMethodCount(); n++ )
+		{
+			asIScriptFunction *f = ti->GetMethodByIndex(n);
+			asDWORD flags;
+			if( strcmp(f->GetName(), "opEquals") == 0 &&
+				f->GetReturnTypeId(&flags) == asTYPEID_BOOL &&
+				flags == asTM_NONE &&
+				f->GetParamCount() == 1 )
+			{
+				int paramTypeId;
+				f->GetParam(0, &paramTypeId, &flags);
+
+				// The parameter must be an input reference of the same type
+				// If the reference is a inout reference, then it must also be read-only
+				if( !(flags & asTM_INREF) || typeId != paramTypeId || ((flags & asTM_OUTREF) && !(flags & asTM_CONST)) )
+					break;
+
+				// Found the method
+				func = f;
+				break;
+			}
+		}
+	}
+
+	if( func )
+	{
+		// Call the method
+		asIScriptContext *ctx = engine->CreateContext();
+		ctx->Prepare(func);
+		ctx->SetObject(lobj);
+		ctx->SetArgAddress(0, robj);
+		int r = ctx->Execute();
+		if( r == asEXECUTION_FINISHED )
+		{
+			result = ctx->GetReturnByte() ? true : false;
+
+			// The comparison was successful
+			retval = 0;
+		}
+		ctx->Release();
+	}
+	else
+	{
+		// If the opEquals method doesn't exist, then we try with opCmp instead
+		int relation;
+		retval = CompareRelation(engine, lobj, robj, typeId, relation);
+		if( retval >= 0 )
+			result = relation == 0 ? true : false;
+	}
+
+	return retval;
+}
+
+int ExecuteString(asIScriptEngine *engine, const char *code, asIScriptModule *mod, asIScriptContext *ctx)
+{
+	return ExecuteString(engine, code, 0, asTYPEID_VOID, mod, ctx);
+}
+
+int ExecuteString(asIScriptEngine *engine, const char *code, void *ref, int refTypeId, asIScriptModule *mod, asIScriptContext *ctx)
+{
+	// Wrap the code in a function so that it can be compiled and executed
+	string funcCode = " ExecuteString() {\n";
+	funcCode += code;
+	funcCode += "\n;}";
+
+	// Determine the return type based on the type of the ref arg
+	funcCode = engine->GetTypeDeclaration(refTypeId, true) + funcCode;
+
+	// GetModule will free unused types, so to be on the safe side we'll hold on to a reference to the type
+	asITypeInfo *type = 0;
+	if( refTypeId & asTYPEID_MASK_OBJECT )
+	{
+		type = engine->GetTypeInfoById(refTypeId);
+		if( type )
+			type->AddRef();
+	}
+
+	// If no module was provided, get a dummy from the engine
+	asIScriptModule *execMod = mod ? mod : engine->GetModule("ExecuteString", asGM_ALWAYS_CREATE);
+
+	// Now it's ok to release the type
+	if( type )
+		type->Release();
+
+	// Compile the function that can be executed
+	asIScriptFunction *func = 0;
+	int r = execMod->CompileFunction("ExecuteString", funcCode.c_str(), -1, 0, &func);
+	if( r < 0 )
+		return r;
+
+	// If no context was provided, request a new one from the engine
+	asIScriptContext *execCtx = ctx ? ctx : engine->RequestContext();
+	r = execCtx->Prepare(func);
+	if (r >= 0)
+	{
+		// Execute the function
+		r = execCtx->Execute();
+
+		// Unless the provided type was void retrieve it's value
+		if (ref != 0 && refTypeId != asTYPEID_VOID)
+		{
+			if (refTypeId & asTYPEID_OBJHANDLE)
+			{
+				// Expect the pointer to be null to start with
+				assert(*reinterpret_cast<void**>(ref) == 0);
+				*reinterpret_cast<void**>(ref) = *reinterpret_cast<void**>(execCtx->GetAddressOfReturnValue());
+				engine->AddRefScriptObject(*reinterpret_cast<void**>(ref), engine->GetTypeInfoById(refTypeId));
+			}
+			else if (refTypeId & asTYPEID_MASK_OBJECT)
+			{
+				// Use the registered assignment operator to do a value assign. 
+				// This assumes that the ref is pointing to a valid object instance.
+				engine->AssignScriptObject(ref, execCtx->GetAddressOfReturnValue(), engine->GetTypeInfoById(refTypeId));
+			}
+			else
+			{
+				// Copy the primitive value
+				memcpy(ref, execCtx->GetAddressOfReturnValue(), engine->GetSizeOfPrimitiveType(refTypeId));
+			}
+		}
+	}
+
+	// Clean up
+	func->Release();
+	if( !ctx ) engine->ReturnContext(execCtx);
+
+	return r;
+}
+
+int WriteConfigToFile(asIScriptEngine *engine, const char *filename)
+{
+	ofstream strm;
+	strm.open(filename);
+
+	return WriteConfigToStream(engine, strm);
+}
+
+int WriteConfigToStream(asIScriptEngine *engine, ostream &strm)
+{
+	// A helper function for escaping quotes in default arguments
+	struct Escape
+	{
+		static string Quotes(const char *decl)
+		{
+			string str = decl;
+			size_t pos = 0;
+			for(;;)
+			{
+				// Find " characters
+				pos = str.find("\"",pos);
+				if( pos == string::npos )
+					break;
+
+				// Add a \ to escape them
+				str.insert(pos, "\\");
+				pos += 2;
+			}
+
+			return str;
+		}
+	};
+
+	int c, n;
+
+	asDWORD currAccessMask = 0;
+	string currNamespace = "";
+	engine->SetDefaultNamespace("");
+
+	// Export the engine version, just for info
+	strm << "// AngelScript " << asGetLibraryVersion() << "\n";
+	strm << "// Lib options " <<  asGetLibraryOptions() << "\n";
+
+	// Export the relevant engine properties
+	strm << "// Engine properties\n";
+	for( n = 0; n < asEP_LAST_PROPERTY; n++ )
+		strm << "ep " << n << " " << engine->GetEngineProperty(asEEngineProp(n)) << "\n";
+
+	// Make sure the default array type is expanded to the template form
+	bool expandDefArrayToTempl = engine->GetEngineProperty(asEP_EXPAND_DEF_ARRAY_TO_TMPL) ? true : false;
+	engine->SetEngineProperty(asEP_EXPAND_DEF_ARRAY_TO_TMPL, true);
+
+	// Write enum types and their values
+	strm << "\n// Enums\n";
+	c = engine->GetEnumCount();
+	for( n = 0; n < c; n++ )
+	{
+		asITypeInfo *ti = engine->GetEnumByIndex(n);
+		asDWORD accessMask = ti->GetAccessMask();
+		if( accessMask != currAccessMask )
+		{
+			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+			currAccessMask = accessMask;
+		}
+		const char *nameSpace = ti->GetNamespace();
+		if( nameSpace != currNamespace )
+		{
+			strm << "namespace \"" << nameSpace << "\"\n";
+			currNamespace = nameSpace;
+			engine->SetDefaultNamespace(currNamespace.c_str());
+		}
+		const char *enumName = ti->GetName();
+		strm << "enum " << enumName << "\n";
+		for( asUINT m = 0; m < ti->GetEnumValueCount(); m++ )
+		{
+			const char *valName;
+			int val;
+			valName = ti->GetEnumValueByIndex(m, &val);
+			strm << "enumval " << enumName << " " << valName << " " << val << "\n";
+		}
+	}
+
+	// Enumerate all types
+	strm << "\n// Types\n";
+
+	// Keep a list of the template types, as the methods for these need to be exported first
+	set<asITypeInfo*> templateTypes;
+
+	c = engine->GetObjectTypeCount();
+	for( n = 0; n < c; n++ )
+	{
+		asITypeInfo *type = engine->GetObjectTypeByIndex(n);
+		asDWORD accessMask = type->GetAccessMask();
+		if( accessMask != currAccessMask )
+		{
+			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+			currAccessMask = accessMask;
+		}
+		const char *nameSpace = type->GetNamespace();
+		if( nameSpace != currNamespace )
+		{
+			strm << "namespace \"" << nameSpace << "\"\n";
+			currNamespace = nameSpace;
+			engine->SetDefaultNamespace(currNamespace.c_str());
+		}
+		if( type->GetFlags() & asOBJ_SCRIPT_OBJECT )
+		{
+			// This should only be interfaces
+			assert( type->GetSize() == 0 );
+
+			strm << "intf " << type->GetName() << "\n";
+		}
+		else
+		{
+			// Only the type flags are necessary. The application flags are application
+			// specific and doesn't matter to the offline compiler. The object size is also
+			// unnecessary for the offline compiler
+			strm << "objtype \"" << engine->GetTypeDeclaration(type->GetTypeId()) << "\" " << (unsigned int)(type->GetFlags() & asOBJ_MASK_VALID_FLAGS) << "\n";
+
+			// Store the template types (but not template instances)
+			if( (type->GetFlags() & asOBJ_TEMPLATE) && type->GetSubType() && (type->GetSubType()->GetFlags() & asOBJ_TEMPLATE_SUBTYPE) )
+				templateTypes.insert(type);
+		}
+	}
+
+	c = engine->GetTypedefCount();
+	for( n = 0; n < c; n++ )
+	{
+		asITypeInfo *ti = engine->GetTypedefByIndex(n);
+		const char *nameSpace = ti->GetNamespace();
+		if( nameSpace != currNamespace )
+		{
+			strm << "namespace \"" << nameSpace << "\"\n";
+			currNamespace = nameSpace;
+			engine->SetDefaultNamespace(currNamespace.c_str());
+		}
+		asDWORD accessMask = ti->GetAccessMask();
+		if( accessMask != currAccessMask )
+		{
+			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+			currAccessMask = accessMask;
+		}
+		strm << "typedef " << ti->GetName() << " \"" << engine->GetTypeDeclaration(ti->GetTypedefTypeId()) << "\"\n";
+	}
+
+	c = engine->GetFuncdefCount();
+	for( n = 0; n < c; n++ )
+	{
+		asITypeInfo *funcDef = engine->GetFuncdefByIndex(n);
+		asDWORD accessMask = funcDef->GetAccessMask();
+		const char *nameSpace = funcDef->GetNamespace();
+		// Child funcdefs do not have any namespace, as they belong to the parent object
+		if( nameSpace && nameSpace != currNamespace )
+		{
+			strm << "namespace \"" << nameSpace << "\"\n";
+			currNamespace = nameSpace;
+			engine->SetDefaultNamespace(currNamespace.c_str());
+		}
+		if( accessMask != currAccessMask )
+		{
+			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+			currAccessMask = accessMask;
+		}
+		strm << "funcdef \"" << funcDef->GetFuncdefSignature()->GetDeclaration() << "\"\n";
+	}
+
+	// A helper for writing object type members
+	struct TypeWriter
+	{
+		static void Write(asIScriptEngine *engine, ostream &strm, asITypeInfo *type, string &currNamespace, asDWORD &currAccessMask)
+		{
+			const char *nameSpace = type->GetNamespace();
+			if( nameSpace != currNamespace )
+			{
+				strm << "namespace \"" << nameSpace << "\"\n";
+				currNamespace = nameSpace;
+				engine->SetDefaultNamespace(currNamespace.c_str());
+			}
+			string typeDecl = engine->GetTypeDeclaration(type->GetTypeId());
+			if( type->GetFlags() & asOBJ_SCRIPT_OBJECT )
+			{
+				for( asUINT m = 0; m < type->GetMethodCount(); m++ )
+				{
+					asIScriptFunction *func = type->GetMethodByIndex(m);
+					asDWORD accessMask = func->GetAccessMask();
+					if( accessMask != currAccessMask )
+					{
+						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+						currAccessMask = accessMask;
+					}
+					strm << "intfmthd " << typeDecl.c_str() << " \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << (func->IsProperty() ? " property" : "") << "\"\n";
+				}
+			}
+			else
+			{
+				asUINT m;
+				for( m = 0; m < type->GetFactoryCount(); m++ )
+				{
+					asIScriptFunction *func = type->GetFactoryByIndex(m);
+					asDWORD accessMask = func->GetAccessMask();
+					if( accessMask != currAccessMask )
+					{
+						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+						currAccessMask = accessMask;
+					}
+					strm << "objbeh \"" << typeDecl.c_str() << "\" " << asBEHAVE_FACTORY << " \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
+				}
+				for( m = 0; m < type->GetBehaviourCount(); m++ )
+				{
+					asEBehaviours beh;
+					asIScriptFunction *func = type->GetBehaviourByIndex(m, &beh);
+
+					if( beh == asBEHAVE_CONSTRUCT )
+						// Prefix 'void'
+						strm << "objbeh \"" << typeDecl.c_str() << "\" " << beh << " \"void " << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
+					else if( beh == asBEHAVE_DESTRUCT )
+						// Prefix 'void' and remove ~
+						strm << "objbeh \"" << typeDecl.c_str() << "\" " << beh << " \"void " << Escape::Quotes(func->GetDeclaration(false)).c_str()+1 << "\"\n";
+					else
+						strm << "objbeh \"" << typeDecl.c_str() << "\" " << beh << " \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << "\"\n";
+				}
+				for( m = 0; m < type->GetMethodCount(); m++ )
+				{
+					asIScriptFunction *func = type->GetMethodByIndex(m);
+					asDWORD accessMask = func->GetAccessMask();
+					if( accessMask != currAccessMask )
+					{
+						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+						currAccessMask = accessMask;
+					}
+					strm << "objmthd \"" << typeDecl.c_str() << "\" \"" << Escape::Quotes(func->GetDeclaration(false)).c_str() << (func->IsProperty() ? " property" : "") << "\"\n";
+				}
+				for( m = 0; m < type->GetPropertyCount(); m++ )
+				{
+					asDWORD accessMask;
+					type->GetProperty(m, 0, 0, 0, 0, 0, 0, &accessMask);
+					if( accessMask != currAccessMask )
+					{
+						strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+						currAccessMask = accessMask;
+					}
+					strm << "objprop \"" << typeDecl.c_str() << "\" \"" << type->GetPropertyDeclaration(m) << "\"";
+
+					// Save information about composite properties
+					int compositeOffset;
+					bool isCompositeIndirect;
+					type->GetProperty(m, 0, 0, 0, 0, 0, 0, 0, &compositeOffset, &isCompositeIndirect);
+					strm << " " << compositeOffset << " " << (isCompositeIndirect ? "1" : "0") << "\n";
+				}
+			}
+		}
+	};
+
+	// Write the members of the template types, so they can be fully registered before any other type uses them
+	// TODO: Order the template types based on dependency to avoid failure if one type uses instances of another 
+	strm << "\n// Template type members\n";
+	for( set<asITypeInfo*>::iterator it = templateTypes.begin(); it != templateTypes.end(); ++it )
+	{
+		asITypeInfo *type = *it;
+		TypeWriter::Write(engine, strm, type, currNamespace, currAccessMask);
+	}
+
+	// Write the object types members
+	strm << "\n// Type members\n";
+
+	c = engine->GetObjectTypeCount();
+	for( n = 0; n < c; n++ )
+	{
+		asITypeInfo *type = engine->GetObjectTypeByIndex(n);
+		if( templateTypes.find(type) == templateTypes.end() )
+			TypeWriter::Write(engine, strm, type, currNamespace, currAccessMask);
+	}
+
+	// Write functions
+	strm << "\n// Functions\n";
+
+	c = engine->GetGlobalFunctionCount();
+	for( n = 0; n < c; n++ )
+	{
+		asIScriptFunction *func = engine->GetGlobalFunctionByIndex(n);
+		const char *nameSpace = func->GetNamespace();
+		if( nameSpace != currNamespace )
+		{
+			strm << "namespace \"" << nameSpace << "\"\n";
+			currNamespace = nameSpace;
+			engine->SetDefaultNamespace(currNamespace.c_str());
+		}
+		asDWORD accessMask = func->GetAccessMask();
+		if( accessMask != currAccessMask )
+		{
+			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+			currAccessMask = accessMask;
+		}
+		strm << "func \"" << Escape::Quotes(func->GetDeclaration()).c_str() << (func->IsProperty() ? " property" : "") << "\"\n";
+	}
+
+	// Write global properties
+	strm << "\n// Properties\n";
+
+	c = engine->GetGlobalPropertyCount();
+	for( n = 0; n < c; n++ )
+	{
+		const char *name;
+		int typeId;
+		bool isConst;
+		asDWORD accessMask;
+		const char *nameSpace;
+		engine->GetGlobalPropertyByIndex(n, &name, &nameSpace, &typeId, &isConst, 0, 0, &accessMask);
+		if( accessMask != currAccessMask )
+		{
+			strm << "access " << hex << (unsigned int)(accessMask) << dec << "\n";
+			currAccessMask = accessMask;
+		}
+		if( nameSpace != currNamespace )
+		{
+			strm << "namespace \"" << nameSpace << "\"\n";
+			currNamespace = nameSpace;
+			engine->SetDefaultNamespace(currNamespace.c_str());
+		}
+		strm << "prop \"" << (isConst ? "const " : "") << engine->GetTypeDeclaration(typeId) << " " << name << "\"\n";
+	}
+
+	// Write string factory
+	strm << "\n// String factory\n";
+
+	// Reset the namespace for the string factory and default array type
+	if ("" != currNamespace)
+	{
+		strm << "namespace \"\"\n";
+		currNamespace = "";
+		engine->SetDefaultNamespace("");
+	}
+
+	asDWORD flags = 0;
+	int typeId = engine->GetStringFactoryReturnTypeId(&flags);
+	if( typeId > 0 )
+		strm << "strfactory \"" << ((flags & asTM_CONST) ? "const " : "") << engine->GetTypeDeclaration(typeId) << ((flags & asTM_INOUTREF) ? "&" : "") << "\"\n";
+
+	// Write default array type
+	strm << "\n// Default array type\n";
+	typeId = engine->GetDefaultArrayTypeId();
+	if( typeId > 0 )
+		strm << "defarray \"" << engine->GetTypeDeclaration(typeId) << "\"\n";
+
+	// Restore original settings
+	engine->SetEngineProperty(asEP_EXPAND_DEF_ARRAY_TO_TMPL, expandDefArrayToTempl);
+
+	return 0;
+}
+
+int ConfigEngineFromStream(asIScriptEngine *engine, istream &strm, const char *configFile, asIStringFactory *stringFactory)
+{
+	int r;
+
+	// Some helper functions for parsing the configuration
+	struct in
+	{
+		static asETokenClass GetToken(asIScriptEngine *engine, string &token, const string &text, asUINT &pos)
+		{
+			asUINT len = 0;
+			asETokenClass t = engine->ParseToken(&text[pos], text.length() - pos, &len);
+			while( (t == asTC_WHITESPACE || t == asTC_COMMENT) && pos < text.length() )
+			{
+				pos += len;
+				t = engine->ParseToken(&text[pos], text.length() - pos, &len);
+			}
+
+			token.assign(&text[pos], len);
+
+			pos += len;
+
+			return t;
+		}
+
+		static void ReplaceSlashQuote(string &str)
+		{
+			size_t pos = 0;
+			for(;;)
+			{
+				// Search for \" in the string
+				pos = str.find("\\\"", pos);
+				if( pos == string::npos )
+					break;
+
+				// Remove the \ character
+				str.erase(pos, 1);
+			}
+		}
+
+		static asUINT GetLineNumber(const string &text, asUINT pos)
+		{
+			asUINT count = 1;
+			for( asUINT n = 0; n < pos; n++ )
+				if( text[n] == '\n' )
+					count++;
+
+			return count;
+		}
+	};
+
+	// Since we are only going to compile the script and never actually execute it,
+	// we turn off the initialization of global variables, so that the compiler can
+	// just register dummy types and functions for the application interface.
+	r = engine->SetEngineProperty(asEP_INIT_GLOBAL_VARS_AFTER_BUILD, false); assert( r >= 0 );
+
+	// Read the entire file
+	char buffer[1000];
+	string config;
+	do {
+		strm.getline(buffer, 1000);
+		config += buffer;
+		config += "\n";
+	} while( !strm.eof() && strm.good() );
+
+	// Process the configuration file and register each entity
+	asUINT pos  = 0;
+	while( pos < config.length() )
+	{
+		string token;
+		// TODO: The position where the initial token is found should be stored for error messages
+		in::GetToken(engine, token, config, pos);
+		if( token == "ep" )
+		{
+			string tmp;
+			in::GetToken(engine, tmp, config, pos);
+
+			asEEngineProp ep = asEEngineProp(atol(tmp.c_str()));
+
+			// Only set properties that affect the compiler
+			if( ep != asEP_COPY_SCRIPT_SECTIONS &&
+				ep != asEP_MAX_STACK_SIZE &&
+				ep != asEP_INIT_GLOBAL_VARS_AFTER_BUILD &&
+				ep != asEP_EXPAND_DEF_ARRAY_TO_TMPL &&
+				ep != asEP_AUTO_GARBAGE_COLLECT )
+			{
+				// Get the value for the property
+				in::GetToken(engine, tmp, config, pos);
+				stringstream s(tmp);
+				asPWORD value;
+
+				s >> value;
+
+				engine->SetEngineProperty(ep, value);
+			}
+		}
+		else if( token == "namespace" )
+		{
+			string ns;
+			in::GetToken(engine, ns, config, pos);
+			ns = ns.substr(1, ns.length() - 2);
+
+			r = engine->SetDefaultNamespace(ns.c_str());
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to set namespace");
+				return -1;
+			}
+		}
+		else if( token == "access" )
+		{
+			string maskStr;
+			in::GetToken(engine, maskStr, config, pos);
+			asDWORD mask = strtoul(maskStr.c_str(), 0, 16);
+			engine->SetDefaultAccessMask(mask);
+		}
+		else if( token == "objtype" )
+		{
+			string name, flags;
+			in::GetToken(engine, name, config, pos);
+			name = name.substr(1, name.length() - 2);
+			in::GetToken(engine, flags, config, pos);
+
+			// The size of the value type doesn't matter, because the
+			// engine must adjust it anyway for different platforms
+			r = engine->RegisterObjectType(name.c_str(), (atol(flags.c_str()) & asOBJ_VALUE) ? 1 : 0, atol(flags.c_str()));
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register object type");
+				return -1;
+			}
+		}
+		else if( token == "objbeh" )
+		{
+			string name, behaviour, decl;
+			in::GetToken(engine, name, config, pos);
+			name = name.substr(1, name.length() - 2);
+			in::GetToken(engine, behaviour, config, pos);
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+			in::ReplaceSlashQuote(decl);
+
+			// Remove the $ that the engine prefixes the behaviours with
+			size_t n = decl.find("$");
+			if( n != string::npos )
+				decl[n] = ' ';
+
+			asEBehaviours behave = static_cast<asEBehaviours>(atol(behaviour.c_str()));
+			if( behave == asBEHAVE_TEMPLATE_CALLBACK )
+			{
+				// TODO: How can we let the compiler register this? Maybe through a plug-in system? Or maybe by implementing the callback as a script itself
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_WARNING, "Cannot register template callback without the actual implementation");
+			}
+			else
+			{
+				r = engine->RegisterObjectBehaviour(name.c_str(), behave, decl.c_str(), asFUNCTION(0), asCALL_GENERIC);
+				if( r < 0 )
+				{
+					engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register behaviour");
+					return -1;
+				}
+			}
+		}
+		else if( token == "objmthd" )
+		{
+			string name, decl;
+			in::GetToken(engine, name, config, pos);
+			name = name.substr(1, name.length() - 2);
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+			in::ReplaceSlashQuote(decl);
+
+			r = engine->RegisterObjectMethod(name.c_str(), decl.c_str(), asFUNCTION(0), asCALL_GENERIC);
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register object method");
+				return -1;
+			}
+		}
+		else if( token == "objprop" )
+		{
+			string name, decl, compositeOffset, isCompositeIndirect;
+			in::GetToken(engine, name, config, pos);
+			name = name.substr(1, name.length() - 2);
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+			in::GetToken(engine, compositeOffset, config, pos);
+			in::GetToken(engine, isCompositeIndirect, config, pos);
+
+			asITypeInfo *type = engine->GetTypeInfoById(engine->GetTypeIdByDecl(name.c_str()));
+			if( type == 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Type doesn't exist for property registration");
+				return -1;
+			}
+
+			// All properties must have different offsets in order to make them
+			// distinct, so we simply register them with an incremental offset
+			r = engine->RegisterObjectProperty(name.c_str(), decl.c_str(), type->GetPropertyCount(), compositeOffset != "0" ? type->GetPropertyCount() : 0, isCompositeIndirect != "0");
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register object property");
+				return -1;
+			}
+		}
+		else if( token == "intf" )
+		{
+			string name, size, flags;
+			in::GetToken(engine, name, config, pos);
+
+			r = engine->RegisterInterface(name.c_str());
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register interface");
+				return -1;
+			}
+		}
+		else if( token == "intfmthd" )
+		{
+			string name, decl;
+			in::GetToken(engine, name, config, pos);
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+			in::ReplaceSlashQuote(decl);
+
+			r = engine->RegisterInterfaceMethod(name.c_str(), decl.c_str());
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register interface method");
+				return -1;
+			}
+		}
+		else if( token == "func" )
+		{
+			string decl;
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+			in::ReplaceSlashQuote(decl);
+
+			r = engine->RegisterGlobalFunction(decl.c_str(), asFUNCTION(0), asCALL_GENERIC);
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register global function");
+				return -1;
+			}
+		}
+		else if( token == "prop" )
+		{
+			string decl;
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+
+			// All properties must have different offsets in order to make them
+			// distinct, so we simply register them with an incremental offset.
+			// The pointer must also be non-null so we add 1 to have a value.
+			r = engine->RegisterGlobalProperty(decl.c_str(), reinterpret_cast<void*>(asPWORD(engine->GetGlobalPropertyCount()+1)));
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register global property");
+				return -1;
+			}
+		}
+		else if( token == "strfactory" )
+		{
+			string type;
+			in::GetToken(engine, type, config, pos);
+			type = type.substr(1, type.length() - 2);
+
+			if (stringFactory == 0)
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_WARNING, "Cannot register string factory without the actual implementation");
+				return -1;
+			}
+			else
+			{
+				r = engine->RegisterStringFactory(type.c_str(), stringFactory);
+				if (r < 0)
+				{
+					engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register string factory");
+					return -1;
+				}
+			}
+		}
+		else if( token == "defarray" )
+		{
+			string type;
+			in::GetToken(engine, type, config, pos);
+			type = type.substr(1, type.length() - 2);
+
+			r = engine->RegisterDefaultArrayType(type.c_str());
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register the default array type");
+				return -1;
+			}
+		}
+		else if( token == "enum" )
+		{
+			string type;
+			in::GetToken(engine, type, config, pos);
+
+			r = engine->RegisterEnum(type.c_str());
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register enum type");
+				return -1;
+			}
+		}
+		else if( token == "enumval" )
+		{
+			string type, name, value;
+			in::GetToken(engine, type, config, pos);
+			in::GetToken(engine, name, config, pos);
+			in::GetToken(engine, value, config, pos);
+
+			r = engine->RegisterEnumValue(type.c_str(), name.c_str(), atol(value.c_str()));
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register enum value");
+				return -1;
+			}
+		}
+		else if( token == "typedef" )
+		{
+			string type, decl;
+			in::GetToken(engine, type, config, pos);
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+
+			r = engine->RegisterTypedef(type.c_str(), decl.c_str());
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register typedef");
+				return -1;
+			}
+		}
+		else if( token == "funcdef" )
+		{
+			string decl;
+			in::GetToken(engine, decl, config, pos);
+			decl = decl.substr(1, decl.length() - 2);
+
+			r = engine->RegisterFuncdef(decl.c_str());
+			if( r < 0 )
+			{
+				engine->WriteMessage(configFile, in::GetLineNumber(config, pos), 0, asMSGTYPE_ERROR, "Failed to register funcdef");
+				return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+string GetExceptionInfo(asIScriptContext *ctx, bool showStack)
+{
+	if( ctx->GetState() != asEXECUTION_EXCEPTION ) return "";
+
+	stringstream text;
+
+	const asIScriptFunction *function = ctx->GetExceptionFunction();
+	text << "func: " << function->GetDeclaration() << "\n";
+	text << "modl: " << (function->GetModuleName() ? function->GetModuleName() : "") << "\n";
+	text << "sect: " << (function->GetScriptSectionName() ? function->GetScriptSectionName() : "") << "\n";
+	text << "line: " << ctx->GetExceptionLineNumber() << "\n";
+	text << "desc: " << ctx->GetExceptionString() << "\n";
+
+	if( showStack )
+	{
+		text << "--- call stack ---\n";
+		for( asUINT n = 1; n < ctx->GetCallstackSize(); n++ )
+		{
+			function = ctx->GetFunction(n);
+			if( function )
+			{
+				if( function->GetFuncType() == asFUNC_SCRIPT )
+				{
+					text << (function->GetScriptSectionName() ? function->GetScriptSectionName() : "") << " (" << ctx->GetLineNumber(n) << "): " << function->GetDeclaration() << "\n";
+				}
+				else
+				{
+					// The context is being reused by the application for a nested call
+					text << "{...application...}: " << function->GetDeclaration() << "\n";
+				}
+			}
+			else
+			{
+				// The context is being reused by the script engine for a nested call
+				text << "{...script engine...}\n";
+			}
+		}
+	}
+
+	return text.str();
+}
+
+void ScriptThrow(const string &msg)
+{
+	asIScriptContext *ctx = asGetActiveContext();
+	if (ctx)
+		ctx->SetException(msg.c_str());
+}
+
+string ScriptGetExceptionInfo()
+{
+	asIScriptContext *ctx = asGetActiveContext();
+	if (!ctx)
+		return "";
+	
+	const char *msg = ctx->GetExceptionString();
+	if (msg == 0)
+		return "";
+
+	return string(msg);
+}
+
+void RegisterExceptionRoutines(asIScriptEngine *engine)
+{
+	int r;
+
+	// The string type must be available
+	assert(engine->GetTypeInfoByDecl("string"));
+
+	if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") == 0)
+	{
+		r = engine->RegisterGlobalFunction("void throw(const string &in)", asFUNCTION(ScriptThrow), asCALL_CDECL); assert(r >= 0);
+		r = engine->RegisterGlobalFunction("string getExceptionInfo()", asFUNCTION(ScriptGetExceptionInfo), asCALL_CDECL); assert(r >= 0);
+	}
+	else
+	{
+		r = engine->RegisterGlobalFunction("void throw(const string &in)", WRAP_FN(ScriptThrow), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterGlobalFunction("string getExceptionInfo()", WRAP_FN(ScriptGetExceptionInfo), asCALL_GENERIC); assert(r >= 0);
+	}
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/addons/scripthelper.h b/Sources/AngelScript/add_on/scripthelper/scripthelper.h
old mode 100755
new mode 100644
similarity index 88%
rename from Sources/AngelScript/addons/scripthelper.h
rename to Sources/AngelScript/add_on/scripthelper/scripthelper.h
index b239302bc..dc3e0b816
--- a/Sources/AngelScript/addons/scripthelper.h
+++ b/Sources/AngelScript/add_on/scripthelper/scripthelper.h
@@ -1,48 +1,53 @@
-#ifndef SCRIPTHELPER_H
-#define SCRIPTHELPER_H
-
-#include <sstream>
-#include <string>
-
-#ifndef ANGELSCRIPT_H
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-
-BEGIN_AS_NAMESPACE
-
-// Compare relation between two objects of the same type
-int CompareRelation(asIScriptEngine *engine, void *lobj, void *robj, int typeId, int &result);
-
-// Compare equality between two objects of the same type
-int CompareEquality(asIScriptEngine *engine, void *lobj, void *robj, int typeId, bool &result);
-
-// Compile and execute simple statements
-// The module is optional. If given the statements can access the entities compiled in the module.
-// The caller can optionally provide its own context, for example if a context should be reused.
-int ExecuteString(asIScriptEngine *engine, const char *code, asIScriptModule *mod = 0, asIScriptContext *ctx = 0);
-
-// Compile and execute simple statements with option of return value
-// The module is optional. If given the statements can access the entitites compiled in the module.
-// The caller can optionally provide its own context, for example if a context should be reused.
-int ExecuteString(asIScriptEngine *engine, const char *code, void *ret, int retTypeId, asIScriptModule *mod = 0, asIScriptContext *ctx = 0);
-
-// Write the registered application interface to a file for an offline compiler.
-// The format is compatible with the offline compiler in /sdk/samples/asbuild/.
-int WriteConfigToFile(asIScriptEngine *engine, const char *filename);
-
-// Write the registered application interface to a text stream. 
-int WriteConfigToStream(asIScriptEngine *engine, std::ostream &strm); 
-
-// Loads an interface from a text stream and configures the engine with it. This will not 
-// set the correct function pointers, so it is not possible to use this engine to execute
-// scripts, but it can be used to compile scripts and save the byte code.
-int ConfigEngineFromStream(asIScriptEngine *engine, std::istream &strm, const char *nameOfStream = "config");
-
-// Format the details of the script exception into a human readable text
-std::string GetExceptionInfo(asIScriptContext *ctx, bool showStack = false);
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTHELPER_H
+#define SCRIPTHELPER_H
+
+#include <sstream>
+#include <string>
+
+#ifndef ANGELSCRIPT_H
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+
+BEGIN_AS_NAMESPACE
+
+// Compare relation between two objects of the same type
+int CompareRelation(asIScriptEngine *engine, void *lobj, void *robj, int typeId, int &result);
+
+// Compare equality between two objects of the same type
+int CompareEquality(asIScriptEngine *engine, void *lobj, void *robj, int typeId, bool &result);
+
+// Compile and execute simple statements
+// The module is optional. If given the statements can access the entities compiled in the module.
+// The caller can optionally provide its own context, for example if a context should be reused.
+int ExecuteString(asIScriptEngine *engine, const char *code, asIScriptModule *mod = 0, asIScriptContext *ctx = 0);
+
+// Compile and execute simple statements with option of return value
+// The module is optional. If given the statements can access the entitites compiled in the module.
+// The caller can optionally provide its own context, for example if a context should be reused.
+int ExecuteString(asIScriptEngine *engine, const char *code, void *ret, int retTypeId, asIScriptModule *mod = 0, asIScriptContext *ctx = 0);
+
+// Write the registered application interface to a file for an offline compiler.
+// The format is compatible with the offline compiler in /sdk/samples/asbuild/.
+int WriteConfigToFile(asIScriptEngine *engine, const char *filename);
+
+// Write the registered application interface to a text stream. 
+int WriteConfigToStream(asIScriptEngine *engine, std::ostream &strm); 
+
+// Loads an interface from a text stream and configures the engine with it. This will not 
+// set the correct function pointers, so it is not possible to use this engine to execute
+// scripts, but it can be used to compile scripts and save the byte code.
+int ConfigEngineFromStream(asIScriptEngine *engine, std::istream &strm, const char *nameOfStream = "config", asIStringFactory *stringFactory = 0);
+
+// Format the details of the script exception into a human readable text
+std::string GetExceptionInfo(asIScriptContext *ctx, bool showStack = false);
+
+// Register the exception routines
+//  'void throw(const string &msg)'
+//  'string getExceptionInfo()'
+void RegisterExceptionRoutines(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scriptmath.cpp b/Sources/AngelScript/add_on/scriptmath/scriptmath.cpp
old mode 100755
new mode 100644
similarity index 98%
rename from Sources/AngelScript/addons/scriptmath.cpp
rename to Sources/AngelScript/add_on/scriptmath/scriptmath.cpp
index 1bf4e5e15..c5b86c38a
--- a/Sources/AngelScript/addons/scriptmath.cpp
+++ b/Sources/AngelScript/add_on/scriptmath/scriptmath.cpp
@@ -1,347 +1,347 @@
-#include <assert.h>
-#include <math.h>
-#include <float.h>
-#include <string.h>
-#include "scriptmath.h"
-
-#ifdef __BORLANDC__
-#include <cmath>
-
-// The C++Builder RTL doesn't pull the *f functions into the global namespace per default.
-using namespace std;
-
-#if __BORLANDC__ < 0x580
-// C++Builder 6 and earlier don't come with any *f variants of the math functions at all.
-inline float cosf (float arg) { return std::cos (arg); }
-inline float sinf (float arg) { return std::sin (arg); }
-inline float tanf (float arg) { return std::tan (arg); }
-inline float atan2f (float y, float x) { return std::atan2 (y, x); }
-inline float logf (float arg) { return std::log (arg); }
-inline float powf (float x, float y) { return std::pow (x, y); }
-inline float sqrtf (float arg) { return std::sqrt (arg); }
-#endif
-
-// C++Builder doesn't define most of the non-standard float-specific math functions with
-// "*f" suffix; instead it provides overloads for the standard math functions which take
-// "float" arguments.
-inline float acosf (float arg) { return std::acos (arg); }
-inline float asinf (float arg) { return std::asin (arg); }
-inline float atanf (float arg) { return std::atan (arg); }
-inline float coshf (float arg) { return std::cosh (arg); }
-inline float sinhf (float arg) { return std::sinh (arg); }
-inline float tanhf (float arg) { return std::tanh (arg); }
-inline float log10f (float arg) { return std::log10 (arg); }
-inline float ceilf (float arg) { return std::ceil (arg); }
-inline float fabsf (float arg) { return std::fabs (arg); }
-inline float floorf (float arg) { return std::floor (arg); }
-
-// C++Builder doesn't define a non-standard "modff" function but rather an overload of "modf"
-// for float arguments. However, BCC's float overload of fmod() is broken (QC #74816; fixed
-// in C++Builder 2010).
-inline float modff (float x, float *y)
-{
-	double d;
-	float f = (float) modf((double) x, &d);
-	*y = (float) d;
-	return f;
-}
-#endif
-
-BEGIN_AS_NAMESPACE
-
-// Determine whether the float version should be registered, or the double version
-#ifndef AS_USE_FLOAT
-#if !defined(_WIN32_WCE) // WinCE doesn't have the float versions of the math functions
-#define AS_USE_FLOAT 1
-#endif
-#endif
-
-// The modf function doesn't seem very intuitive, so I'm writing this 
-// function that simply returns the fractional part of the float value
-#if AS_USE_FLOAT
-float fractionf(float v)
-{
-	float intPart;
-	return modff(v, &intPart);
-}
-#else
-double fraction(double v)
-{
-	double intPart;
-	return modf(v, &intPart);
-}
-#endif
-
-// As AngelScript doesn't allow bitwise manipulation of float types we'll provide a couple of
-// functions for converting float values to IEEE 754 formatted values etc. This also allow us to 
-// provide a platform agnostic representation to the script so the scripts don't have to worry
-// about whether the CPU uses IEEE 754 floats or some other representation
-float fpFromIEEE(asUINT raw)
-{
-	// TODO: Identify CPU family to provide proper conversion
-	//        if the CPU doesn't natively use IEEE style floats
-	return *reinterpret_cast<float*>(&raw);
-}
-asUINT fpToIEEE(float fp)
-{
-	return *reinterpret_cast<asUINT*>(&fp);
-}
-double fpFromIEEE(asQWORD raw)
-{
-	return *reinterpret_cast<double*>(&raw);
-}
-asQWORD fpToIEEE(double fp)
-{
-	return *reinterpret_cast<asQWORD*>(&fp);
-}
-
-// closeTo() is used to determine if the binary representation of two numbers are 
-// relatively close to each other. Numerical errors due to rounding errors build
-// up over many operations, so it is almost impossible to get exact numbers and
-// this is where closeTo() comes in.
-//
-// It shouldn't be used to determine if two numbers are mathematically close to 
-// each other.
-//
-// ref: http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
-// ref: http://www.gamedev.net/topic/653449-scriptmath-and-closeto/
-bool closeTo(float a, float b, float epsilon)
-{
-	// Equal numbers and infinity will return immediately
-	if( a == b ) return true;
-
-	// When very close to 0, we can use the absolute comparison
-	float diff = fabsf(a - b);
-	if( (a == 0 || b == 0) && (diff < epsilon) )
-		return true;
-	
-	// Otherwise we need to use relative comparison to account for precision
-	return diff / (fabs(a) + fabs(b)) < epsilon;
-}
-
-bool closeTo(double a, double b, double epsilon)
-{
-	if( a == b ) return true;
-
-	double diff = fabs(a - b);
-	if( (a == 0 || b == 0) && (diff < epsilon) )
-		return true;
-	
-	return diff / (fabs(a) + fabs(b)) < epsilon;
-}
-
-void RegisterScriptMath_Native(asIScriptEngine *engine)
-{
-	int r;
-
-	// Conversion between floating point and IEEE bits representations
-	r = engine->RegisterGlobalFunction("float fpFromIEEE(uint)", asFUNCTIONPR(fpFromIEEE, (asUINT), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("uint fpToIEEE(float)", asFUNCTIONPR(fpToIEEE, (float), asUINT), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double fpFromIEEE(uint64)", asFUNCTIONPR(fpFromIEEE, (asQWORD), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("uint64 fpToIEEE(double)", asFUNCTIONPR(fpToIEEE, (double), asQWORD), asCALL_CDECL); assert( r >= 0 );
-
-	// Close to comparison with epsilon 
-	r = engine->RegisterGlobalFunction("bool closeTo(float, float, float = 0.00001f)", asFUNCTIONPR(closeTo, (float, float, float), bool), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("bool closeTo(double, double, double = 0.0000000001)", asFUNCTIONPR(closeTo, (double, double, double), bool), asCALL_CDECL); assert( r >= 0 );
-
-#if AS_USE_FLOAT
-	// Trigonometric functions
-	r = engine->RegisterGlobalFunction("float cos(float)", asFUNCTIONPR(cosf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float sin(float)", asFUNCTIONPR(sinf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float tan(float)", asFUNCTIONPR(tanf, (float), float), asCALL_CDECL); assert( r >= 0 );
-
-	r = engine->RegisterGlobalFunction("float acos(float)", asFUNCTIONPR(acosf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float asin(float)", asFUNCTIONPR(asinf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float atan(float)", asFUNCTIONPR(atanf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float atan2(float,float)", asFUNCTIONPR(atan2f, (float, float), float), asCALL_CDECL); assert( r >= 0 );
-
-	// Hyberbolic functions
-	r = engine->RegisterGlobalFunction("float cosh(float)", asFUNCTIONPR(coshf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float sinh(float)", asFUNCTIONPR(sinhf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float tanh(float)", asFUNCTIONPR(tanhf, (float), float), asCALL_CDECL); assert( r >= 0 );
-
-	// Exponential and logarithmic functions
-	r = engine->RegisterGlobalFunction("float log(float)", asFUNCTIONPR(logf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float log10(float)", asFUNCTIONPR(log10f, (float), float), asCALL_CDECL); assert( r >= 0 );
-
-	// Power functions
-	r = engine->RegisterGlobalFunction("float pow(float, float)", asFUNCTIONPR(powf, (float, float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float sqrt(float)", asFUNCTIONPR(sqrtf, (float), float), asCALL_CDECL); assert( r >= 0 );
-
-	// Nearest integer, absolute value, and remainder functions
-	r = engine->RegisterGlobalFunction("float ceil(float)", asFUNCTIONPR(ceilf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float abs(float)", asFUNCTIONPR(fabsf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float floor(float)", asFUNCTIONPR(floorf, (float), float), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float fraction(float)", asFUNCTIONPR(fractionf, (float), float), asCALL_CDECL); assert( r >= 0 );
-
-	// Don't register modf because AngelScript already supports the % operator
-#else
-	// double versions of the same
-	r = engine->RegisterGlobalFunction("double cos(double)", asFUNCTIONPR(cos, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double sin(double)", asFUNCTIONPR(sin, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double tan(double)", asFUNCTIONPR(tan, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double acos(double)", asFUNCTIONPR(acos, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double asin(double)", asFUNCTIONPR(asin, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double atan(double)", asFUNCTIONPR(atan, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double atan2(double,double)", asFUNCTIONPR(atan2, (double, double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double cosh(double)", asFUNCTIONPR(cosh, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double sinh(double)", asFUNCTIONPR(sinh, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double tanh(double)", asFUNCTIONPR(tanh, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double log(double)", asFUNCTIONPR(log, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double log10(double)", asFUNCTIONPR(log10, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double pow(double, double)", asFUNCTIONPR(pow, (double, double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double sqrt(double)", asFUNCTIONPR(sqrt, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double ceil(double)", asFUNCTIONPR(ceil, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double abs(double)", asFUNCTIONPR(fabs, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double floor(double)", asFUNCTIONPR(floor, (double), double), asCALL_CDECL); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double fraction(double)", asFUNCTIONPR(fraction, (double), double), asCALL_CDECL); assert( r >= 0 );
-#endif
-}
-
-#if AS_USE_FLOAT
-// This macro creates simple generic wrappers for functions of type 'float func(float)'
-#define GENERICff(x) \
-void x##_generic(asIScriptGeneric *gen) \
-{ \
-	float f = *(float*)gen->GetAddressOfArg(0); \
-	*(float*)gen->GetAddressOfReturnLocation() = x(f); \
-}
-
-GENERICff(cosf)
-GENERICff(sinf)
-GENERICff(tanf)
-GENERICff(acosf)
-GENERICff(asinf)
-GENERICff(atanf)
-GENERICff(coshf)
-GENERICff(sinhf)
-GENERICff(tanhf)
-GENERICff(logf)
-GENERICff(log10f)
-GENERICff(sqrtf)
-GENERICff(ceilf)
-GENERICff(fabsf)
-GENERICff(floorf)
-GENERICff(fractionf)
-
-void powf_generic(asIScriptGeneric *gen)
-{
-	float f1 = *(float*)gen->GetAddressOfArg(0);
-	float f2 = *(float*)gen->GetAddressOfArg(1);
-	*(float*)gen->GetAddressOfReturnLocation() = powf(f1, f2);
-}
-void atan2f_generic(asIScriptGeneric *gen)
-{
-	float f1 = *(float*)gen->GetAddressOfArg(0);
-	float f2 = *(float*)gen->GetAddressOfArg(1);
-	*(float*)gen->GetAddressOfReturnLocation() = atan2f(f1, f2);
-}
-
-#else
-// This macro creates simple generic wrappers for functions of type 'double func(double)'
-#define GENERICdd(x) \
-void x##_generic(asIScriptGeneric *gen) \
-{ \
-	double f = *(double*)gen->GetAddressOfArg(0); \
-	*(double*)gen->GetAddressOfReturnLocation() = x(f); \
-}
-
-GENERICdd(cos)
-GENERICdd(sin)
-GENERICdd(tan)
-GENERICdd(acos)
-GENERICdd(asin)
-GENERICdd(atan)
-GENERICdd(cosh)
-GENERICdd(sinh)
-GENERICdd(tanh)
-GENERICdd(log)
-GENERICdd(log10)
-GENERICdd(sqrt)
-GENERICdd(ceil)
-GENERICdd(fabs)
-GENERICdd(floor)
-GENERICdd(fraction)
-
-void pow_generic(asIScriptGeneric *gen)
-{
-	double f1 = *(double*)gen->GetAddressOfArg(0);
-	double f2 = *(double*)gen->GetAddressOfArg(1);
-	*(double*)gen->GetAddressOfReturnLocation() = pow(f1, f2);
-}
-void atan2_generic(asIScriptGeneric *gen)
-{
-	double f1 = *(double*)gen->GetAddressOfArg(0);
-	double f2 = *(double*)gen->GetAddressOfArg(1);
-	*(double*)gen->GetAddressOfReturnLocation() = atan2(f1, f2);
-}
-#endif
-void RegisterScriptMath_Generic(asIScriptEngine *engine)
-{
-	int r;
-
-#if AS_USE_FLOAT
-	// Trigonometric functions
-	r = engine->RegisterGlobalFunction("float cos(float)", asFUNCTION(cosf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float sin(float)", asFUNCTION(sinf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float tan(float)", asFUNCTION(tanf_generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterGlobalFunction("float acos(float)", asFUNCTION(acosf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float asin(float)", asFUNCTION(asinf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float atan(float)", asFUNCTION(atanf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float atan2(float,float)", asFUNCTION(atan2f_generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Hyberbolic functions
-	r = engine->RegisterGlobalFunction("float cosh(float)", asFUNCTION(coshf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float sinh(float)", asFUNCTION(sinhf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float tanh(float)", asFUNCTION(tanhf_generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Exponential and logarithmic functions
-	r = engine->RegisterGlobalFunction("float log(float)", asFUNCTION(logf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float log10(float)", asFUNCTION(log10f_generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Power functions
-	r = engine->RegisterGlobalFunction("float pow(float, float)", asFUNCTION(powf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float sqrt(float)", asFUNCTION(sqrtf_generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Nearest integer, absolute value, and remainder functions
-	r = engine->RegisterGlobalFunction("float ceil(float)", asFUNCTION(ceilf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float abs(float)", asFUNCTION(fabsf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float floor(float)", asFUNCTION(floorf_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("float fraction(float)", asFUNCTION(fractionf_generic), asCALL_GENERIC); assert( r >= 0 );
-
-	// Don't register modf because AngelScript already supports the % operator
-#else
-	// double versions of the same
-	r = engine->RegisterGlobalFunction("double cos(double)", asFUNCTION(cos_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double sin(double)", asFUNCTION(sin_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double tan(double)", asFUNCTION(tan_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double acos(double)", asFUNCTION(acos_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double asin(double)", asFUNCTION(asin_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double atan(double)", asFUNCTION(atan_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double atan2(double,double)", asFUNCTION(atan2_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double cosh(double)", asFUNCTION(cosh_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double sinh(double)", asFUNCTION(sinh_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double tanh(double)", asFUNCTION(tanh_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double log(double)", asFUNCTION(log_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double log10(double)", asFUNCTION(log10_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double pow(double, double)", asFUNCTION(pow_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double sqrt(double)", asFUNCTION(sqrt_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double ceil(double)", asFUNCTION(ceil_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double abs(double)", asFUNCTION(fabs_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double floor(double)", asFUNCTION(floor_generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterGlobalFunction("double fraction(double)", asFUNCTION(fraction_generic), asCALL_GENERIC); assert( r >= 0 );
-#endif
-}
-
-void RegisterScriptMath(asIScriptEngine *engine)
-{
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
-		RegisterScriptMath_Generic(engine);
-	else
-		RegisterScriptMath_Native(engine);
-}
-
-END_AS_NAMESPACE
-
-
+#include <assert.h>
+#include <math.h>
+#include <float.h>
+#include <string.h>
+#include "scriptmath.h"
+
+#ifdef __BORLANDC__
+#include <cmath>
+
+// The C++Builder RTL doesn't pull the *f functions into the global namespace per default.
+using namespace std;
+
+#if __BORLANDC__ < 0x580
+// C++Builder 6 and earlier don't come with any *f variants of the math functions at all.
+inline float cosf (float arg) { return std::cos (arg); }
+inline float sinf (float arg) { return std::sin (arg); }
+inline float tanf (float arg) { return std::tan (arg); }
+inline float atan2f (float y, float x) { return std::atan2 (y, x); }
+inline float logf (float arg) { return std::log (arg); }
+inline float powf (float x, float y) { return std::pow (x, y); }
+inline float sqrtf (float arg) { return std::sqrt (arg); }
+#endif
+
+// C++Builder doesn't define most of the non-standard float-specific math functions with
+// "*f" suffix; instead it provides overloads for the standard math functions which take
+// "float" arguments.
+inline float acosf (float arg) { return std::acos (arg); }
+inline float asinf (float arg) { return std::asin (arg); }
+inline float atanf (float arg) { return std::atan (arg); }
+inline float coshf (float arg) { return std::cosh (arg); }
+inline float sinhf (float arg) { return std::sinh (arg); }
+inline float tanhf (float arg) { return std::tanh (arg); }
+inline float log10f (float arg) { return std::log10 (arg); }
+inline float ceilf (float arg) { return std::ceil (arg); }
+inline float fabsf (float arg) { return std::fabs (arg); }
+inline float floorf (float arg) { return std::floor (arg); }
+
+// C++Builder doesn't define a non-standard "modff" function but rather an overload of "modf"
+// for float arguments. However, BCC's float overload of fmod() is broken (QC #74816; fixed
+// in C++Builder 2010).
+inline float modff (float x, float *y)
+{
+	double d;
+	float f = (float) modf((double) x, &d);
+	*y = (float) d;
+	return f;
+}
+#endif
+
+BEGIN_AS_NAMESPACE
+
+// Determine whether the float version should be registered, or the double version
+#ifndef AS_USE_FLOAT
+#if !defined(_WIN32_WCE) // WinCE doesn't have the float versions of the math functions
+#define AS_USE_FLOAT 1
+#endif
+#endif
+
+// The modf function doesn't seem very intuitive, so I'm writing this 
+// function that simply returns the fractional part of the float value
+#if AS_USE_FLOAT
+float fractionf(float v)
+{
+	float intPart;
+	return modff(v, &intPart);
+}
+#else
+double fraction(double v)
+{
+	double intPart;
+	return modf(v, &intPart);
+}
+#endif
+
+// As AngelScript doesn't allow bitwise manipulation of float types we'll provide a couple of
+// functions for converting float values to IEEE 754 formatted values etc. This also allow us to 
+// provide a platform agnostic representation to the script so the scripts don't have to worry
+// about whether the CPU uses IEEE 754 floats or some other representation
+float fpFromIEEE(asUINT raw)
+{
+	// TODO: Identify CPU family to provide proper conversion
+	//        if the CPU doesn't natively use IEEE style floats
+	return *reinterpret_cast<float*>(&raw);
+}
+asUINT fpToIEEE(float fp)
+{
+	return *reinterpret_cast<asUINT*>(&fp);
+}
+double fpFromIEEE(asQWORD raw)
+{
+	return *reinterpret_cast<double*>(&raw);
+}
+asQWORD fpToIEEE(double fp)
+{
+	return *reinterpret_cast<asQWORD*>(&fp);
+}
+
+// closeTo() is used to determine if the binary representation of two numbers are 
+// relatively close to each other. Numerical errors due to rounding errors build
+// up over many operations, so it is almost impossible to get exact numbers and
+// this is where closeTo() comes in.
+//
+// It shouldn't be used to determine if two numbers are mathematically close to 
+// each other.
+//
+// ref: http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
+// ref: http://www.gamedev.net/topic/653449-scriptmath-and-closeto/
+bool closeTo(float a, float b, float epsilon)
+{
+	// Equal numbers and infinity will return immediately
+	if( a == b ) return true;
+
+	// When very close to 0, we can use the absolute comparison
+	float diff = fabsf(a - b);
+	if( (a == 0 || b == 0) && (diff < epsilon) )
+		return true;
+	
+	// Otherwise we need to use relative comparison to account for precision
+	return diff / (fabs(a) + fabs(b)) < epsilon;
+}
+
+bool closeTo(double a, double b, double epsilon)
+{
+	if( a == b ) return true;
+
+	double diff = fabs(a - b);
+	if( (a == 0 || b == 0) && (diff < epsilon) )
+		return true;
+	
+	return diff / (fabs(a) + fabs(b)) < epsilon;
+}
+
+void RegisterScriptMath_Native(asIScriptEngine *engine)
+{
+	int r;
+
+	// Conversion between floating point and IEEE bits representations
+	r = engine->RegisterGlobalFunction("float fpFromIEEE(uint)", asFUNCTIONPR(fpFromIEEE, (asUINT), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("uint fpToIEEE(float)", asFUNCTIONPR(fpToIEEE, (float), asUINT), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double fpFromIEEE(uint64)", asFUNCTIONPR(fpFromIEEE, (asQWORD), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("uint64 fpToIEEE(double)", asFUNCTIONPR(fpToIEEE, (double), asQWORD), asCALL_CDECL); assert( r >= 0 );
+
+	// Close to comparison with epsilon 
+	r = engine->RegisterGlobalFunction("bool closeTo(float, float, float = 0.00001f)", asFUNCTIONPR(closeTo, (float, float, float), bool), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("bool closeTo(double, double, double = 0.0000000001)", asFUNCTIONPR(closeTo, (double, double, double), bool), asCALL_CDECL); assert( r >= 0 );
+
+#if AS_USE_FLOAT
+	// Trigonometric functions
+	r = engine->RegisterGlobalFunction("float cos(float)", asFUNCTIONPR(cosf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float sin(float)", asFUNCTIONPR(sinf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float tan(float)", asFUNCTIONPR(tanf, (float), float), asCALL_CDECL); assert( r >= 0 );
+
+	r = engine->RegisterGlobalFunction("float acos(float)", asFUNCTIONPR(acosf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float asin(float)", asFUNCTIONPR(asinf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float atan(float)", asFUNCTIONPR(atanf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float atan2(float,float)", asFUNCTIONPR(atan2f, (float, float), float), asCALL_CDECL); assert( r >= 0 );
+
+	// Hyberbolic functions
+	r = engine->RegisterGlobalFunction("float cosh(float)", asFUNCTIONPR(coshf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float sinh(float)", asFUNCTIONPR(sinhf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float tanh(float)", asFUNCTIONPR(tanhf, (float), float), asCALL_CDECL); assert( r >= 0 );
+
+	// Exponential and logarithmic functions
+	r = engine->RegisterGlobalFunction("float log(float)", asFUNCTIONPR(logf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float log10(float)", asFUNCTIONPR(log10f, (float), float), asCALL_CDECL); assert( r >= 0 );
+
+	// Power functions
+	r = engine->RegisterGlobalFunction("float pow(float, float)", asFUNCTIONPR(powf, (float, float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float sqrt(float)", asFUNCTIONPR(sqrtf, (float), float), asCALL_CDECL); assert( r >= 0 );
+
+	// Nearest integer, absolute value, and remainder functions
+	r = engine->RegisterGlobalFunction("float ceil(float)", asFUNCTIONPR(ceilf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float abs(float)", asFUNCTIONPR(fabsf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float floor(float)", asFUNCTIONPR(floorf, (float), float), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float fraction(float)", asFUNCTIONPR(fractionf, (float), float), asCALL_CDECL); assert( r >= 0 );
+
+	// Don't register modf because AngelScript already supports the % operator
+#else
+	// double versions of the same
+	r = engine->RegisterGlobalFunction("double cos(double)", asFUNCTIONPR(cos, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double sin(double)", asFUNCTIONPR(sin, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double tan(double)", asFUNCTIONPR(tan, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double acos(double)", asFUNCTIONPR(acos, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double asin(double)", asFUNCTIONPR(asin, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double atan(double)", asFUNCTIONPR(atan, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double atan2(double,double)", asFUNCTIONPR(atan2, (double, double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double cosh(double)", asFUNCTIONPR(cosh, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double sinh(double)", asFUNCTIONPR(sinh, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double tanh(double)", asFUNCTIONPR(tanh, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double log(double)", asFUNCTIONPR(log, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double log10(double)", asFUNCTIONPR(log10, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double pow(double, double)", asFUNCTIONPR(pow, (double, double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double sqrt(double)", asFUNCTIONPR(sqrt, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double ceil(double)", asFUNCTIONPR(ceil, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double abs(double)", asFUNCTIONPR(fabs, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double floor(double)", asFUNCTIONPR(floor, (double), double), asCALL_CDECL); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double fraction(double)", asFUNCTIONPR(fraction, (double), double), asCALL_CDECL); assert( r >= 0 );
+#endif
+}
+
+#if AS_USE_FLOAT
+// This macro creates simple generic wrappers for functions of type 'float func(float)'
+#define GENERICff(x) \
+void x##_generic(asIScriptGeneric *gen) \
+{ \
+	float f = *(float*)gen->GetAddressOfArg(0); \
+	*(float*)gen->GetAddressOfReturnLocation() = x(f); \
+}
+
+GENERICff(cosf)
+GENERICff(sinf)
+GENERICff(tanf)
+GENERICff(acosf)
+GENERICff(asinf)
+GENERICff(atanf)
+GENERICff(coshf)
+GENERICff(sinhf)
+GENERICff(tanhf)
+GENERICff(logf)
+GENERICff(log10f)
+GENERICff(sqrtf)
+GENERICff(ceilf)
+GENERICff(fabsf)
+GENERICff(floorf)
+GENERICff(fractionf)
+
+void powf_generic(asIScriptGeneric *gen)
+{
+	float f1 = *(float*)gen->GetAddressOfArg(0);
+	float f2 = *(float*)gen->GetAddressOfArg(1);
+	*(float*)gen->GetAddressOfReturnLocation() = powf(f1, f2);
+}
+void atan2f_generic(asIScriptGeneric *gen)
+{
+	float f1 = *(float*)gen->GetAddressOfArg(0);
+	float f2 = *(float*)gen->GetAddressOfArg(1);
+	*(float*)gen->GetAddressOfReturnLocation() = atan2f(f1, f2);
+}
+
+#else
+// This macro creates simple generic wrappers for functions of type 'double func(double)'
+#define GENERICdd(x) \
+void x##_generic(asIScriptGeneric *gen) \
+{ \
+	double f = *(double*)gen->GetAddressOfArg(0); \
+	*(double*)gen->GetAddressOfReturnLocation() = x(f); \
+}
+
+GENERICdd(cos)
+GENERICdd(sin)
+GENERICdd(tan)
+GENERICdd(acos)
+GENERICdd(asin)
+GENERICdd(atan)
+GENERICdd(cosh)
+GENERICdd(sinh)
+GENERICdd(tanh)
+GENERICdd(log)
+GENERICdd(log10)
+GENERICdd(sqrt)
+GENERICdd(ceil)
+GENERICdd(fabs)
+GENERICdd(floor)
+GENERICdd(fraction)
+
+void pow_generic(asIScriptGeneric *gen)
+{
+	double f1 = *(double*)gen->GetAddressOfArg(0);
+	double f2 = *(double*)gen->GetAddressOfArg(1);
+	*(double*)gen->GetAddressOfReturnLocation() = pow(f1, f2);
+}
+void atan2_generic(asIScriptGeneric *gen)
+{
+	double f1 = *(double*)gen->GetAddressOfArg(0);
+	double f2 = *(double*)gen->GetAddressOfArg(1);
+	*(double*)gen->GetAddressOfReturnLocation() = atan2(f1, f2);
+}
+#endif
+void RegisterScriptMath_Generic(asIScriptEngine *engine)
+{
+	int r;
+
+#if AS_USE_FLOAT
+	// Trigonometric functions
+	r = engine->RegisterGlobalFunction("float cos(float)", asFUNCTION(cosf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float sin(float)", asFUNCTION(sinf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float tan(float)", asFUNCTION(tanf_generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterGlobalFunction("float acos(float)", asFUNCTION(acosf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float asin(float)", asFUNCTION(asinf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float atan(float)", asFUNCTION(atanf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float atan2(float,float)", asFUNCTION(atan2f_generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Hyberbolic functions
+	r = engine->RegisterGlobalFunction("float cosh(float)", asFUNCTION(coshf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float sinh(float)", asFUNCTION(sinhf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float tanh(float)", asFUNCTION(tanhf_generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Exponential and logarithmic functions
+	r = engine->RegisterGlobalFunction("float log(float)", asFUNCTION(logf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float log10(float)", asFUNCTION(log10f_generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Power functions
+	r = engine->RegisterGlobalFunction("float pow(float, float)", asFUNCTION(powf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float sqrt(float)", asFUNCTION(sqrtf_generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Nearest integer, absolute value, and remainder functions
+	r = engine->RegisterGlobalFunction("float ceil(float)", asFUNCTION(ceilf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float abs(float)", asFUNCTION(fabsf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float floor(float)", asFUNCTION(floorf_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("float fraction(float)", asFUNCTION(fractionf_generic), asCALL_GENERIC); assert( r >= 0 );
+
+	// Don't register modf because AngelScript already supports the % operator
+#else
+	// double versions of the same
+	r = engine->RegisterGlobalFunction("double cos(double)", asFUNCTION(cos_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double sin(double)", asFUNCTION(sin_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double tan(double)", asFUNCTION(tan_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double acos(double)", asFUNCTION(acos_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double asin(double)", asFUNCTION(asin_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double atan(double)", asFUNCTION(atan_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double atan2(double,double)", asFUNCTION(atan2_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double cosh(double)", asFUNCTION(cosh_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double sinh(double)", asFUNCTION(sinh_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double tanh(double)", asFUNCTION(tanh_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double log(double)", asFUNCTION(log_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double log10(double)", asFUNCTION(log10_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double pow(double, double)", asFUNCTION(pow_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double sqrt(double)", asFUNCTION(sqrt_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double ceil(double)", asFUNCTION(ceil_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double abs(double)", asFUNCTION(fabs_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double floor(double)", asFUNCTION(floor_generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterGlobalFunction("double fraction(double)", asFUNCTION(fraction_generic), asCALL_GENERIC); assert( r >= 0 );
+#endif
+}
+
+void RegisterScriptMath(asIScriptEngine *engine)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+		RegisterScriptMath_Generic(engine);
+	else
+		RegisterScriptMath_Native(engine);
+}
+
+END_AS_NAMESPACE
+
+
diff --git a/Sources/AngelScript/addons/scriptmath.h b/Sources/AngelScript/add_on/scriptmath/scriptmath.h
old mode 100755
new mode 100644
similarity index 93%
rename from Sources/AngelScript/addons/scriptmath.h
rename to Sources/AngelScript/add_on/scriptmath/scriptmath.h
index 8c1fd82cf..a239e38d7
--- a/Sources/AngelScript/addons/scriptmath.h
+++ b/Sources/AngelScript/add_on/scriptmath/scriptmath.h
@@ -1,26 +1,26 @@
-#ifndef SCRIPTMATH_H
-#define SCRIPTMATH_H
-
-#ifndef ANGELSCRIPT_H 
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-
-BEGIN_AS_NAMESPACE
-
-// This function will determine the configuration of the engine
-// and use one of the two functions below to register the math functions
-void RegisterScriptMath(asIScriptEngine *engine);
-
-// Call this function to register the math functions
-// using native calling conventions
-void RegisterScriptMath_Native(asIScriptEngine *engine);
-
-// Use this one instead if native calling conventions
-// are not supported on the target platform
-void RegisterScriptMath_Generic(asIScriptEngine *engine);
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTMATH_H
+#define SCRIPTMATH_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+
+BEGIN_AS_NAMESPACE
+
+// This function will determine the configuration of the engine
+// and use one of the two functions below to register the math functions
+void RegisterScriptMath(asIScriptEngine *engine);
+
+// Call this function to register the math functions
+// using native calling conventions
+void RegisterScriptMath_Native(asIScriptEngine *engine);
+
+// Use this one instead if native calling conventions
+// are not supported on the target platform
+void RegisterScriptMath_Generic(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scriptmathcomplex.cpp b/Sources/AngelScript/add_on/scriptmath/scriptmathcomplex.cpp
old mode 100755
new mode 100644
similarity index 95%
rename from Sources/AngelScript/addons/scriptmathcomplex.cpp
rename to Sources/AngelScript/add_on/scriptmath/scriptmathcomplex.cpp
index 4f10232b6..0695b7cd9
--- a/Sources/AngelScript/addons/scriptmathcomplex.cpp
+++ b/Sources/AngelScript/add_on/scriptmath/scriptmathcomplex.cpp
@@ -199,10 +199,10 @@ static void RegisterScriptMathComplex_Native(asIScriptEngine *engine)
 	r = engine->RegisterObjectMethod("complex", "float abs() const", asMETHOD(Complex,length), asCALL_THISCALL); assert( r >= 0 );
 
 	// Register the swizzle operators
-	r = engine->RegisterObjectMethod("complex", "complex get_ri() const", asMETHOD(Complex, get_ri), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("complex", "complex get_ir() const", asMETHOD(Complex, get_ir), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("complex", "void set_ri(const complex &in)", asMETHOD(Complex, set_ri), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("complex", "void set_ir(const complex &in)", asMETHOD(Complex, set_ir), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("complex", "complex get_ri() const property", asMETHOD(Complex, get_ri), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("complex", "complex get_ir() const property", asMETHOD(Complex, get_ir), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("complex", "void set_ri(const complex &in) property", asMETHOD(Complex, set_ri), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("complex", "void set_ir(const complex &in) property", asMETHOD(Complex, set_ir), asCALL_THISCALL); assert( r >= 0 );
 }
 
 void RegisterScriptMathComplex(asIScriptEngine *engine)
diff --git a/Sources/AngelScript/addons/scriptmathcomplex.h b/Sources/AngelScript/add_on/scriptmath/scriptmathcomplex.h
old mode 100755
new mode 100644
similarity index 94%
rename from Sources/AngelScript/addons/scriptmathcomplex.h
rename to Sources/AngelScript/add_on/scriptmath/scriptmathcomplex.h
index 4198a4966..8d33915d6
--- a/Sources/AngelScript/addons/scriptmathcomplex.h
+++ b/Sources/AngelScript/add_on/scriptmath/scriptmathcomplex.h
@@ -1,61 +1,61 @@
-#ifndef SCRIPTMATHCOMPLEX_H
-#define SCRIPTMATHCOMPLEX_H
-
-#ifndef ANGELSCRIPT_H 
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-
-BEGIN_AS_NAMESPACE
-
-// This class implements complex numbers and the common 
-// operations that can be done with it.
-//
-// Ref: http://mathworld.wolfram.com/ComplexNumber.html
-
-struct Complex
-{
-	Complex();
-	Complex(const Complex &other);
-	Complex(float r, float i = 0);
-
-	// Assignment operator
-	Complex &operator=(const Complex &other);
-	
-	// Compound assigment operators
-	Complex &operator+=(const Complex &other);
-	Complex &operator-=(const Complex &other);
-	Complex &operator*=(const Complex &other);
-	Complex &operator/=(const Complex &other);
-
-	float length() const;
-	float squaredLength() const;
-
-	// Swizzle operators
-	Complex get_ri() const;
-	void    set_ri(const Complex &in);
-	Complex get_ir() const;
-	void    set_ir(const Complex &in);
-
-	// Comparison
-	bool operator==(const Complex &other) const;
-	bool operator!=(const Complex &other) const;
-	
-	// Math operators
-	Complex operator+(const Complex &other) const;
-	Complex operator-(const Complex &other) const;
-	Complex operator*(const Complex &other) const;
-	Complex operator/(const Complex &other) const;
-
-	float r;
-	float i;
-};
-
-// This function will determine the configuration of the engine
-// and use one of the two functions below to register the string type
-void RegisterScriptMathComplex(asIScriptEngine *engine);
-
-END_AS_NAMESPACE
-
-#endif
+#ifndef SCRIPTMATHCOMPLEX_H
+#define SCRIPTMATHCOMPLEX_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+
+BEGIN_AS_NAMESPACE
+
+// This class implements complex numbers and the common 
+// operations that can be done with it.
+//
+// Ref: http://mathworld.wolfram.com/ComplexNumber.html
+
+struct Complex
+{
+	Complex();
+	Complex(const Complex &other);
+	Complex(float r, float i = 0);
+
+	// Assignment operator
+	Complex &operator=(const Complex &other);
+	
+	// Compound assigment operators
+	Complex &operator+=(const Complex &other);
+	Complex &operator-=(const Complex &other);
+	Complex &operator*=(const Complex &other);
+	Complex &operator/=(const Complex &other);
+
+	float length() const;
+	float squaredLength() const;
+
+	// Swizzle operators
+	Complex get_ri() const;
+	void    set_ri(const Complex &in);
+	Complex get_ir() const;
+	void    set_ir(const Complex &in);
+
+	// Comparison
+	bool operator==(const Complex &other) const;
+	bool operator!=(const Complex &other) const;
+	
+	// Math operators
+	Complex operator+(const Complex &other) const;
+	Complex operator-(const Complex &other) const;
+	Complex operator*(const Complex &other) const;
+	Complex operator/(const Complex &other) const;
+
+	float r;
+	float i;
+};
+
+// This function will determine the configuration of the engine
+// and use one of the two functions below to register the string type
+void RegisterScriptMathComplex(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scriptstdstring.cpp b/Sources/AngelScript/add_on/scriptstdstring/scriptstdstring.cpp
old mode 100755
new mode 100644
similarity index 88%
rename from Sources/AngelScript/addons/scriptstdstring.cpp
rename to Sources/AngelScript/add_on/scriptstdstring/scriptstdstring.cpp
index dec7b9e97..2a96ad405
--- a/Sources/AngelScript/addons/scriptstdstring.cpp
+++ b/Sources/AngelScript/add_on/scriptstdstring/scriptstdstring.cpp
@@ -1,1381 +1,1365 @@
-#include "scriptstdstring.h"
-#include <assert.h> // assert()
-#include <sstream>  // std::stringstream
-#include <string.h> // strstr()
-#include <stdio.h>	// sprintf()
-#include <stdlib.h> // strtod()
-#ifndef __psp2__
-	#include <locale.h> // setlocale()
-#endif
-
-using namespace std;
-
-// This macro is used to avoid warnings about unused variables.
-// Usually where the variables are only used in debug mode.
-#define UNUSED_VAR(x) (void)(x)
-
-#if AS_USE_STRINGPOOL == 1
-
-#ifdef AS_CAN_USE_CPP11
-	// The string pool doesn't need to keep a specific order in the
-	// pool, so the unordered_map is faster than the ordinary map
-	#include <unordered_map>  // std::unordered_map
-BEGIN_AS_NAMESPACE
-	typedef unordered_map<const char *, string> map_t;
-END_AS_NAMESPACE
-#else
-	#include <map>      // std::map
-BEGIN_AS_NAMESPACE
-	typedef map<const char *, string> map_t;
-END_AS_NAMESPACE
-#endif
-
-BEGIN_AS_NAMESPACE
-
-// By keeping the literal strings in a pool the application
-// performance is improved as there are less string copies created.
-
-// The string pool will be kept as user data in the engine. We'll
-// need a specific type to identify the string pool user data.
-// We just define a number here that we assume nobody else is using for
-// object type user data. The add-ons have reserved the numbers 1000
-// through 1999 for this purpose, so we should be fine.
-const asPWORD STRING_POOL = 1001;
-
-// This global static variable is placed here rather than locally within the
-// StringFactory, due to memory leak detectors that don't see the deallocation
-// of global variables. By placing the variable globally it will be initialized
-// before the memory leak detector starts, thus it won't report the missing
-// deallocation. An example of this the Marmalade leak detector initialized with
-// IwGxInit() and finished with IwGxTerminate().
-static const string emptyString;
-
-static const string &StringFactory(asUINT length, const char *s)
-{
-	// Each engine instance has its own string pool
-	asIScriptContext *ctx = asGetActiveContext();
-	if( ctx == 0 )
-	{
-		// The string factory can only be called from a script
-		assert( ctx );
-		return emptyString;
-	}
-	asIScriptEngine *engine = ctx->GetEngine();
-
-	map_t *pool = reinterpret_cast< map_t* >(engine->GetUserData(STRING_POOL));
-	if( !pool )
-	{
-		// The string pool hasn't been created yet, so we'll create it now
-		asAcquireExclusiveLock();
-
-		// Make sure the string pool wasn't created while we were waiting for the lock
-		pool = reinterpret_cast< map_t* >(engine->GetUserData(STRING_POOL));
-		if( !pool )
-		{
-			#if defined(__S3E__)
-			pool = new map_t;
-			#else
-			pool = new (nothrow) map_t;
-			#endif
-			if( pool == 0 )
-			{
-				ctx->SetException("Out of memory");
-				asReleaseExclusiveLock();
-				return emptyString;
-			}
-			engine->SetUserData(pool, STRING_POOL);
-		}
-
-		asReleaseExclusiveLock();
-	}
-
-	// We can't let other threads modify the pool while we query it
-	asAcquireSharedLock();
-
-	// First check if a string object hasn't been created already
-	map_t::iterator it;
-	it = pool->find(s);
-	if( it != pool->end() )
-	{
-		asReleaseSharedLock();
-		return it->second;
-	}
-
-	asReleaseSharedLock();
-
-	// Acquire an exclusive lock so we can add the new string to the pool
-	asAcquireExclusiveLock();
-
-	// Make sure the string wasn't created while we were waiting for the exclusive lock
-	it = pool->find(s);
-	if( it == pool->end() )
-	{
-		// Create a new string object
-		it = pool->insert(map_t::value_type(s, string(s, length))).first;
-	}
-
-	asReleaseExclusiveLock();
-	return it->second;
-}
-
-static void CleanupEngineStringPool(asIScriptEngine *engine)
-{
-	map_t *pool = reinterpret_cast< map_t* >(engine->GetUserData(STRING_POOL));
-	if( pool )
-		delete pool;
-}
-
-#else
-static string StringFactory(asUINT length, const char *s)
-{
-	return string(s, length);
-}
-#endif
-
-static void ConstructString(string *thisPointer)
-{
-	new(thisPointer) string();
-}
-
-static void CopyConstructString(const string &other, string *thisPointer)
-{
-	new(thisPointer) string(other);
-}
-
-static void DestructString(string *thisPointer)
-{
-	thisPointer->~string();
-}
-
-static string &AddAssignStringToString(const string &str, string &dest)
-{
-	// We don't register the method directly because some compilers
-	// and standard libraries inline the definition, resulting in the
-	// linker being unable to find the declaration.
-	// Example: CLang/LLVM with XCode 4.3 on OSX 10.7
-	dest += str;
-	return dest;
-}
-
-// bool string::isEmpty()
-// bool string::empty() // if AS_USE_STLNAMES == 1
-static bool StringIsEmpty(const string &str)
-{
-	// We don't register the method directly because some compilers
-	// and standard libraries inline the definition, resulting in the
-	// linker being unable to find the declaration
-	// Example: CLang/LLVM with XCode 4.3 on OSX 10.7
-	return str.empty();
-}
-
-static string &AssignUInt64ToString(asQWORD i, string &dest)
-{
-	ostringstream stream;
-	stream << i;
-	dest = stream.str();
-	return dest;
-}
-
-static string &AddAssignUInt64ToString(asQWORD i, string &dest)
-{
-	ostringstream stream;
-	stream << i;
-	dest += stream.str();
-	return dest;
-}
-
-static string AddStringUInt64(const string &str, asQWORD i)
-{
-	ostringstream stream;
-	stream << i;
-	return str + stream.str();
-}
-
-static string AddInt64String(asINT64 i, const string &str)
-{
-	ostringstream stream;
-	stream << i;
-	return stream.str() + str;
-}
-
-static string &AssignInt64ToString(asINT64 i, string &dest)
-{
-	ostringstream stream;
-	stream << i;
-	dest = stream.str();
-	return dest;
-}
-
-static string &AddAssignInt64ToString(asINT64 i, string &dest)
-{
-	ostringstream stream;
-	stream << i;
-	dest += stream.str();
-	return dest;
-}
-
-static string AddStringInt64(const string &str, asINT64 i)
-{
-	ostringstream stream;
-	stream << i;
-	return str + stream.str();
-}
-
-static string AddUInt64String(asQWORD i, const string &str)
-{
-	ostringstream stream;
-	stream << i;
-	return stream.str() + str;
-}
-
-static string &AssignDoubleToString(double f, string &dest)
-{
-	ostringstream stream;
-	stream << f;
-	dest = stream.str();
-	return dest;
-}
-
-static string &AddAssignDoubleToString(double f, string &dest)
-{
-	ostringstream stream;
-	stream << f;
-	dest += stream.str();
-	return dest;
-}
-
-static string &AssignFloatToString(float f, string &dest)
-{
-	ostringstream stream;
-	stream << f;
-	dest = stream.str();
-	return dest;
-}
-
-static string &AddAssignFloatToString(float f, string &dest)
-{
-	ostringstream stream;
-	stream << f;
-	dest += stream.str();
-	return dest;
-}
-
-static string &AssignBoolToString(bool b, string &dest)
-{
-	ostringstream stream;
-	stream << (b ? "true" : "false");
-	dest = stream.str();
-	return dest;
-}
-
-static string &AddAssignBoolToString(bool b, string &dest)
-{
-	ostringstream stream;
-	stream << (b ? "true" : "false");
-	dest += stream.str();
-	return dest;
-}
-
-static string AddStringDouble(const string &str, double f)
-{
-	ostringstream stream;
-	stream << f;
-	return str + stream.str();
-}
-
-static string AddDoubleString(double f, const string &str)
-{
-	ostringstream stream;
-	stream << f;
-	return stream.str() + str;
-}
-
-static string AddStringFloat(const string &str, float f)
-{
-	ostringstream stream;
-	stream << f;
-	return str + stream.str();
-}
-
-static string AddFloatString(float f, const string &str)
-{
-	ostringstream stream;
-	stream << f;
-	return stream.str() + str;
-}
-
-static string AddStringBool(const string &str, bool b)
-{
-	ostringstream stream;
-	stream << (b ? "true" : "false");
-	return str + stream.str();
-}
-
-static string AddBoolString(bool b, const string &str)
-{
-	ostringstream stream;
-	stream << (b ? "true" : "false");
-	return stream.str() + str;
-}
-
-static char *StringCharAt(unsigned int i, string &str)
-{
-	if( i >= str.size() )
-	{
-		// Set a script exception
-		asIScriptContext *ctx = asGetActiveContext();
-		ctx->SetException("Out of range");
-
-		// Return a null pointer
-		return 0;
-	}
-
-	return &str[i];
-}
-
-// AngelScript signature:
-// int string::opCmp(const string &in) const
-static int StringCmp(const string &a, const string &b)
-{
-	int cmp = 0;
-	if( a < b ) cmp = -1;
-	else if( a > b ) cmp = 1;
-	return cmp;
-}
-
-// This function returns the index of the first position where the substring
-// exists in the input string. If the substring doesn't exist in the input
-// string -1 is returned.
-//
-// AngelScript signature:
-// int string::findFirst(const string &in sub, uint start = 0) const
-static int StringFindFirst(const string &sub, asUINT start, const string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	return (int)str.find(sub, (size_t)(start < 0 ? string::npos : start));
-}
-
-// This function returns the index of the first position where the one of the bytes in substring
-// exists in the input string. If the characters in the substring doesn't exist in the input
-// string -1 is returned.
-//
-// AngelScript signature:
-// int string::findFirstOf(const string &in sub, uint start = 0) const
-static int StringFindFirstOf(const string &sub, asUINT start, const string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	return (int)str.find_first_of(sub, (size_t)(start < 0 ? string::npos : start));
-}
-
-// This function returns the index of the last position where the one of the bytes in substring
-// exists in the input string. If the characters in the substring doesn't exist in the input
-// string -1 is returned.
-//
-// AngelScript signature:
-// int string::findLastOf(const string &in sub, uint start = -1) const
-static int StringFindLastOf(const string &sub, asUINT start, const string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	return (int)str.find_last_of(sub, (size_t)(start < 0 ? string::npos : start));
-}
-
-// This function returns the index of the first position where a byte other than those in substring
-// exists in the input string. If none is found -1 is returned.
-//
-// AngelScript signature:
-// int string::findFirstNotOf(const string &in sub, uint start = 0) const
-static int StringFindFirstNotOf(const string &sub, asUINT start, const string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	return (int)str.find_first_not_of(sub, (size_t)(start < 0 ? string::npos : start));
-}
-
-// This function returns the index of the last position where a byte other than those in substring
-// exists in the input string. If none is found -1 is returned.
-//
-// AngelScript signature:
-// int string::findLastNotOf(const string &in sub, uint start = -1) const
-static int StringFindLastNotOf(const string &sub, asUINT start, const string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	return (int)str.find_last_of(sub, (size_t)(start < 0 ? string::npos : start));
-}
-
-// This function returns the index of the last position where the substring
-// exists in the input string. If the substring doesn't exist in the input
-// string -1 is returned.
-//
-// AngelScript signature:
-// int string::findLast(const string &in sub, int start = -1) const
-static int StringFindLast(const string &sub, int start, const string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	return (int)str.rfind(sub, (size_t)(start < 0 ? string::npos : start));
-}
-
-// AngelScript signature:
-// void string::insert(uint pos, const string &in other)
-static void StringInsert(unsigned int pos, const string &other, string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	str.insert(pos, other);
-}
-
-// AngelScript signature:
-// void string::erase(uint pos, int count = -1)
-static void StringErase(unsigned int pos, int count, string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	str.erase(pos, (size_t)(count < 0 ? string::npos : count));
-}
-
-
-// AngelScript signature:
-// uint string::length() const
-static asUINT StringLength(const string &str)
-{
-	// We don't register the method directly because the return type changes between 32bit and 64bit platforms
-	return (asUINT)str.length();
-}
-
-
-// AngelScript signature:
-// void string::resize(uint l)
-static void StringResize(asUINT l, string &str)
-{
-	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
-	str.resize(l);
-}
-
-// AngelScript signature:
-// string formatInt(int64 val, const string &in options, uint width)
-static string formatInt(asINT64 value, const string &options, asUINT width)
-{
-	bool leftJustify = options.find("l") != string::npos;
-	bool padWithZero = options.find("0") != string::npos;
-	bool alwaysSign  = options.find("+") != string::npos;
-	bool spaceOnSign = options.find(" ") != string::npos;
-	bool hexSmall    = options.find("h") != string::npos;
-	bool hexLarge    = options.find("H") != string::npos;
-
-	string fmt = "%";
-	if( leftJustify ) fmt += "-";
-	if( alwaysSign ) fmt += "+";
-	if( spaceOnSign ) fmt += " ";
-	if( padWithZero ) fmt += "0";
-
-#ifdef _WIN32
-	fmt += "*I64";
-#else
-#ifdef _LP64
-	fmt += "*l";
-#else
-	fmt += "*ll";
-#endif
-#endif
-
-	if( hexSmall ) fmt += "x";
-	else if( hexLarge ) fmt += "X";
-	else fmt += "d";
-
-	string buf;
-	buf.resize(width+30);
-#if _MSC_VER >= 1400 && !defined(__S3E__)
-	// MSVC 8.0 / 2005 or newer
-	sprintf_s(&buf[0], buf.size(), fmt.c_str(), width, value);
-#else
-	sprintf(&buf[0], fmt.c_str(), width, value);
-#endif
-	buf.resize(strlen(&buf[0]));
-
-	return buf;
-}
-
-// AngelScript signature:
-// string formatUInt(uint64 val, const string &in options, uint width)
-static string formatUInt(asQWORD value, const string &options, asUINT width)
-{
-	bool leftJustify = options.find("l") != string::npos;
-	bool padWithZero = options.find("0") != string::npos;
-	bool alwaysSign  = options.find("+") != string::npos;
-	bool spaceOnSign = options.find(" ") != string::npos;
-	bool hexSmall    = options.find("h") != string::npos;
-	bool hexLarge    = options.find("H") != string::npos;
-
-	string fmt = "%";
-	if( leftJustify ) fmt += "-";
-	if( alwaysSign ) fmt += "+";
-	if( spaceOnSign ) fmt += " ";
-	if( padWithZero ) fmt += "0";
-
-#ifdef _WIN32
-	fmt += "*I64";
-#else
-#ifdef _LP64
-	fmt += "*l";
-#else
-	fmt += "*ll";
-#endif
-#endif
-
-	if( hexSmall ) fmt += "x";
-	else if( hexLarge ) fmt += "X";
-	else fmt += "u";
-
-	string buf;
-	buf.resize(width+30);
-#if _MSC_VER >= 1400 && !defined(__S3E__)
-	// MSVC 8.0 / 2005 or newer
-	sprintf_s(&buf[0], buf.size(), fmt.c_str(), width, value);
-#else
-	sprintf(&buf[0], fmt.c_str(), width, value);
-#endif
-	buf.resize(strlen(&buf[0]));
-
-	return buf;
-}
-
-// AngelScript signature:
-// string formatFloat(double val, const string &in options, uint width, uint precision)
-static string formatFloat(double value, const string &options, asUINT width, asUINT precision)
-{
-	bool leftJustify = options.find("l") != string::npos;
-	bool padWithZero = options.find("0") != string::npos;
-	bool alwaysSign  = options.find("+") != string::npos;
-	bool spaceOnSign = options.find(" ") != string::npos;
-	bool expSmall    = options.find("e") != string::npos;
-	bool expLarge    = options.find("E") != string::npos;
-
-	string fmt = "%";
-	if( leftJustify ) fmt += "-";
-	if( alwaysSign ) fmt += "+";
-	if( spaceOnSign ) fmt += " ";
-	if( padWithZero ) fmt += "0";
-
-	fmt += "*.*";
-
-	if( expSmall ) fmt += "e";
-	else if( expLarge ) fmt += "E";
-	else fmt += "f";
-
-	string buf;
-	buf.resize(width+precision+50);
-#if _MSC_VER >= 1400 && !defined(__S3E__)
-	// MSVC 8.0 / 2005 or newer
-	sprintf_s(&buf[0], buf.size(), fmt.c_str(), width, precision, value);
-#else
-	sprintf(&buf[0], fmt.c_str(), width, precision, value);
-#endif
-	buf.resize(strlen(&buf[0]));
-
-	return buf;
-}
-
-// AngelScript signature:
-// int64 parseInt(const string &in val, uint base = 10, uint &out byteCount = 0)
-static asINT64 parseInt(const string &val, asUINT base, asUINT *byteCount)
-{
-	// Only accept base 10 and 16
-	if( base != 10 && base != 16 )
-	{
-		if( byteCount ) *byteCount = 0;
-		return 0;
-	}
-
-	const char *end = &val[0];
-
-	// Determine the sign
-	bool sign = false;
-	if( *end == '-' )
-	{
-		sign = true;
-		end++;
-	}
-	else if( *end == '+' )
-		end++;
-
-	asINT64 res = 0;
-	if( base == 10 )
-	{
-		while( *end >= '0' && *end <= '9' )
-		{
-			res *= 10;
-			res += *end++ - '0';
-		}
-	}
-	else if( base == 16 )
-	{
-		while( (*end >= '0' && *end <= '9') ||
-		       (*end >= 'a' && *end <= 'f') ||
-		       (*end >= 'A' && *end <= 'F') )
-		{
-			res *= 16;
-			if( *end >= '0' && *end <= '9' )
-				res += *end++ - '0';
-			else if( *end >= 'a' && *end <= 'f' )
-				res += *end++ - 'a' + 10;
-			else if( *end >= 'A' && *end <= 'F' )
-				res += *end++ - 'A' + 10;
-		}
-	}
-
-	if( byteCount )
-		*byteCount = asUINT(size_t(end - val.c_str()));
-
-	if( sign )
-		res = -res;
-
-	return res;
-}
-
-// AngelScript signature:
-// uint64 parseUInt(const string &in val, uint base = 10, uint &out byteCount = 0)
-static asQWORD parseUInt(const string &val, asUINT base, asUINT *byteCount)
-{
-	// Only accept base 10 and 16
-	if (base != 10 && base != 16)
-	{
-		if (byteCount) *byteCount = 0;
-		return 0;
-	}
-
-	const char *end = &val[0];
-
-	asQWORD res = 0;
-	if (base == 10)
-	{
-		while (*end >= '0' && *end <= '9')
-		{
-			res *= 10;
-			res += *end++ - '0';
-		}
-	}
-	else if (base == 16)
-	{
-		while ((*end >= '0' && *end <= '9') ||
-			(*end >= 'a' && *end <= 'f') ||
-			(*end >= 'A' && *end <= 'F'))
-		{
-			res *= 16;
-			if (*end >= '0' && *end <= '9')
-				res += *end++ - '0';
-			else if (*end >= 'a' && *end <= 'f')
-				res += *end++ - 'a' + 10;
-			else if (*end >= 'A' && *end <= 'F')
-				res += *end++ - 'A' + 10;
-		}
-	}
-
-	if (byteCount)
-		*byteCount = asUINT(size_t(end - val.c_str()));
-
-	return res;
-}
-
-// AngelScript signature:
-// double parseFloat(const string &in val, uint &out byteCount = 0)
-double parseFloat(const string &val, asUINT *byteCount)
-{
-	char *end;
-
-	// WinCE doesn't have setlocale. Some quick testing on my current platform
-	// still manages to parse the numbers such as "3.14" even if the decimal for the
-	// locale is ",".
-#if !defined(_WIN32_WCE) && !defined(ANDROID) && !defined(__psp2__)
-	// Set the locale to C so that we are guaranteed to parse the float value correctly
-	char *orig = setlocale(LC_NUMERIC, 0);
-	setlocale(LC_NUMERIC, "C");
-#endif
-
-	double res = strtod(val.c_str(), &end);
-
-#if !defined(_WIN32_WCE) && !defined(ANDROID) && !defined(__psp2__)
-	// Restore the locale
-	setlocale(LC_NUMERIC, orig);
-#endif
-
-	if( byteCount )
-		*byteCount = asUINT(size_t(end - val.c_str()));
-
-	return res;
-}
-
-// This function returns a string containing the substring of the input string
-// determined by the starting index and count of characters.
-//
-// AngelScript signature:
-// string string::substr(uint start = 0, int count = -1) const
-static string StringSubString(asUINT start, int count, const string &str)
-{
-	// Check for out-of-bounds
-	string ret;
-	if( start < str.length() && count != 0 )
-		ret = str.substr(start, (size_t)(count < 0 ? string::npos : count));
-
-	return ret;
-}
-
-// String equality comparison.
-// Returns true iff lhs is equal to rhs.
-//
-// For some reason gcc 4.7 has difficulties resolving the
-// asFUNCTIONPR(operator==, (const string &, const string &)
-// makro, so this wrapper was introduced as work around.
-static bool StringEquals(const std::string& lhs, const std::string& rhs)
-{
-	return lhs == rhs;
-}
-
-void RegisterStdString_Native(asIScriptEngine *engine)
-{
-	int r = 0;
-	UNUSED_VAR(r);
-
-	// Register the string type
-#if AS_CAN_USE_CPP11
-	// With C++11 it is possible to use asGetTypeTraits to automatically determine the correct flags to use
-	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asGetTypeTraits<string>()); assert( r >= 0 );
-#else
-	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
-#endif
-
-#if AS_USE_STRINGPOOL == 1
-	// Register the string factory
-	r = engine->RegisterStringFactory("const string &", asFUNCTION(StringFactory), asCALL_CDECL); assert( r >= 0 );
-
-	// Register the cleanup callback for the string pool
-	engine->SetEngineUserDataCleanupCallback(CleanupEngineStringPool, STRING_POOL);
-#else
-	// Register the string factory
-	r = engine->RegisterStringFactory("string", asFUNCTION(StringFactory), asCALL_CDECL); assert( r >= 0 );
-#endif
-
-	// Register the object operator overloads
-	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f()",                    asFUNCTION(ConstructString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f(const string &in)",    asFUNCTION(CopyConstructString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("string", asBEHAVE_DESTRUCT,   "void f()",                    asFUNCTION(DestructString),  asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAssign(const string &in)", asMETHODPR(string, operator =, (const string&), string&), asCALL_THISCALL); assert( r >= 0 );
-	// Need to use a wrapper on Mac OS X 10.7/XCode 4.3 and CLang/LLVM, otherwise the linker fails
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(const string &in)", asFUNCTION(AddAssignStringToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-//	r = engine->RegisterObjectMethod("string", "string &opAddAssign(const string &in)", asMETHODPR(string, operator+=, (const string&), string&), asCALL_THISCALL); assert( r >= 0 );
-
-	// Need to use a wrapper for operator== otherwise gcc 4.7 fails to compile
-	r = engine->RegisterObjectMethod("string", "bool opEquals(const string &in) const", asFUNCTIONPR(StringEquals, (const string &, const string &), bool), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "int opCmp(const string &in) const", asFUNCTION(StringCmp), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(const string &in) const", asFUNCTIONPR(operator +, (const string &, const string &), string), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-
-	// The string length can be accessed through methods or through virtual property
-	r = engine->RegisterObjectMethod("string", "uint length() const", asFUNCTION(StringLength), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "void resize(uint)", asFUNCTION(StringResize), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "uint get_length() const", asFUNCTION(StringLength), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "void set_length(uint)", asFUNCTION(StringResize), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	// Need to use a wrapper on Mac OS X 10.7/XCode 4.3 and CLang/LLVM, otherwise the linker fails
-//	r = engine->RegisterObjectMethod("string", "bool isEmpty() const", asMETHOD(string, empty), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "bool isEmpty() const", asFUNCTION(StringIsEmpty), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-
-	// Register the index operator, both as a mutator and as an inspector
-	// Note that we don't register the operator[] directly, as it doesn't do bounds checking
-	r = engine->RegisterObjectMethod("string", "uint8 &opIndex(uint)", asFUNCTION(StringCharAt), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "const uint8 &opIndex(uint) const", asFUNCTION(StringCharAt), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-
-	// Automatic conversion from values
-	r = engine->RegisterObjectMethod("string", "string &opAssign(double)", asFUNCTION(AssignDoubleToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(double)", asFUNCTION(AddAssignDoubleToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(double) const", asFUNCTION(AddStringDouble), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(double) const", asFUNCTION(AddDoubleString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(float)", asFUNCTION(AssignFloatToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(float)", asFUNCTION(AddAssignFloatToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(float) const", asFUNCTION(AddStringFloat), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(float) const", asFUNCTION(AddFloatString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(int64)", asFUNCTION(AssignInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int64)", asFUNCTION(AddAssignInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(int64) const", asFUNCTION(AddStringInt64), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(int64) const", asFUNCTION(AddInt64String), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(uint64)", asFUNCTION(AssignUInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint64)", asFUNCTION(AddAssignUInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(uint64) const", asFUNCTION(AddStringUInt64), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint64) const", asFUNCTION(AddUInt64String), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(bool)", asFUNCTION(AssignBoolToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(bool)", asFUNCTION(AddAssignBoolToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(bool) const", asFUNCTION(AddStringBool), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(bool) const", asFUNCTION(AddBoolString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-
-	// Utilities
-	r = engine->RegisterObjectMethod("string", "string substr(uint start = 0, int count = -1) const", asFUNCTION(StringSubString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "int findFirst(const string &in, uint start = 0) const", asFUNCTION(StringFindFirst), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "int findFirstOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findFirstNotOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstNotOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findLast(const string &in, int start = -1) const", asFUNCTION(StringFindLast), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "int findLastOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findLastNotOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastNotOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "void insert(uint pos, const string &in other)", asFUNCTION(StringInsert), asCALL_CDECL_OBJLAST); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "void erase(uint pos, int count = -1)", asFUNCTION(StringErase), asCALL_CDECL_OBJLAST); assert(r >= 0);
-
-
-	r = engine->RegisterGlobalFunction("string formatInt(int64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatInt), asCALL_CDECL); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("string formatUInt(uint64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatUInt), asCALL_CDECL); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("string formatFloat(double val, const string &in options = \"\", uint width = 0, uint precision = 0)", asFUNCTION(formatFloat), asCALL_CDECL); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("int64 parseInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseInt), asCALL_CDECL); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("uint64 parseUInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseUInt), asCALL_CDECL); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("double parseFloat(const string &in, uint &out byteCount = 0)", asFUNCTION(parseFloat), asCALL_CDECL); assert(r >= 0);
-
-#if AS_USE_STLNAMES == 1
-	// Same as length
-	r = engine->RegisterObjectMethod("string", "uint size() const", asFUNCTION(StringLength), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	// Same as isEmpty
-	r = engine->RegisterObjectMethod("string", "bool empty() const", asFUNCTION(StringIsEmpty), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	// Same as findFirst
-	r = engine->RegisterObjectMethod("string", "int find(const string &in, uint start = 0) const", asFUNCTION(StringFindFirst), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	// Same as findLast
-	r = engine->RegisterObjectMethod("string", "int rfind(const string &in, int start = -1) const", asFUNCTION(StringFindLast), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-#endif
-
-	// TODO: Implement the following
-	// findAndReplace - replaces a text found in the string
-	// replaceRange - replaces a range of bytes in the string
-	// multiply/times/opMul/opMul_r - takes the string and multiplies it n times, e.g. "-".multiply(5) returns "-----"
-}
-
-#if AS_USE_STRINGPOOL == 1
-static void StringFactoryGeneric(asIScriptGeneric *gen)
-{
-	asUINT length = gen->GetArgDWord(0);
-	const char *s = (const char*)gen->GetArgAddress(1);
-
-	// Return a reference to a string
-	gen->SetReturnAddress(const_cast<string*>(&StringFactory(length, s)));
-}
-#else
-static void StringFactoryGeneric(asIScriptGeneric *gen)
-{
-	asUINT length = gen->GetArgDWord(0);
-	const char *s = (const char*)gen->GetArgAddress(1);
-
-	// Return a string value
-	new (gen->GetAddressOfReturnLocation()) string(StringFactory(length, s));
-}
-#endif
-
-static void ConstructStringGeneric(asIScriptGeneric * gen)
-{
-	new (gen->GetObject()) string();
-}
-
-static void CopyConstructStringGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetArgObject(0));
-	new (gen->GetObject()) string(*a);
-}
-
-static void DestructStringGeneric(asIScriptGeneric * gen)
-{
-	string * ptr = static_cast<string *>(gen->GetObject());
-	ptr->~string();
-}
-
-static void AssignStringGeneric(asIScriptGeneric *gen)
-{
-	string * a = static_cast<string *>(gen->GetArgObject(0));
-	string * self = static_cast<string *>(gen->GetObject());
-	*self = *a;
-	gen->SetReturnAddress(self);
-}
-
-static void AddAssignStringGeneric(asIScriptGeneric *gen)
-{
-	string * a = static_cast<string *>(gen->GetArgObject(0));
-	string * self = static_cast<string *>(gen->GetObject());
-	*self += *a;
-	gen->SetReturnAddress(self);
-}
-
-static void StringEqualsGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	string * b = static_cast<string *>(gen->GetArgAddress(0));
-	*(bool*)gen->GetAddressOfReturnLocation() = (*a == *b);
-}
-
-static void StringCmpGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	string * b = static_cast<string *>(gen->GetArgAddress(0));
-
-	int cmp = 0;
-	if( *a < *b ) cmp = -1;
-	else if( *a > *b ) cmp = 1;
-
-	*(int*)gen->GetAddressOfReturnLocation() = cmp;
-}
-
-static void StringAddGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	string * b = static_cast<string *>(gen->GetArgAddress(0));
-	string ret_val = *a + *b;
-	gen->SetReturnObject(&ret_val);
-}
-
-static void StringLengthGeneric(asIScriptGeneric * gen)
-{
-	string * self = static_cast<string *>(gen->GetObject());
-	*static_cast<asUINT *>(gen->GetAddressOfReturnLocation()) = (asUINT)self->length();
-}
-
-static void StringIsEmptyGeneric(asIScriptGeneric * gen)
-{
-	string * self = reinterpret_cast<string *>(gen->GetObject());
-	*reinterpret_cast<bool *>(gen->GetAddressOfReturnLocation()) = StringIsEmpty(*self);
-}
-
-static void StringResizeGeneric(asIScriptGeneric * gen)
-{
-	string * self = static_cast<string *>(gen->GetObject());
-	self->resize(*static_cast<asUINT *>(gen->GetAddressOfArg(0)));
-}
-
-static void StringInsert_Generic(asIScriptGeneric *gen)
-{
-	string * self = static_cast<string *>(gen->GetObject());
-	asUINT pos = gen->GetArgDWord(0);
-	string *other = reinterpret_cast<string*>(gen->GetArgAddress(1));
-	StringInsert(pos, *other, *self);
-}
-
-static void StringErase_Generic(asIScriptGeneric *gen)
-{
-	string * self = static_cast<string *>(gen->GetObject());
-	asUINT pos = gen->GetArgDWord(0);
-	int count = int(gen->GetArgDWord(1));
-	StringErase(pos, count, *self);
-}
-
-static void StringFindFirst_Generic(asIScriptGeneric * gen)
-{
-	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT start = gen->GetArgDWord(1);
-	string *self = reinterpret_cast<string *>(gen->GetObject());
-	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindFirst(*find, start, *self);
-}
-
-static void StringFindLast_Generic(asIScriptGeneric * gen)
-{
-	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT start = gen->GetArgDWord(1);
-	string *self = reinterpret_cast<string *>(gen->GetObject());
-	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindLast(*find, start, *self);
-}
-
-static void StringFindFirstOf_Generic(asIScriptGeneric * gen)
-{
-	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT start = gen->GetArgDWord(1);
-	string *self = reinterpret_cast<string *>(gen->GetObject());
-	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindFirstOf(*find, start, *self);
-}
-
-static void StringFindLastOf_Generic(asIScriptGeneric * gen)
-{
-	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT start = gen->GetArgDWord(1);
-	string *self = reinterpret_cast<string *>(gen->GetObject());
-	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindLastOf(*find, start, *self);
-}
-
-static void StringFindFirstNotOf_Generic(asIScriptGeneric * gen)
-{
-	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT start = gen->GetArgDWord(1);
-	string *self = reinterpret_cast<string *>(gen->GetObject());
-	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindFirstNotOf(*find, start, *self);
-}
-
-static void StringFindLastNotOf_Generic(asIScriptGeneric * gen)
-{
-	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT start = gen->GetArgDWord(1);
-	string *self = reinterpret_cast<string *>(gen->GetObject());
-	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindLastNotOf(*find, start, *self);
-}
-
-static void formatInt_Generic(asIScriptGeneric * gen)
-{
-	asINT64 val = gen->GetArgQWord(0);
-	string *options = reinterpret_cast<string*>(gen->GetArgAddress(1));
-	asUINT width = gen->GetArgDWord(2);
-	new(gen->GetAddressOfReturnLocation()) string(formatInt(val, *options, width));
-}
-
-static void formatUInt_Generic(asIScriptGeneric * gen)
-{
-	asQWORD val = gen->GetArgQWord(0);
-	string *options = reinterpret_cast<string*>(gen->GetArgAddress(1));
-	asUINT width = gen->GetArgDWord(2);
-	new(gen->GetAddressOfReturnLocation()) string(formatUInt(val, *options, width));
-}
-
-static void formatFloat_Generic(asIScriptGeneric *gen)
-{
-	double val = gen->GetArgDouble(0);
-	string *options = reinterpret_cast<string*>(gen->GetArgAddress(1));
-	asUINT width = gen->GetArgDWord(2);
-	asUINT precision = gen->GetArgDWord(3);
-	new(gen->GetAddressOfReturnLocation()) string(formatFloat(val, *options, width, precision));
-}
-
-static void parseInt_Generic(asIScriptGeneric *gen)
-{
-	string *str = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT base = gen->GetArgDWord(1);
-	asUINT *byteCount = reinterpret_cast<asUINT*>(gen->GetArgAddress(2));
-	gen->SetReturnQWord(parseInt(*str,base,byteCount));
-}
-
-static void parseUInt_Generic(asIScriptGeneric *gen)
-{
-	string *str = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT base = gen->GetArgDWord(1);
-	asUINT *byteCount = reinterpret_cast<asUINT*>(gen->GetArgAddress(2));
-	gen->SetReturnQWord(parseUInt(*str, base, byteCount));
-}
-
-static void parseFloat_Generic(asIScriptGeneric *gen)
-{
-	string *str = reinterpret_cast<string*>(gen->GetArgAddress(0));
-	asUINT *byteCount = reinterpret_cast<asUINT*>(gen->GetArgAddress(1));
-	gen->SetReturnDouble(parseFloat(*str,byteCount));
-}
-
-static void StringCharAtGeneric(asIScriptGeneric * gen)
-{
-	unsigned int index = gen->GetArgDWord(0);
-	string * self = static_cast<string *>(gen->GetObject());
-
-	if (index >= self->size())
-	{
-		// Set a script exception
-		asIScriptContext *ctx = asGetActiveContext();
-		ctx->SetException("Out of range");
-
-		gen->SetReturnAddress(0);
-	}
-	else
-	{
-		gen->SetReturnAddress(&(self->operator [](index)));
-	}
-}
-
-static void AssignInt2StringGeneric(asIScriptGeneric *gen)
-{
-	asINT64 *a = static_cast<asINT64*>(gen->GetAddressOfArg(0));
-	string *self = static_cast<string*>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self = sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AssignUInt2StringGeneric(asIScriptGeneric *gen)
-{
-	asQWORD *a = static_cast<asQWORD*>(gen->GetAddressOfArg(0));
-	string *self = static_cast<string*>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self = sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AssignDouble2StringGeneric(asIScriptGeneric *gen)
-{
-	double *a = static_cast<double*>(gen->GetAddressOfArg(0));
-	string *self = static_cast<string*>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self = sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AssignFloat2StringGeneric(asIScriptGeneric *gen)
-{
-	float *a = static_cast<float*>(gen->GetAddressOfArg(0));
-	string *self = static_cast<string*>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self = sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AssignBool2StringGeneric(asIScriptGeneric *gen)
-{
-	bool *a = static_cast<bool*>(gen->GetAddressOfArg(0));
-	string *self = static_cast<string*>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << (*a ? "true" : "false");
-	*self = sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AddAssignDouble2StringGeneric(asIScriptGeneric * gen)
-{
-	double * a = static_cast<double *>(gen->GetAddressOfArg(0));
-	string * self = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self += sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AddAssignFloat2StringGeneric(asIScriptGeneric * gen)
-{
-	float * a = static_cast<float *>(gen->GetAddressOfArg(0));
-	string * self = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self += sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AddAssignInt2StringGeneric(asIScriptGeneric * gen)
-{
-	asINT64 * a = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
-	string * self = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self += sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AddAssignUInt2StringGeneric(asIScriptGeneric * gen)
-{
-	asQWORD * a = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
-	string * self = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a;
-	*self += sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AddAssignBool2StringGeneric(asIScriptGeneric * gen)
-{
-	bool * a = static_cast<bool *>(gen->GetAddressOfArg(0));
-	string * self = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << (*a ? "true" : "false");
-	*self += sstr.str();
-	gen->SetReturnAddress(self);
-}
-
-static void AddString2DoubleGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	double * b = static_cast<double *>(gen->GetAddressOfArg(0));
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddString2FloatGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	float * b = static_cast<float *>(gen->GetAddressOfArg(0));
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddString2IntGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	asINT64 * b = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddString2UIntGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	asQWORD * b = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddString2BoolGeneric(asIScriptGeneric * gen)
-{
-	string * a = static_cast<string *>(gen->GetObject());
-	bool * b = static_cast<bool *>(gen->GetAddressOfArg(0));
-	std::stringstream sstr;
-	sstr << *a << (*b ? "true" : "false");
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddDouble2StringGeneric(asIScriptGeneric * gen)
-{
-	double* a = static_cast<double *>(gen->GetAddressOfArg(0));
-	string * b = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddFloat2StringGeneric(asIScriptGeneric * gen)
-{
-	float* a = static_cast<float *>(gen->GetAddressOfArg(0));
-	string * b = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddInt2StringGeneric(asIScriptGeneric * gen)
-{
-	asINT64* a = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
-	string * b = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddUInt2StringGeneric(asIScriptGeneric * gen)
-{
-	asQWORD* a = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
-	string * b = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << *a << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void AddBool2StringGeneric(asIScriptGeneric * gen)
-{
-	bool* a = static_cast<bool *>(gen->GetAddressOfArg(0));
-	string * b = static_cast<string *>(gen->GetObject());
-	std::stringstream sstr;
-	sstr << (*a ? "true" : "false") << *b;
-	std::string ret_val = sstr.str();
-	gen->SetReturnObject(&ret_val);
-}
-
-static void StringSubString_Generic(asIScriptGeneric *gen)
-{
-	// Get the arguments
-	string *str   = (string*)gen->GetObject();
-	asUINT  start = *(int*)gen->GetAddressOfArg(0);
-	int     count = *(int*)gen->GetAddressOfArg(1);
-
-	// Return the substring
-	new(gen->GetAddressOfReturnLocation()) string(StringSubString(start, count, *str));
-}
-
-void RegisterStdString_Generic(asIScriptEngine *engine)
-{
-	int r = 0;
-	UNUSED_VAR(r);
-
-	// Register the string type
-	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
-
-#if AS_USE_STRINGPOOL == 1
-	// Register the string factory
-	r = engine->RegisterStringFactory("const string &", asFUNCTION(StringFactoryGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	// Register the cleanup callback for the string pool
-	engine->SetEngineUserDataCleanupCallback(CleanupEngineStringPool, STRING_POOL);
-#else
-	// Register the string factory
-	r = engine->RegisterStringFactory("string", asFUNCTION(StringFactoryGeneric), asCALL_GENERIC); assert( r >= 0 );
-#endif
-
-	// Register the object operator overloads
-	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f()",                    asFUNCTION(ConstructStringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f(const string &in)",    asFUNCTION(CopyConstructStringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("string", asBEHAVE_DESTRUCT,   "void f()",                    asFUNCTION(DestructStringGeneric),  asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAssign(const string &in)", asFUNCTION(AssignStringGeneric),    asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(const string &in)", asFUNCTION(AddAssignStringGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "bool opEquals(const string &in) const", asFUNCTION(StringEqualsGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "int opCmp(const string &in) const", asFUNCTION(StringCmpGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(const string &in) const", asFUNCTION(StringAddGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	// Register the object methods
-	r = engine->RegisterObjectMethod("string", "uint length() const", asFUNCTION(StringLengthGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "void resize(uint)",   asFUNCTION(StringResizeGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "uint get_length() const", asFUNCTION(StringLengthGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "void set_length(uint)", asFUNCTION(StringResizeGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "bool isEmpty() const", asFUNCTION(StringIsEmptyGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	// Register the index operator, both as a mutator and as an inspector
-	r = engine->RegisterObjectMethod("string", "uint8 &opIndex(uint)", asFUNCTION(StringCharAtGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "const uint8 &opIndex(uint) const", asFUNCTION(StringCharAtGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	// Automatic conversion from values
-	r = engine->RegisterObjectMethod("string", "string &opAssign(double)", asFUNCTION(AssignDouble2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(double)", asFUNCTION(AddAssignDouble2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(double) const", asFUNCTION(AddString2DoubleGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(double) const", asFUNCTION(AddDouble2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(float)", asFUNCTION(AssignFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(float)", asFUNCTION(AddAssignFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(float) const", asFUNCTION(AddString2FloatGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(float) const", asFUNCTION(AddFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(int64)", asFUNCTION(AssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int64)", asFUNCTION(AddAssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(int64) const", asFUNCTION(AddString2IntGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(int64) const", asFUNCTION(AddInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(uint64)", asFUNCTION(AssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint64)", asFUNCTION(AddAssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(uint64) const", asFUNCTION(AddString2UIntGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint64) const", asFUNCTION(AddUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string &opAssign(bool)", asFUNCTION(AssignBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string &opAddAssign(bool)", asFUNCTION(AddAssignBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd(bool) const", asFUNCTION(AddString2BoolGeneric), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("string", "string opAdd_r(bool) const", asFUNCTION(AddBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("string", "string substr(uint start = 0, int count = -1) const", asFUNCTION(StringSubString_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findFirst(const string &in, uint start = 0) const", asFUNCTION(StringFindFirst_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findFirstOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstOf_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findFirstNotOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstNotOf_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findLast(const string &in, int start = -1) const", asFUNCTION(StringFindLast_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findLastOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastOf_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "int findLastNotOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastNotOf_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "void insert(uint pos, const string &in other)", asFUNCTION(StringInsert_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("string", "void erase(uint pos, int count = -1)", asFUNCTION(StringErase_Generic), asCALL_GENERIC); assert(r >= 0);
-
-
-	r = engine->RegisterGlobalFunction("string formatInt(int64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatInt_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("string formatUInt(uint64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatUInt_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("string formatFloat(double val, const string &in options = \"\", uint width = 0, uint precision = 0)", asFUNCTION(formatFloat_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("int64 parseInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseInt_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("uint64 parseUInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseUInt_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterGlobalFunction("double parseFloat(const string &in, uint &out byteCount = 0)", asFUNCTION(parseFloat_Generic), asCALL_GENERIC); assert(r >= 0);
-}
-
-void RegisterStdString(asIScriptEngine * engine)
-{
-	if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY"))
-		RegisterStdString_Generic(engine);
-	else
-		RegisterStdString_Native(engine);
-}
-
-END_AS_NAMESPACE
-
-
-
-
+#include "scriptstdstring.h"
+#include <assert.h> // assert()
+#include <sstream>  // std::stringstream
+#include <string.h> // strstr()
+#include <stdio.h>	// sprintf()
+#include <stdlib.h> // strtod()
+#ifndef __psp2__
+	#include <locale.h> // setlocale()
+#endif
+
+using namespace std;
+
+// This macro is used to avoid warnings about unused variables.
+// Usually where the variables are only used in debug mode.
+#define UNUSED_VAR(x) (void)(x)
+
+#ifdef AS_CAN_USE_CPP11
+// The string factory doesn't need to keep a specific order in the
+// cache, so the unordered_map is faster than the ordinary map
+#include <unordered_map>  // std::unordered_map
+BEGIN_AS_NAMESPACE
+typedef unordered_map<string, int> map_t;
+END_AS_NAMESPACE
+#else
+#include <map>      // std::map
+BEGIN_AS_NAMESPACE
+typedef map<string, int> map_t;
+END_AS_NAMESPACE
+#endif
+
+BEGIN_AS_NAMESPACE
+class CStdStringFactory : public asIStringFactory
+{
+public:
+	CStdStringFactory() {}
+	~CStdStringFactory() 
+	{
+		// The script engine must release each string 
+		// constant that it has requested
+		assert(stringCache.size() == 0);
+	}
+
+	const void *GetStringConstant(const char *data, asUINT length)
+	{
+		// The string factory might be modified from multiple 
+		// threads, so it is necessary to use a mutex.
+		asAcquireExclusiveLock();
+		
+		string str(data, length);
+		map_t::iterator it = stringCache.find(str);
+		if (it != stringCache.end())
+			it->second++;
+		else
+			it = stringCache.insert(map_t::value_type(str, 1)).first;
+
+		asReleaseExclusiveLock();
+		
+		return reinterpret_cast<const void*>(&it->first);
+	}
+
+	int  ReleaseStringConstant(const void *str)
+	{
+		if (str == 0)
+			return asERROR;
+
+		int ret = asSUCCESS;
+		
+		// The string factory might be modified from multiple 
+		// threads, so it is necessary to use a mutex.
+		asAcquireExclusiveLock();
+		
+		map_t::iterator it = stringCache.find(*reinterpret_cast<const string*>(str));
+		if (it == stringCache.end())
+			ret = asERROR;
+		else
+		{
+			it->second--;
+			if (it->second == 0)
+				stringCache.erase(it);
+		}
+		
+		asReleaseExclusiveLock();
+		
+		return ret;
+	}
+
+	int  GetRawStringData(const void *str, char *data, asUINT *length) const
+	{
+		if (str == 0)
+			return asERROR;
+
+		if (length)
+			*length = (asUINT)reinterpret_cast<const string*>(str)->length();
+
+		if (data)
+			memcpy(data, reinterpret_cast<const string*>(str)->c_str(), reinterpret_cast<const string*>(str)->length());
+
+		return asSUCCESS;
+	}
+
+	// THe access to the string cache is protected with the common mutex provided by AngelScript
+	map_t stringCache;
+};
+
+static CStdStringFactory *stringFactory = 0;
+
+// TODO: Make this public so the application can also use the string 
+//       factory and share the string constants if so desired, or to
+//       monitor the size of the string factory cache.
+CStdStringFactory *GetStdStringFactorySingleton()
+{
+	if( stringFactory == 0 )
+	{
+		// The following instance will be destroyed by the global 
+		// CStdStringFactoryCleaner instance upon application shutdown
+		stringFactory = new CStdStringFactory();
+	}
+	return stringFactory;
+}
+
+class CStdStringFactoryCleaner
+{
+public:
+	~CStdStringFactoryCleaner()
+	{
+		if (stringFactory)
+		{
+			// Only delete the string factory if the stringCache is empty
+			// If it is not empty, it means that someone might still attempt
+			// to release string constants, so if we delete the string factory
+			// the application might crash. Not deleting the cache would
+			// lead to a memory leak, but since this is only happens when the
+			// application is shutting down anyway, it is not important.
+			if (stringFactory->stringCache.empty())
+			{
+				delete stringFactory;
+				stringFactory = 0;
+			}
+		}
+	}
+};
+
+static CStdStringFactoryCleaner cleaner;
+
+
+static void ConstructString(string *thisPointer)
+{
+	new(thisPointer) string();
+}
+
+static void CopyConstructString(const string &other, string *thisPointer)
+{
+	new(thisPointer) string(other);
+}
+
+static void DestructString(string *thisPointer)
+{
+	thisPointer->~string();
+}
+
+static string &AddAssignStringToString(const string &str, string &dest)
+{
+	// We don't register the method directly because some compilers
+	// and standard libraries inline the definition, resulting in the
+	// linker being unable to find the declaration.
+	// Example: CLang/LLVM with XCode 4.3 on OSX 10.7
+	dest += str;
+	return dest;
+}
+
+// bool string::isEmpty()
+// bool string::empty() // if AS_USE_STLNAMES == 1
+static bool StringIsEmpty(const string &str)
+{
+	// We don't register the method directly because some compilers
+	// and standard libraries inline the definition, resulting in the
+	// linker being unable to find the declaration
+	// Example: CLang/LLVM with XCode 4.3 on OSX 10.7
+	return str.empty();
+}
+
+static string &AssignUInt64ToString(asQWORD i, string &dest)
+{
+	ostringstream stream;
+	stream << i;
+	dest = stream.str();
+	return dest;
+}
+
+static string &AddAssignUInt64ToString(asQWORD i, string &dest)
+{
+	ostringstream stream;
+	stream << i;
+	dest += stream.str();
+	return dest;
+}
+
+static string AddStringUInt64(const string &str, asQWORD i)
+{
+	ostringstream stream;
+	stream << i;
+	return str + stream.str();
+}
+
+static string AddInt64String(asINT64 i, const string &str)
+{
+	ostringstream stream;
+	stream << i;
+	return stream.str() + str;
+}
+
+static string &AssignInt64ToString(asINT64 i, string &dest)
+{
+	ostringstream stream;
+	stream << i;
+	dest = stream.str();
+	return dest;
+}
+
+static string &AddAssignInt64ToString(asINT64 i, string &dest)
+{
+	ostringstream stream;
+	stream << i;
+	dest += stream.str();
+	return dest;
+}
+
+static string AddStringInt64(const string &str, asINT64 i)
+{
+	ostringstream stream;
+	stream << i;
+	return str + stream.str();
+}
+
+static string AddUInt64String(asQWORD i, const string &str)
+{
+	ostringstream stream;
+	stream << i;
+	return stream.str() + str;
+}
+
+static string &AssignDoubleToString(double f, string &dest)
+{
+	ostringstream stream;
+	stream << f;
+	dest = stream.str();
+	return dest;
+}
+
+static string &AddAssignDoubleToString(double f, string &dest)
+{
+	ostringstream stream;
+	stream << f;
+	dest += stream.str();
+	return dest;
+}
+
+static string &AssignFloatToString(float f, string &dest)
+{
+	ostringstream stream;
+	stream << f;
+	dest = stream.str();
+	return dest;
+}
+
+static string &AddAssignFloatToString(float f, string &dest)
+{
+	ostringstream stream;
+	stream << f;
+	dest += stream.str();
+	return dest;
+}
+
+static string &AssignBoolToString(bool b, string &dest)
+{
+	ostringstream stream;
+	stream << (b ? "true" : "false");
+	dest = stream.str();
+	return dest;
+}
+
+static string &AddAssignBoolToString(bool b, string &dest)
+{
+	ostringstream stream;
+	stream << (b ? "true" : "false");
+	dest += stream.str();
+	return dest;
+}
+
+static string AddStringDouble(const string &str, double f)
+{
+	ostringstream stream;
+	stream << f;
+	return str + stream.str();
+}
+
+static string AddDoubleString(double f, const string &str)
+{
+	ostringstream stream;
+	stream << f;
+	return stream.str() + str;
+}
+
+static string AddStringFloat(const string &str, float f)
+{
+	ostringstream stream;
+	stream << f;
+	return str + stream.str();
+}
+
+static string AddFloatString(float f, const string &str)
+{
+	ostringstream stream;
+	stream << f;
+	return stream.str() + str;
+}
+
+static string AddStringBool(const string &str, bool b)
+{
+	ostringstream stream;
+	stream << (b ? "true" : "false");
+	return str + stream.str();
+}
+
+static string AddBoolString(bool b, const string &str)
+{
+	ostringstream stream;
+	stream << (b ? "true" : "false");
+	return stream.str() + str;
+}
+
+static char *StringCharAt(unsigned int i, string &str)
+{
+	if( i >= str.size() )
+	{
+		// Set a script exception
+		asIScriptContext *ctx = asGetActiveContext();
+		ctx->SetException("Out of range");
+
+		// Return a null pointer
+		return 0;
+	}
+
+	return &str[i];
+}
+
+// AngelScript signature:
+// int string::opCmp(const string &in) const
+static int StringCmp(const string &a, const string &b)
+{
+	int cmp = 0;
+	if( a < b ) cmp = -1;
+	else if( a > b ) cmp = 1;
+	return cmp;
+}
+
+// This function returns the index of the first position where the substring
+// exists in the input string. If the substring doesn't exist in the input
+// string -1 is returned.
+//
+// AngelScript signature:
+// int string::findFirst(const string &in sub, uint start = 0) const
+static int StringFindFirst(const string &sub, asUINT start, const string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	return (int)str.find(sub, (size_t)(start < 0 ? string::npos : start));
+}
+
+// This function returns the index of the first position where the one of the bytes in substring
+// exists in the input string. If the characters in the substring doesn't exist in the input
+// string -1 is returned.
+//
+// AngelScript signature:
+// int string::findFirstOf(const string &in sub, uint start = 0) const
+static int StringFindFirstOf(const string &sub, asUINT start, const string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	return (int)str.find_first_of(sub, (size_t)(start < 0 ? string::npos : start));
+}
+
+// This function returns the index of the last position where the one of the bytes in substring
+// exists in the input string. If the characters in the substring doesn't exist in the input
+// string -1 is returned.
+//
+// AngelScript signature:
+// int string::findLastOf(const string &in sub, uint start = -1) const
+static int StringFindLastOf(const string &sub, asUINT start, const string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	return (int)str.find_last_of(sub, (size_t)(start < 0 ? string::npos : start));
+}
+
+// This function returns the index of the first position where a byte other than those in substring
+// exists in the input string. If none is found -1 is returned.
+//
+// AngelScript signature:
+// int string::findFirstNotOf(const string &in sub, uint start = 0) const
+static int StringFindFirstNotOf(const string &sub, asUINT start, const string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	return (int)str.find_first_not_of(sub, (size_t)(start < 0 ? string::npos : start));
+}
+
+// This function returns the index of the last position where a byte other than those in substring
+// exists in the input string. If none is found -1 is returned.
+//
+// AngelScript signature:
+// int string::findLastNotOf(const string &in sub, uint start = -1) const
+static int StringFindLastNotOf(const string &sub, asUINT start, const string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	return (int)str.find_last_not_of(sub, (size_t)(start < 0 ? string::npos : start));
+}
+
+// This function returns the index of the last position where the substring
+// exists in the input string. If the substring doesn't exist in the input
+// string -1 is returned.
+//
+// AngelScript signature:
+// int string::findLast(const string &in sub, int start = -1) const
+static int StringFindLast(const string &sub, int start, const string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	return (int)str.rfind(sub, (size_t)(start < 0 ? string::npos : start));
+}
+
+// AngelScript signature:
+// void string::insert(uint pos, const string &in other)
+static void StringInsert(unsigned int pos, const string &other, string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	str.insert(pos, other);
+}
+
+// AngelScript signature:
+// void string::erase(uint pos, int count = -1)
+static void StringErase(unsigned int pos, int count, string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	str.erase(pos, (size_t)(count < 0 ? string::npos : count));
+}
+
+
+// AngelScript signature:
+// uint string::length() const
+static asUINT StringLength(const string &str)
+{
+	// We don't register the method directly because the return type changes between 32bit and 64bit platforms
+	return (asUINT)str.length();
+}
+
+
+// AngelScript signature:
+// void string::resize(uint l)
+static void StringResize(asUINT l, string &str)
+{
+	// We don't register the method directly because the argument types change between 32bit and 64bit platforms
+	str.resize(l);
+}
+
+// AngelScript signature:
+// string formatInt(int64 val, const string &in options, uint width)
+static string formatInt(asINT64 value, const string &options, asUINT width)
+{
+	bool leftJustify = options.find("l") != string::npos;
+	bool padWithZero = options.find("0") != string::npos;
+	bool alwaysSign  = options.find("+") != string::npos;
+	bool spaceOnSign = options.find(" ") != string::npos;
+	bool hexSmall    = options.find("h") != string::npos;
+	bool hexLarge    = options.find("H") != string::npos;
+
+	string fmt = "%";
+	if( leftJustify ) fmt += "-";
+	if( alwaysSign ) fmt += "+";
+	if( spaceOnSign ) fmt += " ";
+	if( padWithZero ) fmt += "0";
+
+#ifdef _WIN32
+	fmt += "*I64";
+#else
+#ifdef _LP64
+	fmt += "*l";
+#else
+	fmt += "*ll";
+#endif
+#endif
+
+	if( hexSmall ) fmt += "x";
+	else if( hexLarge ) fmt += "X";
+	else fmt += "d";
+
+	string buf;
+	buf.resize(width+30);
+#if _MSC_VER >= 1400 && !defined(__S3E__)
+	// MSVC 8.0 / 2005 or newer
+	sprintf_s(&buf[0], buf.size(), fmt.c_str(), width, value);
+#else
+	sprintf(&buf[0], fmt.c_str(), width, value);
+#endif
+	buf.resize(strlen(&buf[0]));
+
+	return buf;
+}
+
+// AngelScript signature:
+// string formatUInt(uint64 val, const string &in options, uint width)
+static string formatUInt(asQWORD value, const string &options, asUINT width)
+{
+	bool leftJustify = options.find("l") != string::npos;
+	bool padWithZero = options.find("0") != string::npos;
+	bool alwaysSign  = options.find("+") != string::npos;
+	bool spaceOnSign = options.find(" ") != string::npos;
+	bool hexSmall    = options.find("h") != string::npos;
+	bool hexLarge    = options.find("H") != string::npos;
+
+	string fmt = "%";
+	if( leftJustify ) fmt += "-";
+	if( alwaysSign ) fmt += "+";
+	if( spaceOnSign ) fmt += " ";
+	if( padWithZero ) fmt += "0";
+
+#ifdef _WIN32
+	fmt += "*I64";
+#else
+#ifdef _LP64
+	fmt += "*l";
+#else
+	fmt += "*ll";
+#endif
+#endif
+
+	if( hexSmall ) fmt += "x";
+	else if( hexLarge ) fmt += "X";
+	else fmt += "u";
+
+	string buf;
+	buf.resize(width+30);
+#if _MSC_VER >= 1400 && !defined(__S3E__)
+	// MSVC 8.0 / 2005 or newer
+	sprintf_s(&buf[0], buf.size(), fmt.c_str(), width, value);
+#else
+	sprintf(&buf[0], fmt.c_str(), width, value);
+#endif
+	buf.resize(strlen(&buf[0]));
+
+	return buf;
+}
+
+// AngelScript signature:
+// string formatFloat(double val, const string &in options, uint width, uint precision)
+static string formatFloat(double value, const string &options, asUINT width, asUINT precision)
+{
+	bool leftJustify = options.find("l") != string::npos;
+	bool padWithZero = options.find("0") != string::npos;
+	bool alwaysSign  = options.find("+") != string::npos;
+	bool spaceOnSign = options.find(" ") != string::npos;
+	bool expSmall    = options.find("e") != string::npos;
+	bool expLarge    = options.find("E") != string::npos;
+
+	string fmt = "%";
+	if( leftJustify ) fmt += "-";
+	if( alwaysSign ) fmt += "+";
+	if( spaceOnSign ) fmt += " ";
+	if( padWithZero ) fmt += "0";
+
+	fmt += "*.*";
+
+	if( expSmall ) fmt += "e";
+	else if( expLarge ) fmt += "E";
+	else fmt += "f";
+
+	string buf;
+	buf.resize(width+precision+50);
+#if _MSC_VER >= 1400 && !defined(__S3E__)
+	// MSVC 8.0 / 2005 or newer
+	sprintf_s(&buf[0], buf.size(), fmt.c_str(), width, precision, value);
+#else
+	sprintf(&buf[0], fmt.c_str(), width, precision, value);
+#endif
+	buf.resize(strlen(&buf[0]));
+
+	return buf;
+}
+
+// AngelScript signature:
+// int64 parseInt(const string &in val, uint base = 10, uint &out byteCount = 0)
+static asINT64 parseInt(const string &val, asUINT base, asUINT *byteCount)
+{
+	// Only accept base 10 and 16
+	if( base != 10 && base != 16 )
+	{
+		if( byteCount ) *byteCount = 0;
+		return 0;
+	}
+
+	const char *end = &val[0];
+
+	// Determine the sign
+	bool sign = false;
+	if( *end == '-' )
+	{
+		sign = true;
+		end++;
+	}
+	else if( *end == '+' )
+		end++;
+
+	asINT64 res = 0;
+	if( base == 10 )
+	{
+		while( *end >= '0' && *end <= '9' )
+		{
+			res *= 10;
+			res += *end++ - '0';
+		}
+	}
+	else if( base == 16 )
+	{
+		while( (*end >= '0' && *end <= '9') ||
+		       (*end >= 'a' && *end <= 'f') ||
+		       (*end >= 'A' && *end <= 'F') )
+		{
+			res *= 16;
+			if( *end >= '0' && *end <= '9' )
+				res += *end++ - '0';
+			else if( *end >= 'a' && *end <= 'f' )
+				res += *end++ - 'a' + 10;
+			else if( *end >= 'A' && *end <= 'F' )
+				res += *end++ - 'A' + 10;
+		}
+	}
+
+	if( byteCount )
+		*byteCount = asUINT(size_t(end - val.c_str()));
+
+	if( sign )
+		res = -res;
+
+	return res;
+}
+
+// AngelScript signature:
+// uint64 parseUInt(const string &in val, uint base = 10, uint &out byteCount = 0)
+static asQWORD parseUInt(const string &val, asUINT base, asUINT *byteCount)
+{
+	// Only accept base 10 and 16
+	if (base != 10 && base != 16)
+	{
+		if (byteCount) *byteCount = 0;
+		return 0;
+	}
+
+	const char *end = &val[0];
+
+	asQWORD res = 0;
+	if (base == 10)
+	{
+		while (*end >= '0' && *end <= '9')
+		{
+			res *= 10;
+			res += *end++ - '0';
+		}
+	}
+	else if (base == 16)
+	{
+		while ((*end >= '0' && *end <= '9') ||
+			(*end >= 'a' && *end <= 'f') ||
+			(*end >= 'A' && *end <= 'F'))
+		{
+			res *= 16;
+			if (*end >= '0' && *end <= '9')
+				res += *end++ - '0';
+			else if (*end >= 'a' && *end <= 'f')
+				res += *end++ - 'a' + 10;
+			else if (*end >= 'A' && *end <= 'F')
+				res += *end++ - 'A' + 10;
+		}
+	}
+
+	if (byteCount)
+		*byteCount = asUINT(size_t(end - val.c_str()));
+
+	return res;
+}
+
+// AngelScript signature:
+// double parseFloat(const string &in val, uint &out byteCount = 0)
+double parseFloat(const string &val, asUINT *byteCount)
+{
+	char *end;
+
+	// WinCE doesn't have setlocale. Some quick testing on my current platform
+	// still manages to parse the numbers such as "3.14" even if the decimal for the
+	// locale is ",".
+#if !defined(_WIN32_WCE) && !defined(ANDROID) && !defined(__psp2__)
+	// Set the locale to C so that we are guaranteed to parse the float value correctly
+	char *tmp = setlocale(LC_NUMERIC, 0);
+	string orig = tmp ? tmp : "C";
+	setlocale(LC_NUMERIC, "C");
+#endif
+
+	double res = strtod(val.c_str(), &end);
+
+#if !defined(_WIN32_WCE) && !defined(ANDROID) && !defined(__psp2__)
+	// Restore the locale
+	setlocale(LC_NUMERIC, orig.c_str());
+#endif
+
+	if( byteCount )
+		*byteCount = asUINT(size_t(end - val.c_str()));
+
+	return res;
+}
+
+// This function returns a string containing the substring of the input string
+// determined by the starting index and count of characters.
+//
+// AngelScript signature:
+// string string::substr(uint start = 0, int count = -1) const
+static string StringSubString(asUINT start, int count, const string &str)
+{
+	// Check for out-of-bounds
+	string ret;
+	if( start < str.length() && count != 0 )
+		ret = str.substr(start, (size_t)(count < 0 ? string::npos : count));
+
+	return ret;
+}
+
+// String equality comparison.
+// Returns true iff lhs is equal to rhs.
+//
+// For some reason gcc 4.7 has difficulties resolving the
+// asFUNCTIONPR(operator==, (const string &, const string &)
+// makro, so this wrapper was introduced as work around.
+static bool StringEquals(const std::string& lhs, const std::string& rhs)
+{
+	return lhs == rhs;
+}
+
+void RegisterStdString_Native(asIScriptEngine *engine)
+{
+	int r = 0;
+	UNUSED_VAR(r);
+
+	// Register the string type
+#if AS_CAN_USE_CPP11
+	// With C++11 it is possible to use asGetTypeTraits to automatically determine the correct flags to use
+	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asGetTypeTraits<string>()); assert( r >= 0 );
+#else
+	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
+#endif
+
+	r = engine->RegisterStringFactory("string", GetStdStringFactorySingleton());
+
+	// Register the object operator overloads
+	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f()",                    asFUNCTION(ConstructString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f(const string &in)",    asFUNCTION(CopyConstructString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("string", asBEHAVE_DESTRUCT,   "void f()",                    asFUNCTION(DestructString),  asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAssign(const string &in)", asMETHODPR(string, operator =, (const string&), string&), asCALL_THISCALL); assert( r >= 0 );
+	// Need to use a wrapper on Mac OS X 10.7/XCode 4.3 and CLang/LLVM, otherwise the linker fails
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(const string &in)", asFUNCTION(AddAssignStringToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+//	r = engine->RegisterObjectMethod("string", "string &opAddAssign(const string &in)", asMETHODPR(string, operator+=, (const string&), string&), asCALL_THISCALL); assert( r >= 0 );
+
+	// Need to use a wrapper for operator== otherwise gcc 4.7 fails to compile
+	r = engine->RegisterObjectMethod("string", "bool opEquals(const string &in) const", asFUNCTIONPR(StringEquals, (const string &, const string &), bool), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "int opCmp(const string &in) const", asFUNCTION(StringCmp), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(const string &in) const", asFUNCTIONPR(operator +, (const string &, const string &), string), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+
+	// The string length can be accessed through methods or through virtual property
+	// TODO: Register as size() for consistency with other types
+#if AS_USE_ACCESSORS != 1
+	r = engine->RegisterObjectMethod("string", "uint length() const", asFUNCTION(StringLength), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectMethod("string", "void resize(uint)", asFUNCTION(StringResize), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+#if AS_USE_STLNAMES != 1 && AS_USE_ACCESSORS == 1
+	// Don't register these if STL names is used, as they conflict with the method size()
+	r = engine->RegisterObjectMethod("string", "uint get_length() const property", asFUNCTION(StringLength), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "void set_length(uint) property", asFUNCTION(StringResize), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+#endif
+	// Need to use a wrapper on Mac OS X 10.7/XCode 4.3 and CLang/LLVM, otherwise the linker fails
+//	r = engine->RegisterObjectMethod("string", "bool isEmpty() const", asMETHOD(string, empty), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "bool isEmpty() const", asFUNCTION(StringIsEmpty), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	// Register the index operator, both as a mutator and as an inspector
+	// Note that we don't register the operator[] directly, as it doesn't do bounds checking
+	r = engine->RegisterObjectMethod("string", "uint8 &opIndex(uint)", asFUNCTION(StringCharAt), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "const uint8 &opIndex(uint) const", asFUNCTION(StringCharAt), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	// Automatic conversion from values
+	r = engine->RegisterObjectMethod("string", "string &opAssign(double)", asFUNCTION(AssignDoubleToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(double)", asFUNCTION(AddAssignDoubleToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(double) const", asFUNCTION(AddStringDouble), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(double) const", asFUNCTION(AddDoubleString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(float)", asFUNCTION(AssignFloatToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(float)", asFUNCTION(AddAssignFloatToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(float) const", asFUNCTION(AddStringFloat), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(float) const", asFUNCTION(AddFloatString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(int64)", asFUNCTION(AssignInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int64)", asFUNCTION(AddAssignInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(int64) const", asFUNCTION(AddStringInt64), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(int64) const", asFUNCTION(AddInt64String), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(uint64)", asFUNCTION(AssignUInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint64)", asFUNCTION(AddAssignUInt64ToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(uint64) const", asFUNCTION(AddStringUInt64), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint64) const", asFUNCTION(AddUInt64String), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(bool)", asFUNCTION(AssignBoolToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(bool)", asFUNCTION(AddAssignBoolToString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(bool) const", asFUNCTION(AddStringBool), asCALL_CDECL_OBJFIRST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(bool) const", asFUNCTION(AddBoolString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+
+	// Utilities
+	r = engine->RegisterObjectMethod("string", "string substr(uint start = 0, int count = -1) const", asFUNCTION(StringSubString), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "int findFirst(const string &in, uint start = 0) const", asFUNCTION(StringFindFirst), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "int findFirstOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findFirstNotOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstNotOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findLast(const string &in, int start = -1) const", asFUNCTION(StringFindLast), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "int findLastOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findLastNotOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastNotOf), asCALL_CDECL_OBJLAST); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "void insert(uint pos, const string &in other)", asFUNCTION(StringInsert), asCALL_CDECL_OBJLAST); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "void erase(uint pos, int count = -1)", asFUNCTION(StringErase), asCALL_CDECL_OBJLAST); assert(r >= 0);
+
+
+	r = engine->RegisterGlobalFunction("string formatInt(int64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatInt), asCALL_CDECL); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("string formatUInt(uint64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatUInt), asCALL_CDECL); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("string formatFloat(double val, const string &in options = \"\", uint width = 0, uint precision = 0)", asFUNCTION(formatFloat), asCALL_CDECL); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("int64 parseInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseInt), asCALL_CDECL); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("uint64 parseUInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseUInt), asCALL_CDECL); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("double parseFloat(const string &in, uint &out byteCount = 0)", asFUNCTION(parseFloat), asCALL_CDECL); assert(r >= 0);
+
+#if AS_USE_STLNAMES == 1
+	// Same as length
+	r = engine->RegisterObjectMethod("string", "uint size() const", asFUNCTION(StringLength), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	// Same as isEmpty
+	r = engine->RegisterObjectMethod("string", "bool empty() const", asFUNCTION(StringIsEmpty), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	// Same as findFirst
+	r = engine->RegisterObjectMethod("string", "int find(const string &in, uint start = 0) const", asFUNCTION(StringFindFirst), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	// Same as findLast
+	r = engine->RegisterObjectMethod("string", "int rfind(const string &in, int start = -1) const", asFUNCTION(StringFindLast), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+#endif
+
+	// TODO: Implement the following
+	// findAndReplace - replaces a text found in the string
+	// replaceRange - replaces a range of bytes in the string
+	// multiply/times/opMul/opMul_r - takes the string and multiplies it n times, e.g. "-".multiply(5) returns "-----"
+}
+
+static void ConstructStringGeneric(asIScriptGeneric * gen)
+{
+	new (gen->GetObject()) string();
+}
+
+static void CopyConstructStringGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetArgObject(0));
+	new (gen->GetObject()) string(*a);
+}
+
+static void DestructStringGeneric(asIScriptGeneric * gen)
+{
+	string * ptr = static_cast<string *>(gen->GetObject());
+	ptr->~string();
+}
+
+static void AssignStringGeneric(asIScriptGeneric *gen)
+{
+	string * a = static_cast<string *>(gen->GetArgObject(0));
+	string * self = static_cast<string *>(gen->GetObject());
+	*self = *a;
+	gen->SetReturnAddress(self);
+}
+
+static void AddAssignStringGeneric(asIScriptGeneric *gen)
+{
+	string * a = static_cast<string *>(gen->GetArgObject(0));
+	string * self = static_cast<string *>(gen->GetObject());
+	*self += *a;
+	gen->SetReturnAddress(self);
+}
+
+static void StringEqualsGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	string * b = static_cast<string *>(gen->GetArgAddress(0));
+	*(bool*)gen->GetAddressOfReturnLocation() = (*a == *b);
+}
+
+static void StringCmpGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	string * b = static_cast<string *>(gen->GetArgAddress(0));
+
+	int cmp = 0;
+	if( *a < *b ) cmp = -1;
+	else if( *a > *b ) cmp = 1;
+
+	*(int*)gen->GetAddressOfReturnLocation() = cmp;
+}
+
+static void StringAddGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	string * b = static_cast<string *>(gen->GetArgAddress(0));
+	string ret_val = *a + *b;
+	gen->SetReturnObject(&ret_val);
+}
+
+static void StringLengthGeneric(asIScriptGeneric * gen)
+{
+	string * self = static_cast<string *>(gen->GetObject());
+	*static_cast<asUINT *>(gen->GetAddressOfReturnLocation()) = (asUINT)self->length();
+}
+
+static void StringIsEmptyGeneric(asIScriptGeneric * gen)
+{
+	string * self = reinterpret_cast<string *>(gen->GetObject());
+	*reinterpret_cast<bool *>(gen->GetAddressOfReturnLocation()) = StringIsEmpty(*self);
+}
+
+static void StringResizeGeneric(asIScriptGeneric * gen)
+{
+	string * self = static_cast<string *>(gen->GetObject());
+	self->resize(*static_cast<asUINT *>(gen->GetAddressOfArg(0)));
+}
+
+static void StringInsert_Generic(asIScriptGeneric *gen)
+{
+	string * self = static_cast<string *>(gen->GetObject());
+	asUINT pos = gen->GetArgDWord(0);
+	string *other = reinterpret_cast<string*>(gen->GetArgAddress(1));
+	StringInsert(pos, *other, *self);
+}
+
+static void StringErase_Generic(asIScriptGeneric *gen)
+{
+	string * self = static_cast<string *>(gen->GetObject());
+	asUINT pos = gen->GetArgDWord(0);
+	int count = int(gen->GetArgDWord(1));
+	StringErase(pos, count, *self);
+}
+
+static void StringFindFirst_Generic(asIScriptGeneric * gen)
+{
+	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT start = gen->GetArgDWord(1);
+	string *self = reinterpret_cast<string *>(gen->GetObject());
+	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindFirst(*find, start, *self);
+}
+
+static void StringFindLast_Generic(asIScriptGeneric * gen)
+{
+	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT start = gen->GetArgDWord(1);
+	string *self = reinterpret_cast<string *>(gen->GetObject());
+	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindLast(*find, start, *self);
+}
+
+static void StringFindFirstOf_Generic(asIScriptGeneric * gen)
+{
+	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT start = gen->GetArgDWord(1);
+	string *self = reinterpret_cast<string *>(gen->GetObject());
+	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindFirstOf(*find, start, *self);
+}
+
+static void StringFindLastOf_Generic(asIScriptGeneric * gen)
+{
+	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT start = gen->GetArgDWord(1);
+	string *self = reinterpret_cast<string *>(gen->GetObject());
+	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindLastOf(*find, start, *self);
+}
+
+static void StringFindFirstNotOf_Generic(asIScriptGeneric * gen)
+{
+	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT start = gen->GetArgDWord(1);
+	string *self = reinterpret_cast<string *>(gen->GetObject());
+	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindFirstNotOf(*find, start, *self);
+}
+
+static void StringFindLastNotOf_Generic(asIScriptGeneric * gen)
+{
+	string *find = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT start = gen->GetArgDWord(1);
+	string *self = reinterpret_cast<string *>(gen->GetObject());
+	*reinterpret_cast<int *>(gen->GetAddressOfReturnLocation()) = StringFindLastNotOf(*find, start, *self);
+}
+
+static void formatInt_Generic(asIScriptGeneric * gen)
+{
+	asINT64 val = gen->GetArgQWord(0);
+	string *options = reinterpret_cast<string*>(gen->GetArgAddress(1));
+	asUINT width = gen->GetArgDWord(2);
+	new(gen->GetAddressOfReturnLocation()) string(formatInt(val, *options, width));
+}
+
+static void formatUInt_Generic(asIScriptGeneric * gen)
+{
+	asQWORD val = gen->GetArgQWord(0);
+	string *options = reinterpret_cast<string*>(gen->GetArgAddress(1));
+	asUINT width = gen->GetArgDWord(2);
+	new(gen->GetAddressOfReturnLocation()) string(formatUInt(val, *options, width));
+}
+
+static void formatFloat_Generic(asIScriptGeneric *gen)
+{
+	double val = gen->GetArgDouble(0);
+	string *options = reinterpret_cast<string*>(gen->GetArgAddress(1));
+	asUINT width = gen->GetArgDWord(2);
+	asUINT precision = gen->GetArgDWord(3);
+	new(gen->GetAddressOfReturnLocation()) string(formatFloat(val, *options, width, precision));
+}
+
+static void parseInt_Generic(asIScriptGeneric *gen)
+{
+	string *str = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT base = gen->GetArgDWord(1);
+	asUINT *byteCount = reinterpret_cast<asUINT*>(gen->GetArgAddress(2));
+	gen->SetReturnQWord(parseInt(*str,base,byteCount));
+}
+
+static void parseUInt_Generic(asIScriptGeneric *gen)
+{
+	string *str = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT base = gen->GetArgDWord(1);
+	asUINT *byteCount = reinterpret_cast<asUINT*>(gen->GetArgAddress(2));
+	gen->SetReturnQWord(parseUInt(*str, base, byteCount));
+}
+
+static void parseFloat_Generic(asIScriptGeneric *gen)
+{
+	string *str = reinterpret_cast<string*>(gen->GetArgAddress(0));
+	asUINT *byteCount = reinterpret_cast<asUINT*>(gen->GetArgAddress(1));
+	gen->SetReturnDouble(parseFloat(*str,byteCount));
+}
+
+static void StringCharAtGeneric(asIScriptGeneric * gen)
+{
+	unsigned int index = gen->GetArgDWord(0);
+	string * self = static_cast<string *>(gen->GetObject());
+
+	if (index >= self->size())
+	{
+		// Set a script exception
+		asIScriptContext *ctx = asGetActiveContext();
+		ctx->SetException("Out of range");
+
+		gen->SetReturnAddress(0);
+	}
+	else
+	{
+		gen->SetReturnAddress(&(self->operator [](index)));
+	}
+}
+
+static void AssignInt2StringGeneric(asIScriptGeneric *gen)
+{
+	asINT64 *a = static_cast<asINT64*>(gen->GetAddressOfArg(0));
+	string *self = static_cast<string*>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self = sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AssignUInt2StringGeneric(asIScriptGeneric *gen)
+{
+	asQWORD *a = static_cast<asQWORD*>(gen->GetAddressOfArg(0));
+	string *self = static_cast<string*>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self = sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AssignDouble2StringGeneric(asIScriptGeneric *gen)
+{
+	double *a = static_cast<double*>(gen->GetAddressOfArg(0));
+	string *self = static_cast<string*>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self = sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AssignFloat2StringGeneric(asIScriptGeneric *gen)
+{
+	float *a = static_cast<float*>(gen->GetAddressOfArg(0));
+	string *self = static_cast<string*>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self = sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AssignBool2StringGeneric(asIScriptGeneric *gen)
+{
+	bool *a = static_cast<bool*>(gen->GetAddressOfArg(0));
+	string *self = static_cast<string*>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << (*a ? "true" : "false");
+	*self = sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AddAssignDouble2StringGeneric(asIScriptGeneric * gen)
+{
+	double * a = static_cast<double *>(gen->GetAddressOfArg(0));
+	string * self = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self += sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AddAssignFloat2StringGeneric(asIScriptGeneric * gen)
+{
+	float * a = static_cast<float *>(gen->GetAddressOfArg(0));
+	string * self = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self += sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AddAssignInt2StringGeneric(asIScriptGeneric * gen)
+{
+	asINT64 * a = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
+	string * self = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self += sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AddAssignUInt2StringGeneric(asIScriptGeneric * gen)
+{
+	asQWORD * a = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
+	string * self = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a;
+	*self += sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AddAssignBool2StringGeneric(asIScriptGeneric * gen)
+{
+	bool * a = static_cast<bool *>(gen->GetAddressOfArg(0));
+	string * self = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << (*a ? "true" : "false");
+	*self += sstr.str();
+	gen->SetReturnAddress(self);
+}
+
+static void AddString2DoubleGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	double * b = static_cast<double *>(gen->GetAddressOfArg(0));
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddString2FloatGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	float * b = static_cast<float *>(gen->GetAddressOfArg(0));
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddString2IntGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	asINT64 * b = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddString2UIntGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	asQWORD * b = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddString2BoolGeneric(asIScriptGeneric * gen)
+{
+	string * a = static_cast<string *>(gen->GetObject());
+	bool * b = static_cast<bool *>(gen->GetAddressOfArg(0));
+	std::stringstream sstr;
+	sstr << *a << (*b ? "true" : "false");
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddDouble2StringGeneric(asIScriptGeneric * gen)
+{
+	double* a = static_cast<double *>(gen->GetAddressOfArg(0));
+	string * b = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddFloat2StringGeneric(asIScriptGeneric * gen)
+{
+	float* a = static_cast<float *>(gen->GetAddressOfArg(0));
+	string * b = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddInt2StringGeneric(asIScriptGeneric * gen)
+{
+	asINT64* a = static_cast<asINT64 *>(gen->GetAddressOfArg(0));
+	string * b = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddUInt2StringGeneric(asIScriptGeneric * gen)
+{
+	asQWORD* a = static_cast<asQWORD *>(gen->GetAddressOfArg(0));
+	string * b = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << *a << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void AddBool2StringGeneric(asIScriptGeneric * gen)
+{
+	bool* a = static_cast<bool *>(gen->GetAddressOfArg(0));
+	string * b = static_cast<string *>(gen->GetObject());
+	std::stringstream sstr;
+	sstr << (*a ? "true" : "false") << *b;
+	std::string ret_val = sstr.str();
+	gen->SetReturnObject(&ret_val);
+}
+
+static void StringSubString_Generic(asIScriptGeneric *gen)
+{
+	// Get the arguments
+	string *str   = (string*)gen->GetObject();
+	asUINT  start = *(int*)gen->GetAddressOfArg(0);
+	int     count = *(int*)gen->GetAddressOfArg(1);
+
+	// Return the substring
+	new(gen->GetAddressOfReturnLocation()) string(StringSubString(start, count, *str));
+}
+
+void RegisterStdString_Generic(asIScriptEngine *engine)
+{
+	int r = 0;
+	UNUSED_VAR(r);
+
+	// Register the string type
+	r = engine->RegisterObjectType("string", sizeof(string), asOBJ_VALUE | asOBJ_APP_CLASS_CDAK); assert( r >= 0 );
+
+	r = engine->RegisterStringFactory("string", GetStdStringFactorySingleton());
+
+	// Register the object operator overloads
+	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f()",                    asFUNCTION(ConstructStringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("string", asBEHAVE_CONSTRUCT,  "void f(const string &in)",    asFUNCTION(CopyConstructStringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("string", asBEHAVE_DESTRUCT,   "void f()",                    asFUNCTION(DestructStringGeneric),  asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAssign(const string &in)", asFUNCTION(AssignStringGeneric),    asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(const string &in)", asFUNCTION(AddAssignStringGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "bool opEquals(const string &in) const", asFUNCTION(StringEqualsGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "int opCmp(const string &in) const", asFUNCTION(StringCmpGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(const string &in) const", asFUNCTION(StringAddGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	// Register the object methods
+#if AS_USE_ACCESSORS != 1
+	r = engine->RegisterObjectMethod("string", "uint length() const", asFUNCTION(StringLengthGeneric), asCALL_GENERIC); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectMethod("string", "void resize(uint)",   asFUNCTION(StringResizeGeneric), asCALL_GENERIC); assert( r >= 0 );
+#if AS_USE_STLNAMES != 1 && AS_USE_ACCESSORS == 1
+	r = engine->RegisterObjectMethod("string", "uint get_length() const property", asFUNCTION(StringLengthGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "void set_length(uint) property", asFUNCTION(StringResizeGeneric), asCALL_GENERIC); assert( r >= 0 );
+#endif
+	r = engine->RegisterObjectMethod("string", "bool isEmpty() const", asFUNCTION(StringIsEmptyGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	// Register the index operator, both as a mutator and as an inspector
+	r = engine->RegisterObjectMethod("string", "uint8 &opIndex(uint)", asFUNCTION(StringCharAtGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "const uint8 &opIndex(uint) const", asFUNCTION(StringCharAtGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	// Automatic conversion from values
+	r = engine->RegisterObjectMethod("string", "string &opAssign(double)", asFUNCTION(AssignDouble2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(double)", asFUNCTION(AddAssignDouble2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(double) const", asFUNCTION(AddString2DoubleGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(double) const", asFUNCTION(AddDouble2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(float)", asFUNCTION(AssignFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(float)", asFUNCTION(AddAssignFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(float) const", asFUNCTION(AddString2FloatGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(float) const", asFUNCTION(AddFloat2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(int64)", asFUNCTION(AssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(int64)", asFUNCTION(AddAssignInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(int64) const", asFUNCTION(AddString2IntGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(int64) const", asFUNCTION(AddInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(uint64)", asFUNCTION(AssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(uint64)", asFUNCTION(AddAssignUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(uint64) const", asFUNCTION(AddString2UIntGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(uint64) const", asFUNCTION(AddUInt2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string &opAssign(bool)", asFUNCTION(AssignBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string &opAddAssign(bool)", asFUNCTION(AddAssignBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd(bool) const", asFUNCTION(AddString2BoolGeneric), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("string", "string opAdd_r(bool) const", asFUNCTION(AddBool2StringGeneric), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("string", "string substr(uint start = 0, int count = -1) const", asFUNCTION(StringSubString_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findFirst(const string &in, uint start = 0) const", asFUNCTION(StringFindFirst_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findFirstOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstOf_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findFirstNotOf(const string &in, uint start = 0) const", asFUNCTION(StringFindFirstNotOf_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findLast(const string &in, int start = -1) const", asFUNCTION(StringFindLast_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findLastOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastOf_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "int findLastNotOf(const string &in, int start = -1) const", asFUNCTION(StringFindLastNotOf_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "void insert(uint pos, const string &in other)", asFUNCTION(StringInsert_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("string", "void erase(uint pos, int count = -1)", asFUNCTION(StringErase_Generic), asCALL_GENERIC); assert(r >= 0);
+
+
+	r = engine->RegisterGlobalFunction("string formatInt(int64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatInt_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("string formatUInt(uint64 val, const string &in options = \"\", uint width = 0)", asFUNCTION(formatUInt_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("string formatFloat(double val, const string &in options = \"\", uint width = 0, uint precision = 0)", asFUNCTION(formatFloat_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("int64 parseInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseInt_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("uint64 parseUInt(const string &in, uint base = 10, uint &out byteCount = 0)", asFUNCTION(parseUInt_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterGlobalFunction("double parseFloat(const string &in, uint &out byteCount = 0)", asFUNCTION(parseFloat_Generic), asCALL_GENERIC); assert(r >= 0);
+}
+
+void RegisterStdString(asIScriptEngine * engine)
+{
+	if (strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY"))
+		RegisterStdString_Generic(engine);
+	else
+		RegisterStdString_Native(engine);
+}
+
+END_AS_NAMESPACE
+
+
+
+
diff --git a/Sources/AngelScript/addons/scriptstdstring.h b/Sources/AngelScript/add_on/scriptstdstring/scriptstdstring.h
old mode 100755
new mode 100644
similarity index 77%
rename from Sources/AngelScript/addons/scriptstdstring.h
rename to Sources/AngelScript/add_on/scriptstdstring/scriptstdstring.h
index 2041717ad..0960beba6
--- a/Sources/AngelScript/addons/scriptstdstring.h
+++ b/Sources/AngelScript/add_on/scriptstdstring/scriptstdstring.h
@@ -1,53 +1,48 @@
-//
-// Script std::string
-//
-// This function registers the std::string type with AngelScript to be used as the default string type.
-//
-// The string type is registered as a value type, thus may have performance issues if a lot of 
-// string operations are performed in the script. However, for relatively few operations, this should
-// not cause any problem for most applications.
-//
-
-#ifndef SCRIPTSTDSTRING_H
-#define SCRIPTSTDSTRING_H
-
-#ifndef ANGELSCRIPT_H 
-// Avoid having to inform include path if header is already include before
-#include "angelscript.h"
-#endif
-
-#include <string>
-
-//---------------------------
-// Compilation settings
-//
-
-// The use of the string pool can improve performance quite drastically
-// for scripts that work with a lot of literal string constants. 
-//
-//  1 = on
-//  0 = off
-
-#ifndef AS_USE_STRINGPOOL
-#define AS_USE_STRINGPOOL 1
-#endif
-
-// Sometimes it may be desired to use the same method names as used by C++ STL.
-// This may for example reduce time when converting code from script to C++ or
-// back.
-//
-//  0 = off
-//  1 = on
-
-#ifndef AS_USE_STLNAMES
-#define AS_USE_STLNAMES 0
-#endif
-
-BEGIN_AS_NAMESPACE
-
-void RegisterStdString(asIScriptEngine *engine);
-void RegisterStdStringUtils(asIScriptEngine *engine);
-
-END_AS_NAMESPACE
-
-#endif
+//
+// Script std::string
+//
+// This function registers the std::string type with AngelScript to be used as the default string type.
+//
+// The string type is registered as a value type, thus may have performance issues if a lot of 
+// string operations are performed in the script. However, for relatively few operations, this should
+// not cause any problem for most applications.
+//
+
+#ifndef SCRIPTSTDSTRING_H
+#define SCRIPTSTDSTRING_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#include <string>
+
+//---------------------------
+// Compilation settings
+//
+
+// Sometimes it may be desired to use the same method names as used by C++ STL.
+// This may for example reduce time when converting code from script to C++ or
+// back.
+//
+//  0 = off
+//  1 = on
+#ifndef AS_USE_STLNAMES
+#define AS_USE_STLNAMES 0
+#endif
+
+// Some prefer to use property accessors to get/set the length of the string
+// This option registers the accessors instead of the method length()
+#ifndef AS_USE_ACCESSORS
+#define AS_USE_ACCESSORS 0
+#endif
+
+BEGIN_AS_NAMESPACE
+
+void RegisterStdString(asIScriptEngine *engine);
+void RegisterStdStringUtils(asIScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/scriptstdstring_utils.cpp b/Sources/AngelScript/add_on/scriptstdstring/scriptstdstring_utils.cpp
old mode 100755
new mode 100644
similarity index 92%
rename from Sources/AngelScript/addons/scriptstdstring_utils.cpp
rename to Sources/AngelScript/add_on/scriptstdstring/scriptstdstring_utils.cpp
index 507dc0feb..0f900a8e6
--- a/Sources/AngelScript/addons/scriptstdstring_utils.cpp
+++ b/Sources/AngelScript/add_on/scriptstdstring/scriptstdstring_utils.cpp
@@ -1,129 +1,130 @@
-#include <assert.h>
-#include "scriptstdstring.h"
-#include "scriptarray.h"
-#include <stdio.h>
-#include <string.h>
-
-using namespace std;
-
-BEGIN_AS_NAMESPACE
-
-// This function takes an input string and splits it into parts by looking
-// for a specified delimiter. Example:
-//
-// string str = "A|B||D";
-// array<string>@ array = str.split("|");
-//
-// The resulting array has the following elements:
-//
-// {"A", "B", "", "D"}
-//
-// AngelScript signature:
-// array<string>@ string::split(const string &in delim) const
-static CScriptArray *StringSplit(const string &delim, const string &str)
-{
-	// Obtain a pointer to the engine
-	asIScriptContext *ctx = asGetActiveContext();
-	asIScriptEngine *engine = ctx->GetEngine();
-
-	// TODO: This should only be done once
-	// TODO: This assumes that CScriptArray was already registered
-	asITypeInfo *arrayType = engine->GetTypeInfoByDecl("array<string>");
-
-	// Create the array object
-	CScriptArray *array = CScriptArray::Create(arrayType);
-
-	// Find the existence of the delimiter in the input string
-	int pos = 0, prev = 0, count = 0;
-	while( (pos = (int)str.find(delim, prev)) != (int)string::npos )
-	{
-		// Add the part to the array
-		array->Resize(array->GetSize()+1);
-		((string*)array->At(count))->assign(&str[prev], pos-prev);
-
-		// Find the next part
-		count++;
-		prev = pos + (int)delim.length();
-	}
-
-	// Add the remaining part
-	array->Resize(array->GetSize()+1);
-	((string*)array->At(count))->assign(&str[prev]);
-
-	return array;
-}
-
-static void StringSplit_Generic(asIScriptGeneric *gen)
-{
-	// Get the arguments
-	string *str   = (string*)gen->GetObject();
-	string *delim = *(string**)gen->GetAddressOfArg(0);
-
-	// Return the array by handle
-	*(CScriptArray**)gen->GetAddressOfReturnLocation() = StringSplit(*delim, *str);
-}
-
-
-
-// This function takes as input an array of string handles as well as a
-// delimiter and concatenates the array elements into one delimited string.
-// Example:
-//
-// array<string> array = {"A", "B", "", "D"};
-// string str = join(array, "|");
-//
-// The resulting string is:
-//
-// "A|B||D"
-//
-// AngelScript signature:
-// string join(const array<string> &in array, const string &in delim)
-static string StringJoin(const CScriptArray &array, const string &delim)
-{
-	// Create the new string
-	string str = "";
-	if( array.GetSize() )
-	{
-		int n;
-		for( n = 0; n < (int)array.GetSize() - 1; n++ )
-		{
-			str += *(string*)array.At(n);
-			str += delim;
-		}
-
-		// Add the last part
-		str += *(string*)array.At(n);
-	}
-
-	return str;
-}
-
-static void StringJoin_Generic(asIScriptGeneric *gen)
-{
-	// Get the arguments
-	CScriptArray  *array = *(CScriptArray**)gen->GetAddressOfArg(0);
-	string *delim = *(string**)gen->GetAddressOfArg(1);
-
-	// Return the string
-	new(gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim));
-}
-
-// This is where the utility functions are registered.
-// The string type must have been registered first.
-void RegisterStdStringUtils(asIScriptEngine *engine)
-{
-	int r;
-
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
-	{
-		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
-		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
-	}
-	else
-	{
-		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
-		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
-	}
-}
-
-END_AS_NAMESPACE
+#include <assert.h>
+#include "scriptstdstring.h"
+#include "../scriptarray/scriptarray.h"
+#include <stdio.h>
+#include <string.h>
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+// This function takes an input string and splits it into parts by looking
+// for a specified delimiter. Example:
+//
+// string str = "A|B||D";
+// array<string>@ array = str.split("|");
+//
+// The resulting array has the following elements:
+//
+// {"A", "B", "", "D"}
+//
+// AngelScript signature:
+// array<string>@ string::split(const string &in delim) const
+static CScriptArray *StringSplit(const string &delim, const string &str)
+{
+	// Obtain a pointer to the engine
+	asIScriptContext *ctx = asGetActiveContext();
+	asIScriptEngine *engine = ctx->GetEngine();
+
+	// TODO: This should only be done once
+	// TODO: This assumes that CScriptArray was already registered
+	asITypeInfo *arrayType = engine->GetTypeInfoByDecl("array<string>");
+
+	// Create the array object
+	CScriptArray *array = CScriptArray::Create(arrayType);
+
+	// Find the existence of the delimiter in the input string
+	size_t pos = 0, prev = 0;
+	asUINT count = 0;
+	while( (pos = str.find(delim, prev)) != string::npos )
+	{
+		// Add the part to the array
+		array->Resize(array->GetSize()+1);
+		((string*)array->At(count))->assign(&str[prev], pos-prev);
+
+		// Find the next part
+		count++;
+		prev = pos + delim.length();
+	}
+
+	// Add the remaining part
+	array->Resize(array->GetSize()+1);
+	((string*)array->At(count))->assign(&str[prev]);
+
+	return array;
+}
+
+static void StringSplit_Generic(asIScriptGeneric *gen)
+{
+	// Get the arguments
+	string *str   = (string*)gen->GetObject();
+	string *delim = *(string**)gen->GetAddressOfArg(0);
+
+	// Return the array by handle
+	*(CScriptArray**)gen->GetAddressOfReturnLocation() = StringSplit(*delim, *str);
+}
+
+
+
+// This function takes as input an array of string handles as well as a
+// delimiter and concatenates the array elements into one delimited string.
+// Example:
+//
+// array<string> array = {"A", "B", "", "D"};
+// string str = join(array, "|");
+//
+// The resulting string is:
+//
+// "A|B||D"
+//
+// AngelScript signature:
+// string join(const array<string> &in array, const string &in delim)
+static string StringJoin(const CScriptArray &array, const string &delim)
+{
+	// Create the new string
+	string str = "";
+	if( array.GetSize() )
+	{
+		int n;
+		for( n = 0; n < (int)array.GetSize() - 1; n++ )
+		{
+			str += *(string*)array.At(n);
+			str += delim;
+		}
+
+		// Add the last part
+		str += *(string*)array.At(n);
+	}
+
+	return str;
+}
+
+static void StringJoin_Generic(asIScriptGeneric *gen)
+{
+	// Get the arguments
+	CScriptArray  *array = *(CScriptArray**)gen->GetAddressOfArg(0);
+	string *delim = *(string**)gen->GetAddressOfArg(1);
+
+	// Return the string
+	new(gen->GetAddressOfReturnLocation()) string(StringJoin(*array, *delim));
+}
+
+// This is where the utility functions are registered.
+// The string type must have been registered first.
+void RegisterStdStringUtils(asIScriptEngine *engine)
+{
+	int r;
+
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+	{
+		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit_Generic), asCALL_GENERIC); assert(r >= 0);
+		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin_Generic), asCALL_GENERIC); assert(r >= 0);
+	}
+	else
+	{
+		r = engine->RegisterObjectMethod("string", "array<string>@ split(const string &in) const", asFUNCTION(StringSplit), asCALL_CDECL_OBJLAST); assert(r >= 0);
+		r = engine->RegisterGlobalFunction("string join(const array<string> &in, const string &in)", asFUNCTION(StringJoin), asCALL_CDECL); assert(r >= 0);
+	}
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/serializer/serializer.cpp b/Sources/AngelScript/add_on/serializer/serializer.cpp
new file mode 100644
index 000000000..a359fcddc
--- /dev/null
+++ b/Sources/AngelScript/add_on/serializer/serializer.cpp
@@ -0,0 +1,548 @@
+//
+// CSerializer
+//
+// This code was based on the CScriptReloader written by FDsagizi
+// http://www.gamedev.net/topic/604890-dynamic-reloading-script/
+//
+
+#include <assert.h>
+#include <string.h> // strstr
+#include <stdio.h>  // sprintf
+#include "serializer.h"
+
+using namespace std;
+
+BEGIN_AS_NAMESPACE
+
+///////////////////////////////////////////////////////////////////////////////////
+
+CSerializer::CSerializer()
+{
+	m_engine = 0;
+}
+
+CSerializer::~CSerializer()
+{
+	// Extra objects need to be released, since they are not stored in 
+	// the module and we cannot rely on the application releasing them
+	for( size_t i = 0; i < m_extraObjects.size(); i++ )
+	{
+		SExtraObject &o = m_extraObjects[i];
+		for( size_t i2 = 0; i2 < m_root.m_children.size(); i2++ )
+		{
+			if( m_root.m_children[i2]->m_originalPtr == o.originalObject && m_root.m_children[i2]->m_restorePtr )
+				reinterpret_cast<asIScriptObject*>(m_root.m_children[i2]->m_restorePtr)->Release();
+		}
+	}
+
+	// Clean the serialized values before we remove the user types
+	m_root.Uninit();
+
+	// Delete the user types
+	std::map<std::string, CUserType*>::iterator it;
+	for( it = m_userTypes.begin(); it != m_userTypes.end(); it++  )
+		delete it->second;
+
+	if( m_engine )
+		m_engine->Release();
+}
+
+void CSerializer::AddUserType(CUserType *ref, const std::string &name)
+{
+	m_userTypes[name] = ref;
+}
+
+int CSerializer::Store(asIScriptModule *mod)
+{
+	m_mod = mod;
+
+	// The engine must not be destroyed before we're completed, so we'll hold on to a reference
+	mod->GetEngine()->AddRef();
+	if( m_engine ) m_engine->Release();
+	m_engine = mod->GetEngine();
+
+	m_root.m_serializer = this;
+
+	// First store global variables
+	asUINT i;
+	for( i = 0; i < mod->GetGlobalVarCount(); i++ )
+	{
+		const char *name, *nameSpace;
+		int typeId;
+		mod->GetGlobalVar(i, &name, &nameSpace, &typeId);
+		m_root.m_children.push_back(new CSerializedValue(&m_root, name, nameSpace, mod->GetAddressOfGlobalVar(i), typeId));
+	}
+
+	// Second store extra objects
+	for( i = 0; i < m_extraObjects.size(); i++ )
+		m_root.m_children.push_back(new CSerializedValue(&m_root, "", "", m_extraObjects[i].originalObject, m_extraObjects[i].originalTypeId));
+
+	// For the handles that were stored, we need to substitute the stored pointer
+	// that is still pointing to the original object to an internal reference so
+	// it can be restored later on.
+	m_root.ReplaceHandles();
+
+	return 0;
+}
+
+// Retrieve all global variables after reload script.
+int CSerializer::Restore(asIScriptModule *mod)
+{
+	m_mod = mod;
+
+	// The engine must not be destroyed before we're completed, so we'll hold on to a reference
+	mod->GetEngine()->AddRef();
+	if( m_engine ) m_engine->Release();
+	m_engine = mod->GetEngine();
+
+	// First restore extra objects, i.e. the ones that are not directly seen from the module's global variables
+	asUINT i;
+	for( i = 0; i < m_extraObjects.size(); i++ )
+	{
+		SExtraObject &o = m_extraObjects[i];
+		asITypeInfo *type = m_mod->GetTypeInfoByName( o.originalClassName.c_str() );
+		if( type )
+		{
+			for( size_t i2 = 0; i2 < m_root.m_children.size(); i2++ )
+			{
+				if( m_root.m_children[i2]->m_originalPtr == o.originalObject )
+				{
+					// Create a new script object, but don't call its constructor as we will initialize the members.
+					// Calling the constructor may have unwanted side effects if for example the constructor changes
+					// any outside entities, such as setting global variables to point to new objects, etc.
+					void *newPtr = m_engine->CreateUninitializedScriptObject( type );
+					m_root.m_children[i2]->Restore( newPtr, type->GetTypeId() ); 
+				}
+			}
+		}
+	}
+
+	// Second restore the global variables
+	asUINT varCount = mod->GetGlobalVarCount();
+	for( i = 0; i < varCount; i++ )
+	{
+		const char *name, *nameSpace;
+		int typeId;
+		mod->GetGlobalVar(i, &name, &nameSpace, &typeId);
+
+		CSerializedValue *v = m_root.FindByName(name, nameSpace);
+		if( v )
+			v->Restore(mod->GetAddressOfGlobalVar(i), typeId);
+	}
+
+	// The handles that were restored needs to be 
+	// updated to point to their final objects.
+	m_root.RestoreHandles();
+
+	return 0;
+}
+
+void *CSerializer::GetPointerToRestoredObject(void *ptr)
+{
+	return m_root.GetPointerToRestoredObject( ptr );
+}
+
+void CSerializer::AddExtraObjectToStore( asIScriptObject *object )
+{
+	if( !object )
+		return;
+
+	// Check if the object hasn't been included already
+	for( size_t i=0; i < m_extraObjects.size(); i++ )
+		if( m_extraObjects[i].originalObject == object )
+			return;
+
+	SExtraObject o;
+	o.originalObject    = object;
+	o.originalClassName = object->GetObjectType()->GetName();
+	o.originalTypeId    = object->GetTypeId();
+
+	m_extraObjects.push_back( o );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////
+
+CSerializedValue::CSerializedValue()
+{
+	Init();
+}
+
+CSerializedValue::CSerializedValue(CSerializedValue *parent, const std::string &name, const std::string &nameSpace, void *ref, int typeId) 
+{
+	Init();
+
+	m_name       = name;
+	m_nameSpace  = nameSpace;
+	m_serializer = parent->m_serializer;
+	Store(ref, typeId);
+}
+
+void CSerializedValue::Init()
+{
+	m_handlePtr   = 0;
+	m_restorePtr  = 0;
+	m_typeId      = 0;
+	m_isInit      = false;
+	m_serializer  = 0;
+	m_userData    = 0;
+	m_originalPtr = 0;
+}
+
+void CSerializedValue::Uninit()
+{
+	m_isInit = false;
+
+	ClearChildren();
+
+	if( m_userData )
+	{
+		CUserType *type = m_serializer->m_userTypes[m_typeName];
+		if( type )
+			type->CleanupUserData(this);
+		m_userData = 0;
+	}
+}
+
+void CSerializedValue::ClearChildren()
+{
+	// If this value is for an object handle that created an object during the restore
+	// then it is necessary to release the handle here, so we won't get a memory leak
+	if( (m_typeId & asTYPEID_OBJHANDLE) && m_children.size() == 1 && m_children[0]->m_restorePtr )
+	{
+		m_serializer->m_engine->ReleaseScriptObject(m_children[0]->m_restorePtr, m_serializer->m_engine->GetTypeInfoById(m_children[0]->m_typeId));
+	}
+
+	for( size_t n = 0; n < m_children.size(); n++ )
+		delete m_children[n];
+	m_children.clear();
+}
+
+CSerializedValue::~CSerializedValue()
+{
+	Uninit();
+}
+
+CSerializedValue *CSerializedValue::FindByName(const std::string &name, const std::string &nameSpace)
+{
+	for( size_t i = 0; i < m_children.size(); i++ )
+		if( m_children[i]->m_name      == name &&
+			m_children[i]->m_nameSpace == nameSpace )
+			return m_children[i];
+
+	return 0;
+}
+
+void  CSerializedValue::GetAllPointersOfChildren(std::vector<void*> *ptrs)
+{
+	ptrs->push_back(m_originalPtr);
+
+	for( size_t i = 0; i < m_children.size(); ++i )
+		m_children[i]->GetAllPointersOfChildren(ptrs);
+}
+
+CSerializedValue *CSerializedValue::FindByPtr(void *ptr)
+{
+	if( m_originalPtr == ptr )
+		return this;
+
+	for( size_t i = 0; i < m_children.size(); i++ )
+	{
+		CSerializedValue *find = m_children[i]->FindByPtr(ptr);
+		if( find )
+			return find;
+	}
+
+	return 0;
+}
+
+void *CSerializedValue::GetPointerToRestoredObject(void *ptr)
+{
+	if( m_originalPtr == ptr )
+		return m_restorePtr;
+
+	for( size_t i = 0; i < m_children.size(); ++i )
+	{
+		void *ret = m_children[i]->GetPointerToRestoredObject(ptr);
+		if( ret )
+			return ret;
+	}
+
+	return 0;
+}
+
+// find variable by ptr but looking only at those in the references, which will create a new object
+CSerializedValue *CSerializedValue::FindByPtrInHandles(void *ptr)
+{
+	// if this handle created object
+	if( (m_typeId & asTYPEID_OBJHANDLE) && m_children.size() == 1 )
+	{
+		if( m_children[0]->m_originalPtr == ptr )
+			return this;
+	}
+
+	if( !(m_typeId & asTYPEID_OBJHANDLE) )
+	{
+		for( size_t i = 0; i < m_children.size(); i++ )
+		{
+			CSerializedValue *find = m_children[i]->FindByPtrInHandles(ptr);
+			if( find )
+				return find;
+		}
+	}
+
+	return 0;
+}
+
+void CSerializedValue::Store(void *ref, int typeId)
+{
+	m_isInit = true;
+	SetType(typeId);
+	m_originalPtr = ref;
+
+	if( m_typeId & asTYPEID_OBJHANDLE )
+	{
+		m_handlePtr = *(void**)ref;
+	}
+	else if( m_typeId & asTYPEID_SCRIPTOBJECT )
+	{
+		asIScriptObject *obj = (asIScriptObject *)ref;
+		asITypeInfo *type = obj->GetObjectType();
+		SetType(type->GetTypeId());
+
+		// Store children 
+		for( asUINT i = 0; i < type->GetPropertyCount(); i++ )
+		{	
+			int childId;
+			const char *childName;
+			type->GetProperty(i, &childName, &childId);
+
+			m_children.push_back(new CSerializedValue(this, childName, "", obj->GetAddressOfProperty(i), childId));
+		}	
+	}
+	else
+	{
+		int size = m_serializer->m_engine->GetSizeOfPrimitiveType(m_typeId);
+		
+		if( size == 0 )
+		{
+			// if it is user type( string, array, etc ... )
+			if( m_serializer->m_userTypes[m_typeName] )
+				m_serializer->m_userTypes[m_typeName]->Store(this, m_originalPtr);
+			else
+			{
+				// POD-types can be stored without need for user type
+				asITypeInfo *type = GetType();
+				if( type && (type->GetFlags() & asOBJ_POD) )
+					size = GetType()->GetSize();
+
+				// It is not necessary to report an error here if it is not a POD-type as that will be done when restoring
+			}
+		}
+
+		if( size )
+		{
+			m_mem.resize(size);
+			memcpy(&m_mem[0], ref, size);
+		}
+	}
+}
+
+void CSerializedValue::Restore(void *ref, int typeId)
+{
+	if( !this || !m_isInit || !ref )
+		return;
+
+	// Verify that the stored type matched the new type of the value being restored
+	if( typeId <= asTYPEID_DOUBLE && typeId != m_typeId ) return; // TODO: We may try to do a type conversion for primitives
+	if( (typeId & ~asTYPEID_MASK_SEQNBR) ^ (m_typeId & ~asTYPEID_MASK_SEQNBR) ) return;
+	asITypeInfo *type = m_serializer->m_engine->GetTypeInfoById(typeId);
+	if( type && m_typeName != type->GetName() ) return;
+
+	// Set the new pointer and type
+	m_restorePtr = ref;
+	SetType(typeId);
+
+	// Restore the value
+	if( m_typeId & asTYPEID_OBJHANDLE )
+	{
+		// if need create objects
+		if( m_children.size() == 1 )
+		{
+			asITypeInfo *ctype = m_children[0]->GetType();
+
+			if( ctype->GetFactoryCount() == 0 )
+			{
+				// There are no factories, so assume the same pointer is going to be used
+				m_children[0]->m_restorePtr = m_handlePtr;
+
+				// Increase the refCount for the object as it will be released upon clean-up
+				m_serializer->m_engine->AddRefScriptObject(m_handlePtr, ctype);
+			}
+			else
+			{
+				// Create a new script object, but don't call its constructor as we will initialize the members. 
+				// Calling the constructor may have unwanted side effects if for example the constructor changes
+				// any outside entities, such as setting global variables to point to new objects, etc.
+				void *newObject = m_serializer->m_engine->CreateUninitializedScriptObject(ctype);
+				m_children[0]->Restore(newObject, ctype->GetTypeId());
+			}
+		}
+	}
+	else if( m_typeId & asTYPEID_SCRIPTOBJECT )
+	{
+		asIScriptObject *obj = (asIScriptObject *)ref;
+
+		// Retrieve children
+		for( asUINT i = 0; i < type->GetPropertyCount() ; i++ )
+		{	
+			const char *nameProperty;
+			int ptypeId;
+			type->GetProperty(i, &nameProperty, &ptypeId);
+			
+			CSerializedValue *var = FindByName(nameProperty, "");
+			if( var )
+				var->Restore(obj->GetAddressOfProperty(i), ptypeId);
+		}
+	}
+	else
+	{
+		if( m_mem.size() )
+		{
+			// POD values can be restored with direct copy
+			memcpy(ref, &m_mem[0], m_mem.size());
+		}
+		else if( m_serializer->m_userTypes[m_typeName] )
+		{
+			// user type restore
+			m_serializer->m_userTypes[m_typeName]->Restore(this, m_restorePtr);
+		}
+		else
+		{
+			std::string str = "Cannot restore type '";
+			str += type->GetName();
+			str += "'";
+			m_serializer->m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.c_str());
+		}
+	}
+}
+
+void CSerializedValue::CancelDuplicates(CSerializedValue *from)
+{
+	std::vector<void*> ptrs;
+	from->GetAllPointersOfChildren(&ptrs);
+
+	for( size_t i = 0; i < ptrs.size(); ++i )
+	{
+		CSerializedValue *find = m_serializer->m_root.FindByPtrInHandles(ptrs[i]);
+
+		while( find )
+		{
+			// cancel create object
+			find->ClearChildren();
+
+			// Find next link to this ptr
+			find = m_serializer->m_root.FindByPtrInHandles(ptrs[i]);
+		}
+	}
+}
+
+void CSerializedValue::ReplaceHandles()
+{
+	if( m_handlePtr )
+	{
+		// Find the object that the handle is referring to
+		CSerializedValue *handle_to = m_serializer->m_root.FindByPtr(m_handlePtr);
+		
+		// If the object hasn't been stored yet...
+		if( handle_to == 0 )
+		{
+			// Store the object now
+			asITypeInfo *type = GetType();
+			CSerializedValue *need_create = new CSerializedValue(this, m_name, m_nameSpace, m_handlePtr, type->GetTypeId()); 
+
+			// Make sure all other handles that point to the same object 
+			// are updated, so we don't end up creating duplicates 
+			CancelDuplicates(need_create);
+
+			m_children.push_back(need_create);
+		}
+	}
+
+	// Replace the handles in the children too
+	for( size_t i = 0; i < m_children.size(); ++i )
+		m_children[i]->ReplaceHandles();
+}
+
+void CSerializedValue::RestoreHandles()
+{
+	if( m_typeId & asTYPEID_OBJHANDLE )
+	{
+		if( m_handlePtr )
+		{
+			// Find the object the handle is supposed to point to
+			CSerializedValue *handleTo = m_serializer->m_root.FindByPtr(m_handlePtr);
+
+			if( m_restorePtr && handleTo && handleTo->m_restorePtr )
+			{
+				asITypeInfo *type = m_serializer->m_engine->GetTypeInfoById(m_typeId);
+
+				// If the handle is already pointing to something it must be released first
+				if( *(void**)m_restorePtr )
+					m_serializer->m_engine->ReleaseScriptObject(*(void**)m_restorePtr, type);
+
+				// Update the internal pointer
+				*(void**)m_restorePtr = handleTo->m_restorePtr;
+
+				// Increase the reference
+				m_serializer->m_engine->AddRefScriptObject(handleTo->m_restorePtr, type);
+			}
+		}
+		else
+		{
+			// If the handle is pointing to something, we must release it to restore the null pointer
+			if( m_restorePtr && *(void**)m_restorePtr )
+			{
+				m_serializer->m_engine->ReleaseScriptObject(*(void**)m_restorePtr, m_serializer->m_engine->GetTypeInfoById(m_typeId));
+				*(void**)m_restorePtr = 0;
+			}
+		}
+	}
+
+	// Do the same for the children
+	for( size_t i = 0; i < m_children.size(); ++i )
+		m_children[i]->RestoreHandles();
+}
+
+void CSerializedValue::SetType(int typeId)
+{
+	m_typeId = typeId;
+
+	asITypeInfo *type = m_serializer->m_engine->GetTypeInfoById(typeId);
+
+	if( type )
+		m_typeName = type->GetName();
+}
+
+asITypeInfo *CSerializedValue::GetType()
+{
+	if( !m_typeName.empty() )
+	{
+		int newTypeId = m_serializer->m_mod->GetTypeIdByDecl(m_typeName.c_str());
+		return m_serializer->m_engine->GetTypeInfoById(newTypeId);
+	}	
+
+	return 0;
+}
+
+void CSerializedValue::SetUserData(void *data)
+{
+	m_userData = data;
+}
+
+void *CSerializedValue::GetUserData()
+{
+	return m_userData;
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/add_on/serializer/serializer.h b/Sources/AngelScript/add_on/serializer/serializer.h
new file mode 100644
index 000000000..2d91cbe81
--- /dev/null
+++ b/Sources/AngelScript/add_on/serializer/serializer.h
@@ -0,0 +1,193 @@
+//
+// CSerializer
+//
+// This code was based on the CScriptReloader written by FDsagizi
+// http://www.gamedev.net/topic/604890-dynamic-reloading-script/
+//
+
+#ifndef SERIALIZER_H
+#define SERIALIZER_H
+
+#ifndef ANGELSCRIPT_H 
+// Avoid having to inform include path if header is already include before
+#include <angelscript.h>
+#endif
+
+#include <vector>
+#include <string>
+#include <map>
+
+BEGIN_AS_NAMESPACE
+
+class CSerializer;
+class CSerializedValue;
+
+// Need for register user types objects
+// string, any, array... for all object
+// user ref type.
+struct CUserType
+{
+	virtual ~CUserType() {};
+	virtual void Store(CSerializedValue *val, void *ptr) = 0;
+	virtual void Restore(CSerializedValue *val, void *ptr) = 0;
+	virtual void CleanupUserData(CSerializedValue * /*val*/) {}
+};
+
+
+class CSerializedValue
+{
+public:
+	CSerializedValue();
+	CSerializedValue(CSerializedValue *parent, const std::string &name, const std::string &nameSpace, void *ref, int typeId);
+	~CSerializedValue();
+
+	// Save the object and its children
+	void Store(void *ref, int refTypeId);
+
+	// Restore the object and its children
+	void Restore(void *ref, int refTypeId);
+
+	// Set type of this var
+	void SetType(int typeId);
+
+	// Returns the object type for non-primitives
+	asITypeInfo *GetType();
+
+	// Get child by name variable
+	CSerializedValue *FindByName(const std::string &name, const std::string &nameSpace);
+
+	// Find variable by ptr
+	CSerializedValue *FindByPtr(void *ptr);
+
+	// User data
+	void *GetUserData();
+	void  SetUserData(void *data);
+
+	// Children, e.g. properties of a script class, or elements 
+	// of an array, or object pointed to by a handle unless it 
+	// is already a variable)
+	std::vector<CSerializedValue*> m_children;
+
+protected:
+	friend class CSerializer;
+
+	void Init();
+	void Uninit();
+
+	// you first need to save all the objects before you can save references to objects
+	void ReplaceHandles();
+
+	// After the objects has been restored, the handles needs to 
+	// be updated to point to the right objects
+	void RestoreHandles(); 
+
+	// Recursively get all ptrs of the children
+	void  GetAllPointersOfChildren(std::vector<void*> *ptrs);
+
+	// may be that the two references refer to the same variable. 
+	// But this variable is not available in the global list. 
+	// According to this reference will be restores it. 
+	// And so two links are not created 2 variables, 
+	// it is necessary to cancel the creation of one of them.
+	void CancelDuplicates(CSerializedValue *from);
+
+	// Find variable by ptr but looking only at those in the references, which will create a new object
+	CSerializedValue *FindByPtrInHandles(void *ptr);
+
+	// ptr  - is a handle to class
+	void *GetPointerToRestoredObject(void *ptr);
+
+	// Cleanup children
+	void ClearChildren();
+
+	// The serializer object
+	CSerializer *m_serializer;
+
+	// The user data can be used by CUserType to store extra information
+	void *m_userData;
+
+	// The type id of the stored value
+	int m_typeId;
+
+	// For non-primitives the typeId may change if the module is reloaded so 
+	// it is necessary to store the type name to determine the new type id
+	std::string m_typeName;
+	
+	// Name of variable or property
+	std::string m_name;
+	std::string m_nameSpace;
+
+	// Is initialized
+	bool m_isInit;
+
+	// 'this' pointer to variable. 
+	// While storing, this points to the actual variable that was stored. 
+	// While restoring, it is just a unique identifier.
+	void *m_originalPtr;
+
+	// where handle references
+	// While storing, this points to the actual object.
+	// While restoring, it is just a unique identifier.
+	void *m_handlePtr;
+
+	// new address object, ie address the restoration
+	// While storing this isn't used.
+	// While restoring it will point to the actual variable/object that is restored.
+	void *m_restorePtr;
+
+	// Serialized data for primitives
+	std::vector<char> m_mem;
+};
+
+
+// This class keeps a list of variables, then restores them after the script is rebuilt.
+// But you have to be careful with the change of signature in classes, or 
+// changing the types of objects. You can remove or add variables, functions, 
+// methods, but you can not (yet) change the type of variables. 
+//
+// You also need to understand that after a rebuild you should get  
+// new functions and typeids from the module.
+class CSerializer
+{
+public:
+	CSerializer();
+	~CSerializer();
+	
+	// Add implementation for serializing user types
+	void AddUserType(CUserType *ref, const std::string &name);
+
+	// Store all global variables in the module
+	int Store(asIScriptModule *mod);
+
+	// Restore all global variables after reloading script
+	int Restore(asIScriptModule *mod);
+
+	// Store extra objects that are not seen from the module's global variables
+	void AddExtraObjectToStore(asIScriptObject *object);
+
+	// Return new pointer to restored object
+	void *GetPointerToRestoredObject(void *originalObject);
+
+protected:
+	friend class CSerializedValue;
+
+	CSerializedValue  m_root;
+	asIScriptEngine  *m_engine;
+	asIScriptModule  *m_mod;
+
+	std::map<std::string, CUserType*> m_userTypes;
+
+	struct SExtraObject
+	{
+		asIScriptObject *originalObject;
+		std::string      originalClassName;
+		int              originalTypeId;
+	};
+
+	std::vector<SExtraObject> m_extraObjects;
+};
+
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/addons/weakref.cpp b/Sources/AngelScript/add_on/weakref/weakref.cpp
old mode 100755
new mode 100644
similarity index 85%
rename from Sources/AngelScript/addons/weakref.cpp
rename to Sources/AngelScript/add_on/weakref/weakref.cpp
index 74244ca25..7d82a1547
--- a/Sources/AngelScript/addons/weakref.cpp
+++ b/Sources/AngelScript/add_on/weakref/weakref.cpp
@@ -1,371 +1,377 @@
-
-// The CScriptWeakRef class was originally implemented by vroad in March 2013
-
-#include "weakref.h"
-#include <new>
-#include <assert.h>
-#include <string.h> // strstr()
-
-BEGIN_AS_NAMESPACE
-
-static void ScriptWeakRefConstruct(asITypeInfo *type, void *mem)
-{
-	new(mem) CScriptWeakRef(type);
-}
-
-static void ScriptWeakRefConstruct2(asITypeInfo *type, void *ref, void *mem)
-{
-	new(mem) CScriptWeakRef(ref, type);
-
-	// It's possible the constructor raised a script exception, in which case we
-	// need to call the destructor in order to cleanup the memory before returning
-	asIScriptContext *ctx = asGetActiveContext();
-	if( ctx && ctx->GetState() == asEXECUTION_EXCEPTION )
-		reinterpret_cast<CScriptWeakRef*>(mem)->~CScriptWeakRef();
-}
-
-static void ScriptWeakRefDestruct(CScriptWeakRef *obj)
-{
-	obj->~CScriptWeakRef();
-}
-
-static bool ScriptWeakRefTemplateCallback(asITypeInfo *ti, bool &/*dontGarbageCollect*/)
-{
-	asITypeInfo *subType = ti->GetSubType();
-
-	// Weak references only work for reference types
-	if( subType == 0 ) return false;
-	if( !(subType->GetFlags() & asOBJ_REF) ) return false;
-
-	// The subtype shouldn't be a handle
-	if( ti->GetSubTypeId() & asTYPEID_OBJHANDLE )
-		return false;
-
-	// Make sure the type really supports weak references
-	asUINT cnt = subType->GetBehaviourCount();
-	for( asUINT n = 0; n < cnt; n++ )
-	{
-		asEBehaviours beh;
-		subType->GetBehaviourByIndex(n, &beh);
-		if( beh == asBEHAVE_GET_WEAKREF_FLAG )
-			return true;
-	}
-
-	ti->GetEngine()->WriteMessage("weakref", 0, 0, asMSGTYPE_ERROR, "The subtype doesn't support weak references");
-	return false;
-}
-
-CScriptWeakRef::CScriptWeakRef(asITypeInfo *type)
-{
-	m_ref  = 0;
-	m_type = type;
-	m_type->AddRef();
-	m_weakRefFlag = 0;
-}
-
-CScriptWeakRef::CScriptWeakRef(const CScriptWeakRef &other)
-{
-	m_ref  = other.m_ref;
-	m_type = other.m_type;
-	m_type->AddRef();
-	m_weakRefFlag = other.m_weakRefFlag;
-	if( m_weakRefFlag )
-		m_weakRefFlag->AddRef();
-}
-
-CScriptWeakRef::CScriptWeakRef(void *ref, asITypeInfo *type)
-{
-	m_ref  = ref;
-	m_type = type;
-	m_type->AddRef();
-
-	// The given type should be the weakref template instance
-	assert( strcmp(type->GetName(), "weakref") == 0 ||
-	        strcmp(type->GetName(), "const_weakref") == 0 );
-
-	// Get the shared flag that will tell us when the object has been destroyed
-	// This is threadsafe as we hold a strong reference to the object
-	m_weakRefFlag = m_type->GetEngine()->GetWeakRefFlagOfScriptObject(m_ref, m_type->GetSubType());
-	if( m_weakRefFlag )
-		m_weakRefFlag->AddRef();
-}
-
-CScriptWeakRef::~CScriptWeakRef()
-{
-	if( m_type )
-		m_type->Release();
-	if( m_weakRefFlag )
-		m_weakRefFlag->Release();
-}
-
-CScriptWeakRef &CScriptWeakRef::operator =(const CScriptWeakRef &other)
-{
-	// Don't do anything if it is the same reference
-	if( m_ref == other.m_ref )
-		return *this;
-
-	// Must not allow changing the type
-	if( m_type != other.m_type )
-	{
-		// We can allow a weakref to be assigned to a const_weakref
-		if( !(strcmp(m_type->GetName(), "const_weakref") == 0 &&
-			  strcmp(other.m_type->GetName(), "weakref") == 0 &&
-			  m_type->GetSubType() == other.m_type->GetSubType()) )
-		{
-			  assert( false );
-			  return *this;
-		}
-	}
-
-	m_ref = other.m_ref;
-
-	if( m_weakRefFlag )
-		m_weakRefFlag->Release();
-	m_weakRefFlag = other.m_weakRefFlag;
-	if( m_weakRefFlag )
-		m_weakRefFlag->AddRef();
-
-	return *this;
-}
-
-CScriptWeakRef &CScriptWeakRef::Set(void *newRef)
-{
-	// Release the previous weak ref 
-	if( m_weakRefFlag )
-		m_weakRefFlag->Release();
-
-	// Retrieve the new weak ref
-	m_ref = newRef;
-	if( newRef )
-	{
-		m_weakRefFlag = m_type->GetEngine()->GetWeakRefFlagOfScriptObject(newRef, m_type->GetSubType());
-		m_weakRefFlag->AddRef();
-	}
-	else
-		m_weakRefFlag = 0;
-
-	// Release the newRef since we're only supposed to hold a weakref
-	m_type->GetEngine()->ReleaseScriptObject(newRef, m_type->GetSubType());
-
-	return *this;
-}
-
-asITypeInfo *CScriptWeakRef::GetRefType() const
-{
-	return m_type->GetSubType();
-}
-
-bool CScriptWeakRef::operator==(const CScriptWeakRef &o) const
-{
-	if( m_ref  == o.m_ref &&
-		m_type == o.m_type )
-		return true;
-
-	// TODO: If type is not the same, we should attempt to do a dynamic cast,
-	//       which may change the pointer for application registered classes
-
-	return false;
-}
-
-bool CScriptWeakRef::operator!=(const CScriptWeakRef &o) const
-{
-	return !(*this == o);
-}
-
-// AngelScript: used as '@obj = ref.get();'
-void *CScriptWeakRef::Get() const
-{
-	// If we hold a null handle, then just return null
-	if( m_ref == 0 || m_weakRefFlag == 0 )
-		return 0;
-
-	// Lock on the shared bool, so we can be certain it won't be changed to true
-	// between the inspection of the flag and the increase of the ref count in the
-	// owning object.
-	m_weakRefFlag->Lock();
-	if( !m_weakRefFlag->Get() )
-	{
-		m_type->GetEngine()->AddRefScriptObject(m_ref, m_type->GetSubType());
-		m_weakRefFlag->Unlock();
-		return m_ref;
-	}
-	m_weakRefFlag->Unlock();
-
-	return 0;
-}
-
-bool CScriptWeakRef::Equals(void *ref) const
-{
-	// Release the ref since we'll not keep it
-	m_type->GetEngine()->ReleaseScriptObject(ref, m_type->GetSubType());
-
-	if( m_ref == ref )
-		return true;
-
-	return false;
-}
-
-void RegisterScriptWeakRef_Native(asIScriptEngine *engine)
-{
-	int r;
-
-	// Register a type for non-const handles
-	r = engine->RegisterObjectType("weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
-
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct), asCALL_CDECL_OBJLAST); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, T@+)", asFUNCTION(ScriptWeakRefConstruct2), asCALL_CDECL_OBJLAST); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback), asCALL_CDECL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("weakref<T>", "T@ opImplCast()", asMETHOD(CScriptWeakRef, Get), asCALL_THISCALL); assert(r >= 0);
-	r = engine->RegisterObjectMethod("weakref<T>", "T@ get() const", asMETHODPR(CScriptWeakRef, Get, () const, void*), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(const weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const weakref<T> &in) const", asMETHODPR(CScriptWeakRef, operator==, (const CScriptWeakRef &) const, bool), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(T@)", asMETHOD(CScriptWeakRef, Set), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const T@) const", asMETHOD(CScriptWeakRef, Equals), asCALL_THISCALL); assert(r >= 0);
-
-	// Register another type for const handles
-	r = engine->RegisterObjectType("const_weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
-
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct), asCALL_CDECL_OBJLAST); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, const T@+)", asFUNCTION(ScriptWeakRefConstruct2), asCALL_CDECL_OBJLAST); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback), asCALL_CDECL); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ opImplCast() const", asMETHOD(CScriptWeakRef, Get), asCALL_THISCALL); assert(r >= 0);
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ get() const", asMETHODPR(CScriptWeakRef, Get, () const, void*), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const const_weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const const_weakref<T> &in) const", asMETHODPR(CScriptWeakRef, operator==, (const CScriptWeakRef &) const, bool), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const T@)", asMETHOD(CScriptWeakRef, Set), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const T@) const", asMETHOD(CScriptWeakRef, Equals), asCALL_THISCALL); assert(r >= 0);
-
-	// Allow non-const weak references to be converted to const weak references
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const weakref<T> &in) const", asMETHODPR(CScriptWeakRef, operator==, (const CScriptWeakRef &) const, bool), asCALL_THISCALL); assert( r >= 0 );
-}
-
-static void ScriptWeakRefConstruct_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *reinterpret_cast<asITypeInfo**>(gen->GetAddressOfArg(0));
-
-	ScriptWeakRefConstruct(ti, gen->GetObject());
-}
-
-static void ScriptWeakRefConstruct2_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *reinterpret_cast<asITypeInfo**>(gen->GetAddressOfArg(0));
-	void *ref = gen->GetArgAddress(1);
-
-	ScriptWeakRefConstruct2(ti, ref, gen->GetObject());
-}
-
-static void ScriptWeakRefDestruct_Generic(asIScriptGeneric *gen)
-{
-	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
-	self->~CScriptWeakRef();
-}
-
-void CScriptWeakRef_Get_Generic(asIScriptGeneric *gen)
-{
-	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
-	gen->SetReturnAddress(self->Get());
-}
-
-void CScriptWeakRef_Assign_Generic(asIScriptGeneric *gen)
-{
-	CScriptWeakRef *other = reinterpret_cast<CScriptWeakRef*>(gen->GetArgAddress(0));
-	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
-	*self = *other;
-	gen->SetReturnAddress(self);
-}
-
-void CScriptWeakRef_Assign2_Generic(asIScriptGeneric *gen)
-{
-	void *other = gen->GetArgAddress(0);
-	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
-
-	// Must increase the refcount of the object, since Set() will decrease it
-	// If this is not done, the object will be destroyed too early since the 
-	// generic interface also automatically decreases the refcount of received handles
-	gen->GetEngine()->AddRefScriptObject(other, self->GetRefType());
-
-	self->Set(other);
-	gen->SetReturnAddress(self);
-}
-
-void CScriptWeakRef_Equals_Generic(asIScriptGeneric *gen)
-{
-	CScriptWeakRef *other = reinterpret_cast<CScriptWeakRef*>(gen->GetArgAddress(0));
-	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
-	gen->SetReturnByte(*self == *other);
-}
-
-void CScriptWeakRef_Equals2_Generic(asIScriptGeneric *gen)
-{
-	void *other = gen->GetArgAddress(0);
-	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
-
-	// Must increase the refcount of the object, since Equals() will decrease it
-	// If this is not done, the object will be destroyed too early since the 
-	// generic interface also automatically decreases the refcount of received handles
-	gen->GetEngine()->AddRefScriptObject(other, self->GetRefType());
-
-	gen->SetReturnByte(self->Equals(other));
-}
-
-static void ScriptWeakRefTemplateCallback_Generic(asIScriptGeneric *gen)
-{
-	asITypeInfo *ti = *reinterpret_cast<asITypeInfo**>(gen->GetAddressOfArg(0));
-	bool *dontGarbageCollect = *reinterpret_cast<bool**>(gen->GetAddressOfArg(1));
-	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = ScriptWeakRefTemplateCallback(ti, *dontGarbageCollect);
-}
-
-void RegisterScriptWeakRef_Generic(asIScriptEngine *engine)
-{
-	int r;
-
-	// Register a type for non-const handles
-	r = engine->RegisterObjectType("weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
-
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct_Generic), asCALL_GENERIC); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, T@)", asFUNCTION(ScriptWeakRefConstruct2_Generic), asCALL_GENERIC); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("weakref<T>", "T@ opImplCast()", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("weakref<T>", "T@ get() const", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(const weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const weakref<T> &in) const", asFUNCTION(CScriptWeakRef_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(T@)", asFUNCTION(CScriptWeakRef_Assign2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const T@) const", asFUNCTION(CScriptWeakRef_Equals2_Generic), asCALL_GENERIC); assert(r >= 0);
-
-	// Register another type for const handles
-	r = engine->RegisterObjectType("const_weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
-
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct_Generic), asCALL_GENERIC); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, const T@)", asFUNCTION(ScriptWeakRefConstruct2_Generic), asCALL_GENERIC); assert( r>= 0 );
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct_Generic), asCALL_GENERIC); assert( r >= 0 );
-
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ opImplCast() const", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert(r >= 0);
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ get() const", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const const_weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const const_weakref<T> &in) const", asFUNCTION(CScriptWeakRef_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const T@)", asFUNCTION(CScriptWeakRef_Assign2_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const T@) const", asFUNCTION(CScriptWeakRef_Equals2_Generic), asCALL_GENERIC); assert(r >= 0);
-
-	// Allow non-const weak references to be converted to const weak references
-	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
-	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const weakref<T> &in) const", asFUNCTION(CScriptWeakRef_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
-}
-
-void RegisterScriptWeakRef(asIScriptEngine *engine)
-{
-	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
-		RegisterScriptWeakRef_Generic(engine);
-	else
-		RegisterScriptWeakRef_Native(engine);
-}
-
-
-END_AS_NAMESPACE
+
+// The CScriptWeakRef class was originally implemented by vroad in March 2013
+
+#include "weakref.h"
+#include <new>
+#include <assert.h>
+#include <string.h> // strstr()
+
+BEGIN_AS_NAMESPACE
+
+static void ScriptWeakRefConstruct(asITypeInfo *type, void *mem)
+{
+	new(mem) CScriptWeakRef(type);
+}
+
+static void ScriptWeakRefConstruct2(asITypeInfo *type, void *ref, void *mem)
+{
+	new(mem) CScriptWeakRef(ref, type);
+
+	// It's possible the constructor raised a script exception, in which case we
+	// need to call the destructor in order to cleanup the memory before returning
+	asIScriptContext *ctx = asGetActiveContext();
+	if( ctx && ctx->GetState() == asEXECUTION_EXCEPTION )
+		reinterpret_cast<CScriptWeakRef*>(mem)->~CScriptWeakRef();
+}
+
+static void ScriptWeakRefDestruct(CScriptWeakRef *obj)
+{
+	obj->~CScriptWeakRef();
+}
+
+static bool ScriptWeakRefTemplateCallback(asITypeInfo *ti, bool &/*dontGarbageCollect*/)
+{
+	asITypeInfo *subType = ti->GetSubType();
+
+	// Weak references only work for reference types
+	if( subType == 0 ) return false;
+	if( !(subType->GetFlags() & asOBJ_REF) ) return false;
+
+	// The subtype shouldn't be a handle
+	if( ti->GetSubTypeId() & asTYPEID_OBJHANDLE )
+		return false;
+
+	// Make sure the type really supports weak references
+	asUINT cnt = subType->GetBehaviourCount();
+	for( asUINT n = 0; n < cnt; n++ )
+	{
+		asEBehaviours beh;
+		subType->GetBehaviourByIndex(n, &beh);
+		if( beh == asBEHAVE_GET_WEAKREF_FLAG )
+			return true;
+	}
+
+	ti->GetEngine()->WriteMessage("weakref", 0, 0, asMSGTYPE_ERROR, "The subtype doesn't support weak references");
+	return false;
+}
+
+CScriptWeakRef::CScriptWeakRef(asITypeInfo *type)
+{
+	m_ref  = 0;
+	m_type = type;
+	m_type->AddRef();
+	m_weakRefFlag = 0;
+}
+
+CScriptWeakRef::CScriptWeakRef(const CScriptWeakRef &other)
+{
+	m_ref  = other.m_ref;
+	m_type = other.m_type;
+	m_type->AddRef();
+	m_weakRefFlag = other.m_weakRefFlag;
+	if( m_weakRefFlag )
+		m_weakRefFlag->AddRef();
+}
+
+CScriptWeakRef::CScriptWeakRef(void *ref, asITypeInfo *type)
+{
+	m_ref  = ref;
+	m_type = type;
+	m_type->AddRef();
+
+	// The given type should be the weakref template instance
+	assert( strcmp(type->GetName(), "weakref") == 0 ||
+	        strcmp(type->GetName(), "const_weakref") == 0 );
+
+	// Get the shared flag that will tell us when the object has been destroyed
+	// This is threadsafe as we hold a strong reference to the object
+	m_weakRefFlag = m_type->GetEngine()->GetWeakRefFlagOfScriptObject(m_ref, m_type->GetSubType());
+	if( m_weakRefFlag )
+		m_weakRefFlag->AddRef();
+}
+
+CScriptWeakRef::~CScriptWeakRef()
+{
+	if( m_type )
+		m_type->Release();
+	if( m_weakRefFlag )
+		m_weakRefFlag->Release();
+}
+
+CScriptWeakRef &CScriptWeakRef::operator =(const CScriptWeakRef &other)
+{
+	// Don't do anything if it is the same reference
+	// It is not enough to verify only the reference to the object, as the 
+	// address may be reused by another instance after the first has been freed.
+	// By checking also the weakRefFlag we can be certain that it is the same
+	// instance. 
+	if( m_ref == other.m_ref &&
+		m_weakRefFlag == other.m_weakRefFlag )
+		return *this;
+
+	// Must not allow changing the type
+	if( m_type != other.m_type )
+	{
+		// We can allow a weakref to be assigned to a const_weakref
+		if( !(strcmp(m_type->GetName(), "const_weakref") == 0 &&
+			  strcmp(other.m_type->GetName(), "weakref") == 0 &&
+			  m_type->GetSubType() == other.m_type->GetSubType()) )
+		{
+			  assert( false );
+			  return *this;
+		}
+	}
+
+	m_ref = other.m_ref;
+
+	if( m_weakRefFlag )
+		m_weakRefFlag->Release();
+	m_weakRefFlag = other.m_weakRefFlag;
+	if( m_weakRefFlag )
+		m_weakRefFlag->AddRef();
+
+	return *this;
+}
+
+CScriptWeakRef &CScriptWeakRef::Set(void *newRef)
+{
+	// Release the previous weak ref 
+	if( m_weakRefFlag )
+		m_weakRefFlag->Release();
+
+	// Retrieve the new weak ref
+	m_ref = newRef;
+	if( newRef )
+	{
+		m_weakRefFlag = m_type->GetEngine()->GetWeakRefFlagOfScriptObject(newRef, m_type->GetSubType());
+		m_weakRefFlag->AddRef();
+	}
+	else
+		m_weakRefFlag = 0;
+
+	// Release the newRef since we're only supposed to hold a weakref
+	m_type->GetEngine()->ReleaseScriptObject(newRef, m_type->GetSubType());
+
+	return *this;
+}
+
+asITypeInfo *CScriptWeakRef::GetRefType() const
+{
+	return m_type->GetSubType();
+}
+
+bool CScriptWeakRef::operator==(const CScriptWeakRef &o) const
+{
+	// It is not enough to compare just the address of the object, as it may
+	// be reused by another instance after the first has been freed. By verifying
+	// also the weakRefFlag we can guarantee that it is indeed the same instance.
+	if( m_ref  == o.m_ref &&
+		m_weakRefFlag == o.m_weakRefFlag &&
+		m_type == o.m_type )
+		return true;
+
+	// TODO: If type is not the same, we should attempt to do a dynamic cast,
+	//       which may change the pointer for application registered classes
+
+	return false;
+}
+
+bool CScriptWeakRef::operator!=(const CScriptWeakRef &o) const
+{
+	return !(*this == o);
+}
+
+// AngelScript: used as '@obj = ref.get();'
+void *CScriptWeakRef::Get() const
+{
+	// If we hold a null handle, then just return null
+	if( m_ref == 0 || m_weakRefFlag == 0 )
+		return 0;
+
+	// Lock on the shared bool, so we can be certain it won't be changed to true
+	// between the inspection of the flag and the increase of the ref count in the
+	// owning object.
+	m_weakRefFlag->Lock();
+	if( !m_weakRefFlag->Get() )
+	{
+		m_type->GetEngine()->AddRefScriptObject(m_ref, m_type->GetSubType());
+		m_weakRefFlag->Unlock();
+		return m_ref;
+	}
+	m_weakRefFlag->Unlock();
+
+	return 0;
+}
+
+bool CScriptWeakRef::Equals(void *ref) const
+{
+	if( m_ref != ref )
+		return false;
+
+	// It is not enough to compare just the address, as another instance may
+	// get the same address after the first instance has been freed. Verify the
+	// weakref flag too to make sure it is the same instance
+	asILockableSharedBool *flag = m_type->GetEngine()->GetWeakRefFlagOfScriptObject(ref, m_type->GetSubType());
+	if (m_weakRefFlag != flag)
+		return false;
+
+	return true;
+}
+
+void RegisterScriptWeakRef_Native(asIScriptEngine *engine)
+{
+	int r;
+
+	// Register a type for non-const handles
+	r = engine->RegisterObjectType("weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
+
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct), asCALL_CDECL_OBJLAST); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, T@+) explicit", asFUNCTION(ScriptWeakRefConstruct2), asCALL_CDECL_OBJLAST); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback), asCALL_CDECL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("weakref<T>", "T@ opImplCast()", asMETHOD(CScriptWeakRef, Get), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("weakref<T>", "T@ get() const", asMETHODPR(CScriptWeakRef, Get, () const, void*), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(const weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opAssign(const weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const weakref<T> &in) const", asMETHODPR(CScriptWeakRef, operator==, (const CScriptWeakRef &) const, bool), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(T@)", asMETHOD(CScriptWeakRef, Set), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const T@+) const", asMETHOD(CScriptWeakRef, Equals), asCALL_THISCALL); assert(r >= 0);
+
+	// Register another type for const handles
+	r = engine->RegisterObjectType("const_weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
+
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct), asCALL_CDECL_OBJLAST); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, const T@+) explicit", asFUNCTION(ScriptWeakRefConstruct2), asCALL_CDECL_OBJLAST); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct), asCALL_CDECL_OBJLAST); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback), asCALL_CDECL); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ opImplCast() const", asMETHOD(CScriptWeakRef, Get), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ get() const", asMETHODPR(CScriptWeakRef, Get, () const, void*), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const const_weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opAssign(const const_weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert(r >= 0);
+	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const const_weakref<T> &in) const", asMETHODPR(CScriptWeakRef, operator==, (const CScriptWeakRef &) const, bool), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const T@)", asMETHOD(CScriptWeakRef, Set), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const T@+) const", asMETHOD(CScriptWeakRef, Equals), asCALL_THISCALL); assert(r >= 0);
+
+	// Allow non-const weak references to be converted to const weak references
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const weakref<T> &in)", asMETHOD(CScriptWeakRef, operator=), asCALL_THISCALL); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const weakref<T> &in) const", asMETHODPR(CScriptWeakRef, operator==, (const CScriptWeakRef &) const, bool), asCALL_THISCALL); assert( r >= 0 );
+}
+
+static void ScriptWeakRefConstruct_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *reinterpret_cast<asITypeInfo**>(gen->GetAddressOfArg(0));
+
+	ScriptWeakRefConstruct(ti, gen->GetObject());
+}
+
+static void ScriptWeakRefConstruct2_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *reinterpret_cast<asITypeInfo**>(gen->GetAddressOfArg(0));
+	void *ref = gen->GetArgAddress(1);
+
+	ScriptWeakRefConstruct2(ti, ref, gen->GetObject());
+}
+
+static void ScriptWeakRefDestruct_Generic(asIScriptGeneric *gen)
+{
+	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
+	self->~CScriptWeakRef();
+}
+
+void CScriptWeakRef_Get_Generic(asIScriptGeneric *gen)
+{
+	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
+	gen->SetReturnAddress(self->Get());
+}
+
+void CScriptWeakRef_Assign_Generic(asIScriptGeneric *gen)
+{
+	CScriptWeakRef *other = reinterpret_cast<CScriptWeakRef*>(gen->GetArgAddress(0));
+	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
+	*self = *other;
+	gen->SetReturnAddress(self);
+}
+
+void CScriptWeakRef_Assign2_Generic(asIScriptGeneric *gen)
+{
+	void *other = gen->GetArgAddress(0);
+	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
+	self->Set(other);
+	gen->SetReturnAddress(self);
+}
+
+void CScriptWeakRef_Equals_Generic(asIScriptGeneric *gen)
+{
+	CScriptWeakRef *other = reinterpret_cast<CScriptWeakRef*>(gen->GetArgAddress(0));
+	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
+	gen->SetReturnByte(*self == *other);
+}
+
+void CScriptWeakRef_Equals2_Generic(asIScriptGeneric *gen)
+{
+	void *other = gen->GetArgAddress(0);
+	CScriptWeakRef *self = reinterpret_cast<CScriptWeakRef*>(gen->GetObject());
+
+	gen->SetReturnByte(self->Equals(other));
+}
+
+static void ScriptWeakRefTemplateCallback_Generic(asIScriptGeneric *gen)
+{
+	asITypeInfo *ti = *reinterpret_cast<asITypeInfo**>(gen->GetAddressOfArg(0));
+	bool *dontGarbageCollect = *reinterpret_cast<bool**>(gen->GetAddressOfArg(1));
+	*reinterpret_cast<bool*>(gen->GetAddressOfReturnLocation()) = ScriptWeakRefTemplateCallback(ti, *dontGarbageCollect);
+}
+
+void RegisterScriptWeakRef_Generic(asIScriptEngine *engine)
+{
+	int r;
+
+	// Register a type for non-const handles
+	r = engine->RegisterObjectType("weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
+
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct_Generic), asCALL_GENERIC); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, T@+) explicit", asFUNCTION(ScriptWeakRefConstruct2_Generic), asCALL_GENERIC); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("weakref<T>", "T@ opImplCast()", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("weakref<T>", "T@ get() const", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(const weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opAssign(const weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const weakref<T> &in) const", asFUNCTION(CScriptWeakRef_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "weakref<T> &opHndlAssign(T@)", asFUNCTION(CScriptWeakRef_Assign2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("weakref<T>", "bool opEquals(const T@+) const", asFUNCTION(CScriptWeakRef_Equals2_Generic), asCALL_GENERIC); assert(r >= 0);
+
+	// Register another type for const handles
+	r = engine->RegisterObjectType("const_weakref<class T>", sizeof(CScriptWeakRef), asOBJ_VALUE | asOBJ_ASHANDLE | asOBJ_TEMPLATE | asOBJ_APP_CLASS_DAK); assert( r >= 0 );
+
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptWeakRefConstruct_Generic), asCALL_GENERIC); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_CONSTRUCT, "void f(int&in, const T@+) explicit", asFUNCTION(ScriptWeakRefConstruct2_Generic), asCALL_GENERIC); assert( r>= 0 );
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_TEMPLATE_CALLBACK, "bool f(int&in, bool&out)", asFUNCTION(ScriptWeakRefTemplateCallback_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectBehaviour("const_weakref<T>", asBEHAVE_DESTRUCT, "void f()", asFUNCTION(ScriptWeakRefDestruct_Generic), asCALL_GENERIC); assert( r >= 0 );
+
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ opImplCast() const", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const T@ get() const", asFUNCTION(CScriptWeakRef_Get_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const const_weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opAssign(const const_weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert(r >= 0);
+	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const const_weakref<T> &in) const", asFUNCTION(CScriptWeakRef_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const T@)", asFUNCTION(CScriptWeakRef_Assign2_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const T@+) const", asFUNCTION(CScriptWeakRef_Equals2_Generic), asCALL_GENERIC); assert(r >= 0);
+
+	// Allow non-const weak references to be converted to const weak references
+	r = engine->RegisterObjectMethod("const_weakref<T>", "const_weakref<T> &opHndlAssign(const weakref<T> &in)", asFUNCTION(CScriptWeakRef_Assign_Generic), asCALL_GENERIC); assert( r >= 0 );
+	r = engine->RegisterObjectMethod("const_weakref<T>", "bool opEquals(const weakref<T> &in) const", asFUNCTION(CScriptWeakRef_Equals_Generic), asCALL_GENERIC); assert( r >= 0 );
+}
+
+void RegisterScriptWeakRef(asIScriptEngine *engine)
+{
+	if( strstr(asGetLibraryOptions(), "AS_MAX_PORTABILITY") )
+		RegisterScriptWeakRef_Generic(engine);
+	else
+		RegisterScriptWeakRef_Native(engine);
+}
+
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/addons/weakref.h b/Sources/AngelScript/add_on/weakref/weakref.h
old mode 100755
new mode 100644
similarity index 95%
rename from Sources/AngelScript/addons/weakref.h
rename to Sources/AngelScript/add_on/weakref/weakref.h
index 660997262..0d564ba74
--- a/Sources/AngelScript/addons/weakref.h
+++ b/Sources/AngelScript/add_on/weakref/weakref.h
@@ -3,15 +3,14 @@
 
 // The CScriptWeakRef class was originally implemented by vroad in March 2013
 
-#ifndef ANGELSCRIPT_H 
+#ifndef ANGELSCRIPT_H
 // Avoid having to inform include path if header is already include before
-#include "angelscript.h"
+#include <angelscript.h>
 #endif
 
-
 BEGIN_AS_NAMESPACE
 
-class CScriptWeakRef 
+class CScriptWeakRef
 {
 public:
 	// Constructors
diff --git a/Sources/AngelScript/include/angelscript.h b/Sources/AngelScript/include/angelscript.h
old mode 100755
new mode 100644
index 5d4ff5f8a..07cc1859d
--- a/Sources/AngelScript/include/angelscript.h
+++ b/Sources/AngelScript/include/angelscript.h
@@ -1,1981 +1,1980 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// angelscript.h
-//
-// The script engine interface
-//
-
-
-#ifndef ANGELSCRIPT_H
-#define ANGELSCRIPT_H
-
-#include <stddef.h>
-#ifndef _MSC_VER
-#include <stdint.h>
-#endif
-
-#ifdef AS_USE_NAMESPACE
- #define BEGIN_AS_NAMESPACE namespace AngelScript {
- #define END_AS_NAMESPACE }
- #define AS_NAMESPACE_QUALIFIER AngelScript::
-#else
- #define BEGIN_AS_NAMESPACE
- #define END_AS_NAMESPACE
- #define AS_NAMESPACE_QUALIFIER ::
-#endif
-
-BEGIN_AS_NAMESPACE
-
-// AngelScript version
-
-#define ANGELSCRIPT_VERSION        23101
-#define ANGELSCRIPT_VERSION_STRING "2.31.1"
-
-// Data types
-
-class asIScriptEngine;
-class asIScriptModule;
-class asIScriptContext;
-class asIScriptGeneric;
-class asIScriptObject;
-class asITypeInfo;
-#ifdef AS_DEPRECATED
-// deprecated since 2.31.0 - 2015/11/18
-typedef asITypeInfo asIObjectType;
-#endif
-class asIScriptFunction;
-class asIBinaryStream;
-class asIJITCompiler;
-class asIThreadManager;
-class asILockableSharedBool;
-
-// Enumerations and constants
-
-// Return codes
-enum asERetCodes
-{
-	asSUCCESS                              =  0,
-	asERROR                                = -1,
-	asCONTEXT_ACTIVE                       = -2,
-	asCONTEXT_NOT_FINISHED                 = -3,
-	asCONTEXT_NOT_PREPARED                 = -4,
-	asINVALID_ARG                          = -5,
-	asNO_FUNCTION                          = -6,
-	asNOT_SUPPORTED                        = -7,
-	asINVALID_NAME                         = -8,
-	asNAME_TAKEN                           = -9,
-	asINVALID_DECLARATION                  = -10,
-	asINVALID_OBJECT                       = -11,
-	asINVALID_TYPE                         = -12,
-	asALREADY_REGISTERED                   = -13,
-	asMULTIPLE_FUNCTIONS                   = -14,
-	asNO_MODULE                            = -15,
-	asNO_GLOBAL_VAR                        = -16,
-	asINVALID_CONFIGURATION                = -17,
-	asINVALID_INTERFACE                    = -18,
-	asCANT_BIND_ALL_FUNCTIONS              = -19,
-	asLOWER_ARRAY_DIMENSION_NOT_REGISTERED = -20,
-	asWRONG_CONFIG_GROUP                   = -21,
-	asCONFIG_GROUP_IS_IN_USE               = -22,
-	asILLEGAL_BEHAVIOUR_FOR_TYPE           = -23,
-	asWRONG_CALLING_CONV                   = -24,
-	asBUILD_IN_PROGRESS                    = -25,
-	asINIT_GLOBAL_VARS_FAILED              = -26,
-	asOUT_OF_MEMORY                        = -27,
-	asMODULE_IS_IN_USE                     = -28
-};
-
-// Engine properties
-enum asEEngineProp
-{
-	asEP_ALLOW_UNSAFE_REFERENCES            = 1,
-	asEP_OPTIMIZE_BYTECODE                  = 2,
-	asEP_COPY_SCRIPT_SECTIONS               = 3,
-	asEP_MAX_STACK_SIZE                     = 4,
-	asEP_USE_CHARACTER_LITERALS             = 5,
-	asEP_ALLOW_MULTILINE_STRINGS            = 6,
-	asEP_ALLOW_IMPLICIT_HANDLE_TYPES        = 7,
-	asEP_BUILD_WITHOUT_LINE_CUES            = 8,
-	asEP_INIT_GLOBAL_VARS_AFTER_BUILD       = 9,
-	asEP_REQUIRE_ENUM_SCOPE                 = 10,
-	asEP_SCRIPT_SCANNER                     = 11,
-	asEP_INCLUDE_JIT_INSTRUCTIONS           = 12,
-	asEP_STRING_ENCODING                    = 13,
-	asEP_PROPERTY_ACCESSOR_MODE             = 14,
-	asEP_EXPAND_DEF_ARRAY_TO_TMPL           = 15,
-	asEP_AUTO_GARBAGE_COLLECT               = 16,
-	asEP_DISALLOW_GLOBAL_VARS               = 17,
-	asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT      = 18,
-	asEP_COMPILER_WARNINGS                  = 19,
-	asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE = 20,
-	asEP_ALTER_SYNTAX_NAMED_ARGS            = 21,
-	asEP_DISABLE_INTEGER_DIVISION           = 22,
-	asEP_DISALLOW_EMPTY_LIST_ELEMENTS       = 23,
-	asEP_PRIVATE_PROP_AS_PROTECTED          = 24,
-	asEP_ALLOW_UNICODE_IDENTIFIERS          = 25,
-	asEP_HEREDOC_TRIM_MODE                  = 26,
-
-	asEP_LAST_PROPERTY
-};
-
-// Calling conventions
-enum asECallConvTypes
-{
-	asCALL_CDECL             = 0,
-	asCALL_STDCALL           = 1,
-	asCALL_THISCALL_ASGLOBAL = 2,
-	asCALL_THISCALL          = 3,
-	asCALL_CDECL_OBJLAST     = 4,
-	asCALL_CDECL_OBJFIRST    = 5,
-	asCALL_GENERIC           = 6,
-	asCALL_THISCALL_OBJLAST  = 7,
-	asCALL_THISCALL_OBJFIRST = 8
-};
-
-// Object type flags
-enum asEObjTypeFlags
-{
-	asOBJ_REF                        = (1<<0),
-	asOBJ_VALUE                      = (1<<1),
-	asOBJ_GC                         = (1<<2),
-	asOBJ_POD                        = (1<<3),
-	asOBJ_NOHANDLE                   = (1<<4),
-	asOBJ_SCOPED                     = (1<<5),
-	asOBJ_TEMPLATE                   = (1<<6),
-	asOBJ_ASHANDLE                   = (1<<7),
-	asOBJ_APP_CLASS                  = (1<<8),
-	asOBJ_APP_CLASS_CONSTRUCTOR      = (1<<9),
-	asOBJ_APP_CLASS_DESTRUCTOR       = (1<<10),
-	asOBJ_APP_CLASS_ASSIGNMENT       = (1<<11),
-	asOBJ_APP_CLASS_COPY_CONSTRUCTOR = (1<<12),
-	asOBJ_APP_CLASS_C                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR),
-	asOBJ_APP_CLASS_CD               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR),
-	asOBJ_APP_CLASS_CA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
-	asOBJ_APP_CLASS_CK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_CLASS_CDA              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
-	asOBJ_APP_CLASS_CDK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_CLASS_CAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_CLASS_CDAK             = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_CLASS_D                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR),
-	asOBJ_APP_CLASS_DA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
-	asOBJ_APP_CLASS_DK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_CLASS_DAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_CLASS_A                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT),
-	asOBJ_APP_CLASS_AK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_CLASS_K                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
-	asOBJ_APP_PRIMITIVE              = (1<<13),
-	asOBJ_APP_FLOAT                  = (1<<14),
-	asOBJ_APP_ARRAY                  = (1<<15),
-	asOBJ_APP_CLASS_ALLINTS          = (1<<16),
-	asOBJ_APP_CLASS_ALLFLOATS        = (1<<17),
-	asOBJ_NOCOUNT                    = (1<<18),
-	asOBJ_APP_CLASS_ALIGN8           = (1<<19),
-	asOBJ_IMPLICIT_HANDLE            = (1<<20),
-	asOBJ_MASK_VALID_FLAGS           = 0x1FFFFF,
-	// Internal flags
-	asOBJ_SCRIPT_OBJECT              = (1<<21),
-	asOBJ_SHARED                     = (1<<22),
-	asOBJ_NOINHERIT                  = (1<<23),
-	asOBJ_FUNCDEF                    = (1<<24),
-	asOBJ_LIST_PATTERN               = (1<<25),
-	asOBJ_ENUM                       = (1<<26),
-	asOBJ_TEMPLATE_SUBTYPE           = (1<<27),
-	asOBJ_TYPEDEF                    = (1<<28),
-	asOBJ_ABSTRACT                   = (1<<29),
-	asOBJ_APP_ALIGN16                = (1<<30)
-};
-
-// Behaviours
-enum asEBehaviours
-{
-	// Value object memory management
-	asBEHAVE_CONSTRUCT,
-	asBEHAVE_LIST_CONSTRUCT,
-	asBEHAVE_DESTRUCT,
-
-	// Reference object memory management
-	asBEHAVE_FACTORY,
-	asBEHAVE_LIST_FACTORY,
-	asBEHAVE_ADDREF,
-	asBEHAVE_RELEASE,
-	asBEHAVE_GET_WEAKREF_FLAG,
-
-	// Object operators
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.30.0, 2014-10-24
-	asBEHAVE_VALUE_CAST,
-	asBEHAVE_IMPLICIT_VALUE_CAST,
-	// Deprecated since 2.30.0, 2014-12-30
-	asBEHAVE_REF_CAST,
-	asBEHAVE_IMPLICIT_REF_CAST,
-#endif
-	asBEHAVE_TEMPLATE_CALLBACK,
-
-	// Garbage collection behaviours
-	asBEHAVE_FIRST_GC,
-	 asBEHAVE_GETREFCOUNT = asBEHAVE_FIRST_GC,
-	 asBEHAVE_SETGCFLAG,
-	 asBEHAVE_GETGCFLAG,
-	 asBEHAVE_ENUMREFS,
-	 asBEHAVE_RELEASEREFS,
-	asBEHAVE_LAST_GC = asBEHAVE_RELEASEREFS,
-
-	asBEHAVE_MAX
-};
-
-// Context states
-enum asEContextState
-{
-	asEXECUTION_FINISHED      = 0,
-	asEXECUTION_SUSPENDED     = 1,
-	asEXECUTION_ABORTED       = 2,
-	asEXECUTION_EXCEPTION     = 3,
-	asEXECUTION_PREPARED      = 4,
-	asEXECUTION_UNINITIALIZED = 5,
-	asEXECUTION_ACTIVE        = 6,
-	asEXECUTION_ERROR         = 7
-};
-
-// Message types
-enum asEMsgType
-{
-	asMSGTYPE_ERROR       = 0,
-	asMSGTYPE_WARNING     = 1,
-	asMSGTYPE_INFORMATION = 2
-};
-
-// Garbage collector flags
-enum asEGCFlags
-{
-	asGC_FULL_CYCLE      = 1,
-	asGC_ONE_STEP        = 2,
-	asGC_DESTROY_GARBAGE = 4,
-	asGC_DETECT_GARBAGE  = 8
-};
-
-// Token classes
-enum asETokenClass
-{
-	asTC_UNKNOWN    = 0,
-	asTC_KEYWORD    = 1,
-	asTC_VALUE      = 2,
-	asTC_IDENTIFIER = 3,
-	asTC_COMMENT    = 4,
-	asTC_WHITESPACE = 5
-};
-
-// Type id flags
-enum asETypeIdFlags
-{
-	asTYPEID_VOID           = 0,
-	asTYPEID_BOOL           = 1,
-	asTYPEID_INT8           = 2,
-	asTYPEID_INT16          = 3,
-	asTYPEID_INT32          = 4,
-	asTYPEID_INT64          = 5,
-	asTYPEID_UINT8          = 6,
-	asTYPEID_UINT16         = 7,
-	asTYPEID_UINT32         = 8,
-	asTYPEID_UINT64         = 9,
-	asTYPEID_FLOAT          = 10,
-	asTYPEID_DOUBLE         = 11,
-	asTYPEID_OBJHANDLE      = 0x40000000,
-	asTYPEID_HANDLETOCONST  = 0x20000000,
-	asTYPEID_MASK_OBJECT    = 0x1C000000,
-	asTYPEID_APPOBJECT      = 0x04000000,
-	asTYPEID_SCRIPTOBJECT   = 0x08000000,
-	asTYPEID_TEMPLATE       = 0x10000000,
-	asTYPEID_MASK_SEQNBR    = 0x03FFFFFF
-};
-
-// Type modifiers
-enum asETypeModifiers
-{
-	asTM_NONE     = 0,
-	asTM_INREF    = 1,
-	asTM_OUTREF   = 2,
-	asTM_INOUTREF = 3,
-	asTM_CONST    = 4
-};
-
-// GetModule flags
-enum asEGMFlags
-{
-	asGM_ONLY_IF_EXISTS       = 0,
-	asGM_CREATE_IF_NOT_EXISTS = 1,
-	asGM_ALWAYS_CREATE        = 2
-};
-
-// Compile flags
-enum asECompileFlags
-{
-	asCOMP_ADD_TO_MODULE = 1
-};
-
-// Function types
-enum asEFuncType
-{
-	asFUNC_DUMMY     =-1,
-	asFUNC_SYSTEM    = 0,
-	asFUNC_SCRIPT    = 1,
-	asFUNC_INTERFACE = 2,
-	asFUNC_VIRTUAL   = 3,
-	asFUNC_FUNCDEF   = 4,
-	asFUNC_IMPORTED  = 5,
-	asFUNC_DELEGATE  = 6
-};
-
-//
-// asBYTE  =  8 bits
-// asWORD  = 16 bits
-// asDWORD = 32 bits
-// asQWORD = 64 bits
-// asPWORD = size of pointer
-//
-typedef unsigned char  asBYTE;
-typedef unsigned short asWORD;
-typedef unsigned int   asUINT;
-#if (defined(_MSC_VER) && _MSC_VER <= 1200) || defined(__S3E__) || (defined(_MSC_VER) && defined(__clang__))
-	// size_t is not really correct, since it only guaranteed to be large enough to hold the segment size.
-	// For example, on 16bit systems the size_t may be 16bits only even if pointers are 32bit. But nobody
-	// is likely to use MSVC6 to compile for 16bit systems anymore, so this should be ok.
-	typedef size_t         asPWORD;
-#else
-	typedef uintptr_t      asPWORD;
-#endif
-#ifdef __LP64__
-	typedef unsigned int  asDWORD;
-	typedef unsigned long asQWORD;
-	typedef long asINT64;
-#else
-	typedef unsigned long asDWORD;
-  #if !defined(_MSC_VER) && (defined(__GNUC__) || defined(__MWERKS__) || defined(__SUNPRO_CC) || defined(__psp2__))
-	typedef uint64_t asQWORD;
-	typedef int64_t asINT64;
-  #else
-	typedef unsigned __int64 asQWORD;
-	typedef __int64 asINT64;
-  #endif
-#endif
-
-// Is the target a 64bit system?
-#if defined(__LP64__) || defined(__amd64__) || defined(__x86_64__) || defined(_M_X64)
-	#ifndef AS_64BIT_PTR
-		#define AS_64BIT_PTR
-	#endif
-#endif
-
-typedef void (*asFUNCTION_t)();
-typedef void (*asGENFUNC_t)(asIScriptGeneric *);
-typedef void *(*asALLOCFUNC_t)(size_t);
-typedef void (*asFREEFUNC_t)(void *);
-typedef void (*asCLEANENGINEFUNC_t)(asIScriptEngine *);
-typedef void (*asCLEANMODULEFUNC_t)(asIScriptModule *);
-typedef void (*asCLEANCONTEXTFUNC_t)(asIScriptContext *);
-typedef void (*asCLEANFUNCTIONFUNC_t)(asIScriptFunction *);
-typedef void (*asCLEANTYPEINFOFUNC_t)(asITypeInfo *);
-#ifdef AS_DEPRECATED
-// deprecated since 2.31.0 - 2015/11/18
-typedef asCLEANTYPEINFOFUNC_t asCLEANOBJECTTYPEFUNC_t;
-#endif
-typedef void (*asCLEANSCRIPTOBJECTFUNC_t)(asIScriptObject *);
-typedef asIScriptContext *(*asREQUESTCONTEXTFUNC_t)(asIScriptEngine *, void *);
-typedef void (*asRETURNCONTEXTFUNC_t)(asIScriptEngine *, asIScriptContext *, void *);
-
-// Check if the compiler can use C++11 features
-#if !defined(_MSC_VER) || _MSC_VER >= 1700   // MSVC 2012
- #if !defined(__GNUC__) || defined(__clang__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)  // gnuc 4.7 or clang
-  #if !(defined(__GNUC__) && defined(__cplusplus) && __cplusplus < 201103L) // gnuc and clang require compiler flag -std=c++11
-   #if !defined(__SUNPRO_CC) // Oracle Solaris Studio
-    #define AS_CAN_USE_CPP11 1
-   #endif
-  #endif
- #endif
-#endif
-
-// This macro does basically the same thing as offsetof defined in stddef.h, but
-// GNUC should not complain about the usage as I'm not using 0 as the base pointer.
-#define asOFFSET(s,m) ((size_t)(&reinterpret_cast<s*>(100000)->m)-100000)
-
-#define asFUNCTION(f) asFunctionPtr(f)
-#if (defined(_MSC_VER) && _MSC_VER <= 1200) || (defined(__BORLANDC__) && __BORLANDC__ < 0x590)
-// MSVC 6 has a bug that prevents it from properly compiling using the correct asFUNCTIONPR with operator >
-// so we need to use ordinary C style cast instead of static_cast. The drawback is that the compiler can't
-// check that the cast is really valid.
-// BCC v5.8 (C++Builder 2006) and earlier have a similar bug which forces us to fall back to a C-style cast.
-#define asFUNCTIONPR(f,p,r) asFunctionPtr((void (*)())((r (*)p)(f)))
-#else
-#define asFUNCTIONPR(f,p,r) asFunctionPtr((void (*)())(static_cast<r (*)p>(f)))
-#endif
-
-#ifndef AS_NO_CLASS_METHODS
-
-class asCUnknownClass;
-typedef void (asCUnknownClass::*asMETHOD_t)();
-
-struct asSFuncPtr
-{
-	asSFuncPtr(asBYTE f = 0)
-	{
-		for( size_t n = 0; n < sizeof(ptr.dummy); n++ )
-			ptr.dummy[n] = 0;
-		flag = f;
-	}
-
-	void CopyMethodPtr(const void *mthdPtr, size_t size)
-	{
-		for( size_t n = 0; n < size; n++ )
-			ptr.dummy[n] = reinterpret_cast<const char *>(mthdPtr)[n];
-	}
-
-	union
-	{
-		// The largest known method point is 20 bytes (MSVC 64bit),
-		// but with 8byte alignment this becomes 24 bytes. So we need
-		// to be able to store at least that much.
-		char dummy[25];
-		struct {asMETHOD_t   mthd; char dummy[25-sizeof(asMETHOD_t)];} m;
-		struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
-	} ptr;
-	asBYTE flag; // 1 = generic, 2 = global func, 3 = method
-};
-
-#if defined(__BORLANDC__)
-// A bug in BCC (QC #85374) makes it impossible to distinguish const/non-const method overloads
-// with static_cast<>. The workaround is to use an _implicit_cast instead.
-
- #if  __BORLANDC__ < 0x590
- // BCC v5.8 (C++Builder 2006) and earlier have an even more annoying bug which causes
- // the "pretty" workaround below (with _implicit_cast<>) to fail. For these compilers
- // we need to use a traditional C-style cast.
-  #define AS_METHOD_AMBIGUITY_CAST(t) (t)
- #else
-template <typename T>
-  T _implicit_cast (T val)
-{ return val; }
-  #define AS_METHOD_AMBIGUITY_CAST(t) AS_NAMESPACE_QUALIFIER _implicit_cast<t >
- #endif
-#else
- #define AS_METHOD_AMBIGUITY_CAST(t) static_cast<t >
-#endif
-
-#define asMETHOD(c,m) asSMethodPtr<sizeof(void (c::*)())>::Convert((void (c::*)())(&c::m))
-#define asMETHODPR(c,m,p,r) asSMethodPtr<sizeof(void (c::*)())>::Convert(AS_METHOD_AMBIGUITY_CAST(r (c::*)p)(&c::m))
-
-#else // Class methods are disabled
-
-struct asSFuncPtr
-{
-	asSFuncPtr(asBYTE f)
-	{
-		for( int n = 0; n < sizeof(ptr.dummy); n++ )
-			ptr.dummy[n] = 0;
-		flag = f;
-	}
-
-	union
-	{
-		char dummy[25]; // largest known class method pointer
-		struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
-	} ptr;
-	asBYTE flag; // 1 = generic, 2 = global func
-};
-
-#endif
-
-struct asSMessageInfo
-{
-	const char *section;
-	int         row;
-	int         col;
-	asEMsgType  type;
-	const char *message;
-};
-
-
-// API functions
-
-// ANGELSCRIPT_EXPORT is defined when compiling the dll or lib
-// ANGELSCRIPT_DLL_LIBRARY_IMPORT is defined when dynamically linking to the
-// dll through the link lib automatically generated by MSVC++
-// ANGELSCRIPT_DLL_MANUAL_IMPORT is defined when manually loading the dll
-// Don't define anything when linking statically to the lib
-
-#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
-  #if defined(ANGELSCRIPT_EXPORT)
-    #define AS_API __declspec(dllexport)
-  #elif defined(ANGELSCRIPT_DLL_LIBRARY_IMPORT)
-    #define AS_API __declspec(dllimport)
-  #else // statically linked library
-    #define AS_API
-  #endif
-#elif defined(__GNUC__)
-  #if defined(ANGELSCRIPT_EXPORT)
-    #define AS_API __attribute__((visibility ("default")))
-  #else
-    #define AS_API
-  #endif
-#else
-  #define AS_API
-#endif
-
-#ifndef ANGELSCRIPT_DLL_MANUAL_IMPORT
-extern "C"
-{
-	// Engine
-	AS_API asIScriptEngine *asCreateScriptEngine(asDWORD version = ANGELSCRIPT_VERSION);
-	AS_API const char      *asGetLibraryVersion();
-	AS_API const char      *asGetLibraryOptions();
-
-	// Context
-	AS_API asIScriptContext *asGetActiveContext();
-
-	// Thread support
-	AS_API int               asPrepareMultithread(asIThreadManager *externalMgr = 0);
-	AS_API void              asUnprepareMultithread();
-	AS_API asIThreadManager *asGetThreadManager();
-	AS_API void              asAcquireExclusiveLock();
-	AS_API void              asReleaseExclusiveLock();
-	AS_API void              asAcquireSharedLock();
-	AS_API void              asReleaseSharedLock();
-	AS_API int               asThreadCleanup();
-
-	// Memory management
-	AS_API int   asSetGlobalMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
-	AS_API int   asResetGlobalMemoryFunctions();
-	AS_API void *asAllocMem(size_t size);
-	AS_API void  asFreeMem(void *mem);
-
-	// Auxiliary
-	AS_API asILockableSharedBool *asCreateLockableSharedBool();
-}
-#endif // ANGELSCRIPT_DLL_MANUAL_IMPORT
-
-// Determine traits of a type for registration of value types
-// Relies on C++11 features so it can not be used with non-compliant compilers
-#ifdef AS_CAN_USE_CPP11
-
-END_AS_NAMESPACE
-#include <type_traits>
-BEGIN_AS_NAMESPACE
-
-template<typename T>
-asUINT asGetTypeTraits()
-{
-#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS) || (__GNUC__ >= 5) || defined(__clang__)
-	// MSVC, XCode/Clang, and gnuc 5+
-	// C++11 compliant code
-	bool hasConstructor        = std::is_default_constructible<T>::value && !std::is_trivially_default_constructible<T>::value;
-	bool hasDestructor         = std::is_destructible<T>::value          && !std::is_trivially_destructible<T>::value;
-	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::is_trivially_copy_assignable<T>::value;
-	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::is_trivially_copy_constructible<T>::value;
-#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
-	// gnuc 4.8 is using a mix of C++11 standard and pre-standard templates
-	bool hasConstructor        = std::is_default_constructible<T>::value && !std::has_trivial_default_constructor<T>::value;
-	bool hasDestructor         = std::is_destructible<T>::value          && !std::is_trivially_destructible<T>::value;
-	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::has_trivial_copy_assign<T>::value;
-	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::has_trivial_copy_constructor<T>::value;
-#else
-	// All other compilers and versions are assumed to use non C++11 compliant code until proven otherwise
-	// Not fully C++11 compliant. The has_trivial checks were used while the standard was still
-	// being elaborated, but were then removed in favor of the above is_trivially checks
-	// http://stackoverflow.com/questions/12702103/writing-code-that-works-when-has-trivial-destructor-is-defined-instead-of-is
-	// https://github.com/mozart/mozart2/issues/51
-	bool hasConstructor        = std::is_default_constructible<T>::value && !std::has_trivial_default_constructor<T>::value;
-	bool hasDestructor         = std::is_destructible<T>::value          && !std::has_trivial_destructor<T>::value;
-	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::has_trivial_copy_assign<T>::value;
-	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::has_trivial_copy_constructor<T>::value;
-#endif
-	bool isFloat     = std::is_floating_point<T>::value;
-	bool isPrimitive = std::is_integral<T>::value || std::is_pointer<T>::value || std::is_enum<T>::value;
-	bool isClass     = std::is_class<T>::value;
-	bool isArray     = std::is_array<T>::value;
-
-	if( isFloat )
-		return asOBJ_APP_FLOAT;
-	if( isPrimitive )
-		return asOBJ_APP_PRIMITIVE;
-
-	if( isClass )
-	{
-		asDWORD flags = asOBJ_APP_CLASS;
-		if( hasConstructor )
-			flags |= asOBJ_APP_CLASS_CONSTRUCTOR;
-		if( hasDestructor )
-			flags |= asOBJ_APP_CLASS_DESTRUCTOR;
-		if( hasAssignmentOperator )
-			flags |= asOBJ_APP_CLASS_ASSIGNMENT;
-		if( hasCopyConstructor )
-			flags |= asOBJ_APP_CLASS_COPY_CONSTRUCTOR;
-		return flags;
-	}
-
-	if( isArray )
-		return asOBJ_APP_ARRAY;
-
-	// Unknown type traits
-	return 0;
-}
-
-#endif // c++11
-
-// Interface declarations
-
-class asIScriptEngine
-{
-public:
-	// Memory management
-	virtual int AddRef() const = 0;
-	virtual int Release() const = 0;
-	virtual int ShutDownAndRelease() = 0;
-
-	// Engine properties
-	virtual int     SetEngineProperty(asEEngineProp property, asPWORD value) = 0;
-	virtual asPWORD GetEngineProperty(asEEngineProp property) const = 0;
-
-	// Compiler messages
-	virtual int SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv) = 0;
-	virtual int ClearMessageCallback() = 0;
-	virtual int WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message) = 0;
-
-	// JIT Compiler
-	virtual int SetJITCompiler(asIJITCompiler *compiler) = 0;
-	virtual asIJITCompiler *GetJITCompiler() const = 0;
-
-	// Global functions
-	virtual int                RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0) = 0;
-	virtual asUINT             GetGlobalFunctionCount() const = 0;
-	virtual asIScriptFunction *GetGlobalFunctionByIndex(asUINT index) const = 0;
-	virtual asIScriptFunction *GetGlobalFunctionByDecl(const char *declaration) const = 0;
-
-	// Global properties
-	virtual int    RegisterGlobalProperty(const char *declaration, void *pointer) = 0;
-	virtual asUINT GetGlobalPropertyCount() const = 0;
-	virtual int    GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0, const char **configGroup = 0, void **pointer = 0, asDWORD *accessMask = 0) const = 0;
-	virtual int    GetGlobalPropertyIndexByName(const char *name) const = 0;
-	virtual int    GetGlobalPropertyIndexByDecl(const char *decl) const = 0;
-
-	// Object types
-	virtual int            RegisterObjectType(const char *obj, int byteSize, asDWORD flags) = 0;
-	virtual int            RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset) = 0;
-	virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0) = 0;
-	virtual int            RegisterObjectBehaviour(const char *obj, asEBehaviours behaviour, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0) = 0;
-	virtual int            RegisterInterface(const char *name) = 0;
-	virtual int            RegisterInterfaceMethod(const char *intf, const char *declaration) = 0;
-	virtual asUINT         GetObjectTypeCount() const = 0;
-	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const = 0;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual asITypeInfo   *GetObjectTypeByName(const char *name) const = 0;
-	virtual asITypeInfo   *GetObjectTypeByDecl(const char *decl) const = 0;
-#endif
-
-	// String factory
-	virtual int RegisterStringFactory(const char *datatype, const asSFuncPtr &factoryFunc, asDWORD callConv, void *auxiliary = 0) = 0;
-	virtual int GetStringFactoryReturnTypeId(asDWORD *flags = 0) const = 0;
-
-	// Default array type
-	virtual int RegisterDefaultArrayType(const char *type) = 0;
-	virtual int GetDefaultArrayTypeId() const = 0;
-
-	// Enums
-	virtual int          RegisterEnum(const char *type) = 0;
-	virtual int          RegisterEnumValue(const char *type, const char *name, int value) = 0;
-	virtual asUINT       GetEnumCount() const = 0;
-	virtual asITypeInfo *GetEnumByIndex(asUINT index) const = 0;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual int          GetEnumValueCount(int enumTypeId) const = 0;
-	virtual const char * GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const = 0;
-#endif
-
-	// Funcdefs
-	virtual int          RegisterFuncdef(const char *decl) = 0;
-	virtual asUINT       GetFuncdefCount() const = 0;
-	virtual asITypeInfo *GetFuncdefByIndex(asUINT index) const = 0;
-
-	// Typedefs
-	virtual int          RegisterTypedef(const char *type, const char *decl) = 0;
-	virtual asUINT       GetTypedefCount() const = 0;
-	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const = 0;
-
-	// Configuration groups
-	virtual int         BeginConfigGroup(const char *groupName) = 0;
-	virtual int         EndConfigGroup() = 0;
-	virtual int         RemoveConfigGroup(const char *groupName) = 0;
-	virtual asDWORD     SetDefaultAccessMask(asDWORD defaultMask) = 0;
-	virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
-	virtual const char *GetDefaultNamespace() const = 0;
-
-	// Script modules
-	virtual asIScriptModule *GetModule(const char *module, asEGMFlags flag = asGM_ONLY_IF_EXISTS) = 0;
-	virtual int              DiscardModule(const char *module) = 0;
-	virtual asUINT           GetModuleCount() const = 0;
-	virtual asIScriptModule *GetModuleByIndex(asUINT index) const = 0;
-
-	// Script functions
-	virtual asIScriptFunction *GetFunctionById(int funcId) const = 0;
-#ifdef AS_DEPRECATED
-	// deprecated since 2.31.0, 2016-01-01
-	virtual asIScriptFunction *GetFuncdefFromTypeId(int typeId) const = 0;
-#endif
-
-	// Type identification
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual asITypeInfo   *GetObjectTypeById(int typeId) const = 0;
-#endif
-	virtual int            GetTypeIdByDecl(const char *decl) const = 0;
-	virtual const char    *GetTypeDeclaration(int typeId, bool includeNamespace = false) const = 0;
-	virtual int            GetSizeOfPrimitiveType(int typeId) const = 0;
-	virtual asITypeInfo   *GetTypeInfoById(int typeId) const = 0;
-	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const = 0;
-	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const = 0;
-
-	// Script execution
-	virtual asIScriptContext      *CreateContext() = 0;
-	virtual void                  *CreateScriptObject(const asITypeInfo *type) = 0;
-	virtual void                  *CreateScriptObjectCopy(void *obj, const asITypeInfo *type) = 0;
-	virtual void                  *CreateUninitializedScriptObject(const asITypeInfo *type) = 0;
-	virtual asIScriptFunction     *CreateDelegate(asIScriptFunction *func, void *obj) = 0;
-	virtual int                    AssignScriptObject(void *dstObj, void *srcObj, const asITypeInfo *type) = 0;
-	virtual void                   ReleaseScriptObject(void *obj, const asITypeInfo *type) = 0;
-	virtual void                   AddRefScriptObject(void *obj, const asITypeInfo *type) = 0;
-	virtual int                    RefCastObject(void *obj, asITypeInfo *fromType, asITypeInfo *toType, void **newPtr, bool useOnlyImplicitCast = false) = 0;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.30.0, 2014-11-04
-	virtual bool                   IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const = 0;
-#endif
-	virtual asILockableSharedBool *GetWeakRefFlagOfScriptObject(void *obj, const asITypeInfo *type) const = 0;
-
-	// Context pooling
-	virtual asIScriptContext      *RequestContext() = 0;
-	virtual void                   ReturnContext(asIScriptContext *ctx) = 0;
-	virtual int                    SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param = 0) = 0;
-
-	// String interpretation
-	virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, asUINT *tokenLength = 0) const = 0;
-
-	// Garbage collection
-	virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE, asUINT numIterations = 1) = 0;
-	virtual void GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed = 0, asUINT *totalDetected = 0, asUINT *newObjects = 0, asUINT *totalNewDestroyed = 0) const = 0;
-	virtual int  NotifyGarbageCollectorOfNewObject(void *obj, asITypeInfo *type) = 0;
-	virtual int  GetObjectInGC(asUINT idx, asUINT *seqNbr = 0, void **obj = 0, asITypeInfo **type = 0) = 0;
-	virtual void GCEnumCallback(void *reference) = 0;
-
-	// User data
-	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
-	virtual void *GetUserData(asPWORD type = 0) const = 0;
-	virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type = 0) = 0;
-	virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type = 0) = 0;
-	virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type = 0) = 0;
-	virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type = 0) = 0;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual void  SetObjectTypeUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type = 0) = 0;
-#endif
-	virtual void  SetTypeInfoUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type = 0) = 0;
-	virtual void  SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type = 0) = 0;
-
-protected:
-	virtual ~asIScriptEngine() {}
-};
-
-class asIThreadManager
-{
-protected:
-	virtual ~asIThreadManager() {}
-};
-
-class asIScriptModule
-{
-public:
-	virtual asIScriptEngine *GetEngine() const = 0;
-	virtual void             SetName(const char *name) = 0;
-	virtual const char      *GetName() const = 0;
-	virtual void             Discard() = 0;
-
-	// Compilation
-	virtual int         AddScriptSection(const char *name, const char *code, size_t codeLength = 0, int lineOffset = 0) = 0;
-	virtual int         Build() = 0;
-	virtual int         CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asIScriptFunction **outFunc) = 0;
-	virtual int         CompileGlobalVar(const char *sectionName, const char *code, int lineOffset) = 0;
-	virtual asDWORD     SetAccessMask(asDWORD accessMask) = 0;
-	virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
-	virtual const char *GetDefaultNamespace() const = 0;
-
-	// Functions
-	virtual asUINT             GetFunctionCount() const = 0;
-	virtual asIScriptFunction *GetFunctionByIndex(asUINT index) const = 0;
-	virtual asIScriptFunction *GetFunctionByDecl(const char *decl) const = 0;
-	virtual asIScriptFunction *GetFunctionByName(const char *name) const = 0;
-	virtual int                RemoveFunction(asIScriptFunction *func) = 0;
-
-	// Global variables
-	virtual int         ResetGlobalVars(asIScriptContext *ctx = 0) = 0;
-	virtual asUINT      GetGlobalVarCount() const = 0;
-	virtual int         GetGlobalVarIndexByName(const char *name) const = 0;
-	virtual int         GetGlobalVarIndexByDecl(const char *decl) const = 0;
-	virtual const char *GetGlobalVarDeclaration(asUINT index, bool includeNamespace = false) const = 0;
-	virtual int         GetGlobalVar(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0) const = 0;
-	virtual void       *GetAddressOfGlobalVar(asUINT index) = 0;
-	virtual int         RemoveGlobalVar(asUINT index) = 0;
-
-	// Type identification
-	virtual asUINT         GetObjectTypeCount() const = 0;
-	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const = 0;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual asITypeInfo   *GetObjectTypeByName(const char *name) const = 0;
-	virtual asITypeInfo   *GetObjectTypeByDecl(const char *decl) const = 0;
-#endif
-	virtual int            GetTypeIdByDecl(const char *decl) const = 0;
-	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const = 0;
-	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const = 0;
-
-	// Enums
-	virtual asUINT       GetEnumCount() const = 0;
-	virtual asITypeInfo *GetEnumByIndex(asUINT index) const = 0;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual int          GetEnumValueCount(int enumTypeId) const = 0;
-	virtual const char * GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const = 0;
-#endif
-
-	// Typedefs
-	virtual asUINT       GetTypedefCount() const = 0;
-	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const = 0;
-
-	// Dynamic binding between modules
-	virtual asUINT      GetImportedFunctionCount() const = 0;
-	virtual int         GetImportedFunctionIndexByDecl(const char *decl) const = 0;
-	virtual const char *GetImportedFunctionDeclaration(asUINT importIndex) const = 0;
-	virtual const char *GetImportedFunctionSourceModule(asUINT importIndex) const = 0;
-	virtual int         BindImportedFunction(asUINT importIndex, asIScriptFunction *func) = 0;
-	virtual int         UnbindImportedFunction(asUINT importIndex) = 0;
-	virtual int         BindAllImportedFunctions() = 0;
-	virtual int         UnbindAllImportedFunctions() = 0;
-
-	// Byte code saving and loading
-	virtual int SaveByteCode(asIBinaryStream *out, bool stripDebugInfo = false) const = 0;
-	virtual int LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped = 0) = 0;
-
-	// User data
-	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
-	virtual void *GetUserData(asPWORD type = 0) const = 0;
-
-protected:
-	virtual ~asIScriptModule() {}
-};
-
-class asIScriptContext
-{
-public:
-	// Memory management
-	virtual int AddRef() const = 0;
-	virtual int Release() const = 0;
-
-	// Miscellaneous
-	virtual asIScriptEngine *GetEngine() const = 0;
-
-	// Execution
-	virtual int             Prepare(asIScriptFunction *func) = 0;
-	virtual int             Unprepare() = 0;
-	virtual int             Execute() = 0;
-	virtual int             Abort() = 0;
-	virtual int             Suspend() = 0;
-	virtual asEContextState GetState() const = 0;
-	virtual int             PushState() = 0;
-	virtual int             PopState() = 0;
-	virtual bool            IsNested(asUINT *nestCount = 0) const = 0;
-
-	// Object pointer for calling class methods
-	virtual int   SetObject(void *obj) = 0;
-
-	// Arguments
-	virtual int   SetArgByte(asUINT arg, asBYTE value) = 0;
-	virtual int   SetArgWord(asUINT arg, asWORD value) = 0;
-	virtual int   SetArgDWord(asUINT arg, asDWORD value) = 0;
-	virtual int   SetArgQWord(asUINT arg, asQWORD value) = 0;
-	virtual int   SetArgFloat(asUINT arg, float value) = 0;
-	virtual int   SetArgDouble(asUINT arg, double value) = 0;
-	virtual int   SetArgAddress(asUINT arg, void *addr) = 0;
-	virtual int   SetArgObject(asUINT arg, void *obj) = 0;
-	virtual int   SetArgVarType(asUINT arg, void *ptr, int typeId) = 0;
-	virtual void *GetAddressOfArg(asUINT arg) = 0;
-
-	// Return value
-	virtual asBYTE  GetReturnByte() = 0;
-	virtual asWORD  GetReturnWord() = 0;
-	virtual asDWORD GetReturnDWord() = 0;
-	virtual asQWORD GetReturnQWord() = 0;
-	virtual float   GetReturnFloat() = 0;
-	virtual double  GetReturnDouble() = 0;
-	virtual void   *GetReturnAddress() = 0;
-	virtual void   *GetReturnObject() = 0;
-	virtual void   *GetAddressOfReturnValue() = 0;
-
-	// Exception handling
-	virtual int                SetException(const char *string) = 0;
-	virtual int                GetExceptionLineNumber(int *column = 0, const char **sectionName = 0) = 0;
-	virtual asIScriptFunction *GetExceptionFunction() = 0;
-	virtual const char *       GetExceptionString() = 0;
-	virtual int                SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
-	virtual void               ClearExceptionCallback() = 0;
-
-	// Debugging
-	virtual int                SetLineCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
-	virtual void               ClearLineCallback() = 0;
-	virtual asUINT             GetCallstackSize() const = 0;
-	virtual asIScriptFunction *GetFunction(asUINT stackLevel = 0) = 0;
-	virtual int                GetLineNumber(asUINT stackLevel = 0, int *column = 0, const char **sectionName = 0) = 0;
-	virtual int                GetVarCount(asUINT stackLevel = 0) = 0;
-	virtual const char        *GetVarName(asUINT varIndex, asUINT stackLevel = 0) = 0;
-	virtual const char        *GetVarDeclaration(asUINT varIndex, asUINT stackLevel = 0, bool includeNamespace = false) = 0;
-	virtual int                GetVarTypeId(asUINT varIndex, asUINT stackLevel = 0) = 0;
-	virtual void              *GetAddressOfVar(asUINT varIndex, asUINT stackLevel = 0) = 0;
-	virtual bool               IsVarInScope(asUINT varIndex, asUINT stackLevel = 0) = 0;
-	virtual int                GetThisTypeId(asUINT stackLevel = 0) = 0;
-	virtual void              *GetThisPointer(asUINT stackLevel = 0) = 0;
-	virtual asIScriptFunction *GetSystemFunction() = 0;
-
-	// User data
-	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
-	virtual void *GetUserData(asPWORD type = 0) const = 0;
-
-protected:
-	virtual ~asIScriptContext() {}
-};
-
-class asIScriptGeneric
-{
-public:
-	// Miscellaneous
-	virtual asIScriptEngine   *GetEngine() const = 0;
-	virtual asIScriptFunction *GetFunction() const = 0;
-	virtual void              *GetAuxiliary() const = 0;
-
-	// Object
-	virtual void   *GetObject() = 0;
-	virtual int     GetObjectTypeId() const = 0;
-
-	// Arguments
-	virtual int     GetArgCount() const = 0;
-	virtual int     GetArgTypeId(asUINT arg, asDWORD *flags = 0) const = 0;
-	virtual asBYTE  GetArgByte(asUINT arg) = 0;
-	virtual asWORD  GetArgWord(asUINT arg) = 0;
-	virtual asDWORD GetArgDWord(asUINT arg) = 0;
-	virtual asQWORD GetArgQWord(asUINT arg) = 0;
-	virtual float   GetArgFloat(asUINT arg) = 0;
-	virtual double  GetArgDouble(asUINT arg) = 0;
-	virtual void   *GetArgAddress(asUINT arg) = 0;
-	virtual void   *GetArgObject(asUINT arg) = 0;
-	virtual void   *GetAddressOfArg(asUINT arg) = 0;
-
-	// Return value
-	virtual int     GetReturnTypeId(asDWORD *flags = 0) const = 0;
-	virtual int     SetReturnByte(asBYTE val) = 0;
-	virtual int     SetReturnWord(asWORD val) = 0;
-	virtual int     SetReturnDWord(asDWORD val) = 0;
-	virtual int     SetReturnQWord(asQWORD val) = 0;
-	virtual int     SetReturnFloat(float val) = 0;
-	virtual int     SetReturnDouble(double val) = 0;
-	virtual int     SetReturnAddress(void *addr) = 0;
-	virtual int     SetReturnObject(void *obj) = 0;
-	virtual void   *GetAddressOfReturnLocation() = 0;
-
-protected:
-	virtual ~asIScriptGeneric() {}
-};
-
-class asIScriptObject
-{
-public:
-	// Memory management
-	virtual int                    AddRef() const = 0;
-	virtual int                    Release() const = 0;
-	virtual asILockableSharedBool *GetWeakRefFlag() const = 0;
-
-	// Type info
-	virtual int            GetTypeId() const = 0;
-	virtual asITypeInfo   *GetObjectType() const = 0;
-
-	// Class properties
-	virtual asUINT      GetPropertyCount() const = 0;
-	virtual int         GetPropertyTypeId(asUINT prop) const = 0;
-	virtual const char *GetPropertyName(asUINT prop) const = 0;
-	virtual void       *GetAddressOfProperty(asUINT prop) = 0;
-
-	// Miscellaneous
-	virtual asIScriptEngine *GetEngine() const = 0;
-	virtual int              CopyFrom(asIScriptObject *other) = 0;
-
-	// User data
-	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
-	virtual void *GetUserData(asPWORD type = 0) const = 0;
-
-protected:
-	virtual ~asIScriptObject() {}
-};
-
-class asITypeInfo
-{
-public:
-	// Miscellaneous
-	virtual asIScriptEngine *GetEngine() const = 0;
-	virtual const char      *GetConfigGroup() const = 0;
-	virtual asDWORD          GetAccessMask() const = 0;
-	virtual asIScriptModule *GetModule() const = 0;
-
-	// Memory management
-	virtual int AddRef() const = 0;
-	virtual int Release() const = 0;
-
-	// Type info
-	virtual const char      *GetName() const = 0;
-	virtual	const char      *GetNamespace() const = 0;
-	virtual asITypeInfo     *GetBaseType() const = 0;
-	virtual bool             DerivesFrom(const asITypeInfo *objType) const = 0;
-	virtual asDWORD          GetFlags() const = 0;
-	virtual asUINT           GetSize() const = 0;
-	virtual int              GetTypeId() const = 0;
-	virtual int              GetSubTypeId(asUINT subTypeIndex = 0) const = 0;
-	virtual asITypeInfo     *GetSubType(asUINT subTypeIndex = 0) const = 0;
-	virtual asUINT           GetSubTypeCount() const = 0;
-
-	// Interfaces
-	virtual asUINT           GetInterfaceCount() const = 0;
-	virtual asITypeInfo     *GetInterface(asUINT index) const = 0;
-	virtual bool             Implements(const asITypeInfo *objType) const = 0;
-
-	// Factories
-	virtual asUINT             GetFactoryCount() const = 0;
-	virtual asIScriptFunction *GetFactoryByIndex(asUINT index) const = 0;
-	virtual asIScriptFunction *GetFactoryByDecl(const char *decl) const = 0;
-
-	// Methods
-	virtual asUINT             GetMethodCount() const = 0;
-	virtual asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual = true) const = 0;
-	virtual asIScriptFunction *GetMethodByName(const char *name, bool getVirtual = true) const = 0;
-	virtual asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual = true) const = 0;
-
-	// Properties
-	virtual asUINT      GetPropertyCount() const = 0;
-	virtual int         GetProperty(asUINT index, const char **name, int *typeId = 0, bool *isPrivate = 0, bool *isProtected = 0, int *offset = 0, bool *isReference = 0, asDWORD *accessMask = 0) const = 0;
-	virtual const char *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const = 0;
-
-	// Behaviours
-	virtual asUINT             GetBehaviourCount() const = 0;
-	virtual asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const = 0;
-
-	// Child types
-	virtual asUINT       GetChildFuncdefCount() const = 0;
-	virtual asITypeInfo *GetChildFuncdef(asUINT index) const = 0;
-	virtual asITypeInfo *GetParentType() const = 0;
-
-	// Enums
-	virtual asUINT      GetEnumValueCount() const = 0;
-	virtual const char *GetEnumValueByIndex(asUINT index, int *outValue) const = 0;
-
-	// Typedef
-	virtual int GetTypedefTypeId() const = 0;
-
-	// Funcdef
-	virtual asIScriptFunction *GetFuncdefSignature() const = 0;
-
-	// User data
-	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
-	virtual void *GetUserData(asPWORD type = 0) const = 0;
-
-protected:
-	virtual ~asITypeInfo() {}
-};
-
-class asIScriptFunction
-{
-public:
-	virtual asIScriptEngine *GetEngine() const = 0;
-
-	// Memory management
-	virtual int              AddRef() const = 0;
-	virtual int              Release() const = 0;
-
-	// Miscellaneous
-	virtual int              GetId() const = 0;
-	virtual asEFuncType      GetFuncType() const = 0;
-	virtual const char      *GetModuleName() const = 0;
-	virtual asIScriptModule *GetModule() const = 0;
-	virtual const char      *GetScriptSectionName() const = 0;
-	virtual const char      *GetConfigGroup() const = 0;
-	virtual asDWORD          GetAccessMask() const = 0;
-	virtual void            *GetAuxiliary() const = 0;
-
-	// Function signature
-	virtual asITypeInfo     *GetObjectType() const = 0;
-	virtual const char      *GetObjectName() const = 0;
-	virtual const char      *GetName() const = 0;
-	virtual const char      *GetNamespace() const = 0;
-	virtual const char      *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const = 0;
-	virtual bool             IsReadOnly() const = 0;
-	virtual bool             IsPrivate() const = 0;
-	virtual bool             IsProtected() const = 0;
-	virtual bool             IsFinal() const = 0;
-	virtual bool             IsOverride() const = 0;
-	virtual bool             IsShared() const = 0;
-	virtual asUINT           GetParamCount() const = 0;
-	virtual int              GetParam(asUINT index, int *typeId, asDWORD *flags = 0, const char **name = 0, const char **defaultArg = 0) const = 0;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.29.0, 2014-04-06
-	virtual int              GetParamTypeId(asUINT index, asDWORD *flags = 0) const = 0;
-#endif
-	virtual int              GetReturnTypeId(asDWORD *flags = 0) const = 0;
-
-	// Type id for function pointers
-	virtual int              GetTypeId() const = 0;
-	virtual bool             IsCompatibleWithTypeId(int typeId) const = 0;
-
-	// Delegates
-	virtual void              *GetDelegateObject() const = 0;
-	virtual asITypeInfo       *GetDelegateObjectType() const = 0;
-	virtual asIScriptFunction *GetDelegateFunction() const = 0;
-
-	// Debug information
-	virtual asUINT           GetVarCount() const = 0;
-	virtual int              GetVar(asUINT index, const char **name, int *typeId = 0) const = 0;
-	virtual const char      *GetVarDecl(asUINT index, bool includeNamespace = false) const = 0;
-	virtual int              FindNextLineWithCode(int line) const = 0;
-
-	// For JIT compilation
-	virtual asDWORD         *GetByteCode(asUINT *length = 0) = 0;
-
-	// User data
-	virtual void            *SetUserData(void *userData, asPWORD type = 0) = 0;
-	virtual void            *GetUserData(asPWORD type = 0) const = 0;
-
-protected:
-	virtual ~asIScriptFunction() {};
-};
-
-class asIBinaryStream
-{
-public:
-	virtual void Read(void *ptr, asUINT size) = 0;
-	virtual void Write(const void *ptr, asUINT size) = 0;
-
-public:
-	virtual ~asIBinaryStream() {}
-};
-
-class asILockableSharedBool
-{
-public:
-	// Memory management
-	virtual int AddRef() const = 0;
-	virtual int Release() const = 0;
-
-	// Value
-	virtual bool Get() const = 0;
-	virtual void Set(bool val) = 0;
-
-	// Thread management
-	virtual void Lock() const = 0;
-	virtual void Unlock() const = 0;
-
-protected:
-	virtual ~asILockableSharedBool() {}
-};
-
-//-----------------------------------------------------------------
-// Function pointers
-
-// Template function to capture all global functions,
-// except the ones using the generic calling convention
-template <class T>
-inline asSFuncPtr asFunctionPtr(T func)
-{
-	// Mark this as a global function
-	asSFuncPtr p(2);
-
-#ifdef AS_64BIT_PTR
-	// The size_t cast is to avoid a compiler warning with asFUNCTION(0)
-	// on 64bit, as 0 is interpreted as a 32bit int value
-	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(size_t(func));
-#else
-	// MSVC6 doesn't like the size_t cast above so I
-	// solved this with a separate code for 32bit.
-	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
-#endif
-
-	return p;
-}
-
-// Specialization for functions using the generic calling convention
-template<>
-inline asSFuncPtr asFunctionPtr<asGENFUNC_t>(asGENFUNC_t func)
-{
-	// Mark this as a generic function
-	asSFuncPtr p(1);
-	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
-	return p;
-}
-
-#ifndef AS_NO_CLASS_METHODS
-
-// Method pointers
-
-// Declare a dummy class so that we can determine the size of a simple method pointer
-class asCSimpleDummy {};
-typedef void (asCSimpleDummy::*asSIMPLEMETHOD_t)();
-const int SINGLE_PTR_SIZE = sizeof(asSIMPLEMETHOD_t);
-
-// Define template
-template <int N>
-struct asSMethodPtr
-{
-	template<class M>
-	static asSFuncPtr Convert(M Mthd)
-	{
-		// This version of the function should never be executed, nor compiled,
-		// as it would mean that the size of the method pointer cannot be determined.
-
-		int ERROR_UnsupportedMethodPtr[N-100];
-
-		asSFuncPtr p(0);
-		return p;
-	}
-};
-
-// Template specialization
-template <>
-struct asSMethodPtr<SINGLE_PTR_SIZE>
-{
-	template<class M>
-	static asSFuncPtr Convert(M Mthd)
-	{
-		// Mark this as a class method
-		asSFuncPtr p(3);
-		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE);
-		return p;
-	}
-};
-
-#if defined(_MSC_VER) && !defined(__MWERKS__)
-
-// MSVC and Intel uses different sizes for different class method pointers
-template <>
-struct asSMethodPtr<SINGLE_PTR_SIZE+1*sizeof(int)>
-{
-	template <class M>
-	static asSFuncPtr Convert(M Mthd)
-	{
-		// Mark this as a class method
-		asSFuncPtr p(3);
-		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+sizeof(int));
-		return p;
-	}
-};
-
-template <>
-struct asSMethodPtr<SINGLE_PTR_SIZE+2*sizeof(int)>
-{
-	template <class M>
-	static asSFuncPtr Convert(M Mthd)
-	{
-		// On 32bit platforms with is where a class with virtual inheritance falls.
-		// On 64bit platforms we can also fall here if 8byte data alignments is used.
-
-		// Mark this as a class method
-		asSFuncPtr p(3);
-		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+2*sizeof(int));
-
-		// Microsoft has a terrible optimization on class methods with virtual inheritance.
-		// They are hardcoding an important offset, which is not coming in the method pointer.
-
-#if defined(_MSC_VER) && !defined(AS_64BIT_PTR)
-			// Method pointers for virtual inheritance is not supported,
-			// as it requires the location of the vbase table, which is
-			// only available to the C++ compiler, but not in the method
-			// pointer.
-
-			// You can get around this by forward declaring the class and
-			// storing the sizeof its method pointer in a constant. Example:
-
-			// class ClassWithVirtualInheritance;
-			// const int ClassWithVirtualInheritance_workaround = sizeof(void ClassWithVirtualInheritance::*());
-
-			// This will force the compiler to use the unknown type
-			// for the class, which falls under the next case
-
-
-			// Copy the virtual table index to the 4th dword so that AngelScript
-			// can properly detect and deny the use of methods with virtual inheritance.
-			*(reinterpret_cast<asDWORD*>(&p)+3) = *(reinterpret_cast<asDWORD*>(&p)+2);
-#endif
-
-		return p;
-	}
-};
-
-template <>
-struct asSMethodPtr<SINGLE_PTR_SIZE+3*sizeof(int)>
-{
-	template <class M>
-	static asSFuncPtr Convert(M Mthd)
-	{
-		// Mark this as a class method
-		asSFuncPtr p(3);
-		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+3*sizeof(int));
-		return p;
-	}
-};
-
-template <>
-struct asSMethodPtr<SINGLE_PTR_SIZE+4*sizeof(int)>
-{
-	template <class M>
-	static asSFuncPtr Convert(M Mthd)
-	{
-		// On 64bit platforms with 8byte data alignment
-		// the unknown class method pointers will come here.
-
-		// Mark this as a class method
-		asSFuncPtr p(3);
-		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+4*sizeof(int));
-		return p;
-	}
-};
-
-#endif
-
-#endif // AS_NO_CLASS_METHODS
-
-//----------------------------------------------------------------
-// JIT compiler
-
-struct asSVMRegisters
-{
-	asDWORD          *programPointer;     // points to current bytecode instruction
-	asDWORD          *stackFramePointer;  // function stack frame
-	asDWORD          *stackPointer;       // top of stack (grows downward)
-	asQWORD           valueRegister;      // temp register for primitives
-	void             *objectRegister;     // temp register for objects and handles
-	asITypeInfo      *objectType;         // type of object held in object register
-	bool              doProcessSuspend;   // whether or not the JIT should break out when it encounters a suspend instruction
-	asIScriptContext *ctx;                // the active context
-};
-
-typedef void (*asJITFunction)(asSVMRegisters *registers, asPWORD jitArg);
-
-class asIJITCompiler
-{
-public:
-	virtual int  CompileFunction(asIScriptFunction *function, asJITFunction *output) = 0;
-	virtual void ReleaseJITFunction(asJITFunction func) = 0;
-public:
-	virtual ~asIJITCompiler() {}
-};
-
-// Byte code instructions
-enum asEBCInstr
-{
-	asBC_PopPtr			= 0,
-	asBC_PshGPtr		= 1,
-	asBC_PshC4			= 2,
-	asBC_PshV4			= 3,
-	asBC_PSF			= 4,
-	asBC_SwapPtr		= 5,
-	asBC_NOT			= 6,
-	asBC_PshG4			= 7,
-	asBC_LdGRdR4		= 8,
-	asBC_CALL			= 9,
-	asBC_RET			= 10,
-	asBC_JMP			= 11,
-	asBC_JZ				= 12,
-	asBC_JNZ			= 13,
-	asBC_JS				= 14,
-	asBC_JNS			= 15,
-	asBC_JP				= 16,
-	asBC_JNP			= 17,
-	asBC_TZ				= 18,
-	asBC_TNZ			= 19,
-	asBC_TS				= 20,
-	asBC_TNS			= 21,
-	asBC_TP				= 22,
-	asBC_TNP			= 23,
-	asBC_NEGi			= 24,
-	asBC_NEGf			= 25,
-	asBC_NEGd			= 26,
-	asBC_INCi16			= 27,
-	asBC_INCi8			= 28,
-	asBC_DECi16			= 29,
-	asBC_DECi8			= 30,
-	asBC_INCi			= 31,
-	asBC_DECi			= 32,
-	asBC_INCf			= 33,
-	asBC_DECf			= 34,
-	asBC_INCd			= 35,
-	asBC_DECd			= 36,
-	asBC_IncVi			= 37,
-	asBC_DecVi			= 38,
-	asBC_BNOT			= 39,
-	asBC_BAND			= 40,
-	asBC_BOR			= 41,
-	asBC_BXOR			= 42,
-	asBC_BSLL			= 43,
-	asBC_BSRL			= 44,
-	asBC_BSRA			= 45,
-	asBC_COPY			= 46,
-	asBC_PshC8			= 47,
-	asBC_PshVPtr		= 48,
-	asBC_RDSPtr			= 49,
-	asBC_CMPd			= 50,
-	asBC_CMPu			= 51,
-	asBC_CMPf			= 52,
-	asBC_CMPi			= 53,
-	asBC_CMPIi			= 54,
-	asBC_CMPIf			= 55,
-	asBC_CMPIu			= 56,
-	asBC_JMPP			= 57,
-	asBC_PopRPtr		= 58,
-	asBC_PshRPtr		= 59,
-	asBC_STR			= 60,
-	asBC_CALLSYS		= 61,
-	asBC_CALLBND		= 62,
-	asBC_SUSPEND		= 63,
-	asBC_ALLOC			= 64,
-	asBC_FREE			= 65,
-	asBC_LOADOBJ		= 66,
-	asBC_STOREOBJ		= 67,
-	asBC_GETOBJ			= 68,
-	asBC_REFCPY			= 69,
-	asBC_CHKREF			= 70,
-	asBC_GETOBJREF		= 71,
-	asBC_GETREF			= 72,
-	asBC_PshNull		= 73,
-	asBC_ClrVPtr		= 74,
-	asBC_OBJTYPE		= 75,
-	asBC_TYPEID			= 76,
-	asBC_SetV4			= 77,
-	asBC_SetV8			= 78,
-	asBC_ADDSi			= 79,
-	asBC_CpyVtoV4		= 80,
-	asBC_CpyVtoV8		= 81,
-	asBC_CpyVtoR4		= 82,
-	asBC_CpyVtoR8		= 83,
-	asBC_CpyVtoG4		= 84,
-	asBC_CpyRtoV4		= 85,
-	asBC_CpyRtoV8		= 86,
-	asBC_CpyGtoV4		= 87,
-	asBC_WRTV1			= 88,
-	asBC_WRTV2			= 89,
-	asBC_WRTV4			= 90,
-	asBC_WRTV8			= 91,
-	asBC_RDR1			= 92,
-	asBC_RDR2			= 93,
-	asBC_RDR4			= 94,
-	asBC_RDR8			= 95,
-	asBC_LDG			= 96,
-	asBC_LDV			= 97,
-	asBC_PGA			= 98,
-	asBC_CmpPtr			= 99,
-	asBC_VAR			= 100,
-	asBC_iTOf			= 101,
-	asBC_fTOi			= 102,
-	asBC_uTOf			= 103,
-	asBC_fTOu			= 104,
-	asBC_sbTOi			= 105,
-	asBC_swTOi			= 106,
-	asBC_ubTOi			= 107,
-	asBC_uwTOi			= 108,
-	asBC_dTOi			= 109,
-	asBC_dTOu			= 110,
-	asBC_dTOf			= 111,
-	asBC_iTOd			= 112,
-	asBC_uTOd			= 113,
-	asBC_fTOd			= 114,
-	asBC_ADDi			= 115,
-	asBC_SUBi			= 116,
-	asBC_MULi			= 117,
-	asBC_DIVi			= 118,
-	asBC_MODi			= 119,
-	asBC_ADDf			= 120,
-	asBC_SUBf			= 121,
-	asBC_MULf			= 122,
-	asBC_DIVf			= 123,
-	asBC_MODf			= 124,
-	asBC_ADDd			= 125,
-	asBC_SUBd			= 126,
-	asBC_MULd			= 127,
-	asBC_DIVd			= 128,
-	asBC_MODd			= 129,
-	asBC_ADDIi			= 130,
-	asBC_SUBIi			= 131,
-	asBC_MULIi			= 132,
-	asBC_ADDIf			= 133,
-	asBC_SUBIf			= 134,
-	asBC_MULIf			= 135,
-	asBC_SetG4			= 136,
-	asBC_ChkRefS		= 137,
-	asBC_ChkNullV		= 138,
-	asBC_CALLINTF		= 139,
-	asBC_iTOb			= 140,
-	asBC_iTOw			= 141,
-	asBC_SetV1			= 142,
-	asBC_SetV2			= 143,
-	asBC_Cast			= 144,
-	asBC_i64TOi			= 145,
-	asBC_uTOi64			= 146,
-	asBC_iTOi64			= 147,
-	asBC_fTOi64			= 148,
-	asBC_dTOi64			= 149,
-	asBC_fTOu64			= 150,
-	asBC_dTOu64			= 151,
-	asBC_i64TOf			= 152,
-	asBC_u64TOf			= 153,
-	asBC_i64TOd			= 154,
-	asBC_u64TOd			= 155,
-	asBC_NEGi64			= 156,
-	asBC_INCi64			= 157,
-	asBC_DECi64			= 158,
-	asBC_BNOT64			= 159,
-	asBC_ADDi64			= 160,
-	asBC_SUBi64			= 161,
-	asBC_MULi64			= 162,
-	asBC_DIVi64			= 163,
-	asBC_MODi64			= 164,
-	asBC_BAND64			= 165,
-	asBC_BOR64			= 166,
-	asBC_BXOR64			= 167,
-	asBC_BSLL64			= 168,
-	asBC_BSRL64			= 169,
-	asBC_BSRA64			= 170,
-	asBC_CMPi64			= 171,
-	asBC_CMPu64			= 172,
-	asBC_ChkNullS		= 173,
-	asBC_ClrHi			= 174,
-	asBC_JitEntry		= 175,
-	asBC_CallPtr		= 176,
-	asBC_FuncPtr		= 177,
-	asBC_LoadThisR		= 178,
-	asBC_PshV8			= 179,
-	asBC_DIVu			= 180,
-	asBC_MODu			= 181,
-	asBC_DIVu64			= 182,
-	asBC_MODu64			= 183,
-	asBC_LoadRObjR		= 184,
-	asBC_LoadVObjR		= 185,
-	asBC_RefCpyV		= 186,
-	asBC_JLowZ			= 187,
-	asBC_JLowNZ			= 188,
-	asBC_AllocMem		= 189,
-	asBC_SetListSize	= 190,
-	asBC_PshListElmnt	= 191,
-	asBC_SetListType	= 192,
-	asBC_POWi			= 193,
-	asBC_POWu			= 194,
-	asBC_POWf			= 195,
-	asBC_POWd			= 196,
-	asBC_POWdi			= 197,
-	asBC_POWi64			= 198,
-	asBC_POWu64			= 199,
-	asBC_Thiscall1		= 200,
-	asBC_MAXBYTECODE	= 201,
-
-	// Temporary tokens. Can't be output to the final program
-	asBC_VarDecl		= 251,
-	asBC_Block			= 252,
-	asBC_ObjInfo		= 253,
-	asBC_LINE			= 254,
-	asBC_LABEL			= 255
-};
-
-// Instruction types
-enum asEBCType
-{
-	asBCTYPE_INFO         = 0,
-	asBCTYPE_NO_ARG       = 1,
-	asBCTYPE_W_ARG        = 2,
-	asBCTYPE_wW_ARG       = 3,
-	asBCTYPE_DW_ARG       = 4,
-	asBCTYPE_rW_DW_ARG    = 5,
-	asBCTYPE_QW_ARG       = 6,
-	asBCTYPE_DW_DW_ARG    = 7,
-	asBCTYPE_wW_rW_rW_ARG = 8,
-	asBCTYPE_wW_QW_ARG    = 9,
-	asBCTYPE_wW_rW_ARG    = 10,
-	asBCTYPE_rW_ARG       = 11,
-	asBCTYPE_wW_DW_ARG    = 12,
-	asBCTYPE_wW_rW_DW_ARG = 13,
-	asBCTYPE_rW_rW_ARG    = 14,
-	asBCTYPE_wW_W_ARG     = 15,
-	asBCTYPE_QW_DW_ARG    = 16,
-	asBCTYPE_rW_QW_ARG    = 17,
-	asBCTYPE_W_DW_ARG     = 18,
-	asBCTYPE_rW_W_DW_ARG  = 19,
-	asBCTYPE_rW_DW_DW_ARG = 20
-};
-
-// Instruction type sizes
-const int asBCTypeSize[21] =
-{
-	0, // asBCTYPE_INFO
-	1, // asBCTYPE_NO_ARG
-	1, // asBCTYPE_W_ARG
-	1, // asBCTYPE_wW_ARG
-	2, // asBCTYPE_DW_ARG
-	2, // asBCTYPE_rW_DW_ARG
-	3, // asBCTYPE_QW_ARG
-	3, // asBCTYPE_DW_DW_ARG
-	2, // asBCTYPE_wW_rW_rW_ARG
-	3, // asBCTYPE_wW_QW_ARG
-	2, // asBCTYPE_wW_rW_ARG
-	1, // asBCTYPE_rW_ARG
-	2, // asBCTYPE_wW_DW_ARG
-	3, // asBCTYPE_wW_rW_DW_ARG
-	2, // asBCTYPE_rW_rW_ARG
-	2, // asBCTYPE_wW_W_ARG
-	4, // asBCTYPE_QW_DW_ARG
-	3, // asBCTYPE_rW_QW_ARG
-	2, // asBCTYPE_W_DW_ARG
-	3, // asBCTYPE_rW_W_DW_ARG
-	3  // asBCTYPE_rW_DW_DW_ARG
-};
-
-// Instruction info
-struct asSBCInfo
-{
-	asEBCInstr  bc;
-	asEBCType   type;
-	int         stackInc;
-	const char *name;
-};
-
-#ifndef AS_64BIT_PTR
-	#define asBCTYPE_PTR_ARG    asBCTYPE_DW_ARG
-	#define asBCTYPE_PTR_DW_ARG asBCTYPE_DW_DW_ARG
-	#define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_DW_ARG
-	#define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_DW_ARG
-	#ifndef AS_PTR_SIZE
-		#define AS_PTR_SIZE 1
-	#endif
-#else
-	#define asBCTYPE_PTR_ARG    asBCTYPE_QW_ARG
-	#define asBCTYPE_PTR_DW_ARG asBCTYPE_QW_DW_ARG
-	#define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_QW_ARG
-	#define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_QW_ARG
-	#ifndef AS_PTR_SIZE
-		#define AS_PTR_SIZE 2
-	#endif
-#endif
-
-#define asBCINFO(b,t,s) {asBC_##b, asBCTYPE_##t, s, #b}
-#define asBCINFO_DUMMY(b) {asBC_MAXBYTECODE, asBCTYPE_INFO, 0, "BC_" #b}
-
-const asSBCInfo asBCInfo[256] =
-{
-	asBCINFO(PopPtr,	NO_ARG,			-AS_PTR_SIZE),
-	asBCINFO(PshGPtr,	PTR_ARG,		AS_PTR_SIZE),
-	asBCINFO(PshC4,		DW_ARG,			1),
-	asBCINFO(PshV4,		rW_ARG,			1),
-	asBCINFO(PSF,		rW_ARG,			AS_PTR_SIZE),
-	asBCINFO(SwapPtr,	NO_ARG,			0),
-	asBCINFO(NOT,		rW_ARG,			0),
-	asBCINFO(PshG4,		PTR_ARG,		1),
-	asBCINFO(LdGRdR4,	wW_PTR_ARG,		0),
-	asBCINFO(CALL,		DW_ARG,			0xFFFF),
-	asBCINFO(RET,		W_ARG,			0xFFFF),
-	asBCINFO(JMP,		DW_ARG,			0),
-	asBCINFO(JZ,		DW_ARG,			0),
-	asBCINFO(JNZ,		DW_ARG,			0),
-	asBCINFO(JS,		DW_ARG,			0),
-	asBCINFO(JNS,		DW_ARG,			0),
-	asBCINFO(JP,		DW_ARG,			0),
-	asBCINFO(JNP,		DW_ARG,			0),
-	asBCINFO(TZ,		NO_ARG,			0),
-	asBCINFO(TNZ,		NO_ARG,			0),
-	asBCINFO(TS,		NO_ARG,			0),
-	asBCINFO(TNS,		NO_ARG,			0),
-	asBCINFO(TP,		NO_ARG,			0),
-	asBCINFO(TNP,		NO_ARG,			0),
-	asBCINFO(NEGi,		rW_ARG,			0),
-	asBCINFO(NEGf,		rW_ARG,			0),
-	asBCINFO(NEGd,		rW_ARG,			0),
-	asBCINFO(INCi16,	NO_ARG,			0),
-	asBCINFO(INCi8,		NO_ARG,			0),
-	asBCINFO(DECi16,	NO_ARG,			0),
-	asBCINFO(DECi8,		NO_ARG,			0),
-	asBCINFO(INCi,		NO_ARG,			0),
-	asBCINFO(DECi,		NO_ARG,			0),
-	asBCINFO(INCf,		NO_ARG,			0),
-	asBCINFO(DECf,		NO_ARG,			0),
-	asBCINFO(INCd,		NO_ARG,			0),
-	asBCINFO(DECd,		NO_ARG,			0),
-	asBCINFO(IncVi,		rW_ARG,			0),
-	asBCINFO(DecVi,		rW_ARG,			0),
-	asBCINFO(BNOT,		rW_ARG,			0),
-	asBCINFO(BAND,		wW_rW_rW_ARG,	0),
-	asBCINFO(BOR,		wW_rW_rW_ARG,	0),
-	asBCINFO(BXOR,		wW_rW_rW_ARG,	0),
-	asBCINFO(BSLL,		wW_rW_rW_ARG,	0),
-	asBCINFO(BSRL,		wW_rW_rW_ARG,	0),
-	asBCINFO(BSRA,		wW_rW_rW_ARG,	0),
-	asBCINFO(COPY,		W_DW_ARG,		-AS_PTR_SIZE),
-	asBCINFO(PshC8,		QW_ARG,			2),
-	asBCINFO(PshVPtr,	rW_ARG,			AS_PTR_SIZE),
-	asBCINFO(RDSPtr,	NO_ARG,			0),
-	asBCINFO(CMPd,		rW_rW_ARG,		0),
-	asBCINFO(CMPu,		rW_rW_ARG,		0),
-	asBCINFO(CMPf,		rW_rW_ARG,		0),
-	asBCINFO(CMPi,		rW_rW_ARG,		0),
-	asBCINFO(CMPIi,		rW_DW_ARG,		0),
-	asBCINFO(CMPIf,		rW_DW_ARG,		0),
-	asBCINFO(CMPIu,		rW_DW_ARG,		0),
-	asBCINFO(JMPP,		rW_ARG,			0),
-	asBCINFO(PopRPtr,	NO_ARG,			-AS_PTR_SIZE),
-	asBCINFO(PshRPtr,	NO_ARG,			AS_PTR_SIZE),
-	asBCINFO(STR,		W_ARG,			1+AS_PTR_SIZE),
-	asBCINFO(CALLSYS,	DW_ARG,			0xFFFF),
-	asBCINFO(CALLBND,	DW_ARG,			0xFFFF),
-	asBCINFO(SUSPEND,	NO_ARG,			0),
-	asBCINFO(ALLOC,		PTR_DW_ARG,		0xFFFF),
-	asBCINFO(FREE,		wW_PTR_ARG,		0),
-	asBCINFO(LOADOBJ,	rW_ARG,			0),
-	asBCINFO(STOREOBJ,	wW_ARG,			0),
-	asBCINFO(GETOBJ,	W_ARG,			0),
-	asBCINFO(REFCPY,	PTR_ARG,		-AS_PTR_SIZE),
-	asBCINFO(CHKREF,	NO_ARG,			0),
-	asBCINFO(GETOBJREF,	W_ARG,			0),
-	asBCINFO(GETREF,	W_ARG,			0),
-	asBCINFO(PshNull,	NO_ARG,			AS_PTR_SIZE),
-	asBCINFO(ClrVPtr,	wW_ARG,			0),
-	asBCINFO(OBJTYPE,	PTR_ARG,		AS_PTR_SIZE),
-	asBCINFO(TYPEID,	DW_ARG,			1),
-	asBCINFO(SetV4,		wW_DW_ARG,		0),
-	asBCINFO(SetV8,		wW_QW_ARG,		0),
-	asBCINFO(ADDSi,		W_DW_ARG,		0),
-	asBCINFO(CpyVtoV4,	wW_rW_ARG,		0),
-	asBCINFO(CpyVtoV8,	wW_rW_ARG,		0),
-	asBCINFO(CpyVtoR4,	rW_ARG,			0),
-	asBCINFO(CpyVtoR8,	rW_ARG,			0),
-	asBCINFO(CpyVtoG4,	rW_PTR_ARG,		0),
-	asBCINFO(CpyRtoV4,	wW_ARG,			0),
-	asBCINFO(CpyRtoV8,	wW_ARG,			0),
-	asBCINFO(CpyGtoV4,	wW_PTR_ARG,		0),
-	asBCINFO(WRTV1,		rW_ARG,			0),
-	asBCINFO(WRTV2,		rW_ARG,			0),
-	asBCINFO(WRTV4,		rW_ARG,			0),
-	asBCINFO(WRTV8,		rW_ARG,			0),
-	asBCINFO(RDR1,		wW_ARG,			0),
-	asBCINFO(RDR2,		wW_ARG,			0),
-	asBCINFO(RDR4,		wW_ARG,			0),
-	asBCINFO(RDR8,		wW_ARG,			0),
-	asBCINFO(LDG,		PTR_ARG,		0),
-	asBCINFO(LDV,		rW_ARG,			0),
-	asBCINFO(PGA,		PTR_ARG,		AS_PTR_SIZE),
-	asBCINFO(CmpPtr,	rW_rW_ARG,		0),
-	asBCINFO(VAR,		rW_ARG,			AS_PTR_SIZE),
-	asBCINFO(iTOf,		rW_ARG,			0),
-	asBCINFO(fTOi,		rW_ARG,			0),
-	asBCINFO(uTOf,		rW_ARG,			0),
-	asBCINFO(fTOu,		rW_ARG,			0),
-	asBCINFO(sbTOi,		rW_ARG,			0),
-	asBCINFO(swTOi,		rW_ARG,			0),
-	asBCINFO(ubTOi,		rW_ARG,			0),
-	asBCINFO(uwTOi,		rW_ARG,			0),
-	asBCINFO(dTOi,		wW_rW_ARG,		0),
-	asBCINFO(dTOu,		wW_rW_ARG,		0),
-	asBCINFO(dTOf,		wW_rW_ARG,		0),
-	asBCINFO(iTOd,		wW_rW_ARG,		0),
-	asBCINFO(uTOd,		wW_rW_ARG,		0),
-	asBCINFO(fTOd,		wW_rW_ARG,		0),
-	asBCINFO(ADDi,		wW_rW_rW_ARG,	0),
-	asBCINFO(SUBi,		wW_rW_rW_ARG,	0),
-	asBCINFO(MULi,		wW_rW_rW_ARG,	0),
-	asBCINFO(DIVi,		wW_rW_rW_ARG,	0),
-	asBCINFO(MODi,		wW_rW_rW_ARG,	0),
-	asBCINFO(ADDf,		wW_rW_rW_ARG,	0),
-	asBCINFO(SUBf,		wW_rW_rW_ARG,	0),
-	asBCINFO(MULf,		wW_rW_rW_ARG,	0),
-	asBCINFO(DIVf,		wW_rW_rW_ARG,	0),
-	asBCINFO(MODf,		wW_rW_rW_ARG,	0),
-	asBCINFO(ADDd,		wW_rW_rW_ARG,	0),
-	asBCINFO(SUBd,		wW_rW_rW_ARG,	0),
-	asBCINFO(MULd,		wW_rW_rW_ARG,	0),
-	asBCINFO(DIVd,		wW_rW_rW_ARG,	0),
-	asBCINFO(MODd,		wW_rW_rW_ARG,	0),
-	asBCINFO(ADDIi,		wW_rW_DW_ARG,	0),
-	asBCINFO(SUBIi,		wW_rW_DW_ARG,	0),
-	asBCINFO(MULIi,		wW_rW_DW_ARG,	0),
-	asBCINFO(ADDIf,		wW_rW_DW_ARG,	0),
-	asBCINFO(SUBIf,		wW_rW_DW_ARG,	0),
-	asBCINFO(MULIf,		wW_rW_DW_ARG,	0),
-	asBCINFO(SetG4,		PTR_DW_ARG,		0),
-	asBCINFO(ChkRefS,	NO_ARG,			0),
-	asBCINFO(ChkNullV,	rW_ARG,			0),
-	asBCINFO(CALLINTF,	DW_ARG,			0xFFFF),
-	asBCINFO(iTOb,		rW_ARG,			0),
-	asBCINFO(iTOw,		rW_ARG,			0),
-	asBCINFO(SetV1,		wW_DW_ARG,		0),
-	asBCINFO(SetV2,		wW_DW_ARG,		0),
-	asBCINFO(Cast,		DW_ARG,			-AS_PTR_SIZE),
-	asBCINFO(i64TOi,	wW_rW_ARG,		0),
-	asBCINFO(uTOi64,	wW_rW_ARG,		0),
-	asBCINFO(iTOi64,	wW_rW_ARG,		0),
-	asBCINFO(fTOi64,	wW_rW_ARG,		0),
-	asBCINFO(dTOi64,	rW_ARG,			0),
-	asBCINFO(fTOu64,	wW_rW_ARG,		0),
-	asBCINFO(dTOu64,	rW_ARG,			0),
-	asBCINFO(i64TOf,	wW_rW_ARG,		0),
-	asBCINFO(u64TOf,	wW_rW_ARG,		0),
-	asBCINFO(i64TOd,	rW_ARG,			0),
-	asBCINFO(u64TOd,	rW_ARG,			0),
-	asBCINFO(NEGi64,	rW_ARG,			0),
-	asBCINFO(INCi64,	NO_ARG,			0),
-	asBCINFO(DECi64,	NO_ARG,			0),
-	asBCINFO(BNOT64,	rW_ARG,			0),
-	asBCINFO(ADDi64,	wW_rW_rW_ARG,	0),
-	asBCINFO(SUBi64,	wW_rW_rW_ARG,	0),
-	asBCINFO(MULi64,	wW_rW_rW_ARG,	0),
-	asBCINFO(DIVi64,	wW_rW_rW_ARG,	0),
-	asBCINFO(MODi64,	wW_rW_rW_ARG,	0),
-	asBCINFO(BAND64,	wW_rW_rW_ARG,	0),
-	asBCINFO(BOR64,		wW_rW_rW_ARG,	0),
-	asBCINFO(BXOR64,	wW_rW_rW_ARG,	0),
-	asBCINFO(BSLL64,	wW_rW_rW_ARG,	0),
-	asBCINFO(BSRL64,	wW_rW_rW_ARG,	0),
-	asBCINFO(BSRA64,	wW_rW_rW_ARG,	0),
-	asBCINFO(CMPi64,	rW_rW_ARG,		0),
-	asBCINFO(CMPu64,	rW_rW_ARG,		0),
-	asBCINFO(ChkNullS,	W_ARG,			0),
-	asBCINFO(ClrHi,		NO_ARG,			0),
-	asBCINFO(JitEntry,	PTR_ARG,		0),
-	asBCINFO(CallPtr,	rW_ARG,			0xFFFF),
-	asBCINFO(FuncPtr,	PTR_ARG,		AS_PTR_SIZE),
-	asBCINFO(LoadThisR,	W_DW_ARG,		0),
-	asBCINFO(PshV8,		rW_ARG,			2),
-	asBCINFO(DIVu,		wW_rW_rW_ARG,	0),
-	asBCINFO(MODu,		wW_rW_rW_ARG,	0),
-	asBCINFO(DIVu64,	wW_rW_rW_ARG,	0),
-	asBCINFO(MODu64,	wW_rW_rW_ARG,	0),
-	asBCINFO(LoadRObjR,	rW_W_DW_ARG,	0),
-	asBCINFO(LoadVObjR,	rW_W_DW_ARG,	0),
-	asBCINFO(RefCpyV,	wW_PTR_ARG,		0),
-	asBCINFO(JLowZ,		DW_ARG,			0),
-	asBCINFO(JLowNZ,	DW_ARG,			0),
-	asBCINFO(AllocMem,	wW_DW_ARG,		0),
-	asBCINFO(SetListSize, rW_DW_DW_ARG,	0),
-	asBCINFO(PshListElmnt, rW_DW_ARG,	AS_PTR_SIZE),
-	asBCINFO(SetListType, rW_DW_DW_ARG,	0),
-	asBCINFO(POWi,		wW_rW_rW_ARG,	0),
-	asBCINFO(POWu,		wW_rW_rW_ARG,	0),
-	asBCINFO(POWf,		wW_rW_rW_ARG,	0),
-	asBCINFO(POWd,		wW_rW_rW_ARG,	0),
-	asBCINFO(POWdi,		wW_rW_rW_ARG,	0),
-	asBCINFO(POWi64,	wW_rW_rW_ARG,	0),
-	asBCINFO(POWu64,	wW_rW_rW_ARG,	0),
-	asBCINFO(Thiscall1, DW_ARG,			-AS_PTR_SIZE-1),
-
-	asBCINFO_DUMMY(201),
-	asBCINFO_DUMMY(202),
-	asBCINFO_DUMMY(203),
-	asBCINFO_DUMMY(204),
-	asBCINFO_DUMMY(205),
-	asBCINFO_DUMMY(206),
-	asBCINFO_DUMMY(207),
-	asBCINFO_DUMMY(208),
-	asBCINFO_DUMMY(209),
-	asBCINFO_DUMMY(210),
-	asBCINFO_DUMMY(211),
-	asBCINFO_DUMMY(212),
-	asBCINFO_DUMMY(213),
-	asBCINFO_DUMMY(214),
-	asBCINFO_DUMMY(215),
-	asBCINFO_DUMMY(216),
-	asBCINFO_DUMMY(217),
-	asBCINFO_DUMMY(218),
-	asBCINFO_DUMMY(219),
-	asBCINFO_DUMMY(220),
-	asBCINFO_DUMMY(221),
-	asBCINFO_DUMMY(222),
-	asBCINFO_DUMMY(223),
-	asBCINFO_DUMMY(224),
-	asBCINFO_DUMMY(225),
-	asBCINFO_DUMMY(226),
-	asBCINFO_DUMMY(227),
-	asBCINFO_DUMMY(228),
-	asBCINFO_DUMMY(229),
-	asBCINFO_DUMMY(230),
-	asBCINFO_DUMMY(231),
-	asBCINFO_DUMMY(232),
-	asBCINFO_DUMMY(233),
-	asBCINFO_DUMMY(234),
-	asBCINFO_DUMMY(235),
-	asBCINFO_DUMMY(236),
-	asBCINFO_DUMMY(237),
-	asBCINFO_DUMMY(238),
-	asBCINFO_DUMMY(239),
-	asBCINFO_DUMMY(240),
-	asBCINFO_DUMMY(241),
-	asBCINFO_DUMMY(242),
-	asBCINFO_DUMMY(243),
-	asBCINFO_DUMMY(244),
-	asBCINFO_DUMMY(245),
-	asBCINFO_DUMMY(246),
-	asBCINFO_DUMMY(247),
-	asBCINFO_DUMMY(248),
-	asBCINFO_DUMMY(249),
-	asBCINFO_DUMMY(250),
-
-	asBCINFO(VarDecl,		W_ARG,			0),
-	asBCINFO(Block,			INFO,			0),
-	asBCINFO(ObjInfo,		rW_DW_ARG,		0),
-	asBCINFO(LINE,			INFO,			0),
-	asBCINFO(LABEL,			INFO,			0)
-};
-
-// Macros to access bytecode instruction arguments
-#define asBC_DWORDARG(x)  (*(((asDWORD*)x)+1))
-#define asBC_INTARG(x)    (*(int*)(((asDWORD*)x)+1))
-#define asBC_QWORDARG(x)  (*(asQWORD*)(((asDWORD*)x)+1))
-#define asBC_FLOATARG(x)  (*(float*)(((asDWORD*)x)+1))
-#define asBC_PTRARG(x)    (*(asPWORD*)(((asDWORD*)x)+1))
-#define asBC_WORDARG0(x)  (*(((asWORD*)x)+1))
-#define asBC_WORDARG1(x)  (*(((asWORD*)x)+2))
-#define asBC_SWORDARG0(x) (*(((short*)x)+1))
-#define asBC_SWORDARG1(x) (*(((short*)x)+2))
-#define asBC_SWORDARG2(x) (*(((short*)x)+3))
-
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// angelscript.h
+//
+// The script engine interface
+//
+
+
+#ifndef ANGELSCRIPT_H
+#define ANGELSCRIPT_H
+
+#include <stddef.h>
+#ifndef _MSC_VER
+#include <stdint.h>
+#endif
+
+#ifdef AS_USE_NAMESPACE
+ #define BEGIN_AS_NAMESPACE namespace AngelScript {
+ #define END_AS_NAMESPACE }
+ #define AS_NAMESPACE_QUALIFIER AngelScript::
+#else
+ #define BEGIN_AS_NAMESPACE
+ #define END_AS_NAMESPACE
+ #define AS_NAMESPACE_QUALIFIER ::
+#endif
+
+BEGIN_AS_NAMESPACE
+
+// AngelScript version
+
+#define ANGELSCRIPT_VERSION        23600
+#define ANGELSCRIPT_VERSION_STRING "2.36.0 WIP"
+
+// Data types
+
+class asIScriptEngine;
+class asIScriptModule;
+class asIScriptContext;
+class asIScriptGeneric;
+class asIScriptObject;
+class asITypeInfo;
+class asIScriptFunction;
+class asIBinaryStream;
+class asIJITCompiler;
+class asIThreadManager;
+class asILockableSharedBool;
+class asIStringFactory;
+
+// Enumerations and constants
+
+// Return codes
+enum asERetCodes
+{
+	asSUCCESS                              =  0,
+	asERROR                                = -1,
+	asCONTEXT_ACTIVE                       = -2,
+	asCONTEXT_NOT_FINISHED                 = -3,
+	asCONTEXT_NOT_PREPARED                 = -4,
+	asINVALID_ARG                          = -5,
+	asNO_FUNCTION                          = -6,
+	asNOT_SUPPORTED                        = -7,
+	asINVALID_NAME                         = -8,
+	asNAME_TAKEN                           = -9,
+	asINVALID_DECLARATION                  = -10,
+	asINVALID_OBJECT                       = -11,
+	asINVALID_TYPE                         = -12,
+	asALREADY_REGISTERED                   = -13,
+	asMULTIPLE_FUNCTIONS                   = -14,
+	asNO_MODULE                            = -15,
+	asNO_GLOBAL_VAR                        = -16,
+	asINVALID_CONFIGURATION                = -17,
+	asINVALID_INTERFACE                    = -18,
+	asCANT_BIND_ALL_FUNCTIONS              = -19,
+	asLOWER_ARRAY_DIMENSION_NOT_REGISTERED = -20,
+	asWRONG_CONFIG_GROUP                   = -21,
+	asCONFIG_GROUP_IS_IN_USE               = -22,
+	asILLEGAL_BEHAVIOUR_FOR_TYPE           = -23,
+	asWRONG_CALLING_CONV                   = -24,
+	asBUILD_IN_PROGRESS                    = -25,
+	asINIT_GLOBAL_VARS_FAILED              = -26,
+	asOUT_OF_MEMORY                        = -27,
+	asMODULE_IS_IN_USE                     = -28
+};
+
+// Engine properties
+enum asEEngineProp
+{
+	asEP_ALLOW_UNSAFE_REFERENCES            = 1,
+	asEP_OPTIMIZE_BYTECODE                  = 2,
+	asEP_COPY_SCRIPT_SECTIONS               = 3,
+	asEP_MAX_STACK_SIZE                     = 4,
+	asEP_USE_CHARACTER_LITERALS             = 5,
+	asEP_ALLOW_MULTILINE_STRINGS            = 6,
+	asEP_ALLOW_IMPLICIT_HANDLE_TYPES        = 7,
+	asEP_BUILD_WITHOUT_LINE_CUES            = 8,
+	asEP_INIT_GLOBAL_VARS_AFTER_BUILD       = 9,
+	asEP_REQUIRE_ENUM_SCOPE                 = 10,
+	asEP_SCRIPT_SCANNER                     = 11,
+	asEP_INCLUDE_JIT_INSTRUCTIONS           = 12,
+	asEP_STRING_ENCODING                    = 13,
+	asEP_PROPERTY_ACCESSOR_MODE             = 14,
+	asEP_EXPAND_DEF_ARRAY_TO_TMPL           = 15,
+	asEP_AUTO_GARBAGE_COLLECT               = 16,
+	asEP_DISALLOW_GLOBAL_VARS               = 17,
+	asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT      = 18,
+	asEP_COMPILER_WARNINGS                  = 19,
+	asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE = 20,
+	asEP_ALTER_SYNTAX_NAMED_ARGS            = 21,
+	asEP_DISABLE_INTEGER_DIVISION           = 22,
+	asEP_DISALLOW_EMPTY_LIST_ELEMENTS       = 23,
+	asEP_PRIVATE_PROP_AS_PROTECTED          = 24,
+	asEP_ALLOW_UNICODE_IDENTIFIERS          = 25,
+	asEP_HEREDOC_TRIM_MODE                  = 26,
+	asEP_MAX_NESTED_CALLS                   = 27,
+	asEP_GENERIC_CALL_MODE                  = 28,
+	asEP_INIT_STACK_SIZE                    = 29,
+	asEP_INIT_CALL_STACK_SIZE               = 30,
+	asEP_MAX_CALL_STACK_SIZE                = 31,
+	asEP_IGNORE_DUPLICATE_SHARED_INTF       = 32,
+	asEP_NO_DEBUG_OUTPUT                    = 33,
+
+	asEP_LAST_PROPERTY
+};
+
+// Calling conventions
+enum asECallConvTypes
+{
+	asCALL_CDECL             = 0,
+	asCALL_STDCALL           = 1,
+	asCALL_THISCALL_ASGLOBAL = 2,
+	asCALL_THISCALL          = 3,
+	asCALL_CDECL_OBJLAST     = 4,
+	asCALL_CDECL_OBJFIRST    = 5,
+	asCALL_GENERIC           = 6,
+	asCALL_THISCALL_OBJLAST  = 7,
+	asCALL_THISCALL_OBJFIRST = 8
+};
+
+// Object type flags
+enum asEObjTypeFlags
+{
+	asOBJ_REF                        = (1<<0),
+	asOBJ_VALUE                      = (1<<1),
+	asOBJ_GC                         = (1<<2),
+	asOBJ_POD                        = (1<<3),
+	asOBJ_NOHANDLE                   = (1<<4),
+	asOBJ_SCOPED                     = (1<<5),
+	asOBJ_TEMPLATE                   = (1<<6),
+	asOBJ_ASHANDLE                   = (1<<7),
+	asOBJ_APP_CLASS                  = (1<<8),
+	asOBJ_APP_CLASS_CONSTRUCTOR      = (1<<9),
+	asOBJ_APP_CLASS_DESTRUCTOR       = (1<<10),
+	asOBJ_APP_CLASS_ASSIGNMENT       = (1<<11),
+	asOBJ_APP_CLASS_COPY_CONSTRUCTOR = (1<<12),
+	asOBJ_APP_CLASS_C                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CD               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR),
+	asOBJ_APP_CLASS_CA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_CK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CDA              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_CDK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_CDAK             = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_CONSTRUCTOR + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_D                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR),
+	asOBJ_APP_CLASS_DA               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_DK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_DAK              = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_DESTRUCTOR + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_A                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT),
+	asOBJ_APP_CLASS_AK               = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_ASSIGNMENT + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_K                = (asOBJ_APP_CLASS + asOBJ_APP_CLASS_COPY_CONSTRUCTOR),
+	asOBJ_APP_CLASS_MORE_CONSTRUCTORS = (1<<31),
+	asOBJ_APP_PRIMITIVE              = (1<<13),
+	asOBJ_APP_FLOAT                  = (1<<14),
+	asOBJ_APP_ARRAY                  = (1<<15),
+	asOBJ_APP_CLASS_ALLINTS          = (1<<16),
+	asOBJ_APP_CLASS_ALLFLOATS        = (1<<17),
+	asOBJ_NOCOUNT                    = (1<<18),
+	asOBJ_APP_CLASS_ALIGN8           = (1<<19),
+	asOBJ_IMPLICIT_HANDLE            = (1<<20),
+	asOBJ_MASK_VALID_FLAGS           = 0x801FFFFF,
+	// Internal flags
+	asOBJ_SCRIPT_OBJECT              = (1<<21),
+	asOBJ_SHARED                     = (1<<22),
+	asOBJ_NOINHERIT                  = (1<<23),
+	asOBJ_FUNCDEF                    = (1<<24),
+	asOBJ_LIST_PATTERN               = (1<<25),
+	asOBJ_ENUM                       = (1<<26),
+	asOBJ_TEMPLATE_SUBTYPE           = (1<<27),
+	asOBJ_TYPEDEF                    = (1<<28),
+	asOBJ_ABSTRACT                   = (1<<29),
+	asOBJ_APP_ALIGN16                = (1<<30)
+};
+
+// Behaviours
+enum asEBehaviours
+{
+	// Value object memory management
+	asBEHAVE_CONSTRUCT,
+	asBEHAVE_LIST_CONSTRUCT,
+	asBEHAVE_DESTRUCT,
+
+	// Reference object memory management
+	asBEHAVE_FACTORY,
+	asBEHAVE_LIST_FACTORY,
+	asBEHAVE_ADDREF,
+	asBEHAVE_RELEASE,
+	asBEHAVE_GET_WEAKREF_FLAG,
+
+	// Object operators
+	asBEHAVE_TEMPLATE_CALLBACK,
+
+	// Garbage collection behaviours
+	asBEHAVE_FIRST_GC,
+	 asBEHAVE_GETREFCOUNT = asBEHAVE_FIRST_GC,
+	 asBEHAVE_SETGCFLAG,
+	 asBEHAVE_GETGCFLAG,
+	 asBEHAVE_ENUMREFS,
+	 asBEHAVE_RELEASEREFS,
+	asBEHAVE_LAST_GC = asBEHAVE_RELEASEREFS,
+
+	asBEHAVE_MAX
+};
+
+// Context states
+enum asEContextState
+{
+	asEXECUTION_FINISHED        = 0,
+	asEXECUTION_SUSPENDED       = 1,
+	asEXECUTION_ABORTED         = 2,
+	asEXECUTION_EXCEPTION       = 3,
+	asEXECUTION_PREPARED        = 4,
+	asEXECUTION_UNINITIALIZED   = 5,
+	asEXECUTION_ACTIVE          = 6,
+	asEXECUTION_ERROR           = 7,
+	asEXECUTION_DESERIALIZATION = 8
+};
+
+// Message types
+enum asEMsgType
+{
+	asMSGTYPE_ERROR       = 0,
+	asMSGTYPE_WARNING     = 1,
+	asMSGTYPE_INFORMATION = 2
+};
+
+// Garbage collector flags
+enum asEGCFlags
+{
+	asGC_FULL_CYCLE      = 1,
+	asGC_ONE_STEP        = 2,
+	asGC_DESTROY_GARBAGE = 4,
+	asGC_DETECT_GARBAGE  = 8
+};
+
+// Token classes
+enum asETokenClass
+{
+	asTC_UNKNOWN    = 0,
+	asTC_KEYWORD    = 1,
+	asTC_VALUE      = 2,
+	asTC_IDENTIFIER = 3,
+	asTC_COMMENT    = 4,
+	asTC_WHITESPACE = 5
+};
+
+// Type id flags
+enum asETypeIdFlags
+{
+	asTYPEID_VOID           = 0,
+	asTYPEID_BOOL           = 1,
+	asTYPEID_INT8           = 2,
+	asTYPEID_INT16          = 3,
+	asTYPEID_INT32          = 4,
+	asTYPEID_INT64          = 5,
+	asTYPEID_UINT8          = 6,
+	asTYPEID_UINT16         = 7,
+	asTYPEID_UINT32         = 8,
+	asTYPEID_UINT64         = 9,
+	asTYPEID_FLOAT          = 10,
+	asTYPEID_DOUBLE         = 11,
+	asTYPEID_OBJHANDLE      = 0x40000000,
+	asTYPEID_HANDLETOCONST  = 0x20000000,
+	asTYPEID_MASK_OBJECT    = 0x1C000000,
+	asTYPEID_APPOBJECT      = 0x04000000,
+	asTYPEID_SCRIPTOBJECT   = 0x08000000,
+	asTYPEID_TEMPLATE       = 0x10000000,
+	asTYPEID_MASK_SEQNBR    = 0x03FFFFFF
+};
+
+// Type modifiers
+enum asETypeModifiers
+{
+	asTM_NONE     = 0,
+	asTM_INREF    = 1,
+	asTM_OUTREF   = 2,
+	asTM_INOUTREF = 3,
+	asTM_CONST    = 4
+};
+
+// GetModule flags
+enum asEGMFlags
+{
+	asGM_ONLY_IF_EXISTS       = 0,
+	asGM_CREATE_IF_NOT_EXISTS = 1,
+	asGM_ALWAYS_CREATE        = 2
+};
+
+// Compile flags
+enum asECompileFlags
+{
+	asCOMP_ADD_TO_MODULE = 1
+};
+
+// Function types
+enum asEFuncType
+{
+	asFUNC_DUMMY     =-1,
+	asFUNC_SYSTEM    = 0,
+	asFUNC_SCRIPT    = 1,
+	asFUNC_INTERFACE = 2,
+	asFUNC_VIRTUAL   = 3,
+	asFUNC_FUNCDEF   = 4,
+	asFUNC_IMPORTED  = 5,
+	asFUNC_DELEGATE  = 6
+};
+
+//
+// asBYTE  =  8 bits
+// asWORD  = 16 bits
+// asDWORD = 32 bits
+// asQWORD = 64 bits
+// asPWORD = size of pointer
+//
+typedef signed char    asINT8;
+typedef signed short   asINT16;
+typedef signed int     asINT32;
+typedef unsigned char  asBYTE;
+typedef unsigned short asWORD;
+typedef unsigned int   asUINT;
+#if (defined(_MSC_VER) && _MSC_VER <= 1200) || defined(__S3E__) || (defined(_MSC_VER) && defined(__clang__))
+	// size_t is not really correct, since it only guaranteed to be large enough to hold the segment size.
+	// For example, on 16bit systems the size_t may be 16bits only even if pointers are 32bit. But nobody
+	// is likely to use MSVC6 to compile for 16bit systems anymore, so this should be ok.
+	typedef size_t         asPWORD;
+#else
+	typedef uintptr_t      asPWORD;
+#endif
+#ifdef __LP64__
+	typedef unsigned int  asDWORD;
+	typedef unsigned long asQWORD;
+	typedef long asINT64;
+#else
+	typedef unsigned long asDWORD;
+  #if !defined(_MSC_VER) && (defined(__GNUC__) || defined(__MWERKS__) || defined(__SUNPRO_CC) || defined(__psp2__))
+	typedef uint64_t asQWORD;
+	typedef int64_t asINT64;
+  #else
+	typedef unsigned __int64 asQWORD;
+	typedef __int64 asINT64;
+  #endif
+#endif
+
+// Is the target a 64bit system?
+#if defined(__LP64__) || defined(__amd64__) || defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
+	#ifndef AS_64BIT_PTR
+		#define AS_64BIT_PTR
+	#endif
+#endif
+
+typedef void (*asFUNCTION_t)();
+typedef void (*asGENFUNC_t)(asIScriptGeneric *);
+typedef void *(*asALLOCFUNC_t)(size_t);
+typedef void (*asFREEFUNC_t)(void *);
+typedef void (*asCLEANENGINEFUNC_t)(asIScriptEngine *);
+typedef void (*asCLEANMODULEFUNC_t)(asIScriptModule *);
+typedef void (*asCLEANCONTEXTFUNC_t)(asIScriptContext *);
+typedef void (*asCLEANFUNCTIONFUNC_t)(asIScriptFunction *);
+typedef void (*asCLEANTYPEINFOFUNC_t)(asITypeInfo *);
+typedef void (*asCLEANSCRIPTOBJECTFUNC_t)(asIScriptObject *);
+typedef asIScriptContext *(*asREQUESTCONTEXTFUNC_t)(asIScriptEngine *, void *);
+typedef void (*asRETURNCONTEXTFUNC_t)(asIScriptEngine *, asIScriptContext *, void *);
+typedef void (*asCIRCULARREFFUNC_t)(asITypeInfo *, const void *, void *);
+
+// Check if the compiler can use C++11 features
+#if !defined(_MSC_VER) || _MSC_VER >= 1700   // MSVC 2012
+ #if !defined(__GNUC__) || defined(__clang__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)  // gnuc 4.7 or clang
+  #if !(defined(__GNUC__) && defined(__cplusplus) && __cplusplus < 201103L) // gnuc and clang require compiler flag -std=c++11
+   #if !defined(__SUNPRO_CC) // Oracle Solaris Studio
+    #define AS_CAN_USE_CPP11 1
+   #endif
+  #endif
+ #endif
+#endif
+
+// This macro does basically the same thing as offsetof defined in stddef.h, but
+// GNUC should not complain about the usage as I'm not using 0 as the base pointer.
+#define asOFFSET(s,m) ((int)(size_t)(&reinterpret_cast<s*>(100000)->m)-100000)
+
+#define asFUNCTION(f) asFunctionPtr(f)
+#if (defined(_MSC_VER) && _MSC_VER <= 1200) || (defined(__BORLANDC__) && __BORLANDC__ < 0x590)
+// MSVC 6 has a bug that prevents it from properly compiling using the correct asFUNCTIONPR with operator >
+// so we need to use ordinary C style cast instead of static_cast. The drawback is that the compiler can't
+// check that the cast is really valid.
+// BCC v5.8 (C++Builder 2006) and earlier have a similar bug which forces us to fall back to a C-style cast.
+#define asFUNCTIONPR(f,p,r) asFunctionPtr((void (*)())((r (*)p)(f)))
+#else
+#define asFUNCTIONPR(f,p,r) asFunctionPtr(reinterpret_cast<void (*)()>(static_cast<r (*)p>(f)))
+#endif
+
+#ifndef AS_NO_CLASS_METHODS
+
+class asCUnknownClass;
+typedef void (asCUnknownClass::*asMETHOD_t)();
+
+struct asSFuncPtr
+{
+	asSFuncPtr(asBYTE f = 0)
+	{
+		for( size_t n = 0; n < sizeof(ptr.dummy); n++ )
+			ptr.dummy[n] = 0;
+		flag = f;
+	}
+
+	void CopyMethodPtr(const void *mthdPtr, size_t size)
+	{
+		for( size_t n = 0; n < size; n++ )
+			ptr.dummy[n] = reinterpret_cast<const char *>(mthdPtr)[n];
+	}
+
+	union
+	{
+		// The largest known method point is 20 bytes (MSVC 64bit),
+		// but with 8byte alignment this becomes 24 bytes. So we need
+		// to be able to store at least that much.
+		char dummy[25];
+		struct {asMETHOD_t   mthd; char dummy[25-sizeof(asMETHOD_t)];} m;
+		struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
+	} ptr;
+	asBYTE flag; // 1 = generic, 2 = global func, 3 = method
+};
+
+#if defined(__BORLANDC__)
+// A bug in BCC (QC #85374) makes it impossible to distinguish const/non-const method overloads
+// with static_cast<>. The workaround is to use an _implicit_cast instead.
+
+ #if  __BORLANDC__ < 0x590
+ // BCC v5.8 (C++Builder 2006) and earlier have an even more annoying bug which causes
+ // the "pretty" workaround below (with _implicit_cast<>) to fail. For these compilers
+ // we need to use a traditional C-style cast.
+  #define AS_METHOD_AMBIGUITY_CAST(t) (t)
+ #else
+template <typename T>
+  T _implicit_cast (T val)
+{ return val; }
+  #define AS_METHOD_AMBIGUITY_CAST(t) AS_NAMESPACE_QUALIFIER _implicit_cast<t >
+ #endif
+#else
+ #define AS_METHOD_AMBIGUITY_CAST(t) static_cast<t >
+#endif
+
+#define asMETHOD(c,m) asSMethodPtr<sizeof(void (c::*)())>::Convert((void (c::*)())(&c::m))
+#define asMETHODPR(c,m,p,r) asSMethodPtr<sizeof(void (c::*)())>::Convert(AS_METHOD_AMBIGUITY_CAST(r (c::*)p)(&c::m))
+
+#else // Class methods are disabled
+
+struct asSFuncPtr
+{
+	asSFuncPtr(asBYTE f)
+	{
+		for( int n = 0; n < sizeof(ptr.dummy); n++ )
+			ptr.dummy[n] = 0;
+		flag = f;
+	}
+
+	union
+	{
+		char dummy[25]; // largest known class method pointer
+		struct {asFUNCTION_t func; char dummy[25-sizeof(asFUNCTION_t)];} f;
+	} ptr;
+	asBYTE flag; // 1 = generic, 2 = global func
+};
+
+#endif
+
+struct asSMessageInfo
+{
+	const char *section;
+	int         row;
+	int         col;
+	asEMsgType  type;
+	const char *message;
+};
+
+
+// API functions
+
+// ANGELSCRIPT_EXPORT is defined when compiling the dll or lib
+// ANGELSCRIPT_DLL_LIBRARY_IMPORT is defined when dynamically linking to the
+// dll through the link lib automatically generated by MSVC++
+// ANGELSCRIPT_DLL_MANUAL_IMPORT is defined when manually loading the dll
+// Don't define anything when linking statically to the lib
+
+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+  #if defined(ANGELSCRIPT_EXPORT)
+    #define AS_API __declspec(dllexport)
+  #elif defined(ANGELSCRIPT_DLL_LIBRARY_IMPORT)
+    #define AS_API __declspec(dllimport)
+  #else // statically linked library
+    #define AS_API
+  #endif
+#elif defined(__GNUC__)
+  #if defined(ANGELSCRIPT_EXPORT)
+    #define AS_API __attribute__((visibility ("default")))
+  #else
+    #define AS_API
+  #endif
+#else
+  #define AS_API
+#endif
+
+#ifndef ANGELSCRIPT_DLL_MANUAL_IMPORT
+extern "C"
+{
+	// Engine
+	AS_API asIScriptEngine *asCreateScriptEngine(asDWORD version = ANGELSCRIPT_VERSION);
+	AS_API const char      *asGetLibraryVersion();
+	AS_API const char      *asGetLibraryOptions();
+
+	// Context
+	AS_API asIScriptContext *asGetActiveContext();
+
+	// Thread support
+	AS_API int               asPrepareMultithread(asIThreadManager *externalMgr = 0);
+	AS_API void              asUnprepareMultithread();
+	AS_API asIThreadManager *asGetThreadManager();
+	AS_API void              asAcquireExclusiveLock();
+	AS_API void              asReleaseExclusiveLock();
+	AS_API void              asAcquireSharedLock();
+	AS_API void              asReleaseSharedLock();
+	AS_API int               asAtomicInc(int &value);
+	AS_API int               asAtomicDec(int &value);
+	AS_API int               asThreadCleanup();
+
+	// Memory management
+	AS_API int   asSetGlobalMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc);
+	AS_API int   asResetGlobalMemoryFunctions();
+	AS_API void *asAllocMem(size_t size);
+	AS_API void  asFreeMem(void *mem);
+
+	// Auxiliary
+	AS_API asILockableSharedBool *asCreateLockableSharedBool();
+}
+#endif // ANGELSCRIPT_DLL_MANUAL_IMPORT
+
+// Determine traits of a type for registration of value types
+// Relies on C++11 features so it can not be used with non-compliant compilers
+#ifdef AS_CAN_USE_CPP11
+
+END_AS_NAMESPACE
+#include <type_traits>
+BEGIN_AS_NAMESPACE
+
+template<typename T>
+asUINT asGetTypeTraits()
+{
+#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS) || (__GNUC__ >= 5) || defined(__clang__)
+	// MSVC, XCode/Clang, and gnuc 5+
+	// C++11 compliant code
+	bool hasConstructor        = std::is_default_constructible<T>::value && !std::is_trivially_default_constructible<T>::value;
+	bool hasDestructor         = std::is_destructible<T>::value          && !std::is_trivially_destructible<T>::value;
+	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::is_trivially_copy_assignable<T>::value;
+	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::is_trivially_copy_constructible<T>::value;
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
+	// gnuc 4.8 is using a mix of C++11 standard and pre-standard templates
+	bool hasConstructor        = std::is_default_constructible<T>::value && !std::has_trivial_default_constructor<T>::value;
+	bool hasDestructor         = std::is_destructible<T>::value          && !std::is_trivially_destructible<T>::value;
+	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::has_trivial_copy_assign<T>::value;
+	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::has_trivial_copy_constructor<T>::value;
+#else
+	// All other compilers and versions are assumed to use non C++11 compliant code until proven otherwise
+	// Not fully C++11 compliant. The has_trivial checks were used while the standard was still
+	// being elaborated, but were then removed in favor of the above is_trivially checks
+	// http://stackoverflow.com/questions/12702103/writing-code-that-works-when-has-trivial-destructor-is-defined-instead-of-is
+	// https://github.com/mozart/mozart2/issues/51
+	bool hasConstructor        = std::is_default_constructible<T>::value && !std::has_trivial_default_constructor<T>::value;
+	bool hasDestructor         = std::is_destructible<T>::value          && !std::has_trivial_destructor<T>::value;
+	bool hasAssignmentOperator = std::is_copy_assignable<T>::value       && !std::has_trivial_copy_assign<T>::value;
+	bool hasCopyConstructor    = std::is_copy_constructible<T>::value    && !std::has_trivial_copy_constructor<T>::value;
+#endif
+	bool isFloat     = std::is_floating_point<T>::value;
+	bool isPrimitive = std::is_integral<T>::value || std::is_pointer<T>::value || std::is_enum<T>::value;
+	bool isClass     = std::is_class<T>::value;
+	bool isArray     = std::is_array<T>::value;
+
+	if( isFloat )
+		return asOBJ_APP_FLOAT;
+	if( isPrimitive )
+		return asOBJ_APP_PRIMITIVE;
+
+	if( isClass )
+	{
+		asDWORD flags = asOBJ_APP_CLASS;
+		if( hasConstructor )
+			flags |= asOBJ_APP_CLASS_CONSTRUCTOR;
+		if( hasDestructor )
+			flags |= asOBJ_APP_CLASS_DESTRUCTOR;
+		if( hasAssignmentOperator )
+			flags |= asOBJ_APP_CLASS_ASSIGNMENT;
+		if( hasCopyConstructor )
+			flags |= asOBJ_APP_CLASS_COPY_CONSTRUCTOR;
+		return flags;
+	}
+
+	if( isArray )
+		return asOBJ_APP_ARRAY;
+
+	// Unknown type traits
+	return 0;
+}
+
+#endif // c++11
+
+// Interface declarations
+
+class asIScriptEngine
+{
+public:
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
+	virtual int ShutDownAndRelease() = 0;
+
+	// Engine properties
+	virtual int     SetEngineProperty(asEEngineProp property, asPWORD value) = 0;
+	virtual asPWORD GetEngineProperty(asEEngineProp property) const = 0;
+
+	// Compiler messages
+	virtual int SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv) = 0;
+	virtual int ClearMessageCallback() = 0;
+	virtual int WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message) = 0;
+
+	// JIT Compiler
+	virtual int SetJITCompiler(asIJITCompiler *compiler) = 0;
+	virtual asIJITCompiler *GetJITCompiler() const = 0;
+
+	// Global functions
+	virtual int                RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0) = 0;
+	virtual asUINT             GetGlobalFunctionCount() const = 0;
+	virtual asIScriptFunction *GetGlobalFunctionByIndex(asUINT index) const = 0;
+	virtual asIScriptFunction *GetGlobalFunctionByDecl(const char *declaration) const = 0;
+
+	// Global properties
+	virtual int    RegisterGlobalProperty(const char *declaration, void *pointer) = 0;
+	virtual asUINT GetGlobalPropertyCount() const = 0;
+	virtual int    GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0, const char **configGroup = 0, void **pointer = 0, asDWORD *accessMask = 0) const = 0;
+	virtual int    GetGlobalPropertyIndexByName(const char *name) const = 0;
+	virtual int    GetGlobalPropertyIndexByDecl(const char *decl) const = 0;
+
+	// Object types
+	virtual int            RegisterObjectType(const char *obj, int byteSize, asDWORD flags) = 0;
+	virtual int            RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset, int compositeOffset = 0, bool isCompositeIndirect = false) = 0;
+	virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0, int compositeOffset = 0, bool isCompositeIndirect = false) = 0;
+	virtual int            RegisterObjectBehaviour(const char *obj, asEBehaviours behaviour, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0, int compositeOffset = 0, bool isCompositeIndirect = false) = 0;
+	virtual int            RegisterInterface(const char *name) = 0;
+	virtual int            RegisterInterfaceMethod(const char *intf, const char *declaration) = 0;
+	virtual asUINT         GetObjectTypeCount() const = 0;
+	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const = 0;
+
+	// String factory
+	virtual int RegisterStringFactory(const char *datatype, asIStringFactory *factory) = 0;
+	virtual int GetStringFactoryReturnTypeId(asDWORD *flags = 0) const = 0;
+
+	// Default array type
+	virtual int RegisterDefaultArrayType(const char *type) = 0;
+	virtual int GetDefaultArrayTypeId() const = 0;
+
+	// Enums
+	virtual int          RegisterEnum(const char *type) = 0;
+	virtual int          RegisterEnumValue(const char *type, const char *name, int value) = 0;
+	virtual asUINT       GetEnumCount() const = 0;
+	virtual asITypeInfo *GetEnumByIndex(asUINT index) const = 0;
+
+	// Funcdefs
+	virtual int          RegisterFuncdef(const char *decl) = 0;
+	virtual asUINT       GetFuncdefCount() const = 0;
+	virtual asITypeInfo *GetFuncdefByIndex(asUINT index) const = 0;
+
+	// Typedefs
+	virtual int          RegisterTypedef(const char *type, const char *decl) = 0;
+	virtual asUINT       GetTypedefCount() const = 0;
+	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const = 0;
+
+	// Configuration groups
+	virtual int         BeginConfigGroup(const char *groupName) = 0;
+	virtual int         EndConfigGroup() = 0;
+	virtual int         RemoveConfigGroup(const char *groupName) = 0;
+	virtual asDWORD     SetDefaultAccessMask(asDWORD defaultMask) = 0;
+	virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
+	virtual const char *GetDefaultNamespace() const = 0;
+
+	// Script modules
+	virtual asIScriptModule *GetModule(const char *module, asEGMFlags flag = asGM_ONLY_IF_EXISTS) = 0;
+	virtual int              DiscardModule(const char *module) = 0;
+	virtual asUINT           GetModuleCount() const = 0;
+	virtual asIScriptModule *GetModuleByIndex(asUINT index) const = 0;
+
+	// Script functions
+	virtual asIScriptFunction *GetFunctionById(int funcId) const = 0;
+
+	// Type identification
+	virtual int            GetTypeIdByDecl(const char *decl) const = 0;
+	virtual const char    *GetTypeDeclaration(int typeId, bool includeNamespace = false) const = 0;
+	virtual int            GetSizeOfPrimitiveType(int typeId) const = 0;
+	virtual asITypeInfo   *GetTypeInfoById(int typeId) const = 0;
+	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const = 0;
+	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const = 0;
+
+	// Script execution
+	virtual asIScriptContext      *CreateContext() = 0;
+	virtual void                  *CreateScriptObject(const asITypeInfo *type) = 0;
+	virtual void                  *CreateScriptObjectCopy(void *obj, const asITypeInfo *type) = 0;
+	virtual void                  *CreateUninitializedScriptObject(const asITypeInfo *type) = 0;
+	virtual asIScriptFunction     *CreateDelegate(asIScriptFunction *func, void *obj) = 0;
+	virtual int                    AssignScriptObject(void *dstObj, void *srcObj, const asITypeInfo *type) = 0;
+	virtual void                   ReleaseScriptObject(void *obj, const asITypeInfo *type) = 0;
+	virtual void                   AddRefScriptObject(void *obj, const asITypeInfo *type) = 0;
+	virtual int                    RefCastObject(void *obj, asITypeInfo *fromType, asITypeInfo *toType, void **newPtr, bool useOnlyImplicitCast = false) = 0;
+	virtual asILockableSharedBool *GetWeakRefFlagOfScriptObject(void *obj, const asITypeInfo *type) const = 0;
+
+	// Context pooling
+	virtual asIScriptContext      *RequestContext() = 0;
+	virtual void                   ReturnContext(asIScriptContext *ctx) = 0;
+	virtual int                    SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param = 0) = 0;
+
+	// String interpretation
+	virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, asUINT *tokenLength = 0) const = 0;
+
+	// Garbage collection
+	virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE, asUINT numIterations = 1) = 0;
+	virtual void GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed = 0, asUINT *totalDetected = 0, asUINT *newObjects = 0, asUINT *totalNewDestroyed = 0) const = 0;
+	virtual int  NotifyGarbageCollectorOfNewObject(void *obj, asITypeInfo *type) = 0;
+	virtual int  GetObjectInGC(asUINT idx, asUINT *seqNbr = 0, void **obj = 0, asITypeInfo **type = 0) = 0;
+	virtual void GCEnumCallback(void *reference) = 0;
+	virtual void ForwardGCEnumReferences(void *ref, asITypeInfo *type) = 0;
+	virtual void ForwardGCReleaseReferences(void *ref, asITypeInfo *type) = 0;
+	virtual void SetCircularRefDetectedCallback(asCIRCULARREFFUNC_t callback, void *param = 0) = 0;
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
+	virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetTypeInfoUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type = 0) = 0;
+	virtual void  SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type = 0) = 0;
+
+	// Exception handling
+	virtual int SetTranslateAppExceptionCallback(asSFuncPtr callback, void *param, int callConv) = 0;
+
+protected:
+	virtual ~asIScriptEngine() {}
+};
+
+class asIStringFactory
+{
+public:
+	virtual const void *GetStringConstant(const char *data, asUINT length) = 0;
+	virtual int         ReleaseStringConstant(const void *str) = 0;
+	virtual int         GetRawStringData(const void *str, char *data, asUINT *length) const = 0;
+
+protected:
+	virtual ~asIStringFactory() {}
+};
+
+class asIThreadManager
+{
+protected:
+	virtual ~asIThreadManager() {}
+};
+
+class asIScriptModule
+{
+public:
+	virtual asIScriptEngine *GetEngine() const = 0;
+	virtual void             SetName(const char *name) = 0;
+	virtual const char      *GetName() const = 0;
+	virtual void             Discard() = 0;
+
+	// Compilation
+	virtual int         AddScriptSection(const char *name, const char *code, size_t codeLength = 0, int lineOffset = 0) = 0;
+	virtual int         Build() = 0;
+	virtual int         CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asIScriptFunction **outFunc) = 0;
+	virtual int         CompileGlobalVar(const char *sectionName, const char *code, int lineOffset) = 0;
+	virtual asDWORD     SetAccessMask(asDWORD accessMask) = 0;
+	virtual int         SetDefaultNamespace(const char *nameSpace) = 0;
+	virtual const char *GetDefaultNamespace() const = 0;
+
+	// Functions
+	virtual asUINT             GetFunctionCount() const = 0;
+	virtual asIScriptFunction *GetFunctionByIndex(asUINT index) const = 0;
+	virtual asIScriptFunction *GetFunctionByDecl(const char *decl) const = 0;
+	virtual asIScriptFunction *GetFunctionByName(const char *name) const = 0;
+	virtual int                RemoveFunction(asIScriptFunction *func) = 0;
+
+	// Global variables
+	virtual int         ResetGlobalVars(asIScriptContext *ctx = 0) = 0;
+	virtual asUINT      GetGlobalVarCount() const = 0;
+	virtual int         GetGlobalVarIndexByName(const char *name) const = 0;
+	virtual int         GetGlobalVarIndexByDecl(const char *decl) const = 0;
+	virtual const char *GetGlobalVarDeclaration(asUINT index, bool includeNamespace = false) const = 0;
+	virtual int         GetGlobalVar(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0) const = 0;
+	virtual void       *GetAddressOfGlobalVar(asUINT index) = 0;
+	virtual int         RemoveGlobalVar(asUINT index) = 0;
+
+	// Type identification
+	virtual asUINT         GetObjectTypeCount() const = 0;
+	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const = 0;
+	virtual int            GetTypeIdByDecl(const char *decl) const = 0;
+	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const = 0;
+	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const = 0;
+
+	// Enums
+	virtual asUINT       GetEnumCount() const = 0;
+	virtual asITypeInfo *GetEnumByIndex(asUINT index) const = 0;
+
+	// Typedefs
+	virtual asUINT       GetTypedefCount() const = 0;
+	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const = 0;
+
+	// Dynamic binding between modules
+	virtual asUINT      GetImportedFunctionCount() const = 0;
+	virtual int         GetImportedFunctionIndexByDecl(const char *decl) const = 0;
+	virtual const char *GetImportedFunctionDeclaration(asUINT importIndex) const = 0;
+	virtual const char *GetImportedFunctionSourceModule(asUINT importIndex) const = 0;
+	virtual int         BindImportedFunction(asUINT importIndex, asIScriptFunction *func) = 0;
+	virtual int         UnbindImportedFunction(asUINT importIndex) = 0;
+	virtual int         BindAllImportedFunctions() = 0;
+	virtual int         UnbindAllImportedFunctions() = 0;
+
+	// Byte code saving and loading
+	virtual int SaveByteCode(asIBinaryStream *out, bool stripDebugInfo = false) const = 0;
+	virtual int LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped = 0) = 0;
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
+
+protected:
+	virtual ~asIScriptModule() {}
+};
+
+class asIScriptContext
+{
+public:
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
+
+	// Miscellaneous
+	virtual asIScriptEngine *GetEngine() const = 0;
+
+	// Execution
+	virtual int             Prepare(asIScriptFunction *func) = 0;
+	virtual int             Unprepare() = 0;
+	virtual int             Execute() = 0;
+	virtual int             Abort() = 0;
+	virtual int             Suspend() = 0;
+	virtual asEContextState GetState() const = 0;
+	virtual int             PushState() = 0;
+	virtual int             PopState() = 0;
+	virtual bool            IsNested(asUINT *nestCount = 0) const = 0;
+
+	// Object pointer for calling class methods
+	virtual int   SetObject(void *obj) = 0;
+
+	// Arguments
+	virtual int   SetArgByte(asUINT arg, asBYTE value) = 0;
+	virtual int   SetArgWord(asUINT arg, asWORD value) = 0;
+	virtual int   SetArgDWord(asUINT arg, asDWORD value) = 0;
+	virtual int   SetArgQWord(asUINT arg, asQWORD value) = 0;
+	virtual int   SetArgFloat(asUINT arg, float value) = 0;
+	virtual int   SetArgDouble(asUINT arg, double value) = 0;
+	virtual int   SetArgAddress(asUINT arg, void *addr) = 0;
+	virtual int   SetArgObject(asUINT arg, void *obj) = 0;
+	virtual int   SetArgVarType(asUINT arg, void *ptr, int typeId) = 0;
+	virtual void *GetAddressOfArg(asUINT arg) = 0;
+
+	// Return value
+	virtual asBYTE  GetReturnByte() = 0;
+	virtual asWORD  GetReturnWord() = 0;
+	virtual asDWORD GetReturnDWord() = 0;
+	virtual asQWORD GetReturnQWord() = 0;
+	virtual float   GetReturnFloat() = 0;
+	virtual double  GetReturnDouble() = 0;
+	virtual void   *GetReturnAddress() = 0;
+	virtual void   *GetReturnObject() = 0;
+	virtual void   *GetAddressOfReturnValue() = 0;
+
+	// Exception handling
+	virtual int                SetException(const char *info, bool allowCatch = true) = 0;
+	virtual int                GetExceptionLineNumber(int *column = 0, const char **sectionName = 0) = 0;
+	virtual asIScriptFunction *GetExceptionFunction() = 0;
+	virtual const char *       GetExceptionString() = 0;
+	virtual bool               WillExceptionBeCaught() = 0;
+	virtual int                SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
+	virtual void               ClearExceptionCallback() = 0;
+
+	// Debugging
+	virtual int                SetLineCallback(asSFuncPtr callback, void *obj, int callConv) = 0;
+	virtual void               ClearLineCallback() = 0;
+	virtual asUINT             GetCallstackSize() const = 0;
+	virtual asIScriptFunction *GetFunction(asUINT stackLevel = 0) = 0;
+	virtual int                GetLineNumber(asUINT stackLevel = 0, int *column = 0, const char **sectionName = 0) = 0;
+	virtual int                GetVarCount(asUINT stackLevel = 0) = 0;
+	virtual int                GetVar(asUINT varIndex, asUINT stackLevel, const char** name, int* typeId = 0, asETypeModifiers* typeModifiers = 0, bool* isVarOnHeap = 0, int* stackOffset = 0) = 0;
+#ifdef AS_DEPRECATED
+	// deprecated since 2022-05-04, 2.36.0
+	virtual const char        *GetVarName(asUINT varIndex, asUINT stackLevel = 0) = 0;
+#endif
+	virtual const char        *GetVarDeclaration(asUINT varIndex, asUINT stackLevel = 0, bool includeNamespace = false) = 0;
+#ifdef AS_DEPRECATED
+	// deprecated since 2022-05-04, 2.36.0
+	virtual int                GetVarTypeId(asUINT varIndex, asUINT stackLevel = 0) = 0;
+#endif
+	virtual void              *GetAddressOfVar(asUINT varIndex, asUINT stackLevel = 0, bool dontDereference = false, bool returnAddressOfUnitializedObjects = false) = 0;
+	virtual bool               IsVarInScope(asUINT varIndex, asUINT stackLevel = 0) = 0;
+	virtual int                GetThisTypeId(asUINT stackLevel = 0) = 0;
+	virtual void              *GetThisPointer(asUINT stackLevel = 0) = 0;
+	virtual asIScriptFunction *GetSystemFunction() = 0;
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
+
+	// Serialization
+	virtual int StartDeserialization() = 0;
+	virtual int FinishDeserialization() = 0;
+	virtual int PushFunction(asIScriptFunction *func, void *object) = 0;
+	virtual int GetStateRegisters(asUINT stackLevel, asIScriptFunction **callingSystemFunction, asIScriptFunction **initialFunction, asDWORD *origStackPointer, asDWORD *argumentsSize, asQWORD *valueRegister, void **objectRegister, asITypeInfo **objectTypeRegister) = 0;
+	virtual int GetCallStateRegisters(asUINT stackLevel, asDWORD *stackFramePointer, asIScriptFunction **currentFunction, asDWORD *programPointer, asDWORD *stackPointer, asDWORD *stackIndex) = 0;
+	virtual int SetStateRegisters(asUINT stackLevel, asIScriptFunction *callingSystemFunction, asIScriptFunction *initialFunction, asDWORD origStackPointer, asDWORD argumentsSize, asQWORD valueRegister, void *objectRegister, asITypeInfo *objectTypeRegister) = 0;
+	virtual int SetCallStateRegisters(asUINT stackLevel, asDWORD stackFramePointer, asIScriptFunction *currentFunction, asDWORD programPointer, asDWORD stackPointer, asDWORD stackIndex) = 0;
+	virtual int GetArgsOnStackCount(asUINT stackLevel) = 0;
+	virtual int GetArgOnStack(asUINT stackLevel, asUINT arg, int* typeId, asUINT *flags, void** address) = 0;
+
+protected:
+	virtual ~asIScriptContext() {}
+};
+
+class asIScriptGeneric
+{
+public:
+	// Miscellaneous
+	virtual asIScriptEngine   *GetEngine() const = 0;
+	virtual asIScriptFunction *GetFunction() const = 0;
+	virtual void              *GetAuxiliary() const = 0;
+
+	// Object
+	virtual void   *GetObject() = 0;
+	virtual int     GetObjectTypeId() const = 0;
+
+	// Arguments
+	virtual int     GetArgCount() const = 0;
+	virtual int     GetArgTypeId(asUINT arg, asDWORD *flags = 0) const = 0;
+	virtual asBYTE  GetArgByte(asUINT arg) = 0;
+	virtual asWORD  GetArgWord(asUINT arg) = 0;
+	virtual asDWORD GetArgDWord(asUINT arg) = 0;
+	virtual asQWORD GetArgQWord(asUINT arg) = 0;
+	virtual float   GetArgFloat(asUINT arg) = 0;
+	virtual double  GetArgDouble(asUINT arg) = 0;
+	virtual void   *GetArgAddress(asUINT arg) = 0;
+	virtual void   *GetArgObject(asUINT arg) = 0;
+	virtual void   *GetAddressOfArg(asUINT arg) = 0;
+
+	// Return value
+	virtual int     GetReturnTypeId(asDWORD *flags = 0) const = 0;
+	virtual int     SetReturnByte(asBYTE val) = 0;
+	virtual int     SetReturnWord(asWORD val) = 0;
+	virtual int     SetReturnDWord(asDWORD val) = 0;
+	virtual int     SetReturnQWord(asQWORD val) = 0;
+	virtual int     SetReturnFloat(float val) = 0;
+	virtual int     SetReturnDouble(double val) = 0;
+	virtual int     SetReturnAddress(void *addr) = 0;
+	virtual int     SetReturnObject(void *obj) = 0;
+	virtual void   *GetAddressOfReturnLocation() = 0;
+
+protected:
+	virtual ~asIScriptGeneric() {}
+};
+
+class asIScriptObject
+{
+public:
+	// Memory management
+	virtual int                    AddRef() const = 0;
+	virtual int                    Release() const = 0;
+	virtual asILockableSharedBool *GetWeakRefFlag() const = 0;
+
+	// Type info
+	virtual int            GetTypeId() const = 0;
+	virtual asITypeInfo   *GetObjectType() const = 0;
+
+	// Class properties
+	virtual asUINT      GetPropertyCount() const = 0;
+	virtual int         GetPropertyTypeId(asUINT prop) const = 0;
+	virtual const char *GetPropertyName(asUINT prop) const = 0;
+	virtual void       *GetAddressOfProperty(asUINT prop) = 0;
+
+	// Miscellaneous
+	virtual asIScriptEngine *GetEngine() const = 0;
+	virtual int              CopyFrom(const asIScriptObject *other) = 0;
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
+
+protected:
+	virtual ~asIScriptObject() {}
+};
+
+class asITypeInfo
+{
+public:
+	// Miscellaneous
+	virtual asIScriptEngine *GetEngine() const = 0;
+	virtual const char      *GetConfigGroup() const = 0;
+	virtual asDWORD          GetAccessMask() const = 0;
+	virtual asIScriptModule *GetModule() const = 0;
+
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
+
+	// Type info
+	virtual const char      *GetName() const = 0;
+	virtual	const char      *GetNamespace() const = 0;
+	virtual asITypeInfo     *GetBaseType() const = 0;
+	virtual bool             DerivesFrom(const asITypeInfo *objType) const = 0;
+	virtual asDWORD          GetFlags() const = 0;
+	virtual asUINT           GetSize() const = 0;
+	virtual int              GetTypeId() const = 0;
+	virtual int              GetSubTypeId(asUINT subTypeIndex = 0) const = 0;
+	virtual asITypeInfo     *GetSubType(asUINT subTypeIndex = 0) const = 0;
+	virtual asUINT           GetSubTypeCount() const = 0;
+
+	// Interfaces
+	virtual asUINT           GetInterfaceCount() const = 0;
+	virtual asITypeInfo     *GetInterface(asUINT index) const = 0;
+	virtual bool             Implements(const asITypeInfo *objType) const = 0;
+
+	// Factories
+	virtual asUINT             GetFactoryCount() const = 0;
+	virtual asIScriptFunction *GetFactoryByIndex(asUINT index) const = 0;
+	virtual asIScriptFunction *GetFactoryByDecl(const char *decl) const = 0;
+
+	// Methods
+	virtual asUINT             GetMethodCount() const = 0;
+	virtual asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual = true) const = 0;
+	virtual asIScriptFunction *GetMethodByName(const char *name, bool getVirtual = true) const = 0;
+	virtual asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual = true) const = 0;
+
+	// Properties
+	virtual asUINT      GetPropertyCount() const = 0;
+	virtual int         GetProperty(asUINT index, const char **name, int *typeId = 0, bool *isPrivate = 0, bool *isProtected = 0, int *offset = 0, bool *isReference = 0, asDWORD *accessMask = 0, int *compositeOffset = 0, bool *isCompositeIndirect = 0) const = 0;
+	virtual const char *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const = 0;
+
+	// Behaviours
+	virtual asUINT             GetBehaviourCount() const = 0;
+	virtual asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const = 0;
+
+	// Child types
+	virtual asUINT       GetChildFuncdefCount() const = 0;
+	virtual asITypeInfo *GetChildFuncdef(asUINT index) const = 0;
+	virtual asITypeInfo *GetParentType() const = 0;
+
+	// Enums
+	virtual asUINT      GetEnumValueCount() const = 0;
+	virtual const char *GetEnumValueByIndex(asUINT index, int *outValue) const = 0;
+
+	// Typedef
+	virtual int GetTypedefTypeId() const = 0;
+
+	// Funcdef
+	virtual asIScriptFunction *GetFuncdefSignature() const = 0;
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type = 0) = 0;
+	virtual void *GetUserData(asPWORD type = 0) const = 0;
+
+protected:
+	virtual ~asITypeInfo() {}
+};
+
+class asIScriptFunction
+{
+public:
+	virtual asIScriptEngine *GetEngine() const = 0;
+
+	// Memory management
+	virtual int              AddRef() const = 0;
+	virtual int              Release() const = 0;
+
+	// Miscellaneous
+	virtual int              GetId() const = 0;
+	virtual asEFuncType      GetFuncType() const = 0;
+	virtual const char      *GetModuleName() const = 0;
+	virtual asIScriptModule *GetModule() const = 0;
+	virtual const char      *GetScriptSectionName() const = 0;
+	virtual const char      *GetConfigGroup() const = 0;
+	virtual asDWORD          GetAccessMask() const = 0;
+	virtual void            *GetAuxiliary() const = 0;
+
+	// Function signature
+	virtual asITypeInfo     *GetObjectType() const = 0;
+	virtual const char      *GetObjectName() const = 0;
+	virtual const char      *GetName() const = 0;
+	virtual const char      *GetNamespace() const = 0;
+	virtual const char      *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const = 0;
+	virtual bool             IsReadOnly() const = 0;
+	virtual bool             IsPrivate() const = 0;
+	virtual bool             IsProtected() const = 0;
+	virtual bool             IsFinal() const = 0;
+	virtual bool             IsOverride() const = 0;
+	virtual bool             IsShared() const = 0;
+	virtual bool             IsExplicit() const = 0;
+	virtual bool             IsProperty() const = 0;
+	virtual asUINT           GetParamCount() const = 0;
+	virtual int              GetParam(asUINT index, int *typeId, asDWORD *flags = 0, const char **name = 0, const char **defaultArg = 0) const = 0;
+	virtual int              GetReturnTypeId(asDWORD *flags = 0) const = 0;
+
+	// Type id for function pointers
+	virtual int              GetTypeId() const = 0;
+	virtual bool             IsCompatibleWithTypeId(int typeId) const = 0;
+
+	// Delegates
+	virtual void              *GetDelegateObject() const = 0;
+	virtual asITypeInfo       *GetDelegateObjectType() const = 0;
+	virtual asIScriptFunction *GetDelegateFunction() const = 0;
+
+	// Debug information
+	virtual asUINT           GetVarCount() const = 0;
+	virtual int              GetVar(asUINT index, const char **name, int *typeId = 0) const = 0;
+	virtual const char      *GetVarDecl(asUINT index, bool includeNamespace = false) const = 0;
+	virtual int              FindNextLineWithCode(int line) const = 0;
+
+	// For JIT compilation
+	virtual asDWORD         *GetByteCode(asUINT *length = 0) = 0;
+
+	// User data
+	virtual void            *SetUserData(void *userData, asPWORD type = 0) = 0;
+	virtual void            *GetUserData(asPWORD type = 0) const = 0;
+
+protected:
+	virtual ~asIScriptFunction() {};
+};
+
+class asIBinaryStream
+{
+public:
+	virtual int Read(void *ptr, asUINT size) = 0;
+	virtual int Write(const void *ptr, asUINT size) = 0;
+
+public:
+	virtual ~asIBinaryStream() {}
+};
+
+class asILockableSharedBool
+{
+public:
+	// Memory management
+	virtual int AddRef() const = 0;
+	virtual int Release() const = 0;
+
+	// Value
+	virtual bool Get() const = 0;
+	virtual void Set(bool val) = 0;
+
+	// Thread management
+	virtual void Lock() const = 0;
+	virtual void Unlock() const = 0;
+
+protected:
+	virtual ~asILockableSharedBool() {}
+};
+
+//-----------------------------------------------------------------
+// Function pointers
+
+// Template function to capture all global functions,
+// except the ones using the generic calling convention
+template <class T>
+inline asSFuncPtr asFunctionPtr(T func)
+{
+	// Mark this as a global function
+	asSFuncPtr p(2);
+
+#ifdef AS_64BIT_PTR
+	// The size_t cast is to avoid a compiler warning with asFUNCTION(0)
+	// on 64bit, as 0 is interpreted as a 32bit int value
+	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(size_t(func));
+#else
+	// MSVC6 doesn't like the size_t cast above so I
+	// solved this with a separate code for 32bit.
+	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
+#endif
+
+	return p;
+}
+
+// Specialization for functions using the generic calling convention
+template<>
+inline asSFuncPtr asFunctionPtr<asGENFUNC_t>(asGENFUNC_t func)
+{
+	// Mark this as a generic function
+	asSFuncPtr p(1);
+	p.ptr.f.func = reinterpret_cast<asFUNCTION_t>(func);
+	return p;
+}
+
+#ifndef AS_NO_CLASS_METHODS
+
+// Method pointers
+
+// Declare a dummy class so that we can determine the size of a simple method pointer
+class asCSimpleDummy {};
+typedef void (asCSimpleDummy::*asSIMPLEMETHOD_t)();
+const int SINGLE_PTR_SIZE = sizeof(asSIMPLEMETHOD_t);
+
+// Define template
+template <int N>
+struct asSMethodPtr
+{
+	template<class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// This version of the function should never be executed, nor compiled,
+		// as it would mean that the size of the method pointer cannot be determined.
+
+		int ERROR_UnsupportedMethodPtr[N-100];
+
+		asSFuncPtr p(0);
+		return p;
+	}
+};
+
+// Template specialization
+template <>
+struct asSMethodPtr<SINGLE_PTR_SIZE>
+{
+	template<class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE);
+		return p;
+	}
+};
+
+#if defined(_MSC_VER) && !defined(__MWERKS__)
+
+// MSVC and Intel uses different sizes for different class method pointers
+template <>
+struct asSMethodPtr<SINGLE_PTR_SIZE+1*sizeof(int)>
+{
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+sizeof(int));
+		return p;
+	}
+};
+
+template <>
+struct asSMethodPtr<SINGLE_PTR_SIZE+2*sizeof(int)>
+{
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// On 32bit platforms with is where a class with virtual inheritance falls.
+		// On 64bit platforms we can also fall here if 8byte data alignments is used.
+
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+2*sizeof(int));
+
+		// Microsoft has a terrible optimization on class methods with virtual inheritance.
+		// They are hardcoding an important offset, which is not coming in the method pointer.
+
+#if defined(_MSC_VER) && !defined(AS_64BIT_PTR)
+			// Method pointers for virtual inheritance is not supported,
+			// as it requires the location of the vbase table, which is
+			// only available to the C++ compiler, but not in the method
+			// pointer.
+
+			// You can get around this by forward declaring the class and
+			// storing the sizeof its method pointer in a constant. Example:
+
+			// class ClassWithVirtualInheritance;
+			// const int ClassWithVirtualInheritance_workaround = sizeof(void ClassWithVirtualInheritance::*());
+
+			// This will force the compiler to use the unknown type
+			// for the class, which falls under the next case
+
+
+			// Copy the virtual table index to the 4th dword so that AngelScript
+			// can properly detect and deny the use of methods with virtual inheritance.
+			*(reinterpret_cast<asDWORD*>(&p)+3) = *(reinterpret_cast<asDWORD*>(&p)+2);
+#endif
+
+		return p;
+	}
+};
+
+template <>
+struct asSMethodPtr<SINGLE_PTR_SIZE+3*sizeof(int)>
+{
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+3*sizeof(int));
+		return p;
+	}
+};
+
+template <>
+struct asSMethodPtr<SINGLE_PTR_SIZE+4*sizeof(int)>
+{
+	template <class M>
+	static asSFuncPtr Convert(M Mthd)
+	{
+		// On 64bit platforms with 8byte data alignment
+		// the unknown class method pointers will come here.
+
+		// Mark this as a class method
+		asSFuncPtr p(3);
+		p.CopyMethodPtr(&Mthd, SINGLE_PTR_SIZE+4*sizeof(int));
+		return p;
+	}
+};
+
+#endif
+
+#endif // AS_NO_CLASS_METHODS
+
+//----------------------------------------------------------------
+// JIT compiler
+
+struct asSVMRegisters
+{
+	asDWORD          *programPointer;     // points to current bytecode instruction
+	asDWORD          *stackFramePointer;  // function stack frame
+	asDWORD          *stackPointer;       // top of stack (grows downward)
+	asQWORD           valueRegister;      // temp register for primitives
+	void             *objectRegister;     // temp register for objects and handles
+	asITypeInfo      *objectType;         // type of object held in object register
+	bool              doProcessSuspend;   // whether or not the JIT should break out when it encounters a suspend instruction
+	asIScriptContext *ctx;                // the active context
+};
+
+typedef void (*asJITFunction)(asSVMRegisters *registers, asPWORD jitArg);
+
+class asIJITCompiler
+{
+public:
+	virtual int  CompileFunction(asIScriptFunction *function, asJITFunction *output) = 0;
+	virtual void ReleaseJITFunction(asJITFunction func) = 0;
+public:
+	virtual ~asIJITCompiler() {}
+};
+
+// Byte code instructions
+enum asEBCInstr
+{
+	asBC_PopPtr			= 0,
+	asBC_PshGPtr		= 1,
+	asBC_PshC4			= 2,
+	asBC_PshV4			= 3,
+	asBC_PSF			= 4,
+	asBC_SwapPtr		= 5,
+	asBC_NOT			= 6,
+	asBC_PshG4			= 7,
+	asBC_LdGRdR4		= 8,
+	asBC_CALL			= 9,
+	asBC_RET			= 10,
+	asBC_JMP			= 11,
+	asBC_JZ				= 12,
+	asBC_JNZ			= 13,
+	asBC_JS				= 14,
+	asBC_JNS			= 15,
+	asBC_JP				= 16,
+	asBC_JNP			= 17,
+	asBC_TZ				= 18,
+	asBC_TNZ			= 19,
+	asBC_TS				= 20,
+	asBC_TNS			= 21,
+	asBC_TP				= 22,
+	asBC_TNP			= 23,
+	asBC_NEGi			= 24,
+	asBC_NEGf			= 25,
+	asBC_NEGd			= 26,
+	asBC_INCi16			= 27,
+	asBC_INCi8			= 28,
+	asBC_DECi16			= 29,
+	asBC_DECi8			= 30,
+	asBC_INCi			= 31,
+	asBC_DECi			= 32,
+	asBC_INCf			= 33,
+	asBC_DECf			= 34,
+	asBC_INCd			= 35,
+	asBC_DECd			= 36,
+	asBC_IncVi			= 37,
+	asBC_DecVi			= 38,
+	asBC_BNOT			= 39,
+	asBC_BAND			= 40,
+	asBC_BOR			= 41,
+	asBC_BXOR			= 42,
+	asBC_BSLL			= 43,
+	asBC_BSRL			= 44,
+	asBC_BSRA			= 45,
+	asBC_COPY			= 46,
+	asBC_PshC8			= 47,
+	asBC_PshVPtr		= 48,
+	asBC_RDSPtr			= 49,
+	asBC_CMPd			= 50,
+	asBC_CMPu			= 51,
+	asBC_CMPf			= 52,
+	asBC_CMPi			= 53,
+	asBC_CMPIi			= 54,
+	asBC_CMPIf			= 55,
+	asBC_CMPIu			= 56,
+	asBC_JMPP			= 57,
+	asBC_PopRPtr		= 58,
+	asBC_PshRPtr		= 59,
+	asBC_STR			= 60,
+	asBC_CALLSYS		= 61,
+	asBC_CALLBND		= 62,
+	asBC_SUSPEND		= 63,
+	asBC_ALLOC			= 64,
+	asBC_FREE			= 65,
+	asBC_LOADOBJ		= 66,
+	asBC_STOREOBJ		= 67,
+	asBC_GETOBJ			= 68,
+	asBC_REFCPY			= 69,
+	asBC_CHKREF			= 70,
+	asBC_GETOBJREF		= 71,
+	asBC_GETREF			= 72,
+	asBC_PshNull		= 73,
+	asBC_ClrVPtr		= 74,
+	asBC_OBJTYPE		= 75,
+	asBC_TYPEID			= 76,
+	asBC_SetV4			= 77,
+	asBC_SetV8			= 78,
+	asBC_ADDSi			= 79,
+	asBC_CpyVtoV4		= 80,
+	asBC_CpyVtoV8		= 81,
+	asBC_CpyVtoR4		= 82,
+	asBC_CpyVtoR8		= 83,
+	asBC_CpyVtoG4		= 84,
+	asBC_CpyRtoV4		= 85,
+	asBC_CpyRtoV8		= 86,
+	asBC_CpyGtoV4		= 87,
+	asBC_WRTV1			= 88,
+	asBC_WRTV2			= 89,
+	asBC_WRTV4			= 90,
+	asBC_WRTV8			= 91,
+	asBC_RDR1			= 92,
+	asBC_RDR2			= 93,
+	asBC_RDR4			= 94,
+	asBC_RDR8			= 95,
+	asBC_LDG			= 96,
+	asBC_LDV			= 97,
+	asBC_PGA			= 98,
+	asBC_CmpPtr			= 99,
+	asBC_VAR			= 100,
+	asBC_iTOf			= 101,
+	asBC_fTOi			= 102,
+	asBC_uTOf			= 103,
+	asBC_fTOu			= 104,
+	asBC_sbTOi			= 105,
+	asBC_swTOi			= 106,
+	asBC_ubTOi			= 107,
+	asBC_uwTOi			= 108,
+	asBC_dTOi			= 109,
+	asBC_dTOu			= 110,
+	asBC_dTOf			= 111,
+	asBC_iTOd			= 112,
+	asBC_uTOd			= 113,
+	asBC_fTOd			= 114,
+	asBC_ADDi			= 115,
+	asBC_SUBi			= 116,
+	asBC_MULi			= 117,
+	asBC_DIVi			= 118,
+	asBC_MODi			= 119,
+	asBC_ADDf			= 120,
+	asBC_SUBf			= 121,
+	asBC_MULf			= 122,
+	asBC_DIVf			= 123,
+	asBC_MODf			= 124,
+	asBC_ADDd			= 125,
+	asBC_SUBd			= 126,
+	asBC_MULd			= 127,
+	asBC_DIVd			= 128,
+	asBC_MODd			= 129,
+	asBC_ADDIi			= 130,
+	asBC_SUBIi			= 131,
+	asBC_MULIi			= 132,
+	asBC_ADDIf			= 133,
+	asBC_SUBIf			= 134,
+	asBC_MULIf			= 135,
+	asBC_SetG4			= 136,
+	asBC_ChkRefS		= 137,
+	asBC_ChkNullV		= 138,
+	asBC_CALLINTF		= 139,
+	asBC_iTOb			= 140,
+	asBC_iTOw			= 141,
+	asBC_SetV1			= 142,
+	asBC_SetV2			= 143,
+	asBC_Cast			= 144,
+	asBC_i64TOi			= 145,
+	asBC_uTOi64			= 146,
+	asBC_iTOi64			= 147,
+	asBC_fTOi64			= 148,
+	asBC_dTOi64			= 149,
+	asBC_fTOu64			= 150,
+	asBC_dTOu64			= 151,
+	asBC_i64TOf			= 152,
+	asBC_u64TOf			= 153,
+	asBC_i64TOd			= 154,
+	asBC_u64TOd			= 155,
+	asBC_NEGi64			= 156,
+	asBC_INCi64			= 157,
+	asBC_DECi64			= 158,
+	asBC_BNOT64			= 159,
+	asBC_ADDi64			= 160,
+	asBC_SUBi64			= 161,
+	asBC_MULi64			= 162,
+	asBC_DIVi64			= 163,
+	asBC_MODi64			= 164,
+	asBC_BAND64			= 165,
+	asBC_BOR64			= 166,
+	asBC_BXOR64			= 167,
+	asBC_BSLL64			= 168,
+	asBC_BSRL64			= 169,
+	asBC_BSRA64			= 170,
+	asBC_CMPi64			= 171,
+	asBC_CMPu64			= 172,
+	asBC_ChkNullS		= 173,
+	asBC_ClrHi			= 174,
+	asBC_JitEntry		= 175,
+	asBC_CallPtr		= 176,
+	asBC_FuncPtr		= 177,
+	asBC_LoadThisR		= 178,
+	asBC_PshV8			= 179,
+	asBC_DIVu			= 180,
+	asBC_MODu			= 181,
+	asBC_DIVu64			= 182,
+	asBC_MODu64			= 183,
+	asBC_LoadRObjR		= 184,
+	asBC_LoadVObjR		= 185,
+	asBC_RefCpyV		= 186,
+	asBC_JLowZ			= 187,
+	asBC_JLowNZ			= 188,
+	asBC_AllocMem		= 189,
+	asBC_SetListSize	= 190,
+	asBC_PshListElmnt	= 191,
+	asBC_SetListType	= 192,
+	asBC_POWi			= 193,
+	asBC_POWu			= 194,
+	asBC_POWf			= 195,
+	asBC_POWd			= 196,
+	asBC_POWdi			= 197,
+	asBC_POWi64			= 198,
+	asBC_POWu64			= 199,
+	asBC_Thiscall1		= 200,
+	asBC_MAXBYTECODE	= 201,
+
+	// Temporary tokens. Can't be output to the final program
+	asBC_TryBlock		= 250,
+	asBC_VarDecl		= 251,
+	asBC_Block			= 252,
+	asBC_ObjInfo		= 253,
+	asBC_LINE			= 254,
+	asBC_LABEL			= 255
+};
+
+// Instruction types
+enum asEBCType
+{
+	asBCTYPE_INFO         = 0,
+	asBCTYPE_NO_ARG       = 1,
+	asBCTYPE_W_ARG        = 2,
+	asBCTYPE_wW_ARG       = 3,
+	asBCTYPE_DW_ARG       = 4,
+	asBCTYPE_rW_DW_ARG    = 5,
+	asBCTYPE_QW_ARG       = 6,
+	asBCTYPE_DW_DW_ARG    = 7,
+	asBCTYPE_wW_rW_rW_ARG = 8,
+	asBCTYPE_wW_QW_ARG    = 9,
+	asBCTYPE_wW_rW_ARG    = 10,
+	asBCTYPE_rW_ARG       = 11,
+	asBCTYPE_wW_DW_ARG    = 12,
+	asBCTYPE_wW_rW_DW_ARG = 13,
+	asBCTYPE_rW_rW_ARG    = 14,
+	asBCTYPE_wW_W_ARG     = 15,
+	asBCTYPE_QW_DW_ARG    = 16,
+	asBCTYPE_rW_QW_ARG    = 17,
+	asBCTYPE_W_DW_ARG     = 18,
+	asBCTYPE_rW_W_DW_ARG  = 19,
+	asBCTYPE_rW_DW_DW_ARG = 20
+};
+
+// Instruction type sizes
+const int asBCTypeSize[21] =
+{
+	0, // asBCTYPE_INFO
+	1, // asBCTYPE_NO_ARG
+	1, // asBCTYPE_W_ARG
+	1, // asBCTYPE_wW_ARG
+	2, // asBCTYPE_DW_ARG
+	2, // asBCTYPE_rW_DW_ARG
+	3, // asBCTYPE_QW_ARG
+	3, // asBCTYPE_DW_DW_ARG
+	2, // asBCTYPE_wW_rW_rW_ARG
+	3, // asBCTYPE_wW_QW_ARG
+	2, // asBCTYPE_wW_rW_ARG
+	1, // asBCTYPE_rW_ARG
+	2, // asBCTYPE_wW_DW_ARG
+	3, // asBCTYPE_wW_rW_DW_ARG
+	2, // asBCTYPE_rW_rW_ARG
+	2, // asBCTYPE_wW_W_ARG
+	4, // asBCTYPE_QW_DW_ARG
+	3, // asBCTYPE_rW_QW_ARG
+	2, // asBCTYPE_W_DW_ARG
+	3, // asBCTYPE_rW_W_DW_ARG
+	3  // asBCTYPE_rW_DW_DW_ARG
+};
+
+// Instruction info
+struct asSBCInfo
+{
+	asEBCInstr  bc;
+	asEBCType   type;
+	int         stackInc;
+	const char *name;
+};
+
+#ifndef AS_64BIT_PTR
+	#define asBCTYPE_PTR_ARG    asBCTYPE_DW_ARG
+	#define asBCTYPE_PTR_DW_ARG asBCTYPE_DW_DW_ARG
+	#define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_DW_ARG
+	#define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_DW_ARG
+	#ifndef AS_PTR_SIZE
+		#define AS_PTR_SIZE 1
+	#endif
+#else
+	#define asBCTYPE_PTR_ARG    asBCTYPE_QW_ARG
+	#define asBCTYPE_PTR_DW_ARG asBCTYPE_QW_DW_ARG
+	#define asBCTYPE_wW_PTR_ARG asBCTYPE_wW_QW_ARG
+	#define asBCTYPE_rW_PTR_ARG asBCTYPE_rW_QW_ARG
+	#ifndef AS_PTR_SIZE
+		#define AS_PTR_SIZE 2
+	#endif
+#endif
+
+#define asBCINFO(b,t,s) {asBC_##b, asBCTYPE_##t, s, #b}
+#define asBCINFO_DUMMY(b) {asBC_MAXBYTECODE, asBCTYPE_INFO, 0, "BC_" #b}
+
+const asSBCInfo asBCInfo[256] =
+{
+	asBCINFO(PopPtr,	NO_ARG,			-AS_PTR_SIZE),
+	asBCINFO(PshGPtr,	PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(PshC4,		DW_ARG,			1),
+	asBCINFO(PshV4,		rW_ARG,			1),
+	asBCINFO(PSF,		rW_ARG,			AS_PTR_SIZE),
+	asBCINFO(SwapPtr,	NO_ARG,			0),
+	asBCINFO(NOT,		rW_ARG,			0),
+	asBCINFO(PshG4,		PTR_ARG,		1),
+	asBCINFO(LdGRdR4,	wW_PTR_ARG,		0),
+	asBCINFO(CALL,		DW_ARG,			0xFFFF),
+	asBCINFO(RET,		W_ARG,			0xFFFF),
+	asBCINFO(JMP,		DW_ARG,			0),
+	asBCINFO(JZ,		DW_ARG,			0),
+	asBCINFO(JNZ,		DW_ARG,			0),
+	asBCINFO(JS,		DW_ARG,			0),
+	asBCINFO(JNS,		DW_ARG,			0),
+	asBCINFO(JP,		DW_ARG,			0),
+	asBCINFO(JNP,		DW_ARG,			0),
+	asBCINFO(TZ,		NO_ARG,			0),
+	asBCINFO(TNZ,		NO_ARG,			0),
+	asBCINFO(TS,		NO_ARG,			0),
+	asBCINFO(TNS,		NO_ARG,			0),
+	asBCINFO(TP,		NO_ARG,			0),
+	asBCINFO(TNP,		NO_ARG,			0),
+	asBCINFO(NEGi,		rW_ARG,			0),
+	asBCINFO(NEGf,		rW_ARG,			0),
+	asBCINFO(NEGd,		rW_ARG,			0),
+	asBCINFO(INCi16,	NO_ARG,			0),
+	asBCINFO(INCi8,		NO_ARG,			0),
+	asBCINFO(DECi16,	NO_ARG,			0),
+	asBCINFO(DECi8,		NO_ARG,			0),
+	asBCINFO(INCi,		NO_ARG,			0),
+	asBCINFO(DECi,		NO_ARG,			0),
+	asBCINFO(INCf,		NO_ARG,			0),
+	asBCINFO(DECf,		NO_ARG,			0),
+	asBCINFO(INCd,		NO_ARG,			0),
+	asBCINFO(DECd,		NO_ARG,			0),
+	asBCINFO(IncVi,		rW_ARG,			0),
+	asBCINFO(DecVi,		rW_ARG,			0),
+	asBCINFO(BNOT,		rW_ARG,			0),
+	asBCINFO(BAND,		wW_rW_rW_ARG,	0),
+	asBCINFO(BOR,		wW_rW_rW_ARG,	0),
+	asBCINFO(BXOR,		wW_rW_rW_ARG,	0),
+	asBCINFO(BSLL,		wW_rW_rW_ARG,	0),
+	asBCINFO(BSRL,		wW_rW_rW_ARG,	0),
+	asBCINFO(BSRA,		wW_rW_rW_ARG,	0),
+	asBCINFO(COPY,		W_DW_ARG,		-AS_PTR_SIZE),
+	asBCINFO(PshC8,		QW_ARG,			2),
+	asBCINFO(PshVPtr,	rW_ARG,			AS_PTR_SIZE),
+	asBCINFO(RDSPtr,	NO_ARG,			0),
+	asBCINFO(CMPd,		rW_rW_ARG,		0),
+	asBCINFO(CMPu,		rW_rW_ARG,		0),
+	asBCINFO(CMPf,		rW_rW_ARG,		0),
+	asBCINFO(CMPi,		rW_rW_ARG,		0),
+	asBCINFO(CMPIi,		rW_DW_ARG,		0),
+	asBCINFO(CMPIf,		rW_DW_ARG,		0),
+	asBCINFO(CMPIu,		rW_DW_ARG,		0),
+	asBCINFO(JMPP,		rW_ARG,			0),
+	asBCINFO(PopRPtr,	NO_ARG,			-AS_PTR_SIZE),
+	asBCINFO(PshRPtr,	NO_ARG,			AS_PTR_SIZE),
+	asBCINFO(STR,		W_ARG,			1+AS_PTR_SIZE),
+	asBCINFO(CALLSYS,	DW_ARG,			0xFFFF),
+	asBCINFO(CALLBND,	DW_ARG,			0xFFFF),
+	asBCINFO(SUSPEND,	NO_ARG,			0),
+	asBCINFO(ALLOC,		PTR_DW_ARG,		0xFFFF),
+	asBCINFO(FREE,		wW_PTR_ARG,		0),
+	asBCINFO(LOADOBJ,	rW_ARG,			0),
+	asBCINFO(STOREOBJ,	wW_ARG,			0),
+	asBCINFO(GETOBJ,	W_ARG,			0),
+	asBCINFO(REFCPY,	PTR_ARG,		-AS_PTR_SIZE),
+	asBCINFO(CHKREF,	NO_ARG,			0),
+	asBCINFO(GETOBJREF,	W_ARG,			0),
+	asBCINFO(GETREF,	W_ARG,			0),
+	asBCINFO(PshNull,	NO_ARG,			AS_PTR_SIZE),
+	asBCINFO(ClrVPtr,	wW_ARG,			0),
+	asBCINFO(OBJTYPE,	PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(TYPEID,	DW_ARG,			1),
+	asBCINFO(SetV4,		wW_DW_ARG,		0),
+	asBCINFO(SetV8,		wW_QW_ARG,		0),
+	asBCINFO(ADDSi,		W_DW_ARG,		0),
+	asBCINFO(CpyVtoV4,	wW_rW_ARG,		0),
+	asBCINFO(CpyVtoV8,	wW_rW_ARG,		0),
+	asBCINFO(CpyVtoR4,	rW_ARG,			0),
+	asBCINFO(CpyVtoR8,	rW_ARG,			0),
+	asBCINFO(CpyVtoG4,	rW_PTR_ARG,		0),
+	asBCINFO(CpyRtoV4,	wW_ARG,			0),
+	asBCINFO(CpyRtoV8,	wW_ARG,			0),
+	asBCINFO(CpyGtoV4,	wW_PTR_ARG,		0),
+	asBCINFO(WRTV1,		rW_ARG,			0),
+	asBCINFO(WRTV2,		rW_ARG,			0),
+	asBCINFO(WRTV4,		rW_ARG,			0),
+	asBCINFO(WRTV8,		rW_ARG,			0),
+	asBCINFO(RDR1,		wW_ARG,			0),
+	asBCINFO(RDR2,		wW_ARG,			0),
+	asBCINFO(RDR4,		wW_ARG,			0),
+	asBCINFO(RDR8,		wW_ARG,			0),
+	asBCINFO(LDG,		PTR_ARG,		0),
+	asBCINFO(LDV,		rW_ARG,			0),
+	asBCINFO(PGA,		PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(CmpPtr,	rW_rW_ARG,		0),
+	asBCINFO(VAR,		rW_ARG,			AS_PTR_SIZE),
+	asBCINFO(iTOf,		rW_ARG,			0),
+	asBCINFO(fTOi,		rW_ARG,			0),
+	asBCINFO(uTOf,		rW_ARG,			0),
+	asBCINFO(fTOu,		rW_ARG,			0),
+	asBCINFO(sbTOi,		rW_ARG,			0),
+	asBCINFO(swTOi,		rW_ARG,			0),
+	asBCINFO(ubTOi,		rW_ARG,			0),
+	asBCINFO(uwTOi,		rW_ARG,			0),
+	asBCINFO(dTOi,		wW_rW_ARG,		0),
+	asBCINFO(dTOu,		wW_rW_ARG,		0),
+	asBCINFO(dTOf,		wW_rW_ARG,		0),
+	asBCINFO(iTOd,		wW_rW_ARG,		0),
+	asBCINFO(uTOd,		wW_rW_ARG,		0),
+	asBCINFO(fTOd,		wW_rW_ARG,		0),
+	asBCINFO(ADDi,		wW_rW_rW_ARG,	0),
+	asBCINFO(SUBi,		wW_rW_rW_ARG,	0),
+	asBCINFO(MULi,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVi,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODi,		wW_rW_rW_ARG,	0),
+	asBCINFO(ADDf,		wW_rW_rW_ARG,	0),
+	asBCINFO(SUBf,		wW_rW_rW_ARG,	0),
+	asBCINFO(MULf,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVf,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODf,		wW_rW_rW_ARG,	0),
+	asBCINFO(ADDd,		wW_rW_rW_ARG,	0),
+	asBCINFO(SUBd,		wW_rW_rW_ARG,	0),
+	asBCINFO(MULd,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVd,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODd,		wW_rW_rW_ARG,	0),
+	asBCINFO(ADDIi,		wW_rW_DW_ARG,	0),
+	asBCINFO(SUBIi,		wW_rW_DW_ARG,	0),
+	asBCINFO(MULIi,		wW_rW_DW_ARG,	0),
+	asBCINFO(ADDIf,		wW_rW_DW_ARG,	0),
+	asBCINFO(SUBIf,		wW_rW_DW_ARG,	0),
+	asBCINFO(MULIf,		wW_rW_DW_ARG,	0),
+	asBCINFO(SetG4,		PTR_DW_ARG,		0),
+	asBCINFO(ChkRefS,	NO_ARG,			0),
+	asBCINFO(ChkNullV,	rW_ARG,			0),
+	asBCINFO(CALLINTF,	DW_ARG,			0xFFFF),
+	asBCINFO(iTOb,		rW_ARG,			0),
+	asBCINFO(iTOw,		rW_ARG,			0),
+	asBCINFO(SetV1,		wW_DW_ARG,		0),
+	asBCINFO(SetV2,		wW_DW_ARG,		0),
+	asBCINFO(Cast,		DW_ARG,			-AS_PTR_SIZE),
+	asBCINFO(i64TOi,	wW_rW_ARG,		0),
+	asBCINFO(uTOi64,	wW_rW_ARG,		0),
+	asBCINFO(iTOi64,	wW_rW_ARG,		0),
+	asBCINFO(fTOi64,	wW_rW_ARG,		0),
+	asBCINFO(dTOi64,	rW_ARG,			0),
+	asBCINFO(fTOu64,	wW_rW_ARG,		0),
+	asBCINFO(dTOu64,	rW_ARG,			0),
+	asBCINFO(i64TOf,	wW_rW_ARG,		0),
+	asBCINFO(u64TOf,	wW_rW_ARG,		0),
+	asBCINFO(i64TOd,	rW_ARG,			0),
+	asBCINFO(u64TOd,	rW_ARG,			0),
+	asBCINFO(NEGi64,	rW_ARG,			0),
+	asBCINFO(INCi64,	NO_ARG,			0),
+	asBCINFO(DECi64,	NO_ARG,			0),
+	asBCINFO(BNOT64,	rW_ARG,			0),
+	asBCINFO(ADDi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(SUBi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(MULi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(DIVi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(MODi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BAND64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BOR64,		wW_rW_rW_ARG,	0),
+	asBCINFO(BXOR64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BSLL64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BSRL64,	wW_rW_rW_ARG,	0),
+	asBCINFO(BSRA64,	wW_rW_rW_ARG,	0),
+	asBCINFO(CMPi64,	rW_rW_ARG,		0),
+	asBCINFO(CMPu64,	rW_rW_ARG,		0),
+	asBCINFO(ChkNullS,	W_ARG,			0),
+	asBCINFO(ClrHi,		NO_ARG,			0),
+	asBCINFO(JitEntry,	PTR_ARG,		0),
+	asBCINFO(CallPtr,	rW_ARG,			0xFFFF),
+	asBCINFO(FuncPtr,	PTR_ARG,		AS_PTR_SIZE),
+	asBCINFO(LoadThisR,	W_DW_ARG,		0),
+	asBCINFO(PshV8,		rW_ARG,			2),
+	asBCINFO(DIVu,		wW_rW_rW_ARG,	0),
+	asBCINFO(MODu,		wW_rW_rW_ARG,	0),
+	asBCINFO(DIVu64,	wW_rW_rW_ARG,	0),
+	asBCINFO(MODu64,	wW_rW_rW_ARG,	0),
+	asBCINFO(LoadRObjR,	rW_W_DW_ARG,	0),
+	asBCINFO(LoadVObjR,	rW_W_DW_ARG,	0),
+	asBCINFO(RefCpyV,	wW_PTR_ARG,		0),
+	asBCINFO(JLowZ,		DW_ARG,			0),
+	asBCINFO(JLowNZ,	DW_ARG,			0),
+	asBCINFO(AllocMem,	wW_DW_ARG,		0),
+	asBCINFO(SetListSize, rW_DW_DW_ARG,	0),
+	asBCINFO(PshListElmnt, rW_DW_ARG,	AS_PTR_SIZE),
+	asBCINFO(SetListType, rW_DW_DW_ARG,	0),
+	asBCINFO(POWi,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWu,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWf,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWd,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWdi,		wW_rW_rW_ARG,	0),
+	asBCINFO(POWi64,	wW_rW_rW_ARG,	0),
+	asBCINFO(POWu64,	wW_rW_rW_ARG,	0),
+	asBCINFO(Thiscall1, DW_ARG,			-AS_PTR_SIZE-1),
+
+	asBCINFO_DUMMY(201),
+	asBCINFO_DUMMY(202),
+	asBCINFO_DUMMY(203),
+	asBCINFO_DUMMY(204),
+	asBCINFO_DUMMY(205),
+	asBCINFO_DUMMY(206),
+	asBCINFO_DUMMY(207),
+	asBCINFO_DUMMY(208),
+	asBCINFO_DUMMY(209),
+	asBCINFO_DUMMY(210),
+	asBCINFO_DUMMY(211),
+	asBCINFO_DUMMY(212),
+	asBCINFO_DUMMY(213),
+	asBCINFO_DUMMY(214),
+	asBCINFO_DUMMY(215),
+	asBCINFO_DUMMY(216),
+	asBCINFO_DUMMY(217),
+	asBCINFO_DUMMY(218),
+	asBCINFO_DUMMY(219),
+	asBCINFO_DUMMY(220),
+	asBCINFO_DUMMY(221),
+	asBCINFO_DUMMY(222),
+	asBCINFO_DUMMY(223),
+	asBCINFO_DUMMY(224),
+	asBCINFO_DUMMY(225),
+	asBCINFO_DUMMY(226),
+	asBCINFO_DUMMY(227),
+	asBCINFO_DUMMY(228),
+	asBCINFO_DUMMY(229),
+	asBCINFO_DUMMY(230),
+	asBCINFO_DUMMY(231),
+	asBCINFO_DUMMY(232),
+	asBCINFO_DUMMY(233),
+	asBCINFO_DUMMY(234),
+	asBCINFO_DUMMY(235),
+	asBCINFO_DUMMY(236),
+	asBCINFO_DUMMY(237),
+	asBCINFO_DUMMY(238),
+	asBCINFO_DUMMY(239),
+	asBCINFO_DUMMY(240),
+	asBCINFO_DUMMY(241),
+	asBCINFO_DUMMY(242),
+	asBCINFO_DUMMY(243),
+	asBCINFO_DUMMY(244),
+	asBCINFO_DUMMY(245),
+	asBCINFO_DUMMY(246),
+	asBCINFO_DUMMY(247),
+	asBCINFO_DUMMY(248),
+	asBCINFO_DUMMY(249),
+
+	asBCINFO(TryBlock,		DW_ARG,			0),
+	asBCINFO(VarDecl,		W_ARG,			0),
+	asBCINFO(Block,			INFO,			0),
+	asBCINFO(ObjInfo,		rW_DW_ARG,		0),
+	asBCINFO(LINE,			INFO,			0),
+	asBCINFO(LABEL,			INFO,			0)
+};
+
+// Macros to access bytecode instruction arguments
+#define asBC_DWORDARG(x)  (*(((asDWORD*)x)+1))
+#define asBC_INTARG(x)    (*(int*)(((asDWORD*)x)+1))
+#define asBC_QWORDARG(x)  (*(asQWORD*)(((asDWORD*)x)+1))
+#define asBC_FLOATARG(x)  (*(float*)(((asDWORD*)x)+1))
+#define asBC_PTRARG(x)    (*(asPWORD*)(((asDWORD*)x)+1))
+#define asBC_WORDARG0(x)  (*(((asWORD*)x)+1))
+#define asBC_WORDARG1(x)  (*(((asWORD*)x)+2))
+#define asBC_SWORDARG0(x) (*(((short*)x)+1))
+#define asBC_SWORDARG1(x) (*(((short*)x)+2))
+#define asBC_SWORDARG2(x) (*(((short*)x)+3))
+
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/lib/dummy b/Sources/AngelScript/lib/dummy
deleted file mode 100755
index 0848a3500..000000000
--- a/Sources/AngelScript/lib/dummy
+++ /dev/null
@@ -1 +0,0 @@
-This file is only here to guarantee that unpackers don't skip creating the /lib directory.
\ No newline at end of file
diff --git a/Sources/AngelScript/projects/cmake/CMakeLists.txt b/Sources/AngelScript/projects/cmake/CMakeLists.txt
old mode 100755
new mode 100644
index 94304aaf1..9f339a06b
--- a/Sources/AngelScript/projects/cmake/CMakeLists.txt
+++ b/Sources/AngelScript/projects/cmake/CMakeLists.txt
@@ -1,117 +1,239 @@
-cmake_minimum_required(VERSION 2.6)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
-cmake_policy(SET CMP0003 NEW)
-
-project(Angelscript)
-
-set(ANGELSCRIPT_SOURCE
-        ../../source/as_atomic.cpp
-        ../../source/as_builder.cpp
-        ../../source/as_bytecode.cpp
-        ../../source/as_callfunc.cpp
-        ../../source/as_callfunc_x86.cpp
-        ../../source/as_callfunc_x64_gcc.cpp
-        ../../source/as_callfunc_x64_msvc.cpp
-        ../../source/as_compiler.cpp
-        ../../source/as_configgroup.cpp
-        ../../source/as_context.cpp
-        ../../source/as_datatype.cpp
-        ../../source/as_gc.cpp
-        ../../source/as_generic.cpp
-        ../../source/as_globalproperty.cpp
-        ../../source/as_memory.cpp
-        ../../source/as_module.cpp
-        ../../source/as_objecttype.cpp
-        ../../source/as_outputbuffer.cpp
-        ../../source/as_parser.cpp
-        ../../source/as_restore.cpp
-        ../../source/as_scriptcode.cpp
-        ../../source/as_scriptengine.cpp
-        ../../source/as_scriptfunction.cpp
-        ../../source/as_scriptnode.cpp
-        ../../source/as_scriptobject.cpp
-        ../../source/as_string.cpp
-        ../../source/as_string_util.cpp
-        ../../source/as_thread.cpp
-        ../../source/as_tokenizer.cpp
-        ../../source/as_typeinfo.cpp
-        ../../source/as_variablescope.cpp
-)
-
-if(MSVC AND CMAKE_CL_64)
-            enable_language(ASM_MASM)
-            if(CMAKE_ASM_MASM_COMPILER_WORKS)
-                            set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_x64_msvc_asm.asm)
-            else()
-                            message(FATAL ERROR "MSVC x86_64 target requires a working assembler")
-            endif()
-endif()
-
-if(ANDROID)
-        enable_language(ASM)
-        if(CMAKE_ASM_COMPILER_WORKS)
-                set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
-        else()
-                message(FATAL ERROR "Android target requires a working assembler")
-        endif(CMAKE_ASM_COMPILER_WORKS)
-endif()
-
-set(ANGELSCRIPT_HEADERS
-        ../../include/angelscript.h
-        ../../source/as_array.h
-        ../../source/as_builder.h
-        ../../source/as_bytecode.h
-        ../../source/as_callfunc.h
-        ../../source/as_compiler.h
-        ../../source/as_config.h
-        ../../source/as_configgroup.h
-        ../../source/as_context.h
-        ../../source/as_criticalsection.h
-        ../../source/as_datatype.h
-        ../../source/as_debug.h
-        ../../source/as_generic.h
-        ../../source/as_map.h
-        ../../source/as_memory.h
-        ../../source/as_module.h
-        ../../source/as_namespace.h
-        ../../source/as_objecttype.h
-        ../../source/as_outputbuffer.h
-        ../../source/as_parser.h
-        ../../source/as_property.h
-        ../../source/as_restore.h
-        ../../source/as_scriptcode.h
-        ../../source/as_scriptengine.h
-        ../../source/as_scriptfunction.h
-        ../../source/as_scriptnode.h
-        ../../source/as_scriptobject.h
-        ../../source/as_string.h
-        ../../source/as_string_util.h
-        ../../source/as_texts.h
-        ../../source/as_thread.h
-        ../../source/as_tokendef.h
-        ../../source/as_tokenizer.h
-        ../../source/as_typeinfo.h
-        ../../source/as_variablescope.h
-)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../include)
-
-add_definitions("-D_CRT_SECURE_NO_WARNINGS -DANGELSCRIPT_EXPORT -D_LIB")
-
-# Fix x64 issues on Linux
-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
-        add_definitions(-fPIC)
-endif()
-
-add_library(Angelscript STATIC ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS})
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
-
-find_package(Threads)
-target_link_libraries(Angelscript ${CMAKE_THREAD_LIBS_INIT})
-
-if(MSVC)
-        set_target_properties(Angelscript PROPERTIES COMPILE_FLAGS "/MP")
-endif(MSVC)
-
-set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin)
-
+cmake_minimum_required(VERSION 3.5)
+
+project(angelscript)
+
+option(BUILD_SHARED_LIBS "Build shared library" OFF)
+option(AS_NO_EXCEPTIONS "Disable exception handling in script context" OFF)
+
+if(MSVC)
+    option(MSVC_COMPILE_FLAGS "Compiler flags to use with MSVC" "/MP")
+endif()
+
+if(APPLE)
+    option(BUILD_FRAMEWORK "Build Framework bundle for OSX" OFF)
+endif()
+
+file(READ ../../include/angelscript.h ANGELSCRIPT_H)
+string(REGEX MATCH "#define ANGELSCRIPT_VERSION_STRING \"([0-9]*).([0-9]*).([0-9]*)" ANGELSCRIPT_VERSION_REGEX ${ANGELSCRIPT_H})
+set(ANGELSCRIPT_VERSION_MAJOR ${CMAKE_MATCH_1})
+set(ANGELSCRIPT_VERSION_MINOR ${CMAKE_MATCH_2})
+set(ANGELSCRIPT_VERSION_PATCH ${CMAKE_MATCH_3})
+set(PROJECT_VERSION ${ANGELSCRIPT_VERSION_MAJOR}.${ANGELSCRIPT_VERSION_MINOR}.${ANGELSCRIPT_VERSION_PATCH})
+
+set(ARCHFLAGS "${CMAKE_SYSTEM_PROCESSOR}")
+if (APPLE AND NOT IOS)
+  if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+    set(ARCHFLAGS "aarch64")
+  endif ()
+endif ()
+
+message(STATUS "Configuring angelscript ${PROJECT_VERSION}")
+
+find_package(Threads)
+
+set(ANGELSCRIPT_HEADERS
+    ../../include/angelscript.h
+    ../../source/as_array.h
+    ../../source/as_builder.h
+    ../../source/as_bytecode.h
+    ../../source/as_callfunc.h
+    ../../source/as_compiler.h
+    ../../source/as_config.h
+    ../../source/as_configgroup.h
+    ../../source/as_context.h
+    ../../source/as_criticalsection.h
+    ../../source/as_datatype.h
+    ../../source/as_debug.h
+    ../../source/as_generic.h
+    ../../source/as_map.h
+    ../../source/as_memory.h
+    ../../source/as_module.h
+    ../../source/as_objecttype.h
+    ../../source/as_outputbuffer.h
+    ../../source/as_parser.h
+    ../../source/as_property.h
+    ../../source/as_restore.h
+    ../../source/as_scriptcode.h
+    ../../source/as_scriptengine.h
+    ../../source/as_scriptfunction.h
+    ../../source/as_scriptnode.h
+    ../../source/as_scriptobject.h
+    ../../source/as_string.h
+    ../../source/as_string_util.h
+    ../../source/as_texts.h
+    ../../source/as_thread.h
+    ../../source/as_tokendef.h
+    ../../source/as_tokenizer.h
+    ../../source/as_typeinfo.h
+    ../../source/as_variablescope.h
+)
+
+set(ANGELSCRIPT_SOURCE
+    ../../source/as_atomic.cpp
+    ../../source/as_builder.cpp
+    ../../source/as_bytecode.cpp
+    ../../source/as_callfunc.cpp
+    ../../source/as_callfunc_mips.cpp
+    ../../source/as_callfunc_x86.cpp
+    ../../source/as_callfunc_x64_gcc.cpp
+    ../../source/as_callfunc_x64_msvc.cpp
+    ../../source/as_callfunc_x64_mingw.cpp
+    ../../source/as_compiler.cpp
+    ../../source/as_configgroup.cpp
+    ../../source/as_context.cpp
+    ../../source/as_datatype.cpp
+    ../../source/as_gc.cpp
+    ../../source/as_generic.cpp
+    ../../source/as_globalproperty.cpp
+    ../../source/as_memory.cpp
+    ../../source/as_module.cpp
+    ../../source/as_objecttype.cpp
+    ../../source/as_outputbuffer.cpp
+    ../../source/as_parser.cpp
+    ../../source/as_restore.cpp
+    ../../source/as_scriptcode.cpp
+    ../../source/as_scriptengine.cpp
+    ../../source/as_scriptfunction.cpp
+    ../../source/as_scriptnode.cpp
+    ../../source/as_scriptobject.cpp
+    ../../source/as_string.cpp
+    ../../source/as_string_util.cpp
+    ../../source/as_thread.cpp
+    ../../source/as_tokenizer.cpp
+    ../../source/as_typeinfo.cpp
+    ../../source/as_variablescope.cpp
+)
+
+if(MSVC AND CMAKE_CL_64)
+    enable_language(ASM_MASM)
+    if(CMAKE_ASM_MASM_COMPILER_WORKS)
+        set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_x64_msvc_asm.asm)
+    else()
+        message(FATAL ERROR "MSVC x86_64 target requires a working assembler")
+    endif()
+endif()
+
+if(${ARCHFLAGS} MATCHES "^arm")
+    enable_language(ASM)
+    if(CMAKE_ASM_COMPILER_WORKS)
+        set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
+        set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
+    else()
+        message(FATAL ERROR "ARM target requires a working assembler")
+    endif()
+endif()
+
+if(${ARCHFLAGS} MATCHES "^aarch64")
+    enable_language(ASM)
+    if(CMAKE_ASM_COMPILER_WORKS)
+        if(NOT APPLE)
+          set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm64.cpp ../../source/as_callfunc_arm64_gcc.S)
+        else()
+          set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm64.cpp ../../source/as_callfunc_arm64_xcode.S)
+        endif()
+        #set_property(SOURCE ../../source/as_callfunc_arm64_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa")
+    else()
+        message(FATAL ERROR "ARM target requires a working assembler")
+    endif()
+endif()
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")  
+endif()
+
+if(NOT BUILD_FRAMEWORK)
+    set(ANGELSCRIPT_LIBRARY_NAME angelscript)
+else()
+    set(ANGELSCRIPT_LIBRARY_NAME Angelscript) # OS X frameworks should have capitalized name
+    set(BUILD_SHARED_LIBS TRUE)
+endif()
+set(ANGELSCRIPT_LIBRARY_NAME ${ANGELSCRIPT_LIBRARY_NAME} CACHE STRING "" FORCE)
+
+add_library(${ANGELSCRIPT_LIBRARY_NAME} ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS})
+
+target_include_directories(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
+
+if(MSVC)
+    target_compile_definitions(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE -D_CRT_SECURE_NO_WARNINGS)    
+endif()
+
+target_compile_definitions(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE -DANGELSCRIPT_EXPORT -D_LIB)
+
+if(AS_NO_EXCEPTIONS)
+	target_compile_definitions(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE AS_NO_EXCEPTIONS)
+endif()
+
+# Fix x64 issues on Linux
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND UNIX AND NOT APPLE)
+    target_compile_options(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE -fPIC)
+endif()
+
+# Don't override the default library output path to avoid conflicts when building for multiple target platforms
+#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
+target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
+
+set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+
+if(BUILD_FRAMEWORK)
+    set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES
+        FRAMEWORK TRUE
+        FRAMEWORK_VERSION ${PROJECT_VERSION}
+        MACOSX_FRAMEWORK_IDENTIFIER com.angelcode.Angelscript
+        MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION}
+        MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}
+        XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
+        PUBLIC_HEADER ../../include/angelscript.h
+    )
+endif()
+
+if(MSVC AND MSVC_COMPILE_FLAGS)
+	target_compile_options(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE "${MSVC_COMPILE_FLAGS}")
+endif()
+
+# Don't override the default runtime output path to avoid conflicts when building for multiple target platforms
+#set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin)
+
+#See https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages for a detailed explanation about this part
+install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib
+	INCLUDES DESTINATION include
+)
+
+install(FILES
+	${CMAKE_CURRENT_SOURCE_DIR}/../../include/angelscript.h
+	DESTINATION include
+	COMPONENT Devel
+)
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+	"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
+	VERSION ${PROJECT_VERSION}
+	COMPATIBILITY AnyNewerVersion
+)
+
+export(EXPORT AngelscriptTargets
+	FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake"
+	NAMESPACE Angelscript::
+)
+configure_file(cmake/AngelscriptConfig.cmake
+	"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake"
+	COPYONLY
+)
+
+set(ConfigPackageLocation lib/cmake/Angelscript)
+install(EXPORT AngelscriptTargets
+	FILE AngelscriptTargets.cmake
+	NAMESPACE Angelscript::
+	DESTINATION ${ConfigPackageLocation}
+)
+install(
+	FILES
+		cmake/AngelscriptConfig.cmake
+		"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
+	DESTINATION ${ConfigPackageLocation}
+	COMPONENT Devel
+)
+
diff --git a/Sources/AngelScript/projects/cmake/cmake/AngelscriptConfig.cmake b/Sources/AngelScript/projects/cmake/cmake/AngelscriptConfig.cmake
new file mode 100644
index 000000000..4d1ef0f44
--- /dev/null
+++ b/Sources/AngelScript/projects/cmake/cmake/AngelscriptConfig.cmake
@@ -0,0 +1,2 @@
+include("${CMAKE_CURRENT_LIST_DIR}/AngelscriptTargets.cmake")
+
diff --git a/Sources/AngelScript/projects/cmake_addons/CMakeLists.txt b/Sources/AngelScript/projects/cmake_addons/CMakeLists.txt
index af125e2e3..8282ccae6 100644
--- a/Sources/AngelScript/projects/cmake_addons/CMakeLists.txt
+++ b/Sources/AngelScript/projects/cmake_addons/CMakeLists.txt
@@ -1,35 +1,35 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 cmake_policy(SET CMP0003 NEW)
 
-project(Angelscript_addons)
+project(angelscript_add_on)
 
 set(ANGELSCRIPT_SOURCE
-        ../../addons/scriptany.cpp
-        ../../addons/scriptarray.cpp
-        ../../addons/scriptbuilder.cpp
-        ../../addons/scriptdictionary.cpp
-        ../../addons/scripthandle.cpp
-        ../../addons/scripthelper.cpp
-        ../../addons/scriptmath.cpp
-        ../../addons/scriptmathcomplex.cpp
-        ../../addons/scriptstdstring.cpp
-        ../../addons/scriptstdstring_utils.cpp
-        ../../addons/weakref.cpp
+        ../../add_on/scriptany/scriptany.cpp
+        ../../add_on/scriptarray/scriptarray.cpp
+        ../../add_on/scriptbuilder/scriptbuilder.cpp
+        ../../add_on/scriptdictionary/scriptdictionary.cpp
+        ../../add_on/scripthandle/scripthandle.cpp
+        ../../add_on/scripthelper/scripthelper.cpp
+        ../../add_on/scriptmath/scriptmath.cpp
+        ../../add_on/scriptmath/scriptmathcomplex.cpp
+        ../../add_on/scriptstdstring/scriptstdstring.cpp
+        ../../add_on/scriptstdstring/scriptstdstring_utils.cpp
+        ../../add_on/weakref/weakref.cpp
 )
 
 set(ANGELSCRIPT_HEADERS
         ../../include/angelscript.h
-        ../../addons/scriptany.h
-        ../../addons/scriptarray.h
-        ../../addons/scriptbuilder.h
-        ../../addons/scriptdictionary.h
-        ../../addons/scripthandle.h
-        ../../addons/scripthelper.h
-        ../../addons/scriptmath.h
-        ../../addons/scriptmathcomplex.h
-        ../../addons/scriptstdstring.h
-        ../../addons/weakref.h
+        ../../add_on/scriptany/scriptany.h
+        ../../add_on/scriptarray/scriptarray.h
+        ../../add_on/scriptbuilder/scriptbuilder.h
+        ../../add_on/scriptdictionary/scriptdictionary.h
+        ../../add_on/scripthandle/scripthandle.h
+        ../../add_on/scripthelper/scripthelper.h
+        ../../add_on/scriptmath/scriptmath.h
+        ../../add_on/scriptmath/scriptmathcomplex.h
+        ../../add_on/scriptstdstring/scriptstdstring.h
+        ../../add_on/weakref/weakref.h
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../include)
@@ -41,14 +41,14 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
         add_definitions(-fPIC)
 endif()
 
-add_library(Angelscript_addons STATIC ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS})
+add_library(angelscript_add_on STATIC ${ANGELSCRIPT_SOURCE} ${ANGELSCRIPT_HEADERS})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 
 find_package(Threads)
-target_link_libraries(Angelscript_addons ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(angelscript_add_on ${CMAKE_THREAD_LIBS_INIT})
 
 if(MSVC)
-        set_target_properties(Angelscript_addons PROPERTIES COMPILE_FLAGS "/MP")
+        set_target_properties(angelscript_add_on PROPERTIES COMPILE_FLAGS "/MP")
 endif(MSVC)
 
 set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../../bin)
diff --git a/Sources/AngelScript/source/as_array.h b/Sources/AngelScript/source/as_array.h
old mode 100755
new mode 100644
index 653028dbc..647495177
--- a/Sources/AngelScript/source/as_array.h
+++ b/Sources/AngelScript/source/as_array.h
@@ -1,528 +1,528 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-#ifndef AS_ARRAY_H
-#define AS_ARRAY_H
-
-#if !defined(AS_NO_MEMORY_H)
-#include <memory.h>
-#endif
-#include <string.h> // some compilers declare memcpy() here
-
-#ifdef _MSC_VER
-#pragma warning(disable:4345) // warning about a change in how the code is handled in this version
-#endif
-
-BEGIN_AS_NAMESPACE
-
-template <class T> class asCArray
-{
-public:
-	asCArray();
-	asCArray(const asCArray<T> &);
-	asCArray(asUINT reserve);
-	~asCArray();
-
-	void   Allocate(asUINT numElements, bool keepData);
-	void   AllocateNoConstruct(asUINT numElements, bool keepData);
-	asUINT GetCapacity() const;
-
-	void PushLast(const T &element);
-	T    PopLast();
-
-	bool   SetLength(asUINT numElements);
-	bool   SetLengthNoConstruct(asUINT numElements);
-	asUINT GetLength() const;
-
-	void         Copy(const T*, asUINT count);
-	asCArray<T> &operator =(const asCArray<T> &);
-	void         SwapWith(asCArray<T> &other);
-
-	const T &operator [](asUINT index) const;
-	T       &operator [](asUINT index);
-	T       *AddressOf();
-	const T *AddressOf() const;
-
-	bool Concatenate(const asCArray<T> &);
-	void Concatenate(T*, unsigned int count);
-
-	bool Exists(const T &element) const;
-	int  IndexOf(const T &element) const;
-	void RemoveIndex(asUINT index);          // Removes the entry without reordering the array
-	void RemoveValue(const T &element);      // Removes the value without reordering the array
-	void RemoveIndexUnordered(asUINT index); // Removes the entry without keeping the order
-
-	bool operator==(const asCArray<T> &) const;
-	bool operator!=(const asCArray<T> &) const;
-
-protected:
-	T      *array;
-	asUINT  length;                  // 32bits is enough for all uses of this array
-	asUINT  maxLength;
-	char    buf[2*4*AS_PTR_SIZE];    // Avoid dynamically allocated memory for tiny arrays
-};
-
-// Implementation
-
-template <class T>
-T *asCArray<T>::AddressOf()
-{
-	return array;
-}
-
-template <class T>
-const T *asCArray<T>::AddressOf() const
-{
-	return array;
-}
-
-template <class T>
-asCArray<T>::asCArray(void)
-{
-	array     = 0;
-	length    = 0;
-	maxLength = 0;
-}
-
-template <class T>
-asCArray<T>::asCArray(const asCArray<T> &copy)
-{
-	array     = 0;
-	length    = 0;
-	maxLength = 0;
-
-	*this = copy;
-}
-
-template <class T>
-asCArray<T>::asCArray(asUINT reserve)
-{
-	array     = 0;
-	length    = 0;
-	maxLength = 0;
-
-	Allocate(reserve, false);
-}
-
-template <class T>
-asCArray<T>::~asCArray(void)
-{
-	// Allocating a zero length array will free all memory
-	Allocate(0,0);
-}
-
-template <class T>
-asUINT asCArray<T>::GetLength() const
-{
-	return length;
-}
-
-template <class T>
-const T &asCArray<T>::operator [](asUINT index) const
-{
-	asASSERT(index < length);
-
-	return array[index];
-}
-
-template <class T>
-T &asCArray<T>::operator [](asUINT index)
-{
-	asASSERT(index < length);
-
-	return array[index];
-}
-
-template <class T>
-void asCArray<T>::PushLast(const T &element)
-{
-	if( length == maxLength )
-	{
-		if( maxLength == 0 )
-			Allocate(1, false);
-		else
-			Allocate(2*maxLength, true);
-
-		if( length == maxLength )
-		{
-			// Out of memory. Return without doing anything
-			return;
-		}
-	}
-
-	array[length++] = element;
-}
-
-template <class T>
-T asCArray<T>::PopLast()
-{
-	asASSERT(length > 0);
-
-	return array[--length];
-}
-
-template <class T>
-void asCArray<T>::Allocate(asUINT numElements, bool keepData)
-{
-	// We have 4 situations
-	// 1. The previous array is 8 bytes or smaller and the new array is also 8 bytes or smaller
-	// 2. The previous array is 8 bytes or smaller and the new array is larger than 8 bytes
-	// 3. The previous array is larger than 8 bytes and the new array is 8 bytes or smaller
-	// 4. The previous array is larger than 8 bytes and the new array is also larger than 8 bytes
-
-	T *tmp = 0;
-	if( numElements )
-	{
-		if( sizeof(T)*numElements <= sizeof(buf) )
-			// Use the internal buffer
-			tmp = reinterpret_cast<T*>(buf);
-		else
-		{
-			// Allocate the array and construct each of the elements
-			tmp = asNEWARRAY(T,numElements);
-			if( tmp == 0 )
-			{
-				// Out of memory. Return without doing anything
-				return;
-			}
-		}
-
-		if( array == tmp )
-		{
-			// Construct only the newly allocated elements
-			for( asUINT n = length; n < numElements; n++ )
-				new (&tmp[n]) T();
-		}
-		else
-		{
-			// Construct all elements
-			for( asUINT n = 0; n < numElements; n++ )
-				new (&tmp[n]) T();
-		}
-	}
-
-	if( array )
-	{	
-		asUINT oldLength = length;
-
-		if( array == tmp )
-		{
-			if( keepData )
-			{
-				if( length > numElements )
-					length = numElements;
-			}
-			else
-				length = 0;
-
-			// Call the destructor for elements that are no longer used
-			for( asUINT n = length; n < oldLength; n++ )
-				array[n].~T();
-		}
-		else
-		{
-			if( keepData )
-			{
-				if( length > numElements )
-					length = numElements;
-
-				for( asUINT n = 0; n < length; n++ )
-					tmp[n] = array[n];
-			}
-			else
-				length = 0;
-
-			// Call the destructor for all elements
-			for( asUINT n = 0; n < oldLength; n++ )
-				array[n].~T();
-
-			if( array != reinterpret_cast<T*>(buf) )
-				asDELETEARRAY(array);
-		}
-	}
-
-	array = tmp;
-	maxLength = numElements;
-}
-
-template <class T>
-void asCArray<T>::AllocateNoConstruct(asUINT numElements, bool keepData)
-{
-	// We have 4 situations
-	// 1. The previous array is 8 bytes or smaller and the new array is also 8 bytes or smaller
-	// 2. The previous array is 8 bytes or smaller and the new array is larger than 8 bytes
-	// 3. The previous array is larger than 8 bytes and the new array is 8 bytes or smaller
-	// 4. The previous array is larger than 8 bytes and the new array is also larger than 8 bytes
-
-	T *tmp = 0;
-	if( numElements )
-	{
-		if( sizeof(T)*numElements <= sizeof(buf) )
-			// Use the internal buffer
-			tmp = reinterpret_cast<T*>(buf);
-		else
-		{
-			// Allocate the array and construct each of the elements
-			tmp = asNEWARRAY(T,numElements);
-			if( tmp == 0 )
-			{
-				// Out of memory. Return without doing anything
-				return;
-			}
-		}
-	}
-
-	if( array )
-	{
-		if( array == tmp )
-		{
-			if( keepData )
-			{
-				if( length > numElements )
-					length = numElements;
-			}
-			else
-				length = 0;
-		}
-		else
-		{
-			if( keepData )
-			{
-				if( length > numElements )
-					length = numElements;
-
-				memcpy(tmp, array, sizeof(T)*length);
-			}
-			else
-				length = 0;
-
-			if( array != reinterpret_cast<T*>(buf) )
-				asDELETEARRAY(array);
-		}
-	}
-
-	array = tmp;
-	maxLength = numElements;
-}
-
-template <class T>
-asUINT asCArray<T>::GetCapacity() const
-{
-	return maxLength;
-}
-
-template <class T>
-bool asCArray<T>::SetLength(asUINT numElements)
-{
-	if( numElements > maxLength )
-	{
-		Allocate(numElements, true);
-		if( numElements > maxLength )
-		{
-			// Out of memory. Return without doing anything
-			return false;
-		}
-	}
-
-	length = numElements;
-	return true;
-}
-
-template <class T>
-bool asCArray<T>::SetLengthNoConstruct(asUINT numElements)
-{
-	if( numElements > maxLength )
-	{
-		AllocateNoConstruct(numElements, true);
-		if( numElements > maxLength )
-		{
-			// Out of memory. Return without doing anything
-			return false;
-		}
-	}
-
-	length = numElements;
-	return true;
-}
-
-template <class T>
-void asCArray<T>::Copy(const T *data, asUINT count)
-{
-	if( maxLength < count )
-	{
-		Allocate(count, false);
-		if( maxLength < count )
-		{
-			// Out of memory. Return without doing anything
-			return;
-		}
-	}
-
-	for( asUINT n = 0; n < count; n++ )
-		array[n] = data[n];
-
-	length = count;
-}
-
-template <class T>
-asCArray<T> &asCArray<T>::operator =(const asCArray<T> &copy)
-{
-	Copy(copy.array, copy.length);
-
-	return *this;
-}
-
-template <class T>
-void asCArray<T>::SwapWith(asCArray<T> &other)
-{
-	T      *tmpArray = array;
-	asUINT  tmpLength = length;
-	asUINT  tmpMaxLength = maxLength;
-	char    tmpBuf[sizeof(buf)];
-	memcpy(tmpBuf, buf, sizeof(buf));
-
-	array = other.array;
-	length = other.length;
-	maxLength = other.maxLength;
-	memcpy(buf, other.buf, sizeof(buf));
-
-	other.array = tmpArray;
-	other.length = tmpLength;
-	other.maxLength = tmpMaxLength;
-	memcpy(other.buf, tmpBuf, sizeof(buf));
-
-	// If the data is in the internal buffer, then the array pointer must refer to it
-	if( array == reinterpret_cast<T*>(other.buf) )
-		array = reinterpret_cast<T*>(buf);
-	if( other.array == reinterpret_cast<T*>(buf) )
-		other.array = reinterpret_cast<T*>(other.buf);
-}
-
-template <class T>
-bool asCArray<T>::operator ==(const asCArray<T> &other) const
-{
-	if( length != other.length ) return false;
-
-	for( asUINT n = 0; n < length; n++ )
-		if( array[n] != other.array[n] )
-			return false;
-
-	return true;
-}
-
-template <class T>
-bool asCArray<T>::operator !=(const asCArray<T> &other) const
-{
-	return !(*this == other);
-}
-
-
-// Returns false if the concatenation wasn't successful due to out of memory
-template <class T>
-bool asCArray<T>::Concatenate(const asCArray<T> &other)
-{
-	if( maxLength < length + other.length )
-	{
-		Allocate(length + other.length, true);
-		if( maxLength < length + other.length )
-		{
-			// Out of memory
-			return false;
-		}
-	}
-
-	for( asUINT n = 0; n < other.length; n++ )
-		array[length+n] = other.array[n];
-
-	length += other.length;
-
-	// Success
-	return true;
-}
-
-template <class T>
-void asCArray<T>::Concatenate(T* other, unsigned int count)
-{
-	for( unsigned int c = 0; c < count; c++ )
-		PushLast(other[c]);
-}
-
-template <class T>
-bool asCArray<T>::Exists(const T &e) const
-{
-	return IndexOf(e) == -1 ? false : true;
-}
-
-template <class T>
-int asCArray<T>::IndexOf(const T &e) const
-{
-	for( asUINT n = 0; n < length; n++ )
-		if( array[n] == e ) return static_cast<int>(n);
-
-	return -1;
-}
-
-template <class T>
-void asCArray<T>::RemoveIndex(asUINT index)
-{
-	if( index < length )
-	{
-		for( asUINT n = index; n < length-1; n++ )
-			array[n] = array[n+1];
-
-		PopLast();
-	}
-}
-
-template <class T>
-void asCArray<T>::RemoveValue(const T &e)
-{
-	for( asUINT n = 0; n < length; n++ )
-	{
-		if( array[n] == e )
-		{
-			RemoveIndex(n);
-			break;
-		}
-	}
-}
-
-template <class T>
-void asCArray<T>::RemoveIndexUnordered(asUINT index)
-{
-	if( index == length - 1 )
-		PopLast();
-	else if( index < length )
-		array[index] = PopLast();
-}
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+#ifndef AS_ARRAY_H
+#define AS_ARRAY_H
+
+#if !defined(AS_NO_MEMORY_H)
+#include <memory.h>
+#endif
+#include <string.h> // some compilers declare memcpy() here
+
+#ifdef _MSC_VER
+#pragma warning(disable:4345) // warning about a change in how the code is handled in this version
+#endif
+
+BEGIN_AS_NAMESPACE
+
+template <class T> class asCArray
+{
+public:
+	asCArray();
+	asCArray(const asCArray<T> &);
+	asCArray(asUINT reserve);
+	~asCArray();
+
+	void   Allocate(asUINT numElements, bool keepData);
+	void   AllocateNoConstruct(asUINT numElements, bool keepData);
+	asUINT GetCapacity() const;
+
+	void PushLast(const T &element);
+	T    PopLast();
+
+	bool   SetLength(asUINT numElements);
+	bool   SetLengthNoConstruct(asUINT numElements);
+	asUINT GetLength() const;
+
+	void         Copy(const T*, asUINT count);
+	asCArray<T> &operator =(const asCArray<T> &);
+	void         SwapWith(asCArray<T> &other);
+
+	const T &operator [](asUINT index) const;
+	T       &operator [](asUINT index);
+	T       *AddressOf();
+	const T *AddressOf() const;
+
+	bool Concatenate(const asCArray<T> &);
+	void Concatenate(T*, unsigned int count);
+
+	bool Exists(const T &element) const;
+	int  IndexOf(const T &element) const;
+	void RemoveIndex(asUINT index);          // Removes the entry without reordering the array
+	void RemoveValue(const T &element);      // Removes the value without reordering the array
+	void RemoveIndexUnordered(asUINT index); // Removes the entry without keeping the order
+
+	bool operator==(const asCArray<T> &) const;
+	bool operator!=(const asCArray<T> &) const;
+
+protected:
+	T      *array;
+	asUINT  length;                  // 32bits is enough for all uses of this array
+	asUINT  maxLength;
+	char    buf[2*4*AS_PTR_SIZE];    // Avoid dynamically allocated memory for tiny arrays
+};
+
+// Implementation
+
+template <class T>
+T *asCArray<T>::AddressOf()
+{
+	return array;
+}
+
+template <class T>
+const T *asCArray<T>::AddressOf() const
+{
+	return array;
+}
+
+template <class T>
+asCArray<T>::asCArray(void)
+{
+	array     = 0;
+	length    = 0;
+	maxLength = 0;
+}
+
+template <class T>
+asCArray<T>::asCArray(const asCArray<T> &copy)
+{
+	array     = 0;
+	length    = 0;
+	maxLength = 0;
+
+	*this = copy;
+}
+
+template <class T>
+asCArray<T>::asCArray(asUINT reserve)
+{
+	array     = 0;
+	length    = 0;
+	maxLength = 0;
+
+	Allocate(reserve, false);
+}
+
+template <class T>
+asCArray<T>::~asCArray(void)
+{
+	// Allocating a zero length array will free all memory
+	Allocate(0,0);
+}
+
+template <class T>
+asUINT asCArray<T>::GetLength() const
+{
+	return length;
+}
+
+template <class T>
+const T &asCArray<T>::operator [](asUINT index) const
+{
+	asASSERT(index < length);
+
+	return array[index];
+}
+
+template <class T>
+T &asCArray<T>::operator [](asUINT index)
+{
+	asASSERT(index < length);
+
+	return array[index];
+}
+
+template <class T>
+void asCArray<T>::PushLast(const T &element)
+{
+	if( length == maxLength )
+	{
+		if( maxLength == 0 )
+			Allocate(1, false);
+		else
+			Allocate(2*maxLength, true);
+
+		if( length == maxLength )
+		{
+			// Out of memory. Return without doing anything
+			return;
+		}
+	}
+
+	array[length++] = element;
+}
+
+template <class T>
+T asCArray<T>::PopLast()
+{
+	asASSERT(length > 0);
+
+	return array[--length];
+}
+
+template <class T>
+void asCArray<T>::Allocate(asUINT numElements, bool keepData)
+{
+	// We have 4 situations
+	// 1. The previous array is 8 bytes or smaller and the new array is also 8 bytes or smaller
+	// 2. The previous array is 8 bytes or smaller and the new array is larger than 8 bytes
+	// 3. The previous array is larger than 8 bytes and the new array is 8 bytes or smaller
+	// 4. The previous array is larger than 8 bytes and the new array is also larger than 8 bytes
+
+	T *tmp = 0;
+	if( numElements )
+	{
+		if( sizeof(T)*numElements <= sizeof(buf) )
+			// Use the internal buffer
+			tmp = reinterpret_cast<T*>(buf);
+		else
+		{
+			// Allocate the array and construct each of the elements
+			tmp = asNEWARRAY(T,numElements);
+			if( tmp == 0 )
+			{
+				// Out of memory. Return without doing anything
+				return;
+			}
+		}
+
+		if( array == tmp )
+		{
+			// Construct only the newly allocated elements
+			for( asUINT n = length; n < numElements; n++ )
+				new (&tmp[n]) T();
+		}
+		else
+		{
+			// Construct all elements
+			for( asUINT n = 0; n < numElements; n++ )
+				new (&tmp[n]) T();
+		}
+	}
+
+	if( array )
+	{	
+		asUINT oldLength = length;
+
+		if( array == tmp )
+		{
+			if( keepData )
+			{
+				if( length > numElements )
+					length = numElements;
+			}
+			else
+				length = 0;
+
+			// Call the destructor for elements that are no longer used
+			for( asUINT n = length; n < oldLength; n++ )
+				array[n].~T();
+		}
+		else
+		{
+			if( keepData )
+			{
+				if( length > numElements )
+					length = numElements;
+
+				for( asUINT n = 0; n < length; n++ )
+					tmp[n] = array[n];
+			}
+			else
+				length = 0;
+
+			// Call the destructor for all elements
+			for( asUINT n = 0; n < oldLength; n++ )
+				array[n].~T();
+
+			if( array != reinterpret_cast<T*>(buf) )
+				asDELETEARRAY(array);
+		}
+	}
+
+	array = tmp;
+	maxLength = numElements;
+}
+
+template <class T>
+void asCArray<T>::AllocateNoConstruct(asUINT numElements, bool keepData)
+{
+	// We have 4 situations
+	// 1. The previous array is 8 bytes or smaller and the new array is also 8 bytes or smaller
+	// 2. The previous array is 8 bytes or smaller and the new array is larger than 8 bytes
+	// 3. The previous array is larger than 8 bytes and the new array is 8 bytes or smaller
+	// 4. The previous array is larger than 8 bytes and the new array is also larger than 8 bytes
+
+	T *tmp = 0;
+	if( numElements )
+	{
+		if( sizeof(T)*numElements <= sizeof(buf) )
+			// Use the internal buffer
+			tmp = reinterpret_cast<T*>(buf);
+		else
+		{
+			// Allocate the array and construct each of the elements
+			tmp = asNEWARRAY(T,numElements);
+			if( tmp == 0 )
+			{
+				// Out of memory. Return without doing anything
+				return;
+			}
+		}
+	}
+
+	if( array )
+	{
+		if( array == tmp )
+		{
+			if( keepData )
+			{
+				if( length > numElements )
+					length = numElements;
+			}
+			else
+				length = 0;
+		}
+		else
+		{
+			if( keepData )
+			{
+				if( length > numElements )
+					length = numElements;
+
+				memcpy(tmp, array, sizeof(T)*length);
+			}
+			else
+				length = 0;
+
+			if( array != reinterpret_cast<T*>(buf) )
+				asDELETEARRAY(array);
+		}
+	}
+
+	array = tmp;
+	maxLength = numElements;
+}
+
+template <class T>
+asUINT asCArray<T>::GetCapacity() const
+{
+	return maxLength;
+}
+
+template <class T>
+bool asCArray<T>::SetLength(asUINT numElements)
+{
+	if( numElements > maxLength )
+	{
+		Allocate(numElements, true);
+		if( numElements > maxLength )
+		{
+			// Out of memory. Return without doing anything
+			return false;
+		}
+	}
+
+	length = numElements;
+	return true;
+}
+
+template <class T>
+bool asCArray<T>::SetLengthNoConstruct(asUINT numElements)
+{
+	if( numElements > maxLength )
+	{
+		AllocateNoConstruct(numElements, true);
+		if( numElements > maxLength )
+		{
+			// Out of memory. Return without doing anything
+			return false;
+		}
+	}
+
+	length = numElements;
+	return true;
+}
+
+template <class T>
+void asCArray<T>::Copy(const T *data, asUINT count)
+{
+	if( maxLength < count )
+	{
+		Allocate(count, false);
+		if( maxLength < count )
+		{
+			// Out of memory. Return without doing anything
+			return;
+		}
+	}
+
+	for( asUINT n = 0; n < count; n++ )
+		array[n] = data[n];
+
+	length = count;
+}
+
+template <class T>
+asCArray<T> &asCArray<T>::operator =(const asCArray<T> &copy)
+{
+	Copy(copy.array, copy.length);
+
+	return *this;
+}
+
+template <class T>
+void asCArray<T>::SwapWith(asCArray<T> &other)
+{
+	T      *tmpArray = array;
+	asUINT  tmpLength = length;
+	asUINT  tmpMaxLength = maxLength;
+	char    tmpBuf[sizeof(buf)];
+	memcpy(tmpBuf, buf, sizeof(buf));
+
+	array = other.array;
+	length = other.length;
+	maxLength = other.maxLength;
+	memcpy(buf, other.buf, sizeof(buf));
+
+	other.array = tmpArray;
+	other.length = tmpLength;
+	other.maxLength = tmpMaxLength;
+	memcpy(other.buf, tmpBuf, sizeof(buf));
+
+	// If the data is in the internal buffer, then the array pointer must refer to it
+	if( array == reinterpret_cast<T*>(other.buf) )
+		array = reinterpret_cast<T*>(buf);
+	if( other.array == reinterpret_cast<T*>(buf) )
+		other.array = reinterpret_cast<T*>(other.buf);
+}
+
+template <class T>
+bool asCArray<T>::operator ==(const asCArray<T> &other) const
+{
+	if( length != other.length ) return false;
+
+	for( asUINT n = 0; n < length; n++ )
+		if( array[n] != other.array[n] )
+			return false;
+
+	return true;
+}
+
+template <class T>
+bool asCArray<T>::operator !=(const asCArray<T> &other) const
+{
+	return !(*this == other);
+}
+
+
+// Returns false if the concatenation wasn't successful due to out of memory
+template <class T>
+bool asCArray<T>::Concatenate(const asCArray<T> &other)
+{
+	if( maxLength < length + other.length )
+	{
+		Allocate(length + other.length, true);
+		if( maxLength < length + other.length )
+		{
+			// Out of memory
+			return false;
+		}
+	}
+
+	for( asUINT n = 0; n < other.length; n++ )
+		array[length+n] = other.array[n];
+
+	length += other.length;
+
+	// Success
+	return true;
+}
+
+template <class T>
+void asCArray<T>::Concatenate(T* other, unsigned int count)
+{
+	for( unsigned int c = 0; c < count; c++ )
+		PushLast(other[c]);
+}
+
+template <class T>
+bool asCArray<T>::Exists(const T &e) const
+{
+	return IndexOf(e) == -1 ? false : true;
+}
+
+template <class T>
+int asCArray<T>::IndexOf(const T &e) const
+{
+	for( asUINT n = 0; n < length; n++ )
+		if( array[n] == e ) return static_cast<int>(n);
+
+	return -1;
+}
+
+template <class T>
+void asCArray<T>::RemoveIndex(asUINT index)
+{
+	if( index < length )
+	{
+		for( asUINT n = index; n < length-1; n++ )
+			array[n] = array[n+1];
+
+		PopLast();
+	}
+}
+
+template <class T>
+void asCArray<T>::RemoveValue(const T &e)
+{
+	for( asUINT n = 0; n < length; n++ )
+	{
+		if( array[n] == e )
+		{
+			RemoveIndex(n);
+			break;
+		}
+	}
+}
+
+template <class T>
+void asCArray<T>::RemoveIndexUnordered(asUINT index)
+{
+	if( index == length - 1 )
+		PopLast();
+	else if( index < length )
+		array[index] = PopLast();
+}
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_atomic.cpp b/Sources/AngelScript/source/as_atomic.cpp
old mode 100755
new mode 100644
index 0e61d7c72..e110b3fc9
--- a/Sources/AngelScript/source/as_atomic.cpp
+++ b/Sources/AngelScript/source/as_atomic.cpp
@@ -1,42 +1,179 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
- 
-//
-// as_atomic.cpp
-//
-// The implementation of the atomic class for thread safe reference counting
-//
-
-#include "as_atomic.h"
-
-BEGIN_AS_NAMESPACE
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2014 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+ 
+//
+// as_atomic.cpp
+//
+// The implementation of the atomic class for thread safe reference counting
+//
+
+#include "as_atomic.h"
+
+BEGIN_AS_NAMESPACE
+
+asCAtomic::asCAtomic()
+{
+	value = 0;
+}
+
+asDWORD asCAtomic::get() const
+{
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
+	return value;
+}
+
+void asCAtomic::set(asDWORD val)
+{
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
+	value = val;
+}
+
+asDWORD asCAtomic::atomicInc()
+{
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
+	return asAtomicInc((int&)value);
+}
+
+asDWORD asCAtomic::atomicDec()
+{
+	// A very high ref count is highly unlikely. It most likely a problem with
+	// memory that has been overwritten or is being accessed after it was deleted.
+	asASSERT(value < 1000000);
+
+	return asAtomicDec((int&)value);
+}
+
+//
+// The following code implements the atomicInc and atomicDec on different platforms
+//
+#if defined(AS_NO_THREADS) || defined(AS_NO_ATOMIC)
+
+int asAtomicInc(int &value)
+{
+	return ++value;
+}
+
+int asAtomicDec(int &value)
+{
+	return --value;
+}
+
+#elif defined(AS_XENON) /// XBox360
+
+END_AS_NAMESPACE
+#include <xtl.h>
+BEGIN_AS_NAMESPACE
+
+int asAtomicInc(int &value)
+{
+	return InterlockedIncrement((LONG*)&value);
+}
+
+int asAtomicDec(int &value)
+{
+	return InterlockedDecrement((LONG*)&value);
+}
+
+#elif defined(AS_WIN)
+
+END_AS_NAMESPACE
+#define WIN32_MEAN_AND_LEAN
+#include <windows.h>
+BEGIN_AS_NAMESPACE
+
+int asAtomicInc(int &value)
+{
+	return InterlockedIncrement((LONG*)&value);
+}
+
+int asAtomicDec(int &value)
+{
+	asASSERT(value > 0);
+	return InterlockedDecrement((LONG*)&value);
+}
+
+#elif defined(AS_LINUX) || defined(AS_BSD) || defined(AS_ILLUMOS) || defined(AS_ANDROID)
+
+//
+// atomic_inc_and_test() and atomic_dec_and_test() from asm/atomic.h is not meant 
+// to be used outside the Linux kernel. Instead we should use the GNUC provided 
+// __sync_add_and_fetch() and __sync_sub_and_fetch() functions.
+//
+// Reference: http://golubenco.org/blog/atomic-operations/
+//
+// These are only available in GCC 4.1 and above, so for older versions we 
+// use the critical sections, though it is a lot slower.
+// 
+
+int asAtomicInc(int &value)
+{
+	return __sync_add_and_fetch(&value, 1);
+}
+
+int asAtomicDec(int &value)
+{
+	return __sync_sub_and_fetch(&value, 1);
+}
+
+#elif defined(AS_MAC) || defined(AS_IPHONE)
+
+END_AS_NAMESPACE
+#include <libkern/OSAtomic.h>
+BEGIN_AS_NAMESPACE
+
+int asAtomicInc(int &value)
+{
+	return OSAtomicIncrement32((int32_t*)&value);
+}
+
+int asAtomicDec(int &value)
+{
+	return OSAtomicDecrement32((int32_t*)&value);
+}
+
+#else
+
+// If we get here, then the configuration in as_config.h
+//  is wrong for the compiler/platform combination. 
+int ERROR_PleaseFixTheConfig[-1];
+
+#endif
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_atomic.h b/Sources/AngelScript/source/as_atomic.h
old mode 100755
new mode 100644
index 996557c0c..c6fea885d
--- a/Sources/AngelScript/source/as_atomic.h
+++ b/Sources/AngelScript/source/as_atomic.h
@@ -1,70 +1,69 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_atomic.h
-//
-// The asCAtomic class provides methods for performing threadsafe
-// operations on a single dword, e.g. reference counting and 
-// bitfields.
-//
-
-
-
-#ifndef AS_ATOMIC_H
-#define AS_ATOMIC_H
-
-#include <atomic>
-#include "as_config.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCAtomic
-{
-public:
-	asCAtomic() {}
-
-	asDWORD get() const { return value.load(); }
-	void    set(asDWORD val) { value.store(val); }
-
-	// Increase and return new value
-	asDWORD atomicInc() { return value.fetch_add(1) + 1; }
-
-	// Decrease and return new value
-	asDWORD atomicDec() { return value.fetch_sub(1) - 1; }
-
-protected:
-	std::atomic<asDWORD> value {0};
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2013 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_atomic.h
+//
+// The asCAtomic class provides methods for performing threadsafe
+// operations on a single dword, e.g. reference counting and 
+// bitfields.
+//
+
+
+
+#ifndef AS_ATOMIC_H
+#define AS_ATOMIC_H
+
+#include "as_config.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCAtomic
+{
+public:
+	asCAtomic();
+
+	asDWORD get() const;
+	void    set(asDWORD val);
+
+	// Increase and return new value
+	asDWORD atomicInc();
+
+	// Decrease and return new value
+	asDWORD atomicDec();
+
+protected:
+	asDWORD value;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_builder.cpp b/Sources/AngelScript/source/as_builder.cpp
old mode 100755
new mode 100644
index 97a3ea688..f5b314055
--- a/Sources/AngelScript/source/as_builder.cpp
+++ b/Sources/AngelScript/source/as_builder.cpp
@@ -1,5861 +1,6494 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_builder.cpp
-//
-// This is the class that manages the compilation of the scripts
-//
-
-
-#include "as_config.h"
-#include "as_builder.h"
-#include "as_parser.h"
-#include "as_compiler.h"
-#include "as_tokendef.h"
-#include "as_string_util.h"
-#include "as_outputbuffer.h"
-#include "as_texts.h"
-#include "as_scriptobject.h"
-#include "as_debug.h"
-
-BEGIN_AS_NAMESPACE
-
-#ifndef AS_NO_COMPILER
-
-// asCSymbolTable template specializations for sGlobalVariableDescription entries
-template<>
-void asCSymbolTable<sGlobalVariableDescription>::GetKey(const sGlobalVariableDescription *entry, asSNameSpaceNamePair &key) const
-{
-	asSNameSpace *ns = entry->ns;
-	asCString name = entry->name;
-	key = asSNameSpaceNamePair(ns, name);
-}
-
-// Comparator for exact variable search
-class asCCompGlobVarType : public asIFilter
-{
-public:
-	const asCDataType &m_type;
-	asCCompGlobVarType(const asCDataType &type) : m_type(type) {}
-
-	bool operator()(const void *p) const
-	{
-		const sGlobalVariableDescription* desc = reinterpret_cast<const sGlobalVariableDescription*>(p);
-		return desc->datatype == m_type;
-	}
-
-private:
-	// The assignment operator is required for MSVC9, otherwise it will complain that it is not possible to auto generate the operator
-	asCCompGlobVarType &operator=(const asCCompGlobVarType &) {return *this;}
-};
-
-#endif
-
-asCBuilder::asCBuilder(asCScriptEngine *_engine, asCModule *_module)
-{
-	this->engine = _engine;
-	this->module = _module;
-	silent = false;
-}
-
-asCBuilder::~asCBuilder()
-{
-#ifndef AS_NO_COMPILER
-	asUINT n;
-
-	// Free all functions
-	for( n = 0; n < functions.GetLength(); n++ )
-	{
-		if( functions[n] )
-		{
-			if( functions[n]->node )
-				functions[n]->node->Destroy(engine);
-
-			asDELETE(functions[n],sFunctionDescription);
-		}
-
-		functions[n] = 0;
-	}
-
-	// Free all global variables
-	asCSymbolTable<sGlobalVariableDescription>::iterator it = globVariables.List();
-	while( it )
-	{
-		if( (*it)->declaredAtNode )
-			(*it)->declaredAtNode->Destroy(engine);
-		if( (*it)->initializationNode )
-			(*it)->initializationNode->Destroy(engine);
-		asDELETE((*it),sGlobalVariableDescription);
-		it++;
-	}
-	globVariables.Clear();
-
-	// Free all the loaded files
-	for( n = 0; n < scripts.GetLength(); n++ )
-	{
-		if( scripts[n] )
-			asDELETE(scripts[n],asCScriptCode);
-
-		scripts[n] = 0;
-	}
-
-	// Free all class declarations
-	for( n = 0; n < classDeclarations.GetLength(); n++ )
-	{
-		if( classDeclarations[n] )
-		{
-			if( classDeclarations[n]->node )
-				classDeclarations[n]->node->Destroy(engine);
-
-			asDELETE(classDeclarations[n],sClassDeclaration);
-			classDeclarations[n] = 0;
-		}
-	}
-
-	for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
-	{
-		if( interfaceDeclarations[n] )
-		{
-			if( interfaceDeclarations[n]->node )
-				interfaceDeclarations[n]->node->Destroy(engine);
-
-			asDELETE(interfaceDeclarations[n],sClassDeclaration);
-			interfaceDeclarations[n] = 0;
-		}
-	}
-
-	for( n = 0; n < namedTypeDeclarations.GetLength(); n++ )
-	{
-		if( namedTypeDeclarations[n] )
-		{
-			if( namedTypeDeclarations[n]->node )
-				namedTypeDeclarations[n]->node->Destroy(engine);
-
-			asDELETE(namedTypeDeclarations[n],sClassDeclaration);
-			namedTypeDeclarations[n] = 0;
-		}
-	}
-
-	for( n = 0; n < funcDefs.GetLength(); n++ )
-	{
-		if( funcDefs[n] )
-		{
-			if( funcDefs[n]->node )
-				funcDefs[n]->node->Destroy(engine);
-
-			asDELETE(funcDefs[n],sFuncDef);
-			funcDefs[n] = 0;
-		}
-	}
-
-	for( n = 0; n < mixinClasses.GetLength(); n++ )
-	{
-		if( mixinClasses[n] )
-		{
-			if( mixinClasses[n]->node )
-				mixinClasses[n]->node->Destroy(engine);
-
-			asDELETE(mixinClasses[n],sMixinClass);
-			mixinClasses[n] = 0;
-		}
-	}
-
-#endif // AS_NO_COMPILER
-}
-
-void asCBuilder::Reset()
-{
-	numErrors = 0;
-	numWarnings = 0;
-	engine->preMessage.isSet = false;
-
-#ifndef AS_NO_COMPILER
-	// Clear the cache of known types
-	hasCachedKnownTypes = false;
-	knownTypes.EraseAll();
-#endif
-}
-
-#ifndef AS_NO_COMPILER
-int asCBuilder::AddCode(const char *name, const char *code, int codeLength, int lineOffset, int sectionIdx, bool makeCopy)
-{
-	asCScriptCode *script = asNEW(asCScriptCode);
-	if( script == 0 )
-		return asOUT_OF_MEMORY;
-
-	int r = script->SetCode(name, code, codeLength, makeCopy);
-	if( r < 0 )
-	{
-		asDELETE(script, asCScriptCode);
-		return r;
-	}
-
-	script->lineOffset = lineOffset;
-	script->idx = sectionIdx;
-	scripts.PushLast(script);
-
-	return 0;
-}
-
-void asCBuilder::EvaluateTemplateInstances(asUINT startIdx, bool keepSilent)
-{
-	// Backup the original message stream
-	bool                       msgCallback     = engine->msgCallback;
-	asSSystemFunctionInterface msgCallbackFunc = engine->msgCallbackFunc;
-	void                      *msgCallbackObj  = engine->msgCallbackObj;
-
-	// Set the new temporary message stream
-	asCOutputBuffer outBuffer;
-	if( keepSilent )
-		engine->SetMessageCallback(asMETHOD(asCOutputBuffer, Callback), &outBuffer, asCALL_THISCALL);
-
-	// Evaluate each of the template instances that have been created since the start of the build
-	// TODO: This is not exactly correct, since another thread may have created template instances in parallel
-	for( asUINT n = startIdx; n < engine->templateInstanceTypes.GetLength(); n++ )
-	{
-		bool dontGarbageCollect = false;
-		asCObjectType *tmpl = engine->templateInstanceTypes[n];
-		asCScriptFunction *callback = engine->scriptFunctions[tmpl->beh.templateCallback];
-		if( callback && !engine->CallGlobalFunctionRetBool(tmpl, &dontGarbageCollect, callback->sysFuncIntf, callback) )
-		{
-			asCString sub = tmpl->templateSubTypes[0].Format(engine->nameSpaces[0]);
-			for( asUINT m = 1; m < tmpl->templateSubTypes.GetLength(); m++ )
-			{
-				sub += ",";
-				sub += tmpl->templateSubTypes[m].Format(engine->nameSpaces[0]);
-			}
-			asCString str;
-			str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, tmpl->name.AddressOf(), sub.AddressOf());
-			WriteError(tmpl->scriptSectionIdx >= 0 ? engine->scriptSectionNames[tmpl->scriptSectionIdx]->AddressOf() : "", str, tmpl->declaredAt&0xFFFFF, (tmpl->declaredAt>>20)&0xFFF);
-		}
-		else
-		{
-			// If the callback said this template instance won't be garbage collected then remove the flag
-			if( dontGarbageCollect )
-				tmpl->flags &= ~asOBJ_GC;
-		}
-	}
-
-	// Restore message callback
-	if( keepSilent )
-	{
-		engine->msgCallback     = msgCallback;
-		engine->msgCallbackFunc = msgCallbackFunc;
-		engine->msgCallbackObj  = msgCallbackObj;
-	}
-}
-
-int asCBuilder::Build()
-{
-	Reset();
-
-	// The template callbacks must only be called after the subtypes have a known structure,
-	// otherwise the callback may think it is not possible to create the template instance, 
-	// even though it is.
-	// TODO: This flag shouldn't be set globally in the engine, as it would mean that another 
-	//       thread requesting a template instance in parallel to the compilation wouldn't 
-	//       evaluate the template instance. 
-	engine->deferValidationOfTemplateTypes = true;
-	asUINT numTempl = (asUINT)engine->templateInstanceTypes.GetLength();
-
-	ParseScripts();
-
-	// Compile the types first
-	CompileInterfaces();
-	CompileClasses(numTempl);
-
-	// Evaluate the template instances one last time, this time with error messages, as we know 
-	// all classes have been fully built and it is known which ones will need garbage collection.
-	EvaluateTemplateInstances(numTempl, false);
-	engine->deferValidationOfTemplateTypes = false;
-
-	// Then the global variables. Here the variables declared with auto
-	// will be resolved, so they can be accessed properly in the functions
-	CompileGlobalVariables();
-
-	// Finally the global functions and class methods
-	CompileFunctions();
-
-	// TODO: Attempt to reorder the initialization of global variables so that
-	//       they do not access other uninitialized global variables out-of-order
-	//       The builder needs to check for each of the global variable, what functions
-	//       that are accessed, and what global variables are access by these functions.
-
-	if( numWarnings > 0 && engine->ep.compilerWarnings == 2 )
-		WriteError(TXT_WARNINGS_TREATED_AS_ERROR, 0, 0);
-
-	if( numErrors > 0 )
-		return asERROR;
-
-	// Make sure something was compiled, otherwise return an error
-	if( module->IsEmpty() )
-	{
-		WriteError(TXT_NOTHING_WAS_BUILT, 0, 0);
-		return asERROR;
-	}
-
-	return asSUCCESS;
-}
-
-int asCBuilder::CompileGlobalVar(const char *sectionName, const char *code, int lineOffset)
-{
-	Reset();
-
-	// Add the string to the script code
-	asCScriptCode *script = asNEW(asCScriptCode);
-	if( script == 0 )
-		return asOUT_OF_MEMORY;
-
-	script->SetCode(sectionName, code, true);
-	script->lineOffset = lineOffset;
-	script->idx = engine->GetScriptSectionNameIndex(sectionName ? sectionName : "");
-	scripts.PushLast(script);
-
-	// Parse the string
-	asCParser parser(this);
-	if( parser.ParseScript(scripts[0]) < 0 )
-		return asERROR;
-
-	asCScriptNode *node = parser.GetScriptNode();
-
-	// Make sure there is nothing else than the global variable in the script code
-	if( node == 0 ||
-		node->firstChild == 0 ||
-		node->firstChild != node->lastChild ||
-		node->firstChild->nodeType != snDeclaration )
-	{
-		WriteError(TXT_ONLY_ONE_VARIABLE_ALLOWED, script, 0);
-		return asERROR;
-	}
-
-	node = node->firstChild;
-	node->DisconnectParent();
-	RegisterGlobalVar(node, script, module->defaultNamespace);
-
-	CompileGlobalVariables();
-
-	// It is possible that the global variable initialization included anonymous functions that must be compiled too
-	for( asUINT n = 0; n < functions.GetLength(); n++ )
-	{
-		asCCompiler compiler(engine);
-		asCScriptFunction *func = engine->scriptFunctions[functions[n]->funcId];
-		int r = compiler.CompileFunction(this, functions[n]->script, func->parameterNames, functions[n]->node, func, 0);
-		if( r < 0 )
-			break;
-	}
-
-	if( numWarnings > 0 && engine->ep.compilerWarnings == 2 )
-		WriteError(TXT_WARNINGS_TREATED_AS_ERROR, 0, 0);
-
-	// None of the functions should be added to the module if any error occurred, 
-	// or it was requested that the functions wouldn't be added to the scope
-	if( numErrors > 0 )
-	{
-		for( asUINT n = 0; n < functions.GetLength(); n++ )
-		{
-			asCScriptFunction *func = engine->scriptFunctions[functions[n]->funcId];
-			if( module->globalFunctions.GetIndex(func) >= 0 )
-			{
-				module->globalFunctions.Erase(module->globalFunctions.GetIndex(func));
-				module->scriptFunctions.RemoveValue(func);
-				func->ReleaseInternal();
-			}
-		}
-	}
-
-	if( numErrors > 0 )
-	{
-		// Remove the variable from the module, if it was registered
-		if( globVariables.GetSize() > 0 )
-			module->RemoveGlobalVar(module->GetGlobalVarCount()-1);
-
-		return asERROR;
-	}
-
-	return 0;
-}
-#endif
-
-int asCBuilder::ValidateDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func)
-{
-	int firstArgWithDefaultValue = -1;
-	for( asUINT n = 0; n < func->defaultArgs.GetLength(); n++ )
-	{
-		if( func->defaultArgs[n] )
-			firstArgWithDefaultValue = n;
-		else if( firstArgWithDefaultValue >= 0 )
-		{
-			asCString str;
-			str.Format(TXT_DEF_ARG_MISSING_IN_FUNC_s, func->GetDeclaration());
-			WriteError(str, script, node);
-			return asINVALID_DECLARATION;
-		}
-	}
-
-	return 0;
-}
-
-#ifndef AS_NO_COMPILER
-// This function will verify if the newly created function will conflict another overload due to having
-// identical function arguments that are not default args, e.g: foo(int) and foo(int, int=0)
-int asCBuilder::CheckForConflictsDueToDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func, asCObjectType *objType)
-{
-	// TODO: Implement for global functions too
-	if( func->objectType == 0 || objType == 0 ) return 0;
-
-	asCArray<int> funcs;
-	GetObjectMethodDescriptions(func->name.AddressOf(), objType, funcs, false);
-	for( asUINT n = 0; n < funcs.GetLength(); n++ )
-	{
-		asCScriptFunction *func2 = engine->scriptFunctions[funcs[n]];
-		if( func == func2 )
-			continue;
-
-		if( func->IsReadOnly() != func2->IsReadOnly() )
-			continue;
-
-		bool match = true;
-		asUINT p = 0;
-		for( ; p < func->parameterTypes.GetLength() && p < func2->parameterTypes.GetLength(); p++ )
-		{
-			// Only verify until the first argument with default args
-			if( (func->defaultArgs.GetLength() > p && func->defaultArgs[p]) ||
-				(func2->defaultArgs.GetLength() > p && func2->defaultArgs[p]) )
-				break;
-
-			if( func->parameterTypes[p] != func2->parameterTypes[p] ||
-				func->inOutFlags[p] != func2->inOutFlags[p] )
-			{
-				match = false;
-				break;
-			}
-		}
-
-		if( match )
-		{
-			if( !((p >= func->parameterTypes.GetLength() && p < func2->defaultArgs.GetLength() && func2->defaultArgs[p]) ||
-				  (p >= func2->parameterTypes.GetLength() && p < func->defaultArgs.GetLength() && func->defaultArgs[p])) )
-			{
-				// The argument lists match for the full length of the shorter, but the next
-				// argument on the longer does not have a default arg so there is no conflict
-				match = false;
-			}
-		}
-
-		if( match )
-		{
-			WriteWarning(TXT_OVERLOAD_CONFLICTS_DUE_TO_DEFAULT_ARGS, script, node);
-			WriteInfo(func->GetDeclaration(), script, node);
-			WriteInfo(func2->GetDeclaration(), script, node);
-			break;
-		}
-	}
-
-	return 0;
-}
-
-int asCBuilder::CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asCScriptFunction **outFunc)
-{
-	asASSERT(outFunc != 0);
-
-	Reset();
-
-	// Add the string to the script code
-	asCScriptCode *script = asNEW(asCScriptCode);
-	if( script == 0 )
-		return asOUT_OF_MEMORY;
-
-	script->SetCode(sectionName, code, true);
-	script->lineOffset = lineOffset;
-	script->idx = engine->GetScriptSectionNameIndex(sectionName ? sectionName : "");
-	scripts.PushLast(script);
-
-	// Parse the string
-	asCParser parser(this);
-	if( parser.ParseScript(scripts[0]) < 0 )
-		return asERROR;
-
-	asCScriptNode *node = parser.GetScriptNode();
-
-	// Make sure there is nothing else than the function in the script code
-	if( node == 0 ||
-		node->firstChild == 0 ||
-		node->firstChild != node->lastChild ||
-		node->firstChild->nodeType != snFunction )
-	{
-		WriteError(TXT_ONLY_ONE_FUNCTION_ALLOWED, script, 0);
-		return asERROR;
-	}
-
-	// Find the function node
-	node = node->firstChild;
-
-	// Create the function
-	bool isConstructor, isDestructor, isPrivate, isProtected, isFinal, isOverride, isShared;
-	asCScriptFunction *func = asNEW(asCScriptFunction)(engine, compileFlags & asCOMP_ADD_TO_MODULE ? module : 0, asFUNC_SCRIPT);
-	if( func == 0 )
-		return asOUT_OF_MEMORY;
-
-	GetParsedFunctionDetails(node, scripts[0], 0, func->name, func->returnType, func->parameterNames, func->parameterTypes, func->inOutFlags, func->defaultArgs, func->isReadOnly, isConstructor, isDestructor, isPrivate, isProtected, isFinal, isOverride, isShared, module->defaultNamespace);
-	func->id                           = engine->GetNextScriptFunctionId();
-	func->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(sectionName ? sectionName : "");
-	int row, col;
-	scripts[0]->ConvertPosToRowCol(node->tokenPos, &row, &col);
-	func->scriptData->declaredAt       = (row & 0xFFFFF)|((col & 0xFFF)<<20);
-	func->nameSpace                    = module->defaultNamespace;
-
-	// Make sure the default args are declared correctly
-	int r = ValidateDefaultArgs(script, node, func);
-	if( r < 0 )
-	{
-		func->ReleaseInternal();
-		return asERROR;
-	}
-
-	// Tell the engine that the function exists already so the compiler can access it
-	if( compileFlags & asCOMP_ADD_TO_MODULE )
-	{
-		r = CheckNameConflict(func->name.AddressOf(), node, scripts[0], module->defaultNamespace);
-		if( r < 0 )
-		{
-			func->ReleaseInternal();
-			return asERROR;
-		}
-
-		module->globalFunctions.Put(func);
-		
-		module->AddScriptFunction(func);
-	}
-	else
-		engine->AddScriptFunction(func);
-
-	// Fill in the function info for the builder too
-	node->DisconnectParent();
-	sFunctionDescription *funcDesc = asNEW(sFunctionDescription);
-	if( funcDesc == 0 )
-	{
-		func->ReleaseInternal();
-		return asOUT_OF_MEMORY;
-	}
-
-	functions.PushLast(funcDesc);
-	funcDesc->script            = scripts[0];
-	funcDesc->node              = node;
-	funcDesc->name              = func->name;
-	funcDesc->funcId            = func->id;
-	funcDesc->paramNames        = func->parameterNames;
-	funcDesc->isExistingShared  = false;
-
-	// This must be done in a loop, as it is possible that additional functions get declared as lambda's in the code
-	for( asUINT n = 0; n < functions.GetLength(); n++ )
-	{
-		asCCompiler compiler(engine);
-		asCScriptFunction *f = engine->scriptFunctions[functions[n]->funcId];
-		r = compiler.CompileFunction(this, functions[n]->script, f->parameterNames, functions[n]->node, f, 0);
-		if( r < 0 )
-			break;
-	}
-
-	if( numWarnings > 0 && engine->ep.compilerWarnings == 2 )
-		WriteError(TXT_WARNINGS_TREATED_AS_ERROR, 0, 0);
-
-	// None of the functions should be added to the module if any error occurred, 
-	// or it was requested that the functions wouldn't be added to the scope
-	if( !(compileFlags & asCOMP_ADD_TO_MODULE) || numErrors > 0 )
-	{
-		for( asUINT n = 0; n < functions.GetLength(); n++ )
-		{
-			asCScriptFunction *f = engine->scriptFunctions[functions[n]->funcId];
-			if( module->globalFunctions.GetIndex(f) >= 0 )
-			{
-				module->globalFunctions.Erase(module->globalFunctions.GetIndex(f));
-				module->scriptFunctions.RemoveValue(f);
-				f->ReleaseInternal();
-			}
-		}
-	}
-
-	if( numErrors > 0 )
-	{
-		// Release the function pointer that would otherwise be returned if no errors occured
-		func->ReleaseInternal();
-
-		return asERROR;
-	}
-
-	// Return the function
-	*outFunc = func;
-
-	return asSUCCESS;
-}
-
-void asCBuilder::ParseScripts()
-{
-	TimeIt("asCBuilder::ParseScripts");
-
-	asCArray<asCParser*> parsers((int)scripts.GetLength());
-
-	// Parse all the files as if they were one
-	asUINT n = 0;
-	for( n = 0; n < scripts.GetLength(); n++ )
-	{
-		asCParser *parser = asNEW(asCParser)(this);
-		if( parser != 0 )
-		{
-			parsers.PushLast(parser);
-
-			// Parse the script file
-			parser->ParseScript(scripts[n]);
-		}
-	}
-
-	if (numErrors == 0)
-	{
-		// Find all type declarations
-		for (n = 0; n < scripts.GetLength(); n++)
-		{
-			asCScriptNode *node = parsers[n]->GetScriptNode();
-			RegisterTypesFromScript(node, scripts[n], engine->nameSpaces[0]);
-		}
-
-		// Before moving forward the builder must establish the relationship between types
-		// so that a derived type can see the child types of the parent type.
-		DetermineTypeRelations();
-
-		// Complete function definitions (defining returntype and parameters)
-		for( n = 0; n < funcDefs.GetLength(); n++ )
-			CompleteFuncDef(funcDefs[n]);
-
-		// Register script methods found in the interfaces
-		for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
-		{
-			sClassDeclaration *decl = interfaceDeclarations[n];
-			asCScriptNode *node = decl->node->firstChild->next;
-
-			// Skip list of inherited interfaces
-			while( node && node->nodeType == snIdentifier )
-				node = node->next;
-
-			while( node )
-			{
-				asCScriptNode *next = node->next;
-				if( node->nodeType == snFunction )
-				{
-					node->DisconnectParent();
-					RegisterScriptFunctionFromNode(node, decl->script, decl->typeInfo->CastToObjectType(), true, false, 0, decl->isExistingShared);
-				}
-				else if( node->nodeType == snVirtualProperty )
-				{
-					node->DisconnectParent();
-					RegisterVirtualProperty(node, decl->script, decl->typeInfo->CastToObjectType(), true, false, 0, decl->isExistingShared);
-				}
-
-				node = next;
-			}
-		}
-
-		// Register script methods found in the classes
-		for( n = 0; n < classDeclarations.GetLength(); n++ )
-		{
-			sClassDeclaration *decl = classDeclarations[n];
-
-			asCScriptNode *node = decl->node->firstChild->next;
-
-			// Skip list of classes and interfaces
-			while( node && node->nodeType == snIdentifier )
-				node = node->next;
-
-			while( node )
-			{
-				asCScriptNode *next = node->next;
-				if( node->nodeType == snFunction )
-				{
-					node->DisconnectParent();
-					RegisterScriptFunctionFromNode(node, decl->script, decl->typeInfo->CastToObjectType(), false, false, 0, decl->isExistingShared);
-				}
-				else if( node->nodeType == snVirtualProperty )
-				{
-					node->DisconnectParent();
-					RegisterVirtualProperty(node, decl->script, decl->typeInfo->CastToObjectType(), false, false, 0, decl->isExistingShared);
-				}
-
-				node = next;
-			}
-
-			// Make sure the default factory & constructor exists for classes
-			asCObjectType *ot = decl->typeInfo->CastToObjectType();
-			if( ot->beh.construct == engine->scriptTypeBehaviours.beh.construct )
-			{
-				if( ot->beh.constructors.GetLength() == 1 || engine->ep.alwaysImplDefaultConstruct )
-				{
-					AddDefaultConstructor(ot, decl->script);
-				}
-				else
-				{
-					// As the class has another constructor we shouldn't provide the default constructor
-					if( ot->beh.construct )
-					{
-						engine->scriptFunctions[ot->beh.construct]->ReleaseInternal();
-						ot->beh.construct = 0;
-						ot->beh.constructors.RemoveIndex(0);
-					}
-					if( ot->beh.factory )
-					{
-						engine->scriptFunctions[ot->beh.factory]->ReleaseInternal();
-						ot->beh.factory = 0;
-						ot->beh.factories.RemoveIndex(0);
-					}
-					// Only remove the opAssign method if the script hasn't provided one
-					if( ot->beh.copy == engine->scriptTypeBehaviours.beh.copy )
-					{
-						engine->scriptFunctions[ot->beh.copy]->ReleaseInternal();
-						ot->beh.copy = 0;
-					}
-				}
-			}
-		}
-
-		// Find other global nodes
-		for( n = 0; n < scripts.GetLength(); n++ )
-		{
-			// Find other global nodes
-			asCScriptNode *node = parsers[n]->GetScriptNode();
-			RegisterNonTypesFromScript(node, scripts[n], engine->nameSpaces[0]);
-		}
-	}
-
-	for( n = 0; n < parsers.GetLength(); n++ )
-	{
-		asDELETE(parsers[n],asCParser);
-	}
-}
-
-void asCBuilder::RegisterTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns)
-{
-	asASSERT(node->nodeType == snScript);
-
-	// Find structure definitions first
-	node = node->firstChild;
-	while( node )
-	{
-		asCScriptNode *next = node->next;
-		if( node->nodeType == snNamespace )
-		{
-			// Recursively register the entities defined in the namespace
-			asCString nsName;
-			nsName.Assign(&script->code[node->firstChild->tokenPos], node->firstChild->tokenLength);
-			if( ns->name != "" )
-				nsName = ns->name + "::" + nsName;
-
-			asSNameSpace *nsChild = engine->AddNameSpace(nsName.AddressOf());
-			RegisterTypesFromScript(node->lastChild, script, nsChild);
-		}
-		else
-		{
-			if( node->nodeType == snClass )
-			{
-				node->DisconnectParent();
-				RegisterClass(node, script, ns);
-			}
-			else if( node->nodeType == snInterface )
-			{
-				node->DisconnectParent();
-				RegisterInterface(node, script, ns);
-			}
-			else if( node->nodeType == snEnum )
-			{
-				node->DisconnectParent();
-				RegisterEnum(node, script, ns);
-			}
-			else if( node->nodeType == snTypedef )
-			{
-				node->DisconnectParent();
-				RegisterTypedef(node, script, ns);
-			}
-			else if( node->nodeType == snFuncDef )
-			{
-				node->DisconnectParent();
-				RegisterFuncDef(node, script, ns, 0);
-			}
-			else if( node->nodeType == snMixin )
-			{
-				node->DisconnectParent();
-				RegisterMixinClass(node, script, ns);
-			}
-		}
-
-		node = next;
-	}
-}
-
-void asCBuilder::RegisterNonTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns)
-{
-	node = node->firstChild;
-	while( node )
-	{
-		asCScriptNode *next = node->next;
-		if( node->nodeType == snNamespace )
-		{
-			// Determine the name of the namespace
-			asCString nsName;
-			nsName.Assign(&script->code[node->firstChild->tokenPos], node->firstChild->tokenLength);
-			if( ns->name != "" )
-				nsName = ns->name + "::" + nsName;
-
-			// Declare the namespace, then add the entities
-			asSNameSpace *nsChild = engine->AddNameSpace(nsName.AddressOf());
-			RegisterNonTypesFromScript(node->lastChild, script, nsChild);
-		}
-		else
-		{
-			node->DisconnectParent();
-			if( node->nodeType == snFunction )
-				RegisterScriptFunctionFromNode(node, script, 0, false, true, ns);
-			else if( node->nodeType == snDeclaration )
-				RegisterGlobalVar(node, script, ns);
-			else if( node->nodeType == snVirtualProperty )
-				RegisterVirtualProperty(node, script, 0, false, true, ns);
-			else if( node->nodeType == snImport )
-				RegisterImportedFunction(module->GetNextImportedFunctionId(), node, script, ns);
-			else
-			{
-				// Unused script node
-				int r, c;
-				script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-				WriteWarning(script->name, TXT_UNUSED_SCRIPT_NODE, r, c);
-
-				node->Destroy(engine);
-			}
-		}
-
-		node = next;
-	}
-}
-
-void asCBuilder::CompileFunctions()
-{
-	// Compile each function
-	for( asUINT n = 0; n < functions.GetLength(); n++ )
-	{
-		sFunctionDescription *current = functions[n];
-		if( current == 0 ) continue;
-
-		// Don't compile the function again if it was an existing shared function
-		if( current->isExistingShared ) continue;
-
-		asCCompiler compiler(engine);
-		asCScriptFunction *func = engine->scriptFunctions[current->funcId];
-
-		// Find the class declaration for constructors
-		sClassDeclaration *classDecl = 0;
-		if( current->objType && current->name == current->objType->name )
-		{
-			for( asUINT c = 0; c < classDeclarations.GetLength(); c++ )
-			{
-				if( classDeclarations[c]->typeInfo == current->objType )
-				{
-					classDecl = classDeclarations[c];
-					break;
-				}
-			}
-
-			asASSERT( classDecl );
-		}
-
-		if( current->node )
-		{
-			int r, c;
-			current->script->ConvertPosToRowCol(current->node->tokenPos, &r, &c);
-
-			asCString str = func->GetDeclarationStr();
-			str.Format(TXT_COMPILING_s, str.AddressOf());
-			WriteInfo(current->script->name, str, r, c, true);
-
-			// When compiling a constructor need to pass the class declaration for member initializations
-			compiler.CompileFunction(this, current->script, current->paramNames, current->node, func, classDecl);
-
-			engine->preMessage.isSet = false;
-		}
-		else if( current->objType && current->name == current->objType->name )
-		{
-			asCScriptNode *node = classDecl->node;
-
-			int r = 0, c = 0;
-			if( node )
-				current->script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-			asCString str = func->GetDeclarationStr();
-			str.Format(TXT_COMPILING_s, str.AddressOf());
-			WriteInfo(current->script->name, str, r, c, true);
-
-			// This is the default constructor that is generated
-			// automatically if not implemented by the user.
-			compiler.CompileDefaultConstructor(this, current->script, node, func, classDecl);
-
-			engine->preMessage.isSet = false;
-		}
-		else
-		{
-			asASSERT( false );
-		}
-	}
-}
-#endif
-
-// Called from module and engine
-int asCBuilder::ParseDataType(const char *datatype, asCDataType *result, asSNameSpace *implicitNamespace, bool isReturnType)
-{
-	Reset();
-
-	asCScriptCode source;
-	source.SetCode("", datatype, true);
-
-	asCParser parser(this);
-	int r = parser.ParseDataType(&source, isReturnType);
-	if( r < 0 )
-		return asINVALID_TYPE;
-
-	// Get data type and property name
-	asCScriptNode *dataType = parser.GetScriptNode()->firstChild;
-
-	*result = CreateDataTypeFromNode(dataType, &source, implicitNamespace, true);
-	if( isReturnType )
-		*result = ModifyDataTypeFromNode(*result, dataType->next, &source, 0, 0);
-
-	if( numErrors > 0 )
-		return asINVALID_TYPE;
-
-	return asSUCCESS;
-}
-
-int asCBuilder::ParseTemplateDecl(const char *decl, asCString *name, asCArray<asCString> &subtypeNames)
-{
-	Reset();
-
-	asCScriptCode source;
-	source.SetCode("", decl, true);
-
-	asCParser parser(this);
-	int r = parser.ParseTemplateDecl(&source);
-	if( r < 0 )
-		return asINVALID_TYPE;
-
-	// Get the template name and subtype names
-	asCScriptNode *node = parser.GetScriptNode()->firstChild;
-
-	name->Assign(&decl[node->tokenPos], node->tokenLength);
-	while( (node = node->next) != 0 )
-	{
-		asCString subtypeName;
-		subtypeName.Assign(&decl[node->tokenPos], node->tokenLength);
-		subtypeNames.PushLast(subtypeName);
-	}
-
-	// TODO: template: check for name conflicts
-
-	if( numErrors > 0 )
-		return asINVALID_DECLARATION;
-
-	return asSUCCESS;
-}
-
-int asCBuilder::VerifyProperty(asCDataType *dt, const char *decl, asCString &name, asCDataType &type, asSNameSpace *ns)
-{
-	// Either datatype or namespace must be informed
-	asASSERT( dt || ns );
-
-	Reset();
-
-	if( dt )
-	{
-		// Verify that the object type exist
-		if( dt->GetTypeInfo()->CastToObjectType() == 0 )
-			return asINVALID_OBJECT;
-	}
-
-	// Check property declaration and type
-	asCScriptCode source;
-	source.SetCode(TXT_PROPERTY, decl, true);
-
-	asCParser parser(this);
-	int r = parser.ParsePropertyDeclaration(&source);
-	if( r < 0 )
-		return asINVALID_DECLARATION;
-
-	// Get data type
-	asCScriptNode *dataType = parser.GetScriptNode()->firstChild;
-
-	// Check if the property is declared 'by reference'
-	bool isReference = (dataType->next->tokenType == ttAmp);
-
-	// Get the name of the property
-	asCScriptNode *nameNode = isReference ? dataType->next->next : dataType->next;
-
-	// If an object property is registered, then use the
-	// object's namespace, otherwise use the specified namespace
-	type = CreateDataTypeFromNode(dataType, &source, dt ? dt->GetTypeInfo()->nameSpace : ns);
-	name.Assign(&decl[nameNode->tokenPos], nameNode->tokenLength);
-	type.MakeReference(isReference);
-
-	// Validate that the type really can be a registered property
-	// We cannot use CanBeInstantiated, as it is allowed to register
-	// properties of type that cannot otherwise be instantiated
-	if( type.IsFuncdef() && !type.IsObjectHandle() )
-	{
-		// Function definitions must always be handles
-		return asINVALID_DECLARATION;
-	}
-
-	// Verify property name
-	if( dt )
-	{
-		if( CheckNameConflictMember(dt->GetTypeInfo(), name.AddressOf(), nameNode, &source, true) < 0 )
-			return asNAME_TAKEN;
-	}
-	else
-	{
-		if( CheckNameConflict(name.AddressOf(), nameNode, &source, ns) < 0 )
-			return asNAME_TAKEN;
-	}
-
-	if( numErrors > 0 )
-		return asINVALID_DECLARATION;
-
-	return asSUCCESS;
-}
-
-#ifndef AS_NO_COMPILER
-asCObjectProperty *asCBuilder::GetObjectProperty(asCDataType &obj, const char *prop)
-{
-	asASSERT(obj.GetTypeInfo()->CastToObjectType() != 0);
-
-	// TODO: optimize: Improve linear search
-	asCArray<asCObjectProperty *> &props = obj.GetTypeInfo()->CastToObjectType()->properties;
-	for( asUINT n = 0; n < props.GetLength(); n++ )
-	{
-		if( props[n]->name == prop )
-		{
-			if( module->accessMask & props[n]->accessMask )
-				return props[n];
-			else
-				return 0;
-		}
-	}
-
-	return 0;
-}
-#endif
-
-bool asCBuilder::DoesGlobalPropertyExist(const char *prop, asSNameSpace *ns, asCGlobalProperty **outProp, sGlobalVariableDescription **outDesc, bool *isAppProp)
-{
-	if( outProp )   *outProp = 0;
-	if( outDesc )   *outDesc = 0;
-	if( isAppProp ) *isAppProp = false;
-
-	// Check application registered properties
-	asCString name(prop);
-	asCGlobalProperty *globProp = engine->registeredGlobalProps.GetFirst(ns, name);
-	if( globProp )
-	{
-		if( isAppProp ) *isAppProp = true;
-		if( outProp )   *outProp   = globProp;
-		return true;
-	}
-
-#ifndef AS_NO_COMPILER
-	// Check properties being compiled now
-	sGlobalVariableDescription* desc = globVariables.GetFirst(ns, prop);
-	if( desc && !desc->isEnumValue )
-	{
-		if( outProp ) *outProp = desc->property;
-		if( outDesc ) *outDesc = desc;
-		return true;
-	}
-#endif
-
-	// Check previously compiled global variables
-	if( module )
-	{
-		globProp = module->scriptGlobals.GetFirst(ns, prop);
-		if( globProp )
-		{
-			if( outProp ) *outProp = globProp;
-			return true;
-		}
-	}
-
-	return false;
-}
-
-asCGlobalProperty *asCBuilder::GetGlobalProperty(const char *prop, asSNameSpace *ns, bool *isCompiled, bool *isPureConstant, asQWORD *constantValue, bool *isAppProp)
-{
-	if( isCompiled )     *isCompiled     = true;
-	if( isPureConstant ) *isPureConstant = false;
-	if( isAppProp )      *isAppProp      = false;
-	if( constantValue )  *constantValue  = 0;
-
-	asCGlobalProperty          *globProp = 0;
-	sGlobalVariableDescription *globDesc = 0;
-	if( DoesGlobalPropertyExist(prop, ns, &globProp, &globDesc, isAppProp) )
-	{
-#ifndef AS_NO_COMPILER
-		if( globDesc )
-		{
-			// The property was declared in this build call, check if it has been compiled successfully already
-			if( isCompiled )     *isCompiled     = globDesc->isCompiled;
-			if( isPureConstant ) *isPureConstant = globDesc->isPureConstant;
-			if( constantValue  ) *constantValue  = globDesc->constantValue;
-		}
-		else 
-#endif
-		if( isAppProp )
-		{
-			// Don't return the property if the module doesn't have access to it
-			if( !(module->accessMask & globProp->accessMask) )
-				globProp = 0;
-		}
-		return globProp;
-	}
-
-	return 0;
-}
-
-int asCBuilder::ParseFunctionDeclaration(asCObjectType *objType, const char *decl, asCScriptFunction *func, bool isSystemFunction, asCArray<bool> *paramAutoHandles, bool *returnAutoHandle, asSNameSpace *ns, asCScriptNode **listPattern, asCObjectType **outParentClass)
-{
-	asASSERT( objType || ns );
-
-	if (listPattern)
-		*listPattern = 0;
-	if (outParentClass)
-		*outParentClass = 0;
-
-	// TODO: Can't we use GetParsedFunctionDetails to do most of what is done in this function?
-
-	Reset();
-
-	asCScriptCode source;
-	source.SetCode(TXT_SYSTEM_FUNCTION, decl, true);
-
-	asCParser parser(this);
-	int r = parser.ParseFunctionDefinition(&source, listPattern != 0);
-	if( r < 0 )
-		return asINVALID_DECLARATION;
-
-	asCScriptNode *node = parser.GetScriptNode();
-
-	// Determine scope
-	asCScriptNode *n = node->firstChild->next->next;
-	asCObjectType *parentClass = 0;
-	func->nameSpace = GetNameSpaceFromNode(n, &source, ns, &n, &parentClass);
-	if( func->nameSpace == 0 && parentClass == 0 )
-		return asINVALID_DECLARATION;
-	if (parentClass && func->funcType != asFUNC_FUNCDEF)
-		return asINVALID_DECLARATION;
-
-	if (outParentClass)
-		*outParentClass = parentClass;
-
-	// Find name
-	func->name.Assign(&source.code[n->tokenPos], n->tokenLength);
-
-	// Initialize a script function object for registration
-	bool autoHandle;
-
-	// Scoped reference types are allowed to use handle when returned from application functions
-	func->returnType = CreateDataTypeFromNode(node->firstChild, &source, objType ? objType->nameSpace : ns, true, parentClass ? parentClass : objType);
-	func->returnType = ModifyDataTypeFromNode(func->returnType, node->firstChild->next, &source, 0, &autoHandle);
-	if( autoHandle && (!func->returnType.IsObjectHandle() || func->returnType.IsReference()) )
-		return asINVALID_DECLARATION;
-	if( returnAutoHandle ) *returnAutoHandle = autoHandle;
-
-	// Reference types cannot be returned by value from system functions
-	if( isSystemFunction &&
-		(func->returnType.GetTypeInfo() &&
-		 (func->returnType.GetTypeInfo()->flags & asOBJ_REF)) &&
-		!(func->returnType.IsReference() ||
-		  func->returnType.IsObjectHandle()) )
-		return asINVALID_DECLARATION;
-
-	// Count number of parameters
-	int paramCount = 0;
-	asCScriptNode *paramList = n->next;
-	n = paramList->firstChild;
-	while( n )
-	{
-		paramCount++;
-		n = n->next->next;
-		if( n && n->nodeType == snIdentifier )
-			n = n->next;
-
-		if( n && n->nodeType == snExpression )
-			n = n->next;
-	}
-
-	// Preallocate memory
-	func->parameterTypes.Allocate(paramCount, false);
-	func->parameterNames.SetLength(paramCount);
-	func->inOutFlags.Allocate(paramCount, false);
-	func->defaultArgs.Allocate(paramCount, false);
-	if( paramAutoHandles ) paramAutoHandles->Allocate(paramCount, false);
-
-	n = paramList->firstChild;
-	asUINT index = 0;
-	while( n )
-	{
-		asETypeModifiers inOutFlags;
-		asCDataType type = CreateDataTypeFromNode(n, &source, objType ? objType->nameSpace : ns, false, parentClass ? parentClass : objType);
-		type = ModifyDataTypeFromNode(type, n->next, &source, &inOutFlags, &autoHandle);
-
-		// Reference types cannot be passed by value to system functions
-		if( isSystemFunction &&
-			(type.GetTypeInfo() &&
-			 (type.GetTypeInfo()->flags & asOBJ_REF)) &&
-			!(type.IsReference() ||
-			  type.IsObjectHandle()) )
-			return asINVALID_DECLARATION;
-
-		// Store the parameter type
-		func->parameterTypes.PushLast(type);
-		func->inOutFlags.PushLast(inOutFlags);
-
-		// Don't permit void parameters
-		if( type.GetTokenType() == ttVoid )
-			return asINVALID_DECLARATION;
-
-		if( autoHandle && (!type.IsObjectHandle() || type.IsReference()) )
-			return asINVALID_DECLARATION;
-
-		if( paramAutoHandles ) paramAutoHandles->PushLast(autoHandle);
-
-		// Make sure that var type parameters are references
-		if( type.GetTokenType() == ttQuestion &&
-			!type.IsReference() )
-			return asINVALID_DECLARATION;
-
-		// Move to next parameter
-		n = n->next->next;
-		if( n && n->nodeType == snIdentifier ) 
-		{
-			func->parameterNames[index] = asCString(&source.code[n->tokenPos], n->tokenLength);
-			n = n->next;
-		}
-		++index;
-
-		if( n && n->nodeType == snExpression )
-		{
-			// Strip out white space and comments to better share the string
-			asCString *defaultArgStr = asNEW(asCString);
-			if( defaultArgStr )
-			{
-				*defaultArgStr = GetCleanExpressionString(n, &source);
-				func->defaultArgs.PushLast(defaultArgStr);
-			}
-
-			n = n->next;
-		}
-		else
-			func->defaultArgs.PushLast(0);
-	}
-
-	// Set the read-only flag if const is declared after parameter list
-	n = paramList->next;
-	if( n && n->nodeType == snUndefined && n->tokenType == ttConst )
-	{
-		if( objType == 0 )
-			return asINVALID_DECLARATION;
-		func->isReadOnly = true;
-
-		n = n->next;
-	}
-	else
-		func->isReadOnly = false;
-
-	// If the caller expects a list pattern, check for the existence, else report an error if not
-	if( listPattern )
-	{
-		if( n == 0 || n->nodeType != snListPattern ) 
-			return asINVALID_DECLARATION;
-		else
-		{
-			*listPattern = n;
-			n->DisconnectParent();
-		}
-	}
-	else
-	{
-		if( n )
-			return asINVALID_DECLARATION;
-	}
-	
-	// Make sure the default args are declared correctly
-	ValidateDefaultArgs(&source, node, func);
-
-	if( numErrors > 0 || numWarnings > 0 )
-		return asINVALID_DECLARATION;
-
-	return 0;
-}
-
-int asCBuilder::ParseVariableDeclaration(const char *decl, asSNameSpace *implicitNamespace, asCString &outName, asSNameSpace *&outNamespace, asCDataType &outDt)
-{
-	Reset();
-
-	asCScriptCode source;
-	source.SetCode(TXT_VARIABLE_DECL, decl, true);
-
-	asCParser parser(this);
-
-	int r = parser.ParsePropertyDeclaration(&source);
-	if( r < 0 )
-		return asINVALID_DECLARATION;
-
-	asCScriptNode *node = parser.GetScriptNode();
-
-	// Determine the scope from declaration
-	asCScriptNode *n = node->firstChild->next;
-	// TODO: child funcdef: The parentType will be set if the scope is actually a type rather than a namespace
-	outNamespace = GetNameSpaceFromNode(n, &source, implicitNamespace, &n);
-	if( outNamespace == 0 )
-		return asINVALID_DECLARATION;
-
-	// Find name
-	outName.Assign(&source.code[n->tokenPos], n->tokenLength);
-
-	// Initialize a script variable object for registration
-	outDt = CreateDataTypeFromNode(node->firstChild, &source, implicitNamespace);
-
-	if( numErrors > 0 || numWarnings > 0 )
-		return asINVALID_DECLARATION;
-
-	return 0;
-}
-
-int asCBuilder::CheckNameConflictMember(asCTypeInfo *t, const char *name, asCScriptNode *node, asCScriptCode *code, bool isProperty)
-{
-	// It's not necessary to check against object types
-
-	asCObjectType *ot = t->CastToObjectType();
-	if (!ot)
-		return 0;
-
-	// TODO: optimize: Improve linear search
-	asCArray<asCObjectProperty *> &props = ot->properties;
-	for( asUINT n = 0; n < props.GetLength(); n++ )
-	{
-		if( props[n]->name == name )
-		{
-			if( code )
-			{
-				asCString str;
-				str.Format(TXT_NAME_CONFLICT_s_OBJ_PROPERTY, name);
-				WriteError(str, code, node);
-			}
-
-			return -1;
-		}
-	}
-
-	asCArray<asCFuncdefType*> &funcdefs = ot->childFuncDefs;
-	for (asUINT n = 0; n < funcdefs.GetLength(); n++)
-	{
-		if (funcdefs[n]->name == name)
-		{
-			if (code)
-			{
-				asCString str;
-				str.Format(TXT_NAME_CONFLICT_s_IS_FUNCDEF, name);
-				WriteError(str, code, node);
-			}
-
-			return -1;
-		}
-	}
-
-	// Property names must be checked against method names
-	if( isProperty )
-	{
-		asCArray<int> methods = ot->methods;
-		for( asUINT n = 0; n < methods.GetLength(); n++ )
-		{
-			if( engine->scriptFunctions[methods[n]]->name == name )
-			{
-				if( code )
-				{
-					asCString str;
-					str.Format(TXT_NAME_CONFLICT_s_METHOD, name);
-					WriteError(str, code, node);
-				}
-
-				return -1;
-			}
-		}
-	}
-
-	return 0;
-}
-
-int asCBuilder::CheckNameConflict(const char *name, asCScriptNode *node, asCScriptCode *code, asSNameSpace *ns)
-{
-	// Check against registered object types
-	// TODO: Must check against registered funcdefs too
-	if( engine->GetRegisteredType(name, ns) != 0 )
-	{
-		if( code )
-		{
-			asCString str;
-			str.Format(TXT_NAME_CONFLICT_s_EXTENDED_TYPE, name);
-			WriteError(str, code, node);
-		}
-
-		return -1;
-	}
-
-	// Check against global properties
-	if( DoesGlobalPropertyExist(name, ns) )
-	{
-		if( code )
-		{
-			asCString str;
-			str.Format(TXT_NAME_CONFLICT_s_GLOBAL_PROPERTY, name);
-			WriteError(str, code, node);
-		}
-
-		return -1;
-	}
-
-	// TODO: Property names must be checked against function names
-
-#ifndef AS_NO_COMPILER
-	// Check against class types
-	asUINT n;
-	for( n = 0; n < classDeclarations.GetLength(); n++ )
-	{
-		if( classDeclarations[n]->name == name &&
-			classDeclarations[n]->typeInfo->nameSpace == ns )
-		{
-			if( code )
-			{
-				asCString str;
-				str.Format(TXT_NAME_CONFLICT_s_STRUCT, name);
-				WriteError(str, code, node);
-			}
-
-			return -1;
-		}
-	}
-
-	// Check against named types
-	for( n = 0; n < namedTypeDeclarations.GetLength(); n++ )
-	{
-		if( namedTypeDeclarations[n]->name == name &&
-			namedTypeDeclarations[n]->typeInfo->nameSpace == ns )
-		{
-			if( code )
-			{
-				asCString str;
-				str.Format(TXT_NAME_CONFLICT_s_IS_NAMED_TYPE, name);
-				WriteError(str, code, node);
-			}
-
-			return -1;
-		}
-	}
-
-	// Must check for name conflicts with funcdefs
-	for( n = 0; n < funcDefs.GetLength(); n++ )
-	{
-		if( funcDefs[n]->name == name &&
-			module->funcDefs[funcDefs[n]->idx]->nameSpace == ns )
-		{
-			if( code )
-			{
-				asCString str;
-				str.Format(TXT_NAME_CONFLICT_s_IS_FUNCDEF, name);
-				WriteError(str, code, node);
-			}
-
-			return -1;
-		}
-	}
-
-	// Check against mixin classes
-	if( GetMixinClass(name, ns) )
-	{
-		if( code )
-		{
-			asCString str;
-			str.Format(TXT_NAME_CONFLICT_s_IS_MIXIN, name);
-			WriteError(str, code, node);
-		}
-
-		return -1;
-	}
-#endif
-
-	return 0;
-}
-
-#ifndef AS_NO_COMPILER
-sMixinClass *asCBuilder::GetMixinClass(const char *name, asSNameSpace *ns)
-{
-	for( asUINT n = 0; n < mixinClasses.GetLength(); n++ )
-		if( mixinClasses[n]->name == name &&
-			mixinClasses[n]->ns == ns )
-			return mixinClasses[n];
-
-	return 0;
-}
-
-int asCBuilder::RegisterFuncDef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns, asCObjectType *parent)
-{
-	// namespace and parent are exclusively mutual
-	asASSERT((ns == 0 && parent) || (ns && parent == 0));
-
-	// TODO: redesign: Allow funcdefs to be explicitly declared as 'shared'. In this case
-	//                 an error should be given if any of the arguments/return type is not
-	//                 shared.
-
-	// Find the name
-	asASSERT( node->firstChild->nodeType == snDataType );
-	asCScriptNode *n = node->firstChild->next->next;
-
-	asCString name;
-	name.Assign(&file->code[n->tokenPos], n->tokenLength);
-
-	// Check for name conflict with other types
-	if (ns)
-	{
-		int r = CheckNameConflict(name.AddressOf(), node, file, ns);
-		if (asSUCCESS != r)
-		{
-			node->Destroy(engine);
-			return r;
-		}
-	}
-	else
-	{
-		int r = CheckNameConflictMember(parent, name.AddressOf(), node, file, false);
-		if (asSUCCESS != r)
-		{
-			node->Destroy(engine);
-			return r;
-		}
-	}
-
-	// The function definition should be stored as a asCScriptFunction so that the application
-	// can use the asIScriptFunction interface to enumerate the return type and parameters
-
-	// The return type and parameter types aren't determined in this function. A second pass is
-	// necessary after all type declarations have been identified. The second pass is implemented
-	// in CompleteFuncDef().
-
-	sFuncDef *fd = asNEW(sFuncDef);
-	if( fd == 0 )
-	{
-		node->Destroy(engine);
-		return asOUT_OF_MEMORY;
-	}
-
-	fd->name   = name;
-	fd->node   = node;
-	fd->script = file;
-	fd->idx    = module->AddFuncDef(name, ns, parent);
-
-	funcDefs.PushLast(fd);
-
-	return 0;
-}
-
-void asCBuilder::CompleteFuncDef(sFuncDef *funcDef)
-{
-	asCArray<asCString *>      defaultArgs;
-	bool                       isConstMethod;
-	bool                       isConstructor;
-	bool                       isDestructor;
-	bool                       isProtected;
-	bool                       isPrivate;
-	bool                       isOverride;
-	bool                       isFinal;
-	bool                       isShared;
-
-	asCFuncdefType *fdt = module->funcDefs[funcDef->idx];
-	asASSERT( fdt );
-	asCScriptFunction *func = fdt->funcdef;
-
-	// TODO: It should be possible to declare funcdef as shared. In this case a compiler error will be given if any of the types it uses are not shared
-	asSNameSpace *implicitNs = func->nameSpace ? func->nameSpace : fdt->parentClass->nameSpace;
-	GetParsedFunctionDetails(funcDef->node, funcDef->script, fdt->parentClass, funcDef->name, func->returnType, func->parameterNames, func->parameterTypes, func->inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared, implicitNs);
-
-	// There should not be any defaultArgs, but if there are any we need to delete them to avoid leaks
-	for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-		if( defaultArgs[n] )
-			asDELETE(defaultArgs[n], asCString);
-
-	// All funcdefs are shared, unless one of the parameter types or return type is not shared
-	isShared = true;
-	if( func->returnType.GetTypeInfo() && !func->returnType.GetTypeInfo()->IsShared() )
-		isShared = false;
-	for( asUINT n = 0; isShared && n < func->parameterTypes.GetLength(); n++ )
-		if( func->parameterTypes[n].GetTypeInfo() && !func->parameterTypes[n].GetTypeInfo()->IsShared() )
-			isShared = false;
-	func->isShared = isShared;
-
-	// Check if there is another identical funcdef from another module and if so reuse that instead
-	if( func->isShared )
-	{
-		for( asUINT n = 0; n < engine->funcDefs.GetLength(); n++ )
-		{
-			asCFuncdefType *fdt2 = engine->funcDefs[n];
-			if( fdt2 == 0 || fdt == fdt2 )
-				continue;
-
-			if( !fdt2->funcdef->isShared )
-				continue;
-
-			if( fdt2->name == fdt->name &&
-				fdt2->nameSpace == fdt->nameSpace &&
-				fdt2->funcdef->IsSignatureExceptNameEqual(func) )
-			{
-				// Replace our funcdef for the existing one
-				funcDef->idx = fdt2->funcdef->id;
-				module->funcDefs[module->funcDefs.IndexOf(fdt)] = fdt2;
-				fdt2->AddRefInternal();
-
-				engine->funcDefs.RemoveValue(fdt);
-
-				fdt->ReleaseInternal();
-				break;
-			}
-		}
-	}
-}
-
-int asCBuilder::RegisterGlobalVar(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
-{
-	// Has the application disabled global vars?
-	if( engine->ep.disallowGlobalVars )
-		WriteError(TXT_GLOBAL_VARS_NOT_ALLOWED, file, node);
-
-	// What data type is it?
-	asCDataType type = CreateDataTypeFromNode(node->firstChild, file, ns);
-
-	if( !type.CanBeInstantiated() )
-	{
-		asCString str;
-		if( type.IsAbstractClass() )
-			str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, type.Format(ns).AddressOf());
-		else if( type.IsInterface() )
-			str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, type.Format(ns).AddressOf());
-		else
-			// TODO: Improve error message to explain why
-			str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format(ns).AddressOf());
-
-		WriteError(str, file, node);
-	}
-
-	asCScriptNode *n = node->firstChild->next;
-
-	while( n )
-	{
-		// Verify that the name isn't taken
-		asCString name(&file->code[n->tokenPos], n->tokenLength);
-		CheckNameConflict(name.AddressOf(), n, file, ns);
-
-		// Register the global variable
-		sGlobalVariableDescription *gvar = asNEW(sGlobalVariableDescription);
-		if( gvar == 0 )
-		{
-			node->Destroy(engine);
-			return asOUT_OF_MEMORY;
-		}
-
-		gvar->script      = file;
-		gvar->name        = name;
-		gvar->isCompiled  = false;
-		gvar->datatype    = type;
-		gvar->isEnumValue = false;
-		gvar->ns          = ns;
-
-		// TODO: Give error message if wrong
-		asASSERT(!gvar->datatype.IsReference());
-
-		// Allocation is done when the variable is compiled, to allow for autos
-		gvar->property = 0;
-		gvar->index    = 0;
-
-		globVariables.Put(gvar);
-
-
-		gvar->declaredAtNode = n;
-		n = n->next;
-		gvar->declaredAtNode->DisconnectParent();
-		gvar->initializationNode = 0;
-		if( n &&
-			( n->nodeType == snAssignment ||
-			  n->nodeType == snArgList    ||
-			  n->nodeType == snInitList     ) )
-		{
-			gvar->initializationNode = n;
-			n = n->next;
-			gvar->initializationNode->DisconnectParent();
-		}
-	}
-
-	node->Destroy(engine);
-
-	return 0;
-}
-
-int asCBuilder::RegisterMixinClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
-{
-	asCScriptNode *cl = node->firstChild;
-	asASSERT( cl->nodeType == snClass );
-
-	asCScriptNode *n = cl->firstChild;
-
-	// Skip potential 'final' and 'shared' tokens
-	while( n->tokenType == ttIdentifier &&
-		   (file->TokenEquals(n->tokenPos, n->tokenLength, FINAL_TOKEN) ||
-		    file->TokenEquals(n->tokenPos, n->tokenLength, SHARED_TOKEN)) )
-	{
-		// Report error, because mixin class cannot be final or shared
-		asCString msg;
-		msg.Format(TXT_MIXIN_CANNOT_BE_DECLARED_AS_s, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
-		WriteError(msg, file, n);
-
-		asCScriptNode *tmp = n;
-		n = n->next;
-
-		// Remove the invalid node, so compilation can continue as if it wasn't there
-		tmp->DisconnectParent();
-		tmp->Destroy(engine);
-	}
-
-	asCString name(&file->code[n->tokenPos], n->tokenLength);
-
-	int r, c;
-	file->ConvertPosToRowCol(n->tokenPos, &r, &c);
-
-	CheckNameConflict(name.AddressOf(), n, file, ns);
-
-	sMixinClass *decl = asNEW(sMixinClass);
-	if( decl == 0 )
-	{
-		node->Destroy(engine);
-		return asOUT_OF_MEMORY;
-	}
-
-	mixinClasses.PushLast(decl);
-	decl->name   = name;
-	decl->ns     = ns;
-	decl->node   = cl;
-	decl->script = file;
-
-	// Clean up memory
-	cl->DisconnectParent();
-	node->Destroy(engine);
-
-	// Check that the mixin class doesn't contain any child types
-	// TODO: Add support for child types in mixin classes
-	n = cl->firstChild;
-	while (n)
-	{
-		if (n->nodeType == snFuncDef)
-		{
-			WriteError(TXT_MIXIN_CANNOT_HAVE_CHILD_TYPES, file, n);
-			break;
-		}
-		n = n->next;
-	}
-
-	return 0;
-}
-
-int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
-{
-	asCScriptNode *n = node->firstChild;
-	bool isFinal = false;
-	bool isShared = false;
-	bool isAbstract = false;
-
-	// Check the class modifiers
-	while( n->tokenType == ttIdentifier )
-	{
-		if( file->TokenEquals(n->tokenPos, n->tokenLength, FINAL_TOKEN) )
-		{
-			if( isAbstract )
-				WriteError(TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT, file, n);
-			else
-			{
-				if( isFinal )
-				{
-					asCString msg;
-					msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
-					WriteWarning(msg, file, n);
-				}
-				isFinal = true;
-			}
-		}
-		else if( file->TokenEquals(n->tokenPos, n->tokenLength, SHARED_TOKEN) )
-		{
-			if( isShared )
-			{
-				asCString msg;
-				msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
-				WriteWarning(msg, file, n);
-			}
-			isShared = true;
-		}
-		else if( file->TokenEquals(n->tokenPos, n->tokenLength, ABSTRACT_TOKEN) )
-		{
-			if( isFinal )
-				WriteError(TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT, file, n);
-			else
-			{
-				if( isAbstract )
-				{
-					asCString msg;
-					msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
-					WriteWarning(msg, file, n);
-				}
-				isAbstract = true;
-			}
-		}
-		else
-		{
-			// This is the name of the class
-			break;
-		}
-
-		n = n->next;
-	}
-
-	asCString name(&file->code[n->tokenPos], n->tokenLength);
-
-	int r, c;
-	file->ConvertPosToRowCol(n->tokenPos, &r, &c);
-
-	CheckNameConflict(name.AddressOf(), n, file, ns);
-
-	sClassDeclaration *decl = asNEW(sClassDeclaration);
-	if( decl == 0 )
-	{
-		node->Destroy(engine);
-		return asOUT_OF_MEMORY;
-	}
-
-	classDeclarations.PushLast(decl);
-	decl->name             = name;
-	decl->script           = file;
-	decl->node             = node;
-	asCObjectType *st = 0;
-
-	// If this type is shared and there already exist another shared
-	// type of the same name, then that one should be used instead of
-	// creating a new one.
-	if( isShared )
-	{
-		for( asUINT i = 0; i < engine->sharedScriptTypes.GetLength(); i++ )
-		{
-			st = engine->sharedScriptTypes[i]->CastToObjectType();
-			if( st &&
-				st->IsShared() &&
-				st->name == name &&
-				st->nameSpace == ns &&
-				!st->IsInterface() )
-			{
-				// We'll use the existing type
-				decl->isExistingShared = true;
-				decl->typeInfo         = st;
-				module->classTypes.PushLast(st);
-				st->AddRefInternal();
-				break;
-			}
-		}
-	}
-
-	if (!decl->isExistingShared)
-	{
-		// Create a new object type for this class
-		st = asNEW(asCObjectType)(engine);
-		if (st == 0)
-			return asOUT_OF_MEMORY;
-
-		// By default all script classes are marked as garbage collected.
-		// Only after the complete structure and relationship between classes
-		// is known, can the flag be cleared for those objects that truly cannot
-		// form circular references. This is important because a template
-		// callback may be called with a script class before the compilation
-		// completes, and until it is known, the callback must assume the class
-		// is garbage collected.
-		st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT | asOBJ_GC;
-
-		if (isShared)
-			st->flags |= asOBJ_SHARED;
-
-		if (isFinal)
-			st->flags |= asOBJ_NOINHERIT;
-
-		if (isAbstract)
-			st->flags |= asOBJ_ABSTRACT;
-
-		if (node->tokenType == ttHandle)
-			st->flags |= asOBJ_IMPLICIT_HANDLE;
-
-		st->size = sizeof(asCScriptObject);
-		st->name = name;
-		st->nameSpace = ns;
-		st->module = module;
-		module->classTypes.PushLast(st);
-		if (isShared)
-		{
-			engine->sharedScriptTypes.PushLast(st);
-			st->AddRefInternal();
-		}
-		decl->typeInfo = st;
-
-		// Use the default script class behaviours
-		st->beh = engine->scriptTypeBehaviours.beh;
-
-		// TODO: Move this to asCObjectType so that the asCRestore can reuse it
-		engine->scriptFunctions[st->beh.addref]->AddRefInternal();
-		engine->scriptFunctions[st->beh.release]->AddRefInternal();
-		engine->scriptFunctions[st->beh.gcEnumReferences]->AddRefInternal();
-		engine->scriptFunctions[st->beh.gcGetFlag]->AddRefInternal();
-		engine->scriptFunctions[st->beh.gcGetRefCount]->AddRefInternal();
-		engine->scriptFunctions[st->beh.gcReleaseAllReferences]->AddRefInternal();
-		engine->scriptFunctions[st->beh.gcSetFlag]->AddRefInternal();
-		engine->scriptFunctions[st->beh.copy]->AddRefInternal();
-		engine->scriptFunctions[st->beh.factory]->AddRefInternal();
-		engine->scriptFunctions[st->beh.construct]->AddRefInternal();
-		// TODO: weak: Should not do this if the class has been declared with noweak
-		engine->scriptFunctions[st->beh.getWeakRefFlag]->AddRefInternal();
-
-		// Skip to the content of the class
-		while (n && n->nodeType == snIdentifier)
-			n = n->next;
-	}
-
-	// Register possible child types
-	while (n)
-	{
-		node = n->next;
-		if (n->nodeType == snFuncDef)
-		{
-			n->DisconnectParent();
-			if (!decl->isExistingShared)
-				RegisterFuncDef(n, file, 0, st);
-			else
-			{
-				// Destroy the node, since it won't be used
-				// TODO: Should verify that the funcdef is identical to the one in the existing shared class
-				n->Destroy(engine);
-			}
-		}
-		n = node;
-	}
-
-	return 0;
-}
-
-int asCBuilder::RegisterInterface(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
-{
-	asCScriptNode *n = node->firstChild;
-	asCString name(&file->code[n->tokenPos], n->tokenLength);
-
-	bool isShared = false;
-	if( name == SHARED_TOKEN )
-	{
-		isShared = true;
-
-		n = n->next;
-		name.Assign(&file->code[n->tokenPos], n->tokenLength);
-	}
-
-	int r, c;
-	file->ConvertPosToRowCol(n->tokenPos, &r, &c);
-
-	CheckNameConflict(name.AddressOf(), n, file, ns);
-
-	sClassDeclaration *decl = asNEW(sClassDeclaration);
-	if( decl == 0 )
-	{
-		node->Destroy(engine);
-		return asOUT_OF_MEMORY;
-	}
-
-	interfaceDeclarations.PushLast(decl);
-	decl->name             = name;
-	decl->script           = file;
-	decl->node             = node;
-
-	// If this type is shared and there already exist another shared
-	// type of the same name, then that one should be used instead of
-	// creating a new one.
-	if( isShared )
-	{
-		for( asUINT i = 0; i < engine->sharedScriptTypes.GetLength(); i++ )
-		{
-			asCObjectType *st = engine->sharedScriptTypes[i]->CastToObjectType();
-			if( st &&
-				st->IsShared() &&
-				st->name == name &&
-				st->nameSpace == ns &&
-				st->IsInterface() )
-			{
-				// We'll use the existing type
-				decl->isExistingShared = true;
-				decl->typeInfo = st;
-				module->classTypes.PushLast(st);
-				st->AddRefInternal();
-				return 0;
-			}
-		}
-	}
-
-	// Register the object type for the interface
-	asCObjectType *st = asNEW(asCObjectType)(engine);
-	if( st == 0 )
-		return asOUT_OF_MEMORY;
-
-	st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT;
-
-	if( isShared )
-		st->flags |= asOBJ_SHARED;
-
-	st->size = 0; // Cannot be instantiated
-	st->name = name;
-	st->nameSpace = ns;
-	st->module = module;
-	module->classTypes.PushLast(st);
-	if( isShared )
-	{
-		engine->sharedScriptTypes.PushLast(st);
-		st->AddRefInternal();
-	}
-	decl->typeInfo = st;
-
-	// Use the default script class behaviours
-	st->beh.construct = 0;
-	st->beh.addref = engine->scriptTypeBehaviours.beh.addref;
-	engine->scriptFunctions[st->beh.addref]->AddRefInternal();
-	st->beh.release = engine->scriptTypeBehaviours.beh.release;
-	engine->scriptFunctions[st->beh.release]->AddRefInternal();
-	st->beh.copy = 0;
-
-	return 0;
-}
-
-void asCBuilder::CompileGlobalVariables()
-{
-	bool compileSucceeded = true;
-
-	// Store state of compilation (errors, warning, output)
-	int currNumErrors   = numErrors;
-	int currNumWarnings = numWarnings;
-
-	// Backup the original message stream
-	bool                       msgCallback     = engine->msgCallback;
-	asSSystemFunctionInterface msgCallbackFunc = engine->msgCallbackFunc;
-	void                      *msgCallbackObj  = engine->msgCallbackObj;
-
-	// Set the new temporary message stream
-	asCOutputBuffer outBuffer;
-	engine->SetMessageCallback(asMETHOD(asCOutputBuffer, Callback), &outBuffer, asCALL_THISCALL);
-
-	asCOutputBuffer finalOutput;
-	asCScriptFunction *initFunc = 0;
-
-	asCSymbolTable<asCGlobalProperty> initOrder;
-
-	// We first try to compile all the primitive global variables, and only after that
-	// compile the non-primitive global variables. This permits the constructors
-	// for the complex types to use the already initialized variables of primitive
-	// type. Note, we currently don't know which global variables are used in the
-	// constructors, so we cannot guarantee that variables of complex types are
-	// initialized in the correct order, so we won't reorder those.
-	bool compilingPrimitives = true;
-
-	// Compile each global variable
-	while( compileSucceeded )
-	{
-		compileSucceeded = false;
-
-		int accumErrors = 0;
-		int accumWarnings = 0;
-
-		// Restore state of compilation
-		finalOutput.Clear();
-		asCSymbolTable<sGlobalVariableDescription>::iterator it = globVariables.List();
-		for( ; it; it++ )
-		{
-			sGlobalVariableDescription *gvar = *it;
-			if( gvar->isCompiled )
-				continue;
-
-			asCByteCode init(engine);
-			numWarnings = 0;
-			numErrors = 0;
-			outBuffer.Clear();
-
-			// Skip this for now if we're not compiling complex types yet
-			if( compilingPrimitives && !gvar->datatype.IsPrimitive() )
-				continue;
-
-			if( gvar->declaredAtNode )
-			{
-				int r, c;
-				gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &r, &c);
-				asCString str = gvar->datatype.Format(gvar->ns);
-				str += " " + gvar->name;
-				str.Format(TXT_COMPILING_s, str.AddressOf());
-				WriteInfo(gvar->script->name, str, r, c, true);
-			}
-
-			if( gvar->isEnumValue )
-			{
-				int r;
-				if( gvar->initializationNode )
-				{
-					asCCompiler comp(engine);
-					asCScriptFunction func(engine, module, asFUNC_SCRIPT);
-
-					// Set the namespace that should be used during the compilation
-					func.nameSpace = gvar->datatype.GetTypeInfo()->nameSpace;
-
-					// Temporarily switch the type of the variable to int so it can be compiled properly
-					asCDataType saveType;
-					saveType = gvar->datatype;
-					gvar->datatype = asCDataType::CreatePrimitive(ttInt, true);
-					r = comp.CompileGlobalVariable(this, gvar->script, gvar->initializationNode, gvar, &func);
-					gvar->datatype = saveType;
-
-					// Make the function a dummy so it doesn't try to release objects while destroying the function
-					func.funcType = asFUNC_DUMMY;
-				}
-				else
-				{
-					r = 0;
-
-					// When there is no assignment the value is the last + 1
-					int enumVal = 0;
-					asCSymbolTable<sGlobalVariableDescription>::iterator prev_it = it;
-					prev_it--;
-					if( prev_it )
-					{
-						sGlobalVariableDescription *gvar2 = *prev_it;
-						if(gvar2->datatype == gvar->datatype )
-						{
-							// The integer value is stored in the lower bytes
-							enumVal = (*(int*)&gvar2->constantValue) + 1;
-
-							if( !gvar2->isCompiled )
-							{
-								int row, col;
-								gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &row, &col);
-
-								asCString str = gvar->datatype.Format(gvar->ns);
-								str += " " + gvar->name;
-								str.Format(TXT_COMPILING_s, str.AddressOf());
-								WriteInfo(gvar->script->name, str, row, col, true);
-
-								str.Format(TXT_UNINITIALIZED_GLOBAL_VAR_s, gvar2->name.AddressOf());
-								WriteError(gvar->script->name, str, row, col);
-								r = -1;
-							}
-						}
-					}
-
-					// The integer value is stored in the lower bytes
-					*(int*)&gvar->constantValue = enumVal;
-				}
-
-				if( r >= 0 )
-				{
-					// Set the value as compiled
-					gvar->isCompiled = true;
-					compileSucceeded = true;
-				}
-			}
-			else
-			{
-				// Compile the global variable
-				initFunc = asNEW(asCScriptFunction)(engine, module, asFUNC_SCRIPT);
-				if( initFunc == 0 )
-				{
-					// Out of memory
-					return;
-				}
-
-				// Set the namespace that should be used for this function
-				initFunc->nameSpace = gvar->ns;
-
-				asCCompiler comp(engine);
-				int r = comp.CompileGlobalVariable(this, gvar->script, gvar->initializationNode, gvar, initFunc);
-				if( r >= 0 )
-				{
-					// Compilation succeeded
-					gvar->isCompiled = true;
-					compileSucceeded = true;
-				}
-				else
-				{
-					// Compilation failed
-					initFunc->funcType = asFUNC_DUMMY;
-					asDELETE(initFunc, asCScriptFunction);
-					initFunc = 0;
-				}
-			}
-
-			if( gvar->isCompiled )
-			{
-				// Add warnings for this constant to the total build
-				if( numWarnings )
-				{
-					currNumWarnings += numWarnings;
-					if( msgCallback )
-						outBuffer.SendToCallback(engine, &msgCallbackFunc, msgCallbackObj);
-				}
-
-				// Determine order of variable initializations
-				if( gvar->property && !gvar->isEnumValue )
-					initOrder.Put(gvar->property);
-
-				// Does the function contain more than just a SUSPEND followed by a RET instruction?
-				if( initFunc && initFunc->scriptData->byteCode.GetLength() > 2 )
-				{
-					// Create the init function for this variable
-					initFunc->id = engine->GetNextScriptFunctionId();
-					engine->AddScriptFunction(initFunc);
-
-					// Finalize the init function for this variable
-					initFunc->returnType = asCDataType::CreatePrimitive(ttVoid, false);
-					initFunc->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(gvar->script->name.AddressOf());
-					if( gvar->declaredAtNode )
-					{
-						int row, col;
-						gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &row, &col);
-						initFunc->scriptData->declaredAt = (row & 0xFFFFF)|((col & 0xFFF)<<20);
-					}
-
-					gvar->property->SetInitFunc(initFunc);
-
-					initFunc->ReleaseInternal();
-					initFunc = 0;
-				}
-				else if( initFunc )
-				{
-					// Destroy the function as it won't be used
-					initFunc->funcType = asFUNC_DUMMY;
-					asDELETE(initFunc, asCScriptFunction);
-					initFunc = 0;
-				}
-
-				// Convert enums to true enum values, so subsequent compilations can access it as an enum
-				if( gvar->isEnumValue )
-				{
-					asCEnumType *enumType = gvar->datatype.GetTypeInfo()->CastToEnumType();
-					asASSERT(NULL != enumType);
-
-					asSEnumValue *e = asNEW(asSEnumValue);
-					if( e == 0 )
-					{
-						// Out of memory
-						numErrors++;
-						return;
-					}
-
-					e->name = gvar->name;
-					e->value = *(int*)&gvar->constantValue;
-
-					enumType->enumValues.PushLast(e);
-				}
-			}
-			else
-			{
-				// Add output to final output
-				finalOutput.Append(outBuffer);
-				accumErrors += numErrors;
-				accumWarnings += numWarnings;
-			}
-
-			engine->preMessage.isSet = false;
-		}
-
-		if( !compileSucceeded )
-		{
-			if( compilingPrimitives )
-			{
-				// No more primitives could be compiled, so
-				// switch to compiling the complex variables
-				compilingPrimitives = false;
-				compileSucceeded    = true;
-			}
-			else
-			{
-				// No more variables can be compiled
-				// Add errors and warnings to total build
-				currNumWarnings += accumWarnings;
-				currNumErrors   += accumErrors;
-				if( msgCallback )
-					finalOutput.SendToCallback(engine, &msgCallbackFunc, msgCallbackObj);
-			}
-		}
-	}
-
-	// Restore states
-	engine->msgCallback     = msgCallback;
-	engine->msgCallbackFunc = msgCallbackFunc;
-	engine->msgCallbackObj  = msgCallbackObj;
-
-	numWarnings = currNumWarnings;
-	numErrors   = currNumErrors;
-
-	// Set the correct order of initialization
-	if( numErrors == 0 )
-	{
-		// If the length of the arrays are not the same, then this is the compilation
-		// of a single variable, in which case the initialization order of the previous
-		// variables must be preserved.
-		if( module->scriptGlobals.GetSize() == initOrder.GetSize() )
-			module->scriptGlobals.SwapWith(initOrder);
-	}
-
-	// Delete the enum expressions
-	asCSymbolTableIterator<sGlobalVariableDescription> it = globVariables.List();
-	while( it )
-	{
-		sGlobalVariableDescription *gvar = *it;
-		if( gvar->isEnumValue )
-		{
-			// Remove from symboltable. This has to be done prior to freeing the memeory
-			globVariables.Erase(it.GetIndex());
-
-			// Destroy the gvar property
-			if( gvar->declaredAtNode )
-			{
-				gvar->declaredAtNode->Destroy(engine);
-				gvar->declaredAtNode = 0;
-			}
-			if( gvar->initializationNode )
-			{
-				gvar->initializationNode->Destroy(engine);
-				gvar->initializationNode = 0;
-			}
-			if( gvar->property )
-			{
-				asDELETE(gvar->property, asCGlobalProperty);
-				gvar->property = 0;
-			}
-
-			asDELETE(gvar, sGlobalVariableDescription);
-		}
-		else
-			it++;
-	}
-}
-
-int asCBuilder::GetNamespaceAndNameFromNode(asCScriptNode *n, asCScriptCode *script, asSNameSpace *implicitNs, asSNameSpace *&outNs, asCString &outName)
-{
-	// TODO: child funcdef: The node might be a snScope now
-	asASSERT( n->nodeType == snIdentifier );
-
-	// Get the optional scope from the node
-	// TODO: child funcdef: The parentType will be set if the scope is actually a type rather than a namespace
-	asSNameSpace *ns = GetNameSpaceFromNode(n->firstChild, script, implicitNs, 0);
-	if( ns == 0 )
-		return -1;
-
-	// Get the name
-	asCString name(&script->code[n->lastChild->tokenPos], n->lastChild->tokenLength);
-
-	outNs = ns;
-	outName = name;
-
-	return 0;
-}
-
-void asCBuilder::AddInterfaceFromMixinToClass(sClassDeclaration *decl, asCScriptNode *errNode, sMixinClass *mixin)
-{
-	// Determine what interfaces that the mixin implements
-	asCScriptNode *node = mixin->node;
-	asASSERT(node->nodeType == snClass);
-
-	// Skip the name of the mixin
-	node = node->firstChild->next;
-
-
-	while( node && node->nodeType == snIdentifier )
-	{
-		bool ok = true;
-		asSNameSpace *ns;
-		asCString name;
-		if( GetNamespaceAndNameFromNode(node, mixin->script, mixin->ns, ns, name) < 0 )
-			ok = false;
-		else
-		{
-			// Find the object type for the interface
-			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
-
-			// Check that the object type is an interface
-			if( objType && objType->IsInterface() )
-			{
-				// Only add the interface if the class doesn't already implement it
-				if( !decl->typeInfo->Implements(objType) )
-					AddInterfaceToClass(decl, errNode, objType);
-			}
-			else
-			{
-				WriteError(TXT_MIXIN_CLASS_CANNOT_INHERIT, mixin->script, node);
-				ok = false;
-			}
-		}
-
-		if( !ok )
-		{
-			// Remove this node so the error isn't reported again
-			asCScriptNode *delNode = node;
-			node = node->prev;
-			delNode->DisconnectParent();
-			delNode->Destroy(engine);
-		}
-
-		node = node->next;
-	}
-}
-
-void asCBuilder::AddInterfaceToClass(sClassDeclaration *decl, asCScriptNode *errNode, asCObjectType *intfType)
-{
-	// A shared type may only implement from shared interfaces
-	if( decl->typeInfo->IsShared() && !intfType->IsShared() )
-	{
-		asCString msg;
-		msg.Format(TXT_SHARED_CANNOT_IMPLEMENT_NON_SHARED_s, intfType->name.AddressOf());
-		WriteError(msg, decl->script, errNode);
-		return;
-	}
-
-	if( decl->isExistingShared )
-	{
-		// If the class is an existing shared class, then just check if the
-		// interface exists in the original declaration too
-		if( !decl->typeInfo->Implements(intfType) )
-		{
-			asCString str;
-			str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, decl->typeInfo->GetName());
-			WriteError(str, decl->script, errNode);
-			return;
-		}
-	}
-	else
-	{
-		// If the interface is already in the class then don't add it again
-		if( decl->typeInfo->Implements(intfType) )
-			return;
-
-		// Add the interface to the class
-		decl->typeInfo->CastToObjectType()->interfaces.PushLast(intfType);
-
-		// Add the inherited interfaces too
-		// For interfaces this will be done outside to handle out-of-order declarations
-		if( !decl->typeInfo->CastToObjectType()->IsInterface() )
-		{
-			for( asUINT n = 0; n < intfType->interfaces.GetLength(); n++ )
-				AddInterfaceToClass(decl, errNode, intfType->interfaces[n]);
-		}
-	}
-}
-
-void asCBuilder::CompileInterfaces()
-{
-	asUINT n;
-
-	// Order the interfaces with inheritances so that the inherited
-	// of inherited interfaces can be added properly
-	for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
-	{
-		sClassDeclaration *intfDecl = interfaceDeclarations[n];
-		asCObjectType *intfType = intfDecl->typeInfo->CastToObjectType();
-
-		if( intfType->interfaces.GetLength() == 0 ) continue;
-
-		// If any of the derived interfaces are found after this interface, then move this to the end of the list
-		for( asUINT m = n+1; m < interfaceDeclarations.GetLength(); m++ )
-		{
-			if( intfType->Implements(interfaceDeclarations[m]->typeInfo) )
-			{
-				interfaceDeclarations.RemoveIndex(n);
-				interfaceDeclarations.PushLast(intfDecl);
-
-				// Decrease index so that we don't skip an entry
-				n--;
-				break;
-			}
-		}
-	}
-
-	// Now recursively add the additional inherited interfaces
-	for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
-	{
-		sClassDeclaration *intfDecl = interfaceDeclarations[n];
-		asCObjectType *intfType = intfDecl->typeInfo->CastToObjectType();
-
-		// TODO: Is this really at the correct place? Hasn't the vfTableIdx already been set here?
-		// Co-opt the vfTableIdx value in our own methods to indicate the
-		// index the function should have in the table chunk for this interface.
-		for( asUINT d = 0; d < intfType->methods.GetLength(); d++ )
-		{
-			asCScriptFunction *func = GetFunctionDescription(intfType->methods[d]);
-			func->vfTableIdx = d;
-
-			asASSERT(func->objectType == intfType);
-		}
-
-		// As new interfaces will be added to the end of the list, all
-		// interfaces will be traversed the same as recursively
-		for( asUINT m = 0; m < intfType->interfaces.GetLength(); m++ )
-		{
-			asCObjectType *base = intfType->interfaces[m];
-
-			// Add any interfaces not already implemented
-			for( asUINT l = 0; l < base->interfaces.GetLength(); l++ )
-				AddInterfaceToClass(intfDecl, intfDecl->node, base->interfaces[l]);
-
-			// Add the methods from the implemented interface
-			for( asUINT l = 0; l < base->methods.GetLength(); l++ )
-			{
-				// If the derived interface implements the same method, then don't add the base interface' method
-				asCScriptFunction *baseFunc = GetFunctionDescription(base->methods[l]);
-				asCScriptFunction *derivedFunc = 0;
-				bool found = false;
-				for( asUINT d = 0; d < intfType->methods.GetLength(); d++ )
-				{
-					derivedFunc = GetFunctionDescription(intfType->methods[d]);
-					if( derivedFunc->IsSignatureEqual(baseFunc) )
-					{
-						found = true;
-						break;
-					}
-				}
-
-				if( !found )
-				{
-					// Add the method
-					intfType->methods.PushLast(baseFunc->id);
-					baseFunc->AddRefInternal();
-				}
-			}
-		}
-	}
-}
-
-void asCBuilder::DetermineTypeRelations()
-{
-	// Determine inheritance between interfaces
-	for (asUINT n = 0; n < interfaceDeclarations.GetLength(); n++)
-	{
-		sClassDeclaration *intfDecl = interfaceDeclarations[n];
-		asCObjectType *intfType = intfDecl->typeInfo->CastToObjectType();
-
-		asCScriptNode *node = intfDecl->node;
-		asASSERT(node && node->nodeType == snInterface);
-		node = node->firstChild;
-
-		// Skip the 'shared' keyword
-		if (intfType->IsShared())
-			node = node->next;
-
-		// Skip the name
-		node = node->next;
-
-		// Verify the inherited interfaces
-		while (node && node->nodeType == snIdentifier)
-		{
-			asSNameSpace *ns;
-			asCString name;
-			if (GetNamespaceAndNameFromNode(node, intfDecl->script, intfType->nameSpace, ns, name) < 0)
-			{
-				node = node->next;
-				continue;
-			}
-
-			// Find the object type for the interface
-			asCObjectType *objType = 0;
-			while (ns)
-			{
-				objType = GetObjectType(name.AddressOf(), ns);
-				if (objType) break;
-
-				ns = engine->GetParentNameSpace(ns);
-			}
-
-			// Check that the object type is an interface
-			bool ok = true;
-			if (objType && objType->IsInterface())
-			{
-				// Check that the implemented interface is shared if the base interface is shared
-				if (intfType->IsShared() && !objType->IsShared())
-				{
-					asCString str;
-					str.Format(TXT_SHARED_CANNOT_IMPLEMENT_NON_SHARED_s, objType->GetName());
-					WriteError(str, intfDecl->script, node);
-					ok = false;
-				}
-			}
-			else
-			{
-				WriteError(TXT_INTERFACE_CAN_ONLY_IMPLEMENT_INTERFACE, intfDecl->script, node);
-				ok = false;
-			}
-
-			if (ok)
-			{
-				// Make sure none of the implemented interfaces implement from this one
-				asCObjectType *base = objType;
-				while (base != 0)
-				{
-					if (base == intfType)
-					{
-						WriteError(TXT_CANNOT_IMPLEMENT_SELF, intfDecl->script, node);
-						ok = false;
-						break;
-					}
-
-					// At this point there is at most one implemented interface
-					if (base->interfaces.GetLength())
-						base = base->interfaces[0];
-					else
-						break;
-				}
-			}
-
-			if (ok)
-				AddInterfaceToClass(intfDecl, node, objType);
-
-			// Remove the nodes so they aren't parsed again
-			asCScriptNode *delNode = node;
-			node = node->next;
-			delNode->DisconnectParent();
-			delNode->Destroy(engine);
-		}
-	}
-
-	// Determine class inheritances and interfaces
-	for (asUINT n = 0; n < classDeclarations.GetLength(); n++)
-	{
-		sClassDeclaration *decl = classDeclarations[n];
-		asCScriptCode *file = decl->script;
-
-		// Find the base class that this class inherits from
-		bool multipleInheritance = false;
-		asCScriptNode *node = decl->node->firstChild;
-
-		while (file->TokenEquals(node->tokenPos, node->tokenLength, FINAL_TOKEN) ||
-			file->TokenEquals(node->tokenPos, node->tokenLength, SHARED_TOKEN) ||
-			file->TokenEquals(node->tokenPos, node->tokenLength, ABSTRACT_TOKEN))
-		{
-			node = node->next;
-		}
-
-		// Skip the name of the class
-		asASSERT(node->tokenType == ttIdentifier);
-		node = node->next;
-
-		while (node && node->nodeType == snIdentifier)
-		{
-			asSNameSpace *ns;
-			asCString name;
-			if (GetNamespaceAndNameFromNode(node, file, decl->typeInfo->nameSpace, ns, name) < 0)
-			{
-				node = node->next;
-				continue;
-			}
-
-			// Find the object type for the interface
-			asCObjectType *objType = 0;
-			sMixinClass *mixin = 0;
-			asSNameSpace *origNs = ns;
-			while (ns)
-			{
-				objType = GetObjectType(name.AddressOf(), ns);
-				if (objType == 0)
-					mixin = GetMixinClass(name.AddressOf(), ns);
-
-				if (objType || mixin)
-					break;
-
-				ns = engine->GetParentNameSpace(ns);
-			}
-
-			if (objType == 0 && mixin == 0)
-			{
-				asCString str;
-				if (origNs->name == "")
-					str.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS, name.AddressOf());
-				else
-					str.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, name.AddressOf(), origNs->name.AddressOf());
-				WriteError(str, file, node);
-			}
-			else if (mixin)
-			{
-				AddInterfaceFromMixinToClass(decl, node, mixin);
-			}
-			else if (!(objType->flags & asOBJ_SCRIPT_OBJECT) ||
-				(objType->flags & asOBJ_NOINHERIT))
-			{
-				// Either the class is not a script class or interface
-				// or the class has been declared as 'final'
-				asCString str;
-				str.Format(TXT_CANNOT_INHERIT_FROM_s_FINAL, objType->name.AddressOf());
-				WriteError(str, file, node);
-			}
-			else if (objType->size != 0)
-			{
-				// The class inherits from another script class
-				if (!decl->isExistingShared && decl->typeInfo->CastToObjectType()->derivedFrom != 0)
-				{
-					if (!multipleInheritance)
-					{
-						WriteError(TXT_CANNOT_INHERIT_FROM_MULTIPLE_CLASSES, file, node);
-						multipleInheritance = true;
-					}
-				}
-				else
-				{
-					// Make sure none of the base classes inherit from this one
-					asCObjectType *base = objType;
-					bool error = false;
-					while (base != 0)
-					{
-						if (base == decl->typeInfo)
-						{
-							WriteError(TXT_CANNOT_INHERIT_FROM_SELF, file, node);
-							error = true;
-							break;
-						}
-
-						base = base->derivedFrom;
-					}
-
-					if (!error)
-					{
-						// A shared type may only inherit from other shared types
-						if ((decl->typeInfo->IsShared()) && !(objType->IsShared()))
-						{
-							asCString msg;
-							msg.Format(TXT_SHARED_CANNOT_INHERIT_FROM_NON_SHARED_s, objType->name.AddressOf());
-							WriteError(msg, file, node);
-							error = true;
-						}
-					}
-
-					if (!error)
-					{
-						if (decl->isExistingShared)
-						{
-							// Verify that the base class is the same as the original shared type
-							if (decl->typeInfo->CastToObjectType()->derivedFrom != objType)
-							{
-								asCString str;
-								str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, decl->typeInfo->GetName());
-								WriteError(str, file, node);
-							}
-						}
-						else
-						{
-							// Set the base class
-							decl->typeInfo->CastToObjectType()->derivedFrom = objType;
-							objType->AddRefInternal();
-						}
-					}
-				}
-			}
-			else
-			{
-				// The class implements an interface
-				AddInterfaceToClass(decl, node, objType);
-			}
-
-			node = node->next;
-		}
-	}
-}
-
-// numTempl is the number of template instances that existed in the engine before the build begun
-void asCBuilder::CompileClasses(asUINT numTempl)
-{
-	asUINT n;
-	asCArray<sClassDeclaration*> toValidate((int)classDeclarations.GetLength());
-
-
-	// Order class declarations so that base classes are compiled before derived classes.
-	// This will allow the derived classes to copy properties and methods in the next step.
-	for( n = 0; n < classDeclarations.GetLength(); n++ )
-	{
-		sClassDeclaration *decl = classDeclarations[n];
-		asCObjectType *derived = decl->typeInfo->CastToObjectType();
-		asCObjectType *base = derived->derivedFrom;
-
-		if( base == 0 ) continue;
-
-		// If the base class is found after the derived class, then move the derived class to the end of the list
-		for( asUINT m = n+1; m < classDeclarations.GetLength(); m++ )
-		{
-			sClassDeclaration *declBase = classDeclarations[m];
-			if( base == declBase->typeInfo )
-			{
-				classDeclarations.RemoveIndex(n);
-				classDeclarations.PushLast(decl);
-
-				// Decrease index so that we don't skip an entry
-				n--;
-				break;
-			}
-		}
-	}
-
-	// Go through each of the classes and register the object type descriptions
-	for( n = 0; n < classDeclarations.GetLength(); n++ )
-	{
-		sClassDeclaration *decl = classDeclarations[n];
-		asCObjectType *ot = decl->typeInfo->CastToObjectType();
-		if( decl->isExistingShared )
-		{
-			// Set the declaration as validated already, so that other
-			// types that contain this will accept this type
-			decl->validState = 1;
-
-			// We'll still validate the declaration to make sure nothing new is
-			// added to the shared class that wasn't there in the previous
-			// compilation. We do not care if something that is there in the previous
-			// declaration is not included in the new declaration though.
-
-			asASSERT( ot->interfaces.GetLength() == ot->interfaceVFTOffsets.GetLength() );
-		}
-
-		// Methods included from mixin classes should take precedence over inherited methods
-		IncludeMethodsFromMixins(decl);
-
-		// Add all properties and methods from the base class
-		if( !decl->isExistingShared && ot->derivedFrom )
-		{
-			asCObjectType *baseType = ot->derivedFrom;
-
-			// The derived class inherits all interfaces from the base class
-			for( unsigned int m = 0; m < baseType->interfaces.GetLength(); m++ )
-			{
-				if( !ot->Implements(baseType->interfaces[m]) )
-					ot->interfaces.PushLast(baseType->interfaces[m]);
-			}
-
-			// TODO: Need to check for name conflict with new class methods
-
-			// Copy properties from base class to derived class
-			for( asUINT p = 0; p < baseType->properties.GetLength(); p++ )
-			{
-				asCObjectProperty *prop = AddPropertyToClass(decl, baseType->properties[p]->name, baseType->properties[p]->type, baseType->properties[p]->isPrivate, baseType->properties[p]->isProtected, true);
-
-				// The properties must maintain the same offset
-				asASSERT(prop && prop->byteOffset == baseType->properties[p]->byteOffset); UNUSED_VAR(prop);
-			}
-
-			// Copy methods from base class to derived class
-			for( asUINT m = 0; m < baseType->methods.GetLength(); m++ )
-			{
-				// If the derived class implements the same method, then don't add the base class' method
-				asCScriptFunction *baseFunc = GetFunctionDescription(baseType->methods[m]);
-				asCScriptFunction *derivedFunc = 0;
-				bool found = false;
-				for( asUINT d = 0; d < ot->methods.GetLength(); d++ )
-				{
-					derivedFunc = GetFunctionDescription(ot->methods[d]);
-					if( baseFunc->name == "opConv" || baseFunc->name == "opImplConv" ||
-						baseFunc->name == "opCast" || baseFunc->name == "opImplCast" )
-					{
-						// For the opConv and opCast methods, the return type can differ if they are different methods
-						if( derivedFunc->name == baseFunc->name &&
-							derivedFunc->IsSignatureExceptNameEqual(baseFunc) )
-						{
-							if( baseFunc->IsFinal() )
-							{
-								asCString msg;
-								msg.Format(TXT_METHOD_CANNOT_OVERRIDE_s, baseFunc->GetDeclaration());
-								WriteError(msg, decl->script, decl->node);
-							}
-
-							// Move the function from the methods array to the virtualFunctionTable
-							ot->methods.RemoveIndex(d);
-							ot->virtualFunctionTable.PushLast(derivedFunc);
-							found = true;
-							break;
-						}
-					}
-					else
-					{
-						if( derivedFunc->name == baseFunc->name &&
-							derivedFunc->IsSignatureExceptNameAndReturnTypeEqual(baseFunc) )
-						{
-							if( baseFunc->returnType != derivedFunc->returnType )
-							{
-								asCString msg;
-								msg.Format(TXT_DERIVED_METHOD_MUST_HAVE_SAME_RETTYPE_s, baseFunc->GetDeclaration());
-								WriteError(msg, decl->script, decl->node);
-							}
-
-							if( baseFunc->IsFinal() )
-							{
-								asCString msg;
-								msg.Format(TXT_METHOD_CANNOT_OVERRIDE_s, baseFunc->GetDeclaration());
-								WriteError(msg, decl->script, decl->node);
-							}
-
-							// Move the function from the methods array to the virtualFunctionTable
-							ot->methods.RemoveIndex(d);
-							ot->virtualFunctionTable.PushLast(derivedFunc);
-							found = true;
-							break;
-						}
-					}
-				}
-
-				if( !found )
-				{
-					// Push the base class function on the virtual function table
-					ot->virtualFunctionTable.PushLast(baseType->virtualFunctionTable[m]);
-					baseType->virtualFunctionTable[m]->AddRefInternal();
-
-					CheckForConflictsDueToDefaultArgs(decl->script, decl->node, baseType->virtualFunctionTable[m], ot);
-				}
-
-				ot->methods.PushLast(baseType->methods[m]);
-				engine->scriptFunctions[baseType->methods[m]]->AddRefInternal();
-			}
-		}
-
-		if( !decl->isExistingShared )
-		{
-			// Move this class' methods into the virtual function table
-			for( asUINT m = 0; m < ot->methods.GetLength(); m++ )
-			{
-				asCScriptFunction *func = GetFunctionDescription(ot->methods[m]);
-				if( func->funcType != asFUNC_VIRTUAL )
-				{
-					// Move the reference from the method list to the virtual function list
-					ot->methods.RemoveIndex(m);
-					ot->virtualFunctionTable.PushLast(func);
-
-					// Substitute the function description in the method list for a virtual method
-					// Make sure the methods are in the same order as the virtual function table
-					ot->methods.PushLast(CreateVirtualFunction(func, (int)ot->virtualFunctionTable.GetLength() - 1));
-					m--;
-				}
-			}
-
-			// Make virtual function table chunks for each implemented interface
-			for( asUINT m = 0; m < ot->interfaces.GetLength(); m++ )
-			{
-				asCObjectType *intf = ot->interfaces[m];
-
-				// Add all the interface's functions to the virtual function table
-				asUINT offset = asUINT(ot->virtualFunctionTable.GetLength());
-				ot->interfaceVFTOffsets.PushLast(offset);
-
-				for( asUINT j = 0; j < intf->methods.GetLength(); j++ )
-				{
-					asCScriptFunction *intfFunc = GetFunctionDescription(intf->methods[j]);
-
-					// Only create the table for functions that are explicitly from this interface,
-					// inherited interface methods will be put in that interface's table.
-					if( intfFunc->objectType != intf )
-						continue;
-
-					asASSERT((asUINT)intfFunc->vfTableIdx == j);
-
-					//Find the interface function in the list of methods
-					asCScriptFunction *realFunc = 0;
-					for( asUINT p = 0; p < ot->methods.GetLength(); p++ )
-					{
-						asCScriptFunction *func = GetFunctionDescription(ot->methods[p]);
-
-						if( func->signatureId == intfFunc->signatureId )
-						{
-							if( func->funcType == asFUNC_VIRTUAL )
-							{
-								realFunc = ot->virtualFunctionTable[func->vfTableIdx];
-							}
-							else
-							{
-								// This should not happen, all methods were moved into the virtual table
-								asASSERT(false);
-							}
-							break;
-						}
-					}
-
-					// If realFunc is still null, the interface was not
-					// implemented and we error out later in the checks.
-					ot->virtualFunctionTable.PushLast(realFunc);
-					if( realFunc )
-						realFunc->AddRefInternal();
-				}
-			}
-		}
-
-		// Enumerate each of the declared properties
-		asCScriptNode *node = decl->node->firstChild->next;
-
-		// Skip list of classes and interfaces
-		while( node && node->nodeType == snIdentifier )
-			node = node->next;
-
-		while( node )
-		{
-			if( node->nodeType == snDeclaration )
-			{
-				asCScriptNode *nd = node->firstChild;
-
-				// Is the property declared as private or protected?
-				bool isPrivate = false, isProtected = false;
-				if( nd && nd->tokenType == ttPrivate )
-				{
-					isPrivate = true;
-					nd = nd->next;
-				}
-				else if( nd && nd->tokenType == ttProtected )
-				{
-					isProtected = true;
-					nd = nd->next;
-				}
-
-				// Determine the type of the property
-				asCScriptCode *file = decl->script;
-				asCDataType dt = CreateDataTypeFromNode(nd, file, ot->nameSpace, false, ot);
-				if( ot->IsShared() && dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared() )
-				{
-					asCString msg;
-					msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
-					WriteError(msg, file, node);
-				}
-
-				if( dt.IsReadOnly() )
-					WriteError(TXT_PROPERTY_CANT_BE_CONST, file, node);
-
-				// Multiple properties can be declared separated by ,
-				nd = nd->next;
-				while( nd )
-				{
-					asCString name(&file->code[nd->tokenPos], nd->tokenLength);
-
-					if( !decl->isExistingShared )
-					{
-						CheckNameConflictMember(ot, name.AddressOf(), nd, file, true);
-						AddPropertyToClass(decl, name, dt, isPrivate, isProtected, false, file, nd);
-					}
-					else
-					{
-						// Verify that the property exists in the original declaration
-						bool found = false;
-						for( asUINT p = 0; p < ot->properties.GetLength(); p++ )
-						{
-							asCObjectProperty *prop = ot->properties[p];
-							if( prop->isPrivate == isPrivate &&
-								prop->isProtected == isProtected &&
-								prop->name == name &&
-								prop->type.IsEqualExceptRef(dt) )
-							{
-								found = true;
-								break;
-							}
-						}
-						if( !found )
-						{
-							asCString str;
-							str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, ot->GetName());
-							WriteError(str, file, nd);
-						}
-					}
-
-					// Skip the initialization node
-					if( nd->next && nd->next->nodeType != snIdentifier )
-						nd = nd->next;
-
-					nd = nd->next;
-				}
-			}
-			else
-				asASSERT(false);
-
-			node = node->next;
-		}
-
-		// Add properties from included mixin classes that don't conflict with existing properties
-		IncludePropertiesFromMixins(decl);
-
-		if( !decl->isExistingShared )
-			toValidate.PushLast(decl);
-
-		asASSERT( ot->interfaces.GetLength() == ot->interfaceVFTOffsets.GetLength() );
-	}
-
-	// TODO: Warn if a method overrides a base method without marking it as 'override'.
-	//       It must be possible to turn off this warning through engine property.
-
-	// TODO: A base class should be able to mark a method as 'abstract'. This will
-	//       allow a base class to provide a partial implementation, but still force
-	//       derived classes to implement specific methods.
-
-	// Verify that all interface methods are implemented in the classes
-	// We do this here so the base class' methods have already been inherited
-	for( n = 0; n < classDeclarations.GetLength(); n++ )
-	{
-		sClassDeclaration *decl = classDeclarations[n];
-		if( decl->isExistingShared ) continue;
-
-		asCObjectType *ot = decl->typeInfo->CastToObjectType();
-		asCArray<bool> overrideValidations(ot->GetMethodCount());
-		for( asUINT k = 0; k < ot->methods.GetLength(); k++ )
-			overrideValidations.PushLast( !static_cast<asCScriptFunction*>(ot->GetMethodByIndex(k, false))->IsOverride() );
-
-		for( asUINT m = 0; m < ot->interfaces.GetLength(); m++ )
-		{
-			asCObjectType *objType = ot->interfaces[m];
-			for( asUINT i = 0; i < objType->methods.GetLength(); i++ )
-			{
-				// Only check the interface methods that was explicitly declared in this interface
-				// Methods that was inherited from other interfaces will be checked in those interfaces
-				if( objType != engine->scriptFunctions[objType->methods[i]]->objectType )
-					continue;
-
-				asUINT overrideIndex;
-				if( !DoesMethodExist(ot, objType->methods[i], &overrideIndex) )
-				{
-					asCString str;
-					str.Format(TXT_MISSING_IMPLEMENTATION_OF_s,
-						engine->GetFunctionDeclaration(objType->methods[i]).AddressOf());
-					WriteError(str, decl->script, decl->node);
-				}
-				else
-					overrideValidations[overrideIndex] = true;
-			}
-		}
-
-		bool hasBaseClass = ot->derivedFrom != 0;
-
-		for( asUINT j = 0; j < overrideValidations.GetLength(); j++ )
-		{
-			if( !overrideValidations[j] && (!hasBaseClass || !DoesMethodExist(ot->derivedFrom, ot->methods[j])) )
-			{
-				asCString msg;
-				msg.Format(TXT_METHOD_s_DOES_NOT_OVERRIDE, ot->GetMethodByIndex(j, false)->GetDeclaration());
-				WriteError(msg, decl->script, decl->node);
-			}
-		}
-	}
-
-	// Verify that the declared structures are valid, e.g. that the structure
-	// doesn't contain a member of its own type directly or indirectly
-	while( toValidate.GetLength() > 0 )
-	{
-		asUINT numClasses = (asUINT)toValidate.GetLength();
-
-		asCArray<sClassDeclaration*> toValidateNext((int)toValidate.GetLength());
-		while( toValidate.GetLength() > 0 )
-		{
-			sClassDeclaration *decl = toValidate[toValidate.GetLength()-1];
-			asCObjectType *ot = decl->typeInfo->CastToObjectType();
-			int validState = 1;
-			for( n = 0; n < ot->properties.GetLength(); n++ )
-			{
-				// A valid structure is one that uses only primitives or other valid objects
-				asCObjectProperty *prop = ot->properties[n];
-				asCDataType dt = prop->type;
-
-				// TODO: Add this check again, once solving the issues commented below
-				/* 
-				if( dt.IsTemplate() )
-				{
-					// TODO: This must verify all sub types, not just the first one
-					// TODO: Just because the subtype is not a handle doesn't mean the template will actually instance the object
-					//       this it shouldn't automatically raise an error for this, e.g. weakref<Object> should be legal as member
-					//       of the Object class
-					asCDataType sub = dt;
-					while( sub.IsTemplate() && !sub.IsObjectHandle() )
-						sub = sub.GetSubType();
-
-					dt = sub;
-				}
-				*/
-
-				if( dt.IsObject() && !dt.IsObjectHandle() )
-				{
-					// Find the class declaration
-					sClassDeclaration *pdecl = 0;
-					for( asUINT p = 0; p < classDeclarations.GetLength(); p++ )
-					{
-						if( classDeclarations[p]->typeInfo == dt.GetTypeInfo() )
-						{
-							pdecl = classDeclarations[p];
-							break;
-						}
-					}
-
-					if( pdecl )
-					{
-						if( pdecl->typeInfo == decl->typeInfo )
-						{
-							WriteError(TXT_ILLEGAL_MEMBER_TYPE, decl->script, decl->node);
-							validState = 2;
-							break;
-						}
-						else if( pdecl->validState != 1 )
-						{
-							validState = pdecl->validState;
-							break;
-						}
-					}
-				}
-			}
-
-			if( validState == 1 )
-			{
-				decl->validState = 1;
-				toValidate.PopLast();
-			}
-			else if( validState == 2 )
-			{
-				decl->validState = 2;
-				toValidate.PopLast();
-			}
-			else
-			{
-				toValidateNext.PushLast(toValidate.PopLast());
-			}
-		}
-
-		toValidate = toValidateNext;
-		toValidateNext.SetLength(0);
-
-		if( numClasses == toValidate.GetLength() )
-		{
-			WriteError(TXT_ILLEGAL_MEMBER_TYPE, toValidate[0]->script, toValidate[0]->node);
-			break;
-		}
-	}
-
-	if( numErrors > 0 ) return;
-
-	// Verify which script classes can really form circular references, and mark only those as garbage collected.
-	// This must be done in the correct order, so that a class that contains another class isn't needlessly marked
-	// as garbage collected, just because the contained class was evaluated afterwards.
-
-	// TODO: runtime optimize: This algorithm can be further improved by checking the types that inherits from
-	//                         a base class. If the base class is not shared all the classes that derive from it
-	//                         are known at compile time, and can thus be checked for potential circular references too.
-	//
-	//                         Observe, that doing this would conflict with another potential future feature, which is to
-	//                         allow incremental builds, i.e. allow application to add or replace classes in an
-	//                         existing module. However, the applications that want to use that should use a special
-	//                         build flag to not finalize the module.
-
-	asCArray<asCObjectType*> typesToValidate;
-	for( n = 0; n < classDeclarations.GetLength(); n++ )
-	{
-		// Existing shared classes won't need evaluating, nor interfaces
-		sClassDeclaration *decl = classDeclarations[n];
-		if( decl->isExistingShared ) continue;
-
-		asCObjectType *ot = decl->typeInfo->CastToObjectType();
-		if( ot->IsInterface() ) continue;
-
-		typesToValidate.PushLast(ot);
-	}
-
-	asUINT numReevaluations = 0;
-	while( typesToValidate.GetLength() )
-	{
-		if( numReevaluations > typesToValidate.GetLength() )
-		{
-			// No types could be completely evaluated in the last iteration so 
-			// we consider the remaining types in the array as garbage collected
-			break;
-		}
-
-		asCObjectType *type = typesToValidate[0];
-		typesToValidate.RemoveIndex(0);
-
-		// If the type inherits from another type that is yet to be validated, then reinsert it at the end
-		if( type->derivedFrom && typesToValidate.Exists(type->derivedFrom) )
-		{
-			typesToValidate.PushLast(type);
-			numReevaluations++;
-			continue;
-		}
-
-		// If the type inherits from a known garbage collected type, then this type must also be garbage collected
-		if( type->derivedFrom && (type->derivedFrom->flags & asOBJ_GC) )
-		{
-			type->flags |= asOBJ_GC;
-			continue;
-		}
-
-		// Evaluate template instances (silently) before verifying each of the classes, since it is possible that
-		// a class will be marked as non-garbage collected, which in turn will mark the template instance that uses
-		// it as non-garbage collected, which in turn means the class that contains the array also do not have to be 
-		// garbage collected
-		EvaluateTemplateInstances(numTempl, true);
-
-		// Is there some path in which this structure is involved in circular references?
-		// If the type contains a member of a type that is yet to be validated, then reinsert it at the end
-		bool mustReevaluate = false;
-		bool gc = false;
-		for( asUINT p = 0; p < type->properties.GetLength(); p++ )
-		{
-			asCDataType dt = type->properties[p]->type;
-
-			if (dt.IsFuncdef())
-			{
-				// If a class holds a function pointer as member then the class must be garbage collected as the 
-				// function pointer can form circular references with the class through use of a delegate. Example:
-				//
-				//   class A { B @b; void f(); }
-				//   class B { F @f; }
-				//   funcdef void F();
-				//
-				//   A a;
-				//   @a.b = B();       // instance of A refers to instance of B
-				//   @a.b.f = F(a.f);  // instance of B refers to delegate that refers to instance of A
-				//
-				gc = true;
-				break;
-			}
-
-			if( !dt.IsObject() )
-				continue;
-
-			if( typesToValidate.Exists(dt.GetTypeInfo()->CastToObjectType()) )
-				mustReevaluate = true;
-			else
-			{
-				if( dt.IsTemplate() )
-				{
-					// Check if any of the subtypes are yet to be evaluated
-					bool skip = false;
-					for( asUINT s = 0; s < dt.GetTypeInfo()->GetSubTypeCount(); s++ )
-					{
-						asCObjectType *t = reinterpret_cast<asCObjectType*>(dt.GetTypeInfo()->GetSubType(s));
-						if( typesToValidate.Exists(t) )
-						{
-							mustReevaluate = true;
-							skip = true;
-							break;
-						}
-					}
-					if( skip )
-						continue;
-				}
-
-				if( dt.IsObjectHandle() )
-				{
-					// If it is known that the handle can't be involved in a circular reference
-					// then this object doesn't need to be marked as garbage collected.
-					asCObjectType *prop = dt.GetTypeInfo()->CastToObjectType();
-
-					if( prop->flags & asOBJ_SCRIPT_OBJECT )
-					{
-						// For script objects, treat non-final classes as if they can contain references
-						// as it is not known what derived classes might do. For final types, check all
-						// properties to determine if any of those can cause a circular reference with this
-						// class.
-						if( prop->flags & asOBJ_NOINHERIT )
-						{
-							for( asUINT sp = 0; sp < prop->properties.GetLength(); sp++ )
-							{
-								asCDataType sdt = prop->properties[sp]->type;
-
-								if( sdt.IsObject() )
-								{
-									if( sdt.IsObjectHandle() )
-									{
-										// TODO: runtime optimize: If the handle is again to a final class, then we can recursively check if the circular reference can occur
-										if( sdt.GetTypeInfo()->flags & (asOBJ_SCRIPT_OBJECT | asOBJ_GC) )
-										{
-											gc = true;
-											break;
-										}
-									}
-									else if( sdt.GetTypeInfo()->flags & asOBJ_GC )
-									{
-										// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
-										//                         Only if the object is of a type that can reference this type, either directly or indirectly
-										gc = true;
-										break;
-									}
-								}
-							}
-
-							if( gc )
-								break;
-						}
-						else
-						{
-							// Assume it is garbage collected as it is not known at compile time what might inherit from this type
-							gc = true;
-							break;
-						}
-					}
-					else if( prop->flags & asOBJ_GC )
-					{
-						// If a type is not a script object, adopt its GC flag
-						// TODO: runtime optimize: Just because an application registered class is garbage collected, doesn't mean it 
-						//                         can form a circular reference with this script class. Perhaps need a flag to tell
-						//                         if the script classes that contains the type should be garbage collected or not.
-						gc = true;
-						break;
-					}
-				}
-				else if( dt.GetTypeInfo()->flags & asOBJ_GC )
-				{
-					// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
-					//                         Only if the object is of a type that can reference this type, either directly or indirectly
-					gc = true;
-					break;
-				}
-			}
-		}
-
-		// If the class wasn't found to require garbage collection, but it 
-		// contains another type that has yet to be evaluated then it must be 
-		// re-evaluated.
-		if( !gc && mustReevaluate )
-		{
-			typesToValidate.PushLast(type);
-			numReevaluations++;
-			continue;
-		}
-
-		// Update the flag in the object type
-		if( gc )
-			type->flags |= asOBJ_GC;
-		else
-			type->flags &= ~asOBJ_GC;
-
-		// Reset the counter
-		numReevaluations = 0;
-	}
-}
-
-void asCBuilder::IncludeMethodsFromMixins(sClassDeclaration *decl)
-{
-	asCScriptNode *node = decl->node->firstChild;
-
-	// Skip the class attributes
-	while( node->nodeType == snIdentifier &&
-		   !decl->script->TokenEquals(node->tokenPos, node->tokenLength, decl->name.AddressOf()) )
-		node = node->next;
-
-	// Skip the name of the class
-	node = node->next;
-
-	// Find the included mixin classes
-	while( node && node->nodeType == snIdentifier )
-	{
-		asSNameSpace *ns;
-		asCString name;
-		if( GetNamespaceAndNameFromNode(node, decl->script, decl->typeInfo->nameSpace, ns, name) < 0 )
-		{
-			node = node->next;
-			continue;
-		}
-
-		sMixinClass *mixin = 0;
-		while( ns )
-		{
-			// Need to make sure the name is not an object type 
-			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
-			if( objType == 0 )
-				mixin = GetMixinClass(name.AddressOf(), ns);
-			
-			if( objType || mixin )
-				break;
-
-			ns = engine->GetParentNameSpace(ns);
-		}
-
-		if( mixin )
-		{
-			// Find methods from mixin declaration
-			asCScriptNode *n = mixin->node->firstChild;
-
-			// Skip to the member declarations
-			// Possible keywords 'final' and 'shared' are removed in RegisterMixinClass so we don't need to worry about those here
-			while( n && n->nodeType == snIdentifier )
-				n = n->next;
-
-			// Add methods from the mixin that are not already existing in the class
-			while( n )
-			{
-				if( n->nodeType == snFunction )
-				{
-					// Instead of disconnecting the node, we need to clone it, otherwise other
-					// classes that include the same mixin will not see the methods
-					asCScriptNode *copy = n->CreateCopy(engine);
-
-					// Register the method, but only if it doesn't already exist in the class
-					RegisterScriptFunctionFromNode(copy, mixin->script, decl->typeInfo->CastToObjectType(), false, false, mixin->ns, false, true);
-				}
-				else if( n->nodeType == snVirtualProperty )
-				{
-					// TODO: mixin: Support virtual properties too
-					WriteError("The virtual property syntax is currently not supported for mixin classes", mixin->script, n);
-					//RegisterVirtualProperty(node, decl->script, decl->objType, false, false);
-				}
-
-				n = n->next;
-			}
-		}
-
-		node = node->next;
-	}
-}
-
-void asCBuilder::IncludePropertiesFromMixins(sClassDeclaration *decl)
-{
-	asCScriptNode *node = decl->node->firstChild;
-
-	// Skip the class attributes
-	while( node->nodeType == snIdentifier &&
-		   !decl->script->TokenEquals(node->tokenPos, node->tokenLength, decl->name.AddressOf()) )
-		node = node->next;
-
-	// Skip the name of the class
-	node = node->next;
-
-	// Find the included mixin classes
-	while( node && node->nodeType == snIdentifier )
-	{
-		asSNameSpace *ns;
-		asCString name;
-		if( GetNamespaceAndNameFromNode(node, decl->script, decl->typeInfo->nameSpace, ns, name) < 0 )
-		{
-			node = node->next;
-			continue;
-		}
-
-		sMixinClass *mixin = 0;
-		while( ns )
-		{
-			// Need to make sure the name is not an object type 
-			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
-			if( objType == 0 )
-				mixin = GetMixinClass(name.AddressOf(), ns);
-			
-			if( objType || mixin )
-				break;
-
-			ns = engine->GetParentNameSpace(ns);
-		}
-
-		if( mixin )
-		{
-			// Find properties from mixin declaration
-			asCScriptNode *n = mixin->node->firstChild;
-
-			// Skip to the member declarations
-			// Possible keywords 'final' and 'shared' are removed in RegisterMixinClass so we don't need to worry about those here
-			while( n && n->nodeType == snIdentifier )
-				n = n->next;
-
-			// Add properties from the mixin that are not already existing in the class
-			while( n )
-			{
-				if( n->nodeType == snDeclaration )
-				{
-					asCScriptNode *n2 = n->firstChild;
-					bool isPrivate = false, isProtected = false;
-					if( n2 && n2->tokenType == ttPrivate )
-					{
-						isPrivate = true;
-						n2 = n2->next;
-					}
-					else if( n2 && n2->tokenType == ttProtected )
-					{
-						isProtected = true;
-						n2 = n2->next;
-					}
-
-					asCScriptCode *file = mixin->script;
-					asCDataType dt = CreateDataTypeFromNode(n2, file, mixin->ns);
-
-					if( decl->typeInfo->IsShared() && dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared() )
-					{
-						asCString msg;
-						msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
-						WriteError(msg, file, n);
-						WriteInfo(TXT_WHILE_INCLUDING_MIXIN, decl->script, node);
-					}
-
-					if( dt.IsReadOnly() )
-						WriteError(TXT_PROPERTY_CANT_BE_CONST, file, n);
-
-					n2 = n2->next;
-					while( n2 )
-					{
-						name.Assign(&file->code[n2->tokenPos], n2->tokenLength);
-
-						// Add the property only if it doesn't already exist in the class
-						bool exists = false;
-						asCObjectType *ot = decl->typeInfo->CastToObjectType();
-						for( asUINT p = 0; p < ot->properties.GetLength(); p++ )
-							if( ot->properties[p]->name == name )
-							{
-								exists = true;
-								break;
-							}
-
-						if( !exists )
-						{
-							if( !decl->isExistingShared )
-							{
-								// It must not conflict with the name of methods
-								int r = CheckNameConflictMember(ot, name.AddressOf(), n2, file, true);
-								if( r < 0 )
-									WriteInfo(TXT_WHILE_INCLUDING_MIXIN, decl->script, node);
-
-								AddPropertyToClass(decl, name, dt, isPrivate, isProtected, false, file, n2);
-							}
-							else
-							{
-								// Verify that the property exists in the original declaration
-								bool found = false;
-								for( asUINT p = 0; p < ot->properties.GetLength(); p++ )
-								{
-									asCObjectProperty *prop = ot->properties[p];
-									if( prop->isPrivate == isPrivate &&
-										prop->isProtected == isProtected &&
-										prop->name == name &&
-										prop->type == dt )
-									{
-										found = true;
-										break;
-									}
-								}
-								if( !found )
-								{
-									asCString str;
-									str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, ot->GetName());
-									WriteError(str, decl->script, decl->node);
-									WriteInfo(TXT_WHILE_INCLUDING_MIXIN, decl->script, node);
-								}
-							}
-						}
-
-						// Skip the initialization expression
-						if( n2->next && n2->next->nodeType != snIdentifier )
-							n2 = n2->next;
-
-						n2 = n2->next;
-					}
-				}
-
-				n = n->next;
-			}
-		}
-
-		node = node->next;
-	}
-}
-
-int asCBuilder::CreateVirtualFunction(asCScriptFunction *func, int idx)
-{
-	asCScriptFunction *vf = asNEW(asCScriptFunction)(engine, module, asFUNC_VIRTUAL);
-	if( vf == 0 )
-		return asOUT_OF_MEMORY;
-
-	vf->name             = func->name;
-	vf->returnType       = func->returnType;
-	vf->parameterTypes   = func->parameterTypes;
-	vf->inOutFlags       = func->inOutFlags;
-	vf->id               = engine->GetNextScriptFunctionId();
-	vf->isReadOnly       = func->isReadOnly;
-	vf->objectType       = func->objectType;
-	vf->objectType->AddRefInternal();
-	vf->signatureId      = func->signatureId;
-	vf->isPrivate        = func->isPrivate;
-	vf->isProtected      = func->isProtected;
-	vf->isFinal          = func->isFinal;
-	vf->isOverride       = func->isOverride;
-	vf->vfTableIdx       = idx;
-
-	// It is not necessary to copy the default args, as they have no meaning in the virtual function
-
-	module->AddScriptFunction(vf);
-
-	// Add a dummy to the builder so that it doesn't mix up function ids
-	functions.PushLast(0);
-
-	return vf->id;
-}
-
-asCObjectProperty *asCBuilder::AddPropertyToClass(sClassDeclaration *decl, const asCString &name, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited, asCScriptCode *file, asCScriptNode *node)
-{
-	if( node )
-	{
-		asASSERT(!isInherited);
-
-		// Check if the property is allowed
-		if( !dt.CanBeInstantiated() )
-		{
-			if( file && node )
-			{
-				asCString str;
-				if( dt.IsAbstractClass() )
-					str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(decl->typeInfo->nameSpace).AddressOf());
-				else if( dt.IsInterface() )
-					str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(decl->typeInfo->nameSpace).AddressOf());
-				else
-					// TODO: Improve error message to explain why
-					str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(decl->typeInfo->nameSpace).AddressOf());
-				WriteError(str, file, node);
-			}
-			return 0;
-		}
-
-		// Register the initialization expression (if any) to be compiled later
-		asCScriptNode *declNode = node;
-		asCScriptNode *initNode = 0;
-		if( node->next && node->next->nodeType != snIdentifier )
-		{
-			asASSERT( node->next->nodeType == snAssignment );
-			initNode = node->next;
-		}
-
-		sPropertyInitializer p(name, declNode, initNode, file);
-		decl->propInits.PushLast(p);
-	}
-	else
-	{
-		// If the declaration node is not given, then
-		// this property is inherited from a base class
-		asASSERT(isInherited);
-	}
-
-	// Add the property to the object type
-	return decl->typeInfo->CastToObjectType()->AddPropertyToClass(name, dt, isPrivate, isProtected, isInherited);
-}
-
-bool asCBuilder::DoesMethodExist(asCObjectType *objType, int methodId, asUINT *methodIndex)
-{
-	asCScriptFunction *method = GetFunctionDescription(methodId);
-
-	for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
-	{
-		asCScriptFunction *m = GetFunctionDescription(objType->methods[n]);
-
-		if( m->name           != method->name           ) continue;
-		if( m->returnType     != method->returnType     ) continue;
-		if( m->isReadOnly     != method->isReadOnly     ) continue;
-		if( m->parameterTypes != method->parameterTypes ) continue;
-		if( m->inOutFlags     != method->inOutFlags     ) continue;
-
-		if( methodIndex )
-			*methodIndex = n;
-
-		return true;
-	}
-
-	return false;
-}
-
-void asCBuilder::AddDefaultConstructor(asCObjectType *objType, asCScriptCode *file)
-{
-	int funcId = engine->GetNextScriptFunctionId();
-
-	asCDataType returnType = asCDataType::CreatePrimitive(ttVoid, false);
-	asCArray<asCDataType> parameterTypes;
-	asCArray<asETypeModifiers> inOutFlags;
-	asCArray<asCString *> defaultArgs;
-	asCArray<asCString> parameterNames;
-
-	// Add the script function
-	// TODO: declaredAt should be set to where the class has been declared
-	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, false, objType, false, false, false, false, false, false, false, objType->nameSpace);
-
-	// Set it as default constructor
-	if( objType->beh.construct )
-		engine->scriptFunctions[objType->beh.construct]->ReleaseInternal();
-	objType->beh.construct = funcId;
-	objType->beh.constructors[0] = funcId;
-	engine->scriptFunctions[funcId]->AddRefInternal();
-
-	// The bytecode for the default constructor will be generated
-	// only after the potential inheritance has been established
-	sFunctionDescription *func = asNEW(sFunctionDescription);
-	if( func == 0 )
-	{
-		// Out of memory
-		return;
-	}
-
-	functions.PushLast(func);
-
-	func->script            = file;
-	func->node              = 0;
-	func->name              = objType->name;
-	func->objType           = objType;
-	func->funcId            = funcId;
-	func->isExistingShared  = false;
-
-	// Add a default factory as well
-	funcId = engine->GetNextScriptFunctionId();
-	if( objType->beh.factory )
-		engine->scriptFunctions[objType->beh.factory]->ReleaseInternal();
-	objType->beh.factory = funcId;
-	objType->beh.factories[0] = funcId;
-	returnType = asCDataType::CreateObjectHandle(objType, false);
-	// TODO: should be the same as the constructor
-	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, false);
-	functions.PushLast(0);
-	asCCompiler compiler(engine);
-	compiler.CompileFactory(this, file, engine->scriptFunctions[funcId]);
-	engine->scriptFunctions[funcId]->AddRefInternal();
-
-	// If the object is shared, then the factory must also be marked as shared
-	if( objType->flags & asOBJ_SHARED )
-		engine->scriptFunctions[funcId]->isShared = true;
-}
-
-int asCBuilder::RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
-{
-	// Is it a shared enum?
-	bool isShared = false;
-	asCEnumType *existingSharedType = 0;
-	asCScriptNode *tmp = node->firstChild;
-	if( tmp->nodeType == snIdentifier && file->TokenEquals(tmp->tokenPos, tmp->tokenLength, SHARED_TOKEN) )
-	{
-		isShared = true;
-		tmp = tmp->next;
-	}
-
-	// Grab the name of the enumeration
-	asCString name;
-	asASSERT(snDataType == tmp->nodeType);
-	asASSERT(snIdentifier == tmp->firstChild->nodeType);
-	name.Assign(&file->code[tmp->firstChild->tokenPos], tmp->firstChild->tokenLength);
-
-	if( isShared )
-	{
-		// Look for a pre-existing shared enum with the same signature
-		for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
-		{
-			asCTypeInfo *o = engine->sharedScriptTypes[n];
-			if( o &&
-				o->IsShared() &&
-				(o->flags & asOBJ_ENUM) &&
-				o->name == name &&
-				o->nameSpace == ns )
-			{
-				existingSharedType = o->CastToEnumType();
-				break;
-			}
-		}
-	}
-
-	// Check the name and add the enum
-	int r = CheckNameConflict(name.AddressOf(), tmp->firstChild, file, ns);
-	if( asSUCCESS == r )
-	{
-		asCEnumType *st;
-
-		if( existingSharedType )
-		{
-			st = existingSharedType;
-			st->AddRefInternal();
-		}
-		else
-		{
-			st = asNEW(asCEnumType)(engine);
-			if( st == 0 )
-				return asOUT_OF_MEMORY;
-
-			st->flags     = asOBJ_ENUM;
-			if( isShared )
-				st->flags |= asOBJ_SHARED;
-			st->size      = 4;
-			st->name      = name;
-			st->nameSpace = ns;
-			st->module    = module;
-		}
-		module->enumTypes.PushLast(st);
-
-		if( !existingSharedType && isShared )
-		{
-			engine->sharedScriptTypes.PushLast(st);
-			st->AddRefInternal();
-		}
-
-		// Store the location of this declaration for reference in name collisions
-		sClassDeclaration *decl = asNEW(sClassDeclaration);
-		if( decl == 0 )
-			return asOUT_OF_MEMORY;
-
-		decl->name             = name;
-		decl->script           = file;
-		decl->typeInfo         = st;
-		namedTypeDeclarations.PushLast(decl);
-
-		asCDataType type = CreateDataTypeFromNode(tmp, file, ns);
-		asASSERT(!type.IsReference());
-
-		// Register the enum values
-		tmp = tmp->next;
-		while( tmp )
-		{
-			asASSERT(snIdentifier == tmp->nodeType);
-
-			name.Assign(&file->code[tmp->tokenPos], tmp->tokenLength);
-
-			if( existingSharedType )
-			{
-				// If this is a pre-existent shared enum, then just double check
-				// that the value is already defined in the original declaration
-				bool found = false;
-				for( asUINT n = 0; n < st->enumValues.GetLength(); n++ )
-					if( st->enumValues[n]->name == name )
-					{
-						found = true;
-						break;
-					}
-
-				if( !found )
-				{
-					asCString str;
-					str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, st->GetName());
-					WriteError(str, file, tmp);
-					break;
-				}
-
-				tmp = tmp->next;
-				if( tmp && tmp->nodeType == snAssignment )
-					tmp = tmp->next;
-				continue;
-			}
-			else
-			{
-				// Check for name conflict errors with other values in the enum
-				if( globVariables.GetFirst(ns, name, asCCompGlobVarType(type)) )
-				{
-					asCString str;
-					str.Format(TXT_NAME_CONFLICT_s_ALREADY_USED, name.AddressOf());
-					WriteError(str, file, tmp);
-
-					tmp = tmp->next;
-					if( tmp && tmp->nodeType == snAssignment )
-						tmp = tmp->next;
-					continue;
-				}
-
-				// Check for assignment
-				asCScriptNode *asnNode = tmp->next;
-				if( asnNode && snAssignment == asnNode->nodeType )
-					asnNode->DisconnectParent();
-				else
-					asnNode = 0;
-
-				// Create the global variable description so the enum value can be evaluated
-				sGlobalVariableDescription *gvar = asNEW(sGlobalVariableDescription);
-				if( gvar == 0 )
-					return asOUT_OF_MEMORY;
-
-				gvar->script             = file;
-				gvar->declaredAtNode     = tmp;
-				tmp = tmp->next;
-				gvar->declaredAtNode->DisconnectParent();
-				gvar->initializationNode = asnNode;
-				gvar->name               = name;
-				gvar->datatype           = type;
-				gvar->ns                 = ns;
-				// No need to allocate space on the global memory stack since the values are stored in the asCObjectType
-				// Set the index to a negative to allow compiler to diferentiate from ordinary global var when compiling the initialization
-				gvar->index              = -1; 
-				gvar->isCompiled         = false;
-				gvar->isPureConstant     = true;
-				gvar->isEnumValue        = true;
-				gvar->constantValue      = 0xdeadbeef;
-
-				// Allocate dummy property so we can compile the value.
-				// This will be removed later on so we don't add it to the engine.
-				gvar->property = asNEW(asCGlobalProperty);
-				if( gvar->property == 0 )
-					return asOUT_OF_MEMORY;
-
-				gvar->property->name      = name;
-				gvar->property->nameSpace = ns;
-				gvar->property->type      = gvar->datatype;
-				gvar->property->id        = 0;
-
-				globVariables.Put(gvar);
-			}
-		}
-	}
-
-	node->Destroy(engine);
-
-	return r;
-}
-
-int asCBuilder::RegisterTypedef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
-{
-	// Get the native data type
-	asCScriptNode *tmp = node->firstChild;
-	asASSERT(NULL != tmp && snDataType == tmp->nodeType);
-	asCDataType dataType;
-	dataType.CreatePrimitive(tmp->tokenType, false);
-	dataType.SetTokenType(tmp->tokenType);
-	tmp = tmp->next;
-
-	// Grab the name of the typedef
-	asASSERT(NULL != tmp && NULL == tmp->next);
-	asCString name;
-	name.Assign(&file->code[tmp->tokenPos], tmp->tokenLength);
-
-	// If the name is not already in use add it
- 	int r = CheckNameConflict(name.AddressOf(), tmp, file, ns);
-
-	asCTypedefType *st = 0;
-	if( asSUCCESS == r )
-	{
-		// Create the new type
-		st = asNEW(asCTypedefType)(engine);
-		if( st == 0 )
-			r = asOUT_OF_MEMORY;
-	}
-
-	if( asSUCCESS == r )
-	{
-		st->flags           = asOBJ_TYPEDEF;
-		st->size            = dataType.GetSizeInMemoryBytes();
-		st->name            = name;
-		st->nameSpace       = ns;
-		st->aliasForType    = dataType;
-		st->module          = module;
-
-		module->typeDefs.PushLast(st);
-
-		// Store the location of this declaration for reference in name collisions
-		sClassDeclaration *decl = asNEW(sClassDeclaration);
-		if( decl == 0 )
-			r = asOUT_OF_MEMORY;
-		else
-		{
-			decl->name             = name;
-			decl->script           = file;
-			decl->typeInfo         = st;
-			namedTypeDeclarations.PushLast(decl);
-		}
-	}
-
-	node->Destroy(engine);
-
-	return r;
-}
-
-void asCBuilder::GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool &isConstMethod, bool &isConstructor, bool &isDestructor, bool &isPrivate, bool &isProtected, bool &isOverride, bool &isFinal, bool &isShared, asSNameSpace *implicitNamespace)
-{
-	node = node->firstChild;
-
-	// Is the function a private or protected class method?
-	isPrivate = false; isProtected = false;
-	if( node->tokenType == ttPrivate )
-	{
-		isPrivate = true;
-		node = node->next;
-	}
-	else if( node->tokenType == ttProtected )
-	{
-		isProtected = true;
-		node = node->next;
-	}
-
-	// Is the function shared?
-	isShared = false;
-	if( node->tokenType == ttIdentifier && file->TokenEquals(node->tokenPos, node->tokenLength, SHARED_TOKEN) )
-	{
-		isShared = true;
-		node = node->next;
-	}
-
-	// Find the name
-	isConstructor = false;
-	isDestructor = false;
-	asCScriptNode *n = 0;
-	if( node->nodeType == snDataType )
-		n = node->next->next;
-	else
-	{
-		// If the first node is a ~ token, then we know it is a destructor
-		if( node->tokenType == ttBitNot )
-		{
-			n = node->next;
-			isDestructor = true;
-		}
-		else
-		{
-			n = node;
-			isConstructor = true;
-		}
-	}
-	name.Assign(&file->code[n->tokenPos], n->tokenLength);
-
-	// Initialize a script function object for registration
-	if( !isConstructor && !isDestructor )
-	{
-		returnType = CreateDataTypeFromNode(node, file, implicitNamespace, false, objType);
-		returnType = ModifyDataTypeFromNode(returnType, node->next, file, 0, 0);
-
-		if( engine->ep.disallowValueAssignForRefType &&
-			returnType.GetTypeInfo() &&
-			(returnType.GetTypeInfo()->flags & asOBJ_REF) &&
-			!(returnType.GetTypeInfo()->flags & asOBJ_SCOPED) &&
-			!returnType.IsReference() && 
-			!returnType.IsObjectHandle() )
-		{
-			WriteError(TXT_REF_TYPE_CANT_BE_RETURNED_BY_VAL, file, node);
-		}
-	}
-	else
-		returnType = asCDataType::CreatePrimitive(ttVoid, false);
-
-	isConstMethod = false;
-	isFinal = false;
-	isOverride = false;
-
-	if( objType && n->next->next )
-	{
-		asCScriptNode *decorator = n->next->next;
-
-		// Is this a const method?
-		if( decorator->tokenType == ttConst )
-		{
-			isConstMethod = true;
-			decorator = decorator->next;
-		}
-
-		while( decorator )
-		{
-			if( decorator->tokenType == ttIdentifier && file->TokenEquals(decorator->tokenPos, decorator->tokenLength, FINAL_TOKEN) )
-				isFinal = true;
-			else if( decorator->tokenType == ttIdentifier && file->TokenEquals(decorator->tokenPos, decorator->tokenLength, OVERRIDE_TOKEN) )
-				isOverride = true;
-
-			decorator = decorator->next;
-		}
-	}
-
-	// Count the number of parameters
-	int count = 0;
-	asCScriptNode *c = n->next->firstChild;
-	while( c )
-	{
-		count++;
-		c = c->next->next;
-		if( c && c->nodeType == snIdentifier )
-			c = c->next;
-		if( c && c->nodeType == snExpression )
-			c = c->next;
-	}
-
-	// Get the parameter types
-	parameterNames.Allocate(count, false);
-	parameterTypes.Allocate(count, false);
-	inOutFlags.Allocate(count, false);
-	defaultArgs.Allocate(count, false);
-	n = n->next->firstChild;
-	while( n )
-	{
-		asETypeModifiers inOutFlag;
-		asCDataType type = CreateDataTypeFromNode(n, file, implicitNamespace, false, objType);
-		type = ModifyDataTypeFromNode(type, n->next, file, &inOutFlag, 0);
-
-		if( engine->ep.disallowValueAssignForRefType &&
-			type.GetTypeInfo() &&
-			(type.GetTypeInfo()->flags & asOBJ_REF) &&
-			!(type.GetTypeInfo()->flags & asOBJ_SCOPED) &&
-			!type.IsReference() && 
-			!type.IsObjectHandle() )
-		{
-			WriteError(TXT_REF_TYPE_CANT_BE_PASSED_BY_VAL, file, node);
-		}
-
-		// Store the parameter type
-		parameterTypes.PushLast(type);
-		inOutFlags.PushLast(inOutFlag);
-
-		// Move to next parameter
-		n = n->next->next;
-		if( n && n->nodeType == snIdentifier )
-		{
-			asCString paramName(&file->code[n->tokenPos], n->tokenLength);
-			parameterNames.PushLast(paramName);
-			n = n->next;
-		}
-		else
-		{
-			// No name was given for the parameter
-			parameterNames.PushLast(asCString());
-		}
-
-		if( n && n->nodeType == snExpression )
-		{
-			// Strip out white space and comments to better share the string
-			asCString *defaultArgStr = asNEW(asCString);
-			if( defaultArgStr )
-				*defaultArgStr = GetCleanExpressionString(n, file);
-			defaultArgs.PushLast(defaultArgStr);
-
-			n = n->next;
-		}
-		else
-			defaultArgs.PushLast(0);
-	}
-}
-#endif
-
-asCString asCBuilder::GetCleanExpressionString(asCScriptNode *node, asCScriptCode *file)
-{
-	asASSERT(node && node->nodeType == snExpression);
-
-	asCString str;
-	str.Assign(file->code + node->tokenPos, node->tokenLength);
-
-	asCString cleanStr;
-	for( asUINT n = 0; n < str.GetLength(); )
-	{
-		asUINT len = 0;
-		asETokenClass tok = engine->ParseToken(str.AddressOf() + n, str.GetLength() - n, &len);
-		if( tok != asTC_COMMENT && tok != asTC_WHITESPACE )
-		{
-			if( cleanStr.GetLength() ) cleanStr += " ";
-			cleanStr.Concatenate(str.AddressOf() + n, len);
-		}
-		n += len;
-	}
-
-	return cleanStr;
-}
-
-#ifndef AS_NO_COMPILER
-int asCBuilder::RegisterScriptFunctionFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin)
-{
-	asCString                  name;
-	asCDataType                returnType;
-	asCArray<asCString>        parameterNames;
-	asCArray<asCDataType>      parameterTypes;
-	asCArray<asETypeModifiers> inOutFlags;
-	asCArray<asCString *>      defaultArgs;
-	bool                       isConstMethod;
-	bool                       isOverride;
-	bool                       isFinal;
-	bool                       isConstructor;
-	bool                       isDestructor;
-	bool                       isPrivate;
-	bool                       isProtected;
-	bool                       isShared;
-
-	asASSERT( (objType && ns == 0) || isGlobalFunction || isMixin );
-
-	// Set the default namespace
-	if( ns == 0 )
-	{
-		if( objType )
-			ns = objType->nameSpace;
-		else
-			ns = engine->nameSpaces[0];
-	}
-
-	GetParsedFunctionDetails(node, file, objType, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared, ns);
-
-	return RegisterScriptFunction(node, file, objType, isInterface, isGlobalFunction, ns, isExistingShared, isMixin, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared);
-}
-
-asCScriptFunction *asCBuilder::RegisterLambda(asCScriptNode *node, asCScriptCode *file, asCScriptFunction *funcDef, const asCString &name, asSNameSpace *ns)
-{
-	// Get the parameter names from the node
-	asCArray<asCString> parameterNames;
-	asCArray<asCString*> defaultArgs;
-	asCScriptNode *args = node->firstChild;
-	while( args && args->nodeType == snIdentifier )
-	{
-		asCString argName;
-		argName.Assign(&file->code[args->tokenPos], args->tokenLength);
-		parameterNames.PushLast(argName);
-		defaultArgs.PushLast(0);
-		args = args->next;
-	}
-
-	// The statement block for the function must be disconnected, as the builder is going to be the owner of it
-	args->DisconnectParent();
-
-	// Get the return and parameter types from the funcDef
-	asCString funcName = name;
-	int r = RegisterScriptFunction(args, file, 0, 0, true, ns, false, false, funcName, funcDef->returnType, parameterNames, funcDef->parameterTypes, funcDef->inOutFlags, defaultArgs, false, false, false, false, false, false, false, false);
-	if( r < 0 )
-		return 0;
-
-	// Return the function that was just created (but that will be compiled later)
-	return engine->scriptFunctions[functions[functions.GetLength()-1]->funcId];
-}
-
-int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool isConstMethod, bool isConstructor, bool isDestructor, bool isPrivate, bool isProtected, bool isOverride, bool isFinal, bool isShared)
-{
-	// Determine default namespace if not specified
-	if( ns == 0 )
-	{
-		if( objType )
-			ns = objType->nameSpace;
-		else
-			ns = engine->nameSpaces[0];
-	}
-
-	if( isExistingShared )
-	{
-		asASSERT( objType );
-
-		// Should validate that the function really exists in the class/interface
-		bool found = false;
-		if( isConstructor || isDestructor )
-		{
-			// TODO: shared: Should check the existance of these too
-			found = true;
-		}
-		else
-		{
-			for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
-			{
-				asCScriptFunction *func = engine->scriptFunctions[objType->methods[n]];
-				if( func->name == name &&
-					func->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, objType, isConstMethod) )
-				{
-					// Add the shared function in this module too
-					module->AddScriptFunction(func);
-
-					found = true;
-					break;
-				}
-			}
-		}
-
-		if( !found )
-		{
-			asCString str;
-			str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, objType->GetName());
-			WriteError(str, file, node);
-		}
-
-		// Free the default args
-		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-			if( defaultArgs[n] )
-				asDELETE(defaultArgs[n], asCString);
-
-		node->Destroy(engine);
-		return 0;
-	}
-
-	// Check for name conflicts
-	if( !isConstructor && !isDestructor )
-	{
-		if( objType )
-		{
-			CheckNameConflictMember(objType, name.AddressOf(), node, file, false);
-
-			if( name == objType->name )
-				WriteError(TXT_METHOD_CANT_HAVE_NAME_OF_CLASS, file, node);
-		}
-		else
-			CheckNameConflict(name.AddressOf(), node, file, ns);
-	}
-	else
-	{
-		if( isMixin )
-		{
-			// Mixins cannot implement constructors/destructors
-			WriteError(TXT_MIXIN_CANNOT_HAVE_CONSTRUCTOR, file, node);
-
-			// Free the default args
-			for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-				if( defaultArgs[n] )
-					asDELETE(defaultArgs[n], asCString);
-
-			node->Destroy(engine);
-			return 0;
-		}
-
-		// Verify that the name of the constructor/destructor is the same as the class
-		if( name != objType->name )
-		{
-			asCString str;
-			if( isDestructor )
-				str.Format(TXT_DESTRUCTOR_s_s_NAME_ERROR, objType->name.AddressOf(), name.AddressOf());
-			else
-				str.Format(TXT_METHOD_s_s_HAS_NO_RETURN_TYPE, objType->name.AddressOf(), name.AddressOf());
-			WriteError(str, file, node);
-		}
-
-		if( isDestructor )
-			name = "~" + name;
-	}
-
-	isExistingShared = false;
-	int funcId = engine->GetNextScriptFunctionId();
-	if( !isInterface )
-	{
-		sFunctionDescription *func = asNEW(sFunctionDescription);
-		if( func == 0 )
-		{
-			// Free the default args
-			for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-				if( defaultArgs[n] )
-					asDELETE(defaultArgs[n], asCString);
-
-			return asOUT_OF_MEMORY;
-		}
-
-		functions.PushLast(func);
-
-		func->script            = file;
-		func->node              = node;
-		func->name              = name;
-		func->objType           = objType;
-		func->funcId            = funcId;
-		func->isExistingShared  = false;
-		func->paramNames        = parameterNames;
-
-		if( isShared )
-		{
-			// Look for a pre-existing shared function with the same signature
-			for( asUINT n = 0; n < engine->scriptFunctions.GetLength(); n++ )
-			{
-				asCScriptFunction *f = engine->scriptFunctions[n];
-				if( f &&
-					f->isShared &&
-					f->name == name &&
-					f->nameSpace == ns &&
-					f->objectType == objType &&
-					f->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, 0, false) )
-				{
-					funcId = func->funcId = f->id;
-					isExistingShared = func->isExistingShared = true;
-					break;
-				}
-			}
-		}
-	}
-
-	// Destructors may not have any parameters
-	if( isDestructor && parameterTypes.GetLength() > 0 )
-		WriteError(TXT_DESTRUCTOR_MAY_NOT_HAVE_PARM, file, node);
-
-	// If a function, class, or interface is shared then only shared types may be used in the signature
-	if( (objType && objType->IsShared()) || isShared )
-	{
-		asCTypeInfo *ti = returnType.GetTypeInfo();
-		if( ti && !ti->IsShared() )
-		{
-			asCString msg;
-			msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, ti->name.AddressOf());
-			WriteError(msg, file, node);
-		}
-
-		for( asUINT p = 0; p < parameterTypes.GetLength(); ++p )
-		{
-			ti = parameterTypes[p].GetTypeInfo();
-			if( ti && !ti->IsShared() )
-			{
-				asCString msg;
-				msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, ti->name.AddressOf());
-				WriteError(msg, file, node);
-			}
-		}
-	}
-
-	// Check that the same function hasn't been registered already in the namespace
-	asCArray<int> funcs;
-	if( objType )
-		GetObjectMethodDescriptions(name.AddressOf(), objType, funcs, false);
-	else
-		GetFunctionDescriptions(name.AddressOf(), funcs, ns);
-	if( objType && (name == "opConv" || name == "opImplConv" || name == "opCast" || name == "opImplCast") && parameterTypes.GetLength() == 0 )
-	{
-		// opConv and opCast are special methods used for type casts
-		for( asUINT n = 0; n < funcs.GetLength(); ++n )
-		{
-			asCScriptFunction *func = GetFunctionDescription(funcs[n]);
-			if( func->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, objType, isConstMethod) )
-			{
-				// TODO: clean up: Reuse the same error handling for both opConv and normal methods
-				if( isMixin )
-				{
-					// Clean up the memory, as the function will not be registered
-					if( node )
-						node->Destroy(engine);
-					sFunctionDescription *funcDesc = functions.PopLast();
-					asDELETE(funcDesc, sFunctionDescription);
-
-					// Free the default args
-					for( n = 0; n < defaultArgs.GetLength(); n++ )
-						if( defaultArgs[n] )
-							asDELETE(defaultArgs[n], asCString);
-
-					return 0;
-				}
-
-				WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
-				break;
-			}
-		}
-	}
-	else
-	{
-		for( asUINT n = 0; n < funcs.GetLength(); ++n )
-		{
-			asCScriptFunction *func = GetFunctionDescription(funcs[n]);
-			if( func->IsSignatureExceptNameAndReturnTypeEqual(parameterTypes, inOutFlags, objType, isConstMethod) )
-			{
-				if( isMixin )
-				{
-					// Clean up the memory, as the function will not be registered
-					if( node )
-						node->Destroy(engine);
-					sFunctionDescription *funcDesc = functions.PopLast();
-					asDELETE(funcDesc, sFunctionDescription);
-
-					// Free the default args
-					for( n = 0; n < defaultArgs.GetLength(); n++ )
-						if( defaultArgs[n] )
-							asDELETE(defaultArgs[n], asCString);
-
-					return 0;
-				}
-
-				WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
-				break;
-			}
-		}
-	}
-
-	// Register the function
-	if( isExistingShared )
-	{
-		// Delete the default args as they won't be used anymore
-		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-			if( defaultArgs[n] )
-				asDELETE(defaultArgs[n], asCString);
-
-		asCScriptFunction *f = engine->scriptFunctions[funcId];
-		module->AddScriptFunction(f);
-
-		// TODO: clean up: This should be done by AddScriptFunction() itself
-		module->globalFunctions.Put(f);
-	}
-	else
-	{
-		int row = 0, col = 0;
-		if( node )
-			file->ConvertPosToRowCol(node->tokenPos, &row, &col);
-		module->AddScriptFunction(file->idx, (row&0xFFFFF)|((col&0xFFF)<<20), funcId, name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, isInterface, objType, isConstMethod, isGlobalFunction, isPrivate, isProtected, isFinal, isOverride, isShared, ns);
-	}
-
-	// Make sure the default args are declared correctly
-	ValidateDefaultArgs(file, node, engine->scriptFunctions[funcId]);
-	CheckForConflictsDueToDefaultArgs(file, node, engine->scriptFunctions[funcId], objType);
-
-	if( objType )
-	{
-		asASSERT( !isExistingShared );
-
-		engine->scriptFunctions[funcId]->AddRefInternal();
-		if( isConstructor )
-		{
-			int factoryId = engine->GetNextScriptFunctionId();
-			if( parameterTypes.GetLength() == 0 )
-			{
-				// Overload the default constructor
-				engine->scriptFunctions[objType->beh.construct]->ReleaseInternal();
-				objType->beh.construct = funcId;
-				objType->beh.constructors[0] = funcId;
-
-				// Register the default factory as well
-				engine->scriptFunctions[objType->beh.factory]->ReleaseInternal();
-				objType->beh.factory = factoryId;
-				objType->beh.factories[0] = factoryId;
-			}
-			else
-			{
-				objType->beh.constructors.PushLast(funcId);
-
-				// Register the factory as well
-				objType->beh.factories.PushLast(factoryId);
-			}
-
-			// We must copy the default arg strings to avoid deleting the same object multiple times
-			for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-				if( defaultArgs[n] )
-					defaultArgs[n] = asNEW(asCString)(*defaultArgs[n]);
-
-			asCDataType dt = asCDataType::CreateObjectHandle(objType, false);
-			module->AddScriptFunction(file->idx, engine->scriptFunctions[funcId]->scriptData->declaredAt, factoryId, name, dt, parameterTypes, parameterNames, inOutFlags, defaultArgs, false);
-
-			// If the object is shared, then the factory must also be marked as shared
-			if( objType->flags & asOBJ_SHARED )
-				engine->scriptFunctions[factoryId]->isShared = true;
-
-			// Add a dummy function to the builder so that it doesn't mix up the fund Ids
-			functions.PushLast(0);
-
-			// Compile the factory immediately
-			asCCompiler compiler(engine);
-			compiler.CompileFactory(this, file, engine->scriptFunctions[factoryId]);
-			engine->scriptFunctions[factoryId]->AddRefInternal();
-		}
-		else if( isDestructor )
-			objType->beh.destruct = funcId;
-		else
-		{
-			// If the method is the assignment operator we need to replace the default implementation
-			asCScriptFunction *f = engine->scriptFunctions[funcId];
-			if( f->name == "opAssign" && f->parameterTypes.GetLength() == 1 &&
-				f->parameterTypes[0].GetTypeInfo() == f->objectType &&
-				(f->inOutFlags[0] & asTM_INREF) )
-			{
-				engine->scriptFunctions[objType->beh.copy]->ReleaseInternal();
-				objType->beh.copy = funcId;
-				f->AddRefInternal();
-			}
-
-			objType->methods.PushLast(funcId);
-		}
-	}
-
-	// We need to delete the node already if this is an interface method
-	if( isInterface && node )
-		node->Destroy(engine);
-
-	return 0;
-}
-
-int asCBuilder::RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared)
-{
-	if( engine->ep.propertyAccessorMode != 2 )
-	{
-		WriteError(TXT_PROPERTY_ACCESSOR_DISABLED, file, node);
-		node->Destroy(engine);
-		return 0;
-	}
-
-	asASSERT( (objType && ns == 0) || isGlobalFunction );
-
-	if( ns == 0 )
-	{
-		if( objType )
-			ns = objType->nameSpace;
-		else
-			ns = engine->nameSpaces[0];
-	}
-
-	bool isPrivate = false, isProtected = false;
-	asCString emulatedName;
-	asCDataType emulatedType;
-
-	asCScriptNode *mainNode = node;
-	node = node->firstChild;
-
-	if( !isGlobalFunction && node->tokenType == ttPrivate )
-	{
-		isPrivate = true;
-		node = node->next;
-	}
-	else if( !isGlobalFunction && node->tokenType == ttProtected )
-	{
-		isProtected = true;
-		node = node->next;
-	}
-
-	emulatedType = CreateDataTypeFromNode(node, file, ns);
-	emulatedType = ModifyDataTypeFromNode(emulatedType, node->next, file, 0, 0);
-	node = node->next->next;
-	emulatedName.Assign(&file->code[node->tokenPos], node->tokenLength);
-
-	if( node->next == 0 )
-		WriteError(TXT_PROPERTY_WITHOUT_ACCESSOR, file, node);
-
-	node = node->next;
-	while( node )
-	{
-		asCScriptNode             *next        = node->next;
-		asCScriptNode             *funcNode    = 0;
-		bool                       success     = false;
-		bool                       isConst     = false;
-		bool                       isFinal     = false;
-		bool                       isOverride  = false;
-		asCDataType                returnType;
-		asCArray<asCString>        paramNames;
-		asCArray<asCDataType>      paramTypes;
-		asCArray<asETypeModifiers> paramModifiers;
-		asCArray<asCString*>       defaultArgs;
-		asCString                  name;
-
-		// TODO: getset: Allow private for individual property accessors
-		// TODO: getset: If the accessor uses its own name, then the property should be automatically declared
-
-		if( node->firstChild->nodeType == snIdentifier && file->TokenEquals(node->firstChild->tokenPos, node->firstChild->tokenLength, GET_TOKEN) )
-		{
-			funcNode  = node->firstChild->next;
-
-			if( funcNode && funcNode->tokenType == ttConst )
-			{
-				isConst = true;
-				funcNode = funcNode->next;
-			}
-
-			while( funcNode && funcNode->nodeType != snStatementBlock )
-			{
-				if( funcNode->tokenType == ttIdentifier && file->TokenEquals(funcNode->tokenPos, funcNode->tokenLength, FINAL_TOKEN) )
-					isFinal = true;
-				else if( funcNode->tokenType == ttIdentifier && file->TokenEquals(funcNode->tokenPos, funcNode->tokenLength, OVERRIDE_TOKEN) )
-					isOverride = true;
-
-				funcNode = funcNode->next;
-			}
-
-			if( funcNode )
-				funcNode->DisconnectParent();
-
-			if( funcNode == 0 && (objType == 0 || !objType->IsInterface()) )
-			{
-				// TODO: getset: If no implementation is supplied the builder should provide an automatically generated implementation
-				//               The compiler needs to be able to handle the different types, primitive, value type, and handle
-				//               The code is also different for global property accessors
-				WriteError(TXT_PROPERTY_ACCESSOR_MUST_BE_IMPLEMENTED, file, node);
-			}
-
-			// Setup the signature for the get accessor method
-			returnType = emulatedType;
-			name       = "get_" + emulatedName;
-			success    = true;
-		}
-		else if( node->firstChild->nodeType == snIdentifier && file->TokenEquals(node->firstChild->tokenPos, node->firstChild->tokenLength, SET_TOKEN) )
-		{
-			funcNode  = node->firstChild->next;
-
-			if( funcNode && funcNode->tokenType == ttConst )
-			{
-				isConst = true;
-				funcNode = funcNode->next;
-			}
-
-			while( funcNode && funcNode->nodeType != snStatementBlock )
-			{
-				if( funcNode->tokenType == ttIdentifier && file->TokenEquals(funcNode->tokenPos, funcNode->tokenLength, FINAL_TOKEN) )
-					isFinal = true;
-				else if( funcNode->tokenType == ttIdentifier && file->TokenEquals(funcNode->tokenPos, funcNode->tokenLength, OVERRIDE_TOKEN) )
-					isOverride = true;
-
-				funcNode = funcNode->next;
-			}
-
-			if( funcNode )
-				funcNode->DisconnectParent();
-
-			if( funcNode == 0 && (objType == 0 || !objType->IsInterface()) )
-				WriteError(TXT_PROPERTY_ACCESSOR_MUST_BE_IMPLEMENTED, file, node);
-
-			// Setup the signature for the set accessor method
-			returnType = asCDataType::CreatePrimitive(ttVoid, false);
-			paramModifiers.PushLast(asTM_NONE);
-			paramNames.PushLast("value");
-			paramTypes.PushLast(emulatedType);
-			defaultArgs.PushLast(0);
-			name = "set_" + emulatedName;
-			success = true;
-		}
-		else
-			WriteError(TXT_UNRECOGNIZED_VIRTUAL_PROPERTY_NODE, file, node);
-
-		if( success )
-		{
-			if( !isExistingShared )
-				RegisterScriptFunction(funcNode, file, objType, isInterface, isGlobalFunction, ns, false, false, name, returnType, paramNames, paramTypes, paramModifiers, defaultArgs, isConst, false, false, isPrivate, isProtected, isOverride, isFinal, false);
-			else
-			{
-				// Free the funcNode as it won't be used
-				if( funcNode ) funcNode->Destroy(engine);
-
-				// Should validate that the function really exists in the class/interface
-				bool found = false;
-				for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
-				{
-					asCScriptFunction *func = engine->scriptFunctions[objType->methods[n]];
-					if( func->name == name &&
-						func->IsSignatureExceptNameEqual(returnType, paramTypes, paramModifiers, objType, isConst) )
-					{
-						found = true;
-						break;
-					}
-				}
-
-				if( !found )
-				{
-					asCString str;
-					str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, objType->GetName());
-					WriteError(str, file, node);
-				}
-			}
-		}
-
-		node = next;
-	};
-
-	mainNode->Destroy(engine);
-
-	return 0;
-}
-
-int asCBuilder::RegisterImportedFunction(int importID, asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
-{
-	asCString                  name;
-	asCDataType                returnType;
-	asCArray<asCString>        parameterNames;
-	asCArray<asCDataType>      parameterTypes;
-	asCArray<asETypeModifiers> inOutFlags;
-	asCArray<asCString *>      defaultArgs;
-	bool isConstMethod, isOverride, isFinal, isConstructor, isDestructor, isPrivate, isProtected, isShared;
-
-	if( ns == 0 )
-		ns = engine->nameSpaces[0];
-
-	GetParsedFunctionDetails(node->firstChild, file, 0, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, isConstMethod, isConstructor, isDestructor, isPrivate, isProtected, isOverride, isFinal, isShared, ns);
-	CheckNameConflict(name.AddressOf(), node, file, ns);
-
-	// Check that the same function hasn't been registered already in the namespace
-	asCArray<int> funcs;
-	GetFunctionDescriptions(name.AddressOf(), funcs, ns);
-	for( asUINT n = 0; n < funcs.GetLength(); ++n )
-	{
-		asCScriptFunction *func = GetFunctionDescription(funcs[n]);
-		if( func->IsSignatureExceptNameAndReturnTypeEqual(parameterTypes, inOutFlags, 0, false) )
-		{
-			WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
-			break;
-		}
-	}
-
-	// Read the module name as well
-	asCScriptNode *nd = node->lastChild;
-	asASSERT( nd->nodeType == snConstant && nd->tokenType == ttStringConstant );
-	asCString moduleName;
-	moduleName.Assign(&file->code[nd->tokenPos+1], nd->tokenLength-2);
-
-	node->Destroy(engine);
-
-	// Register the function
-	module->AddImportedFunction(importID, name, returnType, parameterTypes, inOutFlags, defaultArgs, ns, moduleName);
-
-	return 0;
-}
-
-asCScriptFunction *asCBuilder::GetFunctionDescription(int id)
-{
-	// TODO: import: This should be improved when the imported functions are removed
-	// Get the description from the engine
-	if( (id & FUNC_IMPORTED) == 0 )
-		return engine->scriptFunctions[id];
-	else
-		return engine->importedFunctions[id & ~FUNC_IMPORTED]->importedFunctionSignature;
-}
-
-void asCBuilder::GetFunctionDescriptions(const char *name, asCArray<int> &funcs, asSNameSpace *ns)
-{
-	asUINT n;
-
-	// Get the script declared global functions
-	const asCArray<unsigned int> &idxs = module->globalFunctions.GetIndexes(ns, name);
-	for( n = 0; n < idxs.GetLength(); n++ )
-	{
-		const asCScriptFunction *f = module->globalFunctions.Get(idxs[n]);
-		asASSERT( f->objectType == 0 );
-		funcs.PushLast(f->id);
-	}
-
-	// Add the imported functions
-	// TODO: optimize: Linear search: This is probably not that critial. Also bindInformation will probably be removed in near future
-	for( n = 0; n < module->bindInformations.GetLength(); n++ )
-	{
-		if( module->bindInformations[n]->importedFunctionSignature->name == name &&
-			module->bindInformations[n]->importedFunctionSignature->nameSpace == ns )
-			funcs.PushLast(module->bindInformations[n]->importedFunctionSignature->id);
-	}
-
-	// Add the registered global functions
-	const asCArray<unsigned int> &idxs2 = engine->registeredGlobalFuncs.GetIndexes(ns, name);
-	for( n = 0; n < idxs2.GetLength(); n++ )
-	{
-		asCScriptFunction *f = engine->registeredGlobalFuncs.Get(idxs2[n]);
-
-		// Verify if the module has access to the function
-		if( module->accessMask & f->accessMask )
-		{
-			funcs.PushLast(f->id);
-		}
-	}
-}
-
-// scope is only informed when looking for a base class' method
-void asCBuilder::GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope, asCScriptNode *errNode, asCScriptCode *script)
-{
-	asASSERT(objectType);
-
-	if( scope != "" )
-	{
-		// If searching with a scope informed, then the node and script must also be informed for potential error reporting
-		asASSERT( errNode && script );
-
-		// If the scope contains ::identifier, then use the last identifier as the class name and the rest of it as the namespace
-		// TODO: child funcdef: A scope can include a template type, e.g. array<ns::type> 
-		int n = scope.FindLast("::");
-		asCString className = n >= 0 ? scope.SubString(n+2) : scope;
-		asCString nsName = n >= 0 ? scope.SubString(0, n) : "";
-
-		// If a namespace was specifically defined, then this must be used
-		asSNameSpace *ns = 0;
-		if (n >= 0)
-		{
-			if (nsName == "")
-				ns = engine->nameSpaces[0];
-			else
-				ns = GetNameSpaceByString(nsName, objectType->nameSpace, errNode, script, 0, false);
-			
-			// If the namespace isn't found return silently and let the calling 
-			// function report the error if it cannot resolve the symbol
-			if (ns == 0)
-				return;
-		}
-
-		// Find the base class with the specified scope
-		while (objectType)
-		{
-			// If the name and namespace matches it is the correct class. If no
-			// specific namespace was given, then don't compare the namespace
-			if (objectType->name == className && (ns == 0 || objectType->nameSpace == ns))
-				break;
-
-			objectType = objectType->derivedFrom;
-		}
-
-		// If the scope is not any of the base classes, then return no methods
-		if( objectType == 0 )
-			return;
-	}
-
-	// Find the methods in the object that match the name
-	// TODO: optimize: Improve linear search
-	for( asUINT n = 0; n < objectType->methods.GetLength(); n++ )
-	{
-		asCScriptFunction *func = engine->scriptFunctions[objectType->methods[n]];
-		if( func->name == name &&
-			(!objIsConst || func->isReadOnly) &&
-			(func->accessMask & module->accessMask) )
-		{
-			// When the scope is defined the returned methods should be the true methods, not the virtual method stubs
-			if( scope == "" )
-				methods.PushLast(engine->scriptFunctions[objectType->methods[n]]->id);
-			else
-			{
-				asCScriptFunction *virtFunc = engine->scriptFunctions[objectType->methods[n]];
-				asCScriptFunction *realFunc = objectType->virtualFunctionTable[virtFunc->vfTableIdx];
-				methods.PushLast(realFunc->id);
-			}
-		}
-	}
-}
-#endif
-
-void asCBuilder::WriteInfo(const asCString &scriptname, const asCString &message, int r, int c, bool pre)
-{
-	// Need to store the pre message in a structure
-	if( pre )
-	{
-		engine->preMessage.isSet      = true;
-		engine->preMessage.c          = c;
-		engine->preMessage.r          = r;
-		engine->preMessage.message    = message;
-		engine->preMessage.scriptname = scriptname;
-	}
-	else
-	{
-		engine->preMessage.isSet = false;
-
-		if( !silent )
-			engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_INFORMATION, message.AddressOf());
-	}
-}
-
-void asCBuilder::WriteInfo(const asCString &message, asCScriptCode *file, asCScriptNode *node)
-{
-	int r = 0, c = 0;
-	if( node )
-		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-	WriteInfo(file->name, message, r, c, false);
-}
-
-void asCBuilder::WriteError(const asCString &message, asCScriptCode *file, asCScriptNode *node)
-{
-	int r = 0, c = 0;
-	if( node && file )
-		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-	WriteError(file ? file->name : asCString(""), message, r, c);
-}
-
-void asCBuilder::WriteError(const asCString &scriptname, const asCString &message, int r, int c)
-{
-	numErrors++;
-
-	if( !silent )
-		engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_ERROR, message.AddressOf());
-}
-
-void asCBuilder::WriteWarning(const asCString &scriptname, const asCString &message, int r, int c)
-{
-	if( engine->ep.compilerWarnings )
-	{
-		numWarnings++;
-
-		if( !silent )
-			engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_WARNING, message.AddressOf());
-	}
-}
-
-void asCBuilder::WriteWarning(const asCString &message, asCScriptCode *file, asCScriptNode *node)
-{
-	int r = 0, c = 0;
-	if( node && file )
-		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-	WriteWarning(file ? file->name : asCString(""), message, r, c);
-}
-
-// TODO: child funcdef: Should try to eliminate this function. GetNameSpaceFromNode is more complete
-asCString asCBuilder::GetScopeFromNode(asCScriptNode *node, asCScriptCode *script, asCScriptNode **next)
-{
-	if (node->nodeType != snScope)
-	{
-		if (next)
-			*next = node;
-		return "";
-	}
-
-	asCString scope;
-	asCScriptNode *sn = node->firstChild;
-	if( sn->tokenType == ttScope )
-	{
-		scope = "::";
-		sn = sn->next;
-	}
-
-	// TODO: child funcdef: A scope can have a template type as the innermost
-	while( sn && sn->next && sn->next->tokenType == ttScope )
-	{
-		asCString tmp;
-		tmp.Assign(&script->code[sn->tokenPos], sn->tokenLength);
-		if( scope != "" && scope != "::" )
-			scope += "::";
-		scope += tmp;
-		sn = sn->next->next;
-	}
-
-	if( next )
-		*next = node->next;
-
-	return scope;
-}
-
-asSNameSpace *asCBuilder::GetNameSpaceFromNode(asCScriptNode *node, asCScriptCode *script, asSNameSpace *implicitNs, asCScriptNode **next, asCObjectType **objType)
-{
-	if (objType)
-		*objType = 0;
-
-	// If no scope has been informed, then return the implicit namespace
-	if (node->nodeType != snScope)
-	{
-		if (next)
-			*next = node;
-		return implicitNs ? implicitNs : engine->nameSpaces[0];
-	}
-
-	if (next)
-		*next = node->next;
-
-	asCString scope;
-	asCScriptNode *sn = node->firstChild;
-	if (sn && sn->tokenType == ttScope)
-	{
-		scope = "::";
-		sn = sn->next;
-	}
-
-	while (sn)
-	{
-		if (sn->next->tokenType == ttScope)
-		{
-			asCString tmp;
-			tmp.Assign(&script->code[sn->tokenPos], sn->tokenLength);
-			if (scope != "" && scope != "::")
-				scope += "::";
-			scope += tmp;
-			sn = sn->next->next;
-		}
-		else
-		{
-			// This is a template type
-			asASSERT(sn->next->nodeType == snDataType);
-
-			asSNameSpace *ns = implicitNs;
-			if (scope != "")
-				ns = engine->FindNameSpace(scope.AddressOf());
-
-			asCString templateName(&script->code[sn->tokenPos], sn->tokenLength);
-			asCObjectType *templateType = GetObjectType(templateName.AddressOf(), ns);
-			if (templateType == 0 || (templateType->flags & asOBJ_TEMPLATE) == 0)
-			{
-				// TODO: child funcdef: Report error
-				return ns;
-			}
-
-			if (objType)
-				*objType = GetTemplateInstanceFromNode(sn, script, templateType, implicitNs, 0);
-
-			// Return no namespace, since this is an object type
-			return 0;
-		}
-	}
-
-	asCTypeInfo *ti = 0;
-	asSNameSpace *ns = GetNameSpaceByString(scope, implicitNs ? implicitNs : engine->nameSpaces[0], node, script, &ti);
-	if (ti && objType)
-		*objType = ti->CastToObjectType();
-	return ns;
-}
-
-asSNameSpace *asCBuilder::GetNameSpaceByString(const asCString &nsName, asSNameSpace *implicitNs, asCScriptNode *errNode, asCScriptCode *script, asCTypeInfo **scopeType, bool isRequired)
-{
-	if( scopeType )
-		*scopeType = 0;
-
-	asSNameSpace *ns = implicitNs;
-	if( nsName == "::" )
-		ns = engine->nameSpaces[0];
-	else if( nsName != "" )
-	{
-		ns = engine->FindNameSpace(nsName.AddressOf());
-		if (ns == 0 && scopeType)
-		{
-			asCString typeName;
-			asCString searchNs;
-
-			// Split the scope with at the inner most ::
-			int pos = nsName.FindLast("::");
-			bool recursive = false;
-			if (pos >= 0)
-			{
-				// Fully qualified namespace
-				typeName = nsName.SubString(pos + 2);
-				searchNs = nsName.SubString(0, pos);
-			}
-			else
-			{
-				// Partially qualified, use the implicit namespace and then search recursively for the type
-				typeName = nsName;
-				searchNs = implicitNs->name;
-				recursive = true;
-			}
-
-			asSNameSpace *nsTmp = searchNs == "::" ? engine->nameSpaces[0] : engine->FindNameSpace(searchNs.AddressOf());
-			asCTypeInfo *ti = 0;
-			while( !ti && nsTmp )
-			{
-				// Check if the typeName is an existing type in the namespace
-				ti = GetType(typeName.AddressOf(), nsTmp, 0);
-				if (ti)
-				{
-					// The informed scope is not a namespace, but it does match a type
-					*scopeType = ti;
-					return 0;
-				}
-				nsTmp = recursive ? engine->GetParentNameSpace(nsTmp) : 0;
-			}
-		}
-
-		if (ns == 0 && isRequired)
-		{
-			asCString msg;
-			msg.Format(TXT_NAMESPACE_s_DOESNT_EXIST, nsName.AddressOf());
-			WriteError(msg, script, errNode);
-		}
-	}
-
-	return ns;
-}
-
-asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCode *file, asSNameSpace *implicitNamespace, bool acceptHandleForScope, asCObjectType *currentType)
-{
-	asASSERT(node->nodeType == snDataType);
-
-	asCDataType dt;
-
-	asCScriptNode *n = node->firstChild;
-
-	bool isConst = false;
-	bool isImplicitHandle = false;
-	if( n->tokenType == ttConst )
-	{
-		isConst = true;
-		n = n->next;
-	}
-
-	// Determine namespace (or parent type) to search for the data type in
-	asCObjectType *parentType = 0;
-	asSNameSpace *ns = GetNameSpaceFromNode(n, file, implicitNamespace, &n, &parentType);
-	if( ns == 0 && parentType == 0 )
-	{
-		// The namespace and parent type doesn't exist. Return a dummy type instead.
-		dt = asCDataType::CreatePrimitive(ttInt, false);
-		return dt;
-	}
-
-	if( n->tokenType == ttIdentifier )
-	{
-		bool found = false;
-
-		asCString str;
-		str.Assign(&file->code[n->tokenPos], n->tokenLength);
-
-		// Recursively search parent namespaces for matching type
-		asSNameSpace *origNs = ns;
-		asCObjectType *origParentType = parentType;
-		while( (ns || parentType) && !found )
-		{
-			asCTypeInfo *ti = 0;
-
-			if (currentType)
-			{
-				// If this is for a template type, then we must first determine if the
-				// identifier matches any of the template subtypes
-				if (currentType->flags & asOBJ_TEMPLATE)
-				{
-					for (asUINT subtypeIndex = 0; subtypeIndex < currentType->templateSubTypes.GetLength(); subtypeIndex++)
-					{
-						asCTypeInfo *type = currentType->templateSubTypes[subtypeIndex].GetTypeInfo();
-						if (type && str == type->name)
-						{
-							ti = type;
-							break;
-						}
-					}
-				}
-
-				if (ti == 0)
-				{
-					// Check if the type is a child type of the current type
-					ti = GetFuncDef(str.AddressOf(), 0, currentType);
-					if (ti)
-					{
-						dt = asCDataType::CreateType(ti, false);
-						found = true;
-					}
-				}
-			}
-
-			if( ti == 0 )
-				ti = GetType(str.AddressOf(), ns, parentType);
-			if( ti == 0 && !module && currentType )
-				ti = GetTypeFromTypesKnownByObject(str.AddressOf(), currentType);
-
-			if( ti && !found )
-			{
-				found = true;
-
-				if( ti->flags & asOBJ_IMPLICIT_HANDLE )
-					isImplicitHandle = true;
-
-				// Make sure the module has access to the object type
-				if( !module || (module->accessMask & ti->accessMask) )
-				{
-					if( asOBJ_TYPEDEF == (ti->flags & asOBJ_TYPEDEF) )
-					{
-						// TODO: typedef: A typedef should be considered different from the original type (though with implicit conversions between the two)
-						// Create primitive data type based on object flags
-						dt = ti->CastToTypedefType()->aliasForType;
-						dt.MakeReadOnly(isConst);
-					}
-					else
-					{
-						if( ti->flags & asOBJ_TEMPLATE )
-						{
-							ti = GetTemplateInstanceFromNode(n, file, ti->CastToObjectType(), implicitNamespace, currentType, &n);
-							if (ti == 0)
-							{
-								// Return a dummy
-								return asCDataType::CreatePrimitive(ttInt, false);
-							}
-						}
-						else if( n && n->next && n->next->nodeType == snDataType )
-						{
-							asCString msg;
-							msg.Format(TXT_TYPE_s_NOT_TEMPLATE, ti->name.AddressOf());
-							WriteError(msg, file, n);
-						}
-
-						// Create object data type
-						if( ti )
-							dt = asCDataType::CreateType(ti, isConst);
-						else
-							dt = asCDataType::CreatePrimitive(ttInt, isConst);
-					}
-				}
-				else
-				{
-					asCString msg;
-					msg.Format(TXT_TYPE_s_NOT_AVAILABLE_FOR_MODULE, (const char *)str.AddressOf());
-					WriteError(msg, file, n);
-
-					dt.SetTokenType(ttInt);
-				}
-			}
-
-			if( !found )
-			{
-				// Try to find it in the parent namespace
-				if( ns )
-					ns = engine->GetParentNameSpace(ns);
-				if (parentType)
-					parentType = 0;
-			}
-		}
-
-		if( !found )
-		{
-			asCString msg;
-			if( origNs && origNs->name == "" )
-				msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS, str.AddressOf());
-			else if (origNs)
-				msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, str.AddressOf(), origNs->name.AddressOf());
-			else
-			{
-				// TODO: child funcdef: Message should explain that the identifier is not a type of the parent type
-				asCDataType pt = asCDataType::CreateType(origParentType, false);
-				msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, str.AddressOf(), pt.Format(origParentType->nameSpace, false).AddressOf());
-			}
-			WriteError(msg, file, n);
-
-			dt = asCDataType::CreatePrimitive(ttInt, isConst);
-			return dt;
-		}
-	}
-	else if( n->tokenType == ttAuto )
-	{
-		dt = asCDataType::CreateAuto(isConst);
-	}
-	else
-	{
-		// Create primitive data type
-		dt = asCDataType::CreatePrimitive(n->tokenType, isConst);
-	}
-
-	// Determine array dimensions and object handles
-	n = n->next;
-	while( n && (n->tokenType == ttOpenBracket || n->tokenType == ttHandle) )
-	{
-		if( n->tokenType == ttOpenBracket )
-		{
-			// Make sure the sub type can be instantiated
-			if( !dt.CanBeInstantiated() )
-			{
-				asCString str;
-				if( dt.IsAbstractClass() )
-					str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(ns).AddressOf());
-				else if( dt.IsInterface() )
-					str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(ns).AddressOf());
-				else
-					// TODO: Improve error message to explain why
-					str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(ns).AddressOf());
-
-				WriteError(str, file, n);
-			}
-
-			// Make the type an array (or multidimensional array)
-			if( dt.MakeArray(engine, module) < 0 )
-			{
-				WriteError(TXT_NO_DEFAULT_ARRAY_TYPE, file, n);
-				break;
-			}
-		}
-		else
-		{
-			// Make the type a handle
-			if( dt.IsObjectHandle() )
-			{
-				WriteError(TXT_HANDLE_OF_HANDLE_IS_NOT_ALLOWED, file, n);
-				break;
-			}
-			else if( dt.MakeHandle(true, acceptHandleForScope) < 0 )
-			{
-				WriteError(TXT_OBJECT_HANDLE_NOT_SUPPORTED, file, n);
-				break;
-			}
-		}
-		n = n->next;
-	}
-
-	if( isImplicitHandle )
-	{
-		// Make the type a handle
-		if( dt.MakeHandle(true, acceptHandleForScope) < 0 )
-			WriteError(TXT_OBJECT_HANDLE_NOT_SUPPORTED, file, n);
-	}
-
-	return dt;
-}
-
-asCObjectType *asCBuilder::GetTemplateInstanceFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *templateType, asSNameSpace *implicitNamespace, asCObjectType *currentType, asCScriptNode **next)
-{
-	// Check if the subtype is a type or the template's subtype
-	// if it is the template's subtype then this is the actual template type,
-	// orderwise it is a template instance.
-	// Only do this for application registered interface, as the
-	// scripts cannot implement templates.
-	asCArray<asCDataType> subTypes;
-	asUINT subtypeIndex;
-	asCScriptNode *n = node;
-	while (n && n->next && n->next->nodeType == snDataType)
-	{
-		n = n->next;
-
-		// When parsing function definitions for template registrations (currentType != 0) it is necessary 
-		// to pass in the current template type to the recursive call since it is this ones sub-template types
-		// that should be allowed.
-		asCDataType subType = CreateDataTypeFromNode(n, file, implicitNamespace, false, module ? 0 : (currentType ? currentType : templateType));
-		subTypes.PushLast(subType);
-
-		if (subType.IsReadOnly())
-		{
-			asCString msg;
-			msg.Format(TXT_TMPL_SUBTYPE_MUST_NOT_BE_READ_ONLY);
-			WriteError(msg, file, n);
-
-			// Return a dummy
-			return 0;
-		}
-	}
-
-	if (next)
-		*next = n;
-
-	if (subTypes.GetLength() != templateType->templateSubTypes.GetLength())
-	{
-		asCString msg;
-		msg.Format(TXT_TMPL_s_EXPECTS_d_SUBTYPES, templateType->name.AddressOf(), int(templateType->templateSubTypes.GetLength()));
-		WriteError(msg, file, node);
-
-		// Return a dummy
-		return 0;
-	}
-
-	// Check if any of the given subtypes are different from the template's declared subtypes
-	bool isDifferent = false;
-	for (subtypeIndex = 0; subtypeIndex < subTypes.GetLength(); subtypeIndex++)
-	{
-		if (subTypes[subtypeIndex].GetTypeInfo() != templateType->templateSubTypes[subtypeIndex].GetTypeInfo())
-		{
-			isDifferent = true;
-			break;
-		}
-	}
-
-	if (isDifferent)
-	{
-		// This is a template instance
-		// Need to find the correct object type
-		asCObjectType *otInstance = engine->GetTemplateInstanceType(templateType, subTypes, module);
-
-		if (otInstance && otInstance->scriptSectionIdx < 0)
-		{
-			// If this is the first time the template instance is used, store where it was declared from
-			otInstance->scriptSectionIdx = engine->GetScriptSectionNameIndex(file->name.AddressOf());
-			int row, column;
-			file->ConvertPosToRowCol(n->tokenPos, &row, &column);
-			otInstance->declaredAt = (row & 0xFFFFF) | (column << 20);
-		}
-
-		if (!otInstance)
-		{
-			asCString sub = subTypes[0].Format(templateType->nameSpace);
-			for (asUINT s = 1; s < subTypes.GetLength(); s++)
-			{
-				sub += ",";
-				sub += subTypes[s].Format(templateType->nameSpace);
-			}
-			asCString msg;
-			msg.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, templateType->name.AddressOf(), sub.AddressOf());
-			WriteError(msg, file, n);
-		}
-
-		return otInstance;
-	}
-
-	return templateType;
-}
-
-asCDataType asCBuilder::ModifyDataTypeFromNode(const asCDataType &type, asCScriptNode *node, asCScriptCode *file, asETypeModifiers *inOutFlags, bool *autoHandle)
-{
-	asCDataType dt = type;
-
-	if( inOutFlags ) *inOutFlags = asTM_NONE;
-
-	// Is the argument sent by reference?
-	asCScriptNode *n = node->firstChild;
-	if( n && n->tokenType == ttAmp )
-	{
-		if (dt.GetTokenType() == ttVoid)
-		{
-			asCString msg;
-			msg.Format(TXT_TYPE_s_CANNOT_BE_REFERENCE, type.Format(0).AddressOf());
-			WriteError(msg, file, node->firstChild);
-			return dt;
-		}
-
-		dt.MakeReference(true);
-		n = n->next;
-
-		if( n )
-		{
-			if( inOutFlags )
-			{
-				if( n->tokenType == ttIn )
-					*inOutFlags = asTM_INREF;
-				else if( n->tokenType == ttOut )
-					*inOutFlags = asTM_OUTREF;
-				else if( n->tokenType == ttInOut )
-					*inOutFlags = asTM_INOUTREF;
-				else
-					asASSERT(false);
-			}
-
-			n = n->next;
-		}
-		else
-		{
-			if( inOutFlags )
-				*inOutFlags = asTM_INOUTREF; // ttInOut
-		}
-
-		if( !engine->ep.allowUnsafeReferences &&
-			inOutFlags && *inOutFlags == asTM_INOUTREF )
-		{
-			// Verify that the base type support &inout parameter types
-			if( !dt.IsObject() || dt.IsObjectHandle() || !((dt.GetTypeInfo()->flags & asOBJ_NOCOUNT) || (dt.GetTypeInfo()->CastToObjectType()->beh.addref && dt.GetTypeInfo()->CastToObjectType()->beh.release)) )
-				WriteError(TXT_ONLY_OBJECTS_MAY_USE_REF_INOUT, file, node->firstChild);
-		}
-	}
-
-	if( autoHandle ) *autoHandle = false;
-
-	if( n && n->tokenType == ttPlus )
-	{
-		// Autohandles are not supported for types with NOCOUNT
-		// If the type is not a handle then there was an error with building the type, but 
-		// this error would already have been reported so no need to report another error here
-		if( dt.IsObjectHandle() && (dt.GetTypeInfo()->flags & asOBJ_NOCOUNT) )
-			WriteError(TXT_AUTOHANDLE_CANNOT_BE_USED_FOR_NOCOUNT, file, node->firstChild);
-
-		if( autoHandle ) *autoHandle = true;
-	}
-
-	return dt;
-}
-
-asCTypeInfo *asCBuilder::GetType(const char *type, asSNameSpace *ns, asCObjectType *parentType)
-{
-	asASSERT((ns == 0 && parentType) || (ns && parentType == 0));
-
-	if (ns)
-	{
-		asCTypeInfo *ti = engine->GetRegisteredType(type, ns);
-		if (!ti && module)
-			ti = module->GetType(type, ns);
-		return ti;
-	}
-	else
-	{
-		// Recursively check base classes
-		asCObjectType *currType = parentType;
-		while (currType)
-		{
-			for (asUINT n = 0; n < currType->childFuncDefs.GetLength(); n++)
-			{
-				asCFuncdefType *funcDef = currType->childFuncDefs[n];
-				if (funcDef && funcDef->name == type)
-					return funcDef;
-			}
-			currType = currType->derivedFrom;
-		}
-	}
-
-	return 0;
-}
-
-asCObjectType *asCBuilder::GetObjectType(const char *type, asSNameSpace *ns)
-{
-	return GetType(type, ns, 0)->CastToObjectType();
-}
-
-#ifndef AS_NO_COMPILER
-// This function will return true if there are any types in the engine or module
-// with the given name. The namespace is ignored in this verification.
-bool asCBuilder::DoesTypeExist(const asCString &type)
-{
-	asUINT n;
-
-	// This function is only used when parsing expressions for building bytecode
-	// and this is only done after all types are known. For this reason the types
-	// can be safely cached in a map for quick lookup. Once the builder is released
-	// the cache will also be destroyed thus avoiding unnecessary memory consumption.
-	if( !hasCachedKnownTypes )
-	{
-		// Only do this once
-		hasCachedKnownTypes = true;
-
-		// Add registered types
-		asSMapNode<asSNameSpaceNamePair, asCTypeInfo*> *cursor;
-		engine->allRegisteredTypes.MoveFirst(&cursor);
-		while( cursor )
-		{
-			if( !knownTypes.MoveTo(0, cursor->key.name) )
-				knownTypes.Insert(cursor->key.name, true);
-
-			engine->allRegisteredTypes.MoveNext(&cursor, cursor);
-		}
-
-		if (module)
-		{
-			// Add script classes and interfaces
-			for (n = 0; n < module->classTypes.GetLength(); n++)
-				if (!knownTypes.MoveTo(0, module->classTypes[n]->name))
-					knownTypes.Insert(module->classTypes[n]->name, true);
-		
-			// Add script enums
-			for (n = 0; n < module->enumTypes.GetLength(); n++)
-				if (!knownTypes.MoveTo(0, module->enumTypes[n]->name))
-					knownTypes.Insert(module->enumTypes[n]->name, true);
-		
-			// Add script typedefs
-			for (n = 0; n < module->typeDefs.GetLength(); n++)
-				if (!knownTypes.MoveTo(0, module->typeDefs[n]->name))
-					knownTypes.Insert(module->typeDefs[n]->name, true);
-		
-			// Add script funcdefs
-			for (n = 0; n < module->funcDefs.GetLength(); n++)
-				if (!knownTypes.MoveTo(0, module->funcDefs[n]->name))
-					knownTypes.Insert(module->funcDefs[n]->name, true);
-		}
-	}
-
-	// Check if the type is known
-	return knownTypes.MoveTo(0, type);
-}
-#endif
-
-asCTypeInfo *asCBuilder::GetTypeFromTypesKnownByObject(const char *type, asCObjectType *currentType)
-{
-	if (currentType->name == type)
-		return currentType;
-
-	asUINT n;
-
-	asCTypeInfo *found = 0;
-
-	for (n = 0; found == 0 && n < currentType->properties.GetLength(); n++)
-		if (currentType->properties[n]->type.GetTypeInfo() &&
-			currentType->properties[n]->type.GetTypeInfo()->name == type)
-			found = currentType->properties[n]->type.GetTypeInfo();
-
-	for (n = 0; found == 0 && n < currentType->methods.GetLength(); n++)
-	{
-		asCScriptFunction *func = engine->scriptFunctions[currentType->methods[n]];
-		if (func->returnType.GetTypeInfo() &&
-			func->returnType.GetTypeInfo()->name == type)
-			found = func->returnType.GetTypeInfo();
-
-		for (asUINT f = 0; found == 0 && f < func->parameterTypes.GetLength(); f++)
-			if (func->parameterTypes[f].GetTypeInfo() &&
-				func->parameterTypes[f].GetTypeInfo()->name == type)
-				found = func->parameterTypes[f].GetTypeInfo();
-	}
-
-	if (found)
-	{
-		// In case we find a template instance it mustn't be returned
-		// because it is not known if the subtype is really matching
-		if (found->flags & asOBJ_TEMPLATE)
-			return 0;
-	}
-
-	return found;
-}
-
-asCFuncdefType *asCBuilder::GetFuncDef(const char *type, asSNameSpace *ns, asCObjectType *parentType)
-{
-	asASSERT((ns == 0 && parentType) || (ns && parentType == 0));
-
-	if (ns)
-	{
-		for (asUINT n = 0; n < engine->registeredFuncDefs.GetLength(); n++)
-		{
-			asCFuncdefType *funcDef = engine->registeredFuncDefs[n];
-			// TODO: access: Only return the definitions that the module has access to
-			if (funcDef && funcDef->nameSpace == ns && funcDef->name == type)
-				return funcDef;
-		}
-
-		if (module)
-		{
-			for (asUINT n = 0; n < module->funcDefs.GetLength(); n++)
-			{
-				asCFuncdefType *funcDef = module->funcDefs[n];
-				if (funcDef && funcDef->nameSpace == ns && funcDef->name == type)
-					return funcDef;
-			}
-		}
-	}
-	else
-	{
-		// Recursively check base classes
-		asCObjectType *currType = parentType;
-		while (currType)
-		{
-			for (asUINT n = 0; n < currType->childFuncDefs.GetLength(); n++)
-			{
-				asCFuncdefType *funcDef = currType->childFuncDefs[n];
-				if (funcDef && funcDef->name == type)
-					return funcDef;
-			}
-			currType = currType->derivedFrom;
-		}
-	}
-
-	return 0;
-}
-
-#ifndef AS_NO_COMPILER
-
-int asCBuilder::GetEnumValueFromType(asCEnumType *type, const char *name, asCDataType &outDt, asDWORD &outValue)
-{
-	if( !type || !(type->flags & asOBJ_ENUM) )
-		return 0;
-
-	for( asUINT n = 0; n < type->enumValues.GetLength(); ++n )
-	{
-		if( type->enumValues[n]->name == name )
-		{
-			outDt = asCDataType::CreateType(type, true);
-			outValue = type->enumValues[n]->value;
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-int asCBuilder::GetEnumValue(const char *name, asCDataType &outDt, asDWORD &outValue, asSNameSpace *ns)
-{
-	bool found = false;
-
-	// Search all available enum types
-	asUINT t;
-	for( t = 0; t < engine->registeredEnums.GetLength(); t++ )
-	{
-		asCEnumType *et = engine->registeredEnums[t];
-		if( ns != et->nameSpace ) continue;
-
-		// Don't bother with types the module doesn't have access to
-		if( (et->accessMask & module->accessMask) == 0 )
-			continue;
-
-		if( GetEnumValueFromType(et, name, outDt, outValue) )
-		{
-			if( !found )
-				found = true;
-			else
-			{
-				// Found more than one value in different enum types
-				return 2;
-			}
-		}
-	}
-
-	for( t = 0; t < module->enumTypes.GetLength(); t++ )
-	{
-		asCEnumType *et = module->enumTypes[t];
-		if( ns != et->nameSpace ) continue;
-
-		if( GetEnumValueFromType(et, name, outDt, outValue) )
-		{
-			if( !found )
-				found = true;
-			else
-			{
-				// Found more than one value in different enum types
-				return 2;
-			}
-		}
-	}
-
-	if( found )
-		return 1;
-
-	// Didn't find any value
-	return 0;
-}
-
-#endif // AS_NO_COMPILER
-
-END_AS_NAMESPACE
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_builder.cpp
+//
+// This is the class that manages the compilation of the scripts
+//
+
+
+#include "as_config.h"
+#include "as_builder.h"
+#include "as_parser.h"
+#include "as_compiler.h"
+#include "as_tokendef.h"
+#include "as_string_util.h"
+#include "as_outputbuffer.h"
+#include "as_texts.h"
+#include "as_scriptobject.h"
+#include "as_debug.h"
+
+BEGIN_AS_NAMESPACE
+
+#ifndef AS_NO_COMPILER
+
+// asCSymbolTable template specializations for sGlobalVariableDescription entries
+template<>
+void asCSymbolTable<sGlobalVariableDescription>::GetKey(const sGlobalVariableDescription *entry, asSNameSpaceNamePair &key) const
+{
+	asSNameSpace *ns = entry->ns;
+	asCString name = entry->name;
+	key = asSNameSpaceNamePair(ns, name);
+}
+
+// Comparator for exact variable search
+class asCCompGlobVarType : public asIFilter
+{
+public:
+	const asCDataType &m_type;
+	asCCompGlobVarType(const asCDataType &type) : m_type(type) {}
+
+	bool operator()(const void *p) const
+	{
+		const sGlobalVariableDescription* desc = reinterpret_cast<const sGlobalVariableDescription*>(p);
+		return desc->datatype == m_type;
+	}
+
+private:
+	// The assignment operator is required for MSVC9, otherwise it will complain that it is not possible to auto generate the operator
+	asCCompGlobVarType &operator=(const asCCompGlobVarType &) {return *this;}
+};
+
+#endif
+
+asCBuilder::asCBuilder(asCScriptEngine *_engine, asCModule *_module)
+{
+	this->engine = _engine;
+	this->module = _module;
+	silent = false;
+}
+
+asCBuilder::~asCBuilder()
+{
+#ifndef AS_NO_COMPILER
+	asUINT n;
+
+	// Free all functions
+	for( n = 0; n < functions.GetLength(); n++ )
+	{
+		if( functions[n] )
+		{
+			if( functions[n]->node )
+				functions[n]->node->Destroy(engine);
+
+			asDELETE(functions[n],sFunctionDescription);
+		}
+
+		functions[n] = 0;
+	}
+
+	// Free all global variables
+	CleanupEnumValues();
+	asCSymbolTable<sGlobalVariableDescription>::iterator it = globVariables.List();
+	while( it )
+	{
+		if( (*it)->declaredAtNode )
+			(*it)->declaredAtNode->Destroy(engine);
+		if( (*it)->initializationNode )
+			(*it)->initializationNode->Destroy(engine);
+		asDELETE((*it),sGlobalVariableDescription);
+		it++;
+	}
+	globVariables.Clear();
+
+	// Free all the loaded files
+	for( n = 0; n < scripts.GetLength(); n++ )
+	{
+		if( scripts[n] )
+			asDELETE(scripts[n],asCScriptCode);
+
+		scripts[n] = 0;
+	}
+
+	// Free all class declarations
+	for( n = 0; n < classDeclarations.GetLength(); n++ )
+	{
+		if( classDeclarations[n] )
+		{
+			if( classDeclarations[n]->node )
+				classDeclarations[n]->node->Destroy(engine);
+
+			asDELETE(classDeclarations[n],sClassDeclaration);
+			classDeclarations[n] = 0;
+		}
+	}
+
+	for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
+	{
+		if( interfaceDeclarations[n] )
+		{
+			if( interfaceDeclarations[n]->node )
+				interfaceDeclarations[n]->node->Destroy(engine);
+
+			asDELETE(interfaceDeclarations[n],sClassDeclaration);
+			interfaceDeclarations[n] = 0;
+		}
+	}
+
+	for( n = 0; n < namedTypeDeclarations.GetLength(); n++ )
+	{
+		if( namedTypeDeclarations[n] )
+		{
+			if( namedTypeDeclarations[n]->node )
+				namedTypeDeclarations[n]->node->Destroy(engine);
+
+			asDELETE(namedTypeDeclarations[n],sClassDeclaration);
+			namedTypeDeclarations[n] = 0;
+		}
+	}
+
+	for( n = 0; n < funcDefs.GetLength(); n++ )
+	{
+		if( funcDefs[n] )
+		{
+			if( funcDefs[n]->node )
+				funcDefs[n]->node->Destroy(engine);
+
+			asDELETE(funcDefs[n],sFuncDef);
+			funcDefs[n] = 0;
+		}
+	}
+
+	for( n = 0; n < mixinClasses.GetLength(); n++ )
+	{
+		if( mixinClasses[n] )
+		{
+			if( mixinClasses[n]->node )
+				mixinClasses[n]->node->Destroy(engine);
+
+			asDELETE(mixinClasses[n],sMixinClass);
+			mixinClasses[n] = 0;
+		}
+	}
+
+#endif // AS_NO_COMPILER
+}
+
+void asCBuilder::Reset()
+{
+	numErrors = 0;
+	numWarnings = 0;
+	engine->preMessage.isSet = false;
+
+#ifndef AS_NO_COMPILER
+	// Clear the cache of known types
+	hasCachedKnownTypes = false;
+	knownTypes.EraseAll();
+#endif
+}
+
+#ifndef AS_NO_COMPILER
+int asCBuilder::AddCode(const char *name, const char *code, int codeLength, int lineOffset, int sectionIdx, bool makeCopy)
+{
+	asCScriptCode *script = asNEW(asCScriptCode);
+	if( script == 0 )
+		return asOUT_OF_MEMORY;
+
+	int r = script->SetCode(name, code, codeLength, makeCopy);
+	if( r < 0 )
+	{
+		asDELETE(script, asCScriptCode);
+		return r;
+	}
+
+	script->lineOffset = lineOffset;
+	script->idx = sectionIdx;
+	scripts.PushLast(script);
+
+	return 0;
+}
+
+asCScriptCode *asCBuilder::FindOrAddCode(const char *name, const char *code, size_t length)
+{
+	for (asUINT n = 0; n < scripts.GetLength(); n++)
+		if( scripts[n]->name == name && scripts[n]->codeLength == length && memcmp(scripts[n]->code, code, length) == 0 )
+			return scripts[n];
+
+	asCScriptCode *script = asNEW(asCScriptCode);
+	if (script == 0)
+		return 0;
+
+	int r = script->SetCode(name, code, length, true);
+	if (r < 0)
+	{
+		asDELETE(script, asCScriptCode);
+		return 0;
+	}
+
+	script->idx = engine->GetScriptSectionNameIndex(name);
+	scripts.PushLast(script);
+	return script;
+}
+
+void asCBuilder::EvaluateTemplateInstances(asUINT startIdx, bool keepSilent)
+{
+	// Backup the original message stream
+	bool                       msgCallback     = engine->msgCallback;
+	asSSystemFunctionInterface msgCallbackFunc = engine->msgCallbackFunc;
+	void                      *msgCallbackObj  = engine->msgCallbackObj;
+
+	// Set the new temporary message stream
+	asCOutputBuffer outBuffer;
+	if( keepSilent )
+		engine->SetMessageCallback(asMETHOD(asCOutputBuffer, Callback), &outBuffer, asCALL_THISCALL);
+
+	// Evaluate each of the template instances that have been created since the start of the build
+	// TODO: This is not exactly correct, since another thread may have created template instances in parallel
+	for( asUINT n = startIdx; n < engine->templateInstanceTypes.GetLength(); n++ )
+	{
+		bool dontGarbageCollect = false;
+		asCObjectType *tmpl = engine->templateInstanceTypes[n];
+		asCScriptFunction *callback = engine->scriptFunctions[tmpl->beh.templateCallback];
+		if( callback && !engine->CallGlobalFunctionRetBool(tmpl, &dontGarbageCollect, callback->sysFuncIntf, callback) )
+		{
+			asCString sub = tmpl->templateSubTypes[0].Format(engine->nameSpaces[0]);
+			for( asUINT m = 1; m < tmpl->templateSubTypes.GetLength(); m++ )
+			{
+				sub += ",";
+				sub += tmpl->templateSubTypes[m].Format(engine->nameSpaces[0]);
+			}
+			asCString str;
+			str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, tmpl->name.AddressOf(), sub.AddressOf());
+			WriteError(tmpl->scriptSectionIdx >= 0 ? engine->scriptSectionNames[tmpl->scriptSectionIdx]->AddressOf() : "", str, tmpl->declaredAt&0xFFFFF, (tmpl->declaredAt>>20)&0xFFF);
+		}
+		else
+		{
+			// If the callback said this template instance won't be garbage collected then remove the flag
+			if( dontGarbageCollect )
+				tmpl->flags &= ~asOBJ_GC;
+		}
+	}
+
+	// Restore message callback
+	if( keepSilent )
+	{
+		engine->msgCallback     = msgCallback;
+		engine->msgCallbackFunc = msgCallbackFunc;
+		engine->msgCallbackObj  = msgCallbackObj;
+	}
+}
+
+int asCBuilder::Build()
+{
+	Reset();
+
+	// The template callbacks must only be called after the subtypes have a known structure,
+	// otherwise the callback may think it is not possible to create the template instance,
+	// even though it is.
+	// TODO: This flag shouldn't be set globally in the engine, as it would mean that another
+	//       thread requesting a template instance in parallel to the compilation wouldn't
+	//       evaluate the template instance.
+	engine->deferValidationOfTemplateTypes = true;
+	asUINT numTempl = (asUINT)engine->templateInstanceTypes.GetLength();
+
+	ParseScripts();
+	if (numErrors > 0)
+		return asERROR;
+
+	// Compile the types first
+	CompileInterfaces();
+	CompileClasses(numTempl);
+
+	// Evaluate the template instances one last time, this time with error messages, as we know
+	// all classes have been fully built and it is known which ones will need garbage collection.
+	EvaluateTemplateInstances(numTempl, false);
+	engine->deferValidationOfTemplateTypes = false;
+	if (numErrors > 0)
+		return asERROR;
+
+	// Then the global variables. Here the variables declared with auto
+	// will be resolved, so they can be accessed properly in the functions
+	CompileGlobalVariables();
+
+	// Finally the global functions and class methods
+	CompileFunctions();
+
+	// TODO: Attempt to reorder the initialization of global variables so that
+	//       they do not access other uninitialized global variables out-of-order
+	//       The builder needs to check for each of the global variable, what functions
+	//       that are accessed, and what global variables are access by these functions.
+
+	if( numWarnings > 0 && engine->ep.compilerWarnings == 2 )
+		WriteError(TXT_WARNINGS_TREATED_AS_ERROR, 0, 0);
+
+	if( numErrors > 0 )
+		return asERROR;
+
+	// Make sure something was compiled, otherwise return an error
+	if( module->IsEmpty() )
+	{
+		WriteError(TXT_NOTHING_WAS_BUILT, 0, 0);
+		return asERROR;
+	}
+
+	return asSUCCESS;
+}
+
+int asCBuilder::CompileGlobalVar(const char *sectionName, const char *code, int lineOffset)
+{
+	Reset();
+
+	// Add the string to the script code
+	asCScriptCode *script = asNEW(asCScriptCode);
+	if( script == 0 )
+		return asOUT_OF_MEMORY;
+
+	script->SetCode(sectionName, code, true);
+	script->lineOffset = lineOffset;
+	script->idx = engine->GetScriptSectionNameIndex(sectionName ? sectionName : "");
+	scripts.PushLast(script);
+
+	// Parse the string
+	asCParser parser(this);
+	if( parser.ParseScript(scripts[0]) < 0 )
+		return asERROR;
+
+	asCScriptNode *node = parser.GetScriptNode();
+
+	// Make sure there is nothing else than the global variable in the script code
+	if( node == 0 ||
+		node->firstChild == 0 ||
+		node->firstChild != node->lastChild ||
+		node->firstChild->nodeType != snDeclaration )
+	{
+		WriteError(TXT_ONLY_ONE_VARIABLE_ALLOWED, script, 0);
+		return asERROR;
+	}
+
+	node = node->firstChild;
+	node->DisconnectParent();
+	RegisterGlobalVar(node, script, module->m_defaultNamespace);
+
+	CompileGlobalVariables();
+
+	// It is possible that the global variable initialization included anonymous functions that must be compiled too
+	for( asUINT n = 0; n < functions.GetLength(); n++ )
+	{
+		asCCompiler compiler(engine);
+		asCScriptFunction *func = engine->scriptFunctions[functions[n]->funcId];
+		int r = compiler.CompileFunction(this, functions[n]->script, func->parameterNames, functions[n]->node, func, 0);
+		if( r < 0 )
+			break;
+	}
+
+	if( numWarnings > 0 && engine->ep.compilerWarnings == 2 )
+		WriteError(TXT_WARNINGS_TREATED_AS_ERROR, 0, 0);
+
+	// None of the functions should be added to the module if any error occurred,
+	// or it was requested that the functions wouldn't be added to the scope
+	if( numErrors > 0 )
+	{
+		for( asUINT n = 0; n < functions.GetLength(); n++ )
+		{
+			asCScriptFunction *func = engine->scriptFunctions[functions[n]->funcId];
+			if( module->m_globalFunctions.GetIndex(func) >= 0 )
+			{
+				module->m_globalFunctions.Erase(module->m_globalFunctions.GetIndex(func));
+				module->m_scriptFunctions.RemoveValue(func);
+				func->ReleaseInternal();
+			}
+		}
+	}
+
+	if( numErrors > 0 )
+	{
+		// Remove the variable from the module, if it was registered
+		if( globVariables.GetSize() > 0 )
+			module->RemoveGlobalVar(module->GetGlobalVarCount()-1);
+
+		return asERROR;
+	}
+
+	return 0;
+}
+#endif
+
+int asCBuilder::ValidateDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func)
+{
+	int firstArgWithDefaultValue = -1;
+	for( asUINT n = 0; n < func->defaultArgs.GetLength(); n++ )
+	{
+		if( func->defaultArgs[n] )
+			firstArgWithDefaultValue = n;
+		else if( firstArgWithDefaultValue >= 0 )
+		{
+			asCString str;
+			str.Format(TXT_DEF_ARG_MISSING_IN_FUNC_s, func->GetDeclaration());
+			WriteError(str, script, node);
+			return asINVALID_DECLARATION;
+		}
+	}
+
+	return 0;
+}
+
+#ifndef AS_NO_COMPILER
+// This function will verify if the newly created function will conflict another overload due to having
+// identical function arguments that are not default args, e.g: foo(int) and foo(int, int=0)
+int asCBuilder::CheckForConflictsDueToDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func, asCObjectType *objType)
+{
+	// TODO: Implement for global functions too
+	if( func->objectType == 0 || objType == 0 ) return 0;
+
+	asCArray<int> funcs;
+	GetObjectMethodDescriptions(func->name.AddressOf(), objType, funcs, false);
+	for( asUINT n = 0; n < funcs.GetLength(); n++ )
+	{
+		asCScriptFunction *func2 = engine->scriptFunctions[funcs[n]];
+		if( func == func2 )
+			continue;
+
+		if( func->IsReadOnly() != func2->IsReadOnly() )
+			continue;
+
+		bool match = true;
+		asUINT p = 0;
+		for( ; p < func->parameterTypes.GetLength() && p < func2->parameterTypes.GetLength(); p++ )
+		{
+			// Only verify until the first argument with default args
+			if( (func->defaultArgs.GetLength() > p && func->defaultArgs[p]) ||
+				(func2->defaultArgs.GetLength() > p && func2->defaultArgs[p]) )
+				break;
+
+			if( func->parameterTypes[p] != func2->parameterTypes[p] ||
+				func->inOutFlags[p] != func2->inOutFlags[p] )
+			{
+				match = false;
+				break;
+			}
+		}
+
+		if( match )
+		{
+			if( !((p >= func->parameterTypes.GetLength() && p < func2->defaultArgs.GetLength() && func2->defaultArgs[p]) ||
+				  (p >= func2->parameterTypes.GetLength() && p < func->defaultArgs.GetLength() && func->defaultArgs[p])) )
+			{
+				// The argument lists match for the full length of the shorter, but the next
+				// argument on the longer does not have a default arg so there is no conflict
+				match = false;
+			}
+		}
+
+		if( match )
+		{
+			WriteWarning(TXT_OVERLOAD_CONFLICTS_DUE_TO_DEFAULT_ARGS, script, node);
+			WriteInfo(func->GetDeclaration(), script, node);
+			WriteInfo(func2->GetDeclaration(), script, node);
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int asCBuilder::CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asCScriptFunction **outFunc)
+{
+	asASSERT(outFunc != 0);
+
+	Reset();
+
+	// Add the string to the script code
+	asCScriptCode *script = asNEW(asCScriptCode);
+	if( script == 0 )
+		return asOUT_OF_MEMORY;
+
+	script->SetCode(sectionName, code, true);
+	script->lineOffset = lineOffset;
+	script->idx = engine->GetScriptSectionNameIndex(sectionName ? sectionName : "");
+	scripts.PushLast(script);
+
+	// Parse the string
+	asCParser parser(this);
+	if( parser.ParseScript(scripts[0]) < 0 )
+		return asERROR;
+
+	asCScriptNode *node = parser.GetScriptNode();
+
+	// Make sure there is nothing else than the function in the script code
+	if( node == 0 ||
+		node->firstChild == 0 ||
+		node->firstChild != node->lastChild ||
+		node->firstChild->nodeType != snFunction )
+	{
+		WriteError(TXT_ONLY_ONE_FUNCTION_ALLOWED, script, 0);
+		return asERROR;
+	}
+
+	// Find the function node
+	node = node->firstChild;
+
+	// Create the function
+	asSFunctionTraits funcTraits;
+	asCScriptFunction *func = asNEW(asCScriptFunction)(engine, compileFlags & asCOMP_ADD_TO_MODULE ? module : 0, asFUNC_SCRIPT);
+	if( func == 0 )
+		return asOUT_OF_MEMORY;
+
+	GetParsedFunctionDetails(node, scripts[0], 0, func->name, func->returnType, func->parameterNames, func->parameterTypes, func->inOutFlags, func->defaultArgs, funcTraits, module->m_defaultNamespace);
+	func->id                           = engine->GetNextScriptFunctionId();
+	func->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(sectionName ? sectionName : "");
+	int row, col;
+	scripts[0]->ConvertPosToRowCol(node->tokenPos, &row, &col);
+	func->scriptData->declaredAt       = (row & 0xFFFFF)|((col & 0xFFF)<<20);
+	func->nameSpace                    = module->m_defaultNamespace;
+
+	// Make sure the default args are declared correctly
+	int r = ValidateDefaultArgs(script, node, func);
+	if( r < 0 )
+	{
+		func->ReleaseInternal();
+		return asERROR;
+	}
+
+	// Tell the engine that the function exists already so the compiler can access it
+	if( compileFlags & asCOMP_ADD_TO_MODULE )
+	{
+		r = CheckNameConflict(func->name.AddressOf(), node, scripts[0], module->m_defaultNamespace, false, false, false);
+		if( r < 0 )
+		{
+			func->ReleaseInternal();
+			return asERROR;
+		}
+
+		module->m_globalFunctions.Put(func);
+
+		module->AddScriptFunction(func);
+	}
+	else
+		engine->AddScriptFunction(func);
+
+	// Fill in the function info for the builder too
+	node->DisconnectParent();
+	sFunctionDescription *funcDesc = asNEW(sFunctionDescription);
+	if( funcDesc == 0 )
+	{
+		func->ReleaseInternal();
+		return asOUT_OF_MEMORY;
+	}
+
+	functions.PushLast(funcDesc);
+	funcDesc->script            = scripts[0];
+	funcDesc->node              = node;
+	funcDesc->name              = func->name;
+	funcDesc->funcId            = func->id;
+	funcDesc->paramNames        = func->parameterNames;
+	funcDesc->isExistingShared  = false;
+
+	// This must be done in a loop, as it is possible that additional functions get declared as lambda's in the code
+	for( asUINT n = 0; n < functions.GetLength(); n++ )
+	{
+		asCCompiler compiler(engine);
+		asCScriptFunction *f = engine->scriptFunctions[functions[n]->funcId];
+		r = compiler.CompileFunction(this, functions[n]->script, f->parameterNames, functions[n]->node, f, 0);
+		if( r < 0 )
+			break;
+	}
+
+	if( numWarnings > 0 && engine->ep.compilerWarnings == 2 )
+		WriteError(TXT_WARNINGS_TREATED_AS_ERROR, 0, 0);
+
+	// None of the functions should be added to the module if any error occurred,
+	// or it was requested that the functions wouldn't be added to the scope
+	if( !(compileFlags & asCOMP_ADD_TO_MODULE) || numErrors > 0 )
+	{
+		for( asUINT n = 0; n < functions.GetLength(); n++ )
+		{
+			asCScriptFunction *f = engine->scriptFunctions[functions[n]->funcId];
+			if( module->m_globalFunctions.GetIndex(f) >= 0 )
+			{
+				module->m_globalFunctions.Erase(module->m_globalFunctions.GetIndex(f));
+				module->m_scriptFunctions.RemoveValue(f);
+				f->ReleaseInternal();
+			}
+		}
+	}
+
+	if( numErrors > 0 )
+	{
+		// Release the function pointer that would otherwise be returned if no errors occured
+		func->ReleaseInternal();
+
+		return asERROR;
+	}
+
+	// Return the function
+	*outFunc = func;
+
+	return asSUCCESS;
+}
+
+void asCBuilder::ParseScripts()
+{
+	TimeIt("asCBuilder::ParseScripts");
+
+	asCArray<asCParser*> parsers((int)scripts.GetLength());
+
+	// Parse all the files as if they were one
+	asUINT n = 0;
+	for( n = 0; n < scripts.GetLength(); n++ )
+	{
+		asCParser *parser = asNEW(asCParser)(this);
+		if( parser != 0 )
+		{
+			parsers.PushLast(parser);
+
+			// Parse the script file
+			parser->ParseScript(scripts[n]);
+		}
+	}
+
+	if (numErrors == 0)
+	{
+		// Find all type declarations
+		for (n = 0; n < scripts.GetLength(); n++)
+		{
+			asCScriptNode *node = parsers[n]->GetScriptNode();
+			RegisterTypesFromScript(node, scripts[n], engine->nameSpaces[0]);
+		}
+
+		// Before moving forward the builder must establish the relationship between types
+		// so that a derived type can see the child types of the parent type.
+		DetermineTypeRelations();
+
+		// Complete function definitions (defining returntype and parameters)
+		for( n = 0; n < funcDefs.GetLength(); n++ )
+			CompleteFuncDef(funcDefs[n]);
+
+		// Find other global nodes
+		for (n = 0; n < scripts.GetLength(); n++)
+		{
+			// Find other global nodes
+			asCScriptNode *node = parsers[n]->GetScriptNode();
+			RegisterNonTypesFromScript(node, scripts[n], engine->nameSpaces[0]);
+		}
+
+		// Register script methods found in the interfaces
+		for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
+		{
+			sClassDeclaration *decl = interfaceDeclarations[n];
+			asCScriptNode *node = decl->node->firstChild->next;
+
+			// Skip list of inherited interfaces
+			while( node && node->nodeType == snIdentifier )
+				node = node->next;
+
+			while( node )
+			{
+				asCScriptNode *next = node->next;
+				if( node->nodeType == snFunction )
+				{
+					node->DisconnectParent();
+					RegisterScriptFunctionFromNode(node, decl->script, CastToObjectType(decl->typeInfo), true, false, 0, decl->isExistingShared);
+				}
+				else if( node->nodeType == snVirtualProperty )
+				{
+					node->DisconnectParent();
+					RegisterVirtualProperty(node, decl->script, CastToObjectType(decl->typeInfo), true, false, 0, decl->isExistingShared);
+				}
+
+				node = next;
+			}
+		}
+
+		// Register script methods found in the classes
+		for( n = 0; n < classDeclarations.GetLength(); n++ )
+		{
+			sClassDeclaration *decl = classDeclarations[n];
+
+			asCScriptNode *node = decl->node->firstChild->next;
+
+			// Skip list of classes and interfaces
+			while( node && node->nodeType == snIdentifier )
+				node = node->next;
+
+			while( node )
+			{
+				asCScriptNode *next = node->next;
+				if( node->nodeType == snFunction )
+				{
+					node->DisconnectParent();
+					RegisterScriptFunctionFromNode(node, decl->script, CastToObjectType(decl->typeInfo), false, false, 0, decl->isExistingShared);
+				}
+				else if( node->nodeType == snVirtualProperty )
+				{
+					node->DisconnectParent();
+					RegisterVirtualProperty(node, decl->script, CastToObjectType(decl->typeInfo), false, false, 0, decl->isExistingShared);
+				}
+
+				node = next;
+			}
+
+			// Make sure the default factory & constructor exists for classes
+			asCObjectType *ot = CastToObjectType(decl->typeInfo);
+			if( ot->beh.construct == engine->scriptTypeBehaviours.beh.construct )
+			{
+				if( ot->beh.constructors.GetLength() == 1 || engine->ep.alwaysImplDefaultConstruct )
+				{
+					AddDefaultConstructor(ot, decl->script);
+				}
+				else
+				{
+					// As the class has another constructor we shouldn't provide the default constructor
+					if( ot->beh.construct )
+					{
+						engine->scriptFunctions[ot->beh.construct]->ReleaseInternal();
+						ot->beh.construct = 0;
+						ot->beh.constructors.RemoveIndex(0);
+					}
+					if( ot->beh.factory )
+					{
+						engine->scriptFunctions[ot->beh.factory]->ReleaseInternal();
+						ot->beh.factory = 0;
+						ot->beh.factories.RemoveIndex(0);
+					}
+					// Only remove the opAssign method if the script hasn't provided one
+					if( ot->beh.copy == engine->scriptTypeBehaviours.beh.copy )
+					{
+						engine->scriptFunctions[ot->beh.copy]->ReleaseInternal();
+						ot->beh.copy = 0;
+					}
+				}
+			}
+		}
+	}
+
+	for( n = 0; n < parsers.GetLength(); n++ )
+	{
+		asDELETE(parsers[n],asCParser);
+	}
+}
+
+void asCBuilder::RegisterTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns)
+{
+	asASSERT(node->nodeType == snScript);
+
+	// Find structure definitions first
+	node = node->firstChild;
+	while( node )
+	{
+		asCScriptNode *next = node->next;
+		if( node->nodeType == snNamespace )
+		{
+			// Recursively register the entities defined in the namespace
+			asCString nsName;
+			nsName.Assign(&script->code[node->firstChild->tokenPos], node->firstChild->tokenLength);
+			if( ns->name != "" )
+				nsName = ns->name + "::" + nsName;
+
+			asSNameSpace *nsChild = engine->AddNameSpace(nsName.AddressOf());
+			RegisterTypesFromScript(node->lastChild, script, nsChild);
+		}
+		else
+		{
+			if( node->nodeType == snClass )
+			{
+				node->DisconnectParent();
+				RegisterClass(node, script, ns);
+			}
+			else if( node->nodeType == snInterface )
+			{
+				node->DisconnectParent();
+				RegisterInterface(node, script, ns);
+			}
+			else if( node->nodeType == snEnum )
+			{
+				node->DisconnectParent();
+				RegisterEnum(node, script, ns);
+			}
+			else if( node->nodeType == snTypedef )
+			{
+				node->DisconnectParent();
+				RegisterTypedef(node, script, ns);
+			}
+			else if( node->nodeType == snFuncDef )
+			{
+				node->DisconnectParent();
+				RegisterFuncDef(node, script, ns, 0);
+			}
+			else if( node->nodeType == snMixin )
+			{
+				node->DisconnectParent();
+				RegisterMixinClass(node, script, ns);
+			}
+		}
+
+		node = next;
+	}
+}
+
+void asCBuilder::RegisterNonTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns)
+{
+	node = node->firstChild;
+	while( node )
+	{
+		asCScriptNode *next = node->next;
+		if( node->nodeType == snNamespace )
+		{
+			// Determine the name of the namespace
+			asCString nsName;
+			nsName.Assign(&script->code[node->firstChild->tokenPos], node->firstChild->tokenLength);
+			if( ns->name != "" )
+				nsName = ns->name + "::" + nsName;
+
+			// Declare the namespace, then add the entities
+			asSNameSpace *nsChild = engine->AddNameSpace(nsName.AddressOf());
+			RegisterNonTypesFromScript(node->lastChild, script, nsChild);
+		}
+		else
+		{
+			node->DisconnectParent();
+			if( node->nodeType == snFunction )
+				RegisterScriptFunctionFromNode(node, script, 0, false, true, ns);
+			else if( node->nodeType == snDeclaration )
+				RegisterGlobalVar(node, script, ns);
+			else if( node->nodeType == snVirtualProperty )
+				RegisterVirtualProperty(node, script, 0, false, true, ns);
+			else if( node->nodeType == snImport )
+				RegisterImportedFunction(module->GetNextImportedFunctionId(), node, script, ns);
+			else
+			{
+				// Unused script node
+				int r, c;
+				script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+				WriteWarning(script->name, TXT_UNUSED_SCRIPT_NODE, r, c);
+
+				node->Destroy(engine);
+			}
+		}
+
+		node = next;
+	}
+}
+
+void asCBuilder::CompileFunctions()
+{
+	// Compile each function
+	for( asUINT n = 0; n < functions.GetLength(); n++ )
+	{
+		sFunctionDescription *current = functions[n];
+		if( current == 0 ) continue;
+
+		// Don't compile the function again if it was an existing shared function
+		if( current->isExistingShared ) continue;
+
+		// Don't compile if there is no statement block
+		if (current->node && !(current->node->nodeType == snStatementBlock || current->node->lastChild->nodeType == snStatementBlock))
+			continue;
+
+		asCCompiler compiler(engine);
+		asCScriptFunction *func = engine->scriptFunctions[current->funcId];
+
+		// Find the class declaration for constructors
+		sClassDeclaration *classDecl = 0;
+		if( current->objType && current->name == current->objType->name )
+		{
+			for( asUINT c = 0; c < classDeclarations.GetLength(); c++ )
+			{
+				if( classDeclarations[c]->typeInfo == current->objType )
+				{
+					classDecl = classDeclarations[c];
+					break;
+				}
+			}
+
+			asASSERT( classDecl );
+		}
+
+		if( current->node )
+		{
+			int r, c;
+			current->script->ConvertPosToRowCol(current->node->tokenPos, &r, &c);
+
+			asCString str = func->GetDeclarationStr();
+			str.Format(TXT_COMPILING_s, str.AddressOf());
+			WriteInfo(current->script->name, str, r, c, true);
+
+			// When compiling a constructor need to pass the class declaration for member initializations
+			compiler.CompileFunction(this, current->script, current->paramNames, current->node, func, classDecl);
+
+			engine->preMessage.isSet = false;
+		}
+		else if( current->objType && current->name == current->objType->name )
+		{
+			asCScriptNode *node = classDecl->node;
+
+			int r = 0, c = 0;
+			if( node )
+				current->script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+			asCString str = func->GetDeclarationStr();
+			str.Format(TXT_COMPILING_s, str.AddressOf());
+			WriteInfo(current->script->name, str, r, c, true);
+
+			// This is the default constructor that is generated
+			// automatically if not implemented by the user.
+			compiler.CompileDefaultConstructor(this, current->script, node, func, classDecl);
+
+			engine->preMessage.isSet = false;
+		}
+		else
+		{
+			asASSERT( false );
+		}
+	}
+}
+#endif
+
+// Called from module and engine
+int asCBuilder::ParseDataType(const char *datatype, asCDataType *result, asSNameSpace *implicitNamespace, bool isReturnType)
+{
+	Reset();
+
+	asCScriptCode source;
+	source.SetCode("", datatype, true);
+
+	asCParser parser(this);
+	int r = parser.ParseDataType(&source, isReturnType);
+	if( r < 0 )
+		return asINVALID_TYPE;
+
+	// Get data type and property name
+	asCScriptNode *dataType = parser.GetScriptNode()->firstChild;
+
+	*result = CreateDataTypeFromNode(dataType, &source, implicitNamespace, true);
+	if( isReturnType )
+		*result = ModifyDataTypeFromNode(*result, dataType->next, &source, 0, 0);
+
+	if( numErrors > 0 )
+		return asINVALID_TYPE;
+
+	return asSUCCESS;
+}
+
+int asCBuilder::ParseTemplateDecl(const char *decl, asCString *name, asCArray<asCString> &subtypeNames)
+{
+	Reset();
+
+	asCScriptCode source;
+	source.SetCode("", decl, true);
+
+	asCParser parser(this);
+	int r = parser.ParseTemplateDecl(&source);
+	if( r < 0 )
+		return asINVALID_TYPE;
+
+	// Get the template name and subtype names
+	asCScriptNode *node = parser.GetScriptNode()->firstChild;
+
+	name->Assign(&decl[node->tokenPos], node->tokenLength);
+	while( (node = node->next) != 0 )
+	{
+		asCString subtypeName;
+		subtypeName.Assign(&decl[node->tokenPos], node->tokenLength);
+		subtypeNames.PushLast(subtypeName);
+	}
+
+	// TODO: template: check for name conflicts
+
+	if( numErrors > 0 )
+		return asINVALID_DECLARATION;
+
+	return asSUCCESS;
+}
+
+int asCBuilder::VerifyProperty(asCDataType *dt, const char *decl, asCString &name, asCDataType &type, asSNameSpace *ns)
+{
+	// Either datatype or namespace must be informed
+	asASSERT( dt || ns );
+
+	Reset();
+
+	if( dt )
+	{
+		// Verify that the object type exist
+		if( CastToObjectType(dt->GetTypeInfo()) == 0 )
+			return asINVALID_OBJECT;
+	}
+
+	// Check property declaration and type
+	asCScriptCode source;
+	source.SetCode(TXT_PROPERTY, decl, true);
+
+	asCParser parser(this);
+	int r = parser.ParsePropertyDeclaration(&source);
+	if( r < 0 )
+		return asINVALID_DECLARATION;
+
+	// Get data type
+	asCScriptNode *dataType = parser.GetScriptNode()->firstChild;
+
+	// Check if the property is declared 'by reference'
+	bool isReference = (dataType->next->tokenType == ttAmp);
+
+	// Get the name of the property
+	asCScriptNode *nameNode = isReference ? dataType->next->next : dataType->next;
+
+	// If an object property is registered, then use the
+	// object's namespace, otherwise use the specified namespace
+	type = CreateDataTypeFromNode(dataType, &source, dt ? dt->GetTypeInfo()->nameSpace : ns);
+	name.Assign(&decl[nameNode->tokenPos], nameNode->tokenLength);
+	type.MakeReference(isReference);
+
+	// Validate that the type really can be a registered property
+	// We cannot use CanBeInstantiated, as it is allowed to register
+	// properties of type that cannot otherwise be instantiated
+	if( type.IsFuncdef() && !type.IsObjectHandle() )
+	{
+		// Function definitions must always be handles
+		return asINVALID_DECLARATION;
+	}
+
+	// Verify property name
+	if( dt )
+	{
+		if( CheckNameConflictMember(dt->GetTypeInfo(), name.AddressOf(), nameNode, &source, true, false) < 0 )
+			return asNAME_TAKEN;
+	}
+	else
+	{
+		if( CheckNameConflict(name.AddressOf(), nameNode, &source, ns, true, false, false) < 0 )
+			return asNAME_TAKEN;
+	}
+
+	if( numErrors > 0 )
+		return asINVALID_DECLARATION;
+
+	return asSUCCESS;
+}
+
+#ifndef AS_NO_COMPILER
+asCObjectProperty *asCBuilder::GetObjectProperty(asCDataType &obj, const char *prop)
+{
+	asASSERT(CastToObjectType(obj.GetTypeInfo()) != 0);
+
+	// TODO: optimize: Improve linear search
+	asCArray<asCObjectProperty *> &props = CastToObjectType(obj.GetTypeInfo())->properties;
+	for( asUINT n = 0; n < props.GetLength(); n++ )
+	{
+		if( props[n]->name == prop )
+		{
+			if( module->m_accessMask & props[n]->accessMask )
+				return props[n];
+			else
+				return 0;
+		}
+	}
+
+	return 0;
+}
+#endif
+
+bool asCBuilder::DoesGlobalPropertyExist(const char *prop, asSNameSpace *ns, asCGlobalProperty **outProp, sGlobalVariableDescription **outDesc, bool *isAppProp)
+{
+	if( outProp )   *outProp = 0;
+	if( outDesc )   *outDesc = 0;
+	if( isAppProp ) *isAppProp = false;
+
+	// Check application registered properties
+	asCString name(prop);
+	asCGlobalProperty *globProp = engine->registeredGlobalProps.GetFirst(ns, name);
+	if( globProp )
+	{
+		if( isAppProp ) *isAppProp = true;
+		if( outProp )   *outProp   = globProp;
+		return true;
+	}
+
+#ifndef AS_NO_COMPILER
+	// Check properties being compiled now
+	sGlobalVariableDescription* desc = globVariables.GetFirst(ns, prop);
+	if( desc && !desc->isEnumValue )
+	{
+		if( outProp ) *outProp = desc->property;
+		if( outDesc ) *outDesc = desc;
+		return true;
+	}
+#endif
+
+	// Check previously compiled global variables
+	if( module )
+	{
+		globProp = module->m_scriptGlobals.GetFirst(ns, prop);
+		if( globProp )
+		{
+			if( outProp ) *outProp = globProp;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+asCGlobalProperty *asCBuilder::GetGlobalProperty(const char *prop, asSNameSpace *ns, bool *isCompiled, bool *isPureConstant, asQWORD *constantValue, bool *isAppProp)
+{
+	if( isCompiled )     *isCompiled     = true;
+	if( isPureConstant ) *isPureConstant = false;
+	if( isAppProp )      *isAppProp      = false;
+	if( constantValue )  *constantValue  = 0;
+
+	asCGlobalProperty          *globProp = 0;
+	sGlobalVariableDescription *globDesc = 0;
+	if( DoesGlobalPropertyExist(prop, ns, &globProp, &globDesc, isAppProp) )
+	{
+#ifndef AS_NO_COMPILER
+		if( globDesc )
+		{
+			// The property was declared in this build call, check if it has been compiled successfully already
+			if( isCompiled )     *isCompiled     = globDesc->isCompiled;
+			if( isPureConstant ) *isPureConstant = globDesc->isPureConstant;
+			if( constantValue  ) *constantValue  = globDesc->constantValue;
+		}
+		else
+#endif
+		if( isAppProp )
+		{
+			// Don't return the property if the module doesn't have access to it
+			if( !(module->m_accessMask & globProp->accessMask) )
+				globProp = 0;
+		}
+		return globProp;
+	}
+
+	return 0;
+}
+
+int asCBuilder::ParseFunctionDeclaration(asCObjectType *objType, const char *decl, asCScriptFunction *func, bool isSystemFunction, asCArray<bool> *paramAutoHandles, bool *returnAutoHandle, asSNameSpace *ns, asCScriptNode **listPattern, asCObjectType **outParentClass)
+{
+	asASSERT( objType || ns );
+
+	if (listPattern)
+		*listPattern = 0;
+	if (outParentClass)
+		*outParentClass = 0;
+
+	// TODO: Can't we use GetParsedFunctionDetails to do most of what is done in this function?
+
+	Reset();
+
+	asCScriptCode source;
+	source.SetCode(TXT_SYSTEM_FUNCTION, decl, true);
+
+	asCParser parser(this);
+	int r = parser.ParseFunctionDefinition(&source, listPattern != 0);
+	if( r < 0 )
+		return asINVALID_DECLARATION;
+
+	asCScriptNode *node = parser.GetScriptNode();
+
+	// Determine scope
+	asCScriptNode *n = node->firstChild->next->next;
+	asCObjectType *parentClass = 0;
+	func->nameSpace = GetNameSpaceFromNode(n, &source, ns, &n, &parentClass);
+	if( func->nameSpace == 0 && parentClass == 0 )
+		return asINVALID_DECLARATION;
+	if (parentClass && func->funcType != asFUNC_FUNCDEF)
+		return asINVALID_DECLARATION;
+
+	if (outParentClass)
+		*outParentClass = parentClass;
+
+	// Find name
+	func->name.Assign(&source.code[n->tokenPos], n->tokenLength);
+
+	// Initialize a script function object for registration
+	bool autoHandle;
+
+	// Scoped reference types are allowed to use handle when returned from application functions
+	func->returnType = CreateDataTypeFromNode(node->firstChild, &source, objType ? objType->nameSpace : ns, true, parentClass ? parentClass : objType);
+	func->returnType = ModifyDataTypeFromNode(func->returnType, node->firstChild->next, &source, 0, &autoHandle);
+	if( autoHandle && (!func->returnType.IsObjectHandle() || func->returnType.IsReference()) )
+		return asINVALID_DECLARATION;
+	if( returnAutoHandle ) *returnAutoHandle = autoHandle;
+
+	// Reference types cannot be returned by value from system functions
+	if( isSystemFunction &&
+		(func->returnType.GetTypeInfo() &&
+		 (func->returnType.GetTypeInfo()->flags & asOBJ_REF)) &&
+		!(func->returnType.IsReference() ||
+		  func->returnType.IsObjectHandle()) )
+		return asINVALID_DECLARATION;
+
+	// Count number of parameters
+	int paramCount = 0;
+	asCScriptNode *paramList = n->next;
+	n = paramList->firstChild;
+	while( n )
+	{
+		paramCount++;
+		n = n->next->next;
+		if( n && n->nodeType == snIdentifier )
+			n = n->next;
+
+		if( n && n->nodeType == snExpression )
+			n = n->next;
+	}
+
+	// Preallocate memory
+	func->parameterTypes.Allocate(paramCount, false);
+	func->parameterNames.SetLength(paramCount);
+	func->inOutFlags.Allocate(paramCount, false);
+	func->defaultArgs.Allocate(paramCount, false);
+	if( paramAutoHandles ) paramAutoHandles->Allocate(paramCount, false);
+
+	n = paramList->firstChild;
+	asUINT index = 0;
+	while( n )
+	{
+		asETypeModifiers inOutFlags;
+		asCDataType type = CreateDataTypeFromNode(n, &source, objType ? objType->nameSpace : ns, false, parentClass ? parentClass : objType);
+		type = ModifyDataTypeFromNode(type, n->next, &source, &inOutFlags, &autoHandle);
+
+		// Reference types cannot be passed by value to system functions
+		if( isSystemFunction &&
+			(type.GetTypeInfo() &&
+			 (type.GetTypeInfo()->flags & asOBJ_REF)) &&
+			!(type.IsReference() ||
+			  type.IsObjectHandle()) )
+			return asINVALID_DECLARATION;
+
+		// Store the parameter type
+		func->parameterTypes.PushLast(type);
+		func->inOutFlags.PushLast(inOutFlags);
+
+		// Don't permit void parameters
+		if( type.GetTokenType() == ttVoid )
+			return asINVALID_DECLARATION;
+
+		if( autoHandle && (!type.IsObjectHandle() || type.IsReference()) )
+			return asINVALID_DECLARATION;
+
+		if( paramAutoHandles ) paramAutoHandles->PushLast(autoHandle);
+
+		// Make sure that var type parameters are references
+		if( type.GetTokenType() == ttQuestion &&
+			!type.IsReference() )
+			return asINVALID_DECLARATION;
+
+		// Move to next parameter
+		n = n->next->next;
+		if( n && n->nodeType == snIdentifier )
+		{
+			func->parameterNames[index] = asCString(&source.code[n->tokenPos], n->tokenLength);
+			n = n->next;
+		}
+		++index;
+
+		if( n && n->nodeType == snExpression )
+		{
+			// Strip out white space and comments to better share the string
+			asCString *defaultArgStr = asNEW(asCString);
+			if( defaultArgStr )
+			{
+				*defaultArgStr = GetCleanExpressionString(n, &source);
+				func->defaultArgs.PushLast(defaultArgStr);
+			}
+
+			n = n->next;
+		}
+		else
+			func->defaultArgs.PushLast(0);
+	}
+
+	// Set the read-only flag if const is declared after parameter list
+	n = paramList->next;
+	if( n && n->nodeType == snUndefined && n->tokenType == ttConst )
+	{
+		if( objType == 0 )
+			return asINVALID_DECLARATION;
+		func->SetReadOnly(true);
+
+		n = n->next;
+	}
+	else
+		func->SetReadOnly(false);
+
+	// Check for additional function traits
+	while (n && n->nodeType == snIdentifier)
+	{
+		if (source.TokenEquals(n->tokenPos, n->tokenLength, EXPLICIT_TOKEN))
+			func->SetExplicit(true);
+		else if( source.TokenEquals(n->tokenPos, n->tokenLength, PROPERTY_TOKEN))
+			func->SetProperty(true);
+		else
+			return asINVALID_DECLARATION;
+
+		n = n->next;
+	}
+
+	// If the caller expects a list pattern, check for the existence, else report an error if not
+	if( listPattern )
+	{
+		if( n == 0 || n->nodeType != snListPattern )
+			return asINVALID_DECLARATION;
+		else
+		{
+			*listPattern = n;
+			n->DisconnectParent();
+		}
+	}
+	else
+	{
+		if( n )
+			return asINVALID_DECLARATION;
+	}
+
+	// Make sure the default args are declared correctly
+	ValidateDefaultArgs(&source, node, func);
+
+	if( numErrors > 0 || numWarnings > 0 )
+		return asINVALID_DECLARATION;
+
+	return 0;
+}
+
+int asCBuilder::ParseVariableDeclaration(const char *decl, asSNameSpace *implicitNamespace, asCString &outName, asSNameSpace *&outNamespace, asCDataType &outDt)
+{
+	Reset();
+
+	asCScriptCode source;
+	source.SetCode(TXT_VARIABLE_DECL, decl, true);
+
+	asCParser parser(this);
+
+	int r = parser.ParsePropertyDeclaration(&source);
+	if( r < 0 )
+		return asINVALID_DECLARATION;
+
+	asCScriptNode *node = parser.GetScriptNode();
+
+	// Determine the scope from declaration
+	asCScriptNode *n = node->firstChild->next;
+	// TODO: child funcdef: The parentType will be set if the scope is actually a type rather than a namespace
+	outNamespace = GetNameSpaceFromNode(n, &source, implicitNamespace, &n);
+	if( outNamespace == 0 )
+		return asINVALID_DECLARATION;
+
+	// Find name
+	outName.Assign(&source.code[n->tokenPos], n->tokenLength);
+
+	// Initialize a script variable object for registration
+	outDt = CreateDataTypeFromNode(node->firstChild, &source, implicitNamespace);
+
+	if( numErrors > 0 || numWarnings > 0 )
+		return asINVALID_DECLARATION;
+
+	return 0;
+}
+
+// TODO: This should use SymbolLookupMember, which should be available in the TypeInfo class
+int asCBuilder::CheckNameConflictMember(asCTypeInfo *t, const char *name, asCScriptNode *node, asCScriptCode *code, bool isProperty, bool isVirtualProperty)
+{
+	// It's not necessary to check against object types
+
+	asCObjectType *ot = CastToObjectType(t);
+	if (!ot)
+		return 0;
+
+	// Check against properties
+	// TODO: optimize: Improve linear search
+	// Properties are allowed to have the same name as virtual properties
+	if( !isVirtualProperty )
+	{
+		asCArray<asCObjectProperty *> &props = ot->properties;
+		for( asUINT n = 0; n < props.GetLength(); n++ )
+		{
+			if( props[n]->name == name )
+			{
+				if( code )
+				{
+					asCString str;
+					str.Format(TXT_NAME_CONFLICT_s_OBJ_PROPERTY, name);
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+
+	// Check against virtual properties
+	// Don't do this when the check is for a virtual property, as it is allowed to have multiple overloads for virtual properties
+	// Properties are allowed to have the same name as virtual properties
+	if( !isProperty && !isVirtualProperty )
+	{
+		asCArray<int> methods = ot->methods;
+		for( asUINT n = 0; n < methods.GetLength(); n++ )
+		{
+			asCScriptFunction *func = engine->scriptFunctions[methods[n]];
+			if( func->IsProperty() && func->name.SubString(4) == name )
+			{
+				if( code )
+				{
+					asCString str;
+					str.Format(TXT_NAME_CONFLICT_s_OBJ_PROPERTY, name);
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+
+	// Check against child types
+	asCArray<asCFuncdefType*> &funcdefs = ot->childFuncDefs;
+	for (asUINT n = 0; n < funcdefs.GetLength(); n++)
+	{
+		if (funcdefs[n]->name == name)
+		{
+			if (code)
+			{
+				asCString str;
+				str.Format(TXT_NAME_CONFLICT_s_IS_FUNCDEF, name);
+				WriteError(str, code, node);
+			}
+
+			return -1;
+		}
+	}
+
+	// Property names must be checked against method names
+	if( isProperty )
+	{
+		asCArray<int> methods = ot->methods;
+		for( asUINT n = 0; n < methods.GetLength(); n++ )
+		{
+			if( engine->scriptFunctions[methods[n]]->name == name )
+			{
+				if( code )
+				{
+					asCString str;
+					str.Format(TXT_NAME_CONFLICT_s_METHOD, name);
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+
+	// If there is a namespace at the same level with the same name as the class, then need to check for conflicts with symbols in that namespace too
+	// TODO: When classes can have static members, the code should change so that class name cannot be the same as a namespace
+	asCString scope;
+	if (ot->nameSpace->name != "")
+		scope = ot->nameSpace->name + "::" + ot->name;
+	else
+		scope = ot->name;
+	asSNameSpace *ns = engine->FindNameSpace(scope.AddressOf());
+	if (ns)
+	{
+		// Check as if not a function as it doesn't matter the function signature
+		return CheckNameConflict(name, node, code, ns, true, isVirtualProperty, false);
+	}
+	
+	return 0;
+}
+
+// TODO: This should use SymbolLookup
+int asCBuilder::CheckNameConflict(const char *name, asCScriptNode *node, asCScriptCode *code, asSNameSpace *ns, bool isProperty, bool isVirtualProperty, bool isSharedIntf)
+{
+	// Check against registered object types
+	if( engine->GetRegisteredType(name, ns) != 0 )
+	{
+		if( code )
+		{
+			asCString str;
+			if (ns->name != "")
+				str = ns->name + "::" + name;
+			else
+				str = name;
+			str.Format(TXT_NAME_CONFLICT_s_EXTENDED_TYPE, str.AddressOf());
+			WriteError(str, code, node);
+		}
+
+		return -1;
+	}
+
+	// Check against global properties
+	// Virtual properties are allowed to have the same name as a real property
+	if( !isVirtualProperty && DoesGlobalPropertyExist(name, ns) )
+	{
+		if( code )
+		{
+			asCString str;
+			if (ns->name != "")
+				str = ns->name + "::" + name;
+			else
+				str = name;
+			str.Format(TXT_NAME_CONFLICT_s_GLOBAL_PROPERTY, str.AddressOf());
+			WriteError(str, code, node);
+		}
+
+		return -1;
+	}
+	
+	// Check against registered global virtual properties
+	// Don't do this when the check is for a virtual property, as it is allowed to have multiple overloads for virtual properties
+	if( !isProperty || !isVirtualProperty )
+	{
+		for (asUINT n = 0; n < engine->registeredGlobalFuncs.GetSize(); n++)
+		{
+			asCScriptFunction *func = engine->registeredGlobalFuncs.Get(n);
+			if (func->IsProperty() &&
+				func->nameSpace == ns &&
+				func->name.SubString(4) == name)
+			{
+				if (code)
+				{
+					asCString str;
+					if (ns->name != "")
+						str = ns->name + "::" + name;
+					else
+						str = name;
+					str.Format(TXT_NAME_CONFLICT_s_IS_VIRTPROP, str.AddressOf());
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+
+	// Property names must be checked against function names
+	if (isProperty)
+	{
+		for (asUINT n = 0; n < engine->registeredGlobalFuncs.GetSize(); n++)
+		{
+			if (engine->registeredGlobalFuncs.Get(n)->name == name &&
+				engine->registeredGlobalFuncs.Get(n)->nameSpace == ns)
+			{
+				if (code)
+				{
+					asCString str;
+					if (ns->name != "")
+						str = ns->name + "::" + name;
+					else
+						str = name;
+					str.Format(TXT_NAME_CONFLICT_s_IS_FUNCTION, str.AddressOf());
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+
+#ifndef AS_NO_COMPILER
+	// Check against interface types
+	asUINT n;
+	for (n = 0; n < interfaceDeclarations.GetLength(); n++)
+	{
+		if (interfaceDeclarations[n]->name == name &&
+			interfaceDeclarations[n]->typeInfo->nameSpace == ns)
+		{
+			// Don't report an error if the application wants to ignore duplicate declarations of shared interfaces
+			if (!(isSharedIntf && engine->ep.ignoreDuplicateSharedIntf))
+			{
+				if (code)
+				{
+					asCString str;
+					if (ns->name != "")
+						str = ns->name + "::" + name;
+					else
+						str = name;
+					str.Format(TXT_NAME_CONFLICT_s_INTF, str.AddressOf());
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+
+	// Check against class types
+	for( n = 0; n < classDeclarations.GetLength(); n++ )
+	{
+		if( classDeclarations[n]->name == name &&
+			classDeclarations[n]->typeInfo->nameSpace == ns )
+		{
+			if( code )
+			{
+				asCString str;
+				if (ns->name != "")
+					str = ns->name + "::" + name;
+				else
+					str = name;
+				str.Format(TXT_NAME_CONFLICT_s_STRUCT, str.AddressOf());
+				WriteError(str, code, node);
+			}
+
+			return -1;
+		}
+	}
+
+	// Check against named types
+	for( n = 0; n < namedTypeDeclarations.GetLength(); n++ )
+	{
+		if( namedTypeDeclarations[n]->name == name &&
+			namedTypeDeclarations[n]->typeInfo->nameSpace == ns )
+		{
+			if( code )
+			{
+				asCString str;
+				if (ns->name != "")
+					str = ns->name + "::" + name;
+				else
+					str = name;
+				str.Format(TXT_NAME_CONFLICT_s_IS_NAMED_TYPE, str.AddressOf());
+				WriteError(str, code, node);
+			}
+
+			return -1;
+		}
+	}
+
+	// Must check for name conflicts with funcdefs
+	for( n = 0; n < funcDefs.GetLength(); n++ )
+	{
+		if( funcDefs[n]->name == name &&
+			module->m_funcDefs[funcDefs[n]->idx]->nameSpace == ns )
+		{
+			if( code )
+			{
+				asCString str;
+				if (ns->name != "")
+					str = ns->name + "::" + name;
+				else
+					str = name;
+				str.Format(TXT_NAME_CONFLICT_s_IS_FUNCDEF, str.AddressOf());
+				WriteError(str, code, node);
+			}
+
+			return -1;
+		}
+	}
+
+	// Check against mixin classes
+	if( GetMixinClass(name, ns) )
+	{
+		if( code )
+		{
+			asCString str;
+			if (ns->name != "")
+				str = ns->name + "::" + name;
+			else
+				str = name;
+			str.Format(TXT_NAME_CONFLICT_s_IS_MIXIN, str.AddressOf());
+			WriteError(str, code, node);
+		}
+
+		return -1;
+	}
+
+	// Check against virtual properties
+	// Don't do this when the check is for a virtual property, as it is allowed to have multiple overloads for virtual properties
+	if( !isProperty && !isVirtualProperty )
+	{
+		for (n = 0; n < functions.GetLength(); n++)
+		{
+			asCScriptFunction *func = engine->scriptFunctions[functions[n] ? functions[n]->funcId : 0];
+			if (func && 
+				func->IsProperty() &&
+				func->objectType == 0 && 
+				func->nameSpace == ns &&
+				func->name.SubString(4) == name)
+			{
+				if (code)
+				{
+					asCString str;
+					if (ns->name != "")
+						str = ns->name + "::" + name;
+					else
+						str = name;
+					str.Format(TXT_NAME_CONFLICT_s_IS_VIRTPROP, str.AddressOf());
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+	
+	// Property names must be checked against function names
+	if (isProperty)
+	{
+		for (n = 0; n < functions.GetLength(); n++)
+		{
+			if (functions[n] && 
+				functions[n]->objType == 0 && 
+				functions[n]->name == name &&
+				engine->scriptFunctions[functions[n]->funcId]->nameSpace == ns )
+			{
+				if (code)
+				{
+					asCString str;
+					if (ns->name != "")
+						str = ns->name + "::" + name;
+					else
+						str = name;
+					str.Format(TXT_NAME_CONFLICT_s_IS_FUNCTION, str.AddressOf());
+					WriteError(str, code, node);
+				}
+
+				return -1;
+			}
+		}
+	}
+#endif
+
+	return 0;
+}
+
+// Returns a negative value on invalid property
+// -2 incorrect prefix
+// -3 invalid signature
+// -4 mismatching type for get/set
+// -5 name conflict
+int asCBuilder::ValidateVirtualProperty(asCScriptFunction *func)
+{
+	asASSERT( func->IsProperty() );
+	
+	// A virtual property must have the prefix "get_" or "set_"
+	asCString prefix = func->name.SubString(0, 4);
+	if( prefix != "get_" && prefix != "set_" )
+		return -2;
+	
+	// A getter must return a non-void type and have at most 1 argument (indexed property)
+	if( prefix == "get_" && (func->returnType == asCDataType::CreatePrimitive(ttVoid, false) || func->parameterTypes.GetLength() > 1) )
+		return -3;
+	
+	// A setter must return a void and have 1 or 2 arguments (indexed property)
+	if( prefix == "set_" && (func->returnType != asCDataType::CreatePrimitive(ttVoid, false) || func->parameterTypes.GetLength() < 1 || func->parameterTypes.GetLength() > 2) )
+		return -3;
+	
+	// Check matching getter/setter
+	asCDataType getType, setType;
+	bool found = false;
+	if( prefix == "get_" )
+	{
+		getType = func->returnType;
+		
+		// Find if there is a set accessor in the same scope, and then validate the type of it
+		// TODO: optimize search
+		asCString setName = "set_" + func->name.SubString(4);
+		for( asUINT n = 0; n < engine->scriptFunctions.GetLength(); n++ )
+		{
+			asCScriptFunction *setFunc = engine->scriptFunctions[n];
+			if( setFunc == 0 || setFunc->name != setName || !setFunc->IsProperty() )
+				continue;
+			
+			// Is it the same scope?
+			if( func->module != setFunc->module || func->nameSpace != setFunc->nameSpace || func->objectType != setFunc->objectType )
+				continue;
+			
+			setType = setFunc->parameterTypes[setFunc->parameterTypes.GetLength() - 1];
+			found = true;
+			break;
+		}
+	}
+	else
+	{
+		setType = func->parameterTypes[func->parameterTypes.GetLength() - 1];
+		
+		// Find if there is a get accessor in the same scope and then validate the type of it
+		// TODO: optimize search
+		asCString getName = "get_" + func->name.SubString(4);
+		for( asUINT n = 0; n < engine->scriptFunctions.GetLength(); n++ )
+		{
+			asCScriptFunction *getFunc = engine->scriptFunctions[n];
+			if( getFunc == 0 || getFunc->name != getName || !getFunc->IsProperty() )
+				continue;
+			
+			// Is it the same scope?
+			if( func->module != getFunc->module || func->nameSpace != getFunc->nameSpace || func->objectType != getFunc->objectType )
+				continue;
+			
+			getType = getFunc->returnType;
+			found = true;
+			break;
+		}
+	}
+	
+	if( found )
+	{
+		// Check that the type matches
+		// It is permitted for a getter to return a handle and the setter to take a reference
+		if( !getType.IsEqualExceptRefAndConst(setType) &&
+			!((getType.IsObjectHandle() && !setType.IsObjectHandle()) &&
+			  (getType.GetTypeInfo() == setType.GetTypeInfo())) )
+		{
+			return -4;
+		}
+	}
+	
+	// Check name conflict with other entities in the same scope
+	// It is allowed to have a real property of the same name, in which case the virtual property hides the real one.
+	int r;
+	if( func->objectType )
+		r = CheckNameConflictMember(func->objectType, func->name.SubString(4).AddressOf(), 0, 0, true, true);
+	else
+		r = CheckNameConflict(func->name.SubString(4).AddressOf(), 0, 0, func->nameSpace, true, true, false);
+	if( r < 0 )
+		return -5;
+	
+	// Everything is OK
+	return 0;
+}
+
+#ifndef AS_NO_COMPILER
+sMixinClass *asCBuilder::GetMixinClass(const char *name, asSNameSpace *ns)
+{
+	for( asUINT n = 0; n < mixinClasses.GetLength(); n++ )
+		if( mixinClasses[n]->name == name &&
+			mixinClasses[n]->ns == ns )
+			return mixinClasses[n];
+
+	return 0;
+}
+
+int asCBuilder::RegisterFuncDef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns, asCObjectType *parent)
+{
+	// namespace and parent are exclusively mutual
+	asASSERT((ns == 0 && parent) || (ns && parent == 0));
+
+	// Skip leading 'shared' and 'external' keywords
+	asCScriptNode *n = node->firstChild;
+	while (n->nodeType == snIdentifier)
+		n = n->next;
+
+	// Find the name
+	asASSERT( n->nodeType == snDataType );
+	n = n->next->next;
+
+	asCString name;
+	name.Assign(&file->code[n->tokenPos], n->tokenLength);
+
+	// Check for name conflict with other types
+	if (ns)
+	{
+		int r = CheckNameConflict(name.AddressOf(), node, file, ns, true, false, false);
+		if (asSUCCESS != r)
+		{
+			node->Destroy(engine);
+			return r;
+		}
+	}
+	else
+	{
+		int r = CheckNameConflictMember(parent, name.AddressOf(), node, file, false, false);
+		if (asSUCCESS != r)
+		{
+			node->Destroy(engine);
+			return r;
+		}
+	}
+
+	// The function definition should be stored as a asCScriptFunction so that the application
+	// can use the asIScriptFunction interface to enumerate the return type and parameters
+
+	// The return type and parameter types aren't determined in this function. A second pass is
+	// necessary after all type declarations have been identified. The second pass is implemented
+	// in CompleteFuncDef().
+
+	sFuncDef *fd = asNEW(sFuncDef);
+	if( fd == 0 )
+	{
+		node->Destroy(engine);
+		return asOUT_OF_MEMORY;
+	}
+
+	fd->name   = name;
+	fd->node   = node;
+	fd->script = file;
+	fd->idx    = module->AddFuncDef(name, ns, parent);
+
+	funcDefs.PushLast(fd);
+
+	return 0;
+}
+
+void asCBuilder::CompleteFuncDef(sFuncDef *funcDef)
+{
+	asCArray<asCString *>      defaultArgs;
+	asSFunctionTraits          funcTraits;
+
+	asCFuncdefType *fdt = module->m_funcDefs[funcDef->idx];
+	asASSERT( fdt );
+	asCScriptFunction *func = fdt->funcdef;
+
+	asSNameSpace *implicitNs = func->nameSpace ? func->nameSpace : fdt->parentClass->nameSpace;
+	GetParsedFunctionDetails(funcDef->node, funcDef->script, fdt->parentClass, funcDef->name, func->returnType, func->parameterNames, func->parameterTypes, func->inOutFlags, defaultArgs, funcTraits, implicitNs);
+
+	// There should not be any defaultArgs, but if there are any we need to delete them to avoid leaks
+	for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+		if( defaultArgs[n] )
+			asDELETE(defaultArgs[n], asCString);
+
+	// All funcdefs are shared, unless one of the parameter types or return type is not shared
+	bool declaredShared = funcTraits.GetTrait(asTRAIT_SHARED);
+	funcTraits.SetTrait(asTRAIT_SHARED, true);
+	if (func->returnType.GetTypeInfo() && !func->returnType.GetTypeInfo()->IsShared())
+	{
+		if (declaredShared)
+		{
+			asCString s;
+			s.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, func->returnType.GetTypeInfo()->name.AddressOf());
+			WriteError(s.AddressOf(), funcDef->script, funcDef->node);
+		}
+		funcTraits.SetTrait(asTRAIT_SHARED, false);
+	}
+	for( asUINT n = 0; funcTraits.GetTrait(asTRAIT_SHARED) && n < func->parameterTypes.GetLength(); n++ )
+		if (func->parameterTypes[n].GetTypeInfo() && !func->parameterTypes[n].GetTypeInfo()->IsShared())
+		{
+			if (declaredShared)
+			{
+				asCString s;
+				s.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, func->parameterTypes[n].GetTypeInfo()->name.AddressOf());
+				WriteError(s.AddressOf(), funcDef->script, funcDef->node);
+			}
+			funcTraits.SetTrait(asTRAIT_SHARED, false);
+		}
+	func->SetShared(funcTraits.GetTrait(asTRAIT_SHARED));
+
+	// Check if there is another identical funcdef from another module and if so reuse that instead
+	bool found = false;
+	if( func->IsShared() )
+	{
+		for( asUINT n = 0; n < engine->funcDefs.GetLength(); n++ )
+		{
+			asCFuncdefType *fdt2 = engine->funcDefs[n];
+			if( fdt2 == 0 || fdt == fdt2 )
+				continue;
+
+			if( !fdt2->funcdef->IsShared() )
+				continue;
+
+			if( fdt2->name == fdt->name &&
+				fdt2->nameSpace == fdt->nameSpace &&
+				fdt2->funcdef->IsSignatureExceptNameEqual(func) )
+			{
+				// Replace our funcdef for the existing one
+				funcDef->idx = fdt2->funcdef->id;
+				module->ReplaceFuncDef(fdt, fdt2);
+				fdt2->AddRefInternal();
+
+				engine->funcDefs.RemoveValue(fdt);
+
+				fdt->ReleaseInternal();
+				found = true;
+				break;
+			}
+		}
+	}
+
+	// If the funcdef was declared as external then the existing shared declaration must have been found
+	if (funcTraits.GetTrait(asTRAIT_EXTERNAL) && !found)
+	{
+		asCString str;
+		str.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, funcDef->name.AddressOf());
+		WriteError(str, funcDef->script, funcDef->node);
+	}
+
+	// Remember if the type was declared as external so the saved bytecode can be flagged accordingly
+	if (funcTraits.GetTrait(asTRAIT_EXTERNAL) && found)
+		module->m_externalTypes.PushLast(engine->scriptFunctions[funcDef->idx]->funcdefType);
+}
+
+int asCBuilder::RegisterGlobalVar(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
+{
+	// Has the application disabled global vars?
+	if( engine->ep.disallowGlobalVars )
+		WriteError(TXT_GLOBAL_VARS_NOT_ALLOWED, file, node);
+
+	// What data type is it?
+	asCDataType type = CreateDataTypeFromNode(node->firstChild, file, ns);
+
+	if( !type.CanBeInstantiated() )
+	{
+		asCString str;
+		if( type.IsAbstractClass() )
+			str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, type.Format(ns).AddressOf());
+		else if( type.IsInterface() )
+			str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, type.Format(ns).AddressOf());
+		else
+			// TODO: Improve error message to explain why
+			str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format(ns).AddressOf());
+
+		WriteError(str, file, node);
+	}
+
+	asCScriptNode *n = node->firstChild->next;
+
+	while( n )
+	{
+		// Verify that the name isn't taken
+		asCString name(&file->code[n->tokenPos], n->tokenLength);
+		CheckNameConflict(name.AddressOf(), n, file, ns, true, false, false);
+
+		// Register the global variable
+		sGlobalVariableDescription *gvar = asNEW(sGlobalVariableDescription);
+		if( gvar == 0 )
+		{
+			node->Destroy(engine);
+			return asOUT_OF_MEMORY;
+		}
+
+		gvar->script      = file;
+		gvar->name        = name;
+		gvar->isCompiled  = false;
+		gvar->datatype    = type;
+		gvar->isEnumValue = false;
+		gvar->ns          = ns;
+
+		// TODO: Give error message if wrong
+		asASSERT(!gvar->datatype.IsReference());
+
+		// Allocation is done when the variable is compiled, to allow for autos
+		gvar->property = 0;
+		gvar->index    = 0;
+
+		globVariables.Put(gvar);
+
+
+		gvar->declaredAtNode = n;
+		n = n->next;
+		gvar->declaredAtNode->DisconnectParent();
+		gvar->initializationNode = 0;
+		if( n &&
+			( n->nodeType == snAssignment ||
+			  n->nodeType == snArgList    ||
+			  n->nodeType == snInitList     ) )
+		{
+			gvar->initializationNode = n;
+			n = n->next;
+			gvar->initializationNode->DisconnectParent();
+		}
+	}
+
+	node->Destroy(engine);
+
+	return 0;
+}
+
+int asCBuilder::RegisterMixinClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
+{
+	asCScriptNode *cl = node->firstChild;
+	asASSERT( cl->nodeType == snClass );
+
+	asCScriptNode *n = cl->firstChild;
+
+	// Skip potential decorator tokens
+	while( n->tokenType == ttIdentifier &&
+		   (file->TokenEquals(n->tokenPos, n->tokenLength, FINAL_TOKEN) ||
+		    file->TokenEquals(n->tokenPos, n->tokenLength, SHARED_TOKEN) ||
+			file->TokenEquals(n->tokenPos, n->tokenLength, ABSTRACT_TOKEN) ||
+			file->TokenEquals(n->tokenPos, n->tokenLength, EXTERNAL_TOKEN)) )
+	{
+		// Report error, because mixin class cannot be final or shared
+		asCString msg;
+		msg.Format(TXT_MIXIN_CANNOT_BE_DECLARED_AS_s, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+		WriteError(msg, file, n);
+
+		asCScriptNode *tmp = n;
+		n = n->next;
+
+		// Remove the invalid node, so compilation can continue as if it wasn't there
+		tmp->DisconnectParent();
+		tmp->Destroy(engine);
+	}
+
+	asCString name(&file->code[n->tokenPos], n->tokenLength);
+
+	int r, c;
+	file->ConvertPosToRowCol(n->tokenPos, &r, &c);
+
+	CheckNameConflict(name.AddressOf(), n, file, ns, true, false, false);
+
+	sMixinClass *decl = asNEW(sMixinClass);
+	if( decl == 0 )
+	{
+		node->Destroy(engine);
+		return asOUT_OF_MEMORY;
+	}
+
+	mixinClasses.PushLast(decl);
+	decl->name   = name;
+	decl->ns     = ns;
+	decl->node   = cl;
+	decl->script = file;
+
+	// Clean up memory
+	cl->DisconnectParent();
+	node->Destroy(engine);
+
+	// Check that the mixin class doesn't contain any child types
+	// TODO: Add support for child types in mixin classes
+	n = cl->firstChild;
+	while (n)
+	{
+		if (n->nodeType == snFuncDef)
+		{
+			WriteError(TXT_MIXIN_CANNOT_HAVE_CHILD_TYPES, file, n);
+			break;
+		}
+		n = n->next;
+	}
+
+	return 0;
+}
+
+int asCBuilder::RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
+{
+	asCScriptNode *n = node->firstChild;
+	bool isFinal = false;
+	bool isShared = false;
+	bool isAbstract = false;
+	bool isExternal = false;
+
+	// Check the class modifiers
+	while( n->tokenType == ttIdentifier )
+	{
+		if( file->TokenEquals(n->tokenPos, n->tokenLength, FINAL_TOKEN) )
+		{
+			if( isAbstract )
+				WriteError(TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT, file, n);
+			else
+			{
+				if( isFinal )
+				{
+					asCString msg;
+					msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+					WriteWarning(msg, file, n);
+				}
+				isFinal = true;
+			}
+		}
+		else if( file->TokenEquals(n->tokenPos, n->tokenLength, SHARED_TOKEN) )
+		{
+			if( isShared )
+			{
+				asCString msg;
+				msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+				WriteWarning(msg, file, n);
+			}
+			isShared = true;
+		}
+		else if (file->TokenEquals(n->tokenPos, n->tokenLength, EXTERNAL_TOKEN))
+		{
+			if (isExternal)
+			{
+				asCString msg;
+				msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+				WriteWarning(msg, file, n);
+			}
+			isExternal = true;
+		}
+		else if( file->TokenEquals(n->tokenPos, n->tokenLength, ABSTRACT_TOKEN) )
+		{
+			if( isFinal )
+				WriteError(TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT, file, n);
+			else
+			{
+				if( isAbstract )
+				{
+					asCString msg;
+					msg.Format(TXT_ATTR_s_INFORMED_MULTIPLE_TIMES, asCString(&file->code[n->tokenPos], n->tokenLength).AddressOf());
+					WriteWarning(msg, file, n);
+				}
+				isAbstract = true;
+			}
+		}
+		else
+		{
+			// This is the name of the class
+			break;
+		}
+
+		n = n->next;
+	}
+
+	asCString name(&file->code[n->tokenPos], n->tokenLength);
+
+	int r, c;
+	file->ConvertPosToRowCol(n->tokenPos, &r, &c);
+
+	CheckNameConflict(name.AddressOf(), n, file, ns, true, false, false);
+
+	sClassDeclaration *decl = asNEW(sClassDeclaration);
+	if( decl == 0 )
+	{
+		node->Destroy(engine);
+		return asOUT_OF_MEMORY;
+	}
+
+	classDeclarations.PushLast(decl);
+	decl->name             = name;
+	decl->script           = file;
+	decl->node             = node;
+
+	// External shared interfaces must not try to redefine the interface
+	if (isExternal && (n->next == 0 || n->next->tokenType != ttEndStatement))
+	{
+		asCString str;
+		str.Format(TXT_EXTERNAL_SHARED_s_CANNOT_REDEF, name.AddressOf());
+		WriteError(str, file, n);
+	}
+	else if (!isExternal && n->next && n->next->tokenType == ttEndStatement)
+	{
+		asCString str;
+		str.Format(TXT_MISSING_DEFINITION_OF_s, name.AddressOf());
+		WriteError(str, file, n);
+	}
+
+	// If this type is shared and there already exist another shared
+	// type of the same name, then that one should be used instead of
+	// creating a new one.
+	asCObjectType *st = 0;
+	if( isShared )
+	{
+		for( asUINT i = 0; i < engine->sharedScriptTypes.GetLength(); i++ )
+		{
+			st = CastToObjectType(engine->sharedScriptTypes[i]);
+			if( st &&
+				st->IsShared() &&
+				st->name == name &&
+				st->nameSpace == ns &&
+				!st->IsInterface() )
+			{
+				// We'll use the existing type
+				decl->isExistingShared = true;
+				decl->typeInfo         = st;
+				module->AddClassType(st);
+				st->AddRefInternal();
+				break;
+			}
+		}
+	}
+
+	// If the class was declared as external then it must have been compiled in a different module first
+	if (isExternal && decl->typeInfo == 0)
+	{
+		asCString str;
+		str.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, name.AddressOf());
+		WriteError(str, file, n);
+	}
+
+	// Remember if the class was declared as external so the saved bytecode can be flagged accordingly
+	if (isExternal)
+		module->m_externalTypes.PushLast(st);
+
+	if (!decl->isExistingShared)
+	{
+		// Create a new object type for this class
+		st = asNEW(asCObjectType)(engine);
+		if (st == 0)
+			return asOUT_OF_MEMORY;
+
+		// By default all script classes are marked as garbage collected.
+		// Only after the complete structure and relationship between classes
+		// is known, can the flag be cleared for those objects that truly cannot
+		// form circular references. This is important because a template
+		// callback may be called with a script class before the compilation
+		// completes, and until it is known, the callback must assume the class
+		// is garbage collected.
+		st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT | asOBJ_GC;
+
+		if (isShared)
+			st->flags |= asOBJ_SHARED;
+
+		if (isFinal)
+			st->flags |= asOBJ_NOINHERIT;
+
+		if (isAbstract)
+			st->flags |= asOBJ_ABSTRACT;
+
+		if (node->tokenType == ttHandle)
+			st->flags |= asOBJ_IMPLICIT_HANDLE;
+
+		st->size = sizeof(asCScriptObject);
+		st->name = name;
+		st->nameSpace = ns;
+		st->module = module;
+		module->AddClassType(st);
+		if (isShared)
+		{
+			engine->sharedScriptTypes.PushLast(st);
+			st->AddRefInternal();
+		}
+		decl->typeInfo = st;
+
+		// Use the default script class behaviours
+		st->beh = engine->scriptTypeBehaviours.beh;
+
+		// TODO: Move this to asCObjectType so that the asCRestore can reuse it
+		engine->scriptFunctions[st->beh.addref]->AddRefInternal();
+		engine->scriptFunctions[st->beh.release]->AddRefInternal();
+		engine->scriptFunctions[st->beh.gcEnumReferences]->AddRefInternal();
+		engine->scriptFunctions[st->beh.gcGetFlag]->AddRefInternal();
+		engine->scriptFunctions[st->beh.gcGetRefCount]->AddRefInternal();
+		engine->scriptFunctions[st->beh.gcReleaseAllReferences]->AddRefInternal();
+		engine->scriptFunctions[st->beh.gcSetFlag]->AddRefInternal();
+		engine->scriptFunctions[st->beh.copy]->AddRefInternal();
+		engine->scriptFunctions[st->beh.factory]->AddRefInternal();
+		engine->scriptFunctions[st->beh.construct]->AddRefInternal();
+		// TODO: weak: Should not do this if the class has been declared with noweak
+		engine->scriptFunctions[st->beh.getWeakRefFlag]->AddRefInternal();
+
+		// Skip to the content of the class
+		while (n && n->nodeType == snIdentifier)
+			n = n->next;
+	}
+
+	// Register possible child types
+	while (n)
+	{
+		node = n->next;
+		if (n->nodeType == snFuncDef)
+		{
+			n->DisconnectParent();
+			if (!decl->isExistingShared)
+				RegisterFuncDef(n, file, 0, st);
+			else
+			{
+				// Destroy the node, since it won't be used
+				// TODO: Should verify that the funcdef is identical to the one in the existing shared class
+				n->Destroy(engine);
+			}
+		}
+		n = node;
+	}
+
+	return 0;
+}
+
+int asCBuilder::RegisterInterface(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
+{
+	asCScriptNode *n = node->firstChild;
+
+	bool isShared = false;
+	bool isExternal = false;
+	while( n->nodeType == snIdentifier )
+	{
+		if (file->TokenEquals(n->tokenPos, n->tokenLength, SHARED_TOKEN))
+			isShared = true;
+		else if (file->TokenEquals(n->tokenPos, n->tokenLength, EXTERNAL_TOKEN))
+			isExternal = true;
+		else
+			break;
+		n = n->next;
+	}
+
+	int r, c;
+	file->ConvertPosToRowCol(n->tokenPos, &r, &c);
+
+	asCString name;
+	name.Assign(&file->code[n->tokenPos], n->tokenLength);
+	CheckNameConflict(name.AddressOf(), n, file, ns, true, false, isShared);
+
+	sClassDeclaration *decl = asNEW(sClassDeclaration);
+	if( decl == 0 )
+	{
+		node->Destroy(engine);
+		return asOUT_OF_MEMORY;
+	}
+
+	interfaceDeclarations.PushLast(decl);
+	decl->name             = name;
+	decl->script           = file;
+	decl->node             = node;
+
+	// External shared interfaces must not try to redefine the interface
+	if (isExternal && (n->next == 0 || n->next->tokenType != ttEndStatement) )
+	{
+		asCString str;
+		str.Format(TXT_EXTERNAL_SHARED_s_CANNOT_REDEF, name.AddressOf());
+		WriteError(str, file, n);
+	}
+	else if (!isExternal && n->next && n->next->tokenType == ttEndStatement)
+	{
+		asCString str;
+		str.Format(TXT_MISSING_DEFINITION_OF_s, name.AddressOf());
+		WriteError(str, file, n);
+	}
+
+	// If this type is shared and there already exist another shared
+	// type of the same name, then that one should be used instead of
+	// creating a new one.
+	if( isShared )
+	{
+		for( asUINT i = 0; i < engine->sharedScriptTypes.GetLength(); i++ )
+		{
+			asCObjectType *st = CastToObjectType(engine->sharedScriptTypes[i]);
+			if( st &&
+				st->IsShared() &&
+				st->name == name &&
+				st->nameSpace == ns &&
+				st->IsInterface() )
+			{
+				// We'll use the existing type
+				decl->isExistingShared = true;
+				decl->typeInfo = st;
+				module->AddClassType(st);
+				st->AddRefInternal();
+
+				// Remember if the interface was declared as external so the saved bytecode can be flagged accordingly
+				if (isExternal)
+					module->m_externalTypes.PushLast(st);
+
+				return 0;
+			}
+		}
+	}
+
+	// If the interface was declared as external then it must have been compiled in a different module first
+	if (isExternal)
+	{
+		asCString str;
+		str.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, name.AddressOf());
+		WriteError(str, file, n);
+	}
+
+	// Register the object type for the interface
+	asCObjectType *st = asNEW(asCObjectType)(engine);
+	if( st == 0 )
+		return asOUT_OF_MEMORY;
+
+	st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT;
+
+	if( isShared )
+		st->flags |= asOBJ_SHARED;
+
+	st->size = 0; // Cannot be instantiated
+	st->name = name;
+	st->nameSpace = ns;
+	st->module = module;
+	module->AddClassType(st);
+	if( isShared )
+	{
+		engine->sharedScriptTypes.PushLast(st);
+		st->AddRefInternal();
+	}
+	decl->typeInfo = st;
+
+	// Use the default script class behaviours
+	st->beh.construct = 0;
+	st->beh.addref = engine->scriptTypeBehaviours.beh.addref;
+	engine->scriptFunctions[st->beh.addref]->AddRefInternal();
+	st->beh.release = engine->scriptTypeBehaviours.beh.release;
+	engine->scriptFunctions[st->beh.release]->AddRefInternal();
+	st->beh.copy = 0;
+
+	return 0;
+}
+
+void asCBuilder::CompileGlobalVariables()
+{
+	bool compileSucceeded = true;
+
+	// Store state of compilation (errors, warning, output)
+	int currNumErrors   = numErrors;
+	int currNumWarnings = numWarnings;
+
+	// Backup the original message stream
+	bool                       msgCallback     = engine->msgCallback;
+	asSSystemFunctionInterface msgCallbackFunc = engine->msgCallbackFunc;
+	void                      *msgCallbackObj  = engine->msgCallbackObj;
+
+	// Set the new temporary message stream
+	asCOutputBuffer outBuffer;
+	engine->SetMessageCallback(asMETHOD(asCOutputBuffer, Callback), &outBuffer, asCALL_THISCALL);
+
+	asCOutputBuffer finalOutput;
+	asCScriptFunction *initFunc = 0;
+
+	asCSymbolTable<asCGlobalProperty> initOrder;
+
+	// We first try to compile all the primitive global variables, and only after that
+	// compile the non-primitive global variables. This permits the constructors
+	// for the complex types to use the already initialized variables of primitive
+	// type. Note, we currently don't know which global variables are used in the
+	// constructors, so we cannot guarantee that variables of complex types are
+	// initialized in the correct order, so we won't reorder those.
+	bool compilingPrimitives = true;
+
+	// Compile each global variable
+	while( compileSucceeded )
+	{
+		compileSucceeded = false;
+
+		int accumErrors = 0;
+		int accumWarnings = 0;
+
+		// Restore state of compilation
+		finalOutput.Clear();
+		asCSymbolTable<sGlobalVariableDescription>::iterator it = globVariables.List();
+		for( ; it; it++ )
+		{
+			sGlobalVariableDescription *gvar = *it;
+			if( gvar->isCompiled )
+				continue;
+
+			asCByteCode init(engine);
+			numWarnings = 0;
+			numErrors = 0;
+			outBuffer.Clear();
+
+			// Skip this for now if we're not compiling complex types yet
+			if( compilingPrimitives && !gvar->datatype.IsPrimitive() )
+				continue;
+
+			if( gvar->declaredAtNode )
+			{
+				int r, c;
+				gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &r, &c);
+				asCString str = gvar->datatype.Format(gvar->ns);
+				str += " " + gvar->name;
+				str.Format(TXT_COMPILING_s, str.AddressOf());
+				WriteInfo(gvar->script->name, str, r, c, true);
+			}
+
+			if( gvar->isEnumValue )
+			{
+				int r;
+				if( gvar->initializationNode )
+				{
+					asCCompiler comp(engine);
+					asCScriptFunction func(engine, module, asFUNC_SCRIPT);
+
+					// Set the namespace that should be used during the compilation
+					func.nameSpace = gvar->datatype.GetTypeInfo()->nameSpace;
+
+					// Temporarily switch the type of the variable to int so it can be compiled properly
+					asCDataType saveType;
+					saveType = gvar->datatype;
+					gvar->datatype = asCDataType::CreatePrimitive(ttInt, true);
+					r = comp.CompileGlobalVariable(this, gvar->script, gvar->initializationNode, gvar, &func);
+					gvar->datatype = saveType;
+
+					// Make the function a dummy so it doesn't try to release objects while destroying the function
+					func.funcType = asFUNC_DUMMY;
+				}
+				else
+				{
+					r = 0;
+
+					// When there is no assignment the value is the last + 1
+					int enumVal = 0;
+					asCSymbolTable<sGlobalVariableDescription>::iterator prev_it = it;
+					prev_it--;
+					if( prev_it )
+					{
+						sGlobalVariableDescription *gvar2 = *prev_it;
+						if(gvar2->datatype == gvar->datatype )
+						{
+							enumVal = int(gvar2->constantValue) + 1;
+
+							if( !gvar2->isCompiled )
+							{
+								int row, col;
+								gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &row, &col);
+
+								asCString str = gvar->datatype.Format(gvar->ns);
+								str += " " + gvar->name;
+								str.Format(TXT_COMPILING_s, str.AddressOf());
+								WriteInfo(gvar->script->name, str, row, col, true);
+
+								str.Format(TXT_UNINITIALIZED_GLOBAL_VAR_s, gvar2->name.AddressOf());
+								WriteError(gvar->script->name, str, row, col);
+								r = -1;
+							}
+						}
+					}
+
+					gvar->constantValue = enumVal;
+				}
+
+				if( r >= 0 )
+				{
+					// Set the value as compiled
+					gvar->isCompiled = true;
+					compileSucceeded = true;
+				}
+			}
+			else
+			{
+				// Compile the global variable
+				initFunc = asNEW(asCScriptFunction)(engine, module, asFUNC_SCRIPT);
+				if( initFunc == 0 )
+				{
+					// Out of memory
+					return;
+				}
+
+				// Set the namespace that should be used for this function
+				initFunc->nameSpace = gvar->ns;
+
+				asCCompiler comp(engine);
+				int r = comp.CompileGlobalVariable(this, gvar->script, gvar->initializationNode, gvar, initFunc);
+				if( r >= 0 )
+				{
+					// Compilation succeeded
+					gvar->isCompiled = true;
+					compileSucceeded = true;
+				}
+				else
+				{
+					// Compilation failed
+					initFunc->funcType = asFUNC_DUMMY;
+					asDELETE(initFunc, asCScriptFunction);
+					initFunc = 0;
+				}
+			}
+
+			if( gvar->isCompiled )
+			{
+				// Add warnings for this constant to the total build
+				if( numWarnings )
+				{
+					currNumWarnings += numWarnings;
+					if( msgCallback )
+						outBuffer.SendToCallback(engine, &msgCallbackFunc, msgCallbackObj);
+				}
+
+				// Determine order of variable initializations
+				if( gvar->property && !gvar->isEnumValue )
+					initOrder.Put(gvar->property);
+
+				// Does the function contain more than just a SUSPEND followed by a RET instruction?
+				if( initFunc && initFunc->scriptData->byteCode.GetLength() > 2 )
+				{
+					// Create the init function for this variable
+					initFunc->id = engine->GetNextScriptFunctionId();
+					engine->AddScriptFunction(initFunc);
+
+					// Finalize the init function for this variable
+					initFunc->returnType = asCDataType::CreatePrimitive(ttVoid, false);
+					initFunc->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(gvar->script->name.AddressOf());
+					if( gvar->declaredAtNode )
+					{
+						int row, col;
+						gvar->script->ConvertPosToRowCol(gvar->declaredAtNode->tokenPos, &row, &col);
+						initFunc->scriptData->declaredAt = (row & 0xFFFFF)|((col & 0xFFF)<<20);
+					}
+
+					gvar->property->SetInitFunc(initFunc);
+
+					initFunc->ReleaseInternal();
+					initFunc = 0;
+				}
+				else if( initFunc )
+				{
+					// Destroy the function as it won't be used
+					initFunc->funcType = asFUNC_DUMMY;
+					asDELETE(initFunc, asCScriptFunction);
+					initFunc = 0;
+				}
+
+				// Convert enums to true enum values, so subsequent compilations can access it as an enum
+				if( gvar->isEnumValue )
+				{
+					asCEnumType *enumType = CastToEnumType(gvar->datatype.GetTypeInfo());
+					asASSERT(NULL != enumType);
+
+					asSEnumValue *e = asNEW(asSEnumValue);
+					if( e == 0 )
+					{
+						// Out of memory
+						numErrors++;
+						return;
+					}
+
+					e->name = gvar->name;
+					e->value = int(gvar->constantValue);
+
+					enumType->enumValues.PushLast(e);
+				}
+			}
+			else
+			{
+				// Add output to final output
+				finalOutput.Append(outBuffer);
+				accumErrors += numErrors;
+				accumWarnings += numWarnings;
+			}
+
+			engine->preMessage.isSet = false;
+		}
+
+		if( !compileSucceeded )
+		{
+			if( compilingPrimitives )
+			{
+				// No more primitives could be compiled, so
+				// switch to compiling the complex variables
+				compilingPrimitives = false;
+				compileSucceeded    = true;
+			}
+			else
+			{
+				// No more variables can be compiled
+				// Add errors and warnings to total build
+				currNumWarnings += accumWarnings;
+				currNumErrors   += accumErrors;
+				if( msgCallback )
+					finalOutput.SendToCallback(engine, &msgCallbackFunc, msgCallbackObj);
+			}
+		}
+	}
+
+	// Restore states
+	engine->msgCallback     = msgCallback;
+	engine->msgCallbackFunc = msgCallbackFunc;
+	engine->msgCallbackObj  = msgCallbackObj;
+
+	numWarnings = currNumWarnings;
+	numErrors   = currNumErrors;
+
+	// Set the correct order of initialization
+	if( numErrors == 0 )
+	{
+		// If the length of the arrays are not the same, then this is the compilation
+		// of a single variable, in which case the initialization order of the previous
+		// variables must be preserved.
+		if( module->m_scriptGlobals.GetSize() == initOrder.GetSize() )
+			module->m_scriptGlobals.SwapWith(initOrder);
+	}
+
+	CleanupEnumValues();
+}
+
+void asCBuilder::CleanupEnumValues()
+{
+	// Delete the enum expressions
+	asCSymbolTableIterator<sGlobalVariableDescription> it = globVariables.List();
+	while (it)
+	{
+		sGlobalVariableDescription *gvar = *it;
+		if (gvar->isEnumValue)
+		{
+			// Remove from symboltable. This has to be done prior to freeing the memeory
+			globVariables.Erase(it.GetIndex());
+
+			// Destroy the gvar property
+			if (gvar->declaredAtNode)
+			{
+				gvar->declaredAtNode->Destroy(engine);
+				gvar->declaredAtNode = 0;
+			}
+			if (gvar->initializationNode)
+			{
+				gvar->initializationNode->Destroy(engine);
+				gvar->initializationNode = 0;
+			}
+			if (gvar->property)
+			{
+				asDELETE(gvar->property, asCGlobalProperty);
+				gvar->property = 0;
+			}
+
+			asDELETE(gvar, sGlobalVariableDescription);
+		}
+		else
+			it++;
+	}
+}
+
+int asCBuilder::GetNamespaceAndNameFromNode(asCScriptNode *n, asCScriptCode *script, asSNameSpace *implicitNs, asSNameSpace *&outNs, asCString &outName)
+{
+	// TODO: child funcdef: The node might be a snScope now
+	asASSERT( n->nodeType == snIdentifier );
+
+	// Get the optional scope from the node
+	// TODO: child funcdef: The parentType will be set if the scope is actually a type rather than a namespace
+	asSNameSpace *ns = GetNameSpaceFromNode(n->firstChild, script, implicitNs, 0);
+	if( ns == 0 )
+		return -1;
+
+	// Get the name
+	asCString name(&script->code[n->lastChild->tokenPos], n->lastChild->tokenLength);
+
+	outNs = ns;
+	outName = name;
+
+	return 0;
+}
+
+void asCBuilder::AddInterfaceFromMixinToClass(sClassDeclaration *decl, asCScriptNode *errNode, sMixinClass *mixin)
+{
+	// Determine what interfaces that the mixin implements
+	asCScriptNode *node = mixin->node;
+	asASSERT(node->nodeType == snClass);
+
+	// Skip the name of the mixin
+	node = node->firstChild->next;
+
+
+	while( node && node->nodeType == snIdentifier )
+	{
+		bool ok = true;
+		asSNameSpace *ns;
+		asCString name;
+		if( GetNamespaceAndNameFromNode(node, mixin->script, mixin->ns, ns, name) < 0 )
+			ok = false;
+		else
+		{
+			// Find the object type for the interface
+			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
+
+			// Check that the object type is an interface
+			if( objType && objType->IsInterface() )
+			{
+				// Only add the interface if the class doesn't already implement it
+				if( !decl->typeInfo->Implements(objType) )
+					AddInterfaceToClass(decl, errNode, objType);
+			}
+			else
+			{
+				WriteError(TXT_MIXIN_CLASS_CANNOT_INHERIT, mixin->script, node);
+				ok = false;
+			}
+		}
+
+		if( !ok )
+		{
+			// Remove this node so the error isn't reported again
+			asCScriptNode *delNode = node;
+			node = node->prev;
+			delNode->DisconnectParent();
+			delNode->Destroy(engine);
+		}
+
+		node = node->next;
+	}
+}
+
+void asCBuilder::AddInterfaceToClass(sClassDeclaration *decl, asCScriptNode *errNode, asCObjectType *intfType)
+{
+	// A shared type may only implement from shared interfaces
+	if( decl->typeInfo->IsShared() && !intfType->IsShared() )
+	{
+		asCString msg;
+		msg.Format(TXT_SHARED_CANNOT_IMPLEMENT_NON_SHARED_s, intfType->name.AddressOf());
+		WriteError(msg, decl->script, errNode);
+		return;
+	}
+
+	if( decl->isExistingShared )
+	{
+		// If the class is an existing shared class, then just check if the
+		// interface exists in the original declaration too
+		if( !decl->typeInfo->Implements(intfType) )
+		{
+			asCString str;
+			str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, decl->typeInfo->GetName());
+			WriteError(str, decl->script, errNode);
+			return;
+		}
+	}
+	else
+	{
+		// If the interface is already in the class then don't add it again
+		if( decl->typeInfo->Implements(intfType) )
+			return;
+
+		// Add the interface to the class
+		CastToObjectType(decl->typeInfo)->interfaces.PushLast(intfType);
+
+		// Add the inherited interfaces too
+		// For interfaces this will be done outside to handle out-of-order declarations
+		if( !CastToObjectType(decl->typeInfo)->IsInterface() )
+		{
+			for( asUINT n = 0; n < intfType->interfaces.GetLength(); n++ )
+				AddInterfaceToClass(decl, errNode, intfType->interfaces[n]);
+		}
+	}
+}
+
+void asCBuilder::CompileInterfaces()
+{
+	asUINT n;
+
+	// Order the interfaces with inheritances so that the inherited
+	// of inherited interfaces can be added properly
+	for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
+	{
+		sClassDeclaration *intfDecl = interfaceDeclarations[n];
+		asCObjectType *intfType = CastToObjectType(intfDecl->typeInfo);
+
+		if( intfType->interfaces.GetLength() == 0 ) continue;
+
+		// If any of the derived interfaces are found after this interface, then move this to the end of the list
+		for( asUINT m = n+1; m < interfaceDeclarations.GetLength(); m++ )
+		{
+			if( intfType != interfaceDeclarations[m]->typeInfo &&
+				intfType->Implements(interfaceDeclarations[m]->typeInfo) )
+			{
+				interfaceDeclarations.RemoveIndex(n);
+				interfaceDeclarations.PushLast(intfDecl);
+
+				// Decrease index so that we don't skip an entry
+				n--;
+				break;
+			}
+		}
+	}
+
+	// Now recursively add the additional inherited interfaces
+	for( n = 0; n < interfaceDeclarations.GetLength(); n++ )
+	{
+		sClassDeclaration *intfDecl = interfaceDeclarations[n];
+		if( intfDecl->isExistingShared )
+		{
+			// Set the declaration as validated already, so that other
+			// types that contain this will accept this type
+			intfDecl->validState = 1;
+			continue;
+		}
+		
+		asCObjectType *intfType = CastToObjectType(intfDecl->typeInfo);
+
+		// TODO: Is this really at the correct place? Hasn't the vfTableIdx already been set here?
+		// Co-opt the vfTableIdx value in our own methods to indicate the
+		// index the function should have in the table chunk for this interface.
+		for( asUINT d = 0; d < intfType->methods.GetLength(); d++ )
+		{
+			asCScriptFunction *func = GetFunctionDescription(intfType->methods[d]);
+			func->vfTableIdx = d;
+
+			asASSERT(func->objectType == intfType);
+		}
+
+		// As new interfaces will be added to the end of the list, all
+		// interfaces will be traversed the same as recursively
+		for( asUINT m = 0; m < intfType->interfaces.GetLength(); m++ )
+		{
+			asCObjectType *base = intfType->interfaces[m];
+
+			// Add any interfaces not already implemented
+			for( asUINT l = 0; l < base->interfaces.GetLength(); l++ )
+				AddInterfaceToClass(intfDecl, intfDecl->node, base->interfaces[l]);
+
+			// Add the methods from the implemented interface
+			for( asUINT l = 0; l < base->methods.GetLength(); l++ )
+			{
+				// If the derived interface implements the same method, then don't add the base interface' method
+				asCScriptFunction *baseFunc = GetFunctionDescription(base->methods[l]);
+				asCScriptFunction *derivedFunc = 0;
+				bool found = false;
+				for( asUINT d = 0; d < intfType->methods.GetLength(); d++ )
+				{
+					derivedFunc = GetFunctionDescription(intfType->methods[d]);
+					if( derivedFunc->IsSignatureEqual(baseFunc) )
+					{
+						found = true;
+						break;
+					}
+				}
+
+				if( !found )
+				{
+					// Add the method
+					intfType->methods.PushLast(baseFunc->id);
+					baseFunc->AddRefInternal();
+				}
+			}
+		}
+	}
+}
+
+void asCBuilder::DetermineTypeRelations()
+{
+	// Determine inheritance between interfaces
+	for (asUINT n = 0; n < interfaceDeclarations.GetLength(); n++)
+	{
+		sClassDeclaration *intfDecl = interfaceDeclarations[n];
+		asCObjectType *intfType = CastToObjectType(intfDecl->typeInfo);
+
+		asCScriptNode *node = intfDecl->node;
+		asASSERT(node && node->nodeType == snInterface);
+		node = node->firstChild;
+
+		// Skip the 'shared' & 'external' keywords
+		while( node->nodeType == snIdentifier &&
+			   (intfDecl->script->TokenEquals(node->tokenPos, node->tokenLength, SHARED_TOKEN) ||
+				intfDecl->script->TokenEquals(node->tokenPos, node->tokenLength, EXTERNAL_TOKEN)) )
+			node = node->next;
+
+		// Skip the name
+		node = node->next;
+
+		// Verify the inherited interfaces
+		while (node && node->nodeType == snIdentifier)
+		{
+			asSNameSpace *ns;
+			asCString name;
+			if (GetNamespaceAndNameFromNode(node, intfDecl->script, intfType->nameSpace, ns, name) < 0)
+			{
+				node = node->next;
+				continue;
+			}
+
+			// Find the object type for the interface
+			asCObjectType *objType = 0;
+			while (ns)
+			{
+				objType = GetObjectType(name.AddressOf(), ns);
+				if (objType) break;
+
+				ns = engine->GetParentNameSpace(ns);
+			}
+
+			// Check that the object type is an interface
+			bool ok = true;
+			if (objType && objType->IsInterface())
+			{
+				// Check that the implemented interface is shared if the base interface is shared
+				if (intfType->IsShared() && !objType->IsShared())
+				{
+					asCString str;
+					str.Format(TXT_SHARED_CANNOT_IMPLEMENT_NON_SHARED_s, objType->GetName());
+					WriteError(str, intfDecl->script, node);
+					ok = false;
+				}
+			}
+			else
+			{
+				WriteError(TXT_INTERFACE_CAN_ONLY_IMPLEMENT_INTERFACE, intfDecl->script, node);
+				ok = false;
+			}
+
+			if (ok)
+			{
+				// Make sure none of the implemented interfaces implement from this one
+				asCObjectType *base = objType;
+				while (base != 0)
+				{
+					if (base == intfType)
+					{
+						WriteError(TXT_CANNOT_IMPLEMENT_SELF, intfDecl->script, node);
+						ok = false;
+						break;
+					}
+
+					// At this point there is at most one implemented interface
+					if (base->interfaces.GetLength())
+						base = base->interfaces[0];
+					else
+						break;
+				}
+			}
+
+			if (ok)
+				AddInterfaceToClass(intfDecl, node, objType);
+
+			// Remove the nodes so they aren't parsed again
+			asCScriptNode *delNode = node;
+			node = node->next;
+			delNode->DisconnectParent();
+			delNode->Destroy(engine);
+		}
+	}
+
+	// Determine class inheritances and interfaces
+	for (asUINT n = 0; n < classDeclarations.GetLength(); n++)
+	{
+		sClassDeclaration *decl = classDeclarations[n];
+		asCScriptCode *file = decl->script;
+
+		// Find the base class that this class inherits from
+		bool multipleInheritance = false;
+		asCScriptNode *node = decl->node->firstChild;
+
+		while (file->TokenEquals(node->tokenPos, node->tokenLength, FINAL_TOKEN) ||
+			file->TokenEquals(node->tokenPos, node->tokenLength, SHARED_TOKEN) ||
+			file->TokenEquals(node->tokenPos, node->tokenLength, ABSTRACT_TOKEN) ||
+			file->TokenEquals(node->tokenPos, node->tokenLength, EXTERNAL_TOKEN))
+		{
+			node = node->next;
+		}
+
+		// Skip the name of the class
+		asASSERT(node->tokenType == ttIdentifier);
+		node = node->next;
+
+		while (node && node->nodeType == snIdentifier)
+		{
+			asSNameSpace *ns;
+			asCString name;
+			if (GetNamespaceAndNameFromNode(node, file, decl->typeInfo->nameSpace, ns, name) < 0)
+			{
+				node = node->next;
+				continue;
+			}
+
+			// Find the object type for the interface
+			asCObjectType *objType = 0;
+			sMixinClass *mixin = 0;
+			asSNameSpace *origNs = ns;
+			while (ns)
+			{
+				objType = GetObjectType(name.AddressOf(), ns);
+				if (objType == 0)
+					mixin = GetMixinClass(name.AddressOf(), ns);
+
+				if (objType || mixin)
+					break;
+
+				ns = engine->GetParentNameSpace(ns);
+			}
+
+			if (objType == 0 && mixin == 0)
+			{
+				asCString str;
+				if (origNs->name == "")
+					str.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS, name.AddressOf());
+				else
+					str.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, name.AddressOf(), origNs->name.AddressOf());
+				WriteError(str, file, node);
+			}
+			else if (mixin)
+			{
+				AddInterfaceFromMixinToClass(decl, node, mixin);
+			}
+			else if (!(objType->flags & asOBJ_SCRIPT_OBJECT) ||
+				(objType->flags & asOBJ_NOINHERIT))
+			{
+				// Either the class is not a script class or interface
+				// or the class has been declared as 'final'
+				asCString str;
+				str.Format(TXT_CANNOT_INHERIT_FROM_s_FINAL, objType->name.AddressOf());
+				WriteError(str, file, node);
+			}
+			else if (objType->size != 0)
+			{
+				// The class inherits from another script class
+				if (!decl->isExistingShared && CastToObjectType(decl->typeInfo)->derivedFrom != 0)
+				{
+					if (!multipleInheritance)
+					{
+						WriteError(TXT_CANNOT_INHERIT_FROM_MULTIPLE_CLASSES, file, node);
+						multipleInheritance = true;
+					}
+				}
+				else
+				{
+					// Make sure none of the base classes inherit from this one
+					asCObjectType *base = objType;
+					bool error = false;
+					while (base != 0)
+					{
+						if (base == decl->typeInfo)
+						{
+							WriteError(TXT_CANNOT_INHERIT_FROM_SELF, file, node);
+							error = true;
+							break;
+						}
+
+						base = base->derivedFrom;
+					}
+
+					if (!error)
+					{
+						// A shared type may only inherit from other shared types
+						if ((decl->typeInfo->IsShared()) && !(objType->IsShared()))
+						{
+							asCString msg;
+							msg.Format(TXT_SHARED_CANNOT_INHERIT_FROM_NON_SHARED_s, objType->name.AddressOf());
+							WriteError(msg, file, node);
+							error = true;
+						}
+					}
+
+					if (!error)
+					{
+						if (decl->isExistingShared)
+						{
+							// Verify that the base class is the same as the original shared type
+							if (CastToObjectType(decl->typeInfo)->derivedFrom != objType)
+							{
+								asCString str;
+								str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, decl->typeInfo->GetName());
+								WriteError(str, file, node);
+							}
+						}
+						else
+						{
+							// Set the base class
+							CastToObjectType(decl->typeInfo)->derivedFrom = objType;
+							objType->AddRefInternal();
+						}
+					}
+				}
+			}
+			else
+			{
+				// The class implements an interface
+				AddInterfaceToClass(decl, node, objType);
+			}
+
+			node = node->next;
+		}
+	}
+}
+
+// numTempl is the number of template instances that existed in the engine before the build begun
+void asCBuilder::CompileClasses(asUINT numTempl)
+{
+	asUINT n;
+	asCArray<sClassDeclaration*> toValidate((int)classDeclarations.GetLength());
+
+	// Order class declarations so that base classes are compiled before derived classes.
+	// This will allow the derived classes to copy properties and methods in the next step.
+	for( n = 0; n < classDeclarations.GetLength(); n++ )
+	{
+		sClassDeclaration *decl = classDeclarations[n];
+		asCObjectType *derived = CastToObjectType(decl->typeInfo);
+		asCObjectType *base = derived->derivedFrom;
+
+		if( base == 0 ) continue;
+
+		// If the base class is found after the derived class, then move the derived class to the end of the list
+		for( asUINT m = n+1; m < classDeclarations.GetLength(); m++ )
+		{
+			sClassDeclaration *declBase = classDeclarations[m];
+			if( base == declBase->typeInfo )
+			{
+				classDeclarations.RemoveIndex(n);
+				classDeclarations.PushLast(decl);
+
+				// Decrease index so that we don't skip an entry
+				n--;
+				break;
+			}
+		}
+	}
+
+	// Go through each of the classes and register the object type descriptions
+	for( n = 0; n < classDeclarations.GetLength(); n++ )
+	{
+		sClassDeclaration *decl = classDeclarations[n];
+		asCObjectType *ot = CastToObjectType(decl->typeInfo);
+		if( decl->isExistingShared )
+		{
+			// Set the declaration as validated already, so that other
+			// types that contain this will accept this type
+			decl->validState = 1;
+
+			// We'll still validate the declaration to make sure nothing new is
+			// added to the shared class that wasn't there in the previous
+			// compilation. We do not care if something that is there in the previous
+			// declaration is not included in the new declaration though.
+
+			asASSERT( ot->interfaces.GetLength() == ot->interfaceVFTOffsets.GetLength() );
+		}
+
+		// Methods included from mixin classes should take precedence over inherited methods
+		IncludeMethodsFromMixins(decl);
+
+		// Add all properties and methods from the base class
+		if( !decl->isExistingShared && ot->derivedFrom )
+		{
+			asCObjectType *baseType = ot->derivedFrom;
+
+			// The derived class inherits all interfaces from the base class
+			for( unsigned int m = 0; m < baseType->interfaces.GetLength(); m++ )
+			{
+				if( !ot->Implements(baseType->interfaces[m]) )
+					ot->interfaces.PushLast(baseType->interfaces[m]);
+			}
+
+			// TODO: Need to check for name conflict with new class methods
+
+			// Copy properties from base class to derived class
+			for( asUINT p = 0; p < baseType->properties.GetLength(); p++ )
+			{
+				asCObjectProperty *prop = AddPropertyToClass(decl, baseType->properties[p]->name, baseType->properties[p]->type, baseType->properties[p]->isPrivate, baseType->properties[p]->isProtected, true);
+
+				// The properties must maintain the same offset
+				asASSERT(prop && prop->byteOffset == baseType->properties[p]->byteOffset); UNUSED_VAR(prop);
+			}
+
+			// Copy methods from base class to derived class
+			for( asUINT m = 0; m < baseType->methods.GetLength(); m++ )
+			{
+				// If the derived class implements the same method, then don't add the base class' method
+				asCScriptFunction *baseFunc = GetFunctionDescription(baseType->methods[m]);
+				asCScriptFunction *derivedFunc = 0;
+				bool found = false;
+				for( asUINT d = 0; d < ot->methods.GetLength(); d++ )
+				{
+					derivedFunc = GetFunctionDescription(ot->methods[d]);
+					if( baseFunc->name == "opConv" || baseFunc->name == "opImplConv" ||
+						baseFunc->name == "opCast" || baseFunc->name == "opImplCast" )
+					{
+						// For the opConv and opCast methods, the return type can differ if they are different methods
+						if( derivedFunc->name == baseFunc->name &&
+							derivedFunc->IsSignatureExceptNameEqual(baseFunc) )
+						{
+							if( baseFunc->IsFinal() )
+							{
+								asCString msg;
+								msg.Format(TXT_METHOD_CANNOT_OVERRIDE_s, baseFunc->GetDeclaration());
+								WriteError(msg, decl->script, decl->node);
+							}
+
+							// Move the function from the methods array to the virtualFunctionTable
+							ot->methods.RemoveIndex(d);
+							ot->virtualFunctionTable.PushLast(derivedFunc);
+							found = true;
+							break;
+						}
+					}
+					else
+					{
+						if( derivedFunc->name == baseFunc->name &&
+							derivedFunc->IsSignatureExceptNameAndReturnTypeEqual(baseFunc) )
+						{
+							if( baseFunc->returnType != derivedFunc->returnType )
+							{
+								asCString msg;
+								msg.Format(TXT_DERIVED_METHOD_MUST_HAVE_SAME_RETTYPE_s, baseFunc->GetDeclaration());
+								WriteError(msg, decl->script, decl->node);
+							}
+
+							if( baseFunc->IsFinal() )
+							{
+								asCString msg;
+								msg.Format(TXT_METHOD_CANNOT_OVERRIDE_s, baseFunc->GetDeclaration());
+								WriteError(msg, decl->script, decl->node);
+							}
+
+							// Move the function from the methods array to the virtualFunctionTable
+							ot->methods.RemoveIndex(d);
+							ot->virtualFunctionTable.PushLast(derivedFunc);
+							found = true;
+							break;
+						}
+					}
+				}
+
+				if( !found )
+				{
+					// Push the base class function on the virtual function table
+					ot->virtualFunctionTable.PushLast(baseType->virtualFunctionTable[m]);
+					baseType->virtualFunctionTable[m]->AddRefInternal();
+
+					CheckForConflictsDueToDefaultArgs(decl->script, decl->node, baseType->virtualFunctionTable[m], ot);
+				}
+
+				ot->methods.PushLast(baseType->methods[m]);
+				engine->scriptFunctions[baseType->methods[m]]->AddRefInternal();
+			}
+		}
+
+		if( !decl->isExistingShared )
+		{
+			// Move this class' methods into the virtual function table
+			for( asUINT m = 0; m < ot->methods.GetLength(); m++ )
+			{
+				asCScriptFunction *func = GetFunctionDescription(ot->methods[m]);
+				if( func->funcType != asFUNC_VIRTUAL )
+				{
+					// Move the reference from the method list to the virtual function list
+					ot->methods.RemoveIndex(m);
+					ot->virtualFunctionTable.PushLast(func);
+
+					// Substitute the function description in the method list for a virtual method
+					// Make sure the methods are in the same order as the virtual function table
+					ot->methods.PushLast(CreateVirtualFunction(func, (int)ot->virtualFunctionTable.GetLength() - 1));
+					m--;
+				}
+			}
+
+			// Make virtual function table chunks for each implemented interface
+			for( asUINT m = 0; m < ot->interfaces.GetLength(); m++ )
+			{
+				asCObjectType *intf = ot->interfaces[m];
+
+				// Add all the interface's functions to the virtual function table
+				asUINT offset = asUINT(ot->virtualFunctionTable.GetLength());
+				ot->interfaceVFTOffsets.PushLast(offset);
+
+				for( asUINT j = 0; j < intf->methods.GetLength(); j++ )
+				{
+					asCScriptFunction *intfFunc = GetFunctionDescription(intf->methods[j]);
+
+					// Only create the table for functions that are explicitly from this interface,
+					// inherited interface methods will be put in that interface's table.
+					if( intfFunc->objectType != intf )
+						continue;
+
+					asASSERT((asUINT)intfFunc->vfTableIdx == j);
+
+					//Find the interface function in the list of methods
+					asCScriptFunction *realFunc = 0;
+					for( asUINT p = 0; p < ot->methods.GetLength(); p++ )
+					{
+						asCScriptFunction *func = GetFunctionDescription(ot->methods[p]);
+
+						if( func->signatureId == intfFunc->signatureId )
+						{
+							if( func->funcType == asFUNC_VIRTUAL )
+							{
+								realFunc = ot->virtualFunctionTable[func->vfTableIdx];
+							}
+							else
+							{
+								// This should not happen, all methods were moved into the virtual table
+								asASSERT(false);
+							}
+							break;
+						}
+					}
+
+					// If realFunc is still null, the interface was not
+					// implemented and we error out later in the checks.
+					ot->virtualFunctionTable.PushLast(realFunc);
+					if( realFunc )
+						realFunc->AddRefInternal();
+				}
+			}
+		}
+
+		// Enumerate each of the declared properties
+		asCScriptNode *node = decl->node->firstChild->next;
+
+		// Skip list of classes and interfaces
+		while( node && node->nodeType == snIdentifier )
+			node = node->next;
+
+		while( node && node->nodeType == snDeclaration )
+		{
+			asCScriptNode *nd = node->firstChild;
+
+			// Is the property declared as private or protected?
+			bool isPrivate = false, isProtected = false;
+			if( nd && nd->tokenType == ttPrivate )
+			{
+				isPrivate = true;
+				nd = nd->next;
+			}
+			else if( nd && nd->tokenType == ttProtected )
+			{
+				isProtected = true;
+				nd = nd->next;
+			}
+
+			// Determine the type of the property
+			asCScriptCode *file = decl->script;
+			asCDataType dt = CreateDataTypeFromNode(nd, file, ot->nameSpace, false, ot);
+			if( ot->IsShared() && dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared() )
+			{
+				asCString msg;
+				msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
+				WriteError(msg, file, node);
+			}
+
+			if( dt.IsReadOnly() )
+				WriteError(TXT_PROPERTY_CANT_BE_CONST, file, node);
+
+			// Multiple properties can be declared separated by ,
+			nd = nd->next;
+			while( nd )
+			{
+				asCString name(&file->code[nd->tokenPos], nd->tokenLength);
+
+				if( !decl->isExistingShared )
+				{
+					CheckNameConflictMember(ot, name.AddressOf(), nd, file, true, false);
+					AddPropertyToClass(decl, name, dt, isPrivate, isProtected, false, file, nd);
+				}
+				else
+				{
+					// Verify that the property exists in the original declaration
+					bool found = false;
+					for( asUINT p = 0; p < ot->properties.GetLength(); p++ )
+					{
+						asCObjectProperty *prop = ot->properties[p];
+						if( prop->isPrivate == isPrivate &&
+							prop->isProtected == isProtected &&
+							prop->name == name &&
+							prop->type.IsEqualExceptRef(dt) )
+						{
+							found = true;
+							break;
+						}
+					}
+					if( !found )
+					{
+						asCString str;
+						str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, ot->GetName());
+						WriteError(str, file, nd);
+					}
+				}
+
+				// Skip the initialization node
+				if( nd->next && nd->next->nodeType != snIdentifier )
+					nd = nd->next;
+
+				nd = nd->next;
+			}
+
+			node = node->next;
+		}
+
+		// Add properties from included mixin classes that don't conflict with existing properties
+		IncludePropertiesFromMixins(decl);
+
+		if( !decl->isExistingShared )
+			toValidate.PushLast(decl);
+
+		asASSERT( ot->interfaces.GetLength() == ot->interfaceVFTOffsets.GetLength() );
+	}
+
+	// TODO: Warn if a method overrides a base method without marking it as 'override'.
+	//       It must be possible to turn off this warning through engine property.
+
+	// TODO: A base class should be able to mark a method as 'abstract'. This will
+	//       allow a base class to provide a partial implementation, but still force
+	//       derived classes to implement specific methods.
+
+	// Verify that all interface methods are implemented in the classes
+	// We do this here so the base class' methods have already been inherited
+	for( n = 0; n < classDeclarations.GetLength(); n++ )
+	{
+		sClassDeclaration *decl = classDeclarations[n];
+		if( decl->isExistingShared ) continue;
+
+		asCObjectType *ot = CastToObjectType(decl->typeInfo);
+		asCArray<bool> overrideValidations(ot->GetMethodCount());
+		for( asUINT k = 0; k < ot->methods.GetLength(); k++ )
+			overrideValidations.PushLast( !static_cast<asCScriptFunction*>(ot->GetMethodByIndex(k, false))->IsOverride() );
+
+		for( asUINT m = 0; m < ot->interfaces.GetLength(); m++ )
+		{
+			asCObjectType *objType = ot->interfaces[m];
+			for( asUINT i = 0; i < objType->methods.GetLength(); i++ )
+			{
+				// Only check the interface methods that was explicitly declared in this interface
+				// Methods that was inherited from other interfaces will be checked in those interfaces
+				if( objType != engine->scriptFunctions[objType->methods[i]]->objectType )
+					continue;
+
+				asUINT overrideIndex;
+				if( !DoesMethodExist(ot, objType->methods[i], &overrideIndex) )
+				{
+					asCString str;
+					str.Format(TXT_MISSING_IMPLEMENTATION_OF_s,
+						engine->GetFunctionDeclaration(objType->methods[i]).AddressOf());
+					WriteError(str, decl->script, decl->node);
+				}
+				else
+					overrideValidations[overrideIndex] = true;
+			}
+		}
+
+		bool hasBaseClass = ot->derivedFrom != 0;
+
+		for( asUINT j = 0; j < overrideValidations.GetLength(); j++ )
+		{
+			if( !overrideValidations[j] && (!hasBaseClass || !DoesMethodExist(ot->derivedFrom, ot->methods[j])) )
+			{
+				asCString msg;
+				msg.Format(TXT_METHOD_s_DOES_NOT_OVERRIDE, ot->GetMethodByIndex(j, false)->GetDeclaration());
+				WriteError(msg, decl->script, decl->node);
+			}
+		}
+	}
+
+	// Verify that the declared structures are valid, e.g. that the structure
+	// doesn't contain a member of its own type directly or indirectly
+	while( toValidate.GetLength() > 0 )
+	{
+		asUINT numClasses = (asUINT)toValidate.GetLength();
+
+		asCArray<sClassDeclaration*> toValidateNext((int)toValidate.GetLength());
+		while( toValidate.GetLength() > 0 )
+		{
+			sClassDeclaration *decl = toValidate[toValidate.GetLength()-1];
+			asCObjectType *ot = CastToObjectType(decl->typeInfo);
+			int validState = 1;
+			for( n = 0; n < ot->properties.GetLength(); n++ )
+			{
+				// A valid structure is one that uses only primitives or other valid objects
+				asCObjectProperty *prop = ot->properties[n];
+				asCDataType dt = prop->type;
+
+				// TODO: Add this check again, once solving the issues commented below
+				/*
+				if( dt.IsTemplate() )
+				{
+					// TODO: This must verify all sub types, not just the first one
+					// TODO: Just because the subtype is not a handle doesn't mean the template will actually instance the object
+					//       this it shouldn't automatically raise an error for this, e.g. weakref<Object> should be legal as member
+					//       of the Object class
+					asCDataType sub = dt;
+					while( sub.IsTemplate() && !sub.IsObjectHandle() )
+						sub = sub.GetSubType();
+
+					dt = sub;
+				}
+				*/
+
+				if( dt.IsObject() && !dt.IsObjectHandle() )
+				{
+					// Find the class declaration
+					sClassDeclaration *pdecl = 0;
+					for( asUINT p = 0; p < classDeclarations.GetLength(); p++ )
+					{
+						if( classDeclarations[p]->typeInfo == dt.GetTypeInfo() )
+						{
+							pdecl = classDeclarations[p];
+							break;
+						}
+					}
+
+					if( pdecl )
+					{
+						if( pdecl->typeInfo == decl->typeInfo )
+						{
+							WriteError(TXT_ILLEGAL_MEMBER_TYPE, decl->script, decl->node);
+							validState = 2;
+							break;
+						}
+						else if( pdecl->validState != 1 )
+						{
+							validState = pdecl->validState;
+							break;
+						}
+					}
+				}
+			}
+
+			if( validState == 1 )
+			{
+				decl->validState = 1;
+				toValidate.PopLast();
+			}
+			else if( validState == 2 )
+			{
+				decl->validState = 2;
+				toValidate.PopLast();
+			}
+			else
+			{
+				toValidateNext.PushLast(toValidate.PopLast());
+			}
+		}
+
+		toValidate = toValidateNext;
+		toValidateNext.SetLength(0);
+
+		if( numClasses == toValidate.GetLength() )
+		{
+			WriteError(TXT_ILLEGAL_MEMBER_TYPE, toValidate[0]->script, toValidate[0]->node);
+			break;
+		}
+	}
+
+	if( numErrors > 0 ) return;
+
+	// Verify which script classes can really form circular references, and mark only those as garbage collected.
+	// This must be done in the correct order, so that a class that contains another class isn't needlessly marked
+	// as garbage collected, just because the contained class was evaluated afterwards.
+
+	// TODO: runtime optimize: This algorithm can be further improved by checking the types that inherits from
+	//                         a base class. If the base class is not shared all the classes that derive from it
+	//                         are known at compile time, and can thus be checked for potential circular references too.
+	//
+	//                         Observe, that doing this would conflict with another potential future feature, which is to
+	//                         allow incremental builds, i.e. allow application to add or replace classes in an
+	//                         existing module. However, the applications that want to use that should use a special
+	//                         build flag to not finalize the module.
+
+	asCArray<asCObjectType*> typesToValidate;
+	for( n = 0; n < classDeclarations.GetLength(); n++ )
+	{
+		// Existing shared classes won't need evaluating, nor interfaces
+		sClassDeclaration *decl = classDeclarations[n];
+		if( decl->isExistingShared ) continue;
+
+		asCObjectType *ot = CastToObjectType(decl->typeInfo);
+		if( ot->IsInterface() ) continue;
+
+		typesToValidate.PushLast(ot);
+	}
+
+	asUINT numReevaluations = 0;
+	while( typesToValidate.GetLength() )
+	{
+		if( numReevaluations > typesToValidate.GetLength() )
+		{
+			// No types could be completely evaluated in the last iteration so
+			// we consider the remaining types in the array as garbage collected
+			break;
+		}
+
+		asCObjectType *type = typesToValidate[0];
+		typesToValidate.RemoveIndex(0);
+
+		// If the type inherits from another type that is yet to be validated, then reinsert it at the end
+		if( type->derivedFrom && typesToValidate.Exists(type->derivedFrom) )
+		{
+			typesToValidate.PushLast(type);
+			numReevaluations++;
+			continue;
+		}
+
+		// If the type inherits from a known garbage collected type, then this type must also be garbage collected
+		if( type->derivedFrom && (type->derivedFrom->flags & asOBJ_GC) )
+		{
+			type->flags |= asOBJ_GC;
+			continue;
+		}
+
+		// Evaluate template instances (silently) before verifying each of the classes, since it is possible that
+		// a class will be marked as non-garbage collected, which in turn will mark the template instance that uses
+		// it as non-garbage collected, which in turn means the class that contains the array also do not have to be
+		// garbage collected
+		EvaluateTemplateInstances(numTempl, true);
+
+		// Is there some path in which this structure is involved in circular references?
+		// If the type contains a member of a type that is yet to be validated, then reinsert it at the end
+		bool mustReevaluate = false;
+		bool gc = false;
+		for( asUINT p = 0; p < type->properties.GetLength(); p++ )
+		{
+			asCDataType dt = type->properties[p]->type;
+
+			if (dt.IsFuncdef())
+			{
+				// If a class holds a function pointer as member then the class must be garbage collected as the
+				// function pointer can form circular references with the class through use of a delegate. Example:
+				//
+				//   class A { B @b; void f(); }
+				//   class B { F @f; }
+				//   funcdef void F();
+				//
+				//   A a;
+				//   @a.b = B();       // instance of A refers to instance of B
+				//   @a.b.f = F(a.f);  // instance of B refers to delegate that refers to instance of A
+				//
+				gc = true;
+				break;
+			}
+
+			if( !dt.IsObject() )
+				continue;
+
+			if( typesToValidate.Exists(CastToObjectType(dt.GetTypeInfo())) )
+				mustReevaluate = true;
+			else
+			{
+				if( dt.IsTemplate() )
+				{
+					// Check if any of the subtypes are yet to be evaluated
+					bool skip = false;
+					for( asUINT s = 0; s < dt.GetTypeInfo()->GetSubTypeCount(); s++ )
+					{
+						asCObjectType *t = reinterpret_cast<asCObjectType*>(dt.GetTypeInfo()->GetSubType(s));
+						if( typesToValidate.Exists(t) )
+						{
+							mustReevaluate = true;
+							skip = true;
+							break;
+						}
+					}
+					if( skip )
+						continue;
+				}
+
+				if( dt.IsObjectHandle() )
+				{
+					// If it is known that the handle can't be involved in a circular reference
+					// then this object doesn't need to be marked as garbage collected.
+					asCObjectType *prop = CastToObjectType(dt.GetTypeInfo());
+
+					if( prop->flags & asOBJ_SCRIPT_OBJECT )
+					{
+						// For script objects, treat non-final classes as if they can contain references
+						// as it is not known what derived classes might do. For final types, check all
+						// properties to determine if any of those can cause a circular reference with this
+						// class.
+						if( prop->flags & asOBJ_NOINHERIT )
+						{
+							for( asUINT sp = 0; sp < prop->properties.GetLength(); sp++ )
+							{
+								asCDataType sdt = prop->properties[sp]->type;
+
+								if( sdt.IsObject() )
+								{
+									if( sdt.IsObjectHandle() )
+									{
+										// TODO: runtime optimize: If the handle is again to a final class, then we can recursively check if the circular reference can occur
+										if( sdt.GetTypeInfo()->flags & (asOBJ_SCRIPT_OBJECT | asOBJ_GC) )
+										{
+											gc = true;
+											break;
+										}
+									}
+									else if( sdt.GetTypeInfo()->flags & asOBJ_GC )
+									{
+										// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
+										//                         Only if the object is of a type that can reference this type, either directly or indirectly
+										gc = true;
+										break;
+									}
+								}
+							}
+
+							if( gc )
+								break;
+						}
+						else
+						{
+							// Assume it is garbage collected as it is not known at compile time what might inherit from this type
+							gc = true;
+							break;
+						}
+					}
+					else if( prop->flags & asOBJ_GC )
+					{
+						// If a type is not a script object, adopt its GC flag
+						// TODO: runtime optimize: Just because an application registered class is garbage collected, doesn't mean it
+						//                         can form a circular reference with this script class. Perhaps need a flag to tell
+						//                         if the script classes that contains the type should be garbage collected or not.
+						gc = true;
+						break;
+					}
+				}
+				else if( dt.GetTypeInfo()->flags & asOBJ_GC )
+				{
+					// TODO: runtime optimize: Just because the member type is a potential circle doesn't mean that this one is.
+					//                         Only if the object is of a type that can reference this type, either directly or indirectly
+					gc = true;
+					break;
+				}
+			}
+		}
+
+		// If the class wasn't found to require garbage collection, but it
+		// contains another type that has yet to be evaluated then it must be
+		// re-evaluated.
+		if( !gc && mustReevaluate )
+		{
+			typesToValidate.PushLast(type);
+			numReevaluations++;
+			continue;
+		}
+
+		// Update the flag in the object type
+		if( gc )
+			type->flags |= asOBJ_GC;
+		else
+			type->flags &= ~asOBJ_GC;
+
+		// Reset the counter
+		numReevaluations = 0;
+	}
+}
+
+void asCBuilder::IncludeMethodsFromMixins(sClassDeclaration *decl)
+{
+	asCScriptNode *node = decl->node->firstChild;
+
+	// Skip the class attributes
+	while( node->nodeType == snIdentifier &&
+		   !decl->script->TokenEquals(node->tokenPos, node->tokenLength, decl->name.AddressOf()) )
+		node = node->next;
+
+	// Skip the name of the class
+	node = node->next;
+
+	// Find the included mixin classes
+	while( node && node->nodeType == snIdentifier )
+	{
+		asSNameSpace *ns;
+		asCString name;
+		if( GetNamespaceAndNameFromNode(node, decl->script, decl->typeInfo->nameSpace, ns, name) < 0 )
+		{
+			node = node->next;
+			continue;
+		}
+
+		sMixinClass *mixin = 0;
+		while( ns )
+		{
+			// Need to make sure the name is not an object type
+			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
+			if( objType == 0 )
+				mixin = GetMixinClass(name.AddressOf(), ns);
+
+			if( objType || mixin )
+				break;
+
+			ns = engine->GetParentNameSpace(ns);
+		}
+
+		if( mixin )
+		{
+			// Find methods from mixin declaration
+			asCScriptNode *n = mixin->node->firstChild;
+
+			// Skip to the member declarations
+			// Possible keywords 'final' and 'shared' are removed in RegisterMixinClass so we don't need to worry about those here
+			while( n && n->nodeType == snIdentifier )
+				n = n->next;
+
+			// Add methods from the mixin that are not already existing in the class
+			while( n )
+			{
+				if( n->nodeType == snFunction )
+				{
+					// Instead of disconnecting the node, we need to clone it, otherwise other
+					// classes that include the same mixin will not see the methods
+					asCScriptNode *copy = n->CreateCopy(engine);
+
+					// Register the method, but only if it doesn't already exist in the class
+					RegisterScriptFunctionFromNode(copy, mixin->script, CastToObjectType(decl->typeInfo), false, false, mixin->ns, false, true);
+				}
+				else if( n->nodeType == snVirtualProperty )
+				{
+					// TODO: mixin: Support virtual properties too
+					WriteError("The virtual property syntax is currently not supported for mixin classes", mixin->script, n);
+					//RegisterVirtualProperty(node, decl->script, decl->objType, false, false);
+				}
+
+				n = n->next;
+			}
+		}
+
+		node = node->next;
+	}
+}
+
+void asCBuilder::IncludePropertiesFromMixins(sClassDeclaration *decl)
+{
+	asCScriptNode *node = decl->node->firstChild;
+
+	// Skip the class attributes
+	while( node->nodeType == snIdentifier &&
+		   !decl->script->TokenEquals(node->tokenPos, node->tokenLength, decl->name.AddressOf()) )
+		node = node->next;
+
+	// Skip the name of the class
+	node = node->next;
+
+	// Find the included mixin classes
+	while( node && node->nodeType == snIdentifier )
+	{
+		asSNameSpace *ns;
+		asCString name;
+		if( GetNamespaceAndNameFromNode(node, decl->script, decl->typeInfo->nameSpace, ns, name) < 0 )
+		{
+			node = node->next;
+			continue;
+		}
+
+		sMixinClass *mixin = 0;
+		while( ns )
+		{
+			// Need to make sure the name is not an object type
+			asCObjectType *objType = GetObjectType(name.AddressOf(), ns);
+			if( objType == 0 )
+				mixin = GetMixinClass(name.AddressOf(), ns);
+
+			if( objType || mixin )
+				break;
+
+			ns = engine->GetParentNameSpace(ns);
+		}
+
+		if( mixin )
+		{
+			// Find properties from mixin declaration
+			asCScriptNode *n = mixin->node->firstChild;
+
+			// Skip to the member declarations
+			// Possible keywords 'final' and 'shared' are removed in RegisterMixinClass so we don't need to worry about those here
+			while( n && n->nodeType == snIdentifier )
+				n = n->next;
+
+			// Add properties from the mixin that are not already existing in the class
+			while( n )
+			{
+				if( n->nodeType == snDeclaration )
+				{
+					asCScriptNode *n2 = n->firstChild;
+					bool isPrivate = false, isProtected = false;
+					if( n2 && n2->tokenType == ttPrivate )
+					{
+						isPrivate = true;
+						n2 = n2->next;
+					}
+					else if( n2 && n2->tokenType == ttProtected )
+					{
+						isProtected = true;
+						n2 = n2->next;
+					}
+
+					asCScriptCode *file = mixin->script;
+					asCDataType dt = CreateDataTypeFromNode(n2, file, mixin->ns);
+
+					if( decl->typeInfo->IsShared() && dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared() )
+					{
+						asCString msg;
+						msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
+						WriteError(msg, file, n);
+						WriteInfo(TXT_WHILE_INCLUDING_MIXIN, decl->script, node);
+					}
+
+					if( dt.IsReadOnly() )
+						WriteError(TXT_PROPERTY_CANT_BE_CONST, file, n);
+
+					n2 = n2->next;
+					while( n2 )
+					{
+						name.Assign(&file->code[n2->tokenPos], n2->tokenLength);
+
+						// Add the property only if it doesn't already exist in the class
+						bool exists = false;
+						asCObjectType *ot = CastToObjectType(decl->typeInfo);
+						for( asUINT p = 0; p < ot->properties.GetLength(); p++ )
+							if( ot->properties[p]->name == name )
+							{
+								exists = true;
+								break;
+							}
+
+						if( !exists )
+						{
+							if( !decl->isExistingShared )
+							{
+								// It must not conflict with the name of methods
+								int r = CheckNameConflictMember(ot, name.AddressOf(), n2, file, true, false);
+								if( r < 0 )
+									WriteInfo(TXT_WHILE_INCLUDING_MIXIN, decl->script, node);
+
+								AddPropertyToClass(decl, name, dt, isPrivate, isProtected, false, file, n2);
+							}
+							else
+							{
+								// Verify that the property exists in the original declaration
+								bool found = false;
+								for( asUINT p = 0; p < ot->properties.GetLength(); p++ )
+								{
+									asCObjectProperty *prop = ot->properties[p];
+									if( prop->isPrivate == isPrivate &&
+										prop->isProtected == isProtected &&
+										prop->name == name &&
+										prop->type == dt )
+									{
+										found = true;
+										break;
+									}
+								}
+								if( !found )
+								{
+									asCString str;
+									str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, ot->GetName());
+									WriteError(str, decl->script, decl->node);
+									WriteInfo(TXT_WHILE_INCLUDING_MIXIN, decl->script, node);
+								}
+							}
+						}
+
+						// Skip the initialization expression
+						if( n2->next && n2->next->nodeType != snIdentifier )
+							n2 = n2->next;
+
+						n2 = n2->next;
+					}
+				}
+
+				n = n->next;
+			}
+		}
+
+		node = node->next;
+	}
+}
+
+int asCBuilder::CreateVirtualFunction(asCScriptFunction *func, int idx)
+{
+	asCScriptFunction *vf = asNEW(asCScriptFunction)(engine, module, asFUNC_VIRTUAL);
+	if( vf == 0 )
+		return asOUT_OF_MEMORY;
+
+	vf->name             = func->name;
+	vf->nameSpace        = func->nameSpace;
+	vf->returnType       = func->returnType;
+	vf->parameterTypes   = func->parameterTypes;
+	vf->inOutFlags       = func->inOutFlags;
+	vf->id               = engine->GetNextScriptFunctionId();
+	vf->objectType       = func->objectType;
+	vf->objectType->AddRefInternal();
+	vf->signatureId      = func->signatureId;
+	vf->vfTableIdx       = idx;
+	vf->traits           = func->traits;
+
+	// Clear the shared trait since the virtual function should not have that
+	vf->SetShared(false);
+
+	// It is not necessary to copy the default args, as they have no meaning in the virtual function
+
+	module->AddScriptFunction(vf);
+
+	// Add a dummy to the builder so that it doesn't mix up function ids
+	functions.PushLast(0);
+
+	return vf->id;
+}
+
+asCObjectProperty *asCBuilder::AddPropertyToClass(sClassDeclaration *decl, const asCString &name, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited, asCScriptCode *file, asCScriptNode *node)
+{
+	if( node )
+	{
+		asASSERT(!isInherited);
+
+		// Check if the property is allowed
+		if( !dt.CanBeInstantiated() )
+		{
+			if( file && node )
+			{
+				asCString str;
+				if( dt.IsAbstractClass() )
+					str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(decl->typeInfo->nameSpace).AddressOf());
+				else if( dt.IsInterface() )
+					str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(decl->typeInfo->nameSpace).AddressOf());
+				else
+					// TODO: Improve error message to explain why
+					str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(decl->typeInfo->nameSpace).AddressOf());
+				WriteError(str, file, node);
+			}
+			return 0;
+		}
+
+		// Register the initialization expression (if any) to be compiled later
+		asCScriptNode *declNode = node;
+		asCScriptNode *initNode = 0;
+		if( node->next && node->next->nodeType != snIdentifier )
+		{
+			asASSERT( node->next->nodeType == snAssignment );
+			initNode = node->next;
+		}
+
+		sPropertyInitializer p(name, declNode, initNode, file);
+		decl->propInits.PushLast(p);
+	}
+	else
+	{
+		// If the declaration node is not given, then
+		// this property is inherited from a base class
+		asASSERT(isInherited);
+	}
+
+	// Add the property to the object type
+	return CastToObjectType(decl->typeInfo)->AddPropertyToClass(name, dt, isPrivate, isProtected, isInherited);
+}
+
+bool asCBuilder::DoesMethodExist(asCObjectType *objType, int methodId, asUINT *methodIndex)
+{
+	asCScriptFunction *method = GetFunctionDescription(methodId);
+
+	for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
+	{
+		asCScriptFunction *m = GetFunctionDescription(objType->methods[n]);
+
+		if( m->name           != method->name           ) continue;
+		if( m->returnType     != method->returnType     ) continue;
+		if( m->IsReadOnly()   != method->IsReadOnly()   ) continue;
+		if( m->parameterTypes != method->parameterTypes ) continue;
+		if( m->inOutFlags     != method->inOutFlags     ) continue;
+
+		if( methodIndex )
+			*methodIndex = n;
+
+		return true;
+	}
+
+	return false;
+}
+
+void asCBuilder::AddDefaultConstructor(asCObjectType *objType, asCScriptCode *file)
+{
+	int funcId = engine->GetNextScriptFunctionId();
+
+	asCDataType returnType = asCDataType::CreatePrimitive(ttVoid, false);
+	asCArray<asCDataType> parameterTypes;
+	asCArray<asETypeModifiers> inOutFlags;
+	asCArray<asCString *> defaultArgs;
+	asCArray<asCString> parameterNames;
+
+	// Add the script function
+	// TODO: declaredAt should be set to where the class has been declared
+	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, false, objType, false, asSFunctionTraits(), objType->nameSpace);
+
+	// Set it as default constructor
+	if( objType->beh.construct )
+		engine->scriptFunctions[objType->beh.construct]->ReleaseInternal();
+	objType->beh.construct = funcId;
+	objType->beh.constructors[0] = funcId;
+	engine->scriptFunctions[funcId]->AddRefInternal();
+
+	// The bytecode for the default constructor will be generated
+	// only after the potential inheritance has been established
+	sFunctionDescription *func = asNEW(sFunctionDescription);
+	if( func == 0 )
+	{
+		// Out of memory
+		return;
+	}
+
+	functions.PushLast(func);
+
+	func->script            = file;
+	func->node              = 0;
+	func->name              = objType->name;
+	func->objType           = objType;
+	func->funcId            = funcId;
+	func->isExistingShared  = false;
+
+	// Add a default factory as well
+	funcId = engine->GetNextScriptFunctionId();
+	if( objType->beh.factory )
+		engine->scriptFunctions[objType->beh.factory]->ReleaseInternal();
+	objType->beh.factory = funcId;
+	objType->beh.factories[0] = funcId;
+	returnType = asCDataType::CreateObjectHandle(objType, false);
+	// TODO: should be the same as the constructor
+	module->AddScriptFunction(file->idx, 0, funcId, objType->name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, false);
+	functions.PushLast(0);
+	asCCompiler compiler(engine);
+	compiler.CompileFactory(this, file, engine->scriptFunctions[funcId]);
+	engine->scriptFunctions[funcId]->AddRefInternal();
+
+	// If the object is shared, then the factory must also be marked as shared
+	if( objType->flags & asOBJ_SHARED )
+		engine->scriptFunctions[funcId]->SetShared(true);
+}
+
+int asCBuilder::RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
+{
+	// Is it a shared enum?
+	bool isShared = false;
+	bool isExternal = false;
+	asCEnumType *existingSharedType = 0;
+	asCScriptNode *tmp = node->firstChild;
+	while( tmp->nodeType == snIdentifier )
+	{
+		if (file->TokenEquals(tmp->tokenPos, tmp->tokenLength, SHARED_TOKEN))
+			isShared = true;
+		else if (file->TokenEquals(tmp->tokenPos, tmp->tokenLength, EXTERNAL_TOKEN))
+			isExternal = true;
+		else
+			break;
+		tmp = tmp->next;
+	}
+
+	// Grab the name of the enumeration
+	asCString name;
+	asASSERT(snDataType == tmp->nodeType);
+	asASSERT(snIdentifier == tmp->firstChild->nodeType);
+	name.Assign(&file->code[tmp->firstChild->tokenPos], tmp->firstChild->tokenLength);
+
+	if( isShared )
+	{
+		// Look for a pre-existing shared enum with the same signature
+		for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
+		{
+			asCTypeInfo *o = engine->sharedScriptTypes[n];
+			if( o &&
+				o->IsShared() &&
+				(o->flags & asOBJ_ENUM) &&
+				o->name == name &&
+				o->nameSpace == ns )
+			{
+				existingSharedType = CastToEnumType(o);
+				break;
+			}
+		}
+	}
+
+	// If the enum was declared as external then it must have been compiled in a different module first
+	if (isExternal && existingSharedType == 0)
+	{
+		asCString str;
+		str.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, name.AddressOf());
+		WriteError(str, file, tmp);
+	}
+
+	// Remember if the type was declared as external so the saved bytecode can be flagged accordingly
+	if (isExternal && existingSharedType)
+		module->m_externalTypes.PushLast(existingSharedType);
+
+	// Check the name and add the enum
+	int r = CheckNameConflict(name.AddressOf(), tmp->firstChild, file, ns, true, false, false);
+	if( asSUCCESS == r )
+	{
+		asCEnumType *st;
+
+		if( existingSharedType )
+		{
+			st = existingSharedType;
+			st->AddRefInternal();
+		}
+		else
+		{
+			st = asNEW(asCEnumType)(engine);
+			if( st == 0 )
+				return asOUT_OF_MEMORY;
+
+			st->flags     = asOBJ_ENUM;
+			if( isShared )
+				st->flags |= asOBJ_SHARED;
+			st->size      = 4;
+			st->name      = name;
+			st->nameSpace = ns;
+			st->module    = module;
+		}
+		module->AddEnumType(st);
+
+		if( !existingSharedType && isShared )
+		{
+			engine->sharedScriptTypes.PushLast(st);
+			st->AddRefInternal();
+		}
+
+		// Store the location of this declaration for reference in name collisions
+		sClassDeclaration *decl = asNEW(sClassDeclaration);
+		if( decl == 0 )
+			return asOUT_OF_MEMORY;
+
+		decl->name             = name;
+		decl->script           = file;
+		decl->typeInfo         = st;
+		namedTypeDeclarations.PushLast(decl);
+
+		asCDataType type = CreateDataTypeFromNode(tmp, file, ns);
+		asASSERT(!type.IsReference());
+
+		// External shared enums must not redeclare the enum values
+		if (isExternal && (tmp->next == 0 || tmp->next->tokenType != ttEndStatement) )
+		{
+			asCString str;
+			str.Format(TXT_EXTERNAL_SHARED_s_CANNOT_REDEF, name.AddressOf());
+			WriteError(str, file, tmp);
+		}
+		else if (!isExternal && tmp->next && tmp->next->tokenType == ttEndStatement)
+		{
+			asCString str;
+			str.Format(TXT_MISSING_DEFINITION_OF_s, name.AddressOf());
+			WriteError(str, file, tmp);
+		}
+
+		// Register the enum values
+		tmp = tmp->next;
+		while( tmp && tmp->nodeType == snIdentifier )
+		{
+			name.Assign(&file->code[tmp->tokenPos], tmp->tokenLength);
+
+			if( existingSharedType )
+			{
+				// If this is a pre-existent shared enum, then just double check
+				// that the value is already defined in the original declaration
+				bool found = false;
+				for( asUINT n = 0; n < st->enumValues.GetLength(); n++ )
+					if( st->enumValues[n]->name == name )
+					{
+						found = true;
+						break;
+					}
+
+				if( !found )
+				{
+					asCString str;
+					str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, st->GetName());
+					WriteError(str, file, tmp);
+					break;
+				}
+
+				tmp = tmp->next;
+				if( tmp && tmp->nodeType == snAssignment )
+					tmp = tmp->next;
+				continue;
+			}
+			else
+			{
+				// Check for name conflict errors with other values in the enum
+				if( globVariables.GetFirst(ns, name, asCCompGlobVarType(type)) )
+				{
+					asCString str;
+					str.Format(TXT_NAME_CONFLICT_s_ALREADY_USED, name.AddressOf());
+					WriteError(str, file, tmp);
+
+					tmp = tmp->next;
+					if( tmp && tmp->nodeType == snAssignment )
+						tmp = tmp->next;
+					continue;
+				}
+
+				// Check for assignment
+				asCScriptNode *asnNode = tmp->next;
+				if( asnNode && snAssignment == asnNode->nodeType )
+					asnNode->DisconnectParent();
+				else
+					asnNode = 0;
+
+				// Create the global variable description so the enum value can be evaluated
+				sGlobalVariableDescription *gvar = asNEW(sGlobalVariableDescription);
+				if( gvar == 0 )
+					return asOUT_OF_MEMORY;
+
+				gvar->script             = file;
+				gvar->declaredAtNode     = tmp;
+				tmp = tmp->next;
+				gvar->declaredAtNode->DisconnectParent();
+				gvar->initializationNode = asnNode;
+				gvar->name               = name;
+				gvar->datatype           = type;
+				gvar->ns                 = ns;
+				// No need to allocate space on the global memory stack since the values are stored in the asCObjectType
+				// Set the index to a negative to allow compiler to diferentiate from ordinary global var when compiling the initialization
+				gvar->index              = -1;
+				gvar->isCompiled         = false;
+				gvar->isPureConstant     = true;
+				gvar->isEnumValue        = true;
+				gvar->constantValue      = 0xdeadbeef;
+
+				// Allocate dummy property so we can compile the value.
+				// This will be removed later on so we don't add it to the engine.
+				gvar->property = asNEW(asCGlobalProperty);
+				if( gvar->property == 0 )
+					return asOUT_OF_MEMORY;
+
+				gvar->property->name      = name;
+				gvar->property->nameSpace = ns;
+				gvar->property->type      = gvar->datatype;
+				gvar->property->id        = 0;
+
+				globVariables.Put(gvar);
+			}
+		}
+	}
+
+	node->Destroy(engine);
+
+	return r;
+}
+
+int asCBuilder::RegisterTypedef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
+{
+	// Get the native data type
+	asCScriptNode *tmp = node->firstChild;
+	asASSERT(NULL != tmp && snDataType == tmp->nodeType);
+	asCDataType dataType;
+	dataType.CreatePrimitive(tmp->tokenType, false);
+	dataType.SetTokenType(tmp->tokenType);
+	tmp = tmp->next;
+
+	// Grab the name of the typedef
+	asASSERT(NULL != tmp && NULL == tmp->next);
+	asCString name;
+	name.Assign(&file->code[tmp->tokenPos], tmp->tokenLength);
+
+	// If the name is not already in use add it
+ 	int r = CheckNameConflict(name.AddressOf(), tmp, file, ns, true, false, false);
+
+	asCTypedefType *st = 0;
+	if( asSUCCESS == r )
+	{
+		// Create the new type
+		st = asNEW(asCTypedefType)(engine);
+		if( st == 0 )
+			r = asOUT_OF_MEMORY;
+	}
+
+	if( asSUCCESS == r )
+	{
+		st->flags           = asOBJ_TYPEDEF;
+		st->size            = dataType.GetSizeInMemoryBytes();
+		st->name            = name;
+		st->nameSpace       = ns;
+		st->aliasForType    = dataType;
+		st->module          = module;
+
+		module->AddTypeDef(st);
+
+		// Store the location of this declaration for reference in name collisions
+		sClassDeclaration *decl = asNEW(sClassDeclaration);
+		if( decl == 0 )
+			r = asOUT_OF_MEMORY;
+		else
+		{
+			decl->name             = name;
+			decl->script           = file;
+			decl->typeInfo         = st;
+			namedTypeDeclarations.PushLast(decl);
+		}
+	}
+
+	node->Destroy(engine);
+
+	return r;
+}
+
+void asCBuilder::GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, asSFunctionTraits &funcTraits, asSNameSpace *implicitNamespace)
+{
+	node = node->firstChild;
+
+	// Is the function shared?
+	funcTraits.SetTrait(asTRAIT_SHARED, false);
+	funcTraits.SetTrait(asTRAIT_EXTERNAL, false);
+	while (node->tokenType == ttIdentifier)
+	{
+		if (file->TokenEquals(node->tokenPos, node->tokenLength, SHARED_TOKEN))
+			funcTraits.SetTrait(asTRAIT_SHARED, true);
+		else if (file->TokenEquals(node->tokenPos, node->tokenLength, EXTERNAL_TOKEN))
+			funcTraits.SetTrait(asTRAIT_EXTERNAL, true);
+		else
+			break;
+		node = node->next;
+	}
+
+	// Is the function a private or protected class method?
+	funcTraits.SetTrait(asTRAIT_PRIVATE, false);
+	funcTraits.SetTrait(asTRAIT_PROTECTED, false);
+	if( node->tokenType == ttPrivate )
+	{
+		funcTraits.SetTrait(asTRAIT_PRIVATE, true);
+		node = node->next;
+	}
+	else if( node->tokenType == ttProtected )
+	{
+		funcTraits.SetTrait(asTRAIT_PROTECTED, true);
+		node = node->next;
+	}
+
+	// Find the name
+	funcTraits.SetTrait(asTRAIT_CONSTRUCTOR, false);
+	funcTraits.SetTrait(asTRAIT_DESTRUCTOR, false);
+	asCScriptNode *n = 0;
+	if( node->nodeType == snDataType )
+		n = node->next->next;
+	else
+	{
+		// If the first node is a ~ token, then we know it is a destructor
+		if( node->tokenType == ttBitNot )
+		{
+			n = node->next;
+			funcTraits.SetTrait(asTRAIT_DESTRUCTOR, true);
+		}
+		else
+		{
+			n = node;
+			funcTraits.SetTrait(asTRAIT_CONSTRUCTOR, true);
+		}
+	}
+	name.Assign(&file->code[n->tokenPos], n->tokenLength);
+
+	if( !funcTraits.GetTrait(asTRAIT_CONSTRUCTOR) && !funcTraits.GetTrait(asTRAIT_DESTRUCTOR) )
+	{
+		returnType = CreateDataTypeFromNode(node, file, implicitNamespace, false, objType);
+		returnType = ModifyDataTypeFromNode(returnType, node->next, file, 0, 0);
+
+		if( engine->ep.disallowValueAssignForRefType &&
+			returnType.GetTypeInfo() &&
+			(returnType.GetTypeInfo()->flags & asOBJ_REF) &&
+			!(returnType.GetTypeInfo()->flags & asOBJ_SCOPED) &&
+			!returnType.IsReference() &&
+			!returnType.IsObjectHandle() )
+		{
+			WriteError(TXT_REF_TYPE_CANT_BE_RETURNED_BY_VAL, file, node);
+		}
+	}
+	else
+		returnType = asCDataType::CreatePrimitive(ttVoid, false);
+
+	funcTraits.SetTrait(asTRAIT_CONST, false);
+	funcTraits.SetTrait(asTRAIT_FINAL, false);
+	funcTraits.SetTrait(asTRAIT_OVERRIDE, false);
+	funcTraits.SetTrait(asTRAIT_EXPLICIT, false);
+	funcTraits.SetTrait(asTRAIT_PROPERTY, false);
+
+	if( n->next->next )
+	{
+		asCScriptNode *decorator = n->next->next;
+
+		// Is this a const method?
+		if( objType && decorator->tokenType == ttConst )
+		{
+			funcTraits.SetTrait(asTRAIT_CONST, true);
+			decorator = decorator->next;
+		}
+
+		while( decorator && decorator->tokenType == ttIdentifier )
+		{
+			if (objType && file->TokenEquals(decorator->tokenPos, decorator->tokenLength, FINAL_TOKEN))
+				funcTraits.SetTrait(asTRAIT_FINAL, true);
+			else if (objType && file->TokenEquals(decorator->tokenPos, decorator->tokenLength, OVERRIDE_TOKEN))
+				funcTraits.SetTrait(asTRAIT_OVERRIDE, true);
+			else if (objType && file->TokenEquals(decorator->tokenPos, decorator->tokenLength, EXPLICIT_TOKEN))
+				funcTraits.SetTrait(asTRAIT_EXPLICIT, true);
+			else if (file->TokenEquals(decorator->tokenPos, decorator->tokenLength, PROPERTY_TOKEN))
+				funcTraits.SetTrait(asTRAIT_PROPERTY, true);
+			else
+			{
+				asCString msg(&file->code[decorator->tokenPos], decorator->tokenLength);
+				msg.Format(TXT_UNEXPECTED_TOKEN_s, msg.AddressOf());
+				WriteError(msg.AddressOf(), file, decorator);
+			}			
+			
+			decorator = decorator->next;
+		}
+	}
+
+	// Count the number of parameters
+	int count = 0;
+	asCScriptNode *c = n->next->firstChild;
+	while( c )
+	{
+		count++;
+		c = c->next->next;
+		if( c && c->nodeType == snIdentifier )
+			c = c->next;
+		if( c && c->nodeType == snExpression )
+			c = c->next;
+	}
+
+	// Get the parameter types
+	parameterNames.Allocate(count, false);
+	parameterTypes.Allocate(count, false);
+	inOutFlags.Allocate(count, false);
+	defaultArgs.Allocate(count, false);
+	n = n->next->firstChild;
+	while( n )
+	{
+		asETypeModifiers inOutFlag;
+		asCDataType type = CreateDataTypeFromNode(n, file, implicitNamespace, false, objType);
+		type = ModifyDataTypeFromNode(type, n->next, file, &inOutFlag, 0);
+
+		if( engine->ep.disallowValueAssignForRefType &&
+			type.GetTypeInfo() &&
+			(type.GetTypeInfo()->flags & asOBJ_REF) &&
+			!(type.GetTypeInfo()->flags & asOBJ_SCOPED) &&
+			!type.IsReference() &&
+			!type.IsObjectHandle() )
+		{
+			WriteError(TXT_REF_TYPE_CANT_BE_PASSED_BY_VAL, file, node);
+		}
+
+		// Store the parameter type
+		parameterTypes.PushLast(type);
+		inOutFlags.PushLast(inOutFlag);
+
+		// Move to next parameter
+		n = n->next->next;
+		if( n && n->nodeType == snIdentifier )
+		{
+			asCString paramName(&file->code[n->tokenPos], n->tokenLength);
+			parameterNames.PushLast(paramName);
+			n = n->next;
+		}
+		else
+		{
+			// No name was given for the parameter
+			parameterNames.PushLast(asCString());
+		}
+
+		if( n && n->nodeType == snExpression )
+		{
+			// Strip out white space and comments to better share the string
+			asCString *defaultArgStr = asNEW(asCString);
+			if( defaultArgStr )
+				*defaultArgStr = GetCleanExpressionString(n, file);
+			defaultArgs.PushLast(defaultArgStr);
+
+			n = n->next;
+		}
+		else
+			defaultArgs.PushLast(0);
+	}
+}
+#endif
+
+asCString asCBuilder::GetCleanExpressionString(asCScriptNode *node, asCScriptCode *file)
+{
+	asASSERT(node && node->nodeType == snExpression);
+
+	asCString str;
+	str.Assign(file->code + node->tokenPos, node->tokenLength);
+
+	asCString cleanStr;
+	for( asUINT n = 0; n < str.GetLength(); )
+	{
+		asUINT len = 0;
+		asETokenClass tok = engine->ParseToken(str.AddressOf() + n, str.GetLength() - n, &len);
+		if( tok != asTC_COMMENT && tok != asTC_WHITESPACE )
+		{
+			if( cleanStr.GetLength() ) cleanStr += " ";
+			cleanStr.Concatenate(str.AddressOf() + n, len);
+		}
+		n += len;
+	}
+
+	return cleanStr;
+}
+
+#ifndef AS_NO_COMPILER
+int asCBuilder::RegisterScriptFunctionFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin)
+{
+	asCString                  name;
+	asCDataType                returnType;
+	asCArray<asCString>        parameterNames;
+	asCArray<asCDataType>      parameterTypes;
+	asCArray<asETypeModifiers> inOutFlags;
+	asCArray<asCString *>      defaultArgs;
+	asSFunctionTraits          funcTraits;
+
+	asASSERT( (objType && ns == 0) || isGlobalFunction || isMixin );
+
+	// Set the default namespace
+	if( ns == 0 )
+	{
+		if( objType )
+			ns = objType->nameSpace;
+		else
+			ns = engine->nameSpaces[0];
+	}
+
+	GetParsedFunctionDetails(node, file, objType, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, funcTraits, ns);
+
+	return RegisterScriptFunction(node, file, objType, isInterface, isGlobalFunction, ns, isExistingShared, isMixin, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, funcTraits);
+}
+
+asCScriptFunction *asCBuilder::RegisterLambda(asCScriptNode *node, asCScriptCode *file, asCScriptFunction *funcDef, const asCString &name, asSNameSpace *ns, bool isShared)
+{
+	// Get the parameter names from the node
+	asCArray<asCString> parameterNames;
+	asCArray<asCString*> defaultArgs;
+	asCScriptNode *args = node->firstChild;
+	while( args && args->nodeType != snStatementBlock )
+	{
+		if (args->nodeType == snIdentifier)
+		{
+			asCString argName;
+			argName.Assign(&file->code[args->tokenPos], args->tokenLength);
+			parameterNames.PushLast(argName);
+			defaultArgs.PushLast(0);
+		}
+		args = args->next;
+	}
+
+	// The statement block for the function must be disconnected, as the builder is going to be the owner of it
+	args->DisconnectParent();
+
+	// Get the return and parameter types from the funcDef
+	asCString funcName = name;
+	asSFunctionTraits traits;
+	traits.SetTrait(asTRAIT_SHARED, isShared);
+	int r = RegisterScriptFunction(args, file, 0, 0, true, ns, false, false, funcName, funcDef->returnType, parameterNames, funcDef->parameterTypes, funcDef->inOutFlags, defaultArgs, traits);
+	if( r < 0 )
+		return 0;
+
+	// Return the function that was just created (but that will be compiled later)
+	return engine->scriptFunctions[functions[functions.GetLength()-1]->funcId];
+}
+
+int asCBuilder::RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, asSFunctionTraits funcTraits)
+{
+	// Determine default namespace if not specified
+	if( ns == 0 )
+	{
+		if( objType )
+			ns = objType->nameSpace;
+		else
+			ns = engine->nameSpaces[0];
+	}
+
+	if( isExistingShared )
+	{
+		asASSERT( objType );
+
+		// Should validate that the function really exists in the class/interface
+		bool found = false;
+		if(funcTraits.GetTrait(asTRAIT_CONSTRUCTOR) || funcTraits.GetTrait(asTRAIT_DESTRUCTOR) )
+		{
+			// TODO: shared: Should check the existance of these too
+			found = true;
+		}
+		else
+		{
+			for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *func = engine->scriptFunctions[objType->methods[n]];
+				if( func->name == name &&
+					func->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, objType, funcTraits.GetTrait(asTRAIT_CONST)) )
+				{
+					// Add the shared function in this module too
+					module->AddScriptFunction(func);
+
+					found = true;
+					break;
+				}
+			}
+		}
+
+		if( !found )
+		{
+			asCString str;
+			str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, objType->GetName());
+			WriteError(str, file, node);
+		}
+
+		// Free the default args
+		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+			if( defaultArgs[n] )
+				asDELETE(defaultArgs[n], asCString);
+
+		node->Destroy(engine);
+		return 0;
+	}
+
+	// Check for name conflicts
+	if( !funcTraits.GetTrait(asTRAIT_CONSTRUCTOR) && !funcTraits.GetTrait(asTRAIT_DESTRUCTOR) )
+	{
+		if( objType )
+		{
+			CheckNameConflictMember(objType, name.AddressOf(), node, file, false, false);
+
+			if( name == objType->name )
+				WriteError(TXT_METHOD_CANT_HAVE_NAME_OF_CLASS, file, node);
+		}
+		else
+			CheckNameConflict(name.AddressOf(), node, file, ns, false, false, false);
+	}
+	else
+	{
+		if( isMixin )
+		{
+			// Mixins cannot implement constructors/destructors
+			WriteError(TXT_MIXIN_CANNOT_HAVE_CONSTRUCTOR, file, node);
+
+			// Free the default args
+			for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+				if( defaultArgs[n] )
+					asDELETE(defaultArgs[n], asCString);
+
+			node->Destroy(engine);
+			return 0;
+		}
+
+		// Verify that the name of the constructor/destructor is the same as the class
+		if( name != objType->name )
+		{
+			asCString str;
+			if(funcTraits.GetTrait(asTRAIT_DESTRUCTOR) )
+				str.Format(TXT_DESTRUCTOR_s_s_NAME_ERROR, objType->name.AddressOf(), name.AddressOf());
+			else
+				str.Format(TXT_METHOD_s_s_HAS_NO_RETURN_TYPE, objType->name.AddressOf(), name.AddressOf());
+			WriteError(str, file, node);
+		}
+
+		if(funcTraits.GetTrait(asTRAIT_DESTRUCTOR))
+			name = "~" + name;
+	}
+
+	// Validate virtual properties signature
+	if( funcTraits.GetTrait(asTRAIT_PROPERTY) )
+	{
+		asCScriptFunction func(engine, module, asFUNC_SCRIPT);
+		func.name           = name;
+		func.nameSpace      = ns;
+		func.objectType     = objType;
+		if( objType )
+			objType->AddRefInternal();
+		func.traits         = funcTraits;
+		func.returnType     = returnType;
+		func.parameterTypes = parameterTypes;
+		
+		int r = ValidateVirtualProperty(&func);
+		if( r < 0 )
+		{
+			asCString str;
+			if( r == -2 || r == -3 )
+				str.Format(TXT_INVALID_SIG_FOR_VIRTPROP);
+			else if( r == -4 )
+				str.Format(TXT_GET_SET_ACCESSOR_TYPE_MISMATCH_FOR_s, name.SubString(4).AddressOf());
+			else if( r == -5 )
+				str.Format(TXT_NAME_CONFLICT_s_ALREADY_USED, name.SubString(4).AddressOf());
+			WriteError(str, file, node);
+		}
+		
+		func.funcType = asFUNC_DUMMY;
+	}
+	
+	isExistingShared = false;
+	int funcId = engine->GetNextScriptFunctionId();
+	if( !isInterface )
+	{
+		sFunctionDescription *func = asNEW(sFunctionDescription);
+		if( func == 0 )
+		{
+			// Free the default args
+			for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+				if( defaultArgs[n] )
+					asDELETE(defaultArgs[n], asCString);
+
+			return asOUT_OF_MEMORY;
+		}
+
+		functions.PushLast(func);
+
+		func->script            = file;
+		func->node              = node;
+		func->name              = name;
+		func->objType           = objType;
+		func->funcId            = funcId;
+		func->isExistingShared  = false;
+		func->paramNames        = parameterNames;
+
+		if(funcTraits.GetTrait(asTRAIT_SHARED))
+		{
+			// Look for a pre-existing shared function with the same signature
+			for( asUINT n = 0; n < engine->scriptFunctions.GetLength(); n++ )
+			{
+				asCScriptFunction *f = engine->scriptFunctions[n];
+				if( f &&
+					f->IsShared() &&
+					f->name == name &&
+					f->nameSpace == ns &&
+					f->objectType == objType &&
+					f->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, 0, false) )
+				{
+					funcId = func->funcId = f->id;
+					isExistingShared = func->isExistingShared = true;
+					break;
+				}
+			}
+		}
+
+		// Remember if the function was declared as external so the saved bytecode can be flagged accordingly
+		if (funcTraits.GetTrait(asTRAIT_EXTERNAL) && func->isExistingShared)
+			module->m_externalFunctions.PushLast(engine->scriptFunctions[func->funcId]);
+
+		if (funcTraits.GetTrait(asTRAIT_EXTERNAL) && !func->isExistingShared)
+		{
+			// Mark it as existing shared to avoid compiling it
+			func->isExistingShared = true;
+
+			asCString str;
+			str.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, name.AddressOf());
+			WriteError(str, file, node);
+		}
+
+		// External shared function must not try to redefine the interface
+		if (funcTraits.GetTrait(asTRAIT_EXTERNAL) && !(node->tokenType == ttEndStatement || node->lastChild->tokenType == ttEndStatement))
+		{
+			asCString str;
+			str.Format(TXT_EXTERNAL_SHARED_s_CANNOT_REDEF, name.AddressOf());
+			WriteError(str, file, node);
+		}
+		else if (!funcTraits.GetTrait(asTRAIT_EXTERNAL) && !(node->nodeType == snStatementBlock || node->lastChild->nodeType == snStatementBlock) )
+		{
+			asCString str;
+			str.Format(TXT_MISSING_DEFINITION_OF_s, name.AddressOf());
+			WriteError(str, file, node);
+		}
+	}
+
+	// Destructors may not have any parameters
+	if (funcTraits.GetTrait(asTRAIT_DESTRUCTOR) && parameterTypes.GetLength() > 0)
+		WriteError(TXT_DESTRUCTOR_MAY_NOT_HAVE_PARM, file, node);
+
+	// If a function, class, or interface is shared then only shared types may be used in the signature
+	if( (objType && objType->IsShared()) || funcTraits.GetTrait(asTRAIT_SHARED))
+	{
+		asCTypeInfo *ti = returnType.GetTypeInfo();
+		if( ti && !ti->IsShared() )
+		{
+			asCString msg;
+			msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, ti->name.AddressOf());
+			WriteError(msg, file, node);
+		}
+
+		for( asUINT p = 0; p < parameterTypes.GetLength(); ++p )
+		{
+			ti = parameterTypes[p].GetTypeInfo();
+			if( ti && !ti->IsShared() )
+			{
+				asCString msg;
+				msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, ti->name.AddressOf());
+				WriteError(msg, file, node);
+			}
+		}
+	}
+
+	// Check that the same function hasn't been registered already in the namespace
+	asCArray<int> funcs;
+	if( objType )
+		GetObjectMethodDescriptions(name.AddressOf(), objType, funcs, false);
+	else
+		GetFunctionDescriptions(name.AddressOf(), funcs, ns);
+	if( objType && (name == "opConv" || name == "opImplConv" || name == "opCast" || name == "opImplCast") && parameterTypes.GetLength() == 0 )
+	{
+		// opConv and opCast are special methods used for type casts
+		for( asUINT n = 0; n < funcs.GetLength(); ++n )
+		{
+			asCScriptFunction *func = GetFunctionDescription(funcs[n]);
+			if( func->IsSignatureExceptNameEqual(returnType, parameterTypes, inOutFlags, objType, funcTraits.GetTrait(asTRAIT_CONST)) )
+			{
+				// TODO: clean up: Reuse the same error handling for both opConv and normal methods
+				if( isMixin )
+				{
+					// Clean up the memory, as the function will not be registered
+					if( node )
+						node->Destroy(engine);
+					sFunctionDescription *funcDesc = functions.PopLast();
+					asDELETE(funcDesc, sFunctionDescription);
+
+					// Free the default args
+					for( n = 0; n < defaultArgs.GetLength(); n++ )
+						if( defaultArgs[n] )
+							asDELETE(defaultArgs[n], asCString);
+
+					return 0;
+				}
+
+				WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
+				break;
+			}
+		}
+	}
+	else
+	{
+		for( asUINT n = 0; n < funcs.GetLength(); ++n )
+		{
+			asCScriptFunction *func = GetFunctionDescription(funcs[n]);
+			if( func->IsSignatureExceptNameAndReturnTypeEqual(parameterTypes, inOutFlags, objType, funcTraits.GetTrait(asTRAIT_CONST)) )
+			{
+				if( isMixin )
+				{
+					// Clean up the memory, as the function will not be registered
+					if( node )
+						node->Destroy(engine);
+					sFunctionDescription *funcDesc = functions.PopLast();
+					asDELETE(funcDesc, sFunctionDescription);
+
+					// Free the default args
+					for( n = 0; n < defaultArgs.GetLength(); n++ )
+						if( defaultArgs[n] )
+							asDELETE(defaultArgs[n], asCString);
+
+					return 0;
+				}
+
+				WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
+				break;
+			}
+		}
+	}
+
+	// Register the function
+	if( isExistingShared )
+	{
+		// Delete the default args as they won't be used anymore
+		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+			if( defaultArgs[n] )
+				asDELETE(defaultArgs[n], asCString);
+
+		asCScriptFunction *f = engine->scriptFunctions[funcId];
+		module->AddScriptFunction(f);
+
+		// TODO: clean up: This should be done by AddScriptFunction() itself
+		module->m_globalFunctions.Put(f);
+	}
+	else
+	{
+		int row = 0, col = 0;
+		if( node )
+			file->ConvertPosToRowCol(node->tokenPos, &row, &col);
+		module->AddScriptFunction(file->idx, (row&0xFFFFF)|((col&0xFFF)<<20), funcId, name, returnType, parameterTypes, parameterNames, inOutFlags, defaultArgs, isInterface, objType, isGlobalFunction, funcTraits, ns);
+	}
+
+	// Make sure the default args are declared correctly
+	ValidateDefaultArgs(file, node, engine->scriptFunctions[funcId]);
+	CheckForConflictsDueToDefaultArgs(file, node, engine->scriptFunctions[funcId], objType);
+
+	if( objType )
+	{
+		asASSERT( !isExistingShared );
+
+		engine->scriptFunctions[funcId]->AddRefInternal();
+		if(funcTraits.GetTrait(asTRAIT_CONSTRUCTOR))
+		{
+			int factoryId = engine->GetNextScriptFunctionId();
+			if( parameterTypes.GetLength() == 0 )
+			{
+				// Overload the default constructor
+				engine->scriptFunctions[objType->beh.construct]->ReleaseInternal();
+				objType->beh.construct = funcId;
+				objType->beh.constructors[0] = funcId;
+
+				// Register the default factory as well
+				engine->scriptFunctions[objType->beh.factory]->ReleaseInternal();
+				objType->beh.factory = factoryId;
+				objType->beh.factories[0] = factoryId;
+			}
+			else
+			{
+				// The copy constructor needs to be marked for easy finding
+				if( parameterTypes.GetLength() == 1 && 
+				    parameterTypes[0].GetTypeInfo() == objType && 
+					(parameterTypes[0].IsReference() || parameterTypes[0].IsObjectHandle()) )
+				{
+					// Verify that there are not multiple options matching the copy constructor
+					// TODO: Need a better message, since the parameters can be slightly different, e.g. & vs @
+					if( objType->beh.copyconstruct )
+						WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
+
+					objType->beh.copyconstruct = funcId;
+					objType->beh.copyfactory = factoryId;
+				}
+
+				// Register as a normal constructor
+				objType->beh.constructors.PushLast(funcId);
+
+				// Register the factory as well
+				objType->beh.factories.PushLast(factoryId);
+			}
+
+			// We must copy the default arg strings to avoid deleting the same object multiple times
+			for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+				if( defaultArgs[n] )
+					defaultArgs[n] = asNEW(asCString)(*defaultArgs[n]);
+
+			asCDataType dt = asCDataType::CreateObjectHandle(objType, false);
+			module->AddScriptFunction(file->idx, engine->scriptFunctions[funcId]->scriptData->declaredAt, factoryId, name, dt, parameterTypes, parameterNames, inOutFlags, defaultArgs, false, 0, false, funcTraits);
+
+			// If the object is shared, then the factory must also be marked as shared
+			if( objType->flags & asOBJ_SHARED )
+				engine->scriptFunctions[factoryId]->SetShared(true);
+
+			// Add a dummy function to the builder so that it doesn't mix up the fund Ids
+			functions.PushLast(0);
+
+			// Compile the factory immediately
+			asCCompiler compiler(engine);
+			compiler.CompileFactory(this, file, engine->scriptFunctions[factoryId]);
+			engine->scriptFunctions[factoryId]->AddRefInternal();
+		}
+		else if(funcTraits.GetTrait(asTRAIT_DESTRUCTOR))
+			objType->beh.destruct = funcId;
+		else
+		{
+			// If the method is the assignment operator we need to replace the default implementation
+			asCScriptFunction *f = engine->scriptFunctions[funcId];
+			if( f->name == "opAssign" && f->parameterTypes.GetLength() == 1 &&
+				f->parameterTypes[0].GetTypeInfo() == f->objectType &&
+				(f->inOutFlags[0] & asTM_INREF) )
+			{
+				engine->scriptFunctions[objType->beh.copy]->ReleaseInternal();
+				objType->beh.copy = funcId;
+				f->AddRefInternal();
+			}
+
+			objType->methods.PushLast(funcId);
+		}
+	}
+
+	// We need to delete the node already if this is an interface method
+	if( isInterface && node )
+		node->Destroy(engine);
+
+	return 0;
+}
+
+int asCBuilder::RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared)
+{
+	if( engine->ep.propertyAccessorMode < 2 )
+	{
+		WriteError(TXT_PROPERTY_ACCESSOR_DISABLED, file, node);
+		node->Destroy(engine);
+		return 0;
+	}
+
+	asASSERT( (objType && ns == 0) || isGlobalFunction );
+
+	if( ns == 0 )
+	{
+		if( objType )
+			ns = objType->nameSpace;
+		else
+			ns = engine->nameSpaces[0];
+	}
+
+	bool isPrivate = false, isProtected = false;
+	asCString emulatedName;
+	asCDataType emulatedType;
+
+	asCScriptNode *mainNode = node;
+	node = node->firstChild;
+
+	if( !isGlobalFunction && node->tokenType == ttPrivate )
+	{
+		isPrivate = true;
+		node = node->next;
+	}
+	else if( !isGlobalFunction && node->tokenType == ttProtected )
+	{
+		isProtected = true;
+		node = node->next;
+	}
+
+	emulatedType = CreateDataTypeFromNode(node, file, ns);
+	emulatedType = ModifyDataTypeFromNode(emulatedType, node->next, file, 0, 0);
+	node = node->next->next;
+	emulatedName.Assign(&file->code[node->tokenPos], node->tokenLength);
+
+	if( node->next == 0 )
+		WriteError(TXT_PROPERTY_WITHOUT_ACCESSOR, file, node);
+
+	node = node->next;
+	while (node)
+	{
+		asCScriptNode             *next = node->next;
+		asCScriptNode             *funcNode = 0;
+		bool                       success = false;
+		asSFunctionTraits          funcTraits;
+		asCDataType                returnType;
+		asCArray<asCString>        paramNames;
+		asCArray<asCDataType>      paramTypes;
+		asCArray<asETypeModifiers> paramModifiers;
+		asCArray<asCString*>       defaultArgs;
+		asCString                  name;
+
+		funcTraits.SetTrait(asTRAIT_PRIVATE, isPrivate);
+		funcTraits.SetTrait(asTRAIT_PROTECTED, isProtected);
+		funcTraits.SetTrait(asTRAIT_PROPERTY, true);
+
+		if (node->firstChild->nodeType == snIdentifier && file->TokenEquals(node->firstChild->tokenPos, node->firstChild->tokenLength, GET_TOKEN))
+			name = "get_";
+		else if (node->firstChild->nodeType == snIdentifier && file->TokenEquals(node->firstChild->tokenPos, node->firstChild->tokenLength, SET_TOKEN))
+			name = "set_";
+		else
+			WriteError(TXT_UNRECOGNIZED_VIRTUAL_PROPERTY_NODE, file, node);
+
+		if (name != "")
+		{
+			success = true;
+			funcNode = node->firstChild->next;
+
+			if (funcNode && funcNode->tokenType == ttConst)
+			{
+				funcTraits.SetTrait(asTRAIT_CONST, true);
+				funcNode = funcNode->next;
+			}
+
+			while (funcNode && funcNode->nodeType != snStatementBlock)
+			{
+				if (funcNode->tokenType == ttIdentifier && file->TokenEquals(funcNode->tokenPos, funcNode->tokenLength, FINAL_TOKEN))
+					funcTraits.SetTrait(asTRAIT_FINAL, true);
+				else if (funcNode->tokenType == ttIdentifier && file->TokenEquals(funcNode->tokenPos, funcNode->tokenLength, OVERRIDE_TOKEN))
+					funcTraits.SetTrait(asTRAIT_OVERRIDE, true);
+				else
+				{
+					asCString msg(&file->code[funcNode->tokenPos], funcNode->tokenLength);;
+					msg.Format(TXT_UNEXPECTED_TOKEN_s, msg.AddressOf());
+					WriteError(msg.AddressOf(), file, node);
+				}
+
+				funcNode = funcNode->next;
+			}
+
+			if (funcNode)
+				funcNode->DisconnectParent();
+
+			if (funcNode == 0 && (objType == 0 || !objType->IsInterface()))
+			{
+				// TODO: getset: If no implementation is supplied the builder should provide an automatically generated implementation
+				//               The compiler needs to be able to handle the different types, primitive, value type, and handle
+				//               The code is also different for global property accessors
+				WriteError(TXT_PROPERTY_ACCESSOR_MUST_BE_IMPLEMENTED, file, node);
+			}
+
+			if (name == "get_")
+			{
+				// Setup the signature for the get accessor method
+				returnType = emulatedType;
+				name = "get_" + emulatedName;
+			}
+			else if (name == "set_")
+			{
+				// Setup the signature for the set accessor method
+				returnType = asCDataType::CreatePrimitive(ttVoid, false);
+				paramModifiers.PushLast(asTM_NONE);
+				paramNames.PushLast("value");
+				paramTypes.PushLast(emulatedType);
+				defaultArgs.PushLast(0);
+				name = "set_" + emulatedName;
+			}
+		}
+
+		if( success )
+		{
+			if( !isExistingShared )
+				RegisterScriptFunction(funcNode, file, objType, isInterface, isGlobalFunction, ns, false, false, name, returnType, paramNames, paramTypes, paramModifiers, defaultArgs, funcTraits);
+			else
+			{
+				// Free the funcNode as it won't be used
+				if( funcNode ) funcNode->Destroy(engine);
+
+				// Should validate that the function really exists in the class/interface
+				bool found = false;
+				for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
+				{
+					asCScriptFunction *func = engine->scriptFunctions[objType->methods[n]];
+					if( func->name == name &&
+						func->IsSignatureExceptNameEqual(returnType, paramTypes, paramModifiers, objType, funcTraits.GetTrait(asTRAIT_CONST)) )
+					{
+						found = true;
+						break;
+					}
+				}
+
+				if( !found )
+				{
+					asCString str;
+					str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, objType->GetName());
+					WriteError(str, file, node);
+				}
+			}
+		}
+
+		node = next;
+	};
+
+	mainNode->Destroy(engine);
+
+	return 0;
+}
+
+int asCBuilder::RegisterImportedFunction(int importID, asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns)
+{
+	asCString                  name;
+	asCDataType                returnType;
+	asCArray<asCString>        parameterNames;
+	asCArray<asCDataType>      parameterTypes;
+	asCArray<asETypeModifiers> inOutFlags;
+	asCArray<asCString *>      defaultArgs;
+	asSFunctionTraits          funcTraits;
+
+	if( ns == 0 )
+		ns = engine->nameSpaces[0];
+
+	GetParsedFunctionDetails(node->firstChild, file, 0, name, returnType, parameterNames, parameterTypes, inOutFlags, defaultArgs, funcTraits, ns);
+	CheckNameConflict(name.AddressOf(), node, file, ns, false, false, false);
+
+	// Check that the same function hasn't been registered already in the namespace
+	asCArray<int> funcs;
+	GetFunctionDescriptions(name.AddressOf(), funcs, ns);
+	for( asUINT n = 0; n < funcs.GetLength(); ++n )
+	{
+		asCScriptFunction *func = GetFunctionDescription(funcs[n]);
+		if( func->IsSignatureExceptNameAndReturnTypeEqual(parameterTypes, inOutFlags, 0, false) )
+		{
+			WriteError(TXT_FUNCTION_ALREADY_EXIST, file, node);
+			break;
+		}
+	}
+
+	// Read the module name as well
+	asCScriptNode *nd = node->lastChild;
+	asASSERT( nd->nodeType == snConstant && nd->tokenType == ttStringConstant );
+	asCString moduleName;
+	moduleName.Assign(&file->code[nd->tokenPos+1], nd->tokenLength-2);
+
+	node->Destroy(engine);
+
+	// Register the function
+	module->AddImportedFunction(importID, name, returnType, parameterTypes, inOutFlags, defaultArgs, funcTraits, ns, moduleName);
+
+	return 0;
+}
+
+asCScriptFunction *asCBuilder::GetFunctionDescription(int id)
+{
+	// TODO: import: This should be improved when the imported functions are removed
+	// Get the description from the engine
+	if( (id & FUNC_IMPORTED) == 0 )
+		return engine->scriptFunctions[id];
+	else
+		return engine->importedFunctions[id & ~FUNC_IMPORTED]->importedFunctionSignature;
+}
+
+void asCBuilder::GetFunctionDescriptions(const char *name, asCArray<int> &funcs, asSNameSpace *ns)
+{
+	asUINT n;
+
+	// Get the script declared global functions
+	const asCArray<unsigned int> &idxs = module->m_globalFunctions.GetIndexes(ns, name);
+	for( n = 0; n < idxs.GetLength(); n++ )
+	{
+		const asCScriptFunction *f = module->m_globalFunctions.Get(idxs[n]);
+		asASSERT( f->objectType == 0 );
+		funcs.PushLast(f->id);
+	}
+
+	// Add the imported functions
+	// TODO: optimize: Linear search: This is probably not that critial. Also bindInformation will probably be removed in near future
+	for( n = 0; n < module->m_bindInformations.GetLength(); n++ )
+	{
+		if( module->m_bindInformations[n]->importedFunctionSignature->name == name &&
+			module->m_bindInformations[n]->importedFunctionSignature->nameSpace == ns )
+			funcs.PushLast(module->m_bindInformations[n]->importedFunctionSignature->id);
+	}
+
+	// Add the registered global functions
+	const asCArray<unsigned int> &idxs2 = engine->registeredGlobalFuncs.GetIndexes(ns, name);
+	for( n = 0; n < idxs2.GetLength(); n++ )
+	{
+		asCScriptFunction *f = engine->registeredGlobalFuncs.Get(idxs2[n]);
+
+		// Verify if the module has access to the function
+		if( module->m_accessMask & f->accessMask )
+		{
+			funcs.PushLast(f->id);
+		}
+	}
+}
+
+// scope is only informed when looking for a base class' method
+void asCBuilder::GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope, asCScriptNode *errNode, asCScriptCode *script)
+{
+	asASSERT(objectType);
+
+	if( scope != "" )
+	{
+		// If searching with a scope informed, then the node and script must also be informed for potential error reporting
+		asASSERT( errNode && script );
+
+		// If the scope contains ::identifier, then use the last identifier as the class name and the rest of it as the namespace
+		// TODO: child funcdef: A scope can include a template type, e.g. array<ns::type>
+		int n = scope.FindLast("::");
+		asCString className = n >= 0 ? scope.SubString(n+2) : scope;
+		asCString nsName = n >= 0 ? scope.SubString(0, n) : asCString("");
+
+		// If a namespace was specifically defined, then this must be used
+		asSNameSpace *ns = 0;
+		if (n >= 0)
+		{
+			if (nsName == "")
+				ns = engine->nameSpaces[0];
+			else
+				ns = GetNameSpaceByString(nsName, objectType->nameSpace, errNode, script, 0, false);
+
+			// If the namespace isn't found return silently and let the calling
+			// function report the error if it cannot resolve the symbol
+			if (ns == 0)
+				return;
+		}
+
+		// Find the base class with the specified scope
+		while (objectType)
+		{
+			// If the name and namespace matches it is the correct class. If no
+			// specific namespace was given, then don't compare the namespace
+			if (objectType->name == className && (ns == 0 || objectType->nameSpace == ns))
+				break;
+
+			objectType = objectType->derivedFrom;
+		}
+
+		// If the scope is not any of the base classes, then return no methods
+		if( objectType == 0 )
+			return;
+	}
+
+	// Find the methods in the object that match the name
+	// TODO: optimize: Improve linear search
+	for( asUINT n = 0; n < objectType->methods.GetLength(); n++ )
+	{
+		asCScriptFunction *func = engine->scriptFunctions[objectType->methods[n]];
+		if( func->name == name &&
+			(!objIsConst || func->IsReadOnly()) &&
+			(func->accessMask & module->m_accessMask) )
+		{
+			// When the scope is defined the returned methods should be the true methods, not the virtual method stubs
+			if( scope == "" )
+				methods.PushLast(engine->scriptFunctions[objectType->methods[n]]->id);
+			else
+			{
+				asCScriptFunction *f = engine->scriptFunctions[objectType->methods[n]];
+				if( f && f->funcType == asFUNC_VIRTUAL )
+					f = objectType->virtualFunctionTable[f->vfTableIdx];
+				methods.PushLast(f->id);
+			}
+		}
+	}
+}
+#endif
+
+void asCBuilder::WriteInfo(const asCString &scriptname, const asCString &message, int r, int c, bool pre)
+{
+	// Need to store the pre message in a structure
+	if( pre )
+	{
+		engine->preMessage.isSet      = true;
+		engine->preMessage.c          = c;
+		engine->preMessage.r          = r;
+		engine->preMessage.message    = message;
+		engine->preMessage.scriptname = scriptname;
+	}
+	else
+	{
+		engine->preMessage.isSet = false;
+
+		if( !silent )
+			engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_INFORMATION, message.AddressOf());
+	}
+}
+
+void asCBuilder::WriteInfo(const asCString &message, asCScriptCode *file, asCScriptNode *node)
+{
+	int r = 0, c = 0;
+	if( node )
+		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	WriteInfo(file->name, message, r, c, false);
+}
+
+void asCBuilder::WriteError(const asCString &message, asCScriptCode *file, asCScriptNode *node)
+{
+	int r = 0, c = 0;
+	if( node && file )
+		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	WriteError(file ? file->name : asCString(""), message, r, c);
+}
+
+void asCBuilder::WriteError(const asCString &scriptname, const asCString &message, int r, int c)
+{
+	numErrors++;
+
+	if( !silent )
+		engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_ERROR, message.AddressOf());
+}
+
+void asCBuilder::WriteWarning(const asCString &scriptname, const asCString &message, int r, int c)
+{
+	if( engine->ep.compilerWarnings )
+	{
+		numWarnings++;
+
+		if( !silent )
+			engine->WriteMessage(scriptname.AddressOf(), r, c, asMSGTYPE_WARNING, message.AddressOf());
+	}
+}
+
+void asCBuilder::WriteWarning(const asCString &message, asCScriptCode *file, asCScriptNode *node)
+{
+	int r = 0, c = 0;
+	if( node && file )
+		file->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	WriteWarning(file ? file->name : asCString(""), message, r, c);
+}
+
+// TODO: child funcdef: Should try to eliminate this function. GetNameSpaceFromNode is more complete
+asCString asCBuilder::GetScopeFromNode(asCScriptNode *node, asCScriptCode *script, asCScriptNode **next)
+{
+	if (node->nodeType != snScope)
+	{
+		if (next)
+			*next = node;
+		return "";
+	}
+
+	asCString scope;
+	asCScriptNode *sn = node->firstChild;
+	if( sn->tokenType == ttScope )
+	{
+		scope = "::";
+		sn = sn->next;
+	}
+
+	// TODO: child funcdef: A scope can have a template type as the innermost
+	while( sn && sn->next && sn->next->tokenType == ttScope )
+	{
+		asCString tmp;
+		tmp.Assign(&script->code[sn->tokenPos], sn->tokenLength);
+		if( scope != "" && scope != "::" )
+			scope += "::";
+		scope += tmp;
+		sn = sn->next->next;
+	}
+
+	if( next )
+		*next = node->next;
+
+	return scope;
+}
+
+asSNameSpace *asCBuilder::GetNameSpaceFromNode(asCScriptNode *node, asCScriptCode *script, asSNameSpace *implicitNs, asCScriptNode **next, asCObjectType **objType)
+{
+	if (objType)
+		*objType = 0;
+
+	// If no scope has been informed, then return the implicit namespace
+	if (node->nodeType != snScope)
+	{
+		if (next)
+			*next = node;
+		return implicitNs ? implicitNs : engine->nameSpaces[0];
+	}
+
+	if (next)
+		*next = node->next;
+
+	asCString scope;
+	asCScriptNode *sn = node->firstChild;
+	if (sn && sn->tokenType == ttScope)
+	{
+		scope = "::";
+		sn = sn->next;
+	}
+
+	while (sn)
+	{
+		if (sn->next->tokenType == ttScope)
+		{
+			asCString tmp;
+			tmp.Assign(&script->code[sn->tokenPos], sn->tokenLength);
+			if (scope != "" && scope != "::")
+				scope += "::";
+			scope += tmp;
+			sn = sn->next->next;
+		}
+		else
+		{
+			// This is a template type
+			asASSERT(sn->next->nodeType == snDataType);
+
+			asSNameSpace *ns = implicitNs;
+			if (scope != "")
+				ns = engine->FindNameSpace(scope.AddressOf());
+
+			asCString templateName(&script->code[sn->tokenPos], sn->tokenLength);
+			asCObjectType *templateType = GetObjectType(templateName.AddressOf(), ns);
+			if (templateType == 0 || (templateType->flags & asOBJ_TEMPLATE) == 0)
+			{
+				// TODO: child funcdef: Report error
+				return ns;
+			}
+
+			if (objType)
+				*objType = GetTemplateInstanceFromNode(sn, script, templateType, implicitNs, 0);
+
+			// Return no namespace, since this is an object type
+			return 0;
+		}
+	}
+
+	asCTypeInfo *ti = 0;
+	asSNameSpace *ns = GetNameSpaceByString(scope, implicitNs ? implicitNs : engine->nameSpaces[0], node, script, &ti);
+	if (ti && objType)
+		*objType = CastToObjectType(ti);
+	return ns;
+}
+
+asSNameSpace *asCBuilder::GetNameSpaceByString(const asCString &nsName, asSNameSpace *implicitNs, asCScriptNode *errNode, asCScriptCode *script, asCTypeInfo **scopeType, bool isRequired)
+{
+	if( scopeType )
+		*scopeType = 0;
+
+	asSNameSpace *ns = implicitNs;
+	if( nsName == "::" )
+		ns = engine->nameSpaces[0];
+	else if( nsName != "" )
+	{
+		ns = engine->FindNameSpace(nsName.AddressOf());
+		if (ns == 0 && scopeType)
+		{
+			asCString typeName;
+			asCString searchNs;
+
+			// Split the scope with at the inner most ::
+			int pos = nsName.FindLast("::");
+			bool recursive = false;
+			if (pos >= 0)
+			{
+				// Fully qualified namespace
+				typeName = nsName.SubString(pos + 2);
+				searchNs = nsName.SubString(0, pos);
+			}
+			else
+			{
+				// Partially qualified, use the implicit namespace and then search recursively for the type
+				typeName = nsName;
+				searchNs = implicitNs->name;
+				recursive = true;
+			}
+
+			asSNameSpace *nsTmp = searchNs == "::" ? engine->nameSpaces[0] : engine->FindNameSpace(searchNs.AddressOf());
+			asCTypeInfo *ti = 0;
+			while( !ti && nsTmp )
+			{
+				// Check if the typeName is an existing type in the namespace
+				ti = GetType(typeName.AddressOf(), nsTmp, 0);
+				if (ti)
+				{
+					// The informed scope is not a namespace, but it does match a type
+					*scopeType = ti;
+					return 0;
+				}
+				nsTmp = recursive ? engine->GetParentNameSpace(nsTmp) : 0;
+			}
+		}
+
+		if (ns == 0 && isRequired)
+		{
+			asCString msg;
+			msg.Format(TXT_NAMESPACE_s_DOESNT_EXIST, nsName.AddressOf());
+			WriteError(msg, script, errNode);
+		}
+	}
+
+	return ns;
+}
+
+asCDataType asCBuilder::CreateDataTypeFromNode(asCScriptNode *node, asCScriptCode *file, asSNameSpace *implicitNamespace, bool acceptHandleForScope, asCObjectType *currentType, bool reportError, bool *isValid)
+{
+	asASSERT(node->nodeType == snDataType || node->nodeType == snIdentifier || node->nodeType == snScope );
+
+	asCDataType dt;
+
+	asCScriptNode *n = node->firstChild;
+
+	if (isValid)
+		*isValid = true;
+
+	// If the informed node is an identifier or scope, then the
+	// datatype should be identified directly from that
+	if (node->nodeType != snDataType)
+		n = node;
+
+	bool isConst = false;
+	bool isImplicitHandle = false;
+	if( n->tokenType == ttConst )
+	{
+		isConst = true;
+		n = n->next;
+	}
+
+	// Determine namespace (or parent type) to search for the data type in
+	asCObjectType *parentType = 0;
+	asSNameSpace *ns = GetNameSpaceFromNode(n, file, implicitNamespace, &n, &parentType);
+	if( ns == 0 && parentType == 0 )
+	{
+		// The namespace and parent type doesn't exist. Return a dummy type instead.
+		dt = asCDataType::CreatePrimitive(ttInt, false);
+		if (isValid)
+			*isValid = false;
+		return dt;
+	}
+
+	if( n->tokenType == ttIdentifier )
+	{
+		bool found = false;
+
+		asCString str;
+		str.Assign(&file->code[n->tokenPos], n->tokenLength);
+
+		// Recursively search parent namespaces for matching type
+		asSNameSpace *origNs = ns;
+		asCObjectType *origParentType = parentType;
+		while( (ns || parentType) && !found )
+		{
+			asCTypeInfo *ti = 0;
+
+			if (currentType)
+			{
+				// If this is for a template type, then we must first determine if the
+				// identifier matches any of the template subtypes
+				if (currentType->flags & asOBJ_TEMPLATE)
+				{
+					for (asUINT subtypeIndex = 0; subtypeIndex < currentType->templateSubTypes.GetLength(); subtypeIndex++)
+					{
+						asCTypeInfo *type = currentType->templateSubTypes[subtypeIndex].GetTypeInfo();
+						if (type && str == type->name)
+						{
+							ti = type;
+							break;
+						}
+					}
+				}
+
+				if (ti == 0)
+				{
+					// Check if the type is a child type of the current type
+					ti = GetFuncDef(str.AddressOf(), 0, currentType);
+					if (ti)
+					{
+						dt = asCDataType::CreateType(ti, false);
+						found = true;
+					}
+				}
+			}
+
+			if( ti == 0 )
+				ti = GetType(str.AddressOf(), ns, parentType);
+			if( ti == 0 && !module && currentType )
+				ti = GetTypeFromTypesKnownByObject(str.AddressOf(), currentType);
+
+			if( ti && !found )
+			{
+				found = true;
+
+				if( ti->flags & asOBJ_IMPLICIT_HANDLE )
+					isImplicitHandle = true;
+
+				// Make sure the module has access to the object type
+				if( !module || (module->m_accessMask & ti->accessMask) )
+				{
+					if( asOBJ_TYPEDEF == (ti->flags & asOBJ_TYPEDEF) )
+					{
+						// TODO: typedef: A typedef should be considered different from the original type (though with implicit conversions between the two)
+						// Create primitive data type based on object flags
+						dt = CastToTypedefType(ti)->aliasForType;
+						dt.MakeReadOnly(isConst);
+					}
+					else
+					{
+						if( ti->flags & asOBJ_TEMPLATE )
+						{
+							ti = GetTemplateInstanceFromNode(n, file, CastToObjectType(ti), implicitNamespace, currentType, &n);
+							if (ti == 0)
+							{
+								if (isValid)
+									*isValid = false;
+
+								// Return a dummy
+								return asCDataType::CreatePrimitive(ttInt, false);
+							}
+						}
+						else if( n && n->next && n->next->nodeType == snDataType )
+						{
+							if (reportError)
+							{
+								asCString msg;
+								msg.Format(TXT_TYPE_s_NOT_TEMPLATE, ti->name.AddressOf());
+								WriteError(msg, file, n);
+							}
+							if (isValid)
+								*isValid = false;
+						}
+
+						// Create object data type
+						if( ti )
+							dt = asCDataType::CreateType(ti, isConst);
+						else
+							dt = asCDataType::CreatePrimitive(ttInt, isConst);
+					}
+				}
+				else
+				{
+					if (reportError)
+					{
+						asCString msg;
+						msg.Format(TXT_TYPE_s_NOT_AVAILABLE_FOR_MODULE, (const char *)str.AddressOf());
+						WriteError(msg, file, n);
+					}
+
+					dt.SetTokenType(ttInt);
+					if (isValid)
+						*isValid = false;
+				}
+			}
+
+			if( !found )
+			{
+				// Try to find it in the parent namespace
+				if( ns )
+					ns = engine->GetParentNameSpace(ns);
+				if (parentType)
+					parentType = 0;
+			}
+		}
+
+		if( !found )
+		{
+			if (reportError)
+			{
+				asCString msg;
+				if (origNs && origNs->name == "")
+					msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS, str.AddressOf());
+				else if (origNs)
+					msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, str.AddressOf(), origNs->name.AddressOf());
+				else
+				{
+					// TODO: child funcdef: Message should explain that the identifier is not a type of the parent type
+					asCDataType pt = asCDataType::CreateType(origParentType, false);
+					msg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s, str.AddressOf(), pt.Format(origParentType->nameSpace, false).AddressOf());
+				}
+				WriteError(msg, file, n);
+			}
+
+			dt = asCDataType::CreatePrimitive(ttInt, isConst);
+			if (isValid)
+				*isValid = false;
+			return dt;
+		}
+	}
+	else if( n->tokenType == ttAuto )
+	{
+		dt = asCDataType::CreateAuto(isConst);
+	}
+	else
+	{
+		// Create primitive data type
+		dt = asCDataType::CreatePrimitive(n->tokenType, isConst);
+	}
+
+	// Determine array dimensions and object handles
+	n = n->next;
+	while( n && (n->tokenType == ttOpenBracket || n->tokenType == ttHandle) )
+	{
+		if( n->tokenType == ttOpenBracket )
+		{
+			if (isImplicitHandle)
+			{
+				// Make the type a handle
+				if (dt.MakeHandle(true, acceptHandleForScope) < 0)
+				{
+					if (reportError)
+						WriteError(TXT_OBJECT_HANDLE_NOT_SUPPORTED, file, n);
+					if (isValid)
+						*isValid = false;
+				}
+				isImplicitHandle = false;
+			}
+
+			// Make sure the sub type can be instantiated
+			if( !dt.CanBeInstantiated() )
+			{
+				if (reportError)
+				{
+					asCString str;
+					if (dt.IsAbstractClass())
+						str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(ns).AddressOf());
+					else if (dt.IsInterface())
+						str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(ns).AddressOf());
+					else
+						// TODO: Improve error message to explain why
+						str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(ns).AddressOf());
+
+					WriteError(str, file, n);
+				}
+				if (isValid)
+					*isValid = false;
+			}
+
+			// Make the type an array (or multidimensional array)
+			if( dt.MakeArray(engine, module) < 0 )
+			{
+				if( reportError )
+					WriteError(TXT_NO_DEFAULT_ARRAY_TYPE, file, n);
+				if (isValid)
+					*isValid = false;
+				break;
+			}
+		}
+		else
+		{
+			// Make the type a handle
+			if( dt.IsObjectHandle() )
+			{
+				if( reportError )
+					WriteError(TXT_HANDLE_OF_HANDLE_IS_NOT_ALLOWED, file, n);
+				if (isValid)
+					*isValid = false;
+				break;
+			}
+			else
+			{
+				if( dt.MakeHandle(true, acceptHandleForScope) < 0 )
+				{
+					if( reportError )
+						WriteError(TXT_OBJECT_HANDLE_NOT_SUPPORTED, file, n);
+					if (isValid)
+						*isValid = false;
+					break;
+				}
+				
+				// Check if the handle should be read-only
+				if( n && n->next && n->next->tokenType == ttConst )
+					dt.MakeReadOnly(true);
+			}
+		}
+		n = n->next;
+	}
+
+	if( isImplicitHandle )
+	{
+		// Make the type a handle
+		if (dt.MakeHandle(true, acceptHandleForScope) < 0)
+		{
+			if( reportError )
+				WriteError(TXT_OBJECT_HANDLE_NOT_SUPPORTED, file, n);
+			if (isValid)
+				*isValid = false;
+		}
+	}
+
+	return dt;
+}
+
+asCObjectType *asCBuilder::GetTemplateInstanceFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *templateType, asSNameSpace *implicitNamespace, asCObjectType *currentType, asCScriptNode **next)
+{
+	// Check if the subtype is a type or the template's subtype
+	// if it is the template's subtype then this is the actual template type,
+	// orderwise it is a template instance.
+	// Only do this for application registered interface, as the
+	// scripts cannot implement templates.
+	asCArray<asCDataType> subTypes;
+	asUINT subtypeIndex;
+	asCScriptNode *n = node;
+	while (n && n->next && n->next->nodeType == snDataType)
+	{
+		n = n->next;
+
+		// When parsing function definitions for template registrations (currentType != 0) it is necessary
+		// to pass in the current template type to the recursive call since it is this ones sub-template types
+		// that should be allowed.
+		asCDataType subType = CreateDataTypeFromNode(n, file, implicitNamespace, false, module ? 0 : (currentType ? currentType : templateType));
+		subTypes.PushLast(subType);
+
+		if (subType.IsReadOnly())
+		{
+			asCString msg;
+			msg.Format(TXT_TMPL_SUBTYPE_MUST_NOT_BE_READ_ONLY);
+			WriteError(msg, file, n);
+
+			// Return a dummy
+			return 0;
+		}
+	}
+
+	if (next)
+		*next = n;
+
+	if (subTypes.GetLength() != templateType->templateSubTypes.GetLength())
+	{
+		asCString msg;
+		msg.Format(TXT_TMPL_s_EXPECTS_d_SUBTYPES, templateType->name.AddressOf(), int(templateType->templateSubTypes.GetLength()));
+		WriteError(msg, file, node);
+
+		// Return a dummy
+		return 0;
+	}
+
+	// Check if any of the given subtypes are different from the template's declared subtypes
+	bool isDifferent = false;
+	for (subtypeIndex = 0; subtypeIndex < subTypes.GetLength(); subtypeIndex++)
+	{
+		if (subTypes[subtypeIndex].GetTypeInfo() != templateType->templateSubTypes[subtypeIndex].GetTypeInfo())
+		{
+			isDifferent = true;
+			break;
+		}
+	}
+
+	if (isDifferent)
+	{
+		// This is a template instance
+		// Need to find the correct object type
+		asCObjectType *otInstance = engine->GetTemplateInstanceType(templateType, subTypes, module);
+
+		if (otInstance && otInstance->scriptSectionIdx < 0)
+		{
+			// If this is the first time the template instance is used, store where it was declared from
+			otInstance->scriptSectionIdx = engine->GetScriptSectionNameIndex(file->name.AddressOf());
+			int row, column;
+			file->ConvertPosToRowCol(n->tokenPos, &row, &column);
+			otInstance->declaredAt = (row & 0xFFFFF) | (column << 20);
+		}
+
+		if (!otInstance)
+		{
+			asCString sub = subTypes[0].Format(templateType->nameSpace);
+			for (asUINT s = 1; s < subTypes.GetLength(); s++)
+			{
+				sub += ",";
+				sub += subTypes[s].Format(templateType->nameSpace);
+			}
+			asCString msg;
+			msg.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, templateType->name.AddressOf(), sub.AddressOf());
+			WriteError(msg, file, n);
+		}
+
+		return otInstance;
+	}
+
+	return templateType;
+}
+
+asCDataType asCBuilder::ModifyDataTypeFromNode(const asCDataType &type, asCScriptNode *node, asCScriptCode *file, asETypeModifiers *inOutFlags, bool *autoHandle)
+{
+	asCDataType dt = type;
+
+	if( inOutFlags ) *inOutFlags = asTM_NONE;
+
+	// Is the argument sent by reference?
+	asCScriptNode *n = node->firstChild;
+	if( n && n->tokenType == ttAmp )
+	{
+		if (dt.GetTokenType() == ttVoid)
+		{
+			asCString msg;
+			msg.Format(TXT_TYPE_s_CANNOT_BE_REFERENCE, type.Format(0).AddressOf());
+			WriteError(msg, file, node->firstChild);
+			return dt;
+		}
+
+		dt.MakeReference(true);
+		n = n->next;
+
+		if( n )
+		{
+			if( inOutFlags )
+			{
+				if( n->tokenType == ttIn )
+					*inOutFlags = asTM_INREF;
+				else if( n->tokenType == ttOut )
+					*inOutFlags = asTM_OUTREF;
+				else if( n->tokenType == ttInOut )
+					*inOutFlags = asTM_INOUTREF;
+				else
+					asASSERT(false);
+			}
+
+			n = n->next;
+		}
+		else
+		{
+			if( inOutFlags )
+				*inOutFlags = asTM_INOUTREF; // ttInOut
+		}
+
+		if( !engine->ep.allowUnsafeReferences &&
+			inOutFlags && *inOutFlags == asTM_INOUTREF &&
+			!(dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE)) )
+		{
+			// Verify that the base type support &inout parameter types
+			if( !dt.IsObject() || dt.IsObjectHandle() || 
+				!((dt.GetTypeInfo()->flags & asOBJ_NOCOUNT) || (CastToObjectType(dt.GetTypeInfo())->beh.addref && CastToObjectType(dt.GetTypeInfo())->beh.release)) )
+				WriteError(TXT_ONLY_OBJECTS_MAY_USE_REF_INOUT, file, node->firstChild);
+		}
+	}
+
+	if( autoHandle ) *autoHandle = false;
+
+	if( n && n->tokenType == ttPlus )
+	{
+		// Autohandles are not supported for types with NOCOUNT
+		// If the type is not a handle then there was an error with building the type, but
+		// this error would already have been reported so no need to report another error here
+		if( dt.IsObjectHandle() && (dt.GetTypeInfo()->flags & asOBJ_NOCOUNT) )
+			WriteError(TXT_AUTOHANDLE_CANNOT_BE_USED_FOR_NOCOUNT, file, node->firstChild);
+
+		if( autoHandle ) *autoHandle = true;
+	}
+
+	if (n && n->tokenType == ttIdentifier)
+	{
+		asCString str;
+		str.Assign(&file->code[n->tokenPos], n->tokenLength);
+		if (str == IF_HANDLE_TOKEN)
+			dt.SetIfHandleThenConst(true);
+		else
+		{
+			// TODO: Should give error if not currently parsing template registration
+			asCString msg;
+			msg.Format(TXT_UNEXPECTED_TOKEN_s, str.AddressOf());
+			WriteError(msg, file, node->firstChild);
+		}
+	}
+
+	return dt;
+}
+
+asCTypeInfo *asCBuilder::GetType(const char *type, asSNameSpace *ns, asCObjectType *parentType)
+{
+	asASSERT((ns == 0 && parentType) || (ns && parentType == 0));
+
+	if (ns)
+	{
+		asCTypeInfo *ti = engine->GetRegisteredType(type, ns);
+		if (!ti && module)
+			ti = module->GetType(type, ns);
+		return ti;
+	}
+	else
+	{
+		// Recursively check base classes
+		asCObjectType *currType = parentType;
+		while (currType)
+		{
+			for (asUINT n = 0; n < currType->childFuncDefs.GetLength(); n++)
+			{
+				asCFuncdefType *funcDef = currType->childFuncDefs[n];
+				if (funcDef && funcDef->name == type)
+					return funcDef;
+			}
+			currType = currType->derivedFrom;
+		}
+	}
+
+	return 0;
+}
+
+asCObjectType *asCBuilder::GetObjectType(const char *type, asSNameSpace *ns)
+{
+	return CastToObjectType(GetType(type, ns, 0));
+}
+
+#ifndef AS_NO_COMPILER
+// This function will return true if there are any types in the engine or module
+// with the given name. The namespace is ignored in this verification.
+bool asCBuilder::DoesTypeExist(const asCString &type)
+{
+	asUINT n;
+
+	// This function is only used when parsing expressions for building bytecode
+	// and this is only done after all types are known. For this reason the types
+	// can be safely cached in a map for quick lookup. Once the builder is released
+	// the cache will also be destroyed thus avoiding unnecessary memory consumption.
+	if( !hasCachedKnownTypes )
+	{
+		// Only do this once
+		hasCachedKnownTypes = true;
+
+		// Add registered types
+		asSMapNode<asSNameSpaceNamePair, asCTypeInfo*> *cursor;
+		engine->allRegisteredTypes.MoveFirst(&cursor);
+		while( cursor )
+		{
+			if( !knownTypes.MoveTo(0, cursor->key.name) )
+				knownTypes.Insert(cursor->key.name, true);
+
+			engine->allRegisteredTypes.MoveNext(&cursor, cursor);
+		}
+
+		if (module)
+		{
+			// Add script classes and interfaces
+			for (n = 0; n < module->m_classTypes.GetLength(); n++)
+				if (!knownTypes.MoveTo(0, module->m_classTypes[n]->name))
+					knownTypes.Insert(module->m_classTypes[n]->name, true);
+
+			// Add script enums
+			for (n = 0; n < module->m_enumTypes.GetLength(); n++)
+				if (!knownTypes.MoveTo(0, module->m_enumTypes[n]->name))
+					knownTypes.Insert(module->m_enumTypes[n]->name, true);
+
+			// Add script typedefs
+			for (n = 0; n < module->m_typeDefs.GetLength(); n++)
+				if (!knownTypes.MoveTo(0, module->m_typeDefs[n]->name))
+					knownTypes.Insert(module->m_typeDefs[n]->name, true);
+
+			// Add script funcdefs
+			for (n = 0; n < module->m_funcDefs.GetLength(); n++)
+				if (!knownTypes.MoveTo(0, module->m_funcDefs[n]->name))
+					knownTypes.Insert(module->m_funcDefs[n]->name, true);
+		}
+	}
+
+	// Check if the type is known
+	return knownTypes.MoveTo(0, type);
+}
+#endif
+
+asCTypeInfo *asCBuilder::GetTypeFromTypesKnownByObject(const char *type, asCObjectType *currentType)
+{
+	if (currentType->name == type)
+		return currentType;
+
+	asUINT n;
+
+	asCTypeInfo *found = 0;
+
+	for (n = 0; found == 0 && n < currentType->properties.GetLength(); n++)
+		if (currentType->properties[n]->type.GetTypeInfo() &&
+			currentType->properties[n]->type.GetTypeInfo()->name == type)
+			found = currentType->properties[n]->type.GetTypeInfo();
+
+	for (n = 0; found == 0 && n < currentType->methods.GetLength(); n++)
+	{
+		asCScriptFunction *func = engine->scriptFunctions[currentType->methods[n]];
+		if (func->returnType.GetTypeInfo() &&
+			func->returnType.GetTypeInfo()->name == type)
+			found = func->returnType.GetTypeInfo();
+
+		for (asUINT f = 0; found == 0 && f < func->parameterTypes.GetLength(); f++)
+			if (func->parameterTypes[f].GetTypeInfo() &&
+				func->parameterTypes[f].GetTypeInfo()->name == type)
+				found = func->parameterTypes[f].GetTypeInfo();
+	}
+
+	if (found)
+	{
+		// In case we find a template instance it mustn't be returned
+		// because it is not known if the subtype is really matching
+		if (found->flags & asOBJ_TEMPLATE)
+			return 0;
+	}
+
+	return found;
+}
+
+asCFuncdefType *asCBuilder::GetFuncDef(const char *type, asSNameSpace *ns, asCObjectType *parentType)
+{
+	asASSERT((ns == 0 && parentType) || (ns && parentType == 0));
+
+	if (ns)
+	{
+		for (asUINT n = 0; n < engine->registeredFuncDefs.GetLength(); n++)
+		{
+			asCFuncdefType *funcDef = engine->registeredFuncDefs[n];
+			// TODO: access: Only return the definitions that the module has access to
+			if (funcDef && funcDef->nameSpace == ns && funcDef->name == type)
+				return funcDef;
+		}
+
+		if (module)
+		{
+			for (asUINT n = 0; n < module->m_funcDefs.GetLength(); n++)
+			{
+				asCFuncdefType *funcDef = module->m_funcDefs[n];
+				if (funcDef && funcDef->nameSpace == ns && funcDef->name == type)
+					return funcDef;
+			}
+		}
+	}
+	else
+	{
+		// Recursively check base classes
+		asCObjectType *currType = parentType;
+		while (currType)
+		{
+			for (asUINT n = 0; n < currType->childFuncDefs.GetLength(); n++)
+			{
+				asCFuncdefType *funcDef = currType->childFuncDefs[n];
+				if (funcDef && funcDef->name == type)
+					return funcDef;
+			}
+			currType = currType->derivedFrom;
+		}
+	}
+
+	return 0;
+}
+
+#ifndef AS_NO_COMPILER
+
+int asCBuilder::GetEnumValueFromType(asCEnumType *type, const char *name, asCDataType &outDt, asDWORD &outValue)
+{
+	if( !type || !(type->flags & asOBJ_ENUM) )
+		return 0;
+
+	for( asUINT n = 0; n < type->enumValues.GetLength(); ++n )
+	{
+		if( type->enumValues[n]->name == name )
+		{
+			outDt = asCDataType::CreateType(type, true);
+			outValue = type->enumValues[n]->value;
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+int asCBuilder::GetEnumValue(const char *name, asCDataType &outDt, asDWORD &outValue, asSNameSpace *ns)
+{
+	bool found = false;
+
+	// Search all available enum types
+	asUINT t;
+	for( t = 0; t < engine->registeredEnums.GetLength(); t++ )
+	{
+		asCEnumType *et = engine->registeredEnums[t];
+		if( ns != et->nameSpace ) continue;
+
+		// Don't bother with types the module doesn't have access to
+		if( (et->accessMask & module->m_accessMask) == 0 )
+			continue;
+
+		if( GetEnumValueFromType(et, name, outDt, outValue) )
+		{
+			if( !found )
+				found = true;
+			else
+			{
+				// Found more than one value in different enum types
+				return 2;
+			}
+		}
+	}
+
+	for( t = 0; t < module->m_enumTypes.GetLength(); t++ )
+	{
+		asCEnumType *et = module->m_enumTypes[t];
+		if( ns != et->nameSpace ) continue;
+
+		if( GetEnumValueFromType(et, name, outDt, outValue) )
+		{
+			if( !found )
+				found = true;
+			else
+			{
+				// Found more than one value in different enum types
+				return 2;
+			}
+		}
+	}
+
+	if( found )
+		return 1;
+
+	// Didn't find any value
+	return 0;
+}
+
+#endif // AS_NO_COMPILER
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/source/as_builder.h b/Sources/AngelScript/source/as_builder.h
old mode 100755
new mode 100644
index a0b931ca3..0b56f31d5
--- a/Sources/AngelScript/source/as_builder.h
+++ b/Sources/AngelScript/source/as_builder.h
@@ -1,259 +1,262 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_builder.h
-//
-// This is the class that manages the compilation of the scripts
-//
-
-
-#ifndef AS_BUILDER_H
-#define AS_BUILDER_H
-
-#include "as_config.h"
-#include "as_symboltable.h"
-#include "as_scriptengine.h"
-#include "as_module.h"
-#include "as_array.h"
-#include "as_scriptcode.h"
-#include "as_scriptnode.h"
-#include "as_datatype.h"
-#include "as_property.h"
-
-BEGIN_AS_NAMESPACE
-
-#ifdef AS_NO_COMPILER
-// Forward declare the structure, as it is part of some function signatures used even without the compiler
-struct sGlobalVariableDescription;
-#endif
-
-#ifndef AS_NO_COMPILER
-
-struct sFunctionDescription
-{
-	asCScriptCode       *script;
-	asCScriptNode       *node;
-	asCString            name;
-	asCObjectType       *objType;
-	asCArray<asCString>  paramNames;
-	int                  funcId;
-	bool                 isExistingShared;
-};
-
-struct sGlobalVariableDescription
-{
-	asCScriptCode     *script;
-	asCScriptNode     *declaredAtNode;
-	asCScriptNode     *initializationNode;
-	asCString          name;
-	asCGlobalProperty *property;
-	asCDataType        datatype;
-	asSNameSpace      *ns;
-	int                index;
-	bool               isCompiled;
-	bool               isPureConstant;
-	bool               isEnumValue;
-	asQWORD            constantValue;
-};
-
-struct sPropertyInitializer
-{
-	sPropertyInitializer() : declNode(0), initNode(0), file(0) {}
-	sPropertyInitializer(const asCString &nm, asCScriptNode *decl, asCScriptNode *init, asCScriptCode *f) : name(nm), declNode(decl), initNode(init), file(f) {}
-	sPropertyInitializer &operator=(const sPropertyInitializer &o) {name = o.name; declNode = o.declNode; initNode = o.initNode; file = o.file; return *this;}
-
-	asCString      name;
-	asCScriptNode *declNode;
-	asCScriptNode *initNode;
-	asCScriptCode *file;
-};
-
-struct sClassDeclaration
-{
-	sClassDeclaration() {script = 0; node = 0; validState = 0; typeInfo = 0; isExistingShared = false; isFinal = false;}
-
-	asCScriptCode *script;
-	asCScriptNode *node;
-	asCString      name;
-	int            validState;
-	asCTypeInfo   *typeInfo;
-	bool           isExistingShared;
-	bool           isFinal;
-
-	asCArray<sPropertyInitializer> propInits;
-};
-
-struct sFuncDef
-{
-	asCScriptCode *script;
-	asCScriptNode *node;
-	asCString      name;
-	int            idx;
-};
-
-struct sMixinClass
-{
-	asCScriptCode *script;
-	asCScriptNode *node;
-	asCString      name;
-	asSNameSpace  *ns;
-};
-
-#endif // AS_NO_COMPILER
-
-class asCBuilder
-{
-public:
-	asCBuilder(asCScriptEngine *engine, asCModule *module);
-	~asCBuilder();
-
-	// These methods are used by the application interface
-	int VerifyProperty(asCDataType *dt, const char *decl, asCString &outName, asCDataType &outType, asSNameSpace *ns);
-	int ParseDataType(const char *datatype, asCDataType *result, asSNameSpace *implicitNamespace, bool isReturnType = false);
-	int ParseTemplateDecl(const char *decl, asCString *name, asCArray<asCString> &subtypeNames);
-	int ParseFunctionDeclaration(asCObjectType *type, const char *decl, asCScriptFunction *func, bool isSystemFunction, asCArray<bool> *paramAutoHandles = 0, bool *returnAutoHandle = 0, asSNameSpace *ns = 0, asCScriptNode **outListPattern = 0, asCObjectType **outParentClass = 0);
-	int ParseVariableDeclaration(const char *decl, asSNameSpace *implicitNamespace, asCString &outName, asSNameSpace *&outNamespace, asCDataType &outDt);
-	int CheckNameConflict(const char *name, asCScriptNode *node, asCScriptCode *code, asSNameSpace *ns);
-	int CheckNameConflictMember(asCTypeInfo *type, const char *name, asCScriptNode *node, asCScriptCode *code, bool isProperty);
-
-#ifndef AS_NO_COMPILER
-	int AddCode(const char *name, const char *code, int codeLength, int lineOffset, int sectionIdx, bool makeCopy);
-	int Build();
-
-	int CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asCScriptFunction **outFunc);
-	int CompileGlobalVar(const char *sectionName, const char *code, int lineOffset);
-#endif
-
-protected:
-	friend class asCModule;
-	friend class asCParser;
-	friend class asCScriptFunction;
-	friend class asCScriptEngine;
-
-	void               Reset();
-
-	void               WriteInfo(const asCString &scriptname, const asCString &msg, int r, int c, bool preMessage);
-	void               WriteInfo(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
-	void               WriteError(const asCString &scriptname, const asCString &msg, int r, int c);
-	void               WriteError(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
-	void               WriteWarning(const asCString &scriptname, const asCString &msg, int r, int c);
-	void               WriteWarning(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
-
-	bool               DoesGlobalPropertyExist(const char *prop, asSNameSpace *ns, asCGlobalProperty **outProp = 0, sGlobalVariableDescription **outDesc = 0, bool *isAppProp = 0);
-	asCGlobalProperty *GetGlobalProperty(const char *prop, asSNameSpace *ns, bool *isCompiled, bool *isPureConstant, asQWORD *constantValue, bool *isAppProp);
-	int                ValidateDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func);
-	asCString          GetCleanExpressionString(asCScriptNode *n, asCScriptCode *file);
-
-	asSNameSpace      *GetNameSpaceFromNode(asCScriptNode *node, asCScriptCode *script, asSNameSpace *implicitNs, asCScriptNode **next, asCObjectType **objType = 0);
-	asSNameSpace      *GetNameSpaceByString(const asCString &nsName, asSNameSpace *implicitNs, asCScriptNode *errNode, asCScriptCode *script, asCTypeInfo **scopeType = 0, bool isRequired = true);
-	asCString          GetScopeFromNode(asCScriptNode *n, asCScriptCode *script, asCScriptNode **next = 0);
-
-	asCTypeInfo       *GetType(const char *type, asSNameSpace *ns, asCObjectType *parentType);
-	asCObjectType     *GetObjectType(const char *type, asSNameSpace *ns);
-	asCFuncdefType    *GetFuncDef(const char *type, asSNameSpace *ns, asCObjectType *parentType);
-	asCTypeInfo       *GetTypeFromTypesKnownByObject(const char *type, asCObjectType *currentType);
-	asCDataType        CreateDataTypeFromNode(asCScriptNode *node, asCScriptCode *file, asSNameSpace *implicitNamespace, bool acceptHandleForScope = false, asCObjectType *currentType = 0);
-	asCObjectType     *GetTemplateInstanceFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *templateType, asSNameSpace *implicitNamespace, asCObjectType *currentType, asCScriptNode **next = 0);
-	asCDataType        ModifyDataTypeFromNode(const asCDataType &type, asCScriptNode *node, asCScriptCode *file, asETypeModifiers *inOutFlag, bool *autoHandle);
-
-	int numErrors;
-	int numWarnings;
-	bool silent;
-
-	asCScriptEngine *engine;
-	asCModule       *module;
-
-#ifndef AS_NO_COMPILER
-protected:
-	friend class asCCompiler;
-
-	int                CheckForConflictsDueToDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func, asCObjectType *objType);
-	int                GetNamespaceAndNameFromNode(asCScriptNode *n, asCScriptCode *script, asSNameSpace *implicitNs, asSNameSpace *&outNs, asCString &outName);
-	int                RegisterMixinClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
-	sMixinClass       *GetMixinClass(const char *name, asSNameSpace *ns);
-	void               IncludePropertiesFromMixins(sClassDeclaration *decl);
-	void               IncludeMethodsFromMixins(sClassDeclaration *decl);
-	void               AddInterfaceToClass(sClassDeclaration *decl, asCScriptNode *errNode, asCObjectType *intf);
-	void               AddInterfaceFromMixinToClass(sClassDeclaration *decl, asCScriptNode *errNode, sMixinClass *mixin);
-
-	int                RegisterScriptFunctionFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *object = 0, bool isInterface = false, bool isGlobalFunction = false, asSNameSpace *ns = 0, bool isExistingShared = false, bool isMixin = false);
-	int                RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool isConstMethod, bool isConstructor, bool isDestructor, bool isPrivate, bool isProtected, bool isOverride, bool isFinal, bool isShared);
-	int                RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file, asCObjectType *object = 0, bool isInterface = false, bool isGlobalFunction = false, asSNameSpace *ns = 0, bool isExistingShared = false);
-	int                RegisterImportedFunction(int funcID, asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
-	int                RegisterGlobalVar(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
-	int                RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
-	int                RegisterInterface(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
-	int                RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
-	int                RegisterTypedef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
-	int                RegisterFuncDef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns, asCObjectType *parent);
-	asCScriptFunction *RegisterLambda(asCScriptNode *node, asCScriptCode *file, asCScriptFunction *funcDef, const asCString &name, asSNameSpace *ns);
-	void               CompleteFuncDef(sFuncDef *funcDef);
-	void               CompileInterfaces();
-	void               CompileClasses(asUINT originalNumTempl);
-	void               DetermineTypeRelations();
-	void               GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, bool &isConstMethod, bool &isConstructor, bool &isDestructor, bool &isPrivate, bool &isProtected, bool &isOverride, bool &isFinal, bool &isShared, asSNameSpace *implicitNamespace);
-	bool               DoesMethodExist(asCObjectType *objType, int methodId, asUINT *methodIndex = 0);
-	void               AddDefaultConstructor(asCObjectType *objType, asCScriptCode *file);
-	asCObjectProperty *AddPropertyToClass(sClassDeclaration *c, const asCString &name, const asCDataType &type, bool isPrivate, bool isProtected, bool isInherited, asCScriptCode *file = 0, asCScriptNode *node = 0);
-	int                CreateVirtualFunction(asCScriptFunction *func, int idx);
-	void               ParseScripts();
-	void               RegisterTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns);
-	void               RegisterNonTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns);
-	void               CompileFunctions();
-	void               CompileGlobalVariables();
-	int                GetEnumValueFromType(asCEnumType *type, const char *name, asCDataType &outDt, asDWORD &outValue);
-	int                GetEnumValue(const char *name, asCDataType &outDt, asDWORD &outValue, asSNameSpace *ns);
-	bool               DoesTypeExist(const asCString &type);
-	asCObjectProperty *GetObjectProperty(asCDataType &obj, const char *prop);
-	asCScriptFunction *GetFunctionDescription(int funcId);
-	void               GetFunctionDescriptions(const char *name, asCArray<int> &funcs, asSNameSpace *ns);
-	void               GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope = "", asCScriptNode *errNode = 0, asCScriptCode *script = 0);
-	void               EvaluateTemplateInstances(asUINT startIdx, bool keepSilent);
-
-	asCArray<asCScriptCode *>                  scripts;
-	asCArray<sFunctionDescription *>           functions;
-	asCSymbolTable<sGlobalVariableDescription> globVariables;
-	asCArray<sClassDeclaration *>              classDeclarations;
-	asCArray<sClassDeclaration *>              interfaceDeclarations;
-	asCArray<sClassDeclaration *>              namedTypeDeclarations;
-	asCArray<sFuncDef *>                       funcDefs;
-	asCArray<sMixinClass *>                    mixinClasses;
-
-	// For use with the DoesTypeExists() method
-	bool                    hasCachedKnownTypes;
-	asCMap<asCString, bool> knownTypes;
-#endif
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_builder.h
+//
+// This is the class that manages the compilation of the scripts
+//
+
+
+#ifndef AS_BUILDER_H
+#define AS_BUILDER_H
+
+#include "as_config.h"
+#include "as_symboltable.h"
+#include "as_scriptengine.h"
+#include "as_module.h"
+#include "as_array.h"
+#include "as_scriptcode.h"
+#include "as_scriptnode.h"
+#include "as_datatype.h"
+#include "as_property.h"
+
+BEGIN_AS_NAMESPACE
+
+#ifdef AS_NO_COMPILER
+// Forward declare the structure, as it is part of some function signatures used even without the compiler
+struct sGlobalVariableDescription;
+#endif
+
+#ifndef AS_NO_COMPILER
+
+struct sFunctionDescription
+{
+	asCScriptCode       *script;
+	asCScriptNode       *node;
+	asCString            name;
+	asCObjectType       *objType;
+	asCArray<asCString>  paramNames;
+	int                  funcId;
+	bool                 isExistingShared;
+};
+
+struct sGlobalVariableDescription
+{
+	asCScriptCode     *script;
+	asCScriptNode     *declaredAtNode;
+	asCScriptNode     *initializationNode;
+	asCString          name;
+	asCGlobalProperty *property;
+	asCDataType        datatype;
+	asSNameSpace      *ns;
+	int                index;
+	bool               isCompiled;
+	bool               isPureConstant;
+	bool               isEnumValue;
+	asQWORD            constantValue;
+};
+
+struct sPropertyInitializer
+{
+	sPropertyInitializer() : declNode(0), initNode(0), file(0) {}
+	sPropertyInitializer(const asCString &nm, asCScriptNode *decl, asCScriptNode *init, asCScriptCode *f) : name(nm), declNode(decl), initNode(init), file(f) {}
+	sPropertyInitializer &operator=(const sPropertyInitializer &o) {name = o.name; declNode = o.declNode; initNode = o.initNode; file = o.file; return *this;}
+
+	asCString      name;
+	asCScriptNode *declNode;
+	asCScriptNode *initNode;
+	asCScriptCode *file;
+};
+
+struct sClassDeclaration
+{
+	sClassDeclaration() {script = 0; node = 0; validState = 0; typeInfo = 0; isExistingShared = false; isFinal = false;}
+
+	asCScriptCode *script;
+	asCScriptNode *node;
+	asCString      name;
+	int            validState;
+	asCTypeInfo   *typeInfo;
+	bool           isExistingShared;
+	bool           isFinal;
+
+	asCArray<sPropertyInitializer> propInits;
+};
+
+struct sFuncDef
+{
+	asCScriptCode *script;
+	asCScriptNode *node;
+	asCString      name;
+	int            idx;
+};
+
+struct sMixinClass
+{
+	asCScriptCode *script;
+	asCScriptNode *node;
+	asCString      name;
+	asSNameSpace  *ns;
+};
+
+#endif // AS_NO_COMPILER
+
+class asCBuilder
+{
+public:
+	asCBuilder(asCScriptEngine *engine, asCModule *module);
+	~asCBuilder();
+
+	// These methods are used by the application interface
+	int VerifyProperty(asCDataType *dt, const char *decl, asCString &outName, asCDataType &outType, asSNameSpace *ns);
+	int ParseDataType(const char *datatype, asCDataType *result, asSNameSpace *implicitNamespace, bool isReturnType = false);
+	int ParseTemplateDecl(const char *decl, asCString *name, asCArray<asCString> &subtypeNames);
+	int ParseFunctionDeclaration(asCObjectType *type, const char *decl, asCScriptFunction *func, bool isSystemFunction, asCArray<bool> *paramAutoHandles = 0, bool *returnAutoHandle = 0, asSNameSpace *ns = 0, asCScriptNode **outListPattern = 0, asCObjectType **outParentClass = 0);
+	int ParseVariableDeclaration(const char *decl, asSNameSpace *implicitNamespace, asCString &outName, asSNameSpace *&outNamespace, asCDataType &outDt);
+	int CheckNameConflict(const char *name, asCScriptNode *node, asCScriptCode *code, asSNameSpace *ns, bool isProperty, bool isVirtualProperty, bool isSharedIntf);
+	int CheckNameConflictMember(asCTypeInfo *type, const char *name, asCScriptNode *node, asCScriptCode *code, bool isProperty, bool isVirtualProperty);
+	int ValidateVirtualProperty(asCScriptFunction *func);
+
+#ifndef AS_NO_COMPILER
+	int AddCode(const char *name, const char *code, int codeLength, int lineOffset, int sectionIdx, bool makeCopy);
+	asCScriptCode *FindOrAddCode(const char *name, const char *code, size_t length);
+	int Build();
+
+	int CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asCScriptFunction **outFunc);
+	int CompileGlobalVar(const char *sectionName, const char *code, int lineOffset);
+#endif
+
+protected:
+	friend class asCModule;
+	friend class asCParser;
+	friend class asCScriptFunction;
+	friend class asCScriptEngine;
+
+	void               Reset();
+
+	void               WriteInfo(const asCString &scriptname, const asCString &msg, int r, int c, bool preMessage);
+	void               WriteInfo(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
+	void               WriteError(const asCString &scriptname, const asCString &msg, int r, int c);
+	void               WriteError(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
+	void               WriteWarning(const asCString &scriptname, const asCString &msg, int r, int c);
+	void               WriteWarning(const asCString &msg, asCScriptCode *file, asCScriptNode *node);
+
+	bool               DoesGlobalPropertyExist(const char *prop, asSNameSpace *ns, asCGlobalProperty **outProp = 0, sGlobalVariableDescription **outDesc = 0, bool *isAppProp = 0);
+	asCGlobalProperty *GetGlobalProperty(const char *prop, asSNameSpace *ns, bool *isCompiled, bool *isPureConstant, asQWORD *constantValue, bool *isAppProp);
+	int                ValidateDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func);
+	asCString          GetCleanExpressionString(asCScriptNode *n, asCScriptCode *file);
+
+	asSNameSpace      *GetNameSpaceFromNode(asCScriptNode *node, asCScriptCode *script, asSNameSpace *implicitNs, asCScriptNode **next, asCObjectType **objType = 0);
+	asSNameSpace      *GetNameSpaceByString(const asCString &nsName, asSNameSpace *implicitNs, asCScriptNode *errNode, asCScriptCode *script, asCTypeInfo **scopeType = 0, bool isRequired = true);
+	asCString          GetScopeFromNode(asCScriptNode *n, asCScriptCode *script, asCScriptNode **next = 0);
+
+	asCTypeInfo       *GetType(const char *type, asSNameSpace *ns, asCObjectType *parentType);
+	asCObjectType     *GetObjectType(const char *type, asSNameSpace *ns);
+	asCFuncdefType    *GetFuncDef(const char *type, asSNameSpace *ns, asCObjectType *parentType);
+	asCTypeInfo       *GetTypeFromTypesKnownByObject(const char *type, asCObjectType *currentType);
+	asCDataType        CreateDataTypeFromNode(asCScriptNode *node, asCScriptCode *file, asSNameSpace *implicitNamespace, bool acceptHandleForScope = false, asCObjectType *currentType = 0, bool reportError = true, bool *isValid = 0);
+	asCObjectType     *GetTemplateInstanceFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *templateType, asSNameSpace *implicitNamespace, asCObjectType *currentType, asCScriptNode **next = 0);
+	asCDataType        ModifyDataTypeFromNode(const asCDataType &type, asCScriptNode *node, asCScriptCode *file, asETypeModifiers *inOutFlag, bool *autoHandle);
+
+	int numErrors;
+	int numWarnings;
+	bool silent;
+
+	asCScriptEngine *engine;
+	asCModule       *module;
+
+#ifndef AS_NO_COMPILER
+protected:
+	friend class asCCompiler;
+
+	int                CheckForConflictsDueToDefaultArgs(asCScriptCode *script, asCScriptNode *node, asCScriptFunction *func, asCObjectType *objType);
+	int                GetNamespaceAndNameFromNode(asCScriptNode *n, asCScriptCode *script, asSNameSpace *implicitNs, asSNameSpace *&outNs, asCString &outName);
+	int                RegisterMixinClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
+	sMixinClass       *GetMixinClass(const char *name, asSNameSpace *ns);
+	void               IncludePropertiesFromMixins(sClassDeclaration *decl);
+	void               IncludeMethodsFromMixins(sClassDeclaration *decl);
+	void               AddInterfaceToClass(sClassDeclaration *decl, asCScriptNode *errNode, asCObjectType *intf);
+	void               AddInterfaceFromMixinToClass(sClassDeclaration *decl, asCScriptNode *errNode, sMixinClass *mixin);
+
+	int                RegisterScriptFunctionFromNode(asCScriptNode *node, asCScriptCode *file, asCObjectType *object = 0, bool isInterface = false, bool isGlobalFunction = false, asSNameSpace *ns = 0, bool isExistingShared = false, bool isMixin = false);
+	int                RegisterScriptFunction(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, bool isInterface, bool isGlobalFunction, asSNameSpace *ns, bool isExistingShared, bool isMixin, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, asSFunctionTraits funcTraits);
+	int                RegisterVirtualProperty(asCScriptNode *node, asCScriptCode *file, asCObjectType *object = 0, bool isInterface = false, bool isGlobalFunction = false, asSNameSpace *ns = 0, bool isExistingShared = false);
+	int                RegisterImportedFunction(int funcID, asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
+	int                RegisterGlobalVar(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
+	int                RegisterClass(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
+	int                RegisterInterface(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
+	int                RegisterEnum(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
+	int                RegisterTypedef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns);
+	int                RegisterFuncDef(asCScriptNode *node, asCScriptCode *file, asSNameSpace *ns, asCObjectType *parent);
+	asCScriptFunction *RegisterLambda(asCScriptNode *node, asCScriptCode *file, asCScriptFunction *funcDef, const asCString &name, asSNameSpace *ns, bool isShared);
+	void               CompleteFuncDef(sFuncDef *funcDef);
+	void               CompileInterfaces();
+	void               CompileClasses(asUINT originalNumTempl);
+	void               DetermineTypeRelations();
+	void               GetParsedFunctionDetails(asCScriptNode *node, asCScriptCode *file, asCObjectType *objType, asCString &name, asCDataType &returnType, asCArray<asCString> &parameterNames, asCArray<asCDataType> &parameterTypes, asCArray<asETypeModifiers> &inOutFlags, asCArray<asCString *> &defaultArgs, asSFunctionTraits &traits, asSNameSpace *implicitNamespace);
+	bool               DoesMethodExist(asCObjectType *objType, int methodId, asUINT *methodIndex = 0);
+	void               AddDefaultConstructor(asCObjectType *objType, asCScriptCode *file);
+	asCObjectProperty *AddPropertyToClass(sClassDeclaration *c, const asCString &name, const asCDataType &type, bool isPrivate, bool isProtected, bool isInherited, asCScriptCode *file = 0, asCScriptNode *node = 0);
+	int                CreateVirtualFunction(asCScriptFunction *func, int idx);
+	void               ParseScripts();
+	void               RegisterTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns);
+	void               RegisterNonTypesFromScript(asCScriptNode *node, asCScriptCode *script, asSNameSpace *ns);
+	void               CompileFunctions();
+	void               CompileGlobalVariables();
+	int                GetEnumValueFromType(asCEnumType *type, const char *name, asCDataType &outDt, asDWORD &outValue);
+	int                GetEnumValue(const char *name, asCDataType &outDt, asDWORD &outValue, asSNameSpace *ns);
+	bool               DoesTypeExist(const asCString &type);
+	asCObjectProperty *GetObjectProperty(asCDataType &obj, const char *prop);
+	asCScriptFunction *GetFunctionDescription(int funcId);
+	void               GetFunctionDescriptions(const char *name, asCArray<int> &funcs, asSNameSpace *ns);
+	void               GetObjectMethodDescriptions(const char *name, asCObjectType *objectType, asCArray<int> &methods, bool objIsConst, const asCString &scope = "", asCScriptNode *errNode = 0, asCScriptCode *script = 0);
+	void               EvaluateTemplateInstances(asUINT startIdx, bool keepSilent);
+	void               CleanupEnumValues();
+
+	asCArray<asCScriptCode *>                  scripts;
+	asCArray<sFunctionDescription *>           functions;
+	asCSymbolTable<sGlobalVariableDescription> globVariables;
+	asCArray<sClassDeclaration *>              classDeclarations;
+	asCArray<sClassDeclaration *>              interfaceDeclarations;
+	asCArray<sClassDeclaration *>              namedTypeDeclarations;
+	asCArray<sFuncDef *>                       funcDefs;
+	asCArray<sMixinClass *>                    mixinClasses;
+
+	// For use with the DoesTypeExists() method
+	bool                    hasCachedKnownTypes;
+	asCMap<asCString, bool> knownTypes;
+#endif
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_bytecode.cpp b/Sources/AngelScript/source/as_bytecode.cpp
old mode 100755
new mode 100644
index 62ab6e6f8..2070b0111
--- a/Sources/AngelScript/source/as_bytecode.cpp
+++ b/Sources/AngelScript/source/as_bytecode.cpp
@@ -1,2929 +1,2979 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_bytecode.cpp
-//
-// A class for constructing the final byte code
-//
-
-#include <stdio.h> // fopen(), fprintf(), fclose()
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_bytecode.h"
-#include "as_debug.h" // mkdir()
-#include "as_array.h"
-#include "as_string.h"
-#include "as_scriptengine.h"
-#include "as_debug.h"
-
-BEGIN_AS_NAMESPACE
-
-asCByteCode::asCByteCode(asCScriptEngine *engine)
-{
-	first = 0;
-	last  = 0;
-	largestStackUsed = -1;
-	temporaryVariables = 0;
-
-	this->engine = engine;
-}
-
-asCByteCode::~asCByteCode()
-{
-	ClearAll();
-}
-
-void asCByteCode::Finalize(const asCArray<int> &tempVariableOffsets)
-{
-	temporaryVariables = &tempVariableOffsets;
-
-	// verify the bytecode
-	PostProcess();
-
-	// Optimize the code
-	Optimize();
-
-	// Resolve jumps
-	ResolveJumpAddresses();
-
-	// Build line numbers buffer
-	ExtractLineNumbers();
-}
-
-void asCByteCode::ClearAll()
-{
-	asCByteInstruction *del = first;
-
-	while( del )
-	{
-		first = del->next;
-		engine->memoryMgr.FreeByteInstruction(del);
-		del = first;
-	}
-
-	first = 0;
-	last = 0;
-
-	lineNumbers.SetLength(0);
-
-	largestStackUsed = -1;
-}
-
-void asCByteCode::InsertIfNotExists(asCArray<int> &vars, int var)
-{
-	if( !vars.Exists(var) )
-		vars.PushLast(var);
-}
-
-void asCByteCode::GetVarsUsed(asCArray<int> &vars)
-{
-	TimeIt("asCByteCode::GetVarsUsed");
-
-	asCByteInstruction *curr = first;
-	while( curr )
-	{
-		if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG )
-		{
-			InsertIfNotExists(vars, curr->wArg[0]);
-			InsertIfNotExists(vars, curr->wArg[1]);
-			InsertIfNotExists(vars, curr->wArg[2]);
-		}
-		else if( asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
-			     asBCInfo[curr->op].type == asBCTYPE_wW_ARG    ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG  ||
-			     asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
-			     asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG ||
-			     asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG )
-		{
-			InsertIfNotExists(vars, curr->wArg[0]);
-		}
-		else if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG )
-		{
-			InsertIfNotExists(vars, curr->wArg[0]);
-			InsertIfNotExists(vars, curr->wArg[1]);
-		}
-		else if( curr->op == asBC_LoadThisR )
-		{
-			InsertIfNotExists(vars, 0);
-		}
-
-		curr = curr->next;
-	}
-}
-
-bool asCByteCode::IsVarUsed(int offset)
-{
-	TimeIt("asCByteCode::IsVarUsed");
-
-	asCByteInstruction *curr = first;
-	while( curr )
-	{
-		// Verify all ops that use variables
-		if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG )
-		{
-			if( curr->wArg[0] == offset || curr->wArg[1] == offset || curr->wArg[2] == offset )
-				return true;
-		}
-		else if( asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_ARG    ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG  ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG )
-		{
-			if( curr->wArg[0] == offset )
-				return true;
-		}
-		else if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG )
-		{
-			if( curr->wArg[0] == offset || curr->wArg[1] == offset )
-				return true;
-		}
-		else if( curr->op == asBC_LoadThisR )
-		{
-			if( offset == 0 )
-				return true;
-		}
-
-		curr = curr->next;
-	}
-
-	return false;
-}
-
-void asCByteCode::ExchangeVar(int oldOffset, int newOffset)
-{
-	asASSERT(oldOffset != 0);
-
-	asCByteInstruction *curr = first;
-	while( curr )
-	{
-		// Verify all ops that use variables
-		if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG )
-		{
-			if( curr->wArg[0] == oldOffset )
-				curr->wArg[0] = (short)newOffset;
-			if( curr->wArg[1] == oldOffset )
-				curr->wArg[1] = (short)newOffset;
-			if( curr->wArg[2] == oldOffset )
-				curr->wArg[2] = (short)newOffset;
-		}
-		else if( asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_ARG    ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG  ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG )
-		{
-			if( curr->wArg[0] == oldOffset )
-				curr->wArg[0] = (short)newOffset;
-		}
-		else if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
-				 asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG )
-		{
-			if( curr->wArg[0] == oldOffset )
-				curr->wArg[0] = (short)newOffset;
-			if( curr->wArg[1] == oldOffset )
-				curr->wArg[1] = (short)newOffset;
-		}
-
-		curr = curr->next;
-	}
-}
-
-void asCByteCode::AddPath(asCArray<asCByteInstruction *> &paths, asCByteInstruction *instr, int stackSize)
-{
-	if( instr->marked )
-	{
-		// Verify the size of the stack
-		asASSERT(instr->stackSize == stackSize);
-	}
-	else
-	{
-		// Add the destination to the code paths
-		instr->marked = true;
-		instr->stackSize = stackSize;
-		paths.PushLast(instr);
-	}
-}
-
-asCByteInstruction *asCByteCode::ChangeFirstDeleteNext(asCByteInstruction *curr, asEBCInstr bc)
-{
-	curr->op = bc;
-
-	if( curr->next ) DeleteInstruction(curr->next);
-
-	// Continue optimization with the instruction before the altered one
-	if( curr->prev )
-		return curr->prev;
-	else
-		return curr;
-}
-
-asCByteInstruction *asCByteCode::DeleteFirstChangeNext(asCByteInstruction *curr, asEBCInstr bc)
-{
-	asASSERT( curr->next );
-
-	asCByteInstruction *instr = curr->next;
-	instr->op = bc;
-
-	DeleteInstruction(curr);
-
-	// Continue optimization with the instruction before the altered one
-	if( instr->prev )
-		return instr->prev;
-	else
-		return instr;
-}
-
-void asCByteCode::InsertBefore(asCByteInstruction *before, asCByteInstruction *instr)
-{
-	asASSERT(instr->next == 0);
-	asASSERT(instr->prev == 0);
-
-	if( before->prev ) before->prev->next = instr;
-	instr->prev = before->prev;
-	before->prev = instr;
-	instr->next = before;
-
-	if( first == before ) first = instr;
-}
-
-void asCByteCode::RemoveInstruction(asCByteInstruction *instr)
-{
-	if( instr == first ) first = first->next;
-	if( instr == last ) last = last->prev;
-
-	if( instr->prev ) instr->prev->next = instr->next;
-	if( instr->next ) instr->next->prev = instr->prev;
-
-	instr->next = 0;
-	instr->prev = 0;
-}
-
-bool asCByteCode::CanBeSwapped(asCByteInstruction *curr)
-{
-	asASSERT( curr->op == asBC_SwapPtr );
-
-	if( !curr->prev || !curr->prev->prev ) return false;
-
-	asCByteInstruction *b = curr->prev;
-	asCByteInstruction *a = b->prev;
-
-	if( a->op != asBC_PshNull &&
-		a->op != asBC_PshVPtr &&
-		a->op != asBC_PSF )
-		return false;
-
-	if( b->op != asBC_PshNull &&
-		b->op != asBC_PshVPtr &&
-		b->op != asBC_PSF )
-		return false;
-
-	return true;
-}
-
-asCByteInstruction *asCByteCode::GoBack(asCByteInstruction *curr)
-{
-	// Go back 2 instructions
-	if( !curr ) return 0;
-	if( curr->prev ) curr = curr->prev;
-	if( curr->prev ) curr = curr->prev;
-	return curr;
-}
-
-asCByteInstruction *asCByteCode::GoForward(asCByteInstruction *curr)
-{
-	// Go forward 2 instructions
-	if( !curr ) return 0;
-	if( curr->next ) curr = curr->next;
-	if( curr->next ) curr = curr->next;
-	return curr;
-}
-
-bool asCByteCode::PostponeInitOfTemp(asCByteInstruction *curr, asCByteInstruction **next)
-{
-	TimeIt("asCByteCode::PostponeInitOfTemp");
-
-	// This is not done for pointers
-	if( (curr->op != asBC_SetV4 && curr->op != asBC_SetV8) ||
-		!IsTemporary(curr->wArg[0]) ) return false;
-
-	// Move the initialization to just before it's use.
-	// Don't move it beyond any labels or jumps.
-	asCByteInstruction *use = curr->next;
-	while( use )
-	{
-		if( IsTempVarReadByInstr(use, curr->wArg[0]) )
-			break;
-
-		if( IsTempVarOverwrittenByInstr(use, curr->wArg[0]) )
-			return false;
-
-		if( IsInstrJmpOrLabel(use) )
-			return false;
-
-		use = use->next;
-	}
-
-	if( use && use->prev != curr )
-	{
-		asCByteInstruction *orig = curr->next;
-
-		// Move the instruction
-		RemoveInstruction(curr);
-		InsertBefore(use, curr);
-
-		// Try a RemoveUnusedValue to see if it can be combined with the other
-		if( RemoveUnusedValue(curr, 0) )
-		{
-			// Optimizations should continue from the instruction that uses the value
-			*next = orig;
-			return true;
-		}
-
-		// Return the instructions to its original position as it wasn't useful
-		RemoveInstruction(curr);
-		InsertBefore(orig, curr);
-	}
-
-	return false;
-}
-
-bool asCByteCode::RemoveUnusedValue(asCByteInstruction *curr, asCByteInstruction **next)
-{
-	TimeIt("asCByteCode::RemoveUnusedValue");
-
-	asCByteInstruction *dummy;
-	if( next == 0 )
-		next = &dummy;
-
-	// TODO: runtime optimize: Should work for 64bit types as well
-
-	// TODO: runtime optimize: Need a asBCTYPE_rwW_ARG to cover the instructions that read
-	//                         and write to the same variable. Currently they are considered
-	//                         as readers only, so they are not optimized away. This includes
-	//                         NOT, BNOT, IncV, DecV, NEG, iTOf (and all other type casts)
-
-	// The value isn't used for anything
-	if( curr->op != asBC_FREE && // Can't remove the FREE instruction
-		(asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG ||
-		 asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG    ||
-		 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG ||
-		 asBCInfo[curr->op].type == asBCTYPE_wW_ARG       ||
-		 asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG    ||
-		 asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG) &&
-		IsTemporary(curr->wArg[0]) &&
-		!IsTempVarRead(curr, curr->wArg[0]) )
-	{
-		if( curr->op == asBC_LdGRdR4 && IsTempRegUsed(curr) )
-		{
-			curr->op = asBC_LDG;
-			*next = GoForward(curr);
-			return true;
-		}
-
-		*next = GoForward(DeleteInstruction(curr));
-		return true;
-	}
-
-	if( curr->op == asBC_SetV4 && curr->next )
-	{
-		// The value is immediately used and then never again
-		if( (curr->next->op == asBC_CMPi ||
-		     curr->next->op == asBC_CMPf ||
-		     curr->next->op == asBC_CMPu) &&
-		    curr->wArg[0] == curr->next->wArg[1] &&
-		    IsTemporary(curr->wArg[0]) &&                       // The variable is temporary and never used again
-		    !IsTempVarRead(curr->next, curr->wArg[0]) )
-		{
-			if(      curr->next->op == asBC_CMPi ) curr->next->op = asBC_CMPIi;
-			else if( curr->next->op == asBC_CMPf ) curr->next->op = asBC_CMPIf;
-			else if( curr->next->op == asBC_CMPu ) curr->next->op = asBC_CMPIu;
-			curr->next->size = asBCTypeSize[asBCInfo[asBC_CMPIi].type];
-			curr->next->arg = curr->arg;
-			*next = GoForward(DeleteInstruction(curr));
-			return true;
-		}
-
-		// The value is immediately used and then never again
-		if(	(curr->next->op == asBC_ADDi ||
-			 curr->next->op == asBC_SUBi ||
-			 curr->next->op == asBC_MULi ||
-			 curr->next->op == asBC_ADDf ||
-			 curr->next->op == asBC_SUBf ||
-			 curr->next->op == asBC_MULf) &&
-			curr->wArg[0] == curr->next->wArg[2] &&
-			(curr->next->wArg[0] == curr->wArg[0] ||        // The variable is overwritten
-			 (IsTemporary(curr->wArg[0]) &&                 // The variable is temporary and never used again
-			  !IsTempVarRead(curr->next, curr->wArg[0]))) )
-		{
-			if(      curr->next->op == asBC_ADDi ) curr->next->op = asBC_ADDIi;
-			else if( curr->next->op == asBC_SUBi ) curr->next->op = asBC_SUBIi;
-			else if( curr->next->op == asBC_MULi ) curr->next->op = asBC_MULIi;
-			else if( curr->next->op == asBC_ADDf ) curr->next->op = asBC_ADDIf;
-			else if( curr->next->op == asBC_SUBf ) curr->next->op = asBC_SUBIf;
-			else if( curr->next->op == asBC_MULf ) curr->next->op = asBC_MULIf;
-			curr->next->size = asBCTypeSize[asBCInfo[asBC_ADDIi].type];
-			curr->next->arg = curr->arg;
-			*next = GoForward(DeleteInstruction(curr));
-			return true;
-		}
-
-		if(	(curr->next->op == asBC_ADDi ||
-			 curr->next->op == asBC_MULi ||
-			 curr->next->op == asBC_ADDf ||
-			 curr->next->op == asBC_MULf) &&
-			curr->wArg[0] == curr->next->wArg[1] &&
-			(curr->next->wArg[0] == curr->wArg[0] ||        // The variable is overwritten
-			 (IsTemporary(curr->wArg[0]) &&                 // The variable is temporary and never used again
-			  !IsTempVarRead(curr->next, curr->wArg[0]))) )
-		{
-			if(      curr->next->op == asBC_ADDi ) curr->next->op = asBC_ADDIi;
-			else if( curr->next->op == asBC_MULi ) curr->next->op = asBC_MULIi;
-			else if( curr->next->op == asBC_ADDf ) curr->next->op = asBC_ADDIf;
-			else if( curr->next->op == asBC_MULf ) curr->next->op = asBC_MULIf;
-			curr->next->size = asBCTypeSize[asBCInfo[asBC_ADDIi].type];
-			curr->next->arg = curr->arg;
-
-			// The order of the operands are changed
-			curr->next->wArg[1] = curr->next->wArg[2];
-
-			*next = GoForward(DeleteInstruction(curr));
-			return true;
-		}
-
-		// The constant value is immediately moved to another variable and then not used again
-		if( curr->next->op == asBC_CpyVtoV4 &&
-			curr->wArg[0] == curr->next->wArg[1] &&
-			IsTemporary(curr->wArg[0]) &&
-			!IsTempVarRead(curr->next, curr->wArg[0]) )
-		{
-			curr->wArg[0] = curr->next->wArg[0];
-			*next = GoForward(DeleteInstruction(curr->next));
-			return true;
-		}
-
-		// The constant is copied to a temp and then immediately pushed on the stack
-		if( curr->next->op == asBC_PshV4 &&
-			curr->wArg[0] == curr->next->wArg[0] &&
-			IsTemporary(curr->wArg[0]) &&
-			!IsTempVarRead(curr->next, curr->wArg[0]) )
-		{
-			curr->op = asBC_PshC4;
-			curr->stackInc = asBCInfo[asBC_PshC4].stackInc;
-			*next = GoForward(DeleteInstruction(curr->next));
-			return true;
-		}
-
-		// The constant is copied to a global variable and then never used again
-		if( curr->next->op == asBC_CpyVtoG4 &&
-			curr->wArg[0] == curr->next->wArg[0] &&
-			IsTemporary(curr->wArg[0]) &&
-			!IsTempVarRead(curr->next, curr->wArg[0]) )
-		{
-			curr->op = asBC_SetG4;
-			curr->size = asBCTypeSize[asBCInfo[asBC_SetG4].type];
-			*(((asDWORD*)&curr->arg)+AS_PTR_SIZE) = *ARG_DW(curr->arg);
-			*ARG_PTR(curr->arg) = *ARG_PTR(curr->next->arg);
-			*next = GoForward(DeleteInstruction(curr->next));
-			return true;
-		}
-	}
-
-	// The value is immediately moved to another variable and then not used again
-	if( (asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG ||
-		 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG) &&
-		curr->next && curr->next->op == asBC_CpyVtoV4 &&
-		curr->wArg[0] == curr->next->wArg[1] &&
-		IsTemporary(curr->wArg[0]) &&
-		!IsTempVarRead(curr->next, curr->wArg[0]) )
-	{
-		curr->wArg[0] = curr->next->wArg[0];
-		*next = GoForward(DeleteInstruction(curr->next));
-		return true;
-	}
-
-	// The register is copied to a temp variable and then back to the register again without being used afterwards
-	if( curr->op == asBC_CpyRtoV4 && curr->next && curr->next->op == asBC_CpyVtoR4 &&
-		curr->wArg[0] == curr->next->wArg[0] &&
-		IsTemporary(curr->wArg[0]) &&
-		!IsTempVarRead(curr->next, curr->wArg[0]) )
-	{
-		// Delete both instructions
-		DeleteInstruction(curr->next);
-		*next = GoForward(DeleteInstruction(curr));
-		return true;
-	}
-
-	// The global value is copied to a temp and then immediately pushed on the stack
-	if( curr->op == asBC_CpyGtoV4 && curr->next && curr->next->op == asBC_PshV4 &&
-		curr->wArg[0] == curr->next->wArg[0] &&
-		IsTemporary(curr->wArg[0]) &&
-		!IsTempVarRead(curr->next, curr->wArg[0]) )
-	{
-		curr->op = asBC_PshG4;
-		curr->size = asBCTypeSize[asBCInfo[asBC_PshG4].type];
-		curr->stackInc = asBCInfo[asBC_PshG4].stackInc;
-		*next = GoForward(DeleteInstruction(curr->next));
-		return true;
-	}
-
-	// The constant is assigned to a variable, then the value of the variable
-	// pushed on the stack, and then the variable is never used again
-	if( curr->op == asBC_SetV8 && curr->next && curr->next->op == asBC_PshV8 &&
-		curr->wArg[0] == curr->next->wArg[0] &&
-		IsTemporary(curr->wArg[0]) &&
-		!IsTempVarRead(curr->next, curr->wArg[0]) )
-	{
-		curr->op = asBC_PshC8;
-		curr->stackInc = asBCInfo[asBC_PshC8].stackInc;
-		*next = GoForward(DeleteInstruction(curr->next));
-		return true;
-	}
-
-	return false;
-}
-
-bool asCByteCode::IsTemporary(int offset)
-{
-	TimeIt("asCByteCode::IsTemporary");
-
-	asASSERT(temporaryVariables);
-
-	return temporaryVariables->Exists(offset);
-}
-
-void asCByteCode::OptimizeLocally(const asCArray<int> &tempVariableOffsets)
-{
-	// This function performs the optimizations that doesn't require global knowledge of the
-	// entire function, e.g. replacement of sequences of bytecodes for specialized instructions.
-
-	if( !engine->ep.optimizeByteCode )
-		return;
-
-	temporaryVariables = &tempVariableOffsets;
-
-	// TODO: runtime optimize: VAR + GET... should be optimized if the only instructions between them are trivial, i.e. no
-	//                         function calls that can suspend the execution.
-
-	// TODO: runtime optimize: Remove temporary copies of handles, when the temp is just copied to yet another location
-
-	// TODO: runtime optimize: A single bytecode for incrementing a variable, comparing, and jumping can probably improve
-	//                         loops a lot. How often do these loops really occur?
-
-	// TODO: runtime optimize: Need a bytecode BC_AddRef so that BC_CALLSYS doesn't have to be used for this trivial call
-
-	// TODO: optimize: Should possibly do two loops. Some of the checks are best doing by iterating from
-	//                 the end to beginning, e.g. the removal of unused values. Other checks are best
-	//                 doing by iterating from the beginning to end, e.g. replacement of sequences with
-	//                 shorter ones. By doing this, we should be able to avoid backtracking with every
-	//                 change thus avoid unnecessary duplicate checks.
-
-	// Iterate through the bytecode instructions in the reverse order.
-	// An optimization in an instruction may mean that another instruction before that
-	// can also be optimized, e.g. if an add instruction is removed because the result is not
-	// used, then the instructions that created the operands may potentially also be removed.
-	asCByteInstruction *instr = last;
-	while( instr )
-	{
-		asCByteInstruction *curr = instr;
-		instr = instr->prev;
-
-		// Remove instructions when the result is not used anywhere
-		// This will return true if the instruction is deleted, and
-		// false if it is not deleted. Observe that the instruction
-		// can be modified.
-		if( RemoveUnusedValue(curr, &instr) ) continue;
-
-		// Postpone initializations so that they may be combined in the second pass.
-		// If the initialization is postponed, then the optimizations should continue
-		// from where the value was used, so instr will be updated to point to that.
-		if( PostponeInitOfTemp(curr, &instr) ) continue;
-
-		// Look for sequences that can be replaced with shorter ones
-		const asEBCInstr currOp = curr->op;
-		if( currOp == asBC_SwapPtr )
-		{
-			// XXX x, YYY y, SwapPtr -> YYY y, XXX x
-			if( CanBeSwapped(curr) )
-			{
-				// Delete the SwapPtr
-				DeleteInstruction(curr);
-
-				// Swap instructions
-				asCByteInstruction *a = instr->prev;
-				RemoveInstruction(instr);
-				InsertBefore(a, instr);
-
-				// Continue the optimization from the second instruction
-				instr = GoForward(a);
-				continue;
-			}
-		}
-		else if( currOp == asBC_ClrHi )
-		{
-			// T??, ClrHi -> T??
-			if( instr &&
-				(instr->op == asBC_TZ  ||
-			     instr->op == asBC_TNZ ||
-			     instr->op == asBC_TS  ||
-			     instr->op == asBC_TNS ||
-			     instr->op == asBC_TP  ||
-		 	     instr->op == asBC_TNP) )
-			{
-				// Remove the ClrHi instruction since the test
-				// instructions always clear the top bytes anyway
-				instr = GoForward(DeleteInstruction(curr));
-				continue;
-			}
-
-			// ClrHi, JZ -> JLowZ
-			if( curr->next &&
-				curr->next->op == asBC_JZ )
-			{
-				curr->next->op = asBC_JLowZ;
-				instr = GoForward(DeleteInstruction(curr));
-				continue;
-			}
-
-			// ClrHi, JNZ -> JLowNZ
-			if( curr->next &&
-				curr->next->op == asBC_JNZ )
-			{
-				curr->next->op = asBC_JLowNZ;
-				instr = GoForward(DeleteInstruction(curr));
-				continue;
-			}
-		}
-		else if( currOp == asBC_LDV && curr->next )
-		{
-			// LDV x, INCi -> IncVi x
-			if( curr->next->op == asBC_INCi && !IsTempRegUsed(curr->next) )
-			{
-				curr->op = asBC_IncVi;
-				DeleteInstruction(curr->next);
-				instr = GoForward(curr);
-			}
-			// LDV x, DECi -> DecVi x
-			else if( curr->next->op == asBC_DECi && !IsTempRegUsed(curr->next) )
-			{
-				curr->op = asBC_DecVi;
-				DeleteInstruction(curr->next);
-				instr = GoForward(curr);
-			}
-		}
-		else if( currOp == asBC_LDG && curr->next )
-		{
-			// LDG x, WRTV4 y -> CpyVtoG4 y, x
-			if( curr->next->op == asBC_WRTV4 && !IsTempRegUsed(curr->next) )
-			{
-				curr->op = asBC_CpyVtoG4;
-				curr->size = asBCTypeSize[asBCInfo[asBC_CpyVtoG4].type];
-				curr->wArg[0] = curr->next->wArg[0];
-				DeleteInstruction(curr->next);
-				instr = GoForward(curr);
-			}
-			// LDG x, RDR4 y -> CpyGtoV4 y, x
-			else if( curr->next->op == asBC_RDR4 )
-			{
-				if( !IsTempRegUsed(curr->next) )
-					curr->op = asBC_CpyGtoV4;
-				else
-					curr->op = asBC_LdGRdR4;
-				curr->size = asBCTypeSize[asBCInfo[asBC_CpyGtoV4].type];
-				curr->wArg[0] = curr->next->wArg[0];
-				DeleteInstruction(curr->next);
-				instr = GoForward(curr);
-			}
-		}
-		else if( currOp == asBC_CHKREF )
-		{
-			// CHKREF, ADDSi -> ADDSi
-			// CHKREF, RDSPtr -> RDSPtr
-			if( curr->next &&
-				(curr->next->op == asBC_ADDSi || curr->next->op == asBC_RDSPtr) )
-			{
-				// As ADDSi & RDSPtr already checks the pointer the CHKREF instruction is unnecessary
-				instr = GoForward(DeleteInstruction(curr));
-			}
-			// ADDSi, CHKREF -> ADDSi
-			// PGA, CHKREF -> PGA
-			// PSF, CHKREF -> PSF
-			else if( instr &&
-				     (instr->op == asBC_ADDSi ||
-					  instr->op == asBC_PGA ||
-					  instr->op == asBC_PSF) )
-			{
-				// ADDSi is guaranteed to work on valid pointers so CHKREF is not necessary.
-				// PGA and PSF always pushes a valid address on the stack.
-				instr = GoForward(DeleteInstruction(curr));
-			}
-			// PGA, ChkRefS, CHKREF -> PGA, ChkRefS
-			else if( instr && instr->op == asBC_ChkRefS &&
-				     instr->prev && instr->prev->op == asBC_PGA )
-			{
-				// Delete CHKREF since PGA always pushes a valid address on the stack
-				instr = GoForward(DeleteInstruction(curr));
-			}
-		}
-		else if( currOp == asBC_PopPtr )
-		{
-			// RDSPtr, PopPtr -> PopPtr
-			if( instr && instr->op == asBC_RDSPtr )
-			{
-				instr = GoForward(DeleteInstruction(instr));
-			}
-			// PshNull, RefCpyV, PopPtr -> FREE
-			else if( instr && instr->op == asBC_RefCpyV &&
-					 instr->prev && instr->prev->op == asBC_PshNull )
-			{
-				DeleteInstruction(curr);
-				DeleteInstruction(instr->prev);
-				instr->op = asBC_FREE;
-				instr = GoForward(instr);
-			}
-			// PshVPtr y, PopPtr -> nothing
-			// PSF y    , PopPtr -> nothing
-			// VAR y    , PopPtr -> nothing
-			// PshNull  , PopPtr -> nothing
-			// PshRPtr  , PopPtr -> nothing
-			else if( instr &&
-				     (instr->op == asBC_PshRPtr ||
-					  instr->op == asBC_PSF     ||
-					  instr->op == asBC_VAR     ||
-					  instr->op == asBC_PshVPtr ||
-					  instr->op == asBC_PshNull) )
-			{
-				// A pointer is pushed on the stack then immediately removed
-				// Remove both instructions as they cancel each other
-				DeleteInstruction(curr);
-				instr = GoForward(DeleteInstruction(instr));
-			}
-			// PSF, ChkRefS, PopPtr -> ChkNullV
-			else if( instr && instr->op == asBC_ChkRefS &&
-				     instr->prev && instr->prev->op == asBC_PSF )
-			{
-				instr = instr->prev;
-				instr->op = asBC_ChkNullV;
-				instr->stackInc = 0;
-				// Delete the PopPtr instruction
-				DeleteInstruction(curr);
-				// Delete the ChkRefS instruction
-				DeleteInstruction(instr->next);
-				instr = GoForward(instr);
-			}
-			// PshVPtr, CHKREF, PopPtr -> ChkNullV
-			else if( instr && instr->op == asBC_CHKREF &&
-					 instr->prev && instr->prev->op == asBC_PshVPtr )
-			{
-				instr = instr->prev;
-				instr->op = asBC_ChkNullV;
-				instr->stackInc = 0;
-				DeleteInstruction(curr->prev);
-				DeleteInstruction(curr);
-				instr = GoForward(instr);
-			}
-			// STOREOBJ y, PSF y, RDSPtr, PSF x, REFCPY, FREE y, PopPtr -> FREE x, STOREOBJ x
-			else if( instr && instr->op == asBC_FREE )
-			{
-				asCByteInstruction *i = instr->prev;
-				if( !i || i->op != asBC_REFCPY ) continue;
-				i = i->prev;
-				if( !i || i->op != asBC_PSF ) continue;
-				short x = i->wArg[0];
-				i = i->prev;
-				if( !i || i->op != asBC_RDSPtr ) continue;
-				i = i->prev;
-				if( !i || i->op != asBC_PSF ) continue;
-				short y = i->wArg[0];
-				i = i->prev;
-				if( !i || i->op != asBC_STOREOBJ || i->wArg[0] != y ) continue;
-
-				// Don't do the substitution if the var y is not a temporary, or if it is used after PopPtr
-				if( !IsTemporary(y) || IsTempVarRead(curr, y) ) continue;
-
-				// Transform the PopPtr into STOREOBJ
-				curr->op = asBC_STOREOBJ;
-				curr->stackInc = 0;
-				curr->wArg[0] = x;
-				curr->size = i->size;
-
-				// Change arg of the FREE to x
-				// TODO: runtime optimize: The FREE instruction shouldn't be necessary. STOREOBJ should free the previous value by itself
-				instr->wArg[0] = x;
-
-				// Delete all other instructions
-				DeleteInstruction(instr->prev); // REFCPY
-				DeleteInstruction(instr->prev); // PSF
-				DeleteInstruction(instr->prev); // RDSTR
-				DeleteInstruction(instr->prev); // PSF
-				DeleteInstruction(instr->prev); // STOREOBJ
-
-				instr = GoForward(curr);
-			}
-		}
-		else if( currOp == asBC_RDSPtr )
-		{
-			// PGA, RDSPtr -> PshGPtr
-			if( instr && instr->op == asBC_PGA )
-			{
-				instr->op = asBC_PshGPtr;
-				DeleteInstruction(curr);
-				instr = GoForward(instr);
-			}
-			// ChkRefS, RDSPtr -> RDSPtr, CHKREF
-			else if( instr && instr->op == asBC_ChkRefS )
-			{
-				// This exchange removes one pointer dereference, and also
-				// makes it easier to completely remove the CHKREF instruction
-				curr->op = asBC_CHKREF;
-				instr->op = asBC_RDSPtr;
-				instr = GoForward(curr);
-			}
-			// PSF, RDSPtr -> PshVPtr
-			else if( instr && instr->op == asBC_PSF )
-			{
-				instr->op = asBC_PshVPtr;
-				instr = GoForward(DeleteInstruction(curr));
-			}
-			// PSF, ChkRefS, RDSPtr -> PshVPtr, CHKREF
-			else if( instr && instr->op == asBC_ChkRefS &&
-					 instr->prev && instr->prev->op == asBC_PSF )
-			{
-				instr->prev->op = asBC_PshVPtr;
-				instr->op = asBC_CHKREF;
-				instr = GoForward(DeleteInstruction(curr));
-			}
-		}
-		else if( currOp == asBC_PopRPtr )
-		{
-			// PshVPtr 0, ADDSi, PopRPtr -> LoadThisR
-			if( instr && instr->op == asBC_ADDSi &&
-			    instr->prev && instr->prev->op == asBC_PshVPtr &&
-			    instr->prev->wArg[0] == 0 )
-			{
-				DeleteInstruction(instr->prev);
-				ChangeFirstDeleteNext(instr, asBC_LoadThisR);
-				instr = GoForward(instr);
-			}
-			// TODO: runtime optimize: PshVPtr x, PopRPtr -> LoadRObjR x, 0
-			// PshVPtr x, ADDSi, PopRPtr -> LoadRObjR
-			else if( instr && instr->op == asBC_ADDSi &&
-					 instr->prev && instr->prev->op == asBC_PshVPtr &&
-					 instr->prev->wArg[0] != 0 )
-			{
-				instr = instr->prev;
-				instr->op = asBC_LoadRObjR;
-				instr->size = asBCTypeSize[asBCInfo[asBC_LoadRObjR].type];
-				instr->stackInc = asBCInfo[asBC_LoadRObjR].stackInc;
-				instr->wArg[1] = instr->next->wArg[0];
-				*(asDWORD*)&instr->arg = *(asDWORD*)&instr->next->arg;
-				DeleteInstruction(instr->next);
-				DeleteInstruction(curr);
-				instr = GoForward(instr);
-			}
-			// PSF x, ADDSi, PopRPtr -> LoadVObjR
-			else if( instr && instr->op == asBC_ADDSi &&
-				     instr->prev && instr->prev->op == asBC_PSF )
-			{
-				instr = instr->prev;
-				instr->op = asBC_LoadVObjR;
-				instr->size = asBCTypeSize[asBCInfo[asBC_LoadVObjR].type];
-				instr->stackInc = asBCInfo[asBC_LoadVObjR].stackInc;
-				instr->wArg[1] = instr->next->wArg[0];
-				*(asDWORD*)&instr->arg = *(asDWORD*)&instr->next->arg;
-				DeleteInstruction(instr->next);
-				DeleteInstruction(curr);
-				instr = GoForward(instr);
-			}
-		}
-		else if( currOp == asBC_REFCPY )
-		{
-			// PSF x, REFCPY -> RefCpyV x
-			if( instr && instr->op == asBC_PSF )
-			{
-				curr->op = asBC_RefCpyV;
-				curr->wArg[0] = instr->wArg[0];
-				curr->stackInc = asBCInfo[asBC_LoadVObjR].stackInc;
-				DeleteInstruction(instr);
-				instr = GoForward(curr);
-			}
-		}
-		else if( ((currOp >= asBC_JZ && currOp <= asBC_JNP) || currOp == asBC_JLowZ || currOp == asBC_JLowNZ) && instr )
-		{
-			// T**; J** +x -> J** +x
-			if( (instr->op == asBC_TZ && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
-			    (instr->op == asBC_TNZ && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
-				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JNZ));
-			else if( (instr->op == asBC_TNZ && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
-					 (instr->op == asBC_TZ && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
-				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JZ));
-			else if( (instr->op == asBC_TS && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
-					 (instr->op == asBC_TNS && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
-				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JNS));
-			else if( (instr->op == asBC_TNS && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
-					 (instr->op == asBC_TS && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
-				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JS));
-			else if( (instr->op == asBC_TP && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
-					 (instr->op == asBC_TNP && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
-				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JNP));
-			else if( (instr->op == asBC_TNP && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
-					 (instr->op == asBC_TP && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
-				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JP));
-		}
-		else if( currOp == asBC_FREE && instr )
-		{
-			// PSF, FREE -> FREE, PSF
-			if( instr->op == asBC_PSF )
-			{
-				// This pattern usually happens when a function returns an object, or handle
-				// and then releases a temporary variable, possibly used in one of the arguments.
-				// By swapping the order of these instructions, the code can be further optimized
-				// to combine the PSF with the following instructions
-				RemoveInstruction(curr);
-				InsertBefore(instr, curr);
-				instr = GoForward(instr);
-			}
-			// VAR, FREE -> FREE, VAR
-			else if( instr->op == asBC_VAR )
-			{
-				// Swap the two instructions, so that the VAR instruction
-				// gets closer to its corresponding GET instruction and thus
-				// has a greater chance of getting optimized
-				RemoveInstruction(curr);
-				InsertBefore(instr, curr);
-				instr = GoForward(instr);
-			}
-		}
-		else if( currOp == asBC_VAR )
-		{
-			// VAR, PSF, GETOBJREF {PTR_SIZE} -> PshVPtr, PSF
-			if( curr->next && curr->next->op == asBC_PSF &&
-				curr->next->next && curr->next->next->op == asBC_GETOBJREF &&
-				curr->next->next->wArg[0] == AS_PTR_SIZE )
-			{
-				curr->op = asBC_PshVPtr;
-				DeleteInstruction(curr->next->next);
-				instr = GoForward(curr);
-			}
-			// VAR a, GETREF 0 -> PSF a
-			else if( curr->next && curr->next->op == asBC_GETREF && curr->next->wArg[0] == 0 )
-			{
-				ChangeFirstDeleteNext(curr, asBC_PSF);
-				instr = GoForward(curr);
-			}
-			// VAR a, GETOBJREF 0 -> PshVPtr a
-			else if( curr->next && curr->next->op == asBC_GETOBJREF && curr->next->wArg[0] == 0 )
-			{
-				ChangeFirstDeleteNext(curr, asBC_PshVPtr);
-				instr = GoForward(curr);
-			}
-			// VAR, PSF, GETREF {PTR_SIZE} -> PSF, PSF
-			if( curr->next && curr->next->op == asBC_PSF &&
-				curr->next->next && curr->next->next->op == asBC_GETREF &&
-				curr->next->next->wArg[0] == AS_PTR_SIZE )
-			{
-				curr->op = asBC_PSF;
-				DeleteInstruction(curr->next->next);
-				instr = GoForward(curr);
-			}
-		}
-	}
-
-	// Optimize unnecessary refcpy for return handle. This scenario only happens for return statements
-	// and LOADOBJ can only be the last instruction before the RET, so doing this check after the rest of
-	// the optimizations have taken place saves us time.
-	if( last && last->op == asBC_LOADOBJ && IsTemporary(last->wArg[0]) )
-	{
-		// A temporary handle is being loaded into the object register.
-		// Let's look for a trivial RefCpyV to that temporary variable, and a Free of the original
-		// variable. If this is found, then we can simply load the original value into the register
-		// and avoid both the RefCpy and the Free.
-		short tempVar = last->wArg[0];
-		asCArray<short> freedVars;
-
-		instr = last->prev;
-		asASSERT( instr && instr->op == asBC_Block );
-		instr = instr->prev;
-		while( instr && instr->op == asBC_FREE )
-		{
-			freedVars.PushLast(instr->wArg[0]);
-			instr = instr->prev;
-		}
-
-		// If there is any non-trivial cleanups, e.g. call to destructors, then we skip this optimizations
-		// TODO: runtime optimize: Do we need to skip it? Is there really a chance the local variable
-		//                         will be invalidated while the destructor, or any other function for
-		//                         that matter, is being called?
-		if( instr && instr->op == asBC_Block )
-		{
-			// We expect a sequence PshVPtr, RefCpyV, PopPtr just before the clean up block
-			instr = instr->prev;
-			if( instr && instr->op == asBC_PopPtr ) instr = instr->prev;
-			if( instr && instr->op == asBC_RefCpyV && instr->wArg[0] == tempVar ) instr = instr->prev;
-			if( instr && instr->op == asBC_PshVPtr && freedVars.Exists(instr->wArg[0]) )
-			{
-				// Update the LOADOBJ to load the local variable directly
-				tempVar = instr->wArg[0];
-				last->wArg[0] = tempVar;
-
-				// Remove the copy of the local variable into the temp
-				DeleteInstruction(instr->next); // deletes RefCpyV
-				DeleteInstruction(instr->next); // deletes PopPtr
-				DeleteInstruction(instr);       // deletes PshVPtr
-
-				// Find and remove the FREE instruction for the local variable too
-				instr = last->prev->prev;
-				while( instr )
-				{
-					asASSERT( instr->op == asBC_FREE );
-					if( instr->wArg[0] == tempVar )
-					{
-						DeleteInstruction(instr);
-						break;
-					}
-					instr = instr->prev;
-				}
-			}
-		}
-	}
-}
-
-void asCByteCode::Optimize()
-{
-	// This function performs the optimizations that require global knowledge of the entire function
-
-	TimeIt("asCByteCode::Optimize");
-
-	if( !engine->ep.optimizeByteCode )
-		return;
-
-	// TODO: runtime optimize: The optimizer should be able to inline function calls.
-	//                         If the called function has only a few instructions, the function call should be inlined.
-	//                         This is especially useful with the factory stubs used for template types and script classes.
-
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		asCByteInstruction *curr = instr;
-		instr = instr->next;
-
-		const asEBCInstr currOp = curr->op;
-
-		// Delete JitEntry if the JIT instructions are not supposed to be included
-		if( currOp == asBC_JitEntry && !engine->ep.includeJitInstructions )
-		{
-			instr = GoBack(DeleteInstruction(curr));
-			continue;
-		}
-
-		if( instr )
-		{
-			const asEBCInstr instrOp = instr->op;
-
-			// PopPtr, RET b -> RET b
-			if( currOp == asBC_PopPtr && instrOp == asBC_RET )
-			{
-				// We don't combine the PopPtr+RET because RET first restores
-				// the previous stack pointer and then pops the arguments
-
-				// Delete PopPtr
-				instr = GoBack(DeleteInstruction(curr));
-			}
-			else if( currOp == asBC_SUSPEND )
-			{
-				// SUSPEND, JitEntry, SUSPEND -> SUSPEND
-				if( instrOp == asBC_JitEntry && instr->next && instr->next->op == asBC_SUSPEND )
-				{
-					// Delete the two first instructions
-					DeleteInstruction(instr);
-					instr = GoBack(DeleteInstruction(curr));
-				}
-				// SUSPEND, SUSPEND -> SUSPEND
-				else if( instrOp == asBC_SUSPEND )
-				{
-					// Delete the first instruction
-					instr = GoBack(DeleteInstruction(curr));
-				}
-				// SUSPEND, Block, SUSPEND -> Block, SUSPEND
-				else if( instrOp == asBC_Block && instr->next && instr->next->op == asBC_SUSPEND )
-				{
-					// Delete the first instruction
-					instr = GoBack(DeleteInstruction(curr));
-				}
-			}
-			else if( currOp == asBC_LINE )
-			{
-				// LINE, JitEntry, LINE -> LINE
-				if( instrOp == asBC_JitEntry && instr->next && instr->next->op == asBC_LINE )
-				{
-					// Delete the two first instructions
-					DeleteInstruction(instr);
-					instr = GoBack(DeleteInstruction(curr));
-				}
-				// LINE, LINE -> LINE
-				else if( instrOp == asBC_LINE )
-				{
-					// Delete the first instruction
-					instr = GoBack(DeleteInstruction(curr));
-				}
-				// LINE, Block, LINE -> Block, LINE
-				else if( instrOp == asBC_Block && instr->next && instr->next->op == asBC_LINE )
-				{
-					// Delete the first instruction
-					instr = GoBack(DeleteInstruction(curr));
-				}
-			}
-			// JMP +0 -> remove
-			else if( currOp == asBC_JMP && instrOp == asBC_LABEL && *(int*)&curr->arg == instr->wArg[0] )
-				instr = GoBack(DeleteInstruction(curr));
-		}
-	}
-}
-
-bool asCByteCode::IsTempVarReadByInstr(asCByteInstruction *curr, int offset)
-{
-	// Which instructions read from variables?
-	if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG &&
-		(int(curr->wArg[1]) == offset || int(curr->wArg[2]) == offset) )
-		return true;
-	else if( (asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
-			  asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
-			  asBCInfo[curr->op].type == asBCTYPE_rW_QW_ARG ||
-			  asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
-			  asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG ||
-			  curr->op == asBC_FREE) &&  // FREE both read and write to the variable
-			  int(curr->wArg[0]) == offset )
-		return true;
-	else if( (asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
-			  asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG) &&
-			 int(curr->wArg[1]) == offset )
-		return true;
-	else if( asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG &&
-			 (int(curr->wArg[0]) == offset || int(curr->wArg[1]) == offset) )
-		return true;
-	else if( curr->op == asBC_LoadThisR && offset == 0 )
-		return true;
-
-	return false;
-}
-
-bool asCByteCode::IsInstrJmpOrLabel(asCByteInstruction *curr)
-{
-	if( curr->op == asBC_JS      ||
-		curr->op == asBC_JNS     ||
-		curr->op == asBC_JP      ||
-		curr->op == asBC_JNP     ||
-		curr->op == asBC_JMPP    ||
-		curr->op == asBC_JMP     ||
-		curr->op == asBC_JZ      ||
-		curr->op == asBC_JNZ     ||
-		curr->op == asBC_JLowZ   ||
-		curr->op == asBC_JLowNZ  ||
-		curr->op == asBC_LABEL   )
-		return true;
-
-	return false;
-}
-
-bool asCByteCode::IsTempVarOverwrittenByInstr(asCByteInstruction *curr, int offset)
-{
-	// Which instructions overwrite the variable or discard it?
-	if( curr->op == asBC_RET     ||
-		curr->op == asBC_SUSPEND )
-		return true;
-	else if( (asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG ||
-			  asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG    ||
-			  asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG ||
-			  asBCInfo[curr->op].type == asBCTYPE_wW_ARG       ||
-			  asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG     ||
-			  asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG    ||
-			  asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG) &&
-			 int(curr->wArg[0]) == offset )
-		return true;
-
-	return false;
-}
-
-bool asCByteCode::IsTempVarRead(asCByteInstruction *curr, int offset)
-{
-	TimeIt("asCByteCode::IsTempVarRead");
-
-	asCArray<asCByteInstruction *> openPaths;
-	asCArray<asCByteInstruction *> closedPaths;
-
-	// We're not interested in the first instruction, since it is the one that sets the variable
-	openPaths.PushLast(curr->next);
-
-	while( openPaths.GetLength() )
-	{
-		curr = openPaths.PopLast();
-
-		// Add the instruction to the closed paths so that we don't verify it again
-		closedPaths.PushLast(curr);
-
-		while( curr )
-		{
-			if( IsTempVarReadByInstr(curr, offset) )
-				return true;
-
-			if( IsTempVarOverwrittenByInstr(curr, offset) ) break;
-
-			// In case of jumps, we must follow the each of the paths
-			if( curr->op == asBC_JMP )
-			{
-				// Find the destination. If it cannot be found it is because we're doing a localized
-				// optimization and the label hasn't been added to the final bytecode yet
-
-				int label = *((int*)ARG_DW(curr->arg));
-				int r = FindLabel(label, curr, &curr, 0);
-				if( r >= 0 &&
-					!closedPaths.Exists(curr) &&
-					!openPaths.Exists(curr) )
-					openPaths.PushLast(curr);
-
-				break;
-			}
-			else if( curr->op == asBC_JZ    || curr->op == asBC_JNZ    ||
-				     curr->op == asBC_JS    || curr->op == asBC_JNS    ||
-					 curr->op == asBC_JP    || curr->op == asBC_JNP    ||
-					 curr->op == asBC_JLowZ || curr->op == asBC_JLowNZ )
-			{
-				// Find the destination. If it cannot be found it is because we're doing a localized
-				// optimization and the label hasn't been added to the final bytecode yet
-
-				asCByteInstruction *dest = 0;
-				int label = *((int*)ARG_DW(curr->arg));
-				int r = FindLabel(label, curr, &dest, 0);
-				if( r >= 0 &&
-					!closedPaths.Exists(dest) &&
-					!openPaths.Exists(dest) )
-					openPaths.PushLast(dest);
-			}
-			else if( curr->op == asBC_JMPP )
-			{
-				// A JMPP instruction is always followed by a series of JMP instructions
-				// that give the real destination (like a look-up table). We need add all
-				// of these as open paths.
-				curr = curr->next;
-				while( curr->op == asBC_JMP )
-				{
-					// Find the destination. If it cannot be found it is because we're doing a localized
-					// optimization and the label hasn't been added to the final bytecode yet
-
-					asCByteInstruction *dest = 0;
-					int label = *((int*)ARG_DW(curr->arg));
-					int r = FindLabel(label, curr, &dest, 0);
-					if( r >= 0 &&
-						!closedPaths.Exists(dest) &&
-						!openPaths.Exists(dest) )
-						openPaths.PushLast(dest);
-
-					curr = curr->next;
-				}
-
-				// We should now be on a label which is the destination of the
-				// first JMP in the sequence and is already added in the open paths
-				asASSERT(curr->op == asBC_LABEL);
-				break;
-			}
-
-			curr = curr->next;
-		}
-	}
-
-	return false;
-}
-
-bool asCByteCode::IsTempRegUsed(asCByteInstruction *curr)
-{
-	TimeIt("asCByteCode::IsTempRegUsed");
-
-	// We're not interested in the first instruction, since it is the one that sets the register
-	while( curr->next )
-	{
-		curr = curr->next;
-
-		// Which instructions read from the register?
-		if( curr->op == asBC_INCi     ||
-			curr->op == asBC_INCi16   ||
-			curr->op == asBC_INCi8    ||
-			curr->op == asBC_INCf     ||
-			curr->op == asBC_INCd     ||
-			curr->op == asBC_DECi     ||
-			curr->op == asBC_DECi16   ||
-			curr->op == asBC_DECi8    ||
-			curr->op == asBC_DECf     ||
-			curr->op == asBC_DECd     ||
-			curr->op == asBC_WRTV1    ||
-			curr->op == asBC_WRTV2    ||
-			curr->op == asBC_WRTV4    ||
-			curr->op == asBC_WRTV8    ||
-			curr->op == asBC_RDR1     ||
-			curr->op == asBC_RDR2     ||
-			curr->op == asBC_RDR4     ||
-			curr->op == asBC_RDR8     ||
-			curr->op == asBC_PshRPtr  ||
-			curr->op == asBC_CpyRtoV4 ||
-			curr->op == asBC_CpyRtoV8 ||
-			curr->op == asBC_TZ       ||
-			curr->op == asBC_TNZ      ||
-			curr->op == asBC_TS       ||
-			curr->op == asBC_TNS      ||
-			curr->op == asBC_TP       ||
-			curr->op == asBC_TNP      ||
-			curr->op == asBC_JZ       ||
-			curr->op == asBC_JNZ      ||
-			curr->op == asBC_JLowZ    ||
-			curr->op == asBC_JLowNZ   ||
-			curr->op == asBC_JS       ||
-			curr->op == asBC_JNS      ||
-			curr->op == asBC_JP       ||
-			curr->op == asBC_JNP      )
-			return true;
-
-		// Which instructions overwrite the register or discard the value?
-		if( curr->op == asBC_CALL      ||
-			curr->op == asBC_PopRPtr   ||
-			curr->op == asBC_CALLSYS   ||
-			curr->op == asBC_CALLBND   ||
-			curr->op == asBC_SUSPEND   ||
-			curr->op == asBC_ALLOC     ||
-			curr->op == asBC_CpyVtoR4  ||
-			curr->op == asBC_LdGRdR4   ||
-			curr->op == asBC_LDG       ||
-			curr->op == asBC_LDV       ||
-			curr->op == asBC_TZ        ||
-			curr->op == asBC_TNZ       ||
-			curr->op == asBC_TS        ||
-			curr->op == asBC_TNS       ||
-			curr->op == asBC_TP        ||
-			curr->op == asBC_TNP       ||
-			curr->op == asBC_JS        ||
-			curr->op == asBC_JNS       ||
-			curr->op == asBC_JP        ||
-			curr->op == asBC_JNP       ||
-			curr->op == asBC_JMPP      ||
-			curr->op == asBC_JMP       ||
-			curr->op == asBC_JZ        ||
-			curr->op == asBC_JNZ       ||
-			curr->op == asBC_JLowZ     ||
-			curr->op == asBC_JLowNZ    ||
-			curr->op == asBC_CMPi      ||
-			curr->op == asBC_CMPu      ||
-			curr->op == asBC_CMPf      ||
-			curr->op == asBC_CMPd      ||
-			curr->op == asBC_CMPIi     ||
-			curr->op == asBC_CMPIu     ||
-			curr->op == asBC_CMPIf     ||
-			curr->op == asBC_LABEL     ||
-			curr->op == asBC_LoadThisR ||
-			curr->op == asBC_LoadRObjR ||
-			curr->op == asBC_LoadVObjR )
-			return false;
-	}
-
-	return false;
-}
-
-bool asCByteCode::IsSimpleExpression()
-{
-	// A simple expression is one that cannot be suspended at any time, i.e.
-	// it doesn't have any calls to other routines, and doesn't have any suspend instructions
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		if( instr->op == asBC_ALLOC ||
-			instr->op == asBC_CALL ||
-			instr->op == asBC_CALLSYS ||
-			instr->op == asBC_SUSPEND ||
-			instr->op == asBC_LINE ||
-			instr->op == asBC_FREE ||
-			instr->op == asBC_CallPtr ||
-			instr->op == asBC_CALLINTF ||
-			instr->op == asBC_CALLBND )
-			return false;
-
-		instr = instr->next;
-	}
-
-	return true;
-}
-
-void asCByteCode::ExtractLineNumbers()
-{
-	// This function will extract the line number and source file for each statement by looking for LINE instructions.
-	// The LINE instructions will be converted to SUSPEND instructions, or removed depending on the configuration.
-
-	TimeIt("asCByteCode::ExtractLineNumbers");
-
-	int lastLinePos = -1;
-	int pos = 0;
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		asCByteInstruction *curr = instr;
-		instr = instr->next;
-
-		if( curr->op == asBC_LINE )
-		{
-			if( lastLinePos == pos )
-			{
-				lineNumbers.PopLast(); // pop position
-				lineNumbers.PopLast(); // pop line number
-				sectionIdxs.PopLast(); // pop section index
-			}
-
-			lastLinePos = pos;
-			lineNumbers.PushLast(pos);
-			lineNumbers.PushLast(*(int*)ARG_DW(curr->arg));
-			sectionIdxs.PushLast(*((int*)ARG_DW(curr->arg)+1));
-
-			if( !engine->ep.buildWithoutLineCues )
-			{
-				// Transform BC_LINE into BC_SUSPEND
-				curr->op = asBC_SUSPEND;
-				curr->size = asBCTypeSize[asBCInfo[asBC_SUSPEND].type];
-				pos += curr->size;
-			}
-			else
-			{
-				// Delete the instruction
-				DeleteInstruction(curr);
-			}
-		}
-		else
-			pos += curr->size;
-	}
-}
-
-void asCByteCode::ExtractObjectVariableInfo(asCScriptFunction *outFunc)
-{
-	asASSERT( outFunc->scriptData );
-
-	unsigned int pos = 0;
-	asCByteInstruction *instr = first;
-	int blockLevel = 0;
-	while( instr )
-	{
-		if( instr->op == asBC_Block )
-		{
-			asSObjectVariableInfo info;
-			info.programPos     = pos;
-			info.variableOffset = 0;
-			info.option         = instr->wArg[0] ? asBLOCK_BEGIN : asBLOCK_END;
-			if( info.option == asBLOCK_BEGIN )
-			{
-				blockLevel++;
-				outFunc->scriptData->objVariableInfo.PushLast(info);
-			}
-			else
-			{
-				blockLevel--;
-				asASSERT( blockLevel >= 0 );
-				if( outFunc->scriptData->objVariableInfo[outFunc->scriptData->objVariableInfo.GetLength()-1].option == asBLOCK_BEGIN &&
-					outFunc->scriptData->objVariableInfo[outFunc->scriptData->objVariableInfo.GetLength()-1].programPos == pos )
-					outFunc->scriptData->objVariableInfo.PopLast();
-				else
-					outFunc->scriptData->objVariableInfo.PushLast(info);
-			}
-		}
-		else if( instr->op == asBC_ObjInfo )
-		{
-			asSObjectVariableInfo info;
-			info.programPos     = pos;
-			info.variableOffset = (short)instr->wArg[0];
-			info.option         = (asEObjVarInfoOption)*(int*)ARG_DW(instr->arg);
-			outFunc->scriptData->objVariableInfo.PushLast(info);
-		}
-		else if( instr->op == asBC_VarDecl )
-		{
-			outFunc->scriptData->variables[instr->wArg[0]]->declaredAtProgramPos = pos;
-		}
-		else
-			pos += instr->size;
-
-		instr = instr->next;
-	}
-	asASSERT( blockLevel == 0 );
-}
-
-int asCByteCode::GetSize()
-{
-	int size = 0;
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		size += instr->GetSize();
-
-		instr = instr->next;
-	}
-
-	return size;
-}
-
-void asCByteCode::AddCode(asCByteCode *bc)
-{
-	if( bc == this ) return;
-	if( bc->first )
-	{
-		if( first == 0 )
-		{
-			first = bc->first;
-			last = bc->last;
-			bc->first = 0;
-			bc->last = 0;
-		}
-		else
-		{
-			last->next = bc->first;
-			bc->first->prev = last;
-			last = bc->last;
-			bc->first = 0;
-			bc->last = 0;
-		}
-	}
-}
-
-int asCByteCode::AddInstruction()
-{
-	void *ptr = engine->memoryMgr.AllocByteInstruction();
-	if( ptr == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-
-	asCByteInstruction *instr = new(ptr) asCByteInstruction();
-	if( first == 0 )
-	{
-		first = last = instr;
-	}
-	else
-	{
-		last->AddAfter(instr);
-		last = instr;
-	}
-
-	return 0;
-}
-
-int asCByteCode::AddInstructionFirst()
-{
-	void *ptr = engine->memoryMgr.AllocByteInstruction();
-	if( ptr == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-
-	asCByteInstruction *instr = new(ptr) asCByteInstruction();
-	if( first == 0 )
-	{
-		first = last = instr;
-	}
-	else
-	{
-		first->AddBefore(instr);
-		first = instr;
-	}
-
-	return 0;
-}
-
-void asCByteCode::Call(asEBCInstr instr, int funcID, int pop)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	asASSERT(asBCInfo[instr].type == asBCTYPE_DW_ARG);
-
-	last->op = instr;
-	last->size = asBCTypeSize[asBCInfo[instr].type];
-	last->stackInc = -pop; // BC_CALL and BC_CALLBND doesn't pop the argument but when the callee returns the arguments are already popped
-	*((int*)ARG_DW(last->arg)) = funcID;
-
-    // Add a JitEntry instruction after function calls so that JIT's can resume execution
-    InstrPTR(asBC_JitEntry, 0);
-}
-
-void asCByteCode::CallPtr(asEBCInstr instr, int funcPtrVar, int pop)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	asASSERT(asBCInfo[instr].type == asBCTYPE_rW_ARG);
-
-	last->op = instr;
-	last->size = asBCTypeSize[asBCInfo[instr].type];
-	last->stackInc = -pop;
-	last->wArg[0] = (short)funcPtrVar;
-
-    // Add a JitEntry instruction after function calls so that JIT's can resume execution
-    InstrPTR(asBC_JitEntry, 0);
-}
-
-void asCByteCode::Alloc(asEBCInstr instr, void *objID, int funcID, int pop)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	last->op = instr;
-	last->size = asBCTypeSize[asBCInfo[instr].type];
-	last->stackInc = -pop; // BC_ALLOC
-
-	asASSERT(asBCInfo[instr].type == asBCTYPE_PTR_DW_ARG);
-	*ARG_PTR(last->arg) = (asPWORD)objID;
-	*((int*)(ARG_DW(last->arg)+AS_PTR_SIZE)) = funcID;
-
-    // Add a JitEntry instruction after function calls so that JIT's can resume execution
-    InstrPTR(asBC_JitEntry, 0);
-}
-
-void asCByteCode::Ret(int pop)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	asASSERT(asBCInfo[asBC_RET].type == asBCTYPE_W_ARG);
-
-	last->op = asBC_RET;
-	last->size = asBCTypeSize[asBCInfo[asBC_RET].type];
-	last->stackInc = 0; // The instruction pops the argument, but it doesn't affect current function
-	last->wArg[0] = (short)pop;
-}
-
-void asCByteCode::JmpP(int var, asDWORD max)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	asASSERT(asBCInfo[asBC_JMPP].type == asBCTYPE_rW_ARG);
-
-	last->op       = asBC_JMPP;
-	last->size     = asBCTypeSize[asBCInfo[asBC_JMPP].type];
-	last->stackInc = asBCInfo[asBC_JMPP].stackInc;
-	last->wArg[0]  = (short)var;
-
-	// Store the largest jump that is made for PostProcess()
-	*ARG_DW(last->arg) = max;
-}
-
-void asCByteCode::Label(short label)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	last->op       = asBC_LABEL;
-	last->size     = 0;
-	last->stackInc = 0;
-	last->wArg[0]  = label;
-}
-
-void asCByteCode::Line(int line, int column, int scriptIdx)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	last->op       = asBC_LINE;
-	// If the build is without line cues these instructions will be removed
-	// otherwise they will be transformed into SUSPEND instructions.
-	if( engine->ep.buildWithoutLineCues )
-		last->size = 0;
-	else
-		last->size = asBCTypeSize[asBCInfo[asBC_SUSPEND].type];
-	last->stackInc = 0;
-	*((int*)ARG_DW(last->arg)) = (line & 0xFFFFF)|((column & 0xFFF)<<20);
-	*((int*)ARG_DW(last->arg)+1) = scriptIdx;
-
-    // Add a JitEntry after the line instruction to allow the JIT function to resume after a suspend
-    InstrPTR(asBC_JitEntry, 0);
-}
-
-void asCByteCode::ObjInfo(int offset, int info)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	// Add the special instruction that will be used to tell the exception
-	// handler when an object is initialized and deinitialized.
-	last->op                   = asBC_ObjInfo;
-	last->size                 = 0;
-	last->stackInc             = 0;
-	last->wArg[0]              = (short)offset;
-	*((int*)ARG_DW(last->arg)) = info;
-}
-
-void asCByteCode::Block(bool start)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	last->op       = asBC_Block;
-	last->size     = 0;
-	last->stackInc = 0;
-	last->wArg[0]  = start ? 1 : 0;
-}
-
-void asCByteCode::VarDecl(int varDeclIdx)
-{
-	if( AddInstruction() < 0 )
-		return;
-
-	last->op       = asBC_VarDecl;
-	last->size     = 0;
-	last->stackInc = 0;
-	last->wArg[0]  = asWORD(varDeclIdx);
-}
-
-int asCByteCode::FindLabel(int label, asCByteInstruction *from, asCByteInstruction **dest, int *positionDelta)
-{
-	TimeIt("asCByteCode::FindLabel");
-
-	// Search forward
-	int labelPos = -from->GetSize();
-
-	asCByteInstruction *labelInstr = from;
-	while( labelInstr )
-	{
-		labelPos += labelInstr->GetSize();
-		labelInstr = labelInstr->next;
-
-		if( labelInstr && labelInstr->op == asBC_LABEL )
-		{
-			if( labelInstr->wArg[0] == label )
-				break;
-		}
-	}
-
-	if( labelInstr == 0 )
-	{
-		// Search backwards
-		labelPos = -from->GetSize();
-
-		labelInstr = from;
-		while( labelInstr )
-		{
-			labelInstr = labelInstr->prev;
-			if( labelInstr )
-			{
-				labelPos -= labelInstr->GetSize();
-
-				if( labelInstr->op == asBC_LABEL )
-				{
-					if( labelInstr->wArg[0] == label )
-						break;
-				}
-			}
-		}
-	}
-
-	if( labelInstr != 0 )
-	{
-		if( dest ) *dest = labelInstr;
-		if( positionDelta ) *positionDelta = labelPos;
-		return 0;
-	}
-
-	return -1;
-}
-
-int asCByteCode::ResolveJumpAddresses()
-{
-	TimeIt("asCByteCode::ResolveJumpAddresses");
-
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		if( instr->op == asBC_JMP   ||
-			instr->op == asBC_JZ    || instr->op == asBC_JNZ    ||
-			instr->op == asBC_JLowZ || instr->op == asBC_JLowNZ ||
-			instr->op == asBC_JS    || instr->op == asBC_JNS    ||
-			instr->op == asBC_JP    || instr->op == asBC_JNP    )
-		{
-			int label = *((int*) ARG_DW(instr->arg));
-			int labelPosOffset;
-			int r = FindLabel(label, instr, 0, &labelPosOffset);
-			if( r == 0 )
-				*((int*) ARG_DW(instr->arg)) = labelPosOffset;
-			else
-				return -1;
-		}
-
-		instr = instr->next;
-	}
-
-	return 0;
-}
-
-
-asCByteInstruction *asCByteCode::DeleteInstruction(asCByteInstruction *instr)
-{
-	if( instr == 0 ) return 0;
-
-	asCByteInstruction *ret = instr->prev ? instr->prev : instr->next;
-
-	RemoveInstruction(instr);
-
-	engine->memoryMgr.FreeByteInstruction(instr);
-
-	return ret;
-}
-
-void asCByteCode::Output(asDWORD *array)
-{
-	TimeIt("asCByteCode::Output");
-
-	// TODO: Receive a script function pointer instead of the bytecode array
-
-	asDWORD *ap = array;
-
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		if( instr->GetSize() > 0 )
-		{
-			*(asBYTE*)ap = asBYTE(instr->op);
-			*(((asBYTE*)ap)+1) = 0; // Second byte is always zero
-			switch( asBCInfo[instr->op].type )
-			{
-			case asBCTYPE_NO_ARG:
-				*(((asWORD*)ap)+1) = 0; // Clear upper bytes
-				break;
-			case asBCTYPE_wW_rW_rW_ARG:
-				*(((asWORD*)ap)+1) = instr->wArg[0];
-				*(((asWORD*)ap)+2) = instr->wArg[1];
-				*(((asWORD*)ap)+3) = instr->wArg[2];
-				break;
-			case asBCTYPE_wW_DW_ARG:
-			case asBCTYPE_rW_DW_ARG:
-			case asBCTYPE_W_DW_ARG:
-				*(((asWORD*)ap)+1) = instr->wArg[0];
-				*(ap+1) = *(asDWORD*)&instr->arg;
-				break;
-			case asBCTYPE_wW_rW_DW_ARG:
-			case asBCTYPE_rW_W_DW_ARG:
-				*(((asWORD*)ap)+1) = instr->wArg[0];
-				*(((asWORD*)ap)+2) = instr->wArg[1];
-				*(ap+2) = *(asDWORD*)&instr->arg;
-				break;
-			case asBCTYPE_wW_QW_ARG:
-			case asBCTYPE_rW_QW_ARG:
-				*(((asWORD*)ap)+1) = instr->wArg[0];
-				*(asQWORD*)(ap+1) = asQWORD(instr->arg);
-				break;
-			case asBCTYPE_W_ARG:
-			case asBCTYPE_rW_ARG:
-			case asBCTYPE_wW_ARG:
-				*(((asWORD*)ap)+1) = instr->wArg[0];
-				break;
-			case asBCTYPE_wW_rW_ARG:
-			case asBCTYPE_rW_rW_ARG:
-			case asBCTYPE_wW_W_ARG:
-				*(((asWORD *)ap)+1) = instr->wArg[0];
-				*(((asWORD *)ap)+2) = instr->wArg[1];
-				break;
-			case asBCTYPE_QW_DW_ARG:
-			case asBCTYPE_DW_DW_ARG:
-			case asBCTYPE_QW_ARG:
-			case asBCTYPE_DW_ARG:
-				*(((asWORD*)ap)+1) = 0; // Clear upper bytes
-				memcpy(ap+1, &instr->arg, instr->GetSize()*4-4);
-				break;
-			case asBCTYPE_rW_DW_DW_ARG:
-				*(((asWORD*)ap)+1) = instr->wArg[0];
-				memcpy(ap+1, &instr->arg, instr->GetSize()*4-4);
-				break;
-			default:
-				// How did we get here?
-				asASSERT(false);
-				break;
-			}
-		}
-
-		ap += instr->GetSize();
-		instr = instr->next;
-	}
-}
-
-void asCByteCode::PostProcess()
-{
-	TimeIt("asCByteCode::PostProcess");
-
-	if( first == 0 ) return;
-
-	// This function will do the following
-	// - Verify if there is any code that never gets executed and remove it
-	// - Calculate the stack size at the position of each byte code
-	// - Calculate the largest stack needed
-
-	largestStackUsed = 0;
-
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		instr->marked = false;
-		instr->stackSize = -1;
-		instr = instr->next;
-	}
-
-	// Add the first instruction to the list of unchecked code paths
-	asCArray<asCByteInstruction *> paths;
-	AddPath(paths, first, 0);
-
-	// Go through each of the code paths
-	for( asUINT p = 0; p < paths.GetLength(); ++p )
-	{
-		instr = paths[p];
-		int stackSize = instr->stackSize;
-
-		while( instr )
-		{
-			instr->marked = true;
-			instr->stackSize = stackSize;
-			stackSize += instr->stackInc;
-			if( stackSize > largestStackUsed )
-				largestStackUsed = stackSize;
-
-			if( instr->op == asBC_JMP )
-			{
-				// Find the label that we should jump to
-				int label = *((int*) ARG_DW(instr->arg));
-				asCByteInstruction *dest = 0;
-				int r = FindLabel(label, instr, &dest, 0); asASSERT( r == 0 ); UNUSED_VAR(r);
-
-				AddPath(paths, dest, stackSize);
-				break;
-			}
-			else if( instr->op == asBC_JZ    || instr->op == asBC_JNZ ||
-					 instr->op == asBC_JLowZ || instr->op == asBC_JLowNZ ||
-					 instr->op == asBC_JS    || instr->op == asBC_JNS ||
-					 instr->op == asBC_JP    || instr->op == asBC_JNP )
-			{
-				// Find the label that is being jumped to
-				int label = *((int*) ARG_DW(instr->arg));
-				asCByteInstruction *dest = 0;
-				int r = FindLabel(label, instr, &dest, 0); asASSERT( r == 0 ); UNUSED_VAR(r);
-
-				AddPath(paths, dest, stackSize);
-
-				// Add both paths to the code paths
-				AddPath(paths, instr->next, stackSize);
-
-				break;
-			}
-			else if( instr->op == asBC_JMPP )
-			{
-				// I need to know the largest value possible
-				asDWORD max = *ARG_DW(instr->arg);
-
-				// Add all destinations to the code paths
-				asCByteInstruction *dest = instr->next;
-				for( asDWORD n = 0; n <= max && dest != 0; ++n )
-				{
-					AddPath(paths, dest, stackSize);
-					dest = dest->next;
-				}
-
-				break;
-			}
-			else
-			{
-				instr = instr->next;
-				if( instr == 0 || instr->marked )
-					break;
-			}
-		}
-	}
-
-	// Are there any instructions that didn't get visited?
-	instr = first;
-	while( instr )
-	{
-		// Don't remove asBC_Block instructions as then the start and end of blocks may become mismatched
-		if( instr->marked == false && instr->op != asBC_Block )
-		{
-			// Remove it
-			asCByteInstruction *curr = instr;
-			instr = instr->next;
-			DeleteInstruction(curr);
-		}
-		else
-		{
-#ifndef AS_DEBUG
-			// If the stackSize is negative, then there is a problem with the bytecode.
-			// If AS_DEBUG is turned on, this same check is done in DebugOutput.
-			asASSERT( instr->stackSize >= 0 || asBCInfo[instr->op].type == asBCTYPE_INFO );
-#endif
-			instr = instr->next;
-		}
-	}
-}
-
-#ifdef AS_DEBUG
-void asCByteCode::DebugOutput(const char *name, asCScriptFunction *func)
-{
-	_mkdir("AS_DEBUG");
-
-	asCString path = "AS_DEBUG/";
-	path += name;
-
-	// Anonymous functions created from within class methods will contain :: as part of the name
-	// Replace :: with __ to avoid error when creating the file for debug output
-	for (asUINT n = 0; n < path.GetLength(); n++)
-		if (path[n] == ':') path[n] = '_';
-
-#if _MSC_VER >= 1500 && !defined(AS_MARMALADE)
-	FILE *file;
-	fopen_s(&file, path.AddressOf(), "w");
-#else
-	FILE *file = fopen(path.AddressOf(), "w");
-#endif
-
-#if !defined(AS_XENON) // XBox 360: When running in DVD Emu, no write is allowed
-	asASSERT( file );
-#endif
-
-	if( file == 0 )
-		return;
-
-	asUINT n;
-
-	fprintf(file, "%s\n\n", func->GetDeclaration());
-
-	fprintf(file, "Temps: ");
-	for( n = 0; n < temporaryVariables->GetLength(); n++ )
-	{
-		fprintf(file, "%d", (*temporaryVariables)[n]);
-		if( n < temporaryVariables->GetLength()-1 )
-			fprintf(file, ", ");
-	}
-	fprintf(file, "\n\n");
-
-	fprintf(file, "Variables: \n");
-	for( n = 0; n < func->scriptData->variables.GetLength(); n++ )
-	{
-		int idx = func->scriptData->objVariablePos.IndexOf(func->scriptData->variables[n]->stackOffset);
-		bool isOnHeap = asUINT(idx) < func->scriptData->objVariablesOnHeap ? true : false;
-		fprintf(file, " %.3d: %s%s %s\n", func->scriptData->variables[n]->stackOffset, isOnHeap ? "(heap) " : "", func->scriptData->variables[n]->type.Format(func->nameSpace).AddressOf(), func->scriptData->variables[n]->name.AddressOf());
-	}
-	asUINT offset = 0;
-	if( func->objectType )
-	{
-		fprintf(file, " %.3d: %s this\n", 0, func->objectType->name.AddressOf());
-		offset -= AS_PTR_SIZE;
-	}
-	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		bool found = false;
-		for( asUINT v = 0; v < func->scriptData->variables.GetLength(); v++ )
-		{
-			if( func->scriptData->variables[v]->stackOffset == (int)offset )
-			{
-				found = true;
-				break;
-			}
-		}
-		if( !found )
-		{
-			int idx = func->scriptData->objVariablePos.IndexOf(offset);
-			bool isOnHeap = asUINT(idx) < func->scriptData->objVariablesOnHeap ? true : false;
-			fprintf(file, " %.3d: %s%s {noname param}\n", offset, isOnHeap ? "(heap) " : "", func->parameterTypes[n].Format(func->nameSpace).AddressOf());
-		}
-
-		offset -= func->parameterTypes[n].GetSizeOnStackDWords();
-	}
-	for( n = 0; n < func->scriptData->objVariablePos.GetLength(); n++ )
-	{
-		bool found = false;
-		for( asUINT v = 0; v < func->scriptData->variables.GetLength(); v++ )
-		{
-			if( func->scriptData->variables[v]->stackOffset == func->scriptData->objVariablePos[n] )
-			{
-				found = true;
-				break;
-			}
-		}
-		if( !found )
-		{
-			if( func->scriptData->objVariableTypes[n] )
-			{
-				int idx = func->scriptData->objVariablePos.IndexOf(func->scriptData->objVariablePos[n]);
-				bool isOnHeap = asUINT(idx) < func->scriptData->objVariablesOnHeap ? true : false;
-				fprintf(file, " %.3d: %s%s {noname}\n", func->scriptData->objVariablePos[n], isOnHeap ? "(heap) " : "", func->scriptData->objVariableTypes[n]->name.AddressOf());
-			}
-			else
-				fprintf(file, " %.3d: null handle {noname}\n", func->scriptData->objVariablePos[n]);
-		}
-	}
-	fprintf(file, "\n\n");
-
-	bool invalidStackSize = false;
-	int pos = 0;
-	asUINT lineIndex = 0;
-	asCByteInstruction *instr = first;
-	while( instr )
-	{
-		if( lineIndex < lineNumbers.GetLength() && lineNumbers[lineIndex] == pos )
-		{
-			asDWORD line = lineNumbers[lineIndex+1];
-			fprintf(file, "- %d,%d -\n", (int)(line&0xFFFFF), (int)(line>>20));
-			lineIndex += 2;
-		}
-
-		if( instr->GetSize() > 0 )
-		{
-			fprintf(file, "%5d ", pos);
-			pos += instr->GetSize();
-
-			fprintf(file, "%3d %c ", int(instr->stackSize + func->scriptData->variableSpace), instr->marked ? '*' : ' ');
-			if( instr->stackSize < 0 )
-				invalidStackSize = true;
-		}
-		else
-		{
-			fprintf(file, "            ");
-		}
-
-		switch( asBCInfo[instr->op].type )
-		{
-		case asBCTYPE_W_ARG:
-			if( instr->op == asBC_STR )
-			{
-				int id = asWORD(instr->wArg[0]);
-				const asCString &str = engine->GetConstantString(id);
-				fprintf(file, "   %-8s %d         (l:%ld s:\"%.10s\")\n", asBCInfo[instr->op].name, asWORD(instr->wArg[0]), (long int)str.GetLength(), str.AddressOf());
-			}
-			else
-				fprintf(file, "   %-8s %d\n", asBCInfo[instr->op].name, instr->wArg[0]);
-			break;
-
-		case asBCTYPE_wW_ARG:
-		case asBCTYPE_rW_ARG:
-			fprintf(file, "   %-8s v%d\n", asBCInfo[instr->op].name, instr->wArg[0]);
-			break;
-
-		case asBCTYPE_wW_rW_ARG:
-		case asBCTYPE_rW_rW_ARG:
-			fprintf(file, "   %-8s v%d, v%d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1]);
-			break;
-
-		case asBCTYPE_wW_W_ARG:
-			fprintf(file, "   %-8s v%d, %d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1]);
-			break;
-
-		case asBCTYPE_wW_rW_DW_ARG:
-		case asBCTYPE_rW_W_DW_ARG:
-			switch( instr->op )
-			{
-			case asBC_ADDIf:
-			case asBC_SUBIf:
-			case asBC_MULIf:
-				fprintf(file, "   %-8s v%d, v%d, %f\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1], *((float*) ARG_DW(instr->arg)));
-				break;
-			default:
-				fprintf(file, "   %-8s v%d, v%d, %d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1], *((int*) ARG_DW(instr->arg)));
-				break;
-			}
-			break;
-
-		case asBCTYPE_DW_ARG:
-			switch( instr->op )
-			{
-			case asBC_OBJTYPE:
-				{
-					asCObjectType *ot = *(asCObjectType**)ARG_DW(instr->arg);
-					fprintf(file, "   %-8s 0x%x           (type:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), ot->GetName());
-				}
-				break;
-
-			case asBC_FuncPtr:
-				{
-					asCScriptFunction *f = *(asCScriptFunction**)ARG_DW(instr->arg);
-					fprintf(file, "   %-8s 0x%x          (func:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), f->GetDeclaration());
-				}
-				break;
-
-			case asBC_PshC4:
-			case asBC_Cast:
-				fprintf(file, "   %-8s 0x%x          (i:%d, f:%g)\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), *((int*) ARG_DW(instr->arg)), *((float*) ARG_DW(instr->arg)));
-				break;
-
-			case asBC_TYPEID:
-				fprintf(file, "   %-8s 0x%x          '%s'\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), engine->GetTypeDeclaration((int)*ARG_DW(instr->arg)));
-				break;
-
-			case asBC_CALL:
-			case asBC_CALLSYS:
-			case asBC_CALLBND:
-			case asBC_CALLINTF:
-			case asBC_Thiscall1:
-				{
-					int funcID = *(int*)ARG_DW(instr->arg);
-					asCString decl = engine->GetFunctionDeclaration(funcID);
-
-					fprintf(file, "   %-8s %d           (%s)\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)), decl.AddressOf());
-				}
-				break;
-
-			case asBC_REFCPY:
-				fprintf(file, "   %-8s 0x%x\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)));
-				break;
-
-			case asBC_JMP:
-			case asBC_JZ:
-			case asBC_JLowZ:
-			case asBC_JS:
-			case asBC_JP:
-			case asBC_JNZ:
-			case asBC_JLowNZ:
-			case asBC_JNS:
-			case asBC_JNP:
-				fprintf(file, "   %-8s %+d              (d:%d)\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)), pos+*((int*) ARG_DW(instr->arg)));
-				break;
-
-			default:
-				fprintf(file, "   %-8s %d\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)));
-				break;
-			}
-			break;
-
-		case asBCTYPE_QW_ARG:
-			switch( instr->op )
-			{
-			case asBC_OBJTYPE:
-				{
-					asCObjectType *ot = *(asCObjectType**)ARG_QW(instr->arg);
-					fprintf(file, "   %-8s 0x%x          (type:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_QW(instr->arg), ot->GetName());
-				}
-				break;
-
-			case asBC_FuncPtr:
-				{
-					asCScriptFunction *f = *(asCScriptFunction**)ARG_QW(instr->arg);
-					fprintf(file, "   %-8s 0x%x          (func:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_QW(instr->arg), f->GetDeclaration());
-				}
-				break;
-	
-			default:
-#ifdef __GNUC__
-#ifdef _LP64
-			fprintf(file, "   %-8s 0x%lx           (i:%ld, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
-#else
-			fprintf(file, "   %-8s 0x%llx           (i:%lld, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
-#endif
-#else
-			fprintf(file, "   %-8s 0x%I64x          (i:%I64d, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
-#endif
-			}
-			break;
-
-		case asBCTYPE_wW_QW_ARG:
-		case asBCTYPE_rW_QW_ARG:
-			switch( instr->op )
-			{
-			case asBC_RefCpyV:
-			case asBC_FREE:
-				{
-					asCObjectType *ot = *(asCObjectType**)ARG_QW(instr->arg);
-					fprintf(file, "   %-8s v%d, 0x%x          (type:%s)\n", asBCInfo[instr->op].name, instr->wArg[0], (asUINT)*ARG_QW(instr->arg), ot->GetName());
-				}
-				break;
-
-			default:
-#ifdef __GNUC__
-#ifdef _LP64
-				fprintf(file, "   %-8s v%d, 0x%lx           (i:%ld, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
-#else
-				fprintf(file, "   %-8s v%d, 0x%llx           (i:%lld, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
-#endif
-#else
-				fprintf(file, "   %-8s v%d, 0x%I64x          (i:%I64d, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
-#endif
-			}
-			break;
-
-		case asBCTYPE_DW_DW_ARG:
-			if( instr->op == asBC_ALLOC )
-			{
-				asCObjectType *ot = *(asCObjectType**)ARG_DW(instr->arg);
-				asCScriptFunction *f = engine->scriptFunctions[instr->wArg[0]];
-				fprintf(file, "   %-8s 0x%x, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
-			}
-			else
-				fprintf(file, "   %-8s %u, %d\n", asBCInfo[instr->op].name, *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1));
-			break;
-
-		case asBCTYPE_rW_DW_DW_ARG:
-			fprintf(file, "   %-8s v%d, %u, %u\n", asBCInfo[instr->op].name, instr->wArg[0], *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1));
-			break;
-
-		case asBCTYPE_QW_DW_ARG:
-			if( instr->op == asBC_ALLOC )
-			{
-				asCObjectType *ot = *(asCObjectType**)ARG_QW(instr->arg);
-				asCScriptFunction *f = engine->scriptFunctions[instr->wArg[0]];
-#if defined(__GNUC__) && !defined(_MSC_VER)
-#ifdef AS_64BIT_PTR
-				fprintf(file, "   %-8s 0x%lx, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
-#else
-				fprintf(file, "   %-8s 0x%llx, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
-#endif
-#else
-				fprintf(file, "   %-8s 0x%I64x, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
-#endif
-			}
-			else
-#if defined(__GNUC__) && !defined(_MSC_VER)
-#ifdef AS_64BIT_PTR
-				fprintf(file, "   %-8s %lu, %d\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2));
-#else
-				fprintf(file, "   %-8s %llu, %d\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2));
-#endif
-#else
-				fprintf(file, "   %-8s %I64u, %d\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2));
-#endif
-			break;
-
-		case asBCTYPE_INFO:
-			if( instr->op == asBC_LABEL )
-				fprintf(file, "%d:\n", instr->wArg[0]);
-			else if( instr->op == asBC_LINE )
-				fprintf(file, "   %s\n", asBCInfo[instr->op].name);
-			else if( instr->op == asBC_Block )
-				fprintf(file, "%c\n", instr->wArg[0] ? '{' : '}');
-			break;
-
-		case asBCTYPE_rW_DW_ARG:
-		case asBCTYPE_wW_DW_ARG:
-		case asBCTYPE_W_DW_ARG:
-			if( instr->op == asBC_SetV1 )
-				fprintf(file, "   %-8s v%d, 0x%x\n", asBCInfo[instr->op].name, instr->wArg[0], *(asBYTE*)ARG_DW(instr->arg));
-			else if( instr->op == asBC_SetV2 )
-				fprintf(file, "   %-8s v%d, 0x%x\n", asBCInfo[instr->op].name, instr->wArg[0], *(asWORD*)ARG_DW(instr->arg));
-			else if( instr->op == asBC_SetV4 )
-				fprintf(file, "   %-8s v%d, 0x%x          (i:%d, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], (asUINT)*ARG_DW(instr->arg), *((int*) ARG_DW(instr->arg)), *((float*) ARG_DW(instr->arg)));
-			else if( instr->op == asBC_CMPIf )
-				fprintf(file, "   %-8s v%d, %f\n", asBCInfo[instr->op].name, instr->wArg[0], *(float*)ARG_DW(instr->arg));
-			else
-				fprintf(file, "   %-8s v%d, %d\n", asBCInfo[instr->op].name, instr->wArg[0], (asUINT)*ARG_DW(instr->arg));
-			break;
-
-		case asBCTYPE_wW_rW_rW_ARG:
-			fprintf(file, "   %-8s v%d, v%d, v%d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1], instr->wArg[2]);
-			break;
-
-		case asBCTYPE_NO_ARG:
-			fprintf(file, "   %s\n", asBCInfo[instr->op].name);
-			break;
-
-		default:
-			asASSERT(false);
-		}
-
-		instr = instr->next;
-	}
-
-	fclose(file);
-
-	// If the stackSize is negative then there is something wrong with the 
-	// bytecode, i.e. there is a bug in the compiler or in the optimizer. We 
-	// only check this here to have the bytecode available on file for verification
-	asASSERT( !invalidStackSize );
-}
-#endif
-
-//=============================================================================
-
-int asCByteCode::InsertFirstInstrDWORD(asEBCInstr bc, asDWORD param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstructionFirst() < 0 )
-		return 0;
-
-	first->op = bc;
-	*ARG_DW(first->arg) = param;
-	first->size = asBCTypeSize[asBCInfo[bc].type];
-	first->stackInc = asBCInfo[bc].stackInc;
-
-	return first->stackInc;
-}
-
-int asCByteCode::InsertFirstInstrQWORD(asEBCInstr bc, asQWORD param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_QW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstructionFirst() < 0 )
-		return 0;
-
-	first->op = bc;
-	*ARG_QW(first->arg) = param;
-	first->size = asBCTypeSize[asBCInfo[bc].type];
-	first->stackInc = asBCInfo[bc].stackInc;
-
-	return first->stackInc;
-}
-
-int asCByteCode::Instr(asEBCInstr bc)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_NO_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrW_W_W(asEBCInstr bc, int a, int b, int c)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_rW_rW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = (short)a;
-	last->wArg[1]  = (short)b;
-	last->wArg[2]  = (short)c;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrW_W(asEBCInstr bc, int a, int b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_rW_ARG ||
-	         asBCInfo[bc].type == asBCTYPE_rW_rW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = (short)a;
-	last->wArg[1]  = (short)b;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrW_PTR(asEBCInstr bc, short a, void *param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_PTR_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-	*ARG_PTR(last->arg) = (asPWORD)param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrW_DW(asEBCInstr bc, asWORD a, asDWORD b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
-             asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
-			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-	*((int*) ARG_DW(last->arg)) = b;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrSHORT_DW_DW(asEBCInstr bc, short a, asDWORD b, asDWORD c)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_rW_DW_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-	*(int*)ARG_DW(last->arg) = b;
-	*(int*)(ARG_DW(last->arg)+1) = c;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrSHORT_B(asEBCInstr bc, short a, asBYTE b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
-	         asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
-			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-
-	// We'll have to be careful to store the byte correctly, independent of endianess.
-	// Some optimizing compilers may change the order of operations, so we make sure
-	// the value is not overwritten even if that happens.
-	asBYTE *argPtr = (asBYTE*)ARG_DW(last->arg);
-	argPtr[0] = b; // The value is always stored in the lower byte
-	argPtr[1] = 0; // and clear the rest of the DWORD
-	argPtr[2] = 0;
-	argPtr[3] = 0;
-
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrSHORT_W(asEBCInstr bc, short a, asWORD b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
-	         asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
-			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-
-	// We'll have to be careful to store the word correctly, independent of endianess.
-	// Some optimizing compilers may change the order of operations, so we make sure
-	// the value is not overwritten even if that happens.
-	asWORD *argPtr = (asWORD*)ARG_DW(last->arg);
-	argPtr[0] = b; // The value is always stored in the lower word
-	argPtr[1] = 0; // and clear the rest of the DWORD
-
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrSHORT_DW(asEBCInstr bc, short a, asDWORD b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
-	         asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
-			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-	*((int*) ARG_DW(last->arg)) = b;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrW_QW(asEBCInstr bc, asWORD a, asQWORD b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_QW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-	*ARG_QW(last->arg) = b;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrSHORT_QW(asEBCInstr bc, short a, asQWORD b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_QW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-	*ARG_QW(last->arg) = b;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrW_FLOAT(asEBCInstr bc, asWORD a, float b)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc == 0);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = a;
-	*((float*) ARG_DW(last->arg)) = b;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrSHORT(asEBCInstr bc, short param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_rW_ARG ||
-	         asBCInfo[bc].type == asBCTYPE_wW_ARG ||
-	         asBCInfo[bc].type == asBCTYPE_W_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrINT(asEBCInstr bc, int param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op = bc;
-	*((int*) ARG_DW(last->arg)) = param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrDWORD(asEBCInstr bc, asDWORD param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op = bc;
-	*ARG_DW(last->arg) = param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrPTR(asEBCInstr bc, void *param)
-{
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op = bc;
-	asASSERT(asBCInfo[bc].type == asBCTYPE_PTR_ARG);
-	*ARG_PTR(last->arg) = (asPWORD)param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrQWORD(asEBCInstr bc, asQWORD param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_QW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op = bc;
-	*ARG_QW(last->arg) = param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrWORD(asEBCInstr bc, asWORD param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_W_ARG  ||
-	         asBCInfo[bc].type == asBCTYPE_rW_ARG ||
-	         asBCInfo[bc].type == asBCTYPE_wW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op       = bc;
-	last->wArg[0]  = param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrFLOAT(asEBCInstr bc, float param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op = bc;
-	*((float*) ARG_DW(last->arg)) = param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::InstrDOUBLE(asEBCInstr bc, double param)
-{
-	asASSERT(asBCInfo[bc].type == asBCTYPE_QW_ARG);
-	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
-
-	if( AddInstruction() < 0 )
-		return 0;
-
-	last->op = bc;
-	*((double*) ARG_QW(last->arg)) = param;
-	last->size     = asBCTypeSize[asBCInfo[bc].type];
-	last->stackInc = asBCInfo[bc].stackInc;
-
-	return last->stackInc;
-}
-
-int asCByteCode::GetLastInstr()
-{
-	if( last == 0 ) return -1;
-
-	return last->op;
-}
-
-int asCByteCode::RemoveLastInstr()
-{
-	if( last == 0 ) return -1;
-
-	if( first == last )
-	{
-		engine->memoryMgr.FreeByteInstruction(last);
-		first = 0;
-		last = 0;
-	}
-	else
-	{
-		asCByteInstruction *bc = last;
-		last = bc->prev;
-
-		bc->Remove();
-		engine->memoryMgr.FreeByteInstruction(bc);
-	}
-
-	return 0;
-}
-
-asDWORD asCByteCode::GetLastInstrValueDW()
-{
-	if( last == 0 ) return 0;
-
-	return *ARG_DW(last->arg);
-}
-
-//===================================================================
-
-asCByteInstruction::asCByteInstruction()
-{
-	next          = 0;
-	prev          = 0;
-
-	op            = asBC_LABEL;
-
-	arg           = 0;
-	wArg[0]       = 0;
-	wArg[1]       = 0;
-	wArg[2]       = 0;
-	size          = 0;
-	stackInc      = 0;
-	marked        = false;
-	stackSize     = 0;
-}
-
-void asCByteInstruction::AddAfter(asCByteInstruction *nextCode)
-{
-	if( next )
-		next->prev = nextCode;
-
-	nextCode->next = next;
-	nextCode->prev = this;
-	next = nextCode;
-}
-
-void asCByteInstruction::AddBefore(asCByteInstruction *prevCode)
-{
-	if( prev )
-		prev->next = prevCode;
-
-	prevCode->prev = prev;
-	prevCode->next = this;
-	prev = prevCode;
-}
-
-int asCByteInstruction::GetSize()
-{
-	return size;
-}
-
-int asCByteInstruction::GetStackIncrease()
-{
-	return stackInc;
-}
-
-void asCByteInstruction::Remove()
-{
-	if( prev ) prev->next = next;
-	if( next ) next->prev = prev;
-	prev = 0;
-	next = 0;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_bytecode.cpp
+//
+// A class for constructing the final byte code
+//
+
+#include <stdio.h> // fopen(), fprintf(), fclose()
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_bytecode.h"
+#include "as_debug.h" // mkdir()
+#include "as_array.h"
+#include "as_string.h"
+#include "as_scriptengine.h"
+#include "as_debug.h"
+
+BEGIN_AS_NAMESPACE
+
+asCByteCode::asCByteCode(asCScriptEngine *engine)
+{
+	first = 0;
+	last  = 0;
+	largestStackUsed = -1;
+	temporaryVariables = 0;
+
+	this->engine = engine;
+}
+
+asCByteCode::~asCByteCode()
+{
+	ClearAll();
+}
+
+void asCByteCode::Finalize(const asCArray<int> &tempVariableOffsets)
+{
+	temporaryVariables = &tempVariableOffsets;
+
+	// verify the bytecode
+	PostProcess();
+
+	// Optimize the code
+	Optimize();
+
+	// Resolve jumps
+	ResolveJumpAddresses();
+
+	// Build line numbers buffer
+	ExtractLineNumbers();
+}
+
+void asCByteCode::ClearAll()
+{
+	asCByteInstruction *del = first;
+
+	while( del )
+	{
+		first = del->next;
+		engine->memoryMgr.FreeByteInstruction(del);
+		del = first;
+	}
+
+	first = 0;
+	last = 0;
+
+	lineNumbers.SetLength(0);
+
+	largestStackUsed = -1;
+}
+
+void asCByteCode::InsertIfNotExists(asCArray<int> &vars, int var)
+{
+	if( !vars.Exists(var) )
+		vars.PushLast(var);
+}
+
+void asCByteCode::GetVarsUsed(asCArray<int> &vars)
+{
+	TimeIt("asCByteCode::GetVarsUsed");
+
+	asCByteInstruction *curr = first;
+	while( curr )
+	{
+		if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG )
+		{
+			InsertIfNotExists(vars, curr->wArg[0]);
+			InsertIfNotExists(vars, curr->wArg[1]);
+			InsertIfNotExists(vars, curr->wArg[2]);
+		}
+		else if( asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
+			     asBCInfo[curr->op].type == asBCTYPE_wW_ARG    ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG  ||
+			     asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
+			     asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG ||
+			     asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG )
+		{
+			InsertIfNotExists(vars, curr->wArg[0]);
+		}
+		else if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG )
+		{
+			InsertIfNotExists(vars, curr->wArg[0]);
+			InsertIfNotExists(vars, curr->wArg[1]);
+		}
+		else if( curr->op == asBC_LoadThisR )
+		{
+			InsertIfNotExists(vars, 0);
+		}
+
+		curr = curr->next;
+	}
+}
+
+bool asCByteCode::IsVarUsed(int offset)
+{
+	TimeIt("asCByteCode::IsVarUsed");
+
+	asCByteInstruction *curr = first;
+	while( curr )
+	{
+		// Verify all ops that use variables
+		if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG )
+		{
+			if( curr->wArg[0] == offset || curr->wArg[1] == offset || curr->wArg[2] == offset )
+				return true;
+		}
+		else if( asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_ARG    ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG  ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG )
+		{
+			if( curr->wArg[0] == offset )
+				return true;
+		}
+		else if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG )
+		{
+			if( curr->wArg[0] == offset || curr->wArg[1] == offset )
+				return true;
+		}
+		else if( curr->op == asBC_LoadThisR )
+		{
+			if( offset == 0 )
+				return true;
+		}
+
+		curr = curr->next;
+	}
+
+	return false;
+}
+
+void asCByteCode::ExchangeVar(int oldOffset, int newOffset)
+{
+	asASSERT(oldOffset != 0);
+
+	asCByteInstruction *curr = first;
+	while( curr )
+	{
+		// Verify all ops that use variables
+		if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG )
+		{
+			if( curr->wArg[0] == oldOffset )
+				curr->wArg[0] = (short)newOffset;
+			if( curr->wArg[1] == oldOffset )
+				curr->wArg[1] = (short)newOffset;
+			if( curr->wArg[2] == oldOffset )
+				curr->wArg[2] = (short)newOffset;
+		}
+		else if( asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_ARG    ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG  ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG )
+		{
+			if( curr->wArg[0] == oldOffset )
+				curr->wArg[0] = (short)newOffset;
+		}
+		else if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
+				 asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG )
+		{
+			if( curr->wArg[0] == oldOffset )
+				curr->wArg[0] = (short)newOffset;
+			if( curr->wArg[1] == oldOffset )
+				curr->wArg[1] = (short)newOffset;
+		}
+
+		curr = curr->next;
+	}
+}
+
+void asCByteCode::AddPath(asCArray<asCByteInstruction *> &paths, asCByteInstruction *instr, int stackSize)
+{
+	if( instr->marked )
+	{
+		// Verify the size of the stack
+		asASSERT(instr->stackSize == stackSize);
+	}
+	else
+	{
+		// Add the destination to the code paths
+		instr->marked = true;
+		instr->stackSize = stackSize;
+		paths.PushLast(instr);
+	}
+}
+
+asCByteInstruction *asCByteCode::ChangeFirstDeleteNext(asCByteInstruction *curr, asEBCInstr bc)
+{
+	curr->op = bc;
+
+	if( curr->next ) DeleteInstruction(curr->next);
+
+	// Continue optimization with the instruction before the altered one
+	if( curr->prev )
+		return curr->prev;
+	else
+		return curr;
+}
+
+asCByteInstruction *asCByteCode::DeleteFirstChangeNext(asCByteInstruction *curr, asEBCInstr bc)
+{
+	asASSERT( curr->next );
+
+	asCByteInstruction *instr = curr->next;
+	instr->op = bc;
+
+	DeleteInstruction(curr);
+
+	// Continue optimization with the instruction before the altered one
+	if( instr->prev )
+		return instr->prev;
+	else
+		return instr;
+}
+
+void asCByteCode::InsertBefore(asCByteInstruction *before, asCByteInstruction *instr)
+{
+	asASSERT(instr->next == 0);
+	asASSERT(instr->prev == 0);
+
+	if( before->prev ) before->prev->next = instr;
+	instr->prev = before->prev;
+	before->prev = instr;
+	instr->next = before;
+
+	if( first == before ) first = instr;
+}
+
+void asCByteCode::RemoveInstruction(asCByteInstruction *instr)
+{
+	if( instr == first ) first = first->next;
+	if( instr == last ) last = last->prev;
+
+	if( instr->prev ) instr->prev->next = instr->next;
+	if( instr->next ) instr->next->prev = instr->prev;
+
+	instr->next = 0;
+	instr->prev = 0;
+}
+
+bool asCByteCode::CanBeSwapped(asCByteInstruction *curr)
+{
+	asASSERT( curr->op == asBC_SwapPtr );
+
+	if( !curr->prev || !curr->prev->prev ) return false;
+
+	asCByteInstruction *b = curr->prev;
+	asCByteInstruction *a = b->prev;
+
+	if( a->op != asBC_PshNull &&
+		a->op != asBC_PshVPtr &&
+		a->op != asBC_PSF )
+		return false;
+
+	if( b->op != asBC_PshNull &&
+		b->op != asBC_PshVPtr &&
+		b->op != asBC_PSF )
+		return false;
+
+	return true;
+}
+
+asCByteInstruction *asCByteCode::GoBack(asCByteInstruction *curr)
+{
+	// Go back 2 instructions
+	if( !curr ) return 0;
+	if( curr->prev ) curr = curr->prev;
+	if( curr->prev ) curr = curr->prev;
+	return curr;
+}
+
+asCByteInstruction *asCByteCode::GoForward(asCByteInstruction *curr)
+{
+	// Go forward 2 instructions
+	if( !curr ) return 0;
+	if( curr->next ) curr = curr->next;
+	if( curr->next ) curr = curr->next;
+	return curr;
+}
+
+bool asCByteCode::PostponeInitOfTemp(asCByteInstruction *curr, asCByteInstruction **next)
+{
+	TimeIt("asCByteCode::PostponeInitOfTemp");
+
+	// This is not done for pointers
+	if( (curr->op != asBC_SetV4 && curr->op != asBC_SetV8) ||
+		!IsTemporary(curr->wArg[0]) ) return false;
+
+	// Move the initialization to just before it's use.
+	// Don't move it beyond any labels or jumps.
+	asCByteInstruction *use = curr->next;
+	while( use )
+	{
+		if( IsTempVarReadByInstr(use, curr->wArg[0]) )
+			break;
+
+		if( IsTempVarOverwrittenByInstr(use, curr->wArg[0]) )
+			return false;
+
+		if( IsInstrJmpOrLabel(use) )
+			return false;
+
+		use = use->next;
+	}
+
+	if( use && use->prev != curr )
+	{
+		asCByteInstruction *orig = curr->next;
+
+		// Move the instruction
+		RemoveInstruction(curr);
+		InsertBefore(use, curr);
+
+		// Try a RemoveUnusedValue to see if it can be combined with the other
+		if( RemoveUnusedValue(curr, 0) )
+		{
+			// Optimizations should continue from the instruction that uses the value
+			*next = orig;
+			return true;
+		}
+
+		// Return the instructions to its original position as it wasn't useful
+		RemoveInstruction(curr);
+		InsertBefore(orig, curr);
+	}
+
+	return false;
+}
+
+bool asCByteCode::RemoveUnusedValue(asCByteInstruction *curr, asCByteInstruction **next)
+{
+	TimeIt("asCByteCode::RemoveUnusedValue");
+
+	asCByteInstruction *dummy;
+	if( next == 0 )
+		next = &dummy;
+
+	// TODO: runtime optimize: Should work for 64bit types as well
+
+	// TODO: runtime optimize: Need a asBCTYPE_rwW_ARG to cover the instructions that read
+	//                         and write to the same variable. Currently they are considered
+	//                         as readers only, so they are not optimized away. This includes
+	//                         NOT, BNOT, IncV, DecV, NEG, iTOf (and all other type casts)
+
+	// The value isn't used for anything
+	if( curr->op != asBC_FREE && // Can't remove the FREE instruction
+		(asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG ||
+		 asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG    ||
+		 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG ||
+		 asBCInfo[curr->op].type == asBCTYPE_wW_ARG       ||
+		 asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG    ||
+		 asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG) &&
+		IsTemporary(curr->wArg[0]) &&
+		!IsTempVarRead(curr, curr->wArg[0]) )
+	{
+		if( curr->op == asBC_LdGRdR4 && IsTempRegUsed(curr) )
+		{
+			curr->op = asBC_LDG;
+			*next = GoForward(curr);
+			return true;
+		}
+
+		*next = GoForward(DeleteInstruction(curr));
+		return true;
+	}
+
+	if( curr->op == asBC_SetV4 && curr->next )
+	{
+		// The value is immediately used and then never again
+		if( (curr->next->op == asBC_CMPi ||
+		     curr->next->op == asBC_CMPf ||
+		     curr->next->op == asBC_CMPu) &&
+		    curr->wArg[0] == curr->next->wArg[1] &&
+		    IsTemporary(curr->wArg[0]) &&                       // The variable is temporary and never used again
+		    !IsTempVarRead(curr->next, curr->wArg[0]) )
+		{
+			if(      curr->next->op == asBC_CMPi ) curr->next->op = asBC_CMPIi;
+			else if( curr->next->op == asBC_CMPf ) curr->next->op = asBC_CMPIf;
+			else if( curr->next->op == asBC_CMPu ) curr->next->op = asBC_CMPIu;
+			curr->next->size = asBCTypeSize[asBCInfo[asBC_CMPIi].type];
+			curr->next->arg = curr->arg;
+			*next = GoForward(DeleteInstruction(curr));
+			return true;
+		}
+
+		// The value is immediately used and then never again
+		if(	(curr->next->op == asBC_ADDi ||
+			 curr->next->op == asBC_SUBi ||
+			 curr->next->op == asBC_MULi ||
+			 curr->next->op == asBC_ADDf ||
+			 curr->next->op == asBC_SUBf ||
+			 curr->next->op == asBC_MULf) &&
+			curr->wArg[0] == curr->next->wArg[2] &&
+			(curr->next->wArg[0] == curr->wArg[0] ||        // The variable is overwritten
+			 (IsTemporary(curr->wArg[0]) &&                 // The variable is temporary and never used again
+			  !IsTempVarRead(curr->next, curr->wArg[0]))) )
+		{
+			if(      curr->next->op == asBC_ADDi ) curr->next->op = asBC_ADDIi;
+			else if( curr->next->op == asBC_SUBi ) curr->next->op = asBC_SUBIi;
+			else if( curr->next->op == asBC_MULi ) curr->next->op = asBC_MULIi;
+			else if( curr->next->op == asBC_ADDf ) curr->next->op = asBC_ADDIf;
+			else if( curr->next->op == asBC_SUBf ) curr->next->op = asBC_SUBIf;
+			else if( curr->next->op == asBC_MULf ) curr->next->op = asBC_MULIf;
+			curr->next->size = asBCTypeSize[asBCInfo[asBC_ADDIi].type];
+			curr->next->arg = curr->arg;
+			*next = GoForward(DeleteInstruction(curr));
+			return true;
+		}
+
+		if(	(curr->next->op == asBC_ADDi ||
+			 curr->next->op == asBC_MULi ||
+			 curr->next->op == asBC_ADDf ||
+			 curr->next->op == asBC_MULf) &&
+			curr->wArg[0] == curr->next->wArg[1] &&
+			(curr->next->wArg[0] == curr->wArg[0] ||        // The variable is overwritten
+			 (IsTemporary(curr->wArg[0]) &&                 // The variable is temporary and never used again
+			  !IsTempVarRead(curr->next, curr->wArg[0]))) )
+		{
+			if(      curr->next->op == asBC_ADDi ) curr->next->op = asBC_ADDIi;
+			else if( curr->next->op == asBC_MULi ) curr->next->op = asBC_MULIi;
+			else if( curr->next->op == asBC_ADDf ) curr->next->op = asBC_ADDIf;
+			else if( curr->next->op == asBC_MULf ) curr->next->op = asBC_MULIf;
+			curr->next->size = asBCTypeSize[asBCInfo[asBC_ADDIi].type];
+			curr->next->arg = curr->arg;
+
+			// The order of the operands are changed
+			curr->next->wArg[1] = curr->next->wArg[2];
+
+			*next = GoForward(DeleteInstruction(curr));
+			return true;
+		}
+
+		// The constant value is immediately moved to another variable and then not used again
+		if( curr->next->op == asBC_CpyVtoV4 &&
+			curr->wArg[0] == curr->next->wArg[1] &&
+			IsTemporary(curr->wArg[0]) &&
+			!IsTempVarRead(curr->next, curr->wArg[0]) )
+		{
+			curr->wArg[0] = curr->next->wArg[0];
+			*next = GoForward(DeleteInstruction(curr->next));
+			return true;
+		}
+
+		// The constant is copied to a temp and then immediately pushed on the stack
+		if( curr->next->op == asBC_PshV4 &&
+			curr->wArg[0] == curr->next->wArg[0] &&
+			IsTemporary(curr->wArg[0]) &&
+			!IsTempVarRead(curr->next, curr->wArg[0]) )
+		{
+			curr->op = asBC_PshC4;
+			curr->stackInc = asBCInfo[asBC_PshC4].stackInc;
+			*next = GoForward(DeleteInstruction(curr->next));
+			return true;
+		}
+
+		// The constant is copied to a global variable and then never used again
+		if( curr->next->op == asBC_CpyVtoG4 &&
+			curr->wArg[0] == curr->next->wArg[0] &&
+			IsTemporary(curr->wArg[0]) &&
+			!IsTempVarRead(curr->next, curr->wArg[0]) )
+		{
+			curr->op = asBC_SetG4;
+			curr->size = asBCTypeSize[asBCInfo[asBC_SetG4].type];
+			*(((asDWORD*)&curr->arg)+AS_PTR_SIZE) = *ARG_DW(curr->arg);
+			*ARG_PTR(curr->arg) = *ARG_PTR(curr->next->arg);
+			*next = GoForward(DeleteInstruction(curr->next));
+			return true;
+		}
+	}
+
+	// The value is immediately moved to another variable and then not used again
+	if( (asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG ||
+		 asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG) &&
+		curr->next && curr->next->op == asBC_CpyVtoV4 &&
+		curr->wArg[0] == curr->next->wArg[1] &&
+		IsTemporary(curr->wArg[0]) &&
+		!IsTempVarRead(curr->next, curr->wArg[0]) )
+	{
+		curr->wArg[0] = curr->next->wArg[0];
+		*next = GoForward(DeleteInstruction(curr->next));
+		return true;
+	}
+
+	// The register is copied to a temp variable and then back to the register again without being used afterwards
+	if( curr->op == asBC_CpyRtoV4 && curr->next && curr->next->op == asBC_CpyVtoR4 &&
+		curr->wArg[0] == curr->next->wArg[0] &&
+		IsTemporary(curr->wArg[0]) &&
+		!IsTempVarRead(curr->next, curr->wArg[0]) )
+	{
+		// Delete both instructions
+		DeleteInstruction(curr->next);
+		*next = GoForward(DeleteInstruction(curr));
+		return true;
+	}
+
+	// The global value is copied to a temp and then immediately pushed on the stack
+	if( curr->op == asBC_CpyGtoV4 && curr->next && curr->next->op == asBC_PshV4 &&
+		curr->wArg[0] == curr->next->wArg[0] &&
+		IsTemporary(curr->wArg[0]) &&
+		!IsTempVarRead(curr->next, curr->wArg[0]) )
+	{
+		curr->op = asBC_PshG4;
+		curr->size = asBCTypeSize[asBCInfo[asBC_PshG4].type];
+		curr->stackInc = asBCInfo[asBC_PshG4].stackInc;
+		*next = GoForward(DeleteInstruction(curr->next));
+		return true;
+	}
+
+	// The constant is assigned to a variable, then the value of the variable
+	// pushed on the stack, and then the variable is never used again
+	if( curr->op == asBC_SetV8 && curr->next && curr->next->op == asBC_PshV8 &&
+		curr->wArg[0] == curr->next->wArg[0] &&
+		IsTemporary(curr->wArg[0]) &&
+		!IsTempVarRead(curr->next, curr->wArg[0]) )
+	{
+		curr->op = asBC_PshC8;
+		curr->stackInc = asBCInfo[asBC_PshC8].stackInc;
+		*next = GoForward(DeleteInstruction(curr->next));
+		return true;
+	}
+
+	return false;
+}
+
+bool asCByteCode::IsTemporary(int offset)
+{
+	TimeIt("asCByteCode::IsTemporary");
+
+	asASSERT(temporaryVariables);
+
+	return temporaryVariables->Exists(offset);
+}
+
+void asCByteCode::OptimizeLocally(const asCArray<int> &tempVariableOffsets)
+{
+	// This function performs the optimizations that doesn't require global knowledge of the
+	// entire function, e.g. replacement of sequences of bytecodes for specialized instructions.
+
+	if( !engine->ep.optimizeByteCode )
+		return;
+
+	temporaryVariables = &tempVariableOffsets;
+
+	// TODO: runtime optimize: VAR + GET... should be optimized if the only instructions between them are trivial, i.e. no
+	//                         function calls that can suspend the execution.
+
+	// TODO: runtime optimize: Remove temporary copies of handles, when the temp is just copied to yet another location
+
+	// TODO: runtime optimize: A single bytecode for incrementing a variable, comparing, and jumping can probably improve
+	//                         loops a lot. How often do these loops really occur?
+
+	// TODO: runtime optimize: Need a bytecode BC_AddRef so that BC_CALLSYS doesn't have to be used for this trivial call
+
+	// TODO: optimize: Should possibly do two loops. Some of the checks are best doing by iterating from
+	//                 the end to beginning, e.g. the removal of unused values. Other checks are best
+	//                 doing by iterating from the beginning to end, e.g. replacement of sequences with
+	//                 shorter ones. By doing this, we should be able to avoid backtracking with every
+	//                 change thus avoid unnecessary duplicate checks.
+
+	// Iterate through the bytecode instructions in the reverse order.
+	// An optimization in an instruction may mean that another instruction before that
+	// can also be optimized, e.g. if an add instruction is removed because the result is not
+	// used, then the instructions that created the operands may potentially also be removed.
+	asCByteInstruction *instr = last;
+	while( instr )
+	{
+		asCByteInstruction *curr = instr;
+		instr = instr->prev;
+
+		// Remove instructions when the result is not used anywhere
+		// This will return true if the instruction is deleted, and
+		// false if it is not deleted. Observe that the instruction
+		// can be modified.
+		if( RemoveUnusedValue(curr, &instr) ) continue;
+
+		// Postpone initializations so that they may be combined in the second pass.
+		// If the initialization is postponed, then the optimizations should continue
+		// from where the value was used, so instr will be updated to point to that.
+		if( PostponeInitOfTemp(curr, &instr) ) continue;
+
+		// Look for sequences that can be replaced with shorter ones
+		const asEBCInstr currOp = curr->op;
+		if( currOp == asBC_SwapPtr )
+		{
+			// XXX x, YYY y, SwapPtr -> YYY y, XXX x
+			if( CanBeSwapped(curr) )
+			{
+				// Delete the SwapPtr
+				DeleteInstruction(curr);
+
+				// Swap instructions
+				asCByteInstruction *a = instr->prev;
+				RemoveInstruction(instr);
+				InsertBefore(a, instr);
+
+				// Continue the optimization from the second instruction
+				instr = GoForward(a);
+				continue;
+			}
+		}
+		else if( currOp == asBC_ClrHi )
+		{
+			// T??, ClrHi -> T??
+			if( instr &&
+				(instr->op == asBC_TZ  ||
+			     instr->op == asBC_TNZ ||
+			     instr->op == asBC_TS  ||
+			     instr->op == asBC_TNS ||
+			     instr->op == asBC_TP  ||
+		 	     instr->op == asBC_TNP) )
+			{
+				// Remove the ClrHi instruction since the test
+				// instructions always clear the top bytes anyway
+				instr = GoForward(DeleteInstruction(curr));
+				continue;
+			}
+
+			// ClrHi, JZ -> JLowZ
+			if( curr->next &&
+				curr->next->op == asBC_JZ )
+			{
+				curr->next->op = asBC_JLowZ;
+				instr = GoForward(DeleteInstruction(curr));
+				continue;
+			}
+
+			// ClrHi, JNZ -> JLowNZ
+			if( curr->next &&
+				curr->next->op == asBC_JNZ )
+			{
+				curr->next->op = asBC_JLowNZ;
+				instr = GoForward(DeleteInstruction(curr));
+				continue;
+			}
+		}
+		else if( currOp == asBC_LDV && curr->next )
+		{
+			// LDV x, INCi -> IncVi x
+			if( curr->next->op == asBC_INCi && !IsTempRegUsed(curr->next) )
+			{
+				curr->op = asBC_IncVi;
+				DeleteInstruction(curr->next);
+				instr = GoForward(curr);
+			}
+			// LDV x, DECi -> DecVi x
+			else if( curr->next->op == asBC_DECi && !IsTempRegUsed(curr->next) )
+			{
+				curr->op = asBC_DecVi;
+				DeleteInstruction(curr->next);
+				instr = GoForward(curr);
+			}
+		}
+		else if( currOp == asBC_LDG && curr->next )
+		{
+			// LDG x, WRTV4 y -> CpyVtoG4 y, x
+			if( curr->next->op == asBC_WRTV4 && !IsTempRegUsed(curr->next) )
+			{
+				curr->op = asBC_CpyVtoG4;
+				curr->size = asBCTypeSize[asBCInfo[asBC_CpyVtoG4].type];
+				curr->wArg[0] = curr->next->wArg[0];
+				DeleteInstruction(curr->next);
+				instr = GoForward(curr);
+			}
+			// LDG x, RDR4 y -> CpyGtoV4 y, x
+			else if( curr->next->op == asBC_RDR4 )
+			{
+				if( !IsTempRegUsed(curr->next) )
+					curr->op = asBC_CpyGtoV4;
+				else
+					curr->op = asBC_LdGRdR4;
+				curr->size = asBCTypeSize[asBCInfo[asBC_CpyGtoV4].type];
+				curr->wArg[0] = curr->next->wArg[0];
+				DeleteInstruction(curr->next);
+				instr = GoForward(curr);
+			}
+		}
+		else if( currOp == asBC_CHKREF )
+		{
+			// CHKREF, ADDSi -> ADDSi
+			// CHKREF, RDSPtr -> RDSPtr
+			if( curr->next &&
+				(curr->next->op == asBC_ADDSi || curr->next->op == asBC_RDSPtr) )
+			{
+				// As ADDSi & RDSPtr already checks the pointer the CHKREF instruction is unnecessary
+				instr = GoForward(DeleteInstruction(curr));
+			}
+			// ADDSi, CHKREF -> ADDSi
+			// PGA, CHKREF -> PGA
+			// PSF, CHKREF -> PSF
+			else if( instr &&
+				     (instr->op == asBC_ADDSi ||
+					  instr->op == asBC_PGA ||
+					  instr->op == asBC_PSF) )
+			{
+				// ADDSi is guaranteed to work on valid pointers so CHKREF is not necessary.
+				// PGA and PSF always pushes a valid address on the stack.
+				instr = GoForward(DeleteInstruction(curr));
+			}
+			// PGA, ChkRefS, CHKREF -> PGA, ChkRefS
+			else if( instr && instr->op == asBC_ChkRefS &&
+				     instr->prev && instr->prev->op == asBC_PGA )
+			{
+				// Delete CHKREF since PGA always pushes a valid address on the stack
+				instr = GoForward(DeleteInstruction(curr));
+			}
+		}
+		else if( currOp == asBC_PopPtr )
+		{
+			// RDSPtr, PopPtr -> PopPtr
+			if( instr && instr->op == asBC_RDSPtr )
+			{
+				instr = GoForward(DeleteInstruction(instr));
+			}
+			// PshNull, RefCpyV, PopPtr -> FREE
+			else if( instr && instr->op == asBC_RefCpyV &&
+					 instr->prev && instr->prev->op == asBC_PshNull )
+			{
+				DeleteInstruction(curr);
+				DeleteInstruction(instr->prev);
+				instr->op = asBC_FREE;
+				instr = GoForward(instr);
+			}
+			// PshVPtr y, PopPtr -> nothing
+			// PSF y    , PopPtr -> nothing
+			// VAR y    , PopPtr -> nothing
+			// PshNull  , PopPtr -> nothing
+			// PshRPtr  , PopPtr -> nothing
+			else if( instr &&
+				     (instr->op == asBC_PshRPtr ||
+					  instr->op == asBC_PSF     ||
+					  instr->op == asBC_VAR     ||
+					  instr->op == asBC_PshVPtr ||
+					  instr->op == asBC_PshNull) )
+			{
+				// A pointer is pushed on the stack then immediately removed
+				// Remove both instructions as they cancel each other
+				DeleteInstruction(curr);
+				instr = GoForward(DeleteInstruction(instr));
+			}
+			// PSF, ChkRefS, PopPtr -> ChkNullV
+			else if( instr && instr->op == asBC_ChkRefS &&
+				     instr->prev && instr->prev->op == asBC_PSF )
+			{
+				instr = instr->prev;
+				instr->op = asBC_ChkNullV;
+				instr->stackInc = 0;
+				// Delete the PopPtr instruction
+				DeleteInstruction(curr);
+				// Delete the ChkRefS instruction
+				DeleteInstruction(instr->next);
+				instr = GoForward(instr);
+			}
+			// PshVPtr, CHKREF, PopPtr -> ChkNullV
+			else if( instr && instr->op == asBC_CHKREF &&
+					 instr->prev && instr->prev->op == asBC_PshVPtr )
+			{
+				instr = instr->prev;
+				instr->op = asBC_ChkNullV;
+				instr->stackInc = 0;
+				DeleteInstruction(curr->prev);
+				DeleteInstruction(curr);
+				instr = GoForward(instr);
+			}
+			// STOREOBJ y, PSF y, RDSPtr, PSF x, REFCPY, FREE y, PopPtr -> FREE x, STOREOBJ x
+			else if( instr && instr->op == asBC_FREE )
+			{
+				asCByteInstruction *i = instr->prev;
+				if( !i || i->op != asBC_REFCPY ) continue;
+				i = i->prev;
+				if( !i || i->op != asBC_PSF ) continue;
+				short x = i->wArg[0];
+				i = i->prev;
+				if( !i || i->op != asBC_RDSPtr ) continue;
+				i = i->prev;
+				if( !i || i->op != asBC_PSF ) continue;
+				short y = i->wArg[0];
+				i = i->prev;
+				if( !i || i->op != asBC_STOREOBJ || i->wArg[0] != y ) continue;
+
+				// Don't do the substitution if the var y is not a temporary, or if it is used after PopPtr
+				if( !IsTemporary(y) || IsTempVarRead(curr, y) ) continue;
+
+				// Transform the PopPtr into STOREOBJ
+				curr->op = asBC_STOREOBJ;
+				curr->stackInc = 0;
+				curr->wArg[0] = x;
+				curr->size = i->size;
+
+				// Change arg of the FREE to x
+				// TODO: runtime optimize: The FREE instruction shouldn't be necessary. STOREOBJ should free the previous value by itself
+				instr->wArg[0] = x;
+
+				// Delete all other instructions
+				DeleteInstruction(instr->prev); // REFCPY
+				DeleteInstruction(instr->prev); // PSF
+				DeleteInstruction(instr->prev); // RDSTR
+				DeleteInstruction(instr->prev); // PSF
+				DeleteInstruction(instr->prev); // STOREOBJ
+
+				instr = GoForward(curr);
+			}
+		}
+		else if( currOp == asBC_RDSPtr )
+		{
+			// PGA, RDSPtr -> PshGPtr
+			if( instr && instr->op == asBC_PGA )
+			{
+				instr->op = asBC_PshGPtr;
+				DeleteInstruction(curr);
+				instr = GoForward(instr);
+			}
+			// ChkRefS, RDSPtr -> RDSPtr, CHKREF
+			else if( instr && instr->op == asBC_ChkRefS )
+			{
+				// This exchange removes one pointer dereference, and also
+				// makes it easier to completely remove the CHKREF instruction
+				curr->op = asBC_CHKREF;
+				instr->op = asBC_RDSPtr;
+				instr = GoForward(curr);
+			}
+			// PSF, RDSPtr -> PshVPtr
+			else if( instr && instr->op == asBC_PSF )
+			{
+				instr->op = asBC_PshVPtr;
+				instr = GoForward(DeleteInstruction(curr));
+			}
+			// PSF, ChkRefS, RDSPtr -> PshVPtr, CHKREF
+			else if( instr && instr->op == asBC_ChkRefS &&
+					 instr->prev && instr->prev->op == asBC_PSF )
+			{
+				instr->prev->op = asBC_PshVPtr;
+				instr->op = asBC_CHKREF;
+				instr = GoForward(DeleteInstruction(curr));
+			}
+		}
+		else if( currOp == asBC_PopRPtr )
+		{
+			// PshVPtr 0, ADDSi, PopRPtr -> LoadThisR
+			if( instr && instr->op == asBC_ADDSi &&
+			    instr->prev && instr->prev->op == asBC_PshVPtr &&
+			    instr->prev->wArg[0] == 0 )
+			{
+				DeleteInstruction(instr->prev);
+				ChangeFirstDeleteNext(instr, asBC_LoadThisR);
+				instr = GoForward(instr);
+			}
+			// TODO: runtime optimize: PshVPtr x, PopRPtr -> LoadRObjR x, 0
+			// PshVPtr x, ADDSi, PopRPtr -> LoadRObjR
+			else if( instr && instr->op == asBC_ADDSi &&
+					 instr->prev && instr->prev->op == asBC_PshVPtr &&
+					 instr->prev->wArg[0] != 0 )
+			{
+				instr = instr->prev;
+				instr->op = asBC_LoadRObjR;
+				instr->size = asBCTypeSize[asBCInfo[asBC_LoadRObjR].type];
+				instr->stackInc = asBCInfo[asBC_LoadRObjR].stackInc;
+				instr->wArg[1] = instr->next->wArg[0];
+				*(asDWORD*)&instr->arg = *(asDWORD*)&instr->next->arg;
+				DeleteInstruction(instr->next);
+				DeleteInstruction(curr);
+				instr = GoForward(instr);
+			}
+			// PSF x, ADDSi, PopRPtr -> LoadVObjR
+			else if( instr && instr->op == asBC_ADDSi &&
+				     instr->prev && instr->prev->op == asBC_PSF )
+			{
+				instr = instr->prev;
+				instr->op = asBC_LoadVObjR;
+				instr->size = asBCTypeSize[asBCInfo[asBC_LoadVObjR].type];
+				instr->stackInc = asBCInfo[asBC_LoadVObjR].stackInc;
+				instr->wArg[1] = instr->next->wArg[0];
+				*(asDWORD*)&instr->arg = *(asDWORD*)&instr->next->arg;
+				DeleteInstruction(instr->next);
+				DeleteInstruction(curr);
+				instr = GoForward(instr);
+			}
+		}
+		else if( currOp == asBC_REFCPY )
+		{
+			// PSF x, REFCPY -> RefCpyV x
+			if( instr && instr->op == asBC_PSF )
+			{
+				curr->op = asBC_RefCpyV;
+				curr->wArg[0] = instr->wArg[0];
+				curr->stackInc = asBCInfo[asBC_LoadVObjR].stackInc;
+				DeleteInstruction(instr);
+				instr = GoForward(curr);
+			}
+		}
+		else if( ((currOp >= asBC_JZ && currOp <= asBC_JNP) || currOp == asBC_JLowZ || currOp == asBC_JLowNZ) && instr )
+		{
+			// T**; J** +x -> J** +x
+			if( (instr->op == asBC_TZ && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
+			    (instr->op == asBC_TNZ && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
+				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JNZ));
+			else if( (instr->op == asBC_TNZ && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
+					 (instr->op == asBC_TZ && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
+				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JZ));
+			else if( (instr->op == asBC_TS && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
+					 (instr->op == asBC_TNS && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
+				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JNS));
+			else if( (instr->op == asBC_TNS && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
+					 (instr->op == asBC_TS && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
+				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JS));
+			else if( (instr->op == asBC_TP && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
+					 (instr->op == asBC_TNP && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
+				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JNP));
+			else if( (instr->op == asBC_TNP && (currOp == asBC_JZ || currOp == asBC_JLowZ)) ||
+					 (instr->op == asBC_TP && (currOp == asBC_JNZ || currOp == asBC_JLowNZ)) )
+				instr = GoForward(DeleteFirstChangeNext(instr, asBC_JP));
+		}
+		else if( currOp == asBC_FREE && instr )
+		{
+			// PSF, FREE -> FREE, PSF
+			if( instr->op == asBC_PSF )
+			{
+				// This pattern usually happens when a function returns an object, or handle
+				// and then releases a temporary variable, possibly used in one of the arguments.
+				// By swapping the order of these instructions, the code can be further optimized
+				// to combine the PSF with the following instructions
+				RemoveInstruction(curr);
+				InsertBefore(instr, curr);
+				instr = GoForward(instr);
+			}
+			// VAR, FREE -> FREE, VAR
+			else if( instr->op == asBC_VAR )
+			{
+				// Swap the two instructions, so that the VAR instruction
+				// gets closer to its corresponding GET instruction and thus
+				// has a greater chance of getting optimized
+				RemoveInstruction(curr);
+				InsertBefore(instr, curr);
+				instr = GoForward(instr);
+			}
+		}
+		else if( currOp == asBC_VAR )
+		{
+			// VAR, PSF, GETOBJREF {PTR_SIZE} -> PshVPtr, PSF
+			if( curr->next && curr->next->op == asBC_PSF &&
+				curr->next->next && curr->next->next->op == asBC_GETOBJREF &&
+				curr->next->next->wArg[0] == AS_PTR_SIZE )
+			{
+				curr->op = asBC_PshVPtr;
+				DeleteInstruction(curr->next->next);
+				instr = GoForward(curr);
+			}
+			// VAR a, GETREF 0 -> PSF a
+			else if( curr->next && curr->next->op == asBC_GETREF && curr->next->wArg[0] == 0 )
+			{
+				ChangeFirstDeleteNext(curr, asBC_PSF);
+				instr = GoForward(curr);
+			}
+			// VAR a, GETOBJREF 0 -> PshVPtr a
+			else if( curr->next && curr->next->op == asBC_GETOBJREF && curr->next->wArg[0] == 0 )
+			{
+				ChangeFirstDeleteNext(curr, asBC_PshVPtr);
+				instr = GoForward(curr);
+			}
+			// VAR, PSF, GETREF {PTR_SIZE} -> PSF, PSF
+			if( curr->next && curr->next->op == asBC_PSF &&
+				curr->next->next && curr->next->next->op == asBC_GETREF &&
+				curr->next->next->wArg[0] == AS_PTR_SIZE )
+			{
+				curr->op = asBC_PSF;
+				DeleteInstruction(curr->next->next);
+				instr = GoForward(curr);
+			}
+		}
+	}
+
+	// Optimize unnecessary refcpy for return handle. This scenario only happens for return statements
+	// and LOADOBJ can only be the last instruction before the RET, so doing this check after the rest of
+	// the optimizations have taken place saves us time.
+	if( last && last->op == asBC_LOADOBJ && IsTemporary(last->wArg[0]) )
+	{
+		// A temporary handle is being loaded into the object register.
+		// Let's look for a trivial RefCpyV to that temporary variable, and a Free of the original
+		// variable. If this is found, then we can simply load the original value into the register
+		// and avoid both the RefCpy and the Free.
+		short tempVar = last->wArg[0];
+		asCArray<short> freedVars;
+
+		instr = last->prev;
+		asASSERT( instr && instr->op == asBC_Block );
+		instr = instr->prev;
+		while( instr && instr->op == asBC_FREE )
+		{
+			freedVars.PushLast(instr->wArg[0]);
+			instr = instr->prev;
+		}
+
+		// If there is any non-trivial cleanups, e.g. call to destructors, then we skip this optimizations
+		// TODO: runtime optimize: Do we need to skip it? Is there really a chance the local variable
+		//                         will be invalidated while the destructor, or any other function for
+		//                         that matter, is being called?
+		if( instr && instr->op == asBC_Block )
+		{
+			// We expect a sequence PshVPtr, RefCpyV, PopPtr just before the clean up block
+			instr = instr->prev;
+			if( instr && instr->op == asBC_PopPtr ) instr = instr->prev;
+			if( instr && instr->op == asBC_RefCpyV && instr->wArg[0] == tempVar ) instr = instr->prev;
+			if( instr && instr->op == asBC_PshVPtr && freedVars.Exists(instr->wArg[0]) )
+			{
+				// Update the LOADOBJ to load the local variable directly
+				tempVar = instr->wArg[0];
+				last->wArg[0] = tempVar;
+
+				// Remove the copy of the local variable into the temp
+				DeleteInstruction(instr->next); // deletes RefCpyV
+				DeleteInstruction(instr->next); // deletes PopPtr
+				DeleteInstruction(instr);       // deletes PshVPtr
+
+				// Find and remove the FREE instruction for the local variable too
+				instr = last->prev->prev;
+				while( instr )
+				{
+					asASSERT( instr->op == asBC_FREE );
+					if( instr->wArg[0] == tempVar )
+					{
+						DeleteInstruction(instr);
+						break;
+					}
+					instr = instr->prev;
+				}
+			}
+		}
+	}
+}
+
+void asCByteCode::Optimize()
+{
+	// This function performs the optimizations that require global knowledge of the entire function
+
+	TimeIt("asCByteCode::Optimize");
+
+	if( !engine->ep.optimizeByteCode )
+		return;
+
+	// TODO: runtime optimize: The optimizer should be able to inline function calls.
+	//                         If the called function has only a few instructions, the function call should be inlined.
+	//                         This is especially useful with the factory stubs used for template types and script classes.
+
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		asCByteInstruction *curr = instr;
+		instr = instr->next;
+
+		const asEBCInstr currOp = curr->op;
+
+		// Delete JitEntry if the JIT instructions are not supposed to be included
+		if( currOp == asBC_JitEntry && !engine->ep.includeJitInstructions )
+		{
+			instr = GoBack(DeleteInstruction(curr));
+			continue;
+		}
+
+		if( instr )
+		{
+			const asEBCInstr instrOp = instr->op;
+
+			// PopPtr, RET b -> RET b
+			if( currOp == asBC_PopPtr && instrOp == asBC_RET )
+			{
+				// We don't combine the PopPtr+RET because RET first restores
+				// the previous stack pointer and then pops the arguments
+
+				// Delete PopPtr
+				instr = GoBack(DeleteInstruction(curr));
+			}
+			else if( currOp == asBC_SUSPEND )
+			{
+				// SUSPEND, JitEntry, SUSPEND -> SUSPEND
+				if( instrOp == asBC_JitEntry && instr->next && instr->next->op == asBC_SUSPEND )
+				{
+					// Delete the two first instructions
+					DeleteInstruction(instr);
+					instr = GoBack(DeleteInstruction(curr));
+				}
+				// SUSPEND, SUSPEND -> SUSPEND
+				else if( instrOp == asBC_SUSPEND )
+				{
+					// Delete the first instruction
+					instr = GoBack(DeleteInstruction(curr));
+				}
+				// SUSPEND, Block, SUSPEND -> Block, SUSPEND
+				else if( instrOp == asBC_Block && instr->next && instr->next->op == asBC_SUSPEND )
+				{
+					// Delete the first instruction
+					instr = GoBack(DeleteInstruction(curr));
+				}
+			}
+			else if( currOp == asBC_LINE )
+			{
+				// LINE, JitEntry, LINE -> LINE
+				if( instrOp == asBC_JitEntry && instr->next && instr->next->op == asBC_LINE )
+				{
+					// Delete the two first instructions
+					DeleteInstruction(instr);
+					instr = GoBack(DeleteInstruction(curr));
+				}
+				// LINE, VarDecl, LINE -> VarDecl, LINE
+				else if (instrOp == asBC_VarDecl && instr->next && instr->next->op == asBC_LINE )
+				{
+					// Delete the first instruction
+					instr = GoBack(DeleteInstruction(curr));
+				}
+				// LINE, LINE -> LINE
+				else if( instrOp == asBC_LINE )
+				{
+					// Delete the first instruction
+					instr = GoBack(DeleteInstruction(curr));
+				}
+				// LINE, Block, LINE -> Block, LINE
+				else if( instrOp == asBC_Block && instr->next && instr->next->op == asBC_LINE )
+				{
+					// Delete the first instruction
+					instr = GoBack(DeleteInstruction(curr));
+				}
+			}
+			// JMP +0 -> remove
+			else if( currOp == asBC_JMP && instrOp == asBC_LABEL && *(int*)&curr->arg == instr->wArg[0] )
+				instr = GoBack(DeleteInstruction(curr));
+		}
+	}
+}
+
+bool asCByteCode::IsTempVarReadByInstr(asCByteInstruction *curr, int offset)
+{
+	// Which instructions read from variables?
+	if( asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG &&
+		(int(curr->wArg[1]) == offset || int(curr->wArg[2]) == offset) )
+		return true;
+	else if( (asBCInfo[curr->op].type == asBCTYPE_rW_ARG    ||
+			  asBCInfo[curr->op].type == asBCTYPE_rW_DW_ARG ||
+			  asBCInfo[curr->op].type == asBCTYPE_rW_QW_ARG ||
+			  asBCInfo[curr->op].type == asBCTYPE_rW_W_DW_ARG ||
+			  asBCInfo[curr->op].type == asBCTYPE_rW_DW_DW_ARG ||
+			  curr->op == asBC_FREE) &&  // FREE both read and write to the variable
+			  int(curr->wArg[0]) == offset )
+		return true;
+	else if( (asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG ||
+			  asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG) &&
+			 int(curr->wArg[1]) == offset )
+		return true;
+	else if( asBCInfo[curr->op].type == asBCTYPE_rW_rW_ARG &&
+			 (int(curr->wArg[0]) == offset || int(curr->wArg[1]) == offset) )
+		return true;
+	else if( curr->op == asBC_LoadThisR && offset == 0 )
+		return true;
+
+	return false;
+}
+
+bool asCByteCode::IsInstrJmpOrLabel(asCByteInstruction *curr)
+{
+	if( curr->op == asBC_JS      ||
+		curr->op == asBC_JNS     ||
+		curr->op == asBC_JP      ||
+		curr->op == asBC_JNP     ||
+		curr->op == asBC_JMPP    ||
+		curr->op == asBC_JMP     ||
+		curr->op == asBC_JZ      ||
+		curr->op == asBC_JNZ     ||
+		curr->op == asBC_JLowZ   ||
+		curr->op == asBC_JLowNZ  ||
+		curr->op == asBC_LABEL   )
+		return true;
+
+	return false;
+}
+
+bool asCByteCode::IsTempVarOverwrittenByInstr(asCByteInstruction *curr, int offset)
+{
+	// Which instructions overwrite the variable or discard it?
+	if( curr->op == asBC_RET     ||
+		curr->op == asBC_SUSPEND )
+		return true;
+	else if( (asBCInfo[curr->op].type == asBCTYPE_wW_rW_rW_ARG ||
+			  asBCInfo[curr->op].type == asBCTYPE_wW_rW_ARG    ||
+			  asBCInfo[curr->op].type == asBCTYPE_wW_rW_DW_ARG ||
+			  asBCInfo[curr->op].type == asBCTYPE_wW_ARG       ||
+			  asBCInfo[curr->op].type == asBCTYPE_wW_W_ARG     ||
+			  asBCInfo[curr->op].type == asBCTYPE_wW_DW_ARG    ||
+			  asBCInfo[curr->op].type == asBCTYPE_wW_QW_ARG) &&
+			 int(curr->wArg[0]) == offset )
+		return true;
+
+	return false;
+}
+
+bool asCByteCode::IsTempVarRead(asCByteInstruction *curr, int offset)
+{
+	TimeIt("asCByteCode::IsTempVarRead");
+
+	asCArray<asCByteInstruction *> openPaths;
+	asCArray<asCByteInstruction *> closedPaths;
+
+	// We're not interested in the first instruction, since it is the one that sets the variable
+	openPaths.PushLast(curr->next);
+
+	while( openPaths.GetLength() )
+	{
+		curr = openPaths.PopLast();
+
+		// Add the instruction to the closed paths so that we don't verify it again
+		closedPaths.PushLast(curr);
+
+		while( curr )
+		{
+			if( IsTempVarReadByInstr(curr, offset) )
+				return true;
+
+			if( IsTempVarOverwrittenByInstr(curr, offset) ) break;
+
+			// In case of jumps, we must follow the each of the paths
+			if( curr->op == asBC_JMP )
+			{
+				// Find the destination. If it cannot be found it is because we're doing a localized
+				// optimization and the label hasn't been added to the final bytecode yet
+
+				int label = *((int*)ARG_DW(curr->arg));
+				int r = FindLabel(label, curr, &curr, 0);
+				if( r >= 0 &&
+					!closedPaths.Exists(curr) &&
+					!openPaths.Exists(curr) )
+					openPaths.PushLast(curr);
+
+				break;
+			}
+			else if( curr->op == asBC_JZ    || curr->op == asBC_JNZ    ||
+				     curr->op == asBC_JS    || curr->op == asBC_JNS    ||
+					 curr->op == asBC_JP    || curr->op == asBC_JNP    ||
+					 curr->op == asBC_JLowZ || curr->op == asBC_JLowNZ )
+			{
+				// Find the destination. If it cannot be found it is because we're doing a localized
+				// optimization and the label hasn't been added to the final bytecode yet
+
+				asCByteInstruction *dest = 0;
+				int label = *((int*)ARG_DW(curr->arg));
+				int r = FindLabel(label, curr, &dest, 0);
+				if( r >= 0 &&
+					!closedPaths.Exists(dest) &&
+					!openPaths.Exists(dest) )
+					openPaths.PushLast(dest);
+			}
+			else if( curr->op == asBC_JMPP )
+			{
+				// A JMPP instruction is always followed by a series of JMP instructions
+				// that give the real destination (like a look-up table). We need add all
+				// of these as open paths.
+				curr = curr->next;
+				while( curr->op == asBC_JMP )
+				{
+					// Find the destination. If it cannot be found it is because we're doing a localized
+					// optimization and the label hasn't been added to the final bytecode yet
+
+					asCByteInstruction *dest = 0;
+					int label = *((int*)ARG_DW(curr->arg));
+					int r = FindLabel(label, curr, &dest, 0);
+					if( r >= 0 &&
+						!closedPaths.Exists(dest) &&
+						!openPaths.Exists(dest) )
+						openPaths.PushLast(dest);
+
+					curr = curr->next;
+				}
+
+				// We should now be on a label which is the destination of the
+				// first JMP in the sequence and is already added in the open paths
+				asASSERT(curr->op == asBC_LABEL);
+				break;
+			}
+
+			curr = curr->next;
+		}
+	}
+
+	return false;
+}
+
+bool asCByteCode::IsTempRegUsed(asCByteInstruction *curr)
+{
+	TimeIt("asCByteCode::IsTempRegUsed");
+
+	// We're not interested in the first instruction, since it is the one that sets the register
+	while( curr->next )
+	{
+		curr = curr->next;
+
+		// Which instructions read from the register?
+		if( curr->op == asBC_INCi     ||
+			curr->op == asBC_INCi16   ||
+			curr->op == asBC_INCi8    ||
+			curr->op == asBC_INCf     ||
+			curr->op == asBC_INCd     ||
+			curr->op == asBC_DECi     ||
+			curr->op == asBC_DECi16   ||
+			curr->op == asBC_DECi8    ||
+			curr->op == asBC_DECf     ||
+			curr->op == asBC_DECd     ||
+			curr->op == asBC_WRTV1    ||
+			curr->op == asBC_WRTV2    ||
+			curr->op == asBC_WRTV4    ||
+			curr->op == asBC_WRTV8    ||
+			curr->op == asBC_RDR1     ||
+			curr->op == asBC_RDR2     ||
+			curr->op == asBC_RDR4     ||
+			curr->op == asBC_RDR8     ||
+			curr->op == asBC_PshRPtr  ||
+			curr->op == asBC_CpyRtoV4 ||
+			curr->op == asBC_CpyRtoV8 ||
+			curr->op == asBC_TZ       ||
+			curr->op == asBC_TNZ      ||
+			curr->op == asBC_TS       ||
+			curr->op == asBC_TNS      ||
+			curr->op == asBC_TP       ||
+			curr->op == asBC_TNP      ||
+			curr->op == asBC_JZ       ||
+			curr->op == asBC_JNZ      ||
+			curr->op == asBC_JLowZ    ||
+			curr->op == asBC_JLowNZ   ||
+			curr->op == asBC_JS       ||
+			curr->op == asBC_JNS      ||
+			curr->op == asBC_JP       ||
+			curr->op == asBC_JNP      )
+			return true;
+
+		// Which instructions overwrite the register or discard the value?
+		if( curr->op == asBC_CALL      ||
+			curr->op == asBC_PopRPtr   ||
+			curr->op == asBC_CALLSYS   ||
+			curr->op == asBC_CALLBND   ||
+			curr->op == asBC_Thiscall1 ||
+			curr->op == asBC_SUSPEND   ||
+			curr->op == asBC_ALLOC     ||
+			curr->op == asBC_CpyVtoR4  ||
+			curr->op == asBC_LdGRdR4   ||
+			curr->op == asBC_LDG       ||
+			curr->op == asBC_LDV       ||
+			curr->op == asBC_TZ        ||
+			curr->op == asBC_TNZ       ||
+			curr->op == asBC_TS        ||
+			curr->op == asBC_TNS       ||
+			curr->op == asBC_TP        ||
+			curr->op == asBC_TNP       ||
+			curr->op == asBC_JS        ||
+			curr->op == asBC_JNS       ||
+			curr->op == asBC_JP        ||
+			curr->op == asBC_JNP       ||
+			curr->op == asBC_JMPP      ||
+			curr->op == asBC_JMP       ||
+			curr->op == asBC_JZ        ||
+			curr->op == asBC_JNZ       ||
+			curr->op == asBC_JLowZ     ||
+			curr->op == asBC_JLowNZ    ||
+			curr->op == asBC_CMPi      ||
+			curr->op == asBC_CMPu      ||
+			curr->op == asBC_CMPf      ||
+			curr->op == asBC_CMPd      ||
+			curr->op == asBC_CMPIi     ||
+			curr->op == asBC_CMPIu     ||
+			curr->op == asBC_CMPIf     ||
+			curr->op == asBC_LABEL     ||
+			curr->op == asBC_LoadThisR ||
+			curr->op == asBC_LoadRObjR ||
+			curr->op == asBC_LoadVObjR )
+			return false;
+	}
+
+	return false;
+}
+
+bool asCByteCode::IsSimpleExpression()
+{
+	// A simple expression is one that cannot be suspended at any time, i.e.
+	// it doesn't have any calls to other routines, and doesn't have any suspend instructions
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		if( instr->op == asBC_ALLOC ||
+			instr->op == asBC_CALL ||
+			instr->op == asBC_CALLSYS ||
+			instr->op == asBC_SUSPEND ||
+			instr->op == asBC_LINE ||
+			instr->op == asBC_FREE ||
+			instr->op == asBC_CallPtr ||
+			instr->op == asBC_CALLINTF ||
+			instr->op == asBC_CALLBND || 
+			instr->op == asBC_Thiscall1 )
+			return false;
+
+		instr = instr->next;
+	}
+
+	return true;
+}
+
+void asCByteCode::ExtractLineNumbers()
+{
+	// This function will extract the line number and source file for each statement by looking for LINE instructions.
+	// The LINE instructions will be converted to SUSPEND instructions, or removed depending on the configuration.
+
+	TimeIt("asCByteCode::ExtractLineNumbers");
+
+	int lastLinePos = -1;
+	int pos = 0;
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		asCByteInstruction *curr = instr;
+		instr = instr->next;
+
+		if( curr->op == asBC_LINE )
+		{
+			if( lastLinePos == pos )
+			{
+				lineNumbers.PopLast(); // pop position
+				lineNumbers.PopLast(); // pop line number
+				sectionIdxs.PopLast(); // pop section index
+			}
+
+			lastLinePos = pos;
+			lineNumbers.PushLast(pos);
+			lineNumbers.PushLast(*(int*)ARG_DW(curr->arg));
+			sectionIdxs.PushLast(*((int*)ARG_DW(curr->arg)+1));
+
+			if( !engine->ep.buildWithoutLineCues )
+			{
+				// Transform BC_LINE into BC_SUSPEND
+				curr->op = asBC_SUSPEND;
+				curr->size = asBCTypeSize[asBCInfo[asBC_SUSPEND].type];
+				pos += curr->size;
+			}
+			else
+			{
+				// Delete the instruction
+				DeleteInstruction(curr);
+			}
+		}
+		else
+			pos += curr->size;
+	}
+}
+
+void asCByteCode::ExtractObjectVariableInfo(asCScriptFunction *outFunc)
+{
+	asASSERT( outFunc->scriptData );
+
+	unsigned int pos = 0;
+	asCByteInstruction *instr = first;
+	int blockLevel = 0;
+	while( instr )
+	{
+		if( instr->op == asBC_Block )
+		{
+			asSObjectVariableInfo info;
+			info.programPos     = pos;
+			info.variableOffset = 0;
+			info.option         = instr->wArg[0] ? asBLOCK_BEGIN : asBLOCK_END;
+			if( info.option == asBLOCK_BEGIN )
+			{
+				blockLevel++;
+				outFunc->scriptData->objVariableInfo.PushLast(info);
+			}
+			else
+			{
+				blockLevel--;
+				asASSERT( blockLevel >= 0 );
+				if( outFunc->scriptData->objVariableInfo[outFunc->scriptData->objVariableInfo.GetLength()-1].option == asBLOCK_BEGIN &&
+					outFunc->scriptData->objVariableInfo[outFunc->scriptData->objVariableInfo.GetLength()-1].programPos == pos )
+					outFunc->scriptData->objVariableInfo.PopLast();
+				else
+					outFunc->scriptData->objVariableInfo.PushLast(info);
+			}
+		}
+		else if( instr->op == asBC_ObjInfo )
+		{
+			asSObjectVariableInfo info;
+			info.programPos     = pos;
+			info.variableOffset = (short)instr->wArg[0];
+			info.option         = (asEObjVarInfoOption)*(int*)ARG_DW(instr->arg);
+			outFunc->scriptData->objVariableInfo.PushLast(info);
+		}
+		else if( instr->op == asBC_VarDecl )
+		{
+			// Record the position for debug info
+			outFunc->scriptData->variables[instr->wArg[0]]->declaredAtProgramPos = pos;
+			
+			// Record declaration of object variables for try/catch handling
+			// This is used for identifying if handles and objects on the heap should be cleared upon catching an exception
+			// Only extract this info if there is a try/catch block in the function, so we don't use up unnecessary space
+			if( outFunc->scriptData->tryCatchInfo.GetLength() && outFunc->scriptData->variables[instr->wArg[0]]->type.GetTypeInfo() )
+			{
+				asSObjectVariableInfo info;
+				info.programPos     = pos;
+				info.variableOffset = outFunc->scriptData->variables[instr->wArg[0]]->stackOffset;
+				info.option         = asOBJ_VARDECL;
+				outFunc->scriptData->objVariableInfo.PushLast(info);
+			}
+		}
+		else
+			pos += instr->size;
+
+		instr = instr->next;
+	}
+	asASSERT( blockLevel == 0 );
+}
+
+void asCByteCode::ExtractTryCatchInfo(asCScriptFunction *outFunc)
+{
+	asASSERT(outFunc->scriptData);
+
+	unsigned int pos = 0;
+	asCByteInstruction *instr = first;
+	while (instr)
+	{
+		if (instr->op == asBC_TryBlock)
+		{
+			asSTryCatchInfo info;
+			info.tryPos    = pos;
+			info.catchPos  = *ARG_DW(instr->arg);
+			outFunc->scriptData->tryCatchInfo.PushLast(info);
+		}
+
+		pos += instr->size;
+		instr = instr->next;
+	}
+}
+
+int asCByteCode::GetSize()
+{
+	int size = 0;
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		size += instr->GetSize();
+
+		instr = instr->next;
+	}
+
+	return size;
+}
+
+void asCByteCode::AddCode(asCByteCode *bc)
+{
+	if( bc == this ) return;
+	if( bc->first )
+	{
+		if( first == 0 )
+		{
+			first = bc->first;
+			last = bc->last;
+			bc->first = 0;
+			bc->last = 0;
+		}
+		else
+		{
+			last->next = bc->first;
+			bc->first->prev = last;
+			last = bc->last;
+			bc->first = 0;
+			bc->last = 0;
+		}
+	}
+}
+
+int asCByteCode::AddInstruction()
+{
+	void *ptr = engine->memoryMgr.AllocByteInstruction();
+	if( ptr == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+
+	asCByteInstruction *instr = new(ptr) asCByteInstruction();
+	if( first == 0 )
+	{
+		first = last = instr;
+	}
+	else
+	{
+		last->AddAfter(instr);
+		last = instr;
+	}
+
+	return 0;
+}
+
+int asCByteCode::AddInstructionFirst()
+{
+	void *ptr = engine->memoryMgr.AllocByteInstruction();
+	if( ptr == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+
+	asCByteInstruction *instr = new(ptr) asCByteInstruction();
+	if( first == 0 )
+	{
+		first = last = instr;
+	}
+	else
+	{
+		first->AddBefore(instr);
+		first = instr;
+	}
+
+	return 0;
+}
+
+void asCByteCode::Call(asEBCInstr instr, int funcID, int pop)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	asASSERT(asBCInfo[instr].type == asBCTYPE_DW_ARG);
+
+	last->op = instr;
+	last->size = asBCTypeSize[asBCInfo[instr].type];
+	last->stackInc = -pop; // BC_CALL and BC_CALLBND doesn't pop the argument but when the callee returns the arguments are already popped
+	*((int*)ARG_DW(last->arg)) = funcID;
+
+    // Add a JitEntry instruction after function calls so that JIT's can resume execution
+    InstrPTR(asBC_JitEntry, 0);
+}
+
+void asCByteCode::CallPtr(asEBCInstr instr, int funcPtrVar, int pop)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	asASSERT(asBCInfo[instr].type == asBCTYPE_rW_ARG);
+
+	last->op = instr;
+	last->size = asBCTypeSize[asBCInfo[instr].type];
+	last->stackInc = -pop;
+	last->wArg[0] = (short)funcPtrVar;
+
+    // Add a JitEntry instruction after function calls so that JIT's can resume execution
+    InstrPTR(asBC_JitEntry, 0);
+}
+
+void asCByteCode::Alloc(asEBCInstr instr, void *objID, int funcID, int pop)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	last->op = instr;
+	last->size = asBCTypeSize[asBCInfo[instr].type];
+	last->stackInc = -pop; // BC_ALLOC
+
+	asASSERT(asBCInfo[instr].type == asBCTYPE_PTR_DW_ARG);
+	*ARG_PTR(last->arg) = (asPWORD)objID;
+	*((int*)(ARG_DW(last->arg)+AS_PTR_SIZE)) = funcID;
+
+    // Add a JitEntry instruction after function calls so that JIT's can resume execution
+    InstrPTR(asBC_JitEntry, 0);
+}
+
+void asCByteCode::Ret(int pop)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	asASSERT(asBCInfo[asBC_RET].type == asBCTYPE_W_ARG);
+
+	last->op = asBC_RET;
+	last->size = asBCTypeSize[asBCInfo[asBC_RET].type];
+	last->stackInc = 0; // The instruction pops the argument, but it doesn't affect current function
+	last->wArg[0] = (short)pop;
+}
+
+void asCByteCode::JmpP(int var, asDWORD max)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	asASSERT(asBCInfo[asBC_JMPP].type == asBCTYPE_rW_ARG);
+
+	last->op       = asBC_JMPP;
+	last->size     = asBCTypeSize[asBCInfo[asBC_JMPP].type];
+	last->stackInc = asBCInfo[asBC_JMPP].stackInc;
+	last->wArg[0]  = (short)var;
+
+	// Store the largest jump that is made for PostProcess()
+	*ARG_DW(last->arg) = max;
+}
+
+void asCByteCode::Label(short label)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	last->op       = asBC_LABEL;
+	last->size     = 0;
+	last->stackInc = 0;
+	last->wArg[0]  = label;
+}
+
+void asCByteCode::Line(int line, int column, int scriptIdx)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	last->op       = asBC_LINE;
+	// If the build is without line cues these instructions will be removed
+	// otherwise they will be transformed into SUSPEND instructions.
+	if( engine->ep.buildWithoutLineCues )
+		last->size = 0;
+	else
+		last->size = asBCTypeSize[asBCInfo[asBC_SUSPEND].type];
+	last->stackInc = 0;
+	*((int*)ARG_DW(last->arg)) = (line & 0xFFFFF)|((column & 0xFFF)<<20);
+	*((int*)ARG_DW(last->arg)+1) = scriptIdx;
+
+    // Add a JitEntry after the line instruction to allow the JIT function to resume after a suspend
+    InstrPTR(asBC_JitEntry, 0);
+}
+
+void asCByteCode::ObjInfo(int offset, int info)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	// Add the special instruction that will be used to tell the exception
+	// handler when an object is initialized and deinitialized.
+	last->op                   = asBC_ObjInfo;
+	last->size                 = 0;
+	last->stackInc             = 0;
+	last->wArg[0]              = (short)offset;
+	*((int*)ARG_DW(last->arg)) = info;
+}
+
+void asCByteCode::Block(bool start)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	last->op       = asBC_Block;
+	last->size     = 0;
+	last->stackInc = 0;
+	last->wArg[0]  = start ? 1 : 0;
+}
+
+void asCByteCode::TryBlock(short catchLabel)
+{
+	if (AddInstruction() < 0)
+		return;
+
+	last->op = asBC_TryBlock;
+	last->size = 0;
+	last->stackInc = 0;
+	*ARG_DW(last->arg) = catchLabel;
+}
+
+void asCByteCode::VarDecl(int varDeclIdx)
+{
+	if( AddInstruction() < 0 )
+		return;
+
+	last->op       = asBC_VarDecl;
+	last->size     = 0;
+	last->stackInc = 0;
+	last->wArg[0]  = asWORD(varDeclIdx);
+}
+
+int asCByteCode::FindLabel(int label, asCByteInstruction *from, asCByteInstruction **dest, int *positionDelta)
+{
+	TimeIt("asCByteCode::FindLabel");
+
+	// Search forward
+	int labelPos = -from->GetSize();
+
+	asCByteInstruction *labelInstr = from;
+	while( labelInstr )
+	{
+		labelPos += labelInstr->GetSize();
+		labelInstr = labelInstr->next;
+
+		if( labelInstr && labelInstr->op == asBC_LABEL )
+		{
+			if( labelInstr->wArg[0] == label )
+				break;
+		}
+	}
+
+	if( labelInstr == 0 )
+	{
+		// Search backwards
+		labelPos = -from->GetSize();
+
+		labelInstr = from;
+		while( labelInstr )
+		{
+			labelInstr = labelInstr->prev;
+			if( labelInstr )
+			{
+				labelPos -= labelInstr->GetSize();
+
+				if( labelInstr->op == asBC_LABEL )
+				{
+					if( labelInstr->wArg[0] == label )
+						break;
+				}
+			}
+		}
+	}
+
+	if( labelInstr != 0 )
+	{
+		if( dest ) *dest = labelInstr;
+		if( positionDelta ) *positionDelta = labelPos;
+		return 0;
+	}
+
+	return -1;
+}
+
+int asCByteCode::ResolveJumpAddresses()
+{
+	TimeIt("asCByteCode::ResolveJumpAddresses");
+
+	asUINT currPos = 0;
+
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		if( instr->op == asBC_JMP   ||
+			instr->op == asBC_JZ    || instr->op == asBC_JNZ    ||
+			instr->op == asBC_JLowZ || instr->op == asBC_JLowNZ ||
+			instr->op == asBC_JS    || instr->op == asBC_JNS    ||
+			instr->op == asBC_JP    || instr->op == asBC_JNP    )
+		{
+			int label = *((int*) ARG_DW(instr->arg));
+			int labelPosOffset;
+			int r = FindLabel(label, instr, 0, &labelPosOffset);
+			if( r == 0 )
+				*((int*) ARG_DW(instr->arg)) = labelPosOffset;
+			else
+				return -1;
+		}
+		else if (instr->op == asBC_TryBlock)
+		{
+			int label = *((int*)ARG_DW(instr->arg));
+			int labelPosOffset;
+			int r = FindLabel(label, instr, 0, &labelPosOffset);
+			if (r == 0)
+			{
+				// Should store the absolute address so the exception handler doesn't need to figure it out
+				*((int*)ARG_DW(instr->arg)) = currPos + labelPosOffset;
+			}
+			else
+				return -1;
+		}
+
+		currPos += instr->GetSize();
+		instr = instr->next;
+	}
+
+	return 0;
+}
+
+
+asCByteInstruction *asCByteCode::DeleteInstruction(asCByteInstruction *instr)
+{
+	if( instr == 0 ) return 0;
+
+	asCByteInstruction *ret = instr->prev ? instr->prev : instr->next;
+
+	RemoveInstruction(instr);
+
+	engine->memoryMgr.FreeByteInstruction(instr);
+
+	return ret;
+}
+
+void asCByteCode::Output(asDWORD *array)
+{
+	TimeIt("asCByteCode::Output");
+
+	// TODO: Receive a script function pointer instead of the bytecode array
+
+	asDWORD *ap = array;
+
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		if( instr->GetSize() > 0 )
+		{
+			*(asBYTE*)ap = asBYTE(instr->op);
+			*(((asBYTE*)ap)+1) = 0; // Second byte is always zero
+			switch( asBCInfo[instr->op].type )
+			{
+			case asBCTYPE_NO_ARG:
+				*(((asWORD*)ap)+1) = 0; // Clear upper bytes
+				break;
+			case asBCTYPE_wW_rW_rW_ARG:
+				*(((asWORD*)ap)+1) = instr->wArg[0];
+				*(((asWORD*)ap)+2) = instr->wArg[1];
+				*(((asWORD*)ap)+3) = instr->wArg[2];
+				break;
+			case asBCTYPE_wW_DW_ARG:
+			case asBCTYPE_rW_DW_ARG:
+			case asBCTYPE_W_DW_ARG:
+				*(((asWORD*)ap)+1) = instr->wArg[0];
+				*(ap+1) = *(asDWORD*)&instr->arg;
+				break;
+			case asBCTYPE_wW_rW_DW_ARG:
+			case asBCTYPE_rW_W_DW_ARG:
+				*(((asWORD*)ap)+1) = instr->wArg[0];
+				*(((asWORD*)ap)+2) = instr->wArg[1];
+				*(ap+2) = *(asDWORD*)&instr->arg;
+				break;
+			case asBCTYPE_wW_QW_ARG:
+			case asBCTYPE_rW_QW_ARG:
+				*(((asWORD*)ap)+1) = instr->wArg[0];
+				*(asQWORD*)(ap+1) = asQWORD(instr->arg);
+				break;
+			case asBCTYPE_W_ARG:
+			case asBCTYPE_rW_ARG:
+			case asBCTYPE_wW_ARG:
+				*(((asWORD*)ap)+1) = instr->wArg[0];
+				break;
+			case asBCTYPE_wW_rW_ARG:
+			case asBCTYPE_rW_rW_ARG:
+			case asBCTYPE_wW_W_ARG:
+				*(((asWORD *)ap)+1) = instr->wArg[0];
+				*(((asWORD *)ap)+2) = instr->wArg[1];
+				break;
+			case asBCTYPE_QW_DW_ARG:
+			case asBCTYPE_DW_DW_ARG:
+			case asBCTYPE_QW_ARG:
+			case asBCTYPE_DW_ARG:
+				*(((asWORD*)ap)+1) = 0; // Clear upper bytes
+				memcpy(ap+1, &instr->arg, instr->GetSize()*4-4);
+				break;
+			case asBCTYPE_rW_DW_DW_ARG:
+				*(((asWORD*)ap)+1) = instr->wArg[0];
+				memcpy(ap+1, &instr->arg, instr->GetSize()*4-4);
+				break;
+			default:
+				// How did we get here?
+				asASSERT(false);
+				break;
+			}
+		}
+
+		ap += instr->GetSize();
+		instr = instr->next;
+	}
+}
+
+void asCByteCode::PostProcess()
+{
+	TimeIt("asCByteCode::PostProcess");
+
+	if( first == 0 ) return;
+
+	// This function will do the following
+	// - Verify if there is any code that never gets executed and remove it
+	// - Calculate the stack size at the position of each byte code
+	// - Calculate the largest stack needed
+
+	largestStackUsed = 0;
+
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		instr->marked = false;
+		instr->stackSize = -1;
+		instr = instr->next;
+	}
+
+	// Add the first instruction to the list of unchecked code paths
+	asCArray<asCByteInstruction *> paths;
+	AddPath(paths, first, 0);
+
+	// Go through each of the code paths
+	for( asUINT p = 0; p < paths.GetLength(); ++p )
+	{
+		instr = paths[p];
+		int stackSize = instr->stackSize;
+
+		while( instr )
+		{
+			instr->marked = true;
+			instr->stackSize = stackSize;
+			stackSize += instr->stackInc;
+			if( stackSize > largestStackUsed )
+				largestStackUsed = stackSize;
+
+			if( instr->op == asBC_JMP )
+			{
+				// Find the label that we should jump to
+				int label = *((int*) ARG_DW(instr->arg));
+				asCByteInstruction *dest = 0;
+				int r = FindLabel(label, instr, &dest, 0); asASSERT( r == 0 ); UNUSED_VAR(r);
+
+				AddPath(paths, dest, stackSize);
+				break;
+			}
+			else if( instr->op == asBC_JZ    || instr->op == asBC_JNZ    ||
+					 instr->op == asBC_JLowZ || instr->op == asBC_JLowNZ ||
+					 instr->op == asBC_JS    || instr->op == asBC_JNS    ||
+					 instr->op == asBC_JP    || instr->op == asBC_JNP    ||
+					 instr->op == asBC_TryBlock )
+			{
+				// Find the label that is being jumped to
+				int label = *((int*) ARG_DW(instr->arg));
+				asCByteInstruction *dest = 0;
+				int r = FindLabel(label, instr, &dest, 0); asASSERT( r == 0 ); UNUSED_VAR(r);
+
+				AddPath(paths, dest, stackSize);
+
+				// Add both paths to the code paths
+				AddPath(paths, instr->next, stackSize);
+
+				break;
+			}
+			else if( instr->op == asBC_JMPP )
+			{
+				// I need to know the largest value possible
+				asDWORD max = *ARG_DW(instr->arg);
+
+				// Add all destinations to the code paths
+				asCByteInstruction *dest = instr->next;
+				for( asDWORD n = 0; n <= max && dest != 0; ++n )
+				{
+					AddPath(paths, dest, stackSize);
+					dest = dest->next;
+				}
+
+				break;
+			}
+			else
+			{
+				instr = instr->next;
+				if( instr == 0 || instr->marked )
+					break;
+			}
+		}
+	}
+
+	// Are there any instructions that didn't get visited?
+	instr = first;
+	while( instr )
+	{
+		// Don't remove asBC_Block instructions as then the start and end of blocks may become mismatched
+		if( instr->marked == false && instr->op != asBC_Block )
+		{
+			// Remove it
+			asCByteInstruction *curr = instr;
+			instr = instr->next;
+			DeleteInstruction(curr);
+		}
+		else
+		{
+#ifndef AS_DEBUG
+			// If the stackSize is negative, then there is a problem with the bytecode.
+			// If AS_DEBUG is turned on, this same check is done in DebugOutput.
+			asASSERT( instr->stackSize >= 0 || asBCInfo[instr->op].type == asBCTYPE_INFO );
+#endif
+			instr = instr->next;
+		}
+	}
+}
+
+#ifdef AS_DEBUG
+void asCByteCode::DebugOutput(const char *name, asCScriptFunction *func)
+{
+	if (engine->ep.noDebugOutput)
+		return;
+
+#ifndef __MINGW32__
+	// _mkdir is broken on mingw
+	_mkdir("AS_DEBUG");
+#endif
+
+	asCString path = "AS_DEBUG/";
+	path += name;
+
+	// Anonymous functions created from within class methods will contain :: as part of the name
+	// Replace :: with __ to avoid error when creating the file for debug output
+	for (asUINT n = 0; n < path.GetLength(); n++)
+		if (path[n] == ':') path[n] = '_';
+
+#if _MSC_VER >= 1500 && !defined(AS_MARMALADE)
+	FILE *file;
+	fopen_s(&file, path.AddressOf(), "w");
+#else
+	FILE *file = fopen(path.AddressOf(), "w");
+#endif
+
+#if !defined(AS_XENON) && !defined(__MINGW32__)
+	// XBox 360: When running in DVD Emu, no write is allowed
+	// MinGW: As _mkdir is broken, don't assert on file not created if the AS_DEBUG directory doesn't exist
+	asASSERT( file );
+#endif
+
+	if( file == 0 )
+		return;
+
+	asUINT n;
+
+	fprintf(file, "%s\n\n", func->GetDeclaration());
+
+	fprintf(file, "Temps: ");
+	for( n = 0; n < temporaryVariables->GetLength(); n++ )
+	{
+		fprintf(file, "%d", (*temporaryVariables)[n]);
+		if( n < temporaryVariables->GetLength()-1 )
+			fprintf(file, ", ");
+	}
+	fprintf(file, "\n\n");
+
+	fprintf(file, "Variables: \n");
+	for( n = 0; n < func->scriptData->variables.GetLength(); n++ )
+	{
+		bool isOnHeap = func->scriptData->variables[n]->onHeap;
+		fprintf(file, " %.3d: %s%s %s\n", func->scriptData->variables[n]->stackOffset, isOnHeap ? "(heap) " : "", func->scriptData->variables[n]->type.Format(func->nameSpace, true).AddressOf(), func->scriptData->variables[n]->name.AddressOf());
+	}
+	if( func->objectType )
+		fprintf(file, " %.3d: %s this\n", 0, func->objectType->name.AddressOf());
+
+	fprintf(file, "\n\n");
+
+	bool invalidStackSize = false;
+	int pos = 0;
+	asUINT lineIndex = 0;
+	asCByteInstruction *instr = first;
+	while( instr )
+	{
+		if( lineIndex < lineNumbers.GetLength() && lineNumbers[lineIndex] == pos )
+		{
+			asDWORD line = lineNumbers[lineIndex+1];
+			fprintf(file, "- %d,%d -\n", (int)(line&0xFFFFF), (int)(line>>20));
+			lineIndex += 2;
+		}
+
+		if( instr->GetSize() > 0 )
+		{
+			fprintf(file, "%5d ", pos);
+			pos += instr->GetSize();
+
+			fprintf(file, "%3d %c ", int(instr->stackSize + func->scriptData->variableSpace), instr->marked ? '*' : ' ');
+			if( instr->stackSize < 0 )
+				invalidStackSize = true;
+		}
+		else
+		{
+			fprintf(file, "            ");
+		}
+
+		switch( asBCInfo[instr->op].type )
+		{
+		case asBCTYPE_W_ARG:
+			fprintf(file, "   %-8s %d\n", asBCInfo[instr->op].name, instr->wArg[0]);
+			break;
+
+		case asBCTYPE_wW_ARG:
+		case asBCTYPE_rW_ARG:
+			fprintf(file, "   %-8s v%d\n", asBCInfo[instr->op].name, instr->wArg[0]);
+			break;
+
+		case asBCTYPE_wW_rW_ARG:
+		case asBCTYPE_rW_rW_ARG:
+			fprintf(file, "   %-8s v%d, v%d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1]);
+			break;
+
+		case asBCTYPE_wW_W_ARG:
+			fprintf(file, "   %-8s v%d, %d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1]);
+			break;
+
+		case asBCTYPE_wW_rW_DW_ARG:
+		case asBCTYPE_rW_W_DW_ARG:
+			switch( instr->op )
+			{
+			case asBC_ADDIf:
+			case asBC_SUBIf:
+			case asBC_MULIf:
+				fprintf(file, "   %-8s v%d, v%d, %f\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1], *((float*) ARG_DW(instr->arg)));
+				break;
+			default:
+				fprintf(file, "   %-8s v%d, v%d, %d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1], *((int*) ARG_DW(instr->arg)));
+				break;
+			}
+			break;
+
+		case asBCTYPE_DW_ARG:
+			switch( instr->op )
+			{
+			case asBC_OBJTYPE:
+				{
+					asCObjectType *ot = *(asCObjectType**)ARG_DW(instr->arg);
+					fprintf(file, "   %-8s 0x%x           (type:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), ot->GetName());
+				}
+				break;
+
+			case asBC_FuncPtr:
+				{
+					asCScriptFunction *f = *(asCScriptFunction**)ARG_DW(instr->arg);
+					fprintf(file, "   %-8s 0x%x          (func:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), f->GetDeclaration());
+				}
+				break;
+
+			case asBC_PshC4:
+			case asBC_Cast:
+				fprintf(file, "   %-8s 0x%x          (i:%d, f:%g)\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), *((int*) ARG_DW(instr->arg)), *((float*) ARG_DW(instr->arg)));
+				break;
+
+			case asBC_TYPEID:
+				fprintf(file, "   %-8s 0x%x          '%s'\n", asBCInfo[instr->op].name, (asUINT)*ARG_DW(instr->arg), engine->GetTypeDeclaration((int)*ARG_DW(instr->arg)));
+				break;
+
+			case asBC_CALL:
+			case asBC_CALLSYS:
+			case asBC_CALLBND:
+			case asBC_CALLINTF:
+			case asBC_Thiscall1:
+				{
+					int funcID = *(int*)ARG_DW(instr->arg);
+					asCString decl = engine->GetFunctionDeclaration(funcID);
+
+					fprintf(file, "   %-8s %d           (%s)\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)), decl.AddressOf());
+				}
+				break;
+
+			case asBC_REFCPY:
+				fprintf(file, "   %-8s 0x%x\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)));
+				break;
+
+			case asBC_JMP:
+			case asBC_JZ:
+			case asBC_JLowZ:
+			case asBC_JS:
+			case asBC_JP:
+			case asBC_JNZ:
+			case asBC_JLowNZ:
+			case asBC_JNS:
+			case asBC_JNP:
+				fprintf(file, "   %-8s %+d              (d:%d)\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)), pos+*((int*) ARG_DW(instr->arg)));
+				break;
+
+			default:
+				fprintf(file, "   %-8s %d\n", asBCInfo[instr->op].name, *((int*) ARG_DW(instr->arg)));
+				break;
+			}
+			break;
+
+		case asBCTYPE_QW_ARG:
+			switch( instr->op )
+			{
+			case asBC_OBJTYPE:
+				{
+					asCObjectType *ot = *(asCObjectType**)ARG_QW(instr->arg);
+					fprintf(file, "   %-8s 0x%x          (type:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_QW(instr->arg), ot->GetName());
+				}
+				break;
+
+			case asBC_FuncPtr:
+				{
+					asCScriptFunction *f = *(asCScriptFunction**)ARG_QW(instr->arg);
+					fprintf(file, "   %-8s 0x%x          (func:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_QW(instr->arg), f->GetDeclaration());
+				}
+				break;
+
+			case asBC_PGA:
+				{
+					void *ptr = *(void**)ARG_QW(instr->arg);
+					asSMapNode<void*, asCGlobalProperty*> *cursor = 0;
+					if( engine->varAddressMap.MoveTo(&cursor, ptr) )
+					{
+						fprintf(file, "   %-8s 0x%x          (var:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_QW(instr->arg), cursor->value->name.AddressOf());
+					}
+					else
+					{
+						asUINT length;
+						engine->stringFactory->GetRawStringData(ptr, 0, &length);
+						asCString str;
+						str.SetLength(length);
+						engine->stringFactory->GetRawStringData(ptr, str.AddressOf(), &length);
+						if (str.GetLength() > 20)
+						{
+							// TODO: Replace non-visible characters with space or something like it
+							str.SetLength(20);
+							str += "...";
+						}
+						fprintf(file, "   %-8s 0x%x          (str:%s)\n", asBCInfo[instr->op].name, (asUINT)*ARG_QW(instr->arg), str.AddressOf());
+					}
+				}
+				break;
+	
+			default:
+#ifdef __GNUC__
+#ifdef _LP64
+			fprintf(file, "   %-8s 0x%lx           (i:%ld, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
+#else
+			fprintf(file, "   %-8s 0x%llx           (i:%lld, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
+#endif
+#else
+			fprintf(file, "   %-8s 0x%I64x          (i:%I64d, f:%g)\n", asBCInfo[instr->op].name, *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
+#endif
+			}
+			break;
+
+		case asBCTYPE_wW_QW_ARG:
+		case asBCTYPE_rW_QW_ARG:
+			switch( instr->op )
+			{
+			case asBC_RefCpyV:
+			case asBC_FREE:
+				{
+					asCObjectType *ot = *(asCObjectType**)ARG_QW(instr->arg);
+					fprintf(file, "   %-8s v%d, 0x%x          (type:%s)\n", asBCInfo[instr->op].name, instr->wArg[0], (asUINT)*ARG_QW(instr->arg), ot->GetName());
+				}
+				break;
+
+			default:
+#ifdef __GNUC__
+#ifdef _LP64
+				fprintf(file, "   %-8s v%d, 0x%lx           (i:%ld, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
+#else
+				fprintf(file, "   %-8s v%d, 0x%llx           (i:%lld, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
+#endif
+#else
+				fprintf(file, "   %-8s v%d, 0x%I64x          (i:%I64d, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], *ARG_QW(instr->arg), *((asINT64*) ARG_QW(instr->arg)), *((double*) ARG_QW(instr->arg)));
+#endif
+			}
+			break;
+
+		case asBCTYPE_DW_DW_ARG:
+			if( instr->op == asBC_ALLOC )
+			{
+				asCObjectType *ot = *(asCObjectType**)ARG_DW(instr->arg);
+				asCScriptFunction *f = engine->scriptFunctions[instr->wArg[0]];
+				fprintf(file, "   %-8s 0x%x, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
+			}
+			else
+				fprintf(file, "   %-8s %u, %d\n", asBCInfo[instr->op].name, *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1));
+			break;
+
+		case asBCTYPE_rW_DW_DW_ARG:
+			fprintf(file, "   %-8s v%d, %u, %u\n", asBCInfo[instr->op].name, instr->wArg[0], *(int*)ARG_DW(instr->arg), *(int*)(ARG_DW(instr->arg)+1));
+			break;
+
+		case asBCTYPE_QW_DW_ARG:
+			if( instr->op == asBC_ALLOC )
+			{
+				asCObjectType *ot = *(asCObjectType**)ARG_QW(instr->arg);
+				asCScriptFunction *f = engine->scriptFunctions[instr->wArg[0]];
+#if defined(__GNUC__) && !defined(_MSC_VER)
+#ifdef AS_64BIT_PTR
+				fprintf(file, "   %-8s 0x%lx, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
+#else
+				fprintf(file, "   %-8s 0x%llx, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
+#endif
+#else
+				fprintf(file, "   %-8s 0x%I64x, %d             (type:%s, %s)\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2), ot->GetName(), f ? f->GetDeclaration() : "{no func}");
+#endif
+			}
+			else
+#if defined(__GNUC__) && !defined(_MSC_VER)
+#ifdef AS_64BIT_PTR
+				fprintf(file, "   %-8s %lu, %d\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2));
+#else
+				fprintf(file, "   %-8s %llu, %d\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2));
+#endif
+#else
+				fprintf(file, "   %-8s %I64u, %d\n", asBCInfo[instr->op].name, *(asINT64*)ARG_QW(instr->arg), *(int*)(ARG_DW(instr->arg)+2));
+#endif
+			break;
+
+		case asBCTYPE_INFO:
+			if( instr->op == asBC_LABEL )
+				fprintf(file, "%d:\n", instr->wArg[0]);
+			else if( instr->op == asBC_LINE )
+				fprintf(file, "   %s\n", asBCInfo[instr->op].name);
+			else if( instr->op == asBC_Block )
+				fprintf(file, "%c\n", instr->wArg[0] ? '{' : '}');
+			break;
+
+		case asBCTYPE_rW_DW_ARG:
+		case asBCTYPE_wW_DW_ARG:
+		case asBCTYPE_W_DW_ARG:
+			if( instr->op == asBC_SetV1 )
+				fprintf(file, "   %-8s v%d, 0x%x\n", asBCInfo[instr->op].name, instr->wArg[0], *(asBYTE*)ARG_DW(instr->arg));
+			else if( instr->op == asBC_SetV2 )
+				fprintf(file, "   %-8s v%d, 0x%x\n", asBCInfo[instr->op].name, instr->wArg[0], *(asWORD*)ARG_DW(instr->arg));
+			else if( instr->op == asBC_SetV4 )
+				fprintf(file, "   %-8s v%d, 0x%x          (i:%d, f:%g)\n", asBCInfo[instr->op].name, instr->wArg[0], (asUINT)*ARG_DW(instr->arg), *((int*) ARG_DW(instr->arg)), *((float*) ARG_DW(instr->arg)));
+			else if( instr->op == asBC_CMPIf )
+				fprintf(file, "   %-8s v%d, %f\n", asBCInfo[instr->op].name, instr->wArg[0], *(float*)ARG_DW(instr->arg));
+			else
+				fprintf(file, "   %-8s v%d, %d\n", asBCInfo[instr->op].name, instr->wArg[0], (asUINT)*ARG_DW(instr->arg));
+			break;
+
+		case asBCTYPE_wW_rW_rW_ARG:
+			fprintf(file, "   %-8s v%d, v%d, v%d\n", asBCInfo[instr->op].name, instr->wArg[0], instr->wArg[1], instr->wArg[2]);
+			break;
+
+		case asBCTYPE_NO_ARG:
+			fprintf(file, "   %s\n", asBCInfo[instr->op].name);
+			break;
+
+		default:
+			asASSERT(false);
+		}
+
+		instr = instr->next;
+	}
+
+	fclose(file);
+
+	// If the stackSize is negative then there is something wrong with the 
+	// bytecode, i.e. there is a bug in the compiler or in the optimizer. We 
+	// only check this here to have the bytecode available on file for verification
+	asASSERT( !invalidStackSize );
+}
+#endif
+
+//=============================================================================
+
+int asCByteCode::InsertFirstInstrDWORD(asEBCInstr bc, asDWORD param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstructionFirst() < 0 )
+		return 0;
+
+	first->op = bc;
+	*ARG_DW(first->arg) = param;
+	first->size = asBCTypeSize[asBCInfo[bc].type];
+	first->stackInc = asBCInfo[bc].stackInc;
+
+	return first->stackInc;
+}
+
+int asCByteCode::InsertFirstInstrQWORD(asEBCInstr bc, asQWORD param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_QW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstructionFirst() < 0 )
+		return 0;
+
+	first->op = bc;
+	*ARG_QW(first->arg) = param;
+	first->size = asBCTypeSize[asBCInfo[bc].type];
+	first->stackInc = asBCInfo[bc].stackInc;
+
+	return first->stackInc;
+}
+
+int asCByteCode::Instr(asEBCInstr bc)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_NO_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrW_W_W(asEBCInstr bc, int a, int b, int c)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_rW_rW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = (short)a;
+	last->wArg[1]  = (short)b;
+	last->wArg[2]  = (short)c;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrW_W(asEBCInstr bc, int a, int b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_rW_ARG ||
+	         asBCInfo[bc].type == asBCTYPE_rW_rW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = (short)a;
+	last->wArg[1]  = (short)b;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrW_PTR(asEBCInstr bc, short a, void *param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_PTR_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+	*ARG_PTR(last->arg) = (asPWORD)param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrW_DW(asEBCInstr bc, asWORD a, asDWORD b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
+             asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
+			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+	*((int*) ARG_DW(last->arg)) = b;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrSHORT_DW_DW(asEBCInstr bc, short a, asDWORD b, asDWORD c)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_rW_DW_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+	*(int*)ARG_DW(last->arg) = b;
+	*(int*)(ARG_DW(last->arg)+1) = c;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrSHORT_B(asEBCInstr bc, short a, asBYTE b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
+	         asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
+			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+
+	// We'll have to be careful to store the byte correctly, independent of endianess.
+	// Some optimizing compilers may change the order of operations, so we make sure
+	// the value is not overwritten even if that happens.
+	asBYTE *argPtr = (asBYTE*)ARG_DW(last->arg);
+	argPtr[0] = b; // The value is always stored in the lower byte
+	argPtr[1] = 0; // and clear the rest of the DWORD
+	argPtr[2] = 0;
+	argPtr[3] = 0;
+
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrSHORT_W(asEBCInstr bc, short a, asWORD b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
+	         asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
+			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+
+	// We'll have to be careful to store the word correctly, independent of endianess.
+	// Some optimizing compilers may change the order of operations, so we make sure
+	// the value is not overwritten even if that happens.
+	asWORD *argPtr = (asWORD*)ARG_DW(last->arg);
+	argPtr[0] = b; // The value is always stored in the lower word
+	argPtr[1] = 0; // and clear the rest of the DWORD
+
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrSHORT_DW(asEBCInstr bc, short a, asDWORD b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG ||
+	         asBCInfo[bc].type == asBCTYPE_rW_DW_ARG ||
+			 asBCInfo[bc].type == asBCTYPE_W_DW_ARG);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+	*((int*) ARG_DW(last->arg)) = b;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrW_QW(asEBCInstr bc, asWORD a, asQWORD b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_QW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+	*ARG_QW(last->arg) = b;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrSHORT_QW(asEBCInstr bc, short a, asQWORD b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_QW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+	*ARG_QW(last->arg) = b;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrW_FLOAT(asEBCInstr bc, asWORD a, float b)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_wW_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc == 0);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = a;
+	*((float*) ARG_DW(last->arg)) = b;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrSHORT(asEBCInstr bc, short param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_rW_ARG ||
+	         asBCInfo[bc].type == asBCTYPE_wW_ARG ||
+	         asBCInfo[bc].type == asBCTYPE_W_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrINT(asEBCInstr bc, int param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op = bc;
+	*((int*) ARG_DW(last->arg)) = param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrDWORD(asEBCInstr bc, asDWORD param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op = bc;
+	*ARG_DW(last->arg) = param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrPTR(asEBCInstr bc, void *param)
+{
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op = bc;
+	asASSERT(asBCInfo[bc].type == asBCTYPE_PTR_ARG);
+	*ARG_PTR(last->arg) = (asPWORD)param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrQWORD(asEBCInstr bc, asQWORD param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_QW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op = bc;
+	*ARG_QW(last->arg) = param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrWORD(asEBCInstr bc, asWORD param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_W_ARG  ||
+	         asBCInfo[bc].type == asBCTYPE_rW_ARG ||
+	         asBCInfo[bc].type == asBCTYPE_wW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op       = bc;
+	last->wArg[0]  = param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrFLOAT(asEBCInstr bc, float param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_DW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op = bc;
+	*((float*) ARG_DW(last->arg)) = param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::InstrDOUBLE(asEBCInstr bc, double param)
+{
+	asASSERT(asBCInfo[bc].type == asBCTYPE_QW_ARG);
+	asASSERT(asBCInfo[bc].stackInc != 0xFFFF);
+
+	if( AddInstruction() < 0 )
+		return 0;
+
+	last->op = bc;
+	*((double*) ARG_QW(last->arg)) = param;
+	last->size     = asBCTypeSize[asBCInfo[bc].type];
+	last->stackInc = asBCInfo[bc].stackInc;
+
+	return last->stackInc;
+}
+
+int asCByteCode::GetLastInstr()
+{
+	if( last == 0 ) return -1;
+
+	return last->op;
+}
+
+int asCByteCode::RemoveLastInstr()
+{
+	if( last == 0 ) return -1;
+
+	if( first == last )
+	{
+		engine->memoryMgr.FreeByteInstruction(last);
+		first = 0;
+		last = 0;
+	}
+	else
+	{
+		asCByteInstruction *bc = last;
+		last = bc->prev;
+
+		bc->Remove();
+		engine->memoryMgr.FreeByteInstruction(bc);
+	}
+
+	return 0;
+}
+
+asDWORD asCByteCode::GetLastInstrValueDW()
+{
+	if( last == 0 ) return 0;
+
+	return *ARG_DW(last->arg);
+}
+
+//===================================================================
+
+asCByteInstruction::asCByteInstruction()
+{
+	next          = 0;
+	prev          = 0;
+
+	op            = asBC_LABEL;
+
+	arg           = 0;
+	wArg[0]       = 0;
+	wArg[1]       = 0;
+	wArg[2]       = 0;
+	size          = 0;
+	stackInc      = 0;
+	marked        = false;
+	stackSize     = 0;
+}
+
+void asCByteInstruction::AddAfter(asCByteInstruction *nextCode)
+{
+	if( next )
+		next->prev = nextCode;
+
+	nextCode->next = next;
+	nextCode->prev = this;
+	next = nextCode;
+}
+
+void asCByteInstruction::AddBefore(asCByteInstruction *prevCode)
+{
+	if( prev )
+		prev->next = prevCode;
+
+	prevCode->prev = prev;
+	prevCode->next = this;
+	prev = prevCode;
+}
+
+int asCByteInstruction::GetSize()
+{
+	return size;
+}
+
+int asCByteInstruction::GetStackIncrease()
+{
+	return stackInc;
+}
+
+void asCByteInstruction::Remove()
+{
+	if( prev ) prev->next = next;
+	if( next ) next->prev = prev;
+	prev = 0;
+	next = 0;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
diff --git a/Sources/AngelScript/source/as_bytecode.h b/Sources/AngelScript/source/as_bytecode.h
old mode 100755
new mode 100644
index 62d15ca11..f69f35bde
--- a/Sources/AngelScript/source/as_bytecode.h
+++ b/Sources/AngelScript/source/as_bytecode.h
@@ -1,202 +1,205 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_bytecode.h
-//
-// A class for constructing the final byte code
-//
-
-
-
-#ifndef AS_BYTECODE_H
-#define AS_BYTECODE_H
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_array.h"
-
-BEGIN_AS_NAMESPACE
-
-#define BYTECODE_SIZE  4
-#define MAX_DATA_SIZE  8
-#define MAX_INSTR_SIZE (BYTECODE_SIZE+MAX_DATA_SIZE)
-
-class asCScriptEngine;
-class asCScriptFunction;
-class asCByteInstruction;
-
-class asCByteCode
-{
-public:
-	asCByteCode(asCScriptEngine *engine);
-	~asCByteCode();
-
-	void ClearAll();
-
-	int GetSize();
-
-	void Finalize(const asCArray<int> &tempVariableOffsets);
-
-	void Optimize();
-	void OptimizeLocally(const asCArray<int> &tempVariableOffsets);
-	void ExtractLineNumbers();
-	void ExtractObjectVariableInfo(asCScriptFunction *outFunc);
-	int  ResolveJumpAddresses();
-	int  FindLabel(int label, asCByteInstruction *from, asCByteInstruction **dest, int *positionDelta);
-
-	void AddPath(asCArray<asCByteInstruction *> &paths, asCByteInstruction *instr, int stackSize);
-
-	void Output(asDWORD *array);
-	void AddCode(asCByteCode *bc);
-
-	void PostProcess();
-
-#ifdef AS_DEBUG
-	void DebugOutput(const char *name, asCScriptFunction *func);
-#endif
-
-	int  GetLastInstr();
-	int  RemoveLastInstr();
-	asDWORD GetLastInstrValueDW();
-
-	void InsertIfNotExists(asCArray<int> &vars, int var);
-	void GetVarsUsed(asCArray<int> &vars);
-	bool IsVarUsed(int offset);
-	void ExchangeVar(int oldOffset, int newOffset);
-	bool IsSimpleExpression();
-
-	void Label(short label);
-	void Line(int line, int column, int scriptIdx);
-	void ObjInfo(int offset, int info);
-	void Block(bool start);
-	void VarDecl(int varDeclIdx);
-	void Call(asEBCInstr bc, int funcID, int pop);
-	void CallPtr(asEBCInstr bc, int funcPtrVar, int pop);
-	void Alloc(asEBCInstr bc, void *objID, int funcID, int pop);
-	void Ret(int pop);
-	void JmpP(int var, asDWORD max);
-
-	int InsertFirstInstrDWORD(asEBCInstr bc, asDWORD param);
-	int InsertFirstInstrQWORD(asEBCInstr bc, asQWORD param);
-	int Instr(asEBCInstr bc);
-	int InstrQWORD(asEBCInstr bc, asQWORD param);
-	int InstrDOUBLE(asEBCInstr bc, double param);
-	int InstrPTR(asEBCInstr bc, void *param);
-	int InstrDWORD(asEBCInstr bc, asDWORD param);
-	int InstrWORD(asEBCInstr bc, asWORD param);
-	int InstrSHORT(asEBCInstr bc, short param);
-	int InstrFLOAT(asEBCInstr bc, float param);
-	int InstrINT(asEBCInstr bc, int param);
-	int InstrW_W_W(asEBCInstr bc, int a, int b, int c);
-	int InstrSHORT_B(asEBCInstr bc, short a, asBYTE b);
-	int InstrSHORT_W(asEBCInstr bc, short a, asWORD b);
-	int InstrSHORT_DW(asEBCInstr bc, short a, asDWORD b);
-	int InstrSHORT_QW(asEBCInstr bc, short a, asQWORD b);
-	int InstrW_DW(asEBCInstr bc, asWORD a, asDWORD b);
-	int InstrW_QW(asEBCInstr bc, asWORD a, asQWORD b);
-	int InstrW_PTR(asEBCInstr bc, short a, void *param);
-	int InstrW_FLOAT(asEBCInstr bc, asWORD a, float b);
-	int InstrW_W(asEBCInstr bc, int w, int b);
-	int InstrSHORT_DW_DW(asEBCInstr bc, short a, asDWORD b, asDWORD c);
-
-	asCScriptEngine *GetEngine() const { return engine; };
-
-	asCArray<int> lineNumbers;
-	asCArray<int> sectionIdxs;
-	int largestStackUsed;
-
-protected:
-	// Assignments are not allowed
-	void operator=(const asCByteCode &) {}
-
-	// Helpers for Optimize
-	bool CanBeSwapped(asCByteInstruction *curr);
-	asCByteInstruction *ChangeFirstDeleteNext(asCByteInstruction *curr, asEBCInstr bc);
-	asCByteInstruction *DeleteFirstChangeNext(asCByteInstruction *curr, asEBCInstr bc);
-	asCByteInstruction *DeleteInstruction(asCByteInstruction *instr);
-	void RemoveInstruction(asCByteInstruction *instr);
-	asCByteInstruction *GoBack(asCByteInstruction *curr);
-	asCByteInstruction *GoForward(asCByteInstruction *curr);
-	void InsertBefore(asCByteInstruction *before, asCByteInstruction *instr);
-	bool RemoveUnusedValue(asCByteInstruction *curr, asCByteInstruction **next);
-	bool IsTemporary(int offset);
-	bool IsTempRegUsed(asCByteInstruction *curr);
-	bool IsTempVarRead(asCByteInstruction *curr, int offset);
-	bool PostponeInitOfTemp(asCByteInstruction *curr, asCByteInstruction **next);
-	bool IsTempVarReadByInstr(asCByteInstruction *curr, int var);
-	bool IsTempVarOverwrittenByInstr(asCByteInstruction *curr, int var);
-	bool IsInstrJmpOrLabel(asCByteInstruction *curr);
-
-	int AddInstruction();
-	int AddInstructionFirst();
-
-	asCByteInstruction *first;
-	asCByteInstruction *last;
-
-	const asCArray<int> *temporaryVariables;
-
-	asCScriptEngine *engine;
-};
-
-class asCByteInstruction
-{
-public:
-	asCByteInstruction();
-
-	void AddAfter(asCByteInstruction *nextCode);
-	void AddBefore(asCByteInstruction *nextCode);
-	void Remove();
-
-	int  GetSize();
-	int  GetStackIncrease();
-
-	asCByteInstruction *next;
-	asCByteInstruction *prev;
-
-	asEBCInstr op;
-	asQWORD arg;
-	short wArg[3];
-	int size;
-	int stackInc;
-
-	// Testing
-	bool marked;
-	int  stackSize;
-};
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2018 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_bytecode.h
+//
+// A class for constructing the final byte code
+//
+
+
+
+#ifndef AS_BYTECODE_H
+#define AS_BYTECODE_H
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_array.h"
+
+BEGIN_AS_NAMESPACE
+
+#define BYTECODE_SIZE  4
+#define MAX_DATA_SIZE  8
+#define MAX_INSTR_SIZE (BYTECODE_SIZE+MAX_DATA_SIZE)
+
+class asCScriptEngine;
+class asCScriptFunction;
+class asCByteInstruction;
+
+class asCByteCode
+{
+public:
+	asCByteCode(asCScriptEngine *engine);
+	~asCByteCode();
+
+	void ClearAll();
+
+	int GetSize();
+
+	void Finalize(const asCArray<int> &tempVariableOffsets);
+
+	void Optimize();
+	void OptimizeLocally(const asCArray<int> &tempVariableOffsets);
+	void ExtractLineNumbers();
+	void ExtractObjectVariableInfo(asCScriptFunction *outFunc);
+	void ExtractTryCatchInfo(asCScriptFunction *outFunc);
+	int  ResolveJumpAddresses();
+	int  FindLabel(int label, asCByteInstruction *from, asCByteInstruction **dest, int *positionDelta);
+
+	void AddPath(asCArray<asCByteInstruction *> &paths, asCByteInstruction *instr, int stackSize);
+
+	void Output(asDWORD *array);
+	void AddCode(asCByteCode *bc);
+
+	void PostProcess();
+
+#ifdef AS_DEBUG
+	void DebugOutput(const char *name, asCScriptFunction *func);
+#endif
+
+	int  GetLastInstr();
+	int  RemoveLastInstr();
+	asDWORD GetLastInstrValueDW();
+
+	void InsertIfNotExists(asCArray<int> &vars, int var);
+	void GetVarsUsed(asCArray<int> &vars);
+	bool IsVarUsed(int offset);
+	void ExchangeVar(int oldOffset, int newOffset);
+	bool IsSimpleExpression();
+
+	void Label(short label);
+	void Line(int line, int column, int scriptIdx);
+	void ObjInfo(int offset, int info);
+	void Block(bool start);
+	void TryBlock(short catchLabel);
+
+	void VarDecl(int varDeclIdx);
+	void Call(asEBCInstr bc, int funcID, int pop);
+	void CallPtr(asEBCInstr bc, int funcPtrVar, int pop);
+	void Alloc(asEBCInstr bc, void *objID, int funcID, int pop);
+	void Ret(int pop);
+	void JmpP(int var, asDWORD max);
+
+	int InsertFirstInstrDWORD(asEBCInstr bc, asDWORD param);
+	int InsertFirstInstrQWORD(asEBCInstr bc, asQWORD param);
+	int Instr(asEBCInstr bc);
+	int InstrQWORD(asEBCInstr bc, asQWORD param);
+	int InstrDOUBLE(asEBCInstr bc, double param);
+	int InstrPTR(asEBCInstr bc, void *param);
+	int InstrDWORD(asEBCInstr bc, asDWORD param);
+	int InstrWORD(asEBCInstr bc, asWORD param);
+	int InstrSHORT(asEBCInstr bc, short param);
+	int InstrFLOAT(asEBCInstr bc, float param);
+	int InstrINT(asEBCInstr bc, int param);
+	int InstrW_W_W(asEBCInstr bc, int a, int b, int c);
+	int InstrSHORT_B(asEBCInstr bc, short a, asBYTE b);
+	int InstrSHORT_W(asEBCInstr bc, short a, asWORD b);
+	int InstrSHORT_DW(asEBCInstr bc, short a, asDWORD b);
+	int InstrSHORT_QW(asEBCInstr bc, short a, asQWORD b);
+	int InstrW_DW(asEBCInstr bc, asWORD a, asDWORD b);
+	int InstrW_QW(asEBCInstr bc, asWORD a, asQWORD b);
+	int InstrW_PTR(asEBCInstr bc, short a, void *param);
+	int InstrW_FLOAT(asEBCInstr bc, asWORD a, float b);
+	int InstrW_W(asEBCInstr bc, int w, int b);
+	int InstrSHORT_DW_DW(asEBCInstr bc, short a, asDWORD b, asDWORD c);
+
+	asCScriptEngine *GetEngine() const { return engine; };
+
+	asCArray<int> lineNumbers;
+	asCArray<int> sectionIdxs;
+	int largestStackUsed;
+
+protected:
+	// Assignments are not allowed
+	void operator=(const asCByteCode &) {}
+
+	// Helpers for Optimize
+	bool CanBeSwapped(asCByteInstruction *curr);
+	asCByteInstruction *ChangeFirstDeleteNext(asCByteInstruction *curr, asEBCInstr bc);
+	asCByteInstruction *DeleteFirstChangeNext(asCByteInstruction *curr, asEBCInstr bc);
+	asCByteInstruction *DeleteInstruction(asCByteInstruction *instr);
+	void RemoveInstruction(asCByteInstruction *instr);
+	asCByteInstruction *GoBack(asCByteInstruction *curr);
+	asCByteInstruction *GoForward(asCByteInstruction *curr);
+	void InsertBefore(asCByteInstruction *before, asCByteInstruction *instr);
+	bool RemoveUnusedValue(asCByteInstruction *curr, asCByteInstruction **next);
+	bool IsTemporary(int offset);
+	bool IsTempRegUsed(asCByteInstruction *curr);
+	bool IsTempVarRead(asCByteInstruction *curr, int offset);
+	bool PostponeInitOfTemp(asCByteInstruction *curr, asCByteInstruction **next);
+	bool IsTempVarReadByInstr(asCByteInstruction *curr, int var);
+	bool IsTempVarOverwrittenByInstr(asCByteInstruction *curr, int var);
+	bool IsInstrJmpOrLabel(asCByteInstruction *curr);
+
+	int AddInstruction();
+	int AddInstructionFirst();
+
+	asCByteInstruction *first;
+	asCByteInstruction *last;
+
+	const asCArray<int> *temporaryVariables;
+
+	asCScriptEngine *engine;
+};
+
+class asCByteInstruction
+{
+public:
+	asCByteInstruction();
+
+	void AddAfter(asCByteInstruction *nextCode);
+	void AddBefore(asCByteInstruction *nextCode);
+	void Remove();
+
+	int  GetSize();
+	int  GetStackIncrease();
+
+	asCByteInstruction *next;
+	asCByteInstruction *prev;
+
+	asEBCInstr op;
+	asQWORD arg;
+	short wArg[3];
+	int size;
+	int stackInc;
+
+	// Testing
+	bool marked;
+	int  stackSize;
+};
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
+#endif
diff --git a/Sources/AngelScript/source/as_callfunc.cpp b/Sources/AngelScript/source/as_callfunc.cpp
old mode 100755
new mode 100644
index 556afab77..4941967ec
--- a/Sources/AngelScript/source/as_callfunc.cpp
+++ b/Sources/AngelScript/source/as_callfunc.cpp
@@ -1,890 +1,920 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc.cpp
-//
-// These functions handle the actual calling of system functions
-//
-
-
-
-#include "as_config.h"
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_context.h"
-
-BEGIN_AS_NAMESPACE
-
-// ref: Member Function Pointers and the Fastest Possible C++ Delegates
-//      describes the structure of class method pointers for most compilers
-//      http://www.codeproject.com/Articles/7150/Member-Function-Pointers-and-the-Fastest-Possible
-
-// ref: The code comments for ItaniumCXXABI::EmitLoadOfMemberFunctionPointer in the LLVM compiler
-//      describes the structure for class method pointers on Itanium and arm64 ABI
-//      http://clang.llvm.org/doxygen/CodeGen_2ItaniumCXXABI_8cpp_source.html#l00937
-
-int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv, void *auxiliary, asSSystemFunctionInterface *internal)
-{
-	memset(internal, 0, sizeof(asSSystemFunctionInterface));
-
-	internal->func      = ptr.ptr.f.func;
-	internal->auxiliary = 0;
-
-	// Was a compatible calling convention specified?
-	if( internal->func )
-	{
-		if( ptr.flag == 1 && callConv != asCALL_GENERIC )
-			return asWRONG_CALLING_CONV;
-		else if( ptr.flag == 2 && (callConv == asCALL_GENERIC || callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL || callConv == asCALL_THISCALL_OBJFIRST || callConv == asCALL_THISCALL_OBJLAST) )
-			return asWRONG_CALLING_CONV;
-		else if( ptr.flag == 3 && !(callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL || callConv == asCALL_THISCALL_OBJFIRST || callConv == asCALL_THISCALL_OBJLAST) )
-			return asWRONG_CALLING_CONV;
-	}
-
-	asDWORD base = callConv;
-	if( !isMethod )
-	{
-		if( base == asCALL_CDECL )
-			internal->callConv = ICC_CDECL;
-		else if( base == asCALL_STDCALL )
-			internal->callConv = ICC_STDCALL;
-		else if( base == asCALL_THISCALL_ASGLOBAL )
-		{
-			if(auxiliary == 0)
-				return asINVALID_ARG;
-			internal->auxiliary = auxiliary;
-			internal->callConv  = ICC_THISCALL;
-
-			// This is really a thiscall, so it is necessary to check for virtual method pointers
-			base = asCALL_THISCALL;
-			isMethod = true;
-		}
-		else if (base == asCALL_GENERIC)
-		{
-			internal->callConv = ICC_GENERIC_FUNC;
-
-			// The auxiliary object is optional for generic calling convention
-			internal->auxiliary = auxiliary;
-		}
-		else
-			return asNOT_SUPPORTED;
-	}
-	
-	if( isMethod )
-	{
-#ifndef AS_NO_CLASS_METHODS
-		if( base == asCALL_THISCALL || base == asCALL_THISCALL_OBJFIRST || base == asCALL_THISCALL_OBJLAST )
-		{
-			internalCallConv thisCallConv;
-			if( base == asCALL_THISCALL )
-			{
-				if(callConv != asCALL_THISCALL_ASGLOBAL && auxiliary)
-					return asINVALID_ARG;
-
-				thisCallConv = ICC_THISCALL;
-			}
-			else
-			{
-#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
-				return asNOT_SUPPORTED;
-#else
-				if(auxiliary == 0)
-					return asINVALID_ARG;
-
-				internal->auxiliary = auxiliary;
-				if( base == asCALL_THISCALL_OBJFIRST )
-					thisCallConv = ICC_THISCALL_OBJFIRST;
-				else //if( base == asCALL_THISCALL_OBJLAST )
-					thisCallConv = ICC_THISCALL_OBJLAST;
-#endif
-			}
-
-			internal->callConv = thisCallConv;
-#ifdef GNU_STYLE_VIRTUAL_METHOD
-			if( (size_t(ptr.ptr.f.func) & 1) )
-				internal->callConv = (internalCallConv)(thisCallConv + 2);
-#endif
-			internal->baseOffset = ( int )MULTI_BASE_OFFSET(ptr);
-#if (defined(AS_ARM) || defined(AS_MIPS)) && (defined(__GNUC__) || defined(AS_PSVITA))
-			// As the least significant bit in func is used to switch to THUMB mode
-			// on ARM processors, the LSB in the __delta variable is used instead of
-			// the one in __pfn on ARM processors.
-			// MIPS also appear to use the base offset to indicate virtual method.
-			if( (size_t(internal->baseOffset) & 1) )
-				internal->callConv = (internalCallConv)(thisCallConv + 2);
-#endif
-
-#ifdef HAVE_VIRTUAL_BASE_OFFSET
-			// We don't support virtual inheritance
-			if( VIRTUAL_BASE_OFFSET(ptr) != 0 )
-				return asNOT_SUPPORTED;
-#endif
-		}
-		else
-#endif
-		if( base == asCALL_CDECL_OBJLAST )
-			internal->callConv = ICC_CDECL_OBJLAST;
-		else if( base == asCALL_CDECL_OBJFIRST )
-			internal->callConv = ICC_CDECL_OBJFIRST;
-		else if (base == asCALL_GENERIC)
-		{
-			internal->callConv = ICC_GENERIC_METHOD;
-			internal->auxiliary = auxiliary;
-		}
-		else
-			return asNOT_SUPPORTED;
-	}
-
-	return 0;
-}
-
-// This function should prepare system functions so that it will be faster to call them
-int PrepareSystemFunctionGeneric(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine)
-{
-	asASSERT(internal->callConv == ICC_GENERIC_METHOD || internal->callConv == ICC_GENERIC_FUNC);
-
-	// Calculate the size needed for the parameters
-	internal->paramSize = func->GetSpaceNeededForArguments();
-
-	// Prepare the clean up instructions for the function arguments
-	internal->cleanArgs.SetLength(0);
-	int offset = 0;
-	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		asCDataType &dt = func->parameterTypes[n];
-
-		if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsReference() )
-		{
-			if (dt.IsFuncdef())
-			{
-				asSSystemFunctionInterface::SClean clean;
-				clean.op = 0; // call release
-				clean.ot = &engine->functionBehaviours;
-				clean.off = short(offset);
-				internal->cleanArgs.PushLast(clean);
-			}
-			else if( dt.GetTypeInfo()->flags & asOBJ_REF )
-			{
-				asSTypeBehaviour *beh = &dt.GetTypeInfo()->CastToObjectType()->beh;
-				asASSERT( (dt.GetTypeInfo()->flags & asOBJ_NOCOUNT) || beh->release );
-				if( beh->release )
-				{
-					asSSystemFunctionInterface::SClean clean;
-					clean.op  = 0; // call release
-					clean.ot  = dt.GetTypeInfo()->CastToObjectType();
-					clean.off = short(offset);
-					internal->cleanArgs.PushLast(clean);
-				}
-			}
-			else
-			{
-				asSSystemFunctionInterface::SClean clean;
-				clean.op  = 1; // call free
-				clean.ot  = dt.GetTypeInfo()->CastToObjectType();
-				clean.off = short(offset);
-
-				// Call the destructor then free the memory
-				asSTypeBehaviour *beh = &dt.GetTypeInfo()->CastToObjectType()->beh;
-				if( beh->destruct )
-					clean.op = 2; // call destruct, then free
-
-				internal->cleanArgs.PushLast(clean);
-			}
-		}
-
-		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
-			offset += AS_PTR_SIZE;
-		else
-			offset += dt.GetSizeOnStackDWords();
-	}
-
-	return 0;
-}
-
-// This function should prepare system functions so that it will be faster to call them
-int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine)
-{
-#ifdef AS_MAX_PORTABILITY
-	UNUSED_VAR(func);
-	UNUSED_VAR(internal);
-	UNUSED_VAR(engine);
-
-	// This should never happen, as when AS_MAX_PORTABILITY is on, all functions 
-	// are asCALL_GENERIC, which are prepared by PrepareSystemFunctionGeneric
-	asASSERT(false);
-#else
-	// References are always returned as primitive data
-	if( func->returnType.IsReference() || func->returnType.IsObjectHandle() )
-	{
-		internal->hostReturnInMemory = false;
-		internal->hostReturnSize     = sizeof(void*)/4;
-		internal->hostReturnFloat    = false;
-	}
-	// Registered types have special flags that determine how they are returned
-	else if( func->returnType.IsObject() )
-	{
-		asDWORD objType = func->returnType.GetTypeInfo()->flags;
-	
-		// Only value types can be returned by value
-		asASSERT( objType & asOBJ_VALUE );
-
-		if( !(objType & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY)) )
-		{
-			// If the return is by value then we need to know the true type
-			engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
-
-			asCString str;
-			str.Format(TXT_CANNOT_RET_TYPE_s_BY_VAL, func->returnType.GetTypeInfo()->name.AddressOf());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-			engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
-		}
-		else if( objType & asOBJ_APP_ARRAY )
-		{
-			// Array types are always returned in memory
-			internal->hostReturnInMemory = true;
-			internal->hostReturnSize     = sizeof(void*)/4;
-			internal->hostReturnFloat = false;
-		}
-		else if( objType & asOBJ_APP_CLASS )
-		{
-			internal->hostReturnFloat = false;
-			if( objType & COMPLEX_RETURN_MASK )
-			{
-				internal->hostReturnInMemory = true;
-				internal->hostReturnSize     = sizeof(void*)/4;
-			}
-			else
-			{
-#ifdef HAS_128_BIT_PRIMITIVES
-				if( func->returnType.GetSizeInMemoryDWords() > 4 )
-#else
-				if( func->returnType.GetSizeInMemoryDWords() > 2 )
-#endif
-				{
-					internal->hostReturnInMemory = true;
-					internal->hostReturnSize = sizeof(void*)/4;
-				}
-				else
-				{
-					internal->hostReturnInMemory = false;
-					internal->hostReturnSize     = func->returnType.GetSizeInMemoryDWords();
-#ifdef SPLIT_OBJS_BY_MEMBER_TYPES
-					if( func->returnType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS )
-						internal->hostReturnFloat = true;
-#endif
-				}
-
-#ifdef THISCALL_RETURN_SIMPLE_IN_MEMORY
-				if((internal->callConv == ICC_THISCALL ||
-#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
-					internal->callConv == ICC_VIRTUAL_THISCALL) &&
-#else
-					internal->callConv == ICC_VIRTUAL_THISCALL ||
-					internal->callConv == ICC_THISCALL_OBJFIRST ||
-					internal->callConv == ICC_THISCALL_OBJLAST) &&
-#endif
-					func->returnType.GetSizeInMemoryDWords() >= THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE)
-				{
-					internal->hostReturnInMemory = true;
-					internal->hostReturnSize     = sizeof(void*)/4;
-				}
-#endif
-#ifdef CDECL_RETURN_SIMPLE_IN_MEMORY
-				if((internal->callConv == ICC_CDECL         ||
-					internal->callConv == ICC_CDECL_OBJLAST ||
-					internal->callConv == ICC_CDECL_OBJFIRST) &&
-					func->returnType.GetSizeInMemoryDWords() >= CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE)
-				{
-					internal->hostReturnInMemory = true;
-					internal->hostReturnSize     = sizeof(void*)/4;
-				}
-#endif
-#ifdef STDCALL_RETURN_SIMPLE_IN_MEMORY
-				if( internal->callConv == ICC_STDCALL &&
-					func->returnType.GetSizeInMemoryDWords() >= STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE)
-				{
-					internal->hostReturnInMemory = true;
-					internal->hostReturnSize     = sizeof(void*)/4;
-				}
-#endif
-			}
-
-#ifdef SPLIT_OBJS_BY_MEMBER_TYPES
-			// It's not safe to return objects by value because different registers
-			// will be used depending on the memory layout of the object.
-			// Ref: http://www.x86-64.org/documentation/abi.pdf
-			// Ref: http://www.agner.org/optimize/calling_conventions.pdf
-			// If the application informs that the class should be treated as all integers, then we allow it
-			if( !internal->hostReturnInMemory &&
-			    !(func->returnType.GetTypeInfo()->flags & (asOBJ_APP_CLASS_ALLINTS | asOBJ_APP_CLASS_ALLFLOATS)) )
-			{
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
-
-				asCString str;
-				str.Format(TXT_DONT_SUPPORT_RET_TYPE_s_BY_VAL, func->returnType.Format(func->nameSpace).AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-				engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
-			}
-#endif
-		}
-		else if( objType & asOBJ_APP_PRIMITIVE )
-		{
-			internal->hostReturnInMemory = false;
-			internal->hostReturnSize     = func->returnType.GetSizeInMemoryDWords();
-			internal->hostReturnFloat    = false;
-		}
-		else if( objType & asOBJ_APP_FLOAT )
-		{
-			internal->hostReturnInMemory = false;
-			internal->hostReturnSize     = func->returnType.GetSizeInMemoryDWords();
-			internal->hostReturnFloat    = true;
-		}
-	}
-	// Primitive types can easily be determined
-#ifdef HAS_128_BIT_PRIMITIVES
-	else if( func->returnType.GetSizeInMemoryDWords() > 4 )
-	{
-		// Shouldn't be possible to get here
-		asASSERT(false);
-	}
-	else if( func->returnType.GetSizeInMemoryDWords() == 4 )
-	{
-		internal->hostReturnInMemory = false;
-		internal->hostReturnSize     = 4;
-		internal->hostReturnFloat    = false;
-	}
-#else
-	else if( func->returnType.GetSizeInMemoryDWords() > 2 )
-	{
-		// Shouldn't be possible to get here
-		asASSERT(false);
-	}
-#endif
-	else if( func->returnType.GetSizeInMemoryDWords() == 2 )
-	{
-		internal->hostReturnInMemory = false;
-		internal->hostReturnSize     = 2;
-		internal->hostReturnFloat    = func->returnType.IsEqualExceptConst(asCDataType::CreatePrimitive(ttDouble, true));
-	}
-	else if( func->returnType.GetSizeInMemoryDWords() == 1 )
-	{
-		internal->hostReturnInMemory = false;
-		internal->hostReturnSize     = 1;
-		internal->hostReturnFloat    = func->returnType.IsEqualExceptConst(asCDataType::CreatePrimitive(ttFloat, true));
-	}
-	else
-	{
-		internal->hostReturnInMemory = false;
-		internal->hostReturnSize     = 0;
-		internal->hostReturnFloat    = false;
-	}
-
-	// Calculate the size needed for the parameters
-	internal->paramSize = func->GetSpaceNeededForArguments();
-
-	// Verify if the function takes any objects by value
-	asUINT n;
-	internal->takesObjByVal = false;
-	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( func->parameterTypes[n].IsObject() && !func->parameterTypes[n].IsObjectHandle() && !func->parameterTypes[n].IsReference() )
-		{
-			internal->takesObjByVal = true;
-
-			// Can't pass objects by value unless the application type is informed
-			if( !(func->parameterTypes[n].GetTypeInfo()->flags & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY)) )
-			{
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
-	
-				asCString str;
-				str.Format(TXT_CANNOT_PASS_TYPE_s_BY_VAL, func->parameterTypes[n].GetTypeInfo()->name.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-				engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
-			}
-
-
-#ifdef SPLIT_OBJS_BY_MEMBER_TYPES
-			// It's not safe to pass objects by value because different registers
-			// will be used depending on the memory layout of the object
-			// Ref: http://www.x86-64.org/documentation/abi.pdf
-			// Ref: http://www.agner.org/optimize/calling_conventions.pdf
-			if( 
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-			    !(func->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK) &&
-#endif
-#ifdef LARGE_OBJS_PASS_BY_REF
-			    func->parameterTypes[n].GetSizeInMemoryDWords() < AS_LARGE_OBJ_MIN_SIZE &&
-#endif
-			    !(func->parameterTypes[n].GetTypeInfo()->flags & (asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_CLASS_ALLINTS | asOBJ_APP_CLASS_ALLFLOATS)) )
-			{
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
-
-				asCString str;
-				str.Format(TXT_DONT_SUPPORT_TYPE_s_BY_VAL, func->parameterTypes[n].GetTypeInfo()->name.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-				engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
-			}
-#endif
-			break;
-		}
-	}
-
-	// Prepare the clean up instructions for the function arguments
-	internal->cleanArgs.SetLength(0);
-	int offset = 0;
-	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		asCDataType &dt = func->parameterTypes[n];
-
-#if defined(COMPLEX_OBJS_PASSED_BY_REF) || defined(AS_LARGE_OBJS_PASSED_BY_REF)
-		bool needFree = false;
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-		if( dt.GetTypeInfo() && dt.GetTypeInfo()->flags & COMPLEX_MASK ) needFree = true;
-#endif
-#ifdef AS_LARGE_OBJS_PASSED_BY_REF
-		if( dt.GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ) needFree = true;
-#endif
-		if( needFree &&
-			dt.IsObject() &&
-			!dt.IsObjectHandle() && 
-			!dt.IsReference() )
-		{
-			asSSystemFunctionInterface::SClean clean;
-			clean.op  = 1; // call free
-			clean.ot  = dt.GetTypeInfo()->CastToObjectType();
-			clean.off = short(offset);
-
-#ifndef AS_CALLEE_DESTROY_OBJ_BY_VAL
-			// If the called function doesn't destroy objects passed by value we must do so here
-			asSTypeBehaviour *beh = &dt.GetTypeInfo()->CastToObjectType()->beh;
-			if( beh->destruct )
-				clean.op = 2; // call destruct, then free
-#endif
-
-			internal->cleanArgs.PushLast(clean);
-		}
-#endif
-
-		if( n < internal->paramAutoHandles.GetLength() && internal->paramAutoHandles[n] )
-		{
-			asSSystemFunctionInterface::SClean clean;
-			clean.op  = 0; // call release
-			if (dt.IsFuncdef())
-				clean.ot = &engine->functionBehaviours;
-			else
-				clean.ot  = dt.GetTypeInfo()->CastToObjectType();
-			clean.off = short(offset);
-			internal->cleanArgs.PushLast(clean);
-		}
-
-		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
-			offset += AS_PTR_SIZE;
-		else
-			offset += dt.GetSizeOnStackDWords();
-	}
-#endif // !defined(AS_MAX_PORTABILITY)
-	return 0;
-}
-
-#ifdef AS_MAX_PORTABILITY
-
-int CallSystemFunction(int id, asCContext *context)
-{
-	asCScriptEngine *engine = context->m_engine;
-	asCScriptFunction *func = engine->scriptFunctions[id];
-	asSSystemFunctionInterface *sysFunc = func->sysFuncIntf;
-	int callConv = sysFunc->callConv;
-	if( callConv == ICC_GENERIC_FUNC || callConv == ICC_GENERIC_METHOD )
-		return context->CallGeneric(func);
-
-	context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-
-	return 0;
-}
-
-#else
-
-//
-// CallSystemFunctionNative
-//
-// This function is implemented for each platform where the native calling conventions is supported.
-// See the various as_callfunc_xxx.cpp files for their implementation. It is responsible for preparing
-// the arguments for the function call, calling the function, and then retrieving the return value.
-//
-// Parameters:
-//
-// context    - This is the context that can be used to retrieve specific information from the engine
-// descr      - This is the script function object that holds the information on how to call the function
-// obj        - This is the object pointer, if the call is for a class method, otherwise it is null
-// args       - This is the function arguments, which are packed as in AngelScript
-// retPointer - This points to a the memory buffer where the return object is to be placed, if the function returns the value in memory rather than in registers
-// retQW2     - This output parameter should be used if the function returns a value larger than 64bits in registers
-// secondObj  - This is the object pointer that the proxy method should invoke its method on when the call convention is THISCALL_OBJFIRST/LAST
-//
-// Return value:
-//
-// The function should return the value that is returned in registers. 
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &retQW2, void *secondObj);
-
-
-int CallSystemFunction(int id, asCContext *context)
-{
-	asCScriptEngine            *engine  = context->m_engine;
-	asCScriptFunction          *descr   = engine->scriptFunctions[id];
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-
-	int callConv = sysFunc->callConv;
-	if( callConv == ICC_GENERIC_FUNC || callConv == ICC_GENERIC_METHOD )
-		return context->CallGeneric(descr);
-
-	asQWORD  retQW             = 0;
-	asQWORD  retQW2            = 0;
-	asDWORD *args              = context->m_regs.stackPointer;
-	void    *retPointer        = 0;
-	int      popSize           = sysFunc->paramSize;
-
-#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
-	void    *obj               = 0;
-	void    *secondObj         = 0;
-
-	if( callConv >= ICC_THISCALL )
-	{
-		if(sysFunc->auxiliary)
-		{
-			// This class method is being called as if it is a global function
-			obj = sysFunc->auxiliary;
-		}
-		else
-		{
-			// The object pointer should be popped from the context stack
-			popSize += AS_PTR_SIZE;
-
-			// Check for null pointer
-			obj = (void*)*(asPWORD*)(args);
-			if( obj == 0 )
-			{
-				context->SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return 0;
-			}
-
-			// Add the base offset for multiple inheritance
-#if (defined(__GNUC__) && (defined(AS_ARM) || defined(AS_MIPS))) || defined(AS_PSVITA)
-			// On GNUC + ARM the lsb of the offset is used to indicate a virtual function
-			// and the whole offset is thus shifted one bit left to keep the original
-			// offset resolution
-			// MIPS also work like ARM in this regard
-			obj = (void*)(asPWORD(obj) + (sysFunc->baseOffset>>1));
-#else
-			obj = (void*)(asPWORD(obj) + sysFunc->baseOffset);
-#endif
-
-			// Skip the object pointer
-			args += AS_PTR_SIZE;
-		}
-	}
-#else
-	// TODO: clean-up: CallSystemFunctionNative should have two arguments for object pointers
-	//                 objForThiscall is the object pointer that should be used for the thiscall
-	//                 objForArg is the object pointer that should be passed as argument when using OBJFIRST or OBJLAST
-
-	// Used to save two object pointers with THISCALL_OBJLAST or THISCALL_OBJFIRST
-	void *obj               = 0;
-	void *secondObj         = 0;
-
-	if( callConv >= ICC_THISCALL )
-	{
-		bool continueCheck = true;  // True if need check objectPointer or context stack for object
-		int continueCheckIndex = 0; // Index into objectsPtrs to save the object if continueCheck
-
-		if( callConv >= ICC_THISCALL_OBJLAST )
-		{
-			asASSERT( sysFunc->auxiliary != 0 );
-			// This class method is being called as object method (sysFunc->auxiliary must be set).
-			obj = sysFunc->auxiliary;
-			continueCheckIndex = 1;
-		}
-		else if(sysFunc->auxiliary)
-		{
-			// This class method is being called as if it is a global function
-			obj = sysFunc->auxiliary;
-			continueCheck = false;
-		}
-
-		if( continueCheck )
-		{
-			void *tempPtr = 0;
-
-			// The object pointer should be popped from the context stack
-			popSize += AS_PTR_SIZE;
-
-			// Check for null pointer
-			tempPtr = (void*)*(asPWORD*)(args);
-			if( tempPtr == 0 )
-			{
-				context->SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return 0;
-			}
-
-			// Add the base offset for multiple inheritance
-#if (defined(__GNUC__) && (defined(AS_ARM) || defined(AS_MIPS))) || defined(AS_PSVITA)
-			// On GNUC + ARM the lsb of the offset is used to indicate a virtual function
-			// and the whole offset is thus shifted one bit left to keep the original
-			// offset resolution
-			// MIPS also work like ARM in this regard
-			tempPtr = (void*)(asPWORD(tempPtr) + (sysFunc->baseOffset>>1));
-#else
-			tempPtr = (void*)(asPWORD(tempPtr) + sysFunc->baseOffset);
-#endif
-
-			// Skip the object pointer
-			args += AS_PTR_SIZE;
-
-			if( continueCheckIndex )
-				secondObj = tempPtr;
-			else
-			{
-				asASSERT( obj == 0 );
-				obj = tempPtr;
-			}
-		}
-	}
-#endif // AS_NO_THISCALL_FUNCTOR_METHOD
-
-	if( descr->DoesReturnOnStack() )
-	{
-		// Get the address of the location for the return value from the stack
-		retPointer = (void*)*(asPWORD*)(args);
-		popSize += AS_PTR_SIZE;
-		args += AS_PTR_SIZE;
-
-		// When returning the value on the location allocated by the called 
-		// we shouldn't set the object type in the register
-		context->m_regs.objectType = 0;
-	}
-	else
-	{
-		// Set the object type of the reference held in the register
-		context->m_regs.objectType = descr->returnType.GetTypeInfo();
-	}
-
-	context->m_callingSystemFunction = descr;
-	bool cppException = false;
-#ifdef AS_NO_EXCEPTIONS
-	retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2, secondObj);
-#else
-	// This try/catch block is to catch potential exception that may 
-	// be thrown by the registered function. The implementation of the
-	// CallSystemFunctionNative() must make sure not to have any manual
-	// clean-up after the call to the real function, or that won't be 
-	// executed in case of an exception.
-	try
-	{
-		retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2, secondObj);
-	}
-	catch(...)
-	{
-		cppException = true;
-
-		// Convert the exception to a script exception so the VM can 
-		// properly report the error to the application and then clean up
-		context->SetException(TXT_EXCEPTION_CAUGHT);
-	}
-#endif
-	context->m_callingSystemFunction = 0;
-
-	// Store the returned value in our stack
-	if( (descr->returnType.IsObject() || descr->returnType.IsFuncdef()) && !descr->returnType.IsReference() )
-	{
-		if( descr->returnType.IsObjectHandle() )
-		{
-#if defined(AS_BIG_ENDIAN) && AS_PTR_SIZE == 1
-			// Since we're treating the system function as if it is returning a QWORD we are
-			// actually receiving the value in the high DWORD of retQW.
-			retQW >>= 32;
-#endif
-
-			context->m_regs.objectRegister = (void*)(asPWORD)retQW;
-
-			if( sysFunc->returnAutoHandle && context->m_regs.objectRegister )
-			{
-				asASSERT( !(descr->returnType.GetTypeInfo()->flags & asOBJ_NOCOUNT) );
-				engine->CallObjectMethod(context->m_regs.objectRegister, descr->returnType.GetTypeInfo()->CastToObjectType()->beh.addref);
-			}
-		}
-		else
-		{
-			asASSERT( retPointer );
-
-			if( !sysFunc->hostReturnInMemory )
-			{
-				// Copy the returned value to the pointer sent by the script engine
-				if( sysFunc->hostReturnSize == 1 )
-				{
-#if defined(AS_BIG_ENDIAN) && AS_PTR_SIZE == 1
-					// Since we're treating the system function as if it is returning a QWORD we are
-					// actually receiving the value in the high DWORD of retQW.
-					retQW >>= 32;
-#endif
-
-					*(asDWORD*)retPointer = (asDWORD)retQW;
-				}
-				else if( sysFunc->hostReturnSize == 2 )
-					*(asQWORD*)retPointer = retQW;
-				else if( sysFunc->hostReturnSize == 3 )
-				{
-					*(asQWORD*)retPointer         = retQW;
-					*(((asDWORD*)retPointer) + 2) = (asDWORD)retQW2;
-				}
-				else // if( sysFunc->hostReturnSize == 4 )
-				{
-					*(asQWORD*)retPointer         = retQW;
-					*(((asQWORD*)retPointer) + 1) = retQW2;
-				}
-			}
-
-			if( context->m_status == asEXECUTION_EXCEPTION && !cppException )
-			{
-				// If the function raised a script exception it really shouldn't have 
-				// initialized the object. However, as it is a soft exception there is 
-				// no way for the application to not return a value, so instead we simply
-				// destroy it here, to pretend it was never created.
-				if( descr->returnType.GetTypeInfo()->CastToObjectType()->beh.destruct )
-					engine->CallObjectMethod(retPointer, descr->returnType.GetTypeInfo()->CastToObjectType()->beh.destruct);
-			}
-		}
-	}
-	else
-	{
-		// Store value in value register
-		if( sysFunc->hostReturnSize == 1 )
-		{
-#if defined(AS_BIG_ENDIAN)
-			// Since we're treating the system function as if it is returning a QWORD we are
-			// actually receiving the value in the high DWORD of retQW.
-			retQW >>= 32;
-
-			// Due to endian issues we need to handle return values that are
-			// less than a DWORD (32 bits) in size specially
-			int numBytes = descr->returnType.GetSizeInMemoryBytes();
-			if( descr->returnType.IsReference() ) numBytes = 4;
-			switch( numBytes )
-			{
-			case 1:
-				{
-					// 8 bits
-					asBYTE *val = (asBYTE*)&context->m_regs.valueRegister;
-					val[0] = (asBYTE)retQW;
-					val[1] = 0;
-					val[2] = 0;
-					val[3] = 0;
-					val[4] = 0;
-					val[5] = 0;
-					val[6] = 0;
-					val[7] = 0;
-				}
-				break;
-			case 2:
-				{
-					// 16 bits
-					asWORD *val = (asWORD*)&context->m_regs.valueRegister;
-					val[0] = (asWORD)retQW;
-					val[1] = 0;
-					val[2] = 0;
-					val[3] = 0;
-				}
-				break;
-			default:
-				{
-					// 32 bits
-					asDWORD *val = (asDWORD*)&context->m_regs.valueRegister;
-					val[0] = (asDWORD)retQW;
-					val[1] = 0;
-				}
-				break;
-			}
-#else
-			*(asDWORD*)&context->m_regs.valueRegister = (asDWORD)retQW;
-#endif
-		}
-		else
-			context->m_regs.valueRegister = retQW;
-	}
-
-	// Clean up arguments
-	const asUINT cleanCount = sysFunc->cleanArgs.GetLength();
-	if( cleanCount )
-	{
-		args = context->m_regs.stackPointer;
-
-		// Skip the hidden argument for the return pointer
-		// TODO: runtime optimize: This check and increment should have been done in PrepareSystemFunction
-		if( descr->DoesReturnOnStack() )
-			args += AS_PTR_SIZE;
-
-		// Skip the object pointer on the stack
-		// TODO: runtime optimize: This check and increment should have been done in PrepareSystemFunction
-		if( callConv >= ICC_THISCALL && sysFunc->auxiliary == 0 )
-			args += AS_PTR_SIZE;
-
-		asSSystemFunctionInterface::SClean *clean = sysFunc->cleanArgs.AddressOf();
-		for( asUINT n = 0; n < cleanCount; n++, clean++ )
-		{
-			void **addr = (void**)&args[clean->off];
-			if( clean->op == 0 )
-			{
-				if( *addr != 0 )
-				{
-					engine->CallObjectMethod(*addr, clean->ot->beh.release);
-					*addr = 0;
-				}
-			}
-			else 
-			{
-				asASSERT( clean->op == 1 || clean->op == 2 );
-				asASSERT( *addr );
-
-				if( clean->op == 2 )
-					engine->CallObjectMethod(*addr, clean->ot->beh.destruct);
-				
-				engine->CallFree(*addr);
-			}
-		}
-	}
-
-	return popSize;
-}
-
-#endif // AS_MAX_PORTABILITY
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc.cpp
+//
+// These functions handle the actual calling of system functions
+//
+
+
+
+#include "as_config.h"
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_context.h"
+
+BEGIN_AS_NAMESPACE
+
+// ref: Member Function Pointers and the Fastest Possible C++ Delegates
+//      describes the structure of class method pointers for most compilers
+//      http://www.codeproject.com/Articles/7150/Member-Function-Pointers-and-the-Fastest-Possible
+
+// ref: The code comments for ItaniumCXXABI::EmitLoadOfMemberFunctionPointer in the LLVM compiler
+//      describes the structure for class method pointers on Itanium and arm64 ABI
+//      http://clang.llvm.org/doxygen/CodeGen_2ItaniumCXXABI_8cpp_source.html#l00937
+
+int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv, void *auxiliary, asSSystemFunctionInterface *internal)
+{
+	internal->Clear();
+	internal->func      = ptr.ptr.f.func;
+	internal->auxiliary = 0;
+
+	// Was a compatible calling convention specified?
+	if( internal->func )
+	{
+		if( ptr.flag == 1 && callConv != asCALL_GENERIC )
+			return asWRONG_CALLING_CONV;
+		else if( ptr.flag == 2 && (callConv == asCALL_GENERIC || callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL || callConv == asCALL_THISCALL_OBJFIRST || callConv == asCALL_THISCALL_OBJLAST) )
+			return asWRONG_CALLING_CONV;
+		else if( ptr.flag == 3 && !(callConv == asCALL_THISCALL || callConv == asCALL_THISCALL_ASGLOBAL || callConv == asCALL_THISCALL_OBJFIRST || callConv == asCALL_THISCALL_OBJLAST) )
+			return asWRONG_CALLING_CONV;
+	}
+
+	asDWORD base = callConv;
+	if( !isMethod )
+	{
+		if( base == asCALL_CDECL )
+			internal->callConv = ICC_CDECL;
+		else if( base == asCALL_STDCALL )
+			internal->callConv = ICC_STDCALL;
+		else if( base == asCALL_THISCALL_ASGLOBAL )
+		{
+			if(auxiliary == 0)
+				return asINVALID_ARG;
+			internal->auxiliary = auxiliary;
+			internal->callConv  = ICC_THISCALL;
+
+			// This is really a thiscall, so it is necessary to check for virtual method pointers
+			base = asCALL_THISCALL;
+			isMethod = true;
+		}
+		else if (base == asCALL_GENERIC)
+		{
+			internal->callConv = ICC_GENERIC_FUNC;
+
+			// The auxiliary object is optional for generic calling convention
+			internal->auxiliary = auxiliary;
+		}
+		else
+			return asNOT_SUPPORTED;
+	}
+
+	if( isMethod )
+	{
+#ifndef AS_NO_CLASS_METHODS
+		if( base == asCALL_THISCALL || base == asCALL_THISCALL_OBJFIRST || base == asCALL_THISCALL_OBJLAST )
+		{
+			internalCallConv thisCallConv;
+			if( base == asCALL_THISCALL )
+			{
+				if(callConv != asCALL_THISCALL_ASGLOBAL && auxiliary)
+					return asINVALID_ARG;
+
+				thisCallConv = ICC_THISCALL;
+			}
+			else
+			{
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+				return asNOT_SUPPORTED;
+#else
+				if(auxiliary == 0)
+					return asINVALID_ARG;
+
+				internal->auxiliary = auxiliary;
+				if( base == asCALL_THISCALL_OBJFIRST )
+					thisCallConv = ICC_THISCALL_OBJFIRST;
+				else //if( base == asCALL_THISCALL_OBJLAST )
+					thisCallConv = ICC_THISCALL_OBJLAST;
+#endif
+			}
+
+			internal->callConv = thisCallConv;
+#ifdef GNU_STYLE_VIRTUAL_METHOD
+			if( (size_t(ptr.ptr.f.func) & 1) )
+				internal->callConv = (internalCallConv)(thisCallConv + 2);
+#endif
+			internal->baseOffset = ( int )MULTI_BASE_OFFSET(ptr);
+#if (defined(AS_ARM64) || defined(AS_ARM) || defined(AS_MIPS)) && (defined(__GNUC__) || defined(AS_PSVITA))
+			// As the least significant bit in func is used to switch to THUMB mode
+			// on ARM processors, the LSB in the __delta variable is used instead of
+			// the one in __pfn on ARM processors.
+			// MIPS also appear to use the base offset to indicate virtual method.
+			if( (size_t(internal->baseOffset) & 1) )
+				internal->callConv = (internalCallConv)(thisCallConv + 2);
+#endif
+
+#ifdef HAVE_VIRTUAL_BASE_OFFSET
+			// We don't support virtual inheritance
+			if( VIRTUAL_BASE_OFFSET(ptr) != 0 )
+				return asNOT_SUPPORTED;
+#endif
+		}
+		else
+#endif
+		if( base == asCALL_CDECL_OBJLAST )
+			internal->callConv = ICC_CDECL_OBJLAST;
+		else if( base == asCALL_CDECL_OBJFIRST )
+			internal->callConv = ICC_CDECL_OBJFIRST;
+		else if (base == asCALL_GENERIC)
+		{
+			internal->callConv = ICC_GENERIC_METHOD;
+			internal->auxiliary = auxiliary;
+		}
+		else
+			return asNOT_SUPPORTED;
+	}
+
+	return 0;
+}
+
+// This function should prepare system functions so that it will be faster to call them
+int PrepareSystemFunctionGeneric(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine)
+{
+	asASSERT(internal->callConv == ICC_GENERIC_METHOD || internal->callConv == ICC_GENERIC_FUNC);
+
+	// Calculate the size needed for the parameters
+	internal->paramSize = func->GetSpaceNeededForArguments();
+
+	// Prepare the clean up instructions for the function arguments
+	internal->cleanArgs.SetLength(0);
+	int offset = 0;
+	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
+	{
+		asCDataType &dt = func->parameterTypes[n];
+
+		if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsReference() )
+		{
+			if (dt.IsFuncdef())
+			{
+				// If the generic call mode is set to old behaviour then always release handles
+				// else only release the handle if the function is declared with auto handles
+				if (engine->ep.genericCallMode == 0 || (internal->paramAutoHandles.GetLength() > n && internal->paramAutoHandles[n]))
+				{
+					asSSystemFunctionInterface::SClean clean;
+					clean.op = 0; // call release
+					clean.ot = &engine->functionBehaviours;
+					clean.off = short(offset);
+					internal->cleanArgs.PushLast(clean);
+				}
+			}
+			else if( dt.GetTypeInfo()->flags & asOBJ_REF )
+			{
+				// If the generic call mode is set to old behaviour then always release handles
+				// else only release the handle if the function is declared with auto handles
+				if (!dt.IsObjectHandle() ||
+					engine->ep.genericCallMode == 0 || 
+					(internal->paramAutoHandles.GetLength() > n && internal->paramAutoHandles[n]) )
+				{
+					asSTypeBehaviour *beh = &CastToObjectType(dt.GetTypeInfo())->beh;
+					asASSERT((dt.GetTypeInfo()->flags & asOBJ_NOCOUNT) || beh->release);
+					if (beh->release)
+					{
+						asSSystemFunctionInterface::SClean clean;
+						clean.op = 0; // call release
+						clean.ot = CastToObjectType(dt.GetTypeInfo());
+						clean.off = short(offset);
+						internal->cleanArgs.PushLast(clean);
+					}
+				}
+			}
+			else
+			{
+				asSSystemFunctionInterface::SClean clean;
+				clean.op  = 1; // call free
+				clean.ot  = CastToObjectType(dt.GetTypeInfo());
+				clean.off = short(offset);
+
+				// Call the destructor then free the memory
+				asSTypeBehaviour *beh = &CastToObjectType(dt.GetTypeInfo())->beh;
+				if( beh->destruct )
+					clean.op = 2; // call destruct, then free
+
+				internal->cleanArgs.PushLast(clean);
+			}
+		}
+
+		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
+			offset += AS_PTR_SIZE;
+		else
+			offset += dt.GetSizeOnStackDWords();
+	}
+
+	return 0;
+}
+
+// This function should prepare system functions so that it will be faster to call them
+int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine)
+{
+#ifdef AS_MAX_PORTABILITY
+	UNUSED_VAR(func);
+	UNUSED_VAR(internal);
+	UNUSED_VAR(engine);
+
+	// This should never happen, as when AS_MAX_PORTABILITY is on, all functions
+	// are asCALL_GENERIC, which are prepared by PrepareSystemFunctionGeneric
+	asASSERT(false);
+#else
+	// References are always returned as primitive data
+	if( func->returnType.IsReference() || func->returnType.IsObjectHandle() )
+	{
+		internal->hostReturnInMemory = false;
+		internal->hostReturnSize     = sizeof(void*)/4;
+		internal->hostReturnFloat    = false;
+	}
+	// Registered types have special flags that determine how they are returned
+	else if( func->returnType.IsObject() )
+	{
+		asDWORD objType = func->returnType.GetTypeInfo()->flags;
+
+		// Only value types can be returned by value
+		asASSERT( objType & asOBJ_VALUE );
+
+		if( !(objType & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY)) )
+		{
+			// If the return is by value then we need to know the true type
+			engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
+
+			asCString str;
+			str.Format(TXT_CANNOT_RET_TYPE_s_BY_VAL, func->returnType.GetTypeInfo()->name.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
+		}
+		else if( objType & asOBJ_APP_ARRAY )
+		{
+			// Array types are always returned in memory
+			internal->hostReturnInMemory = true;
+			internal->hostReturnSize     = sizeof(void*)/4;
+			internal->hostReturnFloat = false;
+		}
+		else if( objType & asOBJ_APP_CLASS )
+		{
+			internal->hostReturnFloat = false;
+			if( objType & COMPLEX_RETURN_MASK )
+			{
+				internal->hostReturnInMemory = true;
+				internal->hostReturnSize     = sizeof(void*)/4;
+			}
+			else
+			{
+#ifdef HAS_128_BIT_PRIMITIVES
+				if( func->returnType.GetSizeInMemoryDWords() > 4 )
+#else
+				if( func->returnType.GetSizeInMemoryDWords() > 2 )
+#endif
+				{
+					internal->hostReturnInMemory = true;
+					internal->hostReturnSize = sizeof(void*)/4;
+				}
+				else
+				{
+					internal->hostReturnInMemory = false;
+					internal->hostReturnSize     = func->returnType.GetSizeInMemoryDWords();
+#ifdef SPLIT_OBJS_BY_MEMBER_TYPES
+					if( func->returnType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS )
+						internal->hostReturnFloat = true;
+#endif
+				}
+
+#ifdef THISCALL_RETURN_SIMPLE_IN_MEMORY
+				if((internal->callConv == ICC_THISCALL ||
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+					internal->callConv == ICC_VIRTUAL_THISCALL) &&
+#else
+					internal->callConv == ICC_VIRTUAL_THISCALL ||
+					internal->callConv == ICC_THISCALL_OBJFIRST ||
+					internal->callConv == ICC_THISCALL_OBJLAST) &&
+#endif
+					func->returnType.GetSizeInMemoryDWords() >= THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE)
+				{
+					internal->hostReturnInMemory = true;
+					internal->hostReturnSize     = sizeof(void*)/4;
+				}
+#endif
+#ifdef CDECL_RETURN_SIMPLE_IN_MEMORY
+				if((internal->callConv == ICC_CDECL         ||
+					internal->callConv == ICC_CDECL_OBJLAST ||
+					internal->callConv == ICC_CDECL_OBJFIRST) &&
+					func->returnType.GetSizeInMemoryDWords() >= CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE)
+				{
+					internal->hostReturnInMemory = true;
+					internal->hostReturnSize     = sizeof(void*)/4;
+				}
+#endif
+#ifdef STDCALL_RETURN_SIMPLE_IN_MEMORY
+				if( internal->callConv == ICC_STDCALL &&
+					func->returnType.GetSizeInMemoryDWords() >= STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE)
+				{
+					internal->hostReturnInMemory = true;
+					internal->hostReturnSize     = sizeof(void*)/4;
+				}
+#endif
+			}
+
+#ifdef SPLIT_OBJS_BY_MEMBER_TYPES
+			// It's not safe to return objects by value because different registers
+			// will be used depending on the memory layout of the object.
+			// Ref: http://www.x86-64.org/documentation/abi.pdf
+			// Ref: http://www.agner.org/optimize/calling_conventions.pdf
+			// If the application informs that the class should be treated as all integers, then we allow it
+			if( !internal->hostReturnInMemory &&
+			    !(func->returnType.GetTypeInfo()->flags & (asOBJ_APP_CLASS_ALLINTS | asOBJ_APP_CLASS_ALLFLOATS)) )
+			{
+				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
+
+				asCString str;
+				str.Format(TXT_DONT_SUPPORT_RET_TYPE_s_BY_VAL, func->returnType.Format(func->nameSpace).AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+				engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
+			}
+#endif
+		}
+		else if( objType & asOBJ_APP_PRIMITIVE )
+		{
+			internal->hostReturnInMemory = false;
+			internal->hostReturnSize     = func->returnType.GetSizeInMemoryDWords();
+			internal->hostReturnFloat    = false;
+		}
+		else if( objType & asOBJ_APP_FLOAT )
+		{
+			internal->hostReturnInMemory = false;
+			internal->hostReturnSize     = func->returnType.GetSizeInMemoryDWords();
+			internal->hostReturnFloat    = true;
+		}
+	}
+	// Primitive types can easily be determined
+#ifdef HAS_128_BIT_PRIMITIVES
+	else if( func->returnType.GetSizeInMemoryDWords() > 4 )
+	{
+		// Shouldn't be possible to get here
+		asASSERT(false);
+	}
+	else if( func->returnType.GetSizeInMemoryDWords() == 4 )
+	{
+		internal->hostReturnInMemory = false;
+		internal->hostReturnSize     = 4;
+		internal->hostReturnFloat    = false;
+	}
+#else
+	else if( func->returnType.GetSizeInMemoryDWords() > 2 )
+	{
+		// Shouldn't be possible to get here
+		asASSERT(false);
+	}
+#endif
+	else if( func->returnType.GetSizeInMemoryDWords() == 2 )
+	{
+		internal->hostReturnInMemory = false;
+		internal->hostReturnSize     = 2;
+		internal->hostReturnFloat    = func->returnType.IsEqualExceptConst(asCDataType::CreatePrimitive(ttDouble, true));
+	}
+	else if( func->returnType.GetSizeInMemoryDWords() == 1 )
+	{
+		internal->hostReturnInMemory = false;
+		internal->hostReturnSize     = 1;
+		internal->hostReturnFloat    = func->returnType.IsEqualExceptConst(asCDataType::CreatePrimitive(ttFloat, true));
+	}
+	else
+	{
+		internal->hostReturnInMemory = false;
+		internal->hostReturnSize     = 0;
+		internal->hostReturnFloat    = false;
+	}
+
+	// Calculate the size needed for the parameters
+	internal->paramSize = func->GetSpaceNeededForArguments();
+
+	// Verify if the function takes any objects by value
+	asUINT n;
+	internal->takesObjByVal = false;
+	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
+	{
+		if( func->parameterTypes[n].IsObject() && !func->parameterTypes[n].IsObjectHandle() && !func->parameterTypes[n].IsReference() )
+		{
+			internal->takesObjByVal = true;
+
+			// Can't pass objects by value unless the application type is informed
+			if( !(func->parameterTypes[n].GetTypeInfo()->flags & (asOBJ_APP_CLASS | asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY)) )
+			{
+				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
+
+				asCString str;
+				str.Format(TXT_CANNOT_PASS_TYPE_s_BY_VAL, func->parameterTypes[n].GetTypeInfo()->name.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+				engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
+			}
+
+
+#ifdef SPLIT_OBJS_BY_MEMBER_TYPES
+			// It's not safe to pass objects by value because different registers
+			// will be used depending on the memory layout of the object
+			// Ref: http://www.x86-64.org/documentation/abi.pdf
+			// Ref: http://www.agner.org/optimize/calling_conventions.pdf
+			if(
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+			    !(func->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK) &&
+#endif
+#ifdef LARGE_OBJS_PASS_BY_REF
+			    func->parameterTypes[n].GetSizeInMemoryDWords() < AS_LARGE_OBJ_MIN_SIZE &&
+#endif
+			    !(func->parameterTypes[n].GetTypeInfo()->flags & (asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_CLASS_ALLINTS | asOBJ_APP_CLASS_ALLFLOATS)) )
+			{
+				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, func->GetDeclarationStr().AddressOf());
+
+				asCString str;
+				str.Format(TXT_DONT_SUPPORT_TYPE_s_BY_VAL, func->parameterTypes[n].GetTypeInfo()->name.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+				engine->ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
+			}
+#endif
+			break;
+		}
+	}
+
+	// Prepare the clean up instructions for the function arguments
+	internal->cleanArgs.SetLength(0);
+	int offset = 0;
+	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
+	{
+		asCDataType &dt = func->parameterTypes[n];
+
+#if defined(COMPLEX_OBJS_PASSED_BY_REF) || defined(AS_LARGE_OBJS_PASSED_BY_REF)
+		bool needFree = false;
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+		if( dt.GetTypeInfo() && dt.GetTypeInfo()->flags & COMPLEX_MASK ) needFree = true;
+#endif
+#ifdef AS_LARGE_OBJS_PASSED_BY_REF
+		if( dt.GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ) needFree = true;
+#endif
+		if( needFree &&
+			dt.IsObject() &&
+			!dt.IsObjectHandle() &&
+			!dt.IsReference() )
+		{
+			asSSystemFunctionInterface::SClean clean;
+			clean.op  = 1; // call free
+			clean.ot  = CastToObjectType(dt.GetTypeInfo());
+			clean.off = short(offset);
+
+#ifndef AS_CALLEE_DESTROY_OBJ_BY_VAL
+			// If the called function doesn't destroy objects passed by value we must do so here
+			asSTypeBehaviour *beh = &CastToObjectType(dt.GetTypeInfo())->beh;
+			if( beh->destruct )
+				clean.op = 2; // call destruct, then free
+#endif
+
+			internal->cleanArgs.PushLast(clean);
+		}
+#endif
+
+		if( n < internal->paramAutoHandles.GetLength() && internal->paramAutoHandles[n] )
+		{
+			asSSystemFunctionInterface::SClean clean;
+			clean.op  = 0; // call release
+			if (dt.IsFuncdef())
+				clean.ot = &engine->functionBehaviours;
+			else
+				clean.ot  = CastToObjectType(dt.GetTypeInfo());
+			clean.off = short(offset);
+			internal->cleanArgs.PushLast(clean);
+		}
+
+		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
+			offset += AS_PTR_SIZE;
+		else
+			offset += dt.GetSizeOnStackDWords();
+	}
+#endif // !defined(AS_MAX_PORTABILITY)
+	return 0;
+}
+
+#ifdef AS_MAX_PORTABILITY
+
+int CallSystemFunction(int id, asCContext *context)
+{
+	asCScriptEngine *engine = context->m_engine;
+	asCScriptFunction *func = engine->scriptFunctions[id];
+	asSSystemFunctionInterface *sysFunc = func->sysFuncIntf;
+	int callConv = sysFunc->callConv;
+	if( callConv == ICC_GENERIC_FUNC || callConv == ICC_GENERIC_METHOD )
+		return context->CallGeneric(func);
+
+	context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+
+	return 0;
+}
+
+#else
+
+//
+// CallSystemFunctionNative
+//
+// This function is implemented for each platform where the native calling conventions is supported.
+// See the various as_callfunc_xxx.cpp files for their implementation. It is responsible for preparing
+// the arguments for the function call, calling the function, and then retrieving the return value.
+//
+// Parameters:
+//
+// context    - This is the context that can be used to retrieve specific information from the engine
+// descr      - This is the script function object that holds the information on how to call the function
+// obj        - This is the object pointer, if the call is for a class method, otherwise it is null
+// args       - This is the function arguments, which are packed as in AngelScript
+// retPointer - This points to a the memory buffer where the return object is to be placed, if the function returns the value in memory rather than in registers
+// retQW2     - This output parameter should be used if the function returns a value larger than 64bits in registers
+// secondObj  - This is the object pointer that the proxy method should invoke its method on when the call convention is THISCALL_OBJFIRST/LAST
+//
+// Return value:
+//
+// The function should return the value that is returned in registers.
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &retQW2, void *secondObj);
+
+
+int CallSystemFunction(int id, asCContext *context)
+{
+	asCScriptEngine            *engine  = context->m_engine;
+	asCScriptFunction          *descr   = engine->scriptFunctions[id];
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+
+	int callConv = sysFunc->callConv;
+	if( callConv == ICC_GENERIC_FUNC || callConv == ICC_GENERIC_METHOD )
+		return context->CallGeneric(descr);
+
+	asQWORD  retQW             = 0;
+	asQWORD  retQW2            = 0;
+	asDWORD *args              = context->m_regs.stackPointer;
+	void    *retPointer        = 0;
+	int      popSize           = sysFunc->paramSize;
+
+	// TODO: clean-up: CallSystemFunctionNative should have two arguments for object pointers
+	//                 objForThiscall is the object pointer that should be used for the thiscall
+	//                 objForArg is the object pointer that should be passed as argument when using OBJFIRST or OBJLAST
+
+	// Used to save two object pointers with THISCALL_OBJLAST or THISCALL_OBJFIRST
+	void *obj = 0;
+	void *secondObj = 0;
+
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+	if( callConv >= ICC_THISCALL )
+	{
+		if(sysFunc->auxiliary)
+		{
+			// This class method is being called as if it is a global function
+			obj = sysFunc->auxiliary;
+		}
+		else
+		{
+			// The object pointer should be popped from the context stack
+			popSize += AS_PTR_SIZE;
+
+			// Check for null pointer
+			obj = (void*)*(asPWORD*)(args);
+			if( obj == 0 )
+			{
+				context->SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return 0;
+			}
+
+			// Skip the object pointer
+			args += AS_PTR_SIZE;
+		}
+		
+		// Add the base offset for multiple inheritance
+#if (defined(__GNUC__) && (defined(AS_ARM64) || defined(AS_ARM) || defined(AS_MIPS))) || defined(AS_PSVITA)
+		// On GNUC + ARM the lsb of the offset is used to indicate a virtual function
+		// and the whole offset is thus shifted one bit left to keep the original
+		// offset resolution
+		// MIPS also work like ARM in this regard
+		obj = (void*)(asPWORD(obj) + (sysFunc->baseOffset>>1));
+#else
+		obj = (void*)(asPWORD(obj) + sysFunc->baseOffset);
+#endif		
+	}
+#else // !defined(AS_NO_THISCALL_FUNCTOR_METHOD)
+
+	if( callConv >= ICC_THISCALL )
+	{
+		bool continueCheck = true;  // True if need check objectPointer or context stack for object
+		int continueCheckIndex = 0; // Index into objectsPtrs to save the object if continueCheck
+
+		if( callConv >= ICC_THISCALL_OBJLAST )
+		{
+			asASSERT( sysFunc->auxiliary != 0 );
+			// This class method is being called as object method (sysFunc->auxiliary must be set).
+			obj = sysFunc->auxiliary;
+			continueCheckIndex = 1;
+		}
+		else if(sysFunc->auxiliary)
+		{
+			// This class method is being called as if it is a global function
+			obj = sysFunc->auxiliary;
+			continueCheck = false;
+		}
+		
+		if( obj )
+		{
+			// Add the base offset for multiple inheritance
+#if (defined(__GNUC__) && (defined(AS_ARM64) || defined(AS_ARM) || defined(AS_MIPS))) || defined(AS_PSVITA)
+			// On GNUC + ARM the lsb of the offset is used to indicate a virtual function
+			// and the whole offset is thus shifted one bit left to keep the original
+			// offset resolution
+			// MIPS also work like ARM in this regard
+			obj = (void*)(asPWORD(obj) + (sysFunc->baseOffset>>1));
+#else
+			obj = (void*)(asPWORD(obj) + sysFunc->baseOffset);
+#endif		
+		}
+
+		if( continueCheck )
+		{
+			void *tempPtr = 0;
+
+			// The object pointer should be popped from the context stack
+			popSize += AS_PTR_SIZE;
+
+			// Check for null pointer
+			tempPtr = (void*)*(asPWORD*)(args);
+			if( tempPtr == 0 )
+			{
+				context->SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return 0;
+			}
+
+			// Add the base offset for multiple inheritance
+#if (defined(__GNUC__) && (defined(AS_ARM64) || defined(AS_ARM) || defined(AS_MIPS))) || defined(AS_PSVITA)
+			// On GNUC + ARM the lsb of the offset is used to indicate a virtual function
+			// and the whole offset is thus shifted one bit left to keep the original
+			// offset resolution
+			// MIPS also work like ARM in this regard
+			tempPtr = (void*)(asPWORD(tempPtr) + (sysFunc->baseOffset>>1));
+#else
+			tempPtr = (void*)(asPWORD(tempPtr) + sysFunc->baseOffset);
+#endif
+
+			// Skip the object pointer
+			args += AS_PTR_SIZE;
+
+			if( continueCheckIndex )
+				secondObj = tempPtr;
+			else
+			{
+				asASSERT( obj == 0 );
+				obj = tempPtr;
+			}
+		}
+	}
+#endif // AS_NO_THISCALL_FUNCTOR_METHOD
+
+	if( descr->DoesReturnOnStack() )
+	{
+		// Get the address of the location for the return value from the stack
+		retPointer = (void*)*(asPWORD*)(args);
+		popSize += AS_PTR_SIZE;
+		args += AS_PTR_SIZE;
+
+		// When returning the value on the location allocated by the called
+		// we shouldn't set the object type in the register
+		context->m_regs.objectType = 0;
+	}
+	else
+	{
+		// Set the object type of the reference held in the register
+		context->m_regs.objectType = descr->returnType.GetTypeInfo();
+	}
+
+	// For composition we need to add the offset and/or dereference the pointer
+	if(obj)
+	{
+		obj = (void*) ((char*) obj + sysFunc->compositeOffset);
+		if(sysFunc->isCompositeIndirect) obj = *((void**)obj);
+	}
+
+	context->m_callingSystemFunction = descr;
+	bool cppException = false;
+#ifdef AS_NO_EXCEPTIONS
+	retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2, secondObj);
+#else
+	// This try/catch block is to catch potential exception that may
+	// be thrown by the registered function. The implementation of the
+	// CallSystemFunctionNative() must make sure not to have any manual
+	// clean-up after the call to the real function, or that won't be
+	// executed in case of an exception.
+	try
+	{
+		retQW = CallSystemFunctionNative(context, descr, obj, args, sysFunc->hostReturnInMemory ? retPointer : 0, retQW2, secondObj);
+	}
+	catch(...)
+	{
+		cppException = true;
+
+		// Convert the exception to a script exception so the VM can
+		// properly report the error to the application and then clean up
+		context->HandleAppException();
+	}
+#endif
+	context->m_callingSystemFunction = 0;
+
+	// Store the returned value in our stack
+	if( (descr->returnType.IsObject() || descr->returnType.IsFuncdef()) && !descr->returnType.IsReference() )
+	{
+		if( descr->returnType.IsObjectHandle() )
+		{
+#if defined(AS_BIG_ENDIAN) && AS_PTR_SIZE == 1
+			// Since we're treating the system function as if it is returning a QWORD we are
+			// actually receiving the value in the high DWORD of retQW.
+			retQW >>= 32;
+#endif
+
+			context->m_regs.objectRegister = (void*)(asPWORD)retQW;
+
+			if( sysFunc->returnAutoHandle && context->m_regs.objectRegister )
+			{
+				asASSERT( !(descr->returnType.GetTypeInfo()->flags & asOBJ_NOCOUNT) );
+				engine->CallObjectMethod(context->m_regs.objectRegister, CastToObjectType(descr->returnType.GetTypeInfo())->beh.addref);
+			}
+		}
+		else
+		{
+			asASSERT( retPointer );
+
+			if( !sysFunc->hostReturnInMemory )
+			{
+				// Copy the returned value to the pointer sent by the script engine
+				if( sysFunc->hostReturnSize == 1 )
+				{
+#if defined(AS_BIG_ENDIAN) && AS_PTR_SIZE == 1
+					// Since we're treating the system function as if it is returning a QWORD we are
+					// actually receiving the value in the high DWORD of retQW.
+					retQW >>= 32;
+#endif
+
+					*(asDWORD*)retPointer = (asDWORD)retQW;
+				}
+				else if( sysFunc->hostReturnSize == 2 )
+					*(asQWORD*)retPointer = retQW;
+				else if( sysFunc->hostReturnSize == 3 )
+				{
+					*(asQWORD*)retPointer         = retQW;
+					*(((asDWORD*)retPointer) + 2) = (asDWORD)retQW2;
+				}
+				else // if( sysFunc->hostReturnSize == 4 )
+				{
+					*(asQWORD*)retPointer         = retQW;
+					*(((asQWORD*)retPointer) + 1) = retQW2;
+				}
+			}
+
+			if( context->m_status == asEXECUTION_EXCEPTION && !cppException )
+			{
+				// If the function raised a script exception it really shouldn't have
+				// initialized the object. However, as it is a soft exception there is
+				// no way for the application to not return a value, so instead we simply
+				// destroy it here, to pretend it was never created.
+				if(CastToObjectType(descr->returnType.GetTypeInfo())->beh.destruct )
+					engine->CallObjectMethod(retPointer, CastToObjectType(descr->returnType.GetTypeInfo())->beh.destruct);
+			}
+		}
+	}
+	else
+	{
+		// Store value in value register
+		if( sysFunc->hostReturnSize == 1 )
+		{
+#if defined(AS_BIG_ENDIAN)
+			// Since we're treating the system function as if it is returning a QWORD we are
+			// actually receiving the value in the high DWORD of retQW.
+			retQW >>= 32;
+
+			// Due to endian issues we need to handle return values that are
+			// less than a DWORD (32 bits) in size specially
+			int numBytes = descr->returnType.GetSizeInMemoryBytes();
+			if( descr->returnType.IsReference() ) numBytes = 4;
+			switch( numBytes )
+			{
+			case 1:
+				{
+					// 8 bits
+					asBYTE *val = (asBYTE*)&context->m_regs.valueRegister;
+					val[0] = (asBYTE)retQW;
+					val[1] = 0;
+					val[2] = 0;
+					val[3] = 0;
+					val[4] = 0;
+					val[5] = 0;
+					val[6] = 0;
+					val[7] = 0;
+				}
+				break;
+			case 2:
+				{
+					// 16 bits
+					asWORD *val = (asWORD*)&context->m_regs.valueRegister;
+					val[0] = (asWORD)retQW;
+					val[1] = 0;
+					val[2] = 0;
+					val[3] = 0;
+				}
+				break;
+			default:
+				{
+					// 32 bits
+					asDWORD *val = (asDWORD*)&context->m_regs.valueRegister;
+					val[0] = (asDWORD)retQW;
+					val[1] = 0;
+				}
+				break;
+			}
+#else
+			*(asDWORD*)&context->m_regs.valueRegister = (asDWORD)retQW;
+#endif
+		}
+		else
+			context->m_regs.valueRegister = retQW;
+	}
+
+	// Clean up arguments
+	const asUINT cleanCount = sysFunc->cleanArgs.GetLength();
+	if( cleanCount )
+	{
+		args = context->m_regs.stackPointer;
+
+		// Skip the hidden argument for the return pointer
+		// TODO: runtime optimize: This check and increment should have been done in PrepareSystemFunction
+		if( descr->DoesReturnOnStack() )
+			args += AS_PTR_SIZE;
+
+		// Skip the object pointer on the stack
+		// TODO: runtime optimize: This check and increment should have been done in PrepareSystemFunction
+		if( callConv >= ICC_THISCALL && sysFunc->auxiliary == 0 )
+			args += AS_PTR_SIZE;
+
+		asSSystemFunctionInterface::SClean *clean = sysFunc->cleanArgs.AddressOf();
+		for( asUINT n = 0; n < cleanCount; n++, clean++ )
+		{
+			void **addr = (void**)&args[clean->off];
+			if( clean->op == 0 )
+			{
+				if( *addr != 0 )
+				{
+					engine->CallObjectMethod(*addr, clean->ot->beh.release);
+					*addr = 0;
+				}
+			}
+			else
+			{
+				asASSERT( clean->op == 1 || clean->op == 2 );
+				asASSERT( *addr );
+
+				if( clean->op == 2 )
+					engine->CallObjectMethod(*addr, clean->ot->beh.destruct);
+
+				engine->CallFree(*addr);
+			}
+		}
+	}
+
+	return popSize;
+}
+
+#endif // AS_MAX_PORTABILITY
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_callfunc.h b/Sources/AngelScript/source/as_callfunc.h
old mode 100755
new mode 100644
index f2eee7f54..8bb6ffe31
--- a/Sources/AngelScript/source/as_callfunc.h
+++ b/Sources/AngelScript/source/as_callfunc.h
@@ -1,150 +1,176 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc.h
-//
-// These functions handle the actual calling of system functions
-//
-
-
-#ifndef AS_CALLFUNC_H
-#define AS_CALLFUNC_H
-
-#include "as_array.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCContext;
-class asCScriptEngine;
-class asCScriptFunction;
-class asCObjectType;
-struct asSSystemFunctionInterface;
-
-int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv, void *auxiliary, asSSystemFunctionInterface *internal);
-
-int PrepareSystemFunctionGeneric(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
-
-int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
-
-int CallSystemFunction(int id, asCContext *context);
-
-inline asPWORD FuncPtrToUInt(asFUNCTION_t func)
-{
-	// A little trickery as the C++ standard doesn't allow direct 
-	// conversion between function pointer and data pointer
-	union { asFUNCTION_t func; asPWORD idx; } u;
-	u.func = func;
-
-	return u.idx;
-}
-
-enum internalCallConv
-{
-	ICC_GENERIC_FUNC,
-	ICC_GENERIC_FUNC_RETURNINMEM, // never used
-	ICC_CDECL,
-	ICC_CDECL_RETURNINMEM,
-	ICC_STDCALL,
-	ICC_STDCALL_RETURNINMEM,
-	ICC_THISCALL,
-	ICC_THISCALL_RETURNINMEM,
-	ICC_VIRTUAL_THISCALL,
-	ICC_VIRTUAL_THISCALL_RETURNINMEM,
-	ICC_CDECL_OBJLAST,
-	ICC_CDECL_OBJLAST_RETURNINMEM,
-	ICC_CDECL_OBJFIRST,
-	ICC_CDECL_OBJFIRST_RETURNINMEM,
-	ICC_GENERIC_METHOD,
-	ICC_GENERIC_METHOD_RETURNINMEM, // never used
-	ICC_THISCALL_OBJLAST,
-	ICC_THISCALL_OBJLAST_RETURNINMEM,
-	ICC_VIRTUAL_THISCALL_OBJLAST,
-	ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM,
-	ICC_THISCALL_OBJFIRST,
-	ICC_THISCALL_OBJFIRST_RETURNINMEM,
-	ICC_VIRTUAL_THISCALL_OBJFIRST,
-	ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM
-};
-
-struct asSSystemFunctionInterface
-{
-	asFUNCTION_t         func;
-	int                  baseOffset;
-	internalCallConv     callConv;
-	int                  scriptReturnSize;
-	bool                 hostReturnInMemory;
-	bool                 hostReturnFloat;
-	int                  hostReturnSize;
-	int                  paramSize;
-	bool                 takesObjByVal;
-	asCArray<bool>       paramAutoHandles; // TODO: Should be able to remove this array. Perhaps the flags can be stored together with the inOutFlags in asCScriptFunction?
-	bool                 returnAutoHandle;
-	void                *auxiliary; // can be used for functors, e.g. by asCALL_THISCALL_ASGLOBAL or asCALL_THISCALL_OBJFIRST
-
-	struct SClean
-	{
-		asCObjectType *ot; // argument type for clean up
-		short op;          // clean up operation: 0 = release, 1 = free, 2 = destruct then free
-		short off;         // argument offset on the stack
-	};
-	asCArray<SClean>     cleanArgs;
-
-	asSSystemFunctionInterface() {}
-
-	asSSystemFunctionInterface(const asSSystemFunctionInterface &in)
-	{
-		*this = in;
-	}
-
-	asSSystemFunctionInterface &operator=(const asSSystemFunctionInterface &in)
-	{
-		func               = in.func;
-		baseOffset         = in.baseOffset;
-		callConv           = in.callConv;
-		scriptReturnSize   = in.scriptReturnSize;
-		hostReturnInMemory = in.hostReturnInMemory;
-		hostReturnFloat    = in.hostReturnFloat;
-		hostReturnSize     = in.hostReturnSize;
-		paramSize          = in.paramSize;
-		takesObjByVal      = in.takesObjByVal;
-		paramAutoHandles   = in.paramAutoHandles;
-		returnAutoHandle   = in.returnAutoHandle;
-		auxiliary          = in.auxiliary;
-		cleanArgs          = in.cleanArgs;
-		return *this;
-	}
-};
-
-END_AS_NAMESPACE
-
-#endif
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc.h
+//
+// These functions handle the actual calling of system functions
+//
+
+
+#ifndef AS_CALLFUNC_H
+#define AS_CALLFUNC_H
+
+#include "as_array.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCContext;
+class asCScriptEngine;
+class asCScriptFunction;
+class asCObjectType;
+struct asSSystemFunctionInterface;
+
+int DetectCallingConvention(bool isMethod, const asSFuncPtr &ptr, int callConv, void *auxiliary, asSSystemFunctionInterface *internal);
+
+int PrepareSystemFunctionGeneric(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
+
+int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
+
+int CallSystemFunction(int id, asCContext *context);
+
+inline asPWORD FuncPtrToUInt(asFUNCTION_t func)
+{
+	// A little trickery as the C++ standard doesn't allow direct
+	// conversion between function pointer and data pointer
+	union { asFUNCTION_t func; asPWORD idx; } u;
+	u.func = func;
+
+	return u.idx;
+}
+
+enum internalCallConv
+{
+	ICC_GENERIC_FUNC,
+	ICC_GENERIC_FUNC_RETURNINMEM, // never used
+	ICC_CDECL,
+	ICC_CDECL_RETURNINMEM,
+	ICC_STDCALL,
+	ICC_STDCALL_RETURNINMEM,
+	ICC_THISCALL,
+	ICC_THISCALL_RETURNINMEM,
+	ICC_VIRTUAL_THISCALL,
+	ICC_VIRTUAL_THISCALL_RETURNINMEM,
+	ICC_CDECL_OBJLAST,
+	ICC_CDECL_OBJLAST_RETURNINMEM,
+	ICC_CDECL_OBJFIRST,
+	ICC_CDECL_OBJFIRST_RETURNINMEM,
+	ICC_GENERIC_METHOD,
+	ICC_GENERIC_METHOD_RETURNINMEM, // never used
+	ICC_THISCALL_OBJLAST,
+	ICC_THISCALL_OBJLAST_RETURNINMEM,
+	ICC_VIRTUAL_THISCALL_OBJLAST,
+	ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM,
+	ICC_THISCALL_OBJFIRST,
+	ICC_THISCALL_OBJFIRST_RETURNINMEM,
+	ICC_VIRTUAL_THISCALL_OBJFIRST,
+	ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM
+};
+
+struct asSSystemFunctionInterface
+{
+	asFUNCTION_t         func;
+	int                  baseOffset;
+	internalCallConv     callConv;
+	bool                 hostReturnInMemory;
+	bool                 hostReturnFloat;
+	int                  hostReturnSize;
+	int                  paramSize;
+	bool                 takesObjByVal;
+	asCArray<bool>       paramAutoHandles; // TODO: Should be able to remove this array. Perhaps the flags can be stored together with the inOutFlags in asCScriptFunction?
+	bool                 returnAutoHandle;
+	int                  compositeOffset;
+	bool                 isCompositeIndirect;
+	void                *auxiliary; // can be used for functors, e.g. by asCALL_THISCALL_ASGLOBAL or asCALL_THISCALL_OBJFIRST
+
+	struct SClean
+	{
+		asCObjectType *ot; // argument type for clean up
+		short op;          // clean up operation: 0 = release, 1 = free, 2 = destruct then free
+		short off;         // argument offset on the stack
+	};
+	asCArray<SClean>     cleanArgs;
+
+	asSSystemFunctionInterface()
+	{ 
+		Clear(); 
+	}
+
+	asSSystemFunctionInterface(const asSSystemFunctionInterface &in)
+	{
+		*this = in;
+	}
+
+	void Clear()
+	{
+		func                = 0;
+		baseOffset          = 0;
+		callConv            = ICC_GENERIC_FUNC;
+		hostReturnInMemory  = false;
+		hostReturnFloat     = false;
+		hostReturnSize      = 0;
+		paramSize           = 0;
+		takesObjByVal       = false;
+		returnAutoHandle    = false;
+		compositeOffset     = 0;
+		isCompositeIndirect = false;
+		auxiliary           = 0;
+
+		paramAutoHandles.SetLength(0);
+		cleanArgs.SetLength(0);
+	}
+
+	asSSystemFunctionInterface &operator=(const asSSystemFunctionInterface &in)
+	{
+		func                = in.func;
+		baseOffset          = in.baseOffset;
+		callConv            = in.callConv;
+		hostReturnInMemory  = in.hostReturnInMemory;
+		hostReturnFloat     = in.hostReturnFloat;
+		hostReturnSize      = in.hostReturnSize;
+		paramSize           = in.paramSize;
+		takesObjByVal       = in.takesObjByVal;
+		returnAutoHandle    = in.returnAutoHandle;
+		compositeOffset     = in.compositeOffset;
+		isCompositeIndirect = in.isCompositeIndirect;
+		auxiliary           = in.auxiliary;
+
+		cleanArgs           = in.cleanArgs;
+		paramAutoHandles    = in.paramAutoHandles;
+
+		return *this;
+	}
+};
+
+END_AS_NAMESPACE
+
+#endif
+
diff --git a/Sources/AngelScript/source/as_callfunc_arm.cpp b/Sources/AngelScript/source/as_callfunc_arm.cpp
old mode 100755
new mode 100644
index dc9dac45d..6d820702f
--- a/Sources/AngelScript/source/as_callfunc_arm.cpp
+++ b/Sources/AngelScript/source/as_callfunc_arm.cpp
@@ -1,665 +1,665 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc_arm.cpp
-//
-// These functions handle the actual calling of system functions on the arm platform
-//
-// Written by Fredrik Ehnbom in June 2009, based on as_callfunc_x86.cpp
-//
-// The code was complemented to support Linux with ARM by Carlos Luna in December, 2012.
-//
-// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
-
-
-// This code has to conform to both AAPCS and the modified ABI for iOS
-//
-// Reference:
-//
-// AAPCS: http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf
-// iOS: http://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/iPhoneOSABIReference.pdf
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_ARM
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_tokendef.h"
-#include "as_context.h"
-
-#if defined(AS_SOFTFP)
-
-// This code supports the soft-float ABI, i.e. g++ -mfloat-abi=softfp
-//
-// The code for iOS, Android, Marmalade and Windows Phone goes here
-
-BEGIN_AS_NAMESPACE
-
-extern "C" asQWORD armFunc          (const asDWORD *, int, asFUNCTION_t);
-extern "C" asQWORD armFuncR0        (const asDWORD *, int, asFUNCTION_t, asDWORD r0);
-extern "C" asQWORD armFuncR0R1      (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD r1);
-extern "C" asQWORD armFuncObjLast   (const asDWORD *, int, asFUNCTION_t, asDWORD obj);
-extern "C" asQWORD armFuncR0ObjLast (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD obj);
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
-{
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-	int callConv = sysFunc->callConv;
-
-	asQWORD       retQW     = 0;
-	asFUNCTION_t  func      = sysFunc->func;
-	int           paramSize = sysFunc->paramSize;
-	asFUNCTION_t *vftable;
-
-	if( sysFunc->hostReturnInMemory )
-	{
-		// The return is made in memory
-		callConv++;
-	}
-	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
-
-
-	asDWORD paramBuffer[64+2];
-	// Android & Linux needs to align 64bit types on even registers, but this isn't done on iOS or Windows Phone
-	// TODO: optimize runtime: There should be a check for this in PrepareSystemFunction() so this 
-	//                         doesn't have to be done for functions that don't have any 64bit types
-#if !defined(AS_ANDROID) && !defined(AS_LINUX)
-	// In cases of thiscall methods, the callstack is configured as a standard thiscall
-	// adding the secondObject as first or last element in callstack
-	if( sysFunc->takesObjByVal || isThisCallMethod )
-#endif
-	{
-#if defined(AS_ANDROID) || defined(AS_LINUX)
-		// mask is used as a toggler to skip uneven registers.
-		int mask = 1;
-
-		if( isThisCallMethod )
-		{
-			mask = 0;
-		}
-		else
-		{
-			// Check for object pointer as first argument
-			switch( callConv )
-			{
-				case ICC_THISCALL:
-				case ICC_CDECL_OBJFIRST:
-				case ICC_VIRTUAL_THISCALL:
-				case ICC_THISCALL_RETURNINMEM:
-				case ICC_CDECL_OBJFIRST_RETURNINMEM:
-				case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-					mask = 0;
-					break;
-				default:
-					break;
-			}
-		}
-
-		// Check for hidden address in case of return by value
-		if( sysFunc->hostReturnInMemory )
-			mask = !mask;
-#endif
-		paramSize = 0;
-		int spos = 0;
-		int dpos = 2;
-
-		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJFIRST &&
-			callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
-		{
-			// Add the object pointer as the first parameter
-			paramBuffer[dpos++] = (asDWORD)secondObject;
-			paramSize++;
-		}
-
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			// TODO: runtime optimize: Declare a reference to descr->parameterTypes[n] so the array doesn't have to be access all the time
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					paramSize++;
-				}
-				else
-#endif
-				{
-#if defined(AS_ANDROID) || defined(AS_LINUX)
-					if( (descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_CLASS_ALIGN8) &&
-						((dpos & 1) == mask) )
-					{
-						// 64 bit value align
-						dpos++;
-						paramSize++;
-					}
-#endif
-					// Copy the object's memory to the buffer
-					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-
-					// Delete the original memory
-					engine->CallFree(*(char**)(args+spos));
-					spos++;
-					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
-				}
-			}
-			else
-			{
-#if defined(AS_ANDROID) || defined(AS_LINUX)
-				// Should an alignment be performed?
-				if( !descr->parameterTypes[n].IsObjectHandle() && 
-					!descr->parameterTypes[n].IsReference() && 
-					descr->parameterTypes[n].GetSizeOnStackDWords() == 2 && 
-					((dpos & 1) == mask) )
-				{
-					// 64 bit value align
-					dpos++;
-					paramSize++;
-				}
-#endif
-
-				// Copy the value directly
-				paramBuffer[dpos++] = args[spos++];
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-					paramBuffer[dpos++] = args[spos++];
-				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-			}
-		}
-
-		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJLAST &&
-			callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
-		{
-			// Add the object pointer as the last parameter
-			paramBuffer[dpos++] = (asDWORD)secondObject;
-			paramSize++;
-		}
-
-		// Keep a free location at the beginning
-		args = &paramBuffer[2];
-	}
-
-	switch( callConv )
-	{
-	case ICC_CDECL_RETURNINMEM:     // fall through
-	case ICC_STDCALL_RETURNINMEM:
-		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)retPointer);
-		break;
-	case ICC_CDECL:     // fall through
-	case ICC_STDCALL:
-		retQW = armFunc(args, paramSize<<2, func);
-		break;
-	case ICC_THISCALL:  // fall through
-	case ICC_CDECL_OBJFIRST:
-	case ICC_THISCALL_OBJFIRST:
-	case ICC_THISCALL_OBJLAST:
-		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)obj);
-		break;
-	case ICC_THISCALL_RETURNINMEM:
-	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_THISCALL_OBJLAST_RETURNINMEM:
-#ifdef __GNUC__
-		// On GNUC the address where the return value will be placed should be put in R0
-		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
-#else
-		// On Windows the R0 should always hold the object pointer, and the address for the return value comes after
-		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)obj, (asDWORD)retPointer);
-#endif
-		break;
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
-		break;
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST:
-	case ICC_VIRTUAL_THISCALL_OBJLAST:
-		// Get virtual function table from the object pointer
-		vftable = *(asFUNCTION_t**)obj;
-		retQW = armFuncR0(args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj);
-		break;
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
-		// Get virtual function table from the object pointer
-		vftable = *(asFUNCTION_t**)obj;
-#ifdef __GNUC__
-		// On GNUC the address where the return value will be placed should be put in R0
-		retQW = armFuncR0R1(args, (paramSize+1)<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)retPointer, (asDWORD)obj);
-#else
-		// On Windows the R0 should always hold the object pointer, and the address for the return value comes after
-		retQW = armFuncR0R1(args, (paramSize+1)<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj, (asDWORD)retPointer);
-#endif
-		break;
-	case ICC_CDECL_OBJLAST:
-		retQW = armFuncObjLast(args, paramSize<<2, func, (asDWORD)obj);
-		break;
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-		retQW = armFuncR0ObjLast(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
-		break;
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#elif !defined(AS_SOFTFP)
-
-// This code supports the hard-float ABI, i.e. g++ -mfloat-abi=hard
-// The main difference is that the floating point values are passed in the fpu registers
-
-#define VFP_OFFSET 70
-#define STACK_OFFSET 6
-#define PARAM_BUFFER_SIZE 104
-
-BEGIN_AS_NAMESPACE
-
-extern "C" asQWORD armFunc          (const asDWORD *, int, asFUNCTION_t);
-extern "C" asQWORD armFuncR0        (const asDWORD *, int, asFUNCTION_t, asDWORD r0);
-extern "C" asQWORD armFuncR0R1      (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD r1);
-extern "C" asQWORD armFuncObjLast   (const asDWORD *, int, asFUNCTION_t, asDWORD obj);
-extern "C" asQWORD armFuncR0ObjLast (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD obj);
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
-{
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-	int callConv = sysFunc->callConv;
-
-	asQWORD       retQW     = 0;
-	asFUNCTION_t  func      = sysFunc->func;
-	int           paramSize = sysFunc->paramSize;
-	asFUNCTION_t *vftable;
-
-	//---------------------------------------------------------------------------- RPi
-	int freeFloatSlot	= VFP_OFFSET;
-	int freeDoubleSlot	= VFP_OFFSET;
-	int stackPos		= STACK_OFFSET;
-	int stackSize		= 0;
-	//----------------------------------------------------------------------------
-
-	//---------------------------------------------------------------------------- RPi
-	// We´ll divide paramBuffer into several segments:
-	//
-	// 0-1							Unused
-	// 2-5		(+8   / +0   asm)	values that should be placed in R0 - R3
-	// 6-67		(+24  / +16  asm)	values that should be placed on the stack
-	// 68		(+272 / +264 asm)	number of values stored in r registers (R0 - R3)
-	// 69		(+276 / +268 asm)	number of args stored on the stack
-	// 70-85	(+280 / +272 asm)	values that should be placed in VFP registers (16)
-	// 86-87	(+344 / +336 asm)	sp original value - sp final value - for debugging
-	// 88-103	(+352 / +344 asm)	Check area for free-used VFP registers
-	//
-	// Total number of elements: 104
-	//
-	// When passing the paramBuffer to the asm routines via the args pointer we are
-	// offsetting the start of the array to being at element # 2. That´s why in asm
-	// all addresses must have an offset of -2 words (-8 bytes).
-	//---------------------------------------------------------------------------- RPi
-
-	asDWORD paramBuffer[PARAM_BUFFER_SIZE];
-	memset(paramBuffer, 0, sizeof(asDWORD) * PARAM_BUFFER_SIZE);
-
-	if( sysFunc->hostReturnInMemory )
-	{
-		// TODO: runtime optimize: This check should be done in PrepareSystemFunction
-		if ( !( descr->returnType.GetTypeInfo()->flags & COMPLEX_RETURN_MASK )		&&
-			  ( descr->returnType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS )	&&
-			    descr->returnType.GetSizeInMemoryBytes() <= 8 )
-			callConv--;
-		
-		// The return is made in memory
-		callConv++;
-	}
-
-	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
-
-	// Linux needs to align 64bit types on even registers, but this isn't done on iOS or Windows Phone
-	// TODO: optimize runtime: There should be a check for this in PrepareSystemFunction() so this 
-	//                         doesn't have to be done for functions that don't have any 64bit types
-	{
-		// mask is used as a toggler to skip uneven registers.
-		int mask = 1;
-
-		if( isThisCallMethod )
-		{
-			mask = 0;
-		}
-		else
-		{
-			// Check for object pointer as first argument
-			switch( callConv )
-			{
-				case ICC_THISCALL:
-				case ICC_CDECL_OBJFIRST:
-				case ICC_VIRTUAL_THISCALL:
-				case ICC_THISCALL_RETURNINMEM:
-				case ICC_CDECL_OBJFIRST_RETURNINMEM:
-				case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-					mask = 0;
-					break;
-				default:
-					break;
-			}
-		}
-		// Check for hidden address in case of return by value
-		if( sysFunc->hostReturnInMemory )
-			mask = !mask;
-
-		paramSize = 0;
-		int spos = 0;
-		int dpos = 2;
-
-		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJFIRST &&
-			callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
-		{
-			// Add the object pointer as the first parameter
-			paramBuffer[dpos++] = (asDWORD)secondObject;
-			paramSize++;
-		}
-
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			// TODO: runtime optimize: Declare a reference to descr->parameterTypes[n] so the array doesn't have to be access all the time
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
-				!(descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_ARRAY) )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					paramSize++;
-				}
-				else
-#endif
-				{
-					if( (descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_CLASS_ALIGN8) )
-					{
-						if ( (dpos & 1) == mask )
-						{
-							// 64 bit value align
-							dpos++;
-							paramSize++;
-						}
-
-						if ( (stackPos & 1) == mask )
-						{
-							// 64 bit value align
-							stackPos++;
-							stackSize++;
-						}
-					}
-
-					// Copy the object's memory to the buffer
-					if (descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS)
-					{
-						int target = (freeFloatSlot > freeDoubleSlot) ? freeFloatSlot : freeDoubleSlot;
-
-						if ( descr->parameterTypes[n].GetSizeInMemoryDWords() <= ( (VFP_OFFSET + 16) - target) )
-						{
-							memcpy(&paramBuffer[target], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-							memset(&paramBuffer[target + 18], (asDWORD)1, descr->parameterTypes[n].GetSizeInMemoryDWords());
-							target += descr->parameterTypes[n].GetSizeInMemoryDWords();
-							freeFloatSlot = freeDoubleSlot = target;
-						}
-						else
-						{
-							memcpy(&paramBuffer[stackPos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-							stackPos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-							stackSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-						}
-					}
-					else
-					{
-						memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-						dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-						paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
-					}
-
-					// Delete the original memory
-					engine->CallFree(*(char**)(args+spos));
-					spos++;					
-				}
-
-				continue;
-			}
-			else if( descr->parameterTypes[n].IsFloatType() && !descr->parameterTypes[n].IsReference() )
-			{
-				// Are there any "s" registers available?
-				if ( freeFloatSlot < (VFP_OFFSET + 16) )
-				{
-					if (freeFloatSlot == freeDoubleSlot)
-						freeDoubleSlot += 2;
-
-					paramBuffer[freeFloatSlot + 18] = (asDWORD)1;
-					paramBuffer[freeFloatSlot++] = args[spos++];
-
-					while(freeFloatSlot < (VFP_OFFSET + 16) && paramBuffer[freeFloatSlot + 18] != 0)
-						freeFloatSlot++;
-				}
-				// If not, then store the float arg in the stack area
-				else
-				{
-					paramBuffer[stackPos++] = args[spos++];
-					stackSize++;
-				}
-
-				continue;
-			}
-			else if( descr->parameterTypes[n].IsDoubleType() && !descr->parameterTypes[n].IsReference() )
-			{
-				// Are there any "d" registers available?
-				if ( freeDoubleSlot < (VFP_OFFSET + 15) )
-				{
-					if (freeFloatSlot == freeDoubleSlot)
-						freeFloatSlot += 2;
-
-					// Copy two dwords for the double
-					paramBuffer[freeDoubleSlot + 18] = (asDWORD)1;
-					paramBuffer[freeDoubleSlot + 19] = (asDWORD)1;
-					paramBuffer[freeDoubleSlot++] = args[spos++];
-					paramBuffer[freeDoubleSlot++] = args[spos++];
-
-					while(freeDoubleSlot < (VFP_OFFSET + 15) && paramBuffer[freeDoubleSlot + 18] != 0)
-						freeDoubleSlot += 2;
-				}
-				// If not, then store the double arg in the stack area
-				else
-				{
-					if ( (stackPos & 1) == mask )
-					{
-						// 64 bit value align
-						stackPos++;
-						stackSize++;
-					}
-
-					paramBuffer[stackPos++] = args[spos++];
-					paramBuffer[stackPos++] = args[spos++];
-					stackSize += 2;
-				}
-				
-				continue;
-			}
-			else
-			{
-				// Copy the value directly to "r" registers or the stack, checking for alignment
-				if (paramSize < 4)
-				{
-					// Should an alignment be performed?
-					if( (dpos & 1) == mask && descr->parameterTypes[n].GetSizeOnStackDWords() == 2 && 
-						!descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
-						!descr->parameterTypes[n].IsAnyType() )
-					{
-						// 64 bit value align
-						dpos++;
-						paramSize++;
-					}
-
-					paramBuffer[dpos++] = args[spos++];
-					paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-				}
-				else
-				{
-					// Should an alignment be performed?
-					if( (stackPos & 1) == mask && descr->parameterTypes[n].GetSizeOnStackDWords() == 2 &&
-						!descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
-						!descr->parameterTypes[n].IsAnyType() )
-					{
-						// 64 bit value align
-						stackPos++;
-						stackSize++;
-					}
-
-					paramBuffer[stackPos++] = args[spos++];
-					stackSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-				}
-
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-				{
-					if (paramSize < 5)
-						paramBuffer[dpos++] = args[spos++];
-					else
-						paramBuffer[stackPos++] = args[spos++];
-				}
-			}// else...
-		}// Loop
-
-		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJLAST &&
-			callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
-		{
-			if (paramSize < 4)
-			{
-				paramBuffer[dpos++] = (asDWORD)secondObject;
-				paramSize++;
-			}
-			else
-			{
-				paramBuffer[stackPos++] = (asDWORD)secondObject;
-				stackSize++;
-			}
-		}
-
-		// Keep a free location at the beginning
-		args = &paramBuffer[2];
-	}
-
-	paramBuffer[69] = static_cast<asDWORD>(stackSize<<2);
-
-	switch( callConv )
-	{
-	case ICC_CDECL_RETURNINMEM:     // fall through
-	case ICC_STDCALL_RETURNINMEM:
-		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)retPointer);
-		break;
-	case ICC_CDECL:     // fall through
-	case ICC_STDCALL:
-		retQW = armFunc(args, paramSize<<2, func);
-		break;
-	case ICC_THISCALL:  // fall through
-	case ICC_CDECL_OBJFIRST:
-	case ICC_THISCALL_OBJFIRST:
-	case ICC_THISCALL_OBJLAST:
-		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)obj);
-		break;
-	case ICC_THISCALL_RETURNINMEM:
-	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_THISCALL_OBJLAST_RETURNINMEM:
-		// On GNUC the address where the return value will be placed should be put in R0
-		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
-		break;
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
-		break;
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST:
-	case ICC_VIRTUAL_THISCALL_OBJLAST:
-		// Get virtual function table from the object pointer
-		vftable = *(asFUNCTION_t**)obj;
-		retQW = armFuncR0(args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj);
-		break;
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
-		// Get virtual function table from the object pointer
-		vftable = *(asFUNCTION_t**)obj;
-		// On GNUC the address where the return value will be placed should be put in R0
-		retQW = armFuncR0R1(args, (paramSize+1)<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)retPointer, (asDWORD)obj);
-		break;
-	case ICC_CDECL_OBJLAST:
-		retQW = armFuncObjLast(args, paramSize<<2, func, (asDWORD)obj);
-		break;
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-		retQW = armFuncR0ObjLast(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
-		break;
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	// On Linux with arm the float and double values are returns in the 
-	// floating point registers, s0 and s1. Objects that contain only 
-	// float types and are not considered complex are also returned in the
-	// floating point registers.
-	if( sysFunc->hostReturnFloat )
-	{
-		retQW = paramBuffer[VFP_OFFSET];
-
-		if ( sysFunc->hostReturnSize > 1 )
-			retQW = *( (asQWORD*)&paramBuffer[VFP_OFFSET] );
-	}
-	else if ( descr->returnType.IsObject() )
-	{
-		// TODO: runtime optimize: This should be identified with a flag determined in PrepareSystemFunction
-		if ( !descr->returnType.IsObjectHandle()									&&
-			 !descr->returnType.IsReference()										&&
-			 !(descr->returnType.GetTypeInfo()->flags & COMPLEX_RETURN_MASK)		&&
-			 (descr->returnType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS) )
-			memcpy( retPointer, &paramBuffer[VFP_OFFSET], descr->returnType.GetSizeInMemoryBytes() );
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_LINUX
-
-#endif // AS_ARM
-#endif // AS_MAX_PORTABILITY
-
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_arm.cpp
+//
+// These functions handle the actual calling of system functions on the arm platform
+//
+// Written by Fredrik Ehnbom in June 2009, based on as_callfunc_x86.cpp
+//
+// The code was complemented to support Linux with ARM by Carlos Luna in December, 2012.
+//
+// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
+
+
+// This code has to conform to both AAPCS and the modified ABI for iOS
+//
+// Reference:
+//
+// AAPCS: http://infocenter.arm.com/help/topic/com.arm.doc.ihi0042d/IHI0042D_aapcs.pdf
+// iOS: http://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/iPhoneOSABIReference.pdf
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_ARM
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+#if defined(AS_SOFTFP)
+
+// This code supports the soft-float ABI, i.e. g++ -mfloat-abi=softfp
+//
+// The code for iOS, Android, Marmalade and Windows Phone goes here
+
+BEGIN_AS_NAMESPACE
+
+extern "C" asQWORD armFunc          (const asDWORD *, int, asFUNCTION_t);
+extern "C" asQWORD armFuncR0        (const asDWORD *, int, asFUNCTION_t, asDWORD r0);
+extern "C" asQWORD armFuncR0R1      (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD r1);
+extern "C" asQWORD armFuncObjLast   (const asDWORD *, int, asFUNCTION_t, asDWORD obj);
+extern "C" asQWORD armFuncR0ObjLast (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD obj);
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
+{
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+	int callConv = sysFunc->callConv;
+
+	asQWORD       retQW     = 0;
+	asFUNCTION_t  func      = sysFunc->func;
+	int           paramSize = sysFunc->paramSize;
+	asFUNCTION_t *vftable;
+
+	if( sysFunc->hostReturnInMemory )
+	{
+		// The return is made in memory
+		callConv++;
+	}
+	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
+
+
+	asDWORD paramBuffer[64+2];
+	// Android & Linux needs to align 64bit types on even registers, but this isn't done on iOS or Windows Phone
+	// TODO: optimize runtime: There should be a check for this in PrepareSystemFunction() so this 
+	//                         doesn't have to be done for functions that don't have any 64bit types
+#if !defined(AS_ANDROID) && !defined(AS_LINUX)
+	// In cases of thiscall methods, the callstack is configured as a standard thiscall
+	// adding the secondObject as first or last element in callstack
+	if( sysFunc->takesObjByVal || isThisCallMethod )
+#endif
+	{
+#if defined(AS_ANDROID) || defined(AS_LINUX)
+		// mask is used as a toggler to skip uneven registers.
+		int mask = 1;
+
+		if( isThisCallMethod )
+		{
+			mask = 0;
+		}
+		else
+		{
+			// Check for object pointer as first argument
+			switch( callConv )
+			{
+				case ICC_THISCALL:
+				case ICC_CDECL_OBJFIRST:
+				case ICC_VIRTUAL_THISCALL:
+				case ICC_THISCALL_RETURNINMEM:
+				case ICC_CDECL_OBJFIRST_RETURNINMEM:
+				case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+					mask = 0;
+					break;
+				default:
+					break;
+			}
+		}
+
+		// Check for hidden address in case of return by value
+		if( sysFunc->hostReturnInMemory )
+			mask = !mask;
+#endif
+		paramSize = 0;
+		int spos = 0;
+		int dpos = 2;
+
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJFIRST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+		{
+			// Add the object pointer as the first parameter
+			paramBuffer[dpos++] = (asDWORD)secondObject;
+			paramSize++;
+		}
+
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			// TODO: runtime optimize: Declare a reference to descr->parameterTypes[n] so the array doesn't have to be access all the time
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					paramSize++;
+				}
+				else
+#endif
+				{
+#if defined(AS_ANDROID) || defined(AS_LINUX)
+					if( (descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_CLASS_ALIGN8) &&
+						((dpos & 1) == mask) )
+					{
+						// 64 bit value align
+						dpos++;
+						paramSize++;
+					}
+#endif
+					// Copy the object's memory to the buffer
+					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+
+					// Delete the original memory
+					engine->CallFree(*(char**)(args+spos));
+					spos++;
+					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
+				}
+			}
+			else
+			{
+#if defined(AS_ANDROID) || defined(AS_LINUX)
+				// Should an alignment be performed?
+				if( !descr->parameterTypes[n].IsObjectHandle() && 
+					!descr->parameterTypes[n].IsReference() && 
+					descr->parameterTypes[n].GetSizeOnStackDWords() == 2 && 
+					((dpos & 1) == mask) )
+				{
+					// 64 bit value align
+					dpos++;
+					paramSize++;
+				}
+#endif
+
+				// Copy the value directly
+				paramBuffer[dpos++] = args[spos++];
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+					paramBuffer[dpos++] = args[spos++];
+				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+			}
+		}
+
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJLAST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
+		{
+			// Add the object pointer as the last parameter
+			paramBuffer[dpos++] = (asDWORD)secondObject;
+			paramSize++;
+		}
+
+		// Keep a free location at the beginning
+		args = &paramBuffer[2];
+	}
+
+	switch( callConv )
+	{
+	case ICC_CDECL_RETURNINMEM:     // fall through
+	case ICC_STDCALL_RETURNINMEM:
+		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)retPointer);
+		break;
+	case ICC_CDECL:     // fall through
+	case ICC_STDCALL:
+		retQW = armFunc(args, paramSize<<2, func);
+		break;
+	case ICC_THISCALL:  // fall through
+	case ICC_CDECL_OBJFIRST:
+	case ICC_THISCALL_OBJFIRST:
+	case ICC_THISCALL_OBJLAST:
+		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)obj);
+		break;
+	case ICC_THISCALL_RETURNINMEM:
+	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL_OBJLAST_RETURNINMEM:
+#ifdef __GNUC__
+		// On GNUC the address where the return value will be placed should be put in R0
+		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
+#else
+		// On Windows the R0 should always hold the object pointer, and the address for the return value comes after
+		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)obj, (asDWORD)retPointer);
+#endif
+		break;
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
+		break;
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST:
+	case ICC_VIRTUAL_THISCALL_OBJLAST:
+		// Get virtual function table from the object pointer
+		vftable = *(asFUNCTION_t**)obj;
+		retQW = armFuncR0(args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj);
+		break;
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
+		// Get virtual function table from the object pointer
+		vftable = *(asFUNCTION_t**)obj;
+#ifdef __GNUC__
+		// On GNUC the address where the return value will be placed should be put in R0
+		retQW = armFuncR0R1(args, (paramSize+1)<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)retPointer, (asDWORD)obj);
+#else
+		// On Windows the R0 should always hold the object pointer, and the address for the return value comes after
+		retQW = armFuncR0R1(args, (paramSize+1)<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj, (asDWORD)retPointer);
+#endif
+		break;
+	case ICC_CDECL_OBJLAST:
+		retQW = armFuncObjLast(args, paramSize<<2, func, (asDWORD)obj);
+		break;
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+		retQW = armFuncR0ObjLast(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
+		break;
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#elif !defined(AS_SOFTFP)
+
+// This code supports the hard-float ABI, i.e. g++ -mfloat-abi=hard
+// The main difference is that the floating point values are passed in the fpu registers
+
+#define VFP_OFFSET 70
+#define STACK_OFFSET 6
+#define PARAM_BUFFER_SIZE 104
+
+BEGIN_AS_NAMESPACE
+
+extern "C" asQWORD armFunc          (const asDWORD *, int, asFUNCTION_t);
+extern "C" asQWORD armFuncR0        (const asDWORD *, int, asFUNCTION_t, asDWORD r0);
+extern "C" asQWORD armFuncR0R1      (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD r1);
+extern "C" asQWORD armFuncObjLast   (const asDWORD *, int, asFUNCTION_t, asDWORD obj);
+extern "C" asQWORD armFuncR0ObjLast (const asDWORD *, int, asFUNCTION_t, asDWORD r0, asDWORD obj);
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
+{
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+	int callConv = sysFunc->callConv;
+
+	asQWORD       retQW     = 0;
+	asFUNCTION_t  func      = sysFunc->func;
+	int           paramSize = sysFunc->paramSize;
+	asFUNCTION_t *vftable;
+
+	//---------------------------------------------------------------------------- RPi
+	int freeFloatSlot	= VFP_OFFSET;
+	int freeDoubleSlot	= VFP_OFFSET;
+	int stackPos		= STACK_OFFSET;
+	int stackSize		= 0;
+	//----------------------------------------------------------------------------
+
+	//---------------------------------------------------------------------------- RPi
+	// We´ll divide paramBuffer into several segments:
+	//
+	// 0-1							Unused
+	// 2-5		(+8   / +0   asm)	values that should be placed in R0 - R3
+	// 6-67		(+24  / +16  asm)	values that should be placed on the stack
+	// 68		(+272 / +264 asm)	number of values stored in r registers (R0 - R3)
+	// 69		(+276 / +268 asm)	number of args stored on the stack
+	// 70-85	(+280 / +272 asm)	values that should be placed in VFP registers (16)
+	// 86-87	(+344 / +336 asm)	sp original value - sp final value - for debugging
+	// 88-103	(+352 / +344 asm)	Check area for free-used VFP registers
+	//
+	// Total number of elements: 104
+	//
+	// When passing the paramBuffer to the asm routines via the args pointer we are
+	// offsetting the start of the array to being at element # 2. That´s why in asm
+	// all addresses must have an offset of -2 words (-8 bytes).
+	//---------------------------------------------------------------------------- RPi
+
+	asDWORD paramBuffer[PARAM_BUFFER_SIZE];
+	memset(paramBuffer, 0, sizeof(asDWORD) * PARAM_BUFFER_SIZE);
+
+	if( sysFunc->hostReturnInMemory )
+	{
+		// TODO: runtime optimize: This check should be done in PrepareSystemFunction
+		if ( !( descr->returnType.GetTypeInfo()->flags & COMPLEX_RETURN_MASK )		&&
+			  ( descr->returnType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS )	&&
+			    descr->returnType.GetSizeInMemoryBytes() <= 8 )
+			callConv--;
+		
+		// The return is made in memory
+		callConv++;
+	}
+
+	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
+
+	// Linux needs to align 64bit types on even registers, but this isn't done on iOS or Windows Phone
+	// TODO: optimize runtime: There should be a check for this in PrepareSystemFunction() so this 
+	//                         doesn't have to be done for functions that don't have any 64bit types
+	{
+		// mask is used as a toggler to skip uneven registers.
+		int mask = 1;
+
+		if( isThisCallMethod )
+		{
+			mask = 0;
+		}
+		else
+		{
+			// Check for object pointer as first argument
+			switch( callConv )
+			{
+				case ICC_THISCALL:
+				case ICC_CDECL_OBJFIRST:
+				case ICC_VIRTUAL_THISCALL:
+				case ICC_THISCALL_RETURNINMEM:
+				case ICC_CDECL_OBJFIRST_RETURNINMEM:
+				case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+					mask = 0;
+					break;
+				default:
+					break;
+			}
+		}
+		// Check for hidden address in case of return by value
+		if( sysFunc->hostReturnInMemory )
+			mask = !mask;
+
+		paramSize = 0;
+		int spos = 0;
+		int dpos = 2;
+
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJFIRST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+		{
+			// Add the object pointer as the first parameter
+			paramBuffer[dpos++] = (asDWORD)secondObject;
+			paramSize++;
+		}
+
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			// TODO: runtime optimize: Declare a reference to descr->parameterTypes[n] so the array doesn't have to be access all the time
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
+				!(descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_ARRAY) )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					paramSize++;
+				}
+				else
+#endif
+				{
+					if( (descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_CLASS_ALIGN8) )
+					{
+						if ( (dpos & 1) == mask )
+						{
+							// 64 bit value align
+							dpos++;
+							paramSize++;
+						}
+
+						if ( (stackPos & 1) == mask )
+						{
+							// 64 bit value align
+							stackPos++;
+							stackSize++;
+						}
+					}
+
+					// Copy the object's memory to the buffer
+					if (descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS)
+					{
+						int target = (freeFloatSlot > freeDoubleSlot) ? freeFloatSlot : freeDoubleSlot;
+
+						if ( descr->parameterTypes[n].GetSizeInMemoryDWords() <= ( (VFP_OFFSET + 16) - target) )
+						{
+							memcpy(&paramBuffer[target], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+							memset(&paramBuffer[target + 18], (asDWORD)1, descr->parameterTypes[n].GetSizeInMemoryDWords());
+							target += descr->parameterTypes[n].GetSizeInMemoryDWords();
+							freeFloatSlot = freeDoubleSlot = target;
+						}
+						else
+						{
+							memcpy(&paramBuffer[stackPos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+							stackPos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+							stackSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+						}
+					}
+					else
+					{
+						memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+						dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+						paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
+					}
+
+					// Delete the original memory
+					engine->CallFree(*(char**)(args+spos));
+					spos++;					
+				}
+
+				continue;
+			}
+			else if( descr->parameterTypes[n].IsFloatType() && !descr->parameterTypes[n].IsReference() )
+			{
+				// Are there any "s" registers available?
+				if ( freeFloatSlot < (VFP_OFFSET + 16) )
+				{
+					if (freeFloatSlot == freeDoubleSlot)
+						freeDoubleSlot += 2;
+
+					paramBuffer[freeFloatSlot + 18] = (asDWORD)1;
+					paramBuffer[freeFloatSlot++] = args[spos++];
+
+					while(freeFloatSlot < (VFP_OFFSET + 16) && paramBuffer[freeFloatSlot + 18] != 0)
+						freeFloatSlot++;
+				}
+				// If not, then store the float arg in the stack area
+				else
+				{
+					paramBuffer[stackPos++] = args[spos++];
+					stackSize++;
+				}
+
+				continue;
+			}
+			else if( descr->parameterTypes[n].IsDoubleType() && !descr->parameterTypes[n].IsReference() )
+			{
+				// Are there any "d" registers available?
+				if ( freeDoubleSlot < (VFP_OFFSET + 15) )
+				{
+					if (freeFloatSlot == freeDoubleSlot)
+						freeFloatSlot += 2;
+
+					// Copy two dwords for the double
+					paramBuffer[freeDoubleSlot + 18] = (asDWORD)1;
+					paramBuffer[freeDoubleSlot + 19] = (asDWORD)1;
+					paramBuffer[freeDoubleSlot++] = args[spos++];
+					paramBuffer[freeDoubleSlot++] = args[spos++];
+
+					while(freeDoubleSlot < (VFP_OFFSET + 15) && paramBuffer[freeDoubleSlot + 18] != 0)
+						freeDoubleSlot += 2;
+				}
+				// If not, then store the double arg in the stack area
+				else
+				{
+					if ( (stackPos & 1) == mask )
+					{
+						// 64 bit value align
+						stackPos++;
+						stackSize++;
+					}
+
+					paramBuffer[stackPos++] = args[spos++];
+					paramBuffer[stackPos++] = args[spos++];
+					stackSize += 2;
+				}
+				
+				continue;
+			}
+			else
+			{
+				// Copy the value directly to "r" registers or the stack, checking for alignment
+				if (paramSize < 4)
+				{
+					// Should an alignment be performed?
+					if( (dpos & 1) == mask && descr->parameterTypes[n].GetSizeOnStackDWords() == 2 && 
+						!descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
+						!descr->parameterTypes[n].IsAnyType() )
+					{
+						// 64 bit value align
+						dpos++;
+						paramSize++;
+					}
+
+					paramBuffer[dpos++] = args[spos++];
+					paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+				}
+				else
+				{
+					// Should an alignment be performed?
+					if( (stackPos & 1) == mask && descr->parameterTypes[n].GetSizeOnStackDWords() == 2 &&
+						!descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
+						!descr->parameterTypes[n].IsAnyType() )
+					{
+						// 64 bit value align
+						stackPos++;
+						stackSize++;
+					}
+
+					paramBuffer[stackPos++] = args[spos++];
+					stackSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+				}
+
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+				{
+					if (paramSize < 5)
+						paramBuffer[dpos++] = args[spos++];
+					else
+						paramBuffer[stackPos++] = args[spos++];
+				}
+			}// else...
+		}// Loop
+
+		if( isThisCallMethod && (callConv >= ICC_THISCALL_OBJLAST &&
+			callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
+		{
+			if (paramSize < 4)
+			{
+				paramBuffer[dpos++] = (asDWORD)secondObject;
+				paramSize++;
+			}
+			else
+			{
+				paramBuffer[stackPos++] = (asDWORD)secondObject;
+				stackSize++;
+			}
+		}
+
+		// Keep a free location at the beginning
+		args = &paramBuffer[2];
+	}
+
+	paramBuffer[69] = static_cast<asDWORD>(stackSize<<2);
+
+	switch( callConv )
+	{
+	case ICC_CDECL_RETURNINMEM:     // fall through
+	case ICC_STDCALL_RETURNINMEM:
+		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)retPointer);
+		break;
+	case ICC_CDECL:     // fall through
+	case ICC_STDCALL:
+		retQW = armFunc(args, paramSize<<2, func);
+		break;
+	case ICC_THISCALL:  // fall through
+	case ICC_CDECL_OBJFIRST:
+	case ICC_THISCALL_OBJFIRST:
+	case ICC_THISCALL_OBJLAST:
+		retQW = armFuncR0(args, paramSize<<2, func, (asDWORD)obj);
+		break;
+	case ICC_THISCALL_RETURNINMEM:
+	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL_OBJLAST_RETURNINMEM:
+		// On GNUC the address where the return value will be placed should be put in R0
+		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
+		break;
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+		retQW = armFuncR0R1(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
+		break;
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST:
+	case ICC_VIRTUAL_THISCALL_OBJLAST:
+		// Get virtual function table from the object pointer
+		vftable = *(asFUNCTION_t**)obj;
+		retQW = armFuncR0(args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)obj);
+		break;
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
+		// Get virtual function table from the object pointer
+		vftable = *(asFUNCTION_t**)obj;
+		// On GNUC the address where the return value will be placed should be put in R0
+		retQW = armFuncR0R1(args, (paramSize+1)<<2, vftable[FuncPtrToUInt(func)>>2], (asDWORD)retPointer, (asDWORD)obj);
+		break;
+	case ICC_CDECL_OBJLAST:
+		retQW = armFuncObjLast(args, paramSize<<2, func, (asDWORD)obj);
+		break;
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+		retQW = armFuncR0ObjLast(args, paramSize<<2, func, (asDWORD)retPointer, (asDWORD)obj);
+		break;
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	// On Linux with arm the float and double values are returns in the 
+	// floating point registers, s0 and s1. Objects that contain only 
+	// float types and are not considered complex are also returned in the
+	// floating point registers.
+	if( sysFunc->hostReturnFloat )
+	{
+		retQW = paramBuffer[VFP_OFFSET];
+
+		if ( sysFunc->hostReturnSize > 1 )
+			retQW = *( (asQWORD*)&paramBuffer[VFP_OFFSET] );
+	}
+	else if ( descr->returnType.IsObject() )
+	{
+		// TODO: runtime optimize: This should be identified with a flag determined in PrepareSystemFunction
+		if ( !descr->returnType.IsObjectHandle()									&&
+			 !descr->returnType.IsReference()										&&
+			 !(descr->returnType.GetTypeInfo()->flags & COMPLEX_RETURN_MASK)		&&
+			 (descr->returnType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALLFLOATS) )
+			memcpy( retPointer, &paramBuffer[VFP_OFFSET], descr->returnType.GetSizeInMemoryBytes() );
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_LINUX
+
+#endif // AS_ARM
+#endif // AS_MAX_PORTABILITY
+
+
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_arm64.cpp b/Sources/AngelScript/source/as_callfunc_arm64.cpp
new file mode 100644
index 000000000..5c73cf23c
--- /dev/null
+++ b/Sources/AngelScript/source/as_callfunc_arm64.cpp
@@ -0,0 +1,329 @@
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2020-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_arm64.cpp
+//
+// These functions handle the actual calling of system functions on the arm64 platform
+//
+// Written by Max Waine in July 2020, based on as_callfunc_arm.cpp
+//
+
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_ARM64
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+// ARM64 targets use has no software floating-point ABI, it's all hardware (or totally disabled)
+
+#define HFA_RET_REGISTERS   4 // s0-s3/d0-d3
+#define GP_ARG_REGISTERS    8 // x0-x7
+#define FLOAT_ARG_REGISTERS 8 // v0-v7
+
+BEGIN_AS_NAMESPACE
+
+// x0-7:   Argument registers (pass params or return results. OK as volatile local variables)
+// x8:     Indirect result register (e.g. address of large returned struct)
+// x9-15:  Volatile local variable registers
+// x16-17: Intra-procedure-call temporary registers
+// x18:    Platform register (reserved for use of platform ABIs)
+// x19-29: Non-volatile variable registers (must be saved and restored if modified)
+// x29:    Frame pointer register
+// x30:    Link register (where to return to)
+
+extern "C" void GetHFAReturnDouble(asQWORD *out1, asQWORD *out2, asQWORD returnSize);
+extern "C" void GetHFAReturnFloat(asQWORD *out1, asQWORD *out2, asQWORD returnSize);
+
+extern "C" asQWORD CallARM64RetInMemory(
+	const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+	const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+	const asQWORD *stackArgs,    asQWORD numStackArgs,
+	void *retPointer,            asFUNCTION_t func
+);
+extern "C" double CallARM64Double(
+	const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+	const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+	const asQWORD *stackArgs,    asQWORD numStackArgs,
+	asFUNCTION_t func
+);
+extern "C" float CallARM64Float(
+	const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+	const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+	const asQWORD *stackArgs,    asQWORD numStackArgs,
+	asFUNCTION_t func
+);
+extern "C" asQWORD CallARM64(
+	const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+	const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+	const asQWORD *stackArgs,    asQWORD numStackArgs,
+	asFUNCTION_t func
+);
+extern "C" asQWORD CallARM64Ret128(
+	const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+	const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+	const asQWORD *stackArgs,    asQWORD numStackArgs,
+	asQWORD *higherQWORD,        asFUNCTION_t func
+);
+
+//
+// If it's possible to fit in registers,
+// there may not be enough float register space even if true is returned
+//
+static inline bool IsRegisterHFA(const asCDataType &type)
+{
+	const asCTypeInfo *const typeInfo = type.GetTypeInfo();
+
+	if( typeInfo == 0 ||
+		(typeInfo->flags & asOBJ_APP_CLASS_ALLFLOATS) == 0 ||
+		type.IsObjectHandle() || type.IsReference() )
+		return false;
+
+	const bool doubles = (typeInfo->flags & asOBJ_APP_CLASS_ALIGN8) != 0;
+	const int maxAllowedSize = doubles ? sizeof(double) * HFA_RET_REGISTERS : sizeof(float) * HFA_RET_REGISTERS;
+
+	return type.GetSizeInMemoryBytes() <= maxAllowedSize;
+}
+
+//
+// If it's possible to fit it in registers,
+// if true is returned there is enough space to fit
+//
+static inline bool IsRegisterHFAParameter(const asCDataType &type, const asQWORD numFloatRegArgs)
+{
+	if( !IsRegisterHFA(type) )
+		return false;
+
+	const bool doubles = (type.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALIGN8) != 0;
+	const int registersUsed = type.GetSizeInMemoryDWords() / (doubles ? sizeof(double) : sizeof(float));
+
+	return numFloatRegArgs + registersUsed <= FLOAT_ARG_REGISTERS;
+}
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &retQW2, void *secondObject)
+{
+	asCScriptEngine *engine = context->m_engine;
+	const asSSystemFunctionInterface *const sysFunc = descr->sysFuncIntf;
+	const asCDataType &retType = descr->returnType;
+	const asCTypeInfo *const retTypeInfo = retType.GetTypeInfo();
+	asFUNCTION_t func = sysFunc->func;
+	int callConv = sysFunc->callConv;
+	asQWORD       retQW     = 0;
+
+	asQWORD       gpRegArgs[GP_ARG_REGISTERS];
+	asQWORD       floatRegArgs[FLOAT_ARG_REGISTERS];
+	asQWORD       stackArgs[64]; // It's how many x64 users can have
+	asQWORD       numGPRegArgs    = 0;
+	asQWORD       numFloatRegArgs = 0;
+	asQWORD       numStackArgs    = 0;
+
+	asFUNCTION_t *vftable;
+
+	// Optimization to avoid check 12 values (all ICC_ that contains THISCALL)
+	if( (callConv >= ICC_THISCALL && callConv <= ICC_VIRTUAL_THISCALL_RETURNINMEM) ||
+		(callConv >= ICC_THISCALL_OBJLAST && callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+	{
+		// Add the object pointer as the first parameter
+		gpRegArgs[numGPRegArgs++] = (asQWORD)obj;
+	}
+
+	if( callConv == ICC_CDECL_OBJFIRST || callConv == ICC_CDECL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		gpRegArgs[numGPRegArgs++] = (asQWORD)obj;
+	}
+	else if( callConv == ICC_THISCALL_OBJFIRST || callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		gpRegArgs[numGPRegArgs++] = (asQWORD)secondObject;
+	}
+
+	if( callConv == ICC_VIRTUAL_THISCALL || callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+	callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJLAST || callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Get virtual function table from the object pointer
+		vftable = *(asFUNCTION_t**)obj;
+		func = vftable[FuncPtrToUInt(func)/sizeof(void*)];
+	}
+
+	asUINT argsPos = 0;
+	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+	{
+		const asCDataType &parmType = descr->parameterTypes[n];
+		const asCTypeInfo *const parmTypeInfo = parmType.GetTypeInfo();
+
+		if( parmType.IsObject() && !parmType.IsObjectHandle() && !parmType.IsReference() )
+		{
+			const asUINT parmDWords = parmType.GetSizeInMemoryDWords();
+			const asUINT parmQWords = (parmDWords >> 1) + (parmDWords & 1);
+
+			const bool passedAsPointer = parmQWords <= 2;
+			const bool fitsInRegisters = passedAsPointer ? (numGPRegArgs < GP_ARG_REGISTERS) : (numGPRegArgs + parmQWords <= GP_ARG_REGISTERS);
+			asQWORD *const argsArray = fitsInRegisters ? gpRegArgs : stackArgs;
+			asQWORD &numArgs = fitsInRegisters ? numGPRegArgs : numStackArgs;
+
+			if( (parmTypeInfo->flags & COMPLEX_MASK) )
+			{
+				argsArray[numArgs++] = *(asQWORD*)&args[argsPos];
+				argsPos += AS_PTR_SIZE;
+			}
+			else if( IsRegisterHFAParameter(parmType, numFloatRegArgs) )
+			{
+				if( (parmTypeInfo->flags & asOBJ_APP_CLASS_ALIGN8) != 0 )
+				{
+					const asQWORD *const contents = *(asQWORD**)&args[argsPos];
+					for( asUINT i = 0; i < parmQWords; i++ )
+						floatRegArgs[numFloatRegArgs++] = *(asQWORD*)&contents[i];
+				}
+				else
+				{
+					const asDWORD *const contents = *(asDWORD**)&args[argsPos];
+					for( asUINT i = 0; i < parmDWords; i++ )
+						floatRegArgs[numFloatRegArgs++] = *(asQWORD*)&contents[i];
+				}
+				engine->CallFree(*(char**)(args+argsPos));
+				argsPos += AS_PTR_SIZE;
+			}
+			else
+			{
+				// Copy the object's memory to the buffer
+				memcpy(&argsArray[numArgs], *(void**)(args+argsPos), parmType.GetSizeInMemoryBytes());
+
+				// Delete the original memory
+				engine->CallFree(*(char**)(args+argsPos));
+				argsPos += AS_PTR_SIZE;
+				numArgs += parmQWords;
+			}
+		}
+		else if( parmType.IsFloatType() && !parmType.IsReference() )
+		{
+			if( numFloatRegArgs >= FLOAT_ARG_REGISTERS )
+				stackArgs[numStackArgs++] = args[argsPos];
+			else
+				floatRegArgs[numFloatRegArgs++] = args[argsPos];
+			argsPos++;
+		}
+		else if( parmType.IsDoubleType() && !parmType.IsReference() )
+		{
+			if( numFloatRegArgs >= FLOAT_ARG_REGISTERS )
+				stackArgs[numStackArgs++] = *(asQWORD*)&args[argsPos];
+			else
+				floatRegArgs[numFloatRegArgs++] = *(asQWORD*)&args[argsPos];
+			argsPos += 2;
+		}
+		else
+		{
+			// Copy the value directly
+			const asUINT parmDWords = parmType.GetSizeOnStackDWords();
+			const asUINT parmQWords = (parmDWords >> 1) + (parmDWords & 1);
+
+			const bool fitsInRegisters = numGPRegArgs + parmQWords <= GP_ARG_REGISTERS;
+			asQWORD *const argsArray = fitsInRegisters ? gpRegArgs : stackArgs;
+			asQWORD &numArgs = fitsInRegisters ? numGPRegArgs : numStackArgs;
+
+			memcpy(&argsArray[numArgs], (void*)(args+argsPos), parmDWords * 4);
+			argsPos += parmDWords;
+			numArgs += parmQWords;
+		}
+	}
+
+	if( callConv == ICC_CDECL_OBJLAST || callConv == ICC_CDECL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		if( numGPRegArgs < GP_ARG_REGISTERS )
+			gpRegArgs[numGPRegArgs++] = (asQWORD)obj;
+		else
+			stackArgs[numStackArgs++] = (asQWORD)obj;
+	}
+	else if( callConv == ICC_THISCALL_OBJLAST || callConv == ICC_THISCALL_OBJLAST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST || callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		if( numGPRegArgs < GP_ARG_REGISTERS )
+			gpRegArgs[numGPRegArgs++] = (asQWORD)secondObject;
+		else
+			stackArgs[numStackArgs++] = (asQWORD)secondObject;
+	}
+
+	if( IsRegisterHFA(retType) && !(retTypeInfo->flags & COMPLEX_MASK) )
+	{
+		// This is to deal with HFAs (Homogeneous Floating-point Aggregates):
+		// ARM64 will place all-float composite types (of equal precision)
+		// with <= 4 members in the float return registers
+
+		const int structSize = retType.GetSizeInMemoryBytes();
+
+		CallARM64(gpRegArgs, numGPRegArgs, floatRegArgs, numFloatRegArgs, stackArgs, numStackArgs, func);
+		if( (retTypeInfo->flags & asOBJ_APP_CLASS_ALIGN8) != 0 )
+		{
+			if( structSize <= sizeof(double) * 2 )
+				GetHFAReturnDouble(&retQW, &retQW2, structSize);
+			else
+				GetHFAReturnDouble((asQWORD*)retPointer, ((asQWORD*)retPointer) + 1, structSize);
+		}
+		else
+			GetHFAReturnFloat(&retQW, &retQW2, structSize);
+	}
+	else if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(float*)&retQW = CallARM64Float(gpRegArgs, numGPRegArgs, floatRegArgs, numFloatRegArgs, stackArgs, numStackArgs, func);
+		else
+			*(double*)&retQW = CallARM64Double(gpRegArgs, numGPRegArgs, floatRegArgs, numFloatRegArgs, stackArgs, numStackArgs, func);
+	}
+	else if( sysFunc->hostReturnInMemory )
+		retQW = CallARM64RetInMemory(gpRegArgs, numGPRegArgs, floatRegArgs, numFloatRegArgs, stackArgs, numStackArgs, retPointer, func);
+	else
+	{
+		if( retType.GetSizeInMemoryBytes() > sizeof(asQWORD) )
+			retQW = CallARM64Ret128(gpRegArgs, numGPRegArgs, floatRegArgs, numFloatRegArgs, stackArgs, numStackArgs, &retQW2, func);
+		else
+			retQW = CallARM64(gpRegArgs, numGPRegArgs, floatRegArgs, numFloatRegArgs, stackArgs, numStackArgs, func);
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_ARM64
+#endif // AS_MAX_PORTABILITY
+
+
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_arm64_gcc.S b/Sources/AngelScript/source/as_callfunc_arm64_gcc.S
new file mode 100644
index 000000000..f89e04283
--- /dev/null
+++ b/Sources/AngelScript/source/as_callfunc_arm64_gcc.S
@@ -0,0 +1,229 @@
+//
+//  AngelCode Scripting Library
+//  Copyright (c) 2020-2022 Andreas Jonsson
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any
+//  damages arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any
+//  purpose, including commercial applications, and to alter it and
+//  redistribute it freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented// you
+//     must not claim that you wrote the original software. If you use
+//     this software in a product, an acknowledgment in the product
+//     documentation would be appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and
+//     must not be misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//     distribution.
+//
+//  The original version of this library can be located at:
+//  http://www.angelcode.com/angelscript/
+//
+//  Andreas Jonsson
+//  andreas@angelcode.com
+//
+
+
+// Assembly routines for the ARM64/AArch64 call convention used for Linux
+// Written by Max Waine in July 2020, based on as_callfunc_arm_msvc.asm,
+// with assistance & guidance provided by Sir Kane
+
+// Compile with GCC/GAS
+
+#if !defined(AS_MAX_PORTABILITY)
+
+#if defined(__aarch64__)
+
+.arch armv8-a
+.text
+
+.global GetHFAReturnDouble
+.global GetHFAReturnFloat
+.global CallARM64Ret128
+.global CallARM64RetInMemory
+.global CallARM64Double
+.global CallARM64Float
+.global CallARM64
+
+#if !defined(__MACH__)
+.type GetHFAReturnDouble, %function
+.type GetHFAReturnFloat, %function
+.type CallARM64Ret128, %function
+.type CallARM64RetInMemory, %function
+.type CallARM64Double, %function
+.type CallARM64Float, %function
+.type CallARM64, %function
+#endif /* __MACH__ */
+
+.align  2
+GetHFAReturnDouble:
+    adr     x9, populateDoubles
+    sub     x9, x9, x1, lsr 1 // x9 -= returnSize >> 1; (/2 because double is 2x instruction size)
+    br      x9
+
+    str     d3, [x0, #0x18]
+    str     d2, [x0, #0x10]
+    str     d1, [x1]
+    str     d0, [x0]
+populateDoubles:
+
+    ret
+
+.align  2
+GetHFAReturnFloat:
+    adr     x9, populateFloats
+    sub     x9, x9, x2 // x9 -= returnSize; (already 4 bytes per return)
+    br      x9
+
+    str     s3, [x1, #0x4]
+    str     s2, [x1]
+    str     s1, [x0, #0x4]
+    str     s0, [x0]
+populateFloats:
+
+    ret
+
+
+//[returnType] CallARM64[type](
+//    const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+//    const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+//    const asQWORD *stackArgs,    asQWORD numStackArgs,
+//    asFUNCTION_t func
+//)
+.align  2
+CallARM64Double:
+CallARM64Float:
+CallARM64:
+    .cfi_startproc
+    stp     fp, lr, [sp,#-0x20]!
+    str     x20, [sp,#0x10]
+    .cfi_def_cfa_offset 0x20
+    .cfi_offset 20,  0x10
+    .cfi_offset fp, -0x20
+    .cfi_offset lr, -0x18
+    mov     fp, sp
+
+    mov     x20, #0
+
+    cbz     x5, stackArgsLoopEnd
+
+    // Align count to 2, then multiply by 8, resulting in a size aligned to 16
+    add x20, x5,  #1
+    lsl x20, x20, #3
+    and x20, x20, #-0x10
+    // Multiply count by 8
+    lsl x10, x5, #3
+    sub sp, sp, x20
+stackArgsLoopStart:
+    ldp     x9,x11, [x4],#16
+    stp     x9,x11, [sp],#16
+    subs    x10, x10, #16
+    bgt     stackArgsLoopStart
+stackArgsLoopEnd:
+
+    // Calculate amount to jump forward, avoiding pointless instructions
+    adr     x9, populateFloatRegisterArgsEnd
+    sub     x9, x9, x3, lsl 2 // x9 -= numFloatRegArgs * 4
+    br      x9
+
+    ldr     d7, [x2, #0x38]
+    ldr     d6, [x2, #0x30]
+    ldr     d5, [x2, #0x28]
+    ldr     d4, [x2, #0x20]
+    ldr     d3, [x2, #0x18]
+    ldr     d2, [x2, #0x10]
+    ldr     d1, [x2, #0x08]
+    ldr     d0, [x2]
+populateFloatRegisterArgsEnd:
+
+    mov     x15, x6
+    // Calculate amount to jump forward, avoiding pointless instructions
+    adr     x9, populateGPRegisterArgsEnd
+    sub     x9, x9, x1, lsl 2 // x9 -= numGPRegArgs * 4
+    br      x9
+
+    ldr     x7, [x0, #0x38]
+    ldr     x6, [x0, #0x30]
+    ldr     x5, [x0, #0x28]
+    ldr     x4, [x0, #0x20]
+    ldr     x3, [x0, #0x18]
+    ldr     x2, [x0, #0x10]
+    ldr     x1, [x0, #0x08]
+    ldr     x0, [x0]
+populateGPRegisterArgsEnd:
+
+    // Actually call function
+    sub     sp, sp, x20
+    blr     x15
+    add     sp, sp, x20
+
+    ldr     x20, [sp,#0x10]
+    ldp     fp, lr, [sp],#0x20
+
+    .cfi_restore lr
+	.cfi_restore fp
+    .cfi_restore 20
+	.cfi_def_cfa_offset 0
+    ret
+    .cfi_endproc
+
+.align  2
+CallARM64Ret128:
+    .cfi_startproc
+    stp     fp, lr, [sp,#-0x20]!
+    str     x20, [sp,#0x10]
+    .cfi_def_cfa_offset 0x20
+    .cfi_offset 20,  0x10
+    .cfi_offset fp, -0x20
+    .cfi_offset lr, -0x18
+    mov     fp, sp
+
+    mov     x20, x6
+    mov     x6, x7
+    mov     x7, #0
+    bl      CallARM64
+
+    str     x1, [x20]
+
+    ldr     x20, [sp,#0x10]
+    ldp     fp, lr, [sp],#0x20
+
+    .cfi_restore lr
+	.cfi_restore fp
+    .cfi_restore 20
+	.cfi_def_cfa_offset 0
+    ret
+    .cfi_endproc
+
+.align  2
+CallARM64RetInMemory:
+    .cfi_startproc
+    stp     fp, lr, [sp,#-0x10]!
+    mov     fp, sp
+    .cfi_def_cfa_offset 0x10
+    .cfi_offset fp, -0x10
+    .cfi_offset lr, -0x08
+
+    mov     x8, x6
+    mov     x6, x7
+    mov     x7, #0
+    bl      CallARM64
+
+    mov     x0, x8
+
+    ldp     fp, lr, [sp],#0x10
+
+    .cfi_restore lr
+	.cfi_restore fp
+	.cfi_def_cfa_offset 0
+    ret
+    .cfi_endproc
+
+#endif /* __aarch64__ */
+
+#endif /* !AS_MAX_PORTABILITY */
diff --git a/Sources/AngelScript/source/as_callfunc_arm64_msvc.asm b/Sources/AngelScript/source/as_callfunc_arm64_msvc.asm
new file mode 100644
index 000000000..ce43c750e
--- /dev/null
+++ b/Sources/AngelScript/source/as_callfunc_arm64_msvc.asm
@@ -0,0 +1,205 @@
+;
+;  AngelCode Scripting Library
+;  Copyright (c) 2020-2020 Andreas Jonsson
+;
+;  This software is provided 'as-is', without any express or implied
+;  warranty. In no event will the authors be held liable for any
+;  damages arising from the use of this software.
+;
+;  Permission is granted to anyone to use this software for any
+;  purpose, including commercial applications, and to alter it and
+;  redistribute it freely, subject to the following restrictions:
+;
+;  1. The origin of this software must not be misrepresented; you
+;     must not claim that you wrote the original software. If you use
+;     this software in a product, an acknowledgment in the product
+;     documentation would be appreciated but is not required.
+;
+;  2. Altered source versions must be plainly marked as such, and
+;     must not be misrepresented as being the original software.
+;
+;  3. This notice may not be removed or altered from any source
+;     distribution.
+;
+;  The original version of this library can be located at:
+;  http://www.angelcode.com/angelscript/
+;
+;  Andreas Jonsson
+;  andreas@angelcode.com
+;
+
+
+; Assembly routines for the ARM64/AArch64 call convention used for Windows 10 on ARM
+; Written by Max Waine in July 2020, based on as_callfunc_arm_msvc.asm
+
+; MSVC currently doesn't support inline assembly for the ARM64 platform,
+; and if they're treating it like x64 /won't/ ever support inline assembly,
+; so this separate file is needed.
+
+; Compile with Microsoft ARM64 assembler (armasm64)
+; http://msdn.microsoft.com/en-us/library/hh873190.aspx
+
+    AREA    |.rdata|, DATA, READONLY
+    EXPORT  GetHFAReturnDouble
+    EXPORT  GetHFAReturnFloat
+    EXPORT  CallARM64Ret128
+    EXPORT  CallARM64RetInMemory
+    EXPORT  CallARM64Double
+    EXPORT  CallARM64Float
+    EXPORT  CallARM64
+
+    AREA    |.text|, CODE, ALIGN=2
+
+    ALIGN   4
+GetHFAReturnDouble PROC
+    adr     x9, |populateDoubles|
+    sub     x9, x9, x1, lsr 1 ; x9 -= returnSize >> 1; (/2 because double is 2x instruction size)
+    br      x9
+
+    str     d3, [x0, #0x18]
+    str     d2, [x0, #0x10]
+    str     d1, [x1]
+    str     d0, [x0]
+|populateDoubles|
+
+    ret
+    ENDP ; GetHFAReturnDouble
+
+    ALIGN   4
+GetHFAReturnFloat PROC
+    adr     x9, |populateFloats|
+    sub     x9, x9, x2 // x9 -= returnSize; (already 4 bytes per return)
+    br      x9
+
+    str     s3, [x1, #0x4]
+    str     s2, [x1]
+    str     s1, [x0, #0x4]
+    str     s0, [x0]
+|populateFloats|
+
+    ret
+    ENDP ; GetHFAReturnFloat
+
+
+;[returnType] CallARM64[type](
+;    const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+;    const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+;    const asQWORD *stackArgs,    asQWORD numStackArgs,
+;    asFUNCTION_t func
+;)
+    ALIGN   4
+CallARM64Double PROC
+    stp     fp, lr, [sp,#-0x10]!
+    bl      CallARM64
+    ldp     fp, lr, [sp,#-0x10]!
+    ret
+    ENDP ; CallARM64Double
+
+    ALIGN   4
+CallARM64Float PROC
+    stp     fp, lr, [sp,#-0x10]!
+    bl      CallARM64
+    ldp     fp, lr, [sp,#-0x10]!
+    ret
+    ENDP ; CallARM64Float
+
+    ALIGN   4
+CallARM64 PROC
+    stp     fp, lr, [sp,#-0x20]!
+    str     x20, [sp,#0x10]
+
+    mov     x20, #0;
+
+    cbz     x5, |stackArgsLoopEnd|
+
+    ; Align count to 2, then multiply by 8, resulting in a size aligned to 16
+    add x20, x5,  #1
+    lsl x20, x20, #3
+    and x20, x20, #-0x10
+    ; Multiply count by 8
+    lsl x10, x5, #3
+    sub sp, sp, x20
+|stackArgsLoopStart|
+    ldp     x9,x11, [x4],#16
+    stp     x9,x11, [sp],#16
+    subs    x10, x10, #16
+    bgt     |stackArgsLoopStart|
+|stackArgsLoopEnd|
+
+    ; Calculate amount to jump forward, avoiding pointless instructions
+    adr     x9, |populateFloatRegisterArgsEnd|
+    sub     x9, x9, x3, lsl 2 ; x9 -= numFloatRegArgs * 4
+    br      x9
+
+    ldr     d7, [x2, #0x38]
+    ldr     d6, [x2, #0x30]
+    ldr     d5, [x2, #0x28]
+    ldr     d4, [x2, #0x20]
+    ldr     d3, [x2, #0x18]
+    ldr     d2, [x2, #0x10]
+    ldr     d1, [x2, #0x08]
+    ldr     d0, [x2]
+|populateFloatRegisterArgsEnd|
+
+    mov     x15, x6
+    ; Calculate amount to jump forward, avoiding pointless instructions
+    adr     x9, |populateGPRegisterArgsEnd|
+    sub     x9, x9, x1, lsl 2 ; x9 -= numGPRegArgs * 4
+    br      x9
+
+    ldr     x7, [x0, #0x38]
+    ldr     x6, [x0, #0x30]
+    ldr     x5, [x0, #0x28]
+    ldr     x4, [x0, #0x20]
+    ldr     x3, [x0, #0x18]
+    ldr     x2, [x0, #0x10]
+    ldr     x1, [x0, #0x08]
+    ldr     x0, [x0]
+|populateGPRegisterArgsEnd|
+
+    ; Actually call function
+    sub     sp, sp, x20
+    blr     x15
+    add     sp, sp, x20
+
+    ldr     x20, [sp,#0x10]
+    ldp     fp, lr, [sp],#0x20
+
+    ret
+    ENDP ; CallARM64
+
+    ALIGN   4
+CallARM64Ret128 PROC
+    stp     fp, lr, [sp,#-0x20]!
+    str     x20, [sp,#0x10]
+    mov     fp, sp
+
+    mov     x20, x6
+    mov     x6, x7
+    mov     x7, #0
+    bl      CallARM64
+
+    str     x1, [x20]
+
+    ldr     x20, [sp,#0x10]
+    ldp     fp, lr, [sp],#0x20
+
+    ret ; CallARM64Ret128
+
+    ALIGN   4
+CallARM64RetInMemory PROC
+    stp     fp, lr, [sp,#-0x10]!
+    mov     fp, sp
+
+    mov     x8, x6
+    mov     x6, x7
+    mov     x7, #0
+    bl      CallARM64
+
+    mov     x0, x8
+
+    ldp     fp, lr, [sp],#0x10
+
+    ret ; CallARM64RetInMemory
+
+    END
diff --git a/Sources/AngelScript/source/as_callfunc_arm64_xcode.S b/Sources/AngelScript/source/as_callfunc_arm64_xcode.S
new file mode 100644
index 000000000..3f7c7ab91
--- /dev/null
+++ b/Sources/AngelScript/source/as_callfunc_arm64_xcode.S
@@ -0,0 +1,206 @@
+//
+//  AngelCode Scripting Library
+//  Copyright (c) 2020-2020 Andreas Jonsson
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty. In no event will the authors be held liable for any
+//  damages arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any
+//  purpose, including commercial applications, and to alter it and
+//  redistribute it freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented// you
+//     must not claim that you wrote the original software. If you use
+//     this software in a product, an acknowledgment in the product
+//     documentation would be appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and
+//     must not be misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source
+//     distribution.
+//
+//  The original version of this library can be located at:
+//  http://www.angelcode.com/angelscript/
+//
+//  Andreas Jonsson
+//  andreas@angelcode.com
+//
+
+
+// Assembly routines for the ARM64/AArch64 call convention used for Linux
+// Written by Max Waine in July 2020, based on as_callfunc_arm_msvc.asm,
+// with assistance & guidance provided by Sir Kane
+
+// Compile with GCC/GAS
+
+.align 2
+.global _GetHFAReturnDouble
+.global _GetHFAReturnFloat
+.global _CallARM64Ret128
+.global _CallARM64RetInMemory
+.global _CallARM64Double
+.global _CallARM64Float
+.global _CallARM64
+
+_GetHFAReturnDouble:
+    adr     x9, populateDoubles
+    sub     x9, x9, x1, lsr 1 // x9 -= returnSize >> 1; (/2 because double is 2x instruction size)
+    br      x9
+
+    str     d3, [x0, #0x18]
+    str     d2, [x0, #0x10]
+    str     d1, [x1]
+    str     d0, [x0]
+populateDoubles:
+
+    ret
+
+_GetHFAReturnFloat:
+    adr     x9, populateFloats
+    sub     x9, x9, x2 // x9 -= returnSize; (already 4 bytes per return)
+    br      x9
+
+    str     s3, [x1, #0x4]
+    str     s2, [x1]
+    str     s1, [x0, #0x4]
+    str     s0, [x0]
+populateFloats:
+
+    ret
+
+
+//[returnType] _CallARM64[type](
+//    const asQWORD *gpRegArgs,    asQWORD numGPRegArgs,
+//    const asQWORD *floatRegArgs, asQWORD numFloatRegArgs,
+//    const asQWORD *stackArgs,    asQWORD numStackArgs,
+//    asFUNCTION_t func
+//)
+_CallARM64Double:
+_CallARM64Float:
+_CallARM64:
+    .cfi_startproc
+    stp     fp, lr, [sp,#-0x20]!
+    str     x20, [sp,#0x10]
+    .cfi_def_cfa_offset 0x20
+    .cfi_offset 20,  0x10
+    .cfi_offset fp, -0x20
+    .cfi_offset lr, -0x18
+    mov     fp, sp
+
+    mov     x20, #0
+
+    cbz     x5, stackArgsLoopEnd
+
+    // Align count to 2, then multiply by 8, resulting in a size aligned to 16
+    add x20, x5,  #1
+    lsl x20, x20, #3
+    and x20, x20, #-0x10
+    // Multiply count by 8
+    lsl x10, x5, #3
+    sub sp, sp, x20
+stackArgsLoopStart:
+    ldp     x9,x11, [x4],#16
+    stp     x9,x11, [sp],#16
+    subs    x10, x10, #16
+    bgt     stackArgsLoopStart
+stackArgsLoopEnd:
+
+    // Calculate amount to jump forward, avoiding pointless instructions
+    adr     x9, populateFloatRegisterArgsEnd
+    sub     x9, x9, x3, lsl 2 // x9 -= numFloatRegArgs * 4
+    br      x9
+
+    ldr     d7, [x2, #0x38]
+    ldr     d6, [x2, #0x30]
+    ldr     d5, [x2, #0x28]
+    ldr     d4, [x2, #0x20]
+    ldr     d3, [x2, #0x18]
+    ldr     d2, [x2, #0x10]
+    ldr     d1, [x2, #0x08]
+    ldr     d0, [x2]
+populateFloatRegisterArgsEnd:
+
+    mov     x15, x6
+    // Calculate amount to jump forward, avoiding pointless instructions
+    adr     x9, populateGPRegisterArgsEnd
+    sub     x9, x9, x1, lsl 2 // x9 -= numGPRegArgs * 4
+    br      x9
+
+    ldr     x7, [x0, #0x38]
+    ldr     x6, [x0, #0x30]
+    ldr     x5, [x0, #0x28]
+    ldr     x4, [x0, #0x20]
+    ldr     x3, [x0, #0x18]
+    ldr     x2, [x0, #0x10]
+    ldr     x1, [x0, #0x08]
+    ldr     x0, [x0]
+populateGPRegisterArgsEnd:
+
+    // Actually call function
+    sub     sp, sp, x20
+    blr     x15
+    add     sp, sp, x20
+
+    ldr     x20, [sp,#0x10]
+    ldp     fp, lr, [sp],#0x20
+
+    .cfi_restore lr
+	.cfi_restore fp
+    .cfi_restore 20
+	.cfi_def_cfa_offset 0
+    ret
+    .cfi_endproc
+
+.align  2
+_CallARM64Ret128:
+    .cfi_startproc
+    stp     fp, lr, [sp,#-0x20]!
+    str     x20, [sp,#0x10]
+    .cfi_def_cfa_offset 0x20
+    .cfi_offset 20,  0x10
+    .cfi_offset fp, -0x20
+    .cfi_offset lr, -0x18
+    mov     fp, sp
+
+    mov     x20, x6
+    mov     x6, x7
+    mov     x7, #0
+    bl      _CallARM64
+
+    str     x1, [x20]
+
+    ldr     x20, [sp,#0x10]
+    ldp     fp, lr, [sp],#0x20
+
+    .cfi_restore lr
+	.cfi_restore fp
+    .cfi_restore 20
+	.cfi_def_cfa_offset 0
+    ret
+    .cfi_endproc
+
+.align  2
+_CallARM64RetInMemory:
+    .cfi_startproc
+    stp     fp, lr, [sp,#-0x10]!
+    mov     fp, sp
+    .cfi_def_cfa_offset 0x10
+    .cfi_offset fp, -0x10
+    .cfi_offset lr, -0x08
+
+    mov     x8, x6
+    mov     x6, x7
+    mov     x7, #0
+    bl      _CallARM64
+
+    mov     x0, x8
+
+    ldp     fp, lr, [sp],#0x10
+
+    .cfi_restore lr
+	.cfi_restore fp
+	.cfi_def_cfa_offset 0
+    ret
+    .cfi_endproc
diff --git a/Sources/AngelScript/source/as_callfunc_arm_gcc.S b/Sources/AngelScript/source/as_callfunc_arm_gcc.S
old mode 100755
new mode 100644
index 39286cc90..994fcb0df
--- a/Sources/AngelScript/source/as_callfunc_arm_gcc.S
+++ b/Sources/AngelScript/source/as_callfunc_arm_gcc.S
@@ -1,729 +1,730 @@
-/*
-  AngelCode Scripting Library
-  Copyright (c) 2003-2015 Andreas Jonsson
-
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event will the authors be held liable for any
-  damages arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any
-  purpose, including commercial applications, and to alter it and
-  redistribute it freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you
-     must not claim that you wrote the original software. If you use
-     this software in a product, an acknowledgment in the product
-     documentation would be appreciated but is not required.
-
-  2. Altered source versions must be plainly marked as such, and
-     must not be misrepresented as being the original software.
-
-  3. This notice may not be removed or altered from any source
-     distribution.
-
-  The original version of this library can be located at:
-  http://www.angelcode.com/angelscript/
-
-  Andreas Jonsson
-  andreas@angelcode.com
-*/
-
-/*
-   Assembly routines for the ARM call convention
-   Written by Fredrik Ehnbom in June 2009
-
-   Adapted to GNUC by darktemplar216 in September 2009
-
-   Modified by Lasse Oorni for 8-byte stack alignment in May 2012
-
-   The assembler routines for Linux were written by Carlos Luna in December 2012
-*/
-
-#if !defined(AS_MAX_PORTABILITY)
-
-#if defined(__arm__) || defined(__ARM__) || defined(I3D_ARCH_ARM)
-
-#if !defined(__linux__) || defined(__ANDROID__) || defined(ANDROID) || defined(__SOFTFP__)
-
-/* iOS, Android, Marmalade, and Linux with soft-float ABI goes here */
-
-.global armFunc
-.global armFuncR0
-.global armFuncR0R1
-.global armFuncObjLast
-.global armFuncR0ObjLast
-
-/* --------------------------------------------------------------------------------------------*/
-armFunc:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r8, #0
-
-    beq     nomoreargs
-
-    /* Load the first 4 arguments into r0-r3 */
-    cmp     r7, #4
-    ldrge   r0, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r1, [r6],#4
-    cmp     r7, #3*4
-    ldrge   r2, [r6],#4
-    cmp     r7, #4*4
-    ldrge   r3, [r6],#4
-    ble     nomoreargs
-
-    /* Load the rest of the arguments onto the stack */
-    sub     r7, r7, #4*4      /* skip the 4 registers already loaded into r0-r3 */
-    add     r8, r7, #4        /* ensure 8-byte stack alignment */
-    bic     r8, r8, #4
-    sub     sp, sp, r8
-    mov     r12, sp           /* copy size != frame size, so store frame start sp */
-stackargsloop:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargsloop
-    mov     sp, r12
-nomoreargs:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncObjLast:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r8, #0
-
-    mov     r0, r3          /* objlast. might get overwritten */
-    mov     r5, r3          /* objlast to temp reg */
-
-    beq     nomoreargsarmFuncObjLast
-
-    /* Load the first 4 arguments into r0-r3 */
-    cmp     r7, #4
-    ldrge   r0, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r1, [r6],#4
-    movlt   r1, r5
-    cmp     r7, #3*4
-    ldrge   r2, [r6],#4
-    movlt   r2, r5
-    cmp     r7, #4*4
-    ldrge   r3, [r6],#4
-    movlt   r3, r5
-    blt     nomoreargsarmFuncObjLast
-
-    /* Load the rest of the arguments onto the stack */
-    sub     r7, r7, #4*4    /* skip the 4 registers already loaded into r0-r3 */
-    add     r8, r7, #8      /* account for the objlast pointer, ensure 8-byte stack alignment */
-    bic     r8, r8, #4
-    str     r5, [sp,#-4]    /* store the objlast on stack, twice in case we adjusted alignment */
-    str     r5, [sp,#-8]
-    sub     sp, sp, r8      /* adjust frame */
-    cmp     r7, #0          /* we may also have come here with no extra params */
-    beq     nomoreargsarmFuncObjLast
-    mov     r12, sp         /* copy size != frame size, so store frame start sp */
-stackargslooparmFuncObjLast:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncObjLast
-    mov     sp, r12
-nomoreargsarmFuncObjLast:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncR0ObjLast:
-    stmdb   sp!, {r4-r8, lr}
-    ldr     r5, [sp,#6*4]   /* objlast to temp reg */
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r8, #0
-
-    mov     r0, r3      /* r0 explicitly set */
-    mov     r1, r5      /* objlast.  might get overwritten */
-
-    beq     nomoreargsarmFuncR0ObjLast
-
-    /* Load the first 3 arguments into r1-r3 */
-    cmp     r7, #1*4
-    ldrge   r1, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r2, [r6],#4
-    movlt   r2, r5
-    cmp     r7, #3*4
-    ldrge   r3, [r6],#4
-    movlt   r3, r5
-    blt     nomoreargsarmFuncR0ObjLast
-
-    /* Load the rest of the arguments onto the stack */
-    sub     r7, r7, #3*4    /* skip the 3 registers already loaded into r1-r3 */
-    add     r8, r7, #8      /* account for the objlast pointer, ensure 8-byte stack alignment */
-    bic     r8, r8, #4
-    str     r5, [sp,#-4]    /* store the objlast on stack, twice in case we adjusted alignment */
-    str     r5, [sp,#-8]
-    sub     sp, sp, r8      /* adjust frame */
-    cmp     r7, #0          /* we may also have come here with no extra params */
-    beq     nomoreargsarmFuncR0ObjLast
-    mov     r12, sp         /* copy size != frame size, so store frame start sp */
-stackargslooparmFuncR0ObjLast:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncR0ObjLast
-    mov     sp, r12
-nomoreargsarmFuncR0ObjLast:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncR0:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r8, #0
-
-    mov     r0, r3  /* r0 explicitly set */
-
-    beq     nomoreargsarmFuncR0
-
-    /* Load the first 3 arguments into r1-r3 */
-    cmp     r7, #1*4
-    ldrge   r1, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r2, [r6],#4
-    cmp     r7, #3*4
-    ldrge   r3, [r6],#4
-    ble     nomoreargsarmFuncR0
-
-    /* Load the rest of the arguments onto the stack */
-    sub     r7, r7, #3*4    /* skip the 3 registers already loaded into r1-r3 */
-    add     r8, r7, #4      /* ensure 8-byte stack alignment */
-    bic     r8, r8, #4
-    sub     sp, sp, r8
-    mov     r12, sp         /* copy size != frame size, so store frame start sp */
-stackargslooparmFuncR0:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncR0
-    mov     sp, r12
-nomoreargsarmFuncR0:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncR0R1:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r8, #0
-
-    mov     r0, r3          /* r0 explicitly set */
-    ldr     r1, [sp, #6*4]  /* r1 explicitly set too */
-
-    beq     nomoreargsarmFuncR0R1
-
-    /* Load the first 2 arguments into r2-r3 */
-    cmp     r7, #1*4
-    ldrge   r2, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r3, [r6],#4
-    ble     nomoreargsarmFuncR0R1
-
-    /* Load the rest of the arguments onto the stack */
-    sub     r7, r7, #2*4    /* skip the 2 registers already loaded into r2-r3 */
-    add     r8, r7, #4      /* ensure 8-byte stack alignment */
-    bic     r8, r8, #4
-    sub     sp, sp, r8
-    mov     r12, sp         /* copy size != frame size, so store frame start sp */
-stackargslooparmFuncR0R1:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncR0R1
-    mov     sp, r12
-nomoreargsarmFuncR0R1:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-/* --------------------------------------------------------------------------------------------*/
-#elif defined(__linux__) && !defined(__SOFTFP__)
-
-/* The Linux with hard-float ABI code goes here */
-
-
-/* These codes are suitable for armeabi + vfp  / armeabihf */
-/* when using armeabi + vfp, please set C_FLAGS -mfloat-abi=softfp -mfpu=vfp */
-/* using armeabihf, please set C_FLAGS -mfloat-abi=hard -mfpu=vfpv3-d16 */
-
-/* if you prefer to run in ARM mode, please add -marm to C_FLAGS */
-/* while using thumb mode, please add -mthumb -Wa,-mimplicit-it=thumb */
-
-
-/* SP is a multiple of 8 when control first enters a program.*/
-/* This places an obligation on authors of low level OS, RTOS, and runtime library code to align SP at all points */
-/* at which control first enters a body of (AAPCS-conforming) code. (please read "ARM IHI 0046B" document)*/
-
-
-.section .text
-
-    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
-#if defined(__thumb__) || defined(__thumb2__)
-    .thumb
-    .syntax unified
-#else
-    .arm            /* Use ARM instructions instead of Thumb.*/
-#endif
-    .globl armFunc  /* Make the function globally accessible.*/
-armFunc:
-    push    {r4-r8, r10, r11, lr}   /* sp must be 8-byte alignment for ABI compliance, so the pushed registers must be even */
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-
-    /* Load float and double args into d0-d7 and s0-s15 */
-    add       r10, r6, #272 /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov       r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargs
-
-    /* Load the first 4 arguments into r0-r3 */
-    cmp     r7, #4
-    ldrge   r0, [r6]
-    cmp     r7, #8
-    ldrge   r1, [r6, #4]
-    cmp     r7, #12
-    ldrge   r2, [r6, #8]
-    cmp     r7, #16
-    ldrge   r3, [r6, #12]
-
-stackargs:
-    ldr     r5, [r6, #268]  /* Load stack size into r5 */
-    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargs
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargsloop:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargsloop
-    mov     sp, r12
-
-nomoreargs:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    vstmia.64 r10, {d0-d7}   /* Copy contents of registers d0-d7 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-/* --------------------------------------------------------------------------------------------*/
-    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
-#if defined(__thumb__) || defined(__thumb2__)
-    .thumb
-    .syntax unified
-#else
-    .arm            /* Use ARM instructions instead of Thumb.*/
-#endif
-    .globl armFuncObjLast       /* Make the function globally accessible.*/
-armFuncObjLast:
-    push {r4-r8, r10, r11, lr}  /* We´re storing r11 just to keep the stack aligned to an 8 byte boundary */
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-
-    mov     r0, r3          /* objlast. might get overwritten */
-    mov     r5, #0          /* This will hold an offset of #4 only if objlast couldn´t be placed into an "r" register */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsFuncObjLast
-
-    mov     r5, r3          /* store objlast in r5 temporarily */
-
-    /* Load the first 4 arguments into r0-r3 */
-    cmp     r7, #4
-    ldrge   r0, [r6]
-    cmp     r7, #8
-    ldrge   r1, [r6,#4]
-    movlt   r1, r5
-    cmp     r7, #12
-    ldrge   r2, [r6,#8]
-    movlt   r2, r5
-    cmp     r7, #16
-    ldrge   r3, [r6,#12]
-    movlt   r3, r5
-    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
-    blt     stackargsFuncObjLast    /* If objlast got placed into a register, go to stackargsFuncObjLast */
-
-    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
-    mov     r5, #4                  /* Set r5 with an offset of #4, so objlast can be loaded into the stack */
-
-stackargsFuncObjLast:
-    ldr     r7, [r6, #268]  /* Load stack size into r7 */
-    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
-    cmp     r7, #0          /* Check for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncObjLast
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncObjLast:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncObjLast
-    mov     sp, r12
-
-nomoreargsarmFuncObjLast:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop   {r4-r8, r10,r11, pc}
-
-/* ------------------------------------------------------------------------------------------- */
-    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
-#if defined(__thumb__) || defined(__thumb2__)
-    .thumb
-    .syntax unified
-#else
-    .arm            /* Use ARM instructions instead of Thumb.*/
-#endif
-    .globl armFuncR0ObjLast     /* Make the function globally accessible.*/
-armFuncR0ObjLast:
-    push    {r4-r8, r10, r11, lr}
-
-    ldr     r5, [sp,#32]   /* objlast to temp reg */
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-
-    mov     r0, r3      /* r0 explicitly set */
-    mov     r1, r5      /* objlast.  might get overwritten */
-    mov     r5, #0      /* This will hold an offset of #4 or #8 if objlast or one arg couldn´t be placed into an "r" register */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsFuncR0ObjLast
-
-    mov     r5, r1          /* store objlast in r5 temporarily */
-
-    /* Load the first 3 arguments into r1-r3 */
-    cmp     r7, #4
-    ldrge   r1, [r6]
-    cmp     r7, #8
-    ldrge   r2, [r6,#4]
-    movlt   r2, r5
-    cmp     r7, #12
-    ldrge   r3, [r6,#8]
-    movlt   r3, r5
-    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
-    blt     stackargsFuncR0ObjLast  /* If objlast got placed into a register, go to stackargsFuncR0ObjLast */
-
-    cmp     r7, #16                 /* Else if we have one last arg set the offset accordingly and store the arg in the array */
-    ldrge   r7, [r6, #12]
-    strge   r7, [r6, #8]
-
-    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
-    mov     r5, #0
-
-    movge   r5, #4                  /* Set r5 with an offset of #4 if there´s one last arg that couldn´t be placed in r registers */
-    add     r5, r5, #4              /* Set r5 with an offset of + #4, so objlast can be loaded into the stack */
-
-stackargsFuncR0ObjLast:
-    ldr     r7, [r6, #268]  /* Load stack size into r7 */
-    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
-    cmp     r7, #0          /* Check for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncR0ObjLast
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncR0ObjLast:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncR0ObjLast
-    mov     sp, r12
-
-nomoreargsarmFuncR0ObjLast:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-/* ------------------------------------------------------------------------------------------- */
-    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
-#if defined(__thumb__) || defined(__thumb2__)
-    .thumb
-    .syntax unified
-#else
-    .arm            /* Use ARM instructions instead of Thumb.*/
-#endif
-    .globl armFuncR0        /* Make the function globally accessible.*/
-armFuncR0:
-    push {r4-r8, r10, r11, lr}
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r11, #0 /* This will hold an offset of #4 only if the last arg that should have been placed into an "r" reg needs to go to the stack */
-    mov     r0, r3  /* r0 explicitly set */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsarmFuncR0
-
-    /* Load the first 3 arguments into r1-r3 */
-    cmp     r7, #4
-    ldrge   r1, [r6]
-    cmp     r7, #8
-    ldrge   r2, [r6, #4]
-    cmp     r7, #12
-    ldrge   r3, [r6, #8]
-    cmp     r7, #16
-    movge   r11, #4         /* If there is still one arg to be placed, set the offset in r11 to #4 */
-
-stackargsarmFuncR0:
-    ldr     r5, [r6, #268]  /* Load stack size into r5 */
-    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4) */
-    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncR0
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncR0:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncR0
-    mov     sp, r12
-
-nomoreargsarmFuncR0:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-/* ------------------------------------------------------------------------------------------- */
-    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
-#if defined(__thumb__) || defined(__thumb2__)
-    .thumb
-    .syntax unified
-#else
-    .arm            /* Use ARM instructions instead of Thumb.*/
-#endif
-    .globl armFuncR0R1      /* Make the function globally accessible.*/
-armFuncR0R1:
-    push {r4-r8, r10, r11, lr}
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r11, #0 /* This will hold an offset of #4 or #8 only if the last arg (or last 2 args) that should have been placed into "r" regs need to go to the stack */
-
-    mov     r0, r3          /* r0 explicitly set */
-    ldr     r1, [sp, #32]   /* r1 explicitly set too */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r2-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsarmFuncR0R1
-
-    /* Load the first 2 arguments into r2-r3 */
-    cmp     r7, #4
-    ldrge   r2, [r6]
-    cmp     r7, #8
-    ldrge   r3, [r6, #4]
-    cmp     r7, #12
-    movge   r11, #4         /* If there is a third arg to be placed, set the offset in r11 to #4 */
-    cmp     r7, #16
-    movge   r11, #8         /* If there is a fourth arg to be placed, set the offset in r11 to #8 */
-    ldrlt   r7, [r6, #8]    /* Else copy the third arg to the correct place in the array */
-    strlt   r7, [r6, #12]
-
-stackargsarmFuncR0R1:
-    ldr     r5, [r6, #268]  /* Load stack size into r5 */
-    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4 or #8) */
-    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncR0R1
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4 or #8) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncR0R1:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncR0R1
-    mov     sp, r12
-
-nomoreargsarmFuncR0R1:
-#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-    mov    lr, pc   /* older ARM didn't support blx */
-    mov    pc, r4
-#else
-    blx     r4
-#endif
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-#endif /* hard float abi */
-
-#if defined(__linux__) && defined(__ELF__)
-/* ref: http://hardened.gentoo.org/gnu-stack.xml */
-.section .note.GNU-stack,"",%progbits
-#endif
-
-#endif /* arm */
-
-#endif /* !AS_MAX_PORTABILITY */
-
-
+/*
+  AngelCode Scripting Library
+  Copyright (c) 2003-2020 Andreas Jonsson
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any
+  damages arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any
+  purpose, including commercial applications, and to alter it and
+  redistribute it freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you
+     must not claim that you wrote the original software. If you use
+     this software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  2. Altered source versions must be plainly marked as such, and
+     must not be misrepresented as being the original software.
+
+  3. This notice may not be removed or altered from any source
+     distribution.
+
+  The original version of this library can be located at:
+  http://www.angelcode.com/angelscript/
+
+  Andreas Jonsson
+  andreas@angelcode.com
+*/
+
+/*
+   Assembly routines for the ARM call convention
+   Written by Fredrik Ehnbom in June 2009
+
+   Adapted to GNUC by darktemplar216 in September 2009
+
+   Modified by Lasse Oorni for 8-byte stack alignment in May 2012
+
+   The assembler routines for Linux were written by Carlos Luna in December 2012
+*/
+
+#if !defined(AS_MAX_PORTABILITY)
+
+#if defined(__arm__) || defined(__ARM__) || defined(I3D_ARCH_ARM)
+
+#if !defined(__linux__) || defined(__ANDROID__) || defined(ANDROID) || defined(__SOFTFP__) || defined(__ARM_PCS)
+
+/* iOS, Android, Marmalade, and Linux with soft-float ABI goes here */
+
+.global armFunc
+.global armFuncR0
+.global armFuncR0R1
+.global armFuncObjLast
+.global armFuncR0ObjLast
+
+/* --------------------------------------------------------------------------------------------*/
+armFunc:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r8, #0
+
+    beq     nomoreargs
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+    ldrge   r0, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r1, [r6],#4
+    cmp     r7, #3*4
+    ldrge   r2, [r6],#4
+    cmp     r7, #4*4
+    ldrge   r3, [r6],#4
+    ble     nomoreargs
+
+    /* Load the rest of the arguments onto the stack */
+    sub     r7, r7, #4*4      /* skip the 4 registers already loaded into r0-r3 */
+    add     r8, r7, #4        /* ensure 8-byte stack alignment */
+    bic     r8, r8, #4
+    sub     sp, sp, r8
+    mov     r12, sp           /* copy size != frame size, so store frame start sp */
+stackargsloop:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargsloop
+    mov     sp, r12
+nomoreargs:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncObjLast:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r8, #0
+
+    mov     r0, r3          /* objlast. might get overwritten */
+    mov     r5, r3          /* objlast to temp reg */
+
+    beq     nomoreargsarmFuncObjLast
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+    ldrge   r0, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r1, [r6],#4
+    movlt   r1, r5
+    cmp     r7, #3*4
+    ldrge   r2, [r6],#4
+    movlt   r2, r5
+    cmp     r7, #4*4
+    ldrge   r3, [r6],#4
+    movlt   r3, r5
+    blt     nomoreargsarmFuncObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    sub     r7, r7, #4*4    /* skip the 4 registers already loaded into r0-r3 */
+    add     r8, r7, #8      /* account for the objlast pointer, ensure 8-byte stack alignment */
+    bic     r8, r8, #4
+    str     r5, [sp,#-4]    /* store the objlast on stack, twice in case we adjusted alignment */
+    str     r5, [sp,#-8]
+    sub     sp, sp, r8      /* adjust frame */
+    cmp     r7, #0          /* we may also have come here with no extra params */
+    beq     nomoreargsarmFuncObjLast
+    mov     r12, sp         /* copy size != frame size, so store frame start sp */
+stackargslooparmFuncObjLast:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncObjLast
+    mov     sp, r12
+nomoreargsarmFuncObjLast:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0ObjLast:
+    stmdb   sp!, {r4-r8, lr}
+    ldr     r5, [sp,#6*4]   /* objlast to temp reg */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r8, #0
+
+    mov     r0, r3      /* r0 explicitly set */
+    mov     r1, r5      /* objlast.  might get overwritten */
+
+    beq     nomoreargsarmFuncR0ObjLast
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #1*4
+    ldrge   r1, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r2, [r6],#4
+    movlt   r2, r5
+    cmp     r7, #3*4
+    ldrge   r3, [r6],#4
+    movlt   r3, r5
+    blt     nomoreargsarmFuncR0ObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    sub     r7, r7, #3*4    /* skip the 3 registers already loaded into r1-r3 */
+    add     r8, r7, #8      /* account for the objlast pointer, ensure 8-byte stack alignment */
+    bic     r8, r8, #4
+    str     r5, [sp,#-4]    /* store the objlast on stack, twice in case we adjusted alignment */
+    str     r5, [sp,#-8]
+    sub     sp, sp, r8      /* adjust frame */
+    cmp     r7, #0          /* we may also have come here with no extra params */
+    beq     nomoreargsarmFuncR0ObjLast
+    mov     r12, sp         /* copy size != frame size, so store frame start sp */
+stackargslooparmFuncR0ObjLast:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncR0ObjLast
+    mov     sp, r12
+nomoreargsarmFuncR0ObjLast:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r8, #0
+
+    mov     r0, r3  /* r0 explicitly set */
+
+    beq     nomoreargsarmFuncR0
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #1*4
+    ldrge   r1, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r2, [r6],#4
+    cmp     r7, #3*4
+    ldrge   r3, [r6],#4
+    ble     nomoreargsarmFuncR0
+
+    /* Load the rest of the arguments onto the stack */
+    sub     r7, r7, #3*4    /* skip the 3 registers already loaded into r1-r3 */
+    add     r8, r7, #4      /* ensure 8-byte stack alignment */
+    bic     r8, r8, #4
+    sub     sp, sp, r8
+    mov     r12, sp         /* copy size != frame size, so store frame start sp */
+stackargslooparmFuncR0:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncR0
+    mov     sp, r12
+nomoreargsarmFuncR0:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0R1:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r8, #0
+
+    mov     r0, r3          /* r0 explicitly set */
+    ldr     r1, [sp, #6*4]  /* r1 explicitly set too */
+
+    beq     nomoreargsarmFuncR0R1
+
+    /* Load the first 2 arguments into r2-r3 */
+    cmp     r7, #1*4
+    ldrge   r2, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r3, [r6],#4
+    ble     nomoreargsarmFuncR0R1
+
+    /* Load the rest of the arguments onto the stack */
+    sub     r7, r7, #2*4    /* skip the 2 registers already loaded into r2-r3 */
+    add     r8, r7, #4      /* ensure 8-byte stack alignment */
+    bic     r8, r8, #4
+    sub     sp, sp, r8
+    mov     r12, sp         /* copy size != frame size, so store frame start sp */
+stackargslooparmFuncR0R1:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncR0R1
+    mov     sp, r12
+nomoreargsarmFuncR0R1:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+/* --------------------------------------------------------------------------------------------*/
+#elif defined(__linux__) && !defined(__SOFTFP__) && !defined(__ARM_PCS)
+
+/* The Linux with hard-float ABI code goes here */
+
+
+/* These codes are suitable for armeabi + vfp  / armeabihf */
+/* when using armeabi + vfp, please set C_FLAGS -mfloat-abi=softfp -mfpu=vfp */
+/* using armeabihf, please set C_FLAGS -mfloat-abi=hard -mfpu=vfpv3-d16 */
+
+/* if you prefer to run in ARM mode, please add -marm to C_FLAGS */
+/* while using thumb mode, please add -mthumb -Wa,-mimplicit-it=thumb */
+
+
+/* SP is a multiple of 8 when control first enters a program.*/
+/* This places an obligation on authors of low level OS, RTOS, and runtime library code to align SP at all points */
+/* at which control first enters a body of (AAPCS-conforming) code. (please read "ARM IHI 0046B" document)*/
+
+
+.section .text
+
+    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
+#if defined(__thumb__) || defined(__thumb2__)
+    .thumb
+    .syntax unified
+#else
+    .arm            /* Use ARM instructions instead of Thumb.*/
+#endif
+    .globl armFunc  /* Make the function globally accessible.*/
+armFunc:
+    push    {r4-r8, r10, r11, lr}   /* sp must be 8-byte alignment for ABI compliance, so the pushed registers must be even */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    /* Load float and double args into d0-d7 and s0-s15 */
+    add       r10, r6, #272 /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov       r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargs
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+    ldrge   r0, [r6]
+    cmp     r7, #8
+    ldrge   r1, [r6, #4]
+    cmp     r7, #12
+    ldrge   r2, [r6, #8]
+    cmp     r7, #16
+    ldrge   r3, [r6, #12]
+
+stackargs:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargs
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargsloop:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargsloop
+    mov     sp, r12
+
+nomoreargs:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    vstmia.64 r10, {d0-d7}   /* Copy contents of registers d0-d7 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+/* --------------------------------------------------------------------------------------------*/
+    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
+#if defined(__thumb__) || defined(__thumb2__)
+    .thumb
+    .syntax unified
+#else
+    .arm            /* Use ARM instructions instead of Thumb.*/
+#endif
+    .globl armFuncObjLast       /* Make the function globally accessible.*/
+armFuncObjLast:
+    push {r4-r8, r10, r11, lr}  /* We´re storing r11 just to keep the stack aligned to an 8 byte boundary */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    mov     r0, r3          /* objlast. might get overwritten */
+    mov     r5, #0          /* This will hold an offset of #4 only if objlast couldn´t be placed into an "r" register */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsFuncObjLast
+
+    mov     r5, r3          /* store objlast in r5 temporarily */
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+    ldrge   r0, [r6]
+    cmp     r7, #8
+    ldrge   r1, [r6,#4]
+    movlt   r1, r5
+    cmp     r7, #12
+    ldrge   r2, [r6,#8]
+    movlt   r2, r5
+    cmp     r7, #16
+    ldrge   r3, [r6,#12]
+    movlt   r3, r5
+    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
+    blt     stackargsFuncObjLast    /* If objlast got placed into a register, go to stackargsFuncObjLast */
+
+    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
+    mov     r5, #4                  /* Set r5 with an offset of #4, so objlast can be loaded into the stack */
+
+stackargsFuncObjLast:
+    ldr     r7, [r6, #268]  /* Load stack size into r7 */
+    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
+    cmp     r7, #0          /* Check for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncObjLast:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncObjLast
+    mov     sp, r12
+
+nomoreargsarmFuncObjLast:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop   {r4-r8, r10,r11, pc}
+
+/* ------------------------------------------------------------------------------------------- */
+    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
+#if defined(__thumb__) || defined(__thumb2__)
+    .thumb
+    .syntax unified
+#else
+    .arm            /* Use ARM instructions instead of Thumb.*/
+#endif
+    .globl armFuncR0ObjLast     /* Make the function globally accessible.*/
+armFuncR0ObjLast:
+    push    {r4-r8, r10, r11, lr}
+
+    ldr     r5, [sp,#32]   /* objlast to temp reg */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    mov     r0, r3      /* r0 explicitly set */
+    mov     r1, r5      /* objlast.  might get overwritten */
+    mov     r5, #0      /* This will hold an offset of #4 or #8 if objlast or one arg couldn´t be placed into an "r" register */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsFuncR0ObjLast
+
+    mov     r5, r1          /* store objlast in r5 temporarily */
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #4
+    ldrge   r1, [r6]
+    cmp     r7, #8
+    ldrge   r2, [r6,#4]
+    movlt   r2, r5
+    cmp     r7, #12
+    ldrge   r3, [r6,#8]
+    movlt   r3, r5
+    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
+    blt     stackargsFuncR0ObjLast  /* If objlast got placed into a register, go to stackargsFuncR0ObjLast */
+
+    cmp     r7, #16                 /* Else if we have one last arg set the offset accordingly and store the arg in the array */
+    ldrge   r7, [r6, #12]
+    strge   r7, [r6, #8]
+
+    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
+    mov     r5, #0
+
+    movge   r5, #4                  /* Set r5 with an offset of #4 if there´s one last arg that couldn´t be placed in r registers */
+    add     r5, r5, #4              /* Set r5 with an offset of + #4, so objlast can be loaded into the stack */
+
+stackargsFuncR0ObjLast:
+    ldr     r7, [r6, #268]  /* Load stack size into r7 */
+    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
+    cmp     r7, #0          /* Check for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0ObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0ObjLast:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0ObjLast
+    mov     sp, r12
+
+nomoreargsarmFuncR0ObjLast:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+/* ------------------------------------------------------------------------------------------- */
+    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
+#if defined(__thumb__) || defined(__thumb2__)
+    .thumb
+    .syntax unified
+#else
+    .arm            /* Use ARM instructions instead of Thumb.*/
+#endif
+    .globl armFuncR0        /* Make the function globally accessible.*/
+armFuncR0:
+    push {r4-r8, r10, r11, lr}
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r11, #0 /* This will hold an offset of #4 only if the last arg that should have been placed into an "r" reg needs to go to the stack */
+    mov     r0, r3  /* r0 explicitly set */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsarmFuncR0
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #4
+    ldrge   r1, [r6]
+    cmp     r7, #8
+    ldrge   r2, [r6, #4]
+    cmp     r7, #12
+    ldrge   r3, [r6, #8]
+    cmp     r7, #16
+    movge   r11, #4         /* If there is still one arg to be placed, set the offset in r11 to #4 */
+
+stackargsarmFuncR0:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4) */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0
+    mov     sp, r12
+
+nomoreargsarmFuncR0:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+/* ------------------------------------------------------------------------------------------- */
+    .align 2        /* Align the function code to a 4-byte (2^n) word boundary. */
+#if defined(__thumb__) || defined(__thumb2__)
+    .thumb
+    .syntax unified
+#else
+    .arm            /* Use ARM instructions instead of Thumb.*/
+#endif
+    .globl armFuncR0R1      /* Make the function globally accessible.*/
+armFuncR0R1:
+    push {r4-r8, r10, r11, lr}
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r11, #0 /* This will hold an offset of #4 or #8 only if the last arg (or last 2 args) that should have been placed into "r" regs need to go to the stack */
+
+    mov     r0, r3          /* r0 explicitly set */
+    ldr     r1, [sp, #32]   /* r1 explicitly set too */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r2-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsarmFuncR0R1
+
+    /* Load the first 2 arguments into r2-r3 */
+    cmp     r7, #4
+    ldrge   r2, [r6]
+    cmp     r7, #8
+    ldrge   r3, [r6, #4]
+    cmp     r7, #12
+    movge   r11, #4         /* If there is a third arg to be placed, set the offset in r11 to #4 */
+    cmp     r7, #16
+    movge   r11, #8         /* If there is a fourth arg to be placed, set the offset in r11 to #8 */
+    ldrlt   r7, [r6, #8]    /* Else copy the third arg to the correct place in the array */
+    strlt   r7, [r6, #12]
+
+stackargsarmFuncR0R1:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4 or #8) */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0R1
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4 or #8) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0R1:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0R1
+    mov     sp, r12
+
+nomoreargsarmFuncR0R1:
+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
+    mov    lr, pc   /* older ARM didn't support blx */
+    mov    pc, r4
+#else
+    blx     r4
+#endif
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+#endif /* hard float abi */
+
+#endif /* arm */
+
+#if defined(__linux__) && defined(__ELF__)
+/* ref: http://hardened.gentoo.org/gnu-stack.xml 
+   ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart */
+.section .note.GNU-stack,"",%progbits
+#endif
+
+#endif /* !AS_MAX_PORTABILITY */
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_arm_msvc.asm b/Sources/AngelScript/source/as_callfunc_arm_msvc.asm
old mode 100755
new mode 100644
diff --git a/Sources/AngelScript/source/as_callfunc_arm_vita.S b/Sources/AngelScript/source/as_callfunc_arm_vita.S
old mode 100755
new mode 100644
index adae391b5..406db039b
--- a/Sources/AngelScript/source/as_callfunc_arm_vita.S
+++ b/Sources/AngelScript/source/as_callfunc_arm_vita.S
@@ -1,485 +1,485 @@
-/*
-  AngelCode Scripting Library
-  Copyright (c) 2003-2015 Andreas Jonsson
-
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event will the authors be held liable for any
-  damages arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any
-  purpose, including commercial applications, and to alter it and
-  redistribute it freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you
-     must not claim that you wrote the original software. If you use
-     this software in a product, an acknowledgment in the product
-     documentation would be appreciated but is not required.
-
-  2. Altered source versions must be plainly marked as such, and
-     must not be misrepresented as being the original software.
-
-  3. This notice may not be removed or altered from any source
-     distribution.
-
-  The original version of this library can be located at:
-  http://www.angelcode.com/angelscript/
-
-  Andreas Jonsson
-  andreas@angelcode.com
-*/
-
-/*
-   Assembly routines for the Playstation Vita SNC call convention.
-
-   This code was adapted from as_callfunc_arm_gcc (ARM, Linux hard float) by Brandon Bare on October 2014.
-*/
-
-#if !defined(AS_MAX_PORTABILITY)
-
-#ifdef __psp2__
-
-.syntax unified
-.cpu cortex-a9
-.fpu neon
-
-.section .text.armCallFunc
-.balign 2
-.thumb
-.thumb_func
-
-.align 2
-
-.global armFunc
-.global armFuncR0
-.global armFuncR0R1
-.global armFuncObjLast
-.global armFuncR0ObjLast
-
-.type armFunc, %function
-.type armFuncR0, %function
-.type armFuncR0R1, %function
-.type armFuncObjLast, %function
-.type armFuncR0ObjLast, %function
-
-/* --------------------------------------------------------------------------------------------*/
-armFunc:
-    .fnstart
-
-    push    {r4-r8, r10, r11, lr}   /* sp must be 8-byte alignment for ABI compliance, so the pushed registers must be even */
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-
-    /* Load float and double args into d0-d7 and s0-s15 */
-    add       r10, r6, #272 /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov       r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargs
-
-    /* Load the first 4 arguments into r0-r3 */
-    cmp     r7, #4
-
-    it ge
-    ldrge   r0, [r6]
-    cmp     r7, #8
-
-    it ge
-    ldrge   r1, [r6, #4]
-    cmp     r7, #12
-
-    it ge
-    ldrge   r2, [r6, #8]
-    cmp     r7, #16
-
-    it ge
-    ldrge   r3, [r6, #12]
-
-stackargs:
-    ldr     r5, [r6, #268]  /* Load stack size into r5 */
-    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargs
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargsloop:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargsloop
-    mov     sp, r12
-
-nomoreargs:
-    blx     r4
-    add     sp, sp, r8
-    vstmia.64 r10, {d0-d7}   /* Copy contents of registers d0-d7 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-    .fnend
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncObjLast:
-    .fnstart
-
-    push {r4-r8, r10, r11, lr}  /* We´re storing r11 just to keep the stack aligned to an 8 byte boundary */
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-
-    mov     r0, r3          /* objlast. might get overwritten */
-    mov     r5, #0          /* This will hold an offset of #4 only if objlast couldn´t be placed into an "r" register */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsFuncObjLast
-
-    mov     r5, r3          /* store objlast in r5 temporarily */
-
-    /* Load the first 4 arguments into r0-r3 */
-    cmp     r7, #4
-
-    it ge
-    ldrge   r0, [r6]
-    cmp     r7, #8
-
-    it ge
-    ldrge   r1, [r6,#4]
-
-    it lt
-    movlt   r1, r5
-    cmp     r7, #12
-
-    it ge
-    ldrge   r2, [r6,#8]
-
-    it lt
-    movlt   r2, r5
-    cmp     r7, #16
-
-    it ge
-    ldrge   r3, [r6,#12]
-
-    ittt lt
-    movlt   r3, r5
-    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
-    blt     stackargsFuncObjLast    /* If objlast got placed into a register, go to stackargsFuncObjLast */
-
-    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
-    mov     r5, #4                  /* Set r5 with an offset of #4, so objlast can be loaded into the stack */
-
-stackargsFuncObjLast:
-    ldr     r7, [r6, #268]  /* Load stack size into r7 */
-    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
-    cmp     r7, #0          /* Check for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncObjLast
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncObjLast:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncObjLast
-    mov     sp, r12
-
-nomoreargsarmFuncObjLast:
-    blx     r4
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop   {r4-r8, r10,r11, pc}
-
-    .fnend
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncR0ObjLast:
-    .fnstart
-
-    push    {r4-r8, r10, r11, lr}
-
-    ldr     r5, [sp,#32]   /* objlast to temp reg */
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-
-    mov     r0, r3      /* r0 explicitly set */
-    mov     r1, r5      /* objlast.  might get overwritten */
-    mov     r5, #0      /* This will hold an offset of #4 or #8 if objlast or one arg couldn´t be placed into an "r" register */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsFuncR0ObjLast
-
-    mov     r5, r1          /* store objlast in r5 temporarily */
-
-    /* Load the first 3 arguments into r1-r3 */
-    cmp     r7, #4
-
-    it ge
-    ldrge   r1, [r6]
-    cmp     r7, #8
-
-    it ge
-    ldrge   r2, [r6,#4]
-
-    it lt
-    movlt   r2, r5
-    cmp     r7, #12
-
-    it ge
-    ldrge   r3, [r6,#8]
-
-    ittt lt
-    movlt   r3, r5
-    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
-    blt     stackargsFuncR0ObjLast  /* If objlast got placed into a register, go to stackargsFuncR0ObjLast */
-
-    cmp     r7, #16                 /* Else if we have one last arg set the offset accordingly and store the arg in the array */
-
-    itt ge
-    ldrge   r7, [r6, #12]
-    strge   r7, [r6, #8]
-
-    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
-    mov     r5, #0
-
-    it ge
-    movge   r5, #4                  /* Set r5 with an offset of #4 if there´s one last arg that couldn´t be placed in r registers */
-    add     r5, r5, #4              /* Set r5 with an offset of + #4, so objlast can be loaded into the stack */
-
-stackargsFuncR0ObjLast:
-    ldr     r7, [r6, #268]  /* Load stack size into r7 */
-    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
-    cmp     r7, #0          /* Check for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncR0ObjLast
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncR0ObjLast:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncR0ObjLast
-    mov     sp, r12
-
-nomoreargsarmFuncR0ObjLast:
-    blx     r4
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-    .fnend
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncR0:
-    .fnstart
-
-    push {r4-r8, r10, r11, lr}
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r11, #0 /* This will hold an offset of #4 only if the last arg that should have been placed into an "r" reg needs to go to the stack */
-    mov     r0, r3  /* r0 explicitly set */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r0-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsarmFuncR0
-
-    /* Load the first 3 arguments into r1-r3 */
-    cmp     r7, #4
-
-    it ge
-    ldrge   r1, [r6]
-    cmp     r7, #8
-
-    it ge
-    ldrge   r2, [r6, #4]
-    cmp     r7, #12
-
-    it ge
-    ldrge   r3, [r6, #8]
-    cmp     r7, #16
-
-    it ge
-    movge   r11, #4         /* If there is still one arg to be placed, set the offset in r11 to #4 */
-
-stackargsarmFuncR0:
-    ldr     r5, [r6, #268]  /* Load stack size into r5 */
-    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4) */
-    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncR0
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncR0:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncR0
-    mov     sp, r12
-
-nomoreargsarmFuncR0:
-    blx     r4
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-    .fnend
-
-/* --------------------------------------------------------------------------------------------*/
-armFuncR0R1:
-    .fnstart
-
-    push {r4-r8, r10, r11, lr}
-
-    mov     r6, r0  /* arg table */
-    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
-    mov     r4, r2  /* function address */
-    mov     r11, #0 /* This will hold an offset of #4 or #8 only if the last arg (or last 2 args) that should have been placed into "r" regs need to go to the stack */
-
-    mov     r0, r3          /* r0 explicitly set */
-    ldr     r1, [sp, #32]   /* r1 explicitly set too */
-
-    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
-    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
-    mov     r8, #0
-    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
-
-    /* If there are no arguments to set into r2-r3 */
-    /* go check if there are arguments for the stack */
-    beq     stackargsarmFuncR0R1
-
-    /* Load the first 2 arguments into r2-r3 */
-    cmp     r7, #4
-
-    it ge
-    ldrge   r2, [r6]
-    cmp     r7, #8
-
-    it ge
-    ldrge   r3, [r6, #4]
-    cmp     r7, #12
-
-    it ge
-    movge   r11, #4         /* If there is a third arg to be placed, set the offset in r11 to #4 */
-
-    cmp     r7, #16
-
-    it ge
-    movge   r11, #8         /* If there is a fourth arg to be placed, set the offset in r11 to #8 */
-
-    itt lt
-    ldrlt   r7, [r6, #8]    /* Else copy the third arg to the correct place in the array */
-    strlt   r7, [r6, #12]
-
-stackargsarmFuncR0R1:
-    ldr     r5, [r6, #268]  /* Load stack size into r5 */
-    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4 or #8) */
-    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
-
-    /* If there are no args for the stack, branch */
-    beq     nomoreargsarmFuncR0R1
-
-    /* Load the rest of the arguments onto the stack */
-    /* Ensure 8-byte stack alignment */
-    mov     r8, sp
-    sub     sp, sp, r7
-    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
-
-    sub     r12, sp, #8
-    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4 or #8) */
-    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
-    sub     r8, r8, r12
-    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
-
-stackargslooparmFuncR0R1:
-    ldr     r5, [r6], #4
-    subs    r7, r7, #4
-    str     r5, [sp], #4
-    bne     stackargslooparmFuncR0R1
-    mov     sp, r12
-
-nomoreargsarmFuncR0R1:
-    blx     r4
-    add     sp, sp, r8
-    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
-
-    pop {r4-r8, r10, r11, pc}
-
-    .fnend
-
-#endif
-
-#endif /* !AS_MAX_PORTABILITY */
-
+/*
+  AngelCode Scripting Library
+  Copyright (c) 2003-2015 Andreas Jonsson
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any
+  damages arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any
+  purpose, including commercial applications, and to alter it and
+  redistribute it freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you
+     must not claim that you wrote the original software. If you use
+     this software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  2. Altered source versions must be plainly marked as such, and
+     must not be misrepresented as being the original software.
+
+  3. This notice may not be removed or altered from any source
+     distribution.
+
+  The original version of this library can be located at:
+  http://www.angelcode.com/angelscript/
+
+  Andreas Jonsson
+  andreas@angelcode.com
+*/
+
+/*
+   Assembly routines for the Playstation Vita SNC call convention.
+
+   This code was adapted from as_callfunc_arm_gcc (ARM, Linux hard float) by Brandon Bare on October 2014.
+*/
+
+#if !defined(AS_MAX_PORTABILITY)
+
+#ifdef __psp2__
+
+.syntax unified
+.cpu cortex-a9
+.fpu neon
+
+.section .text.armCallFunc
+.balign 2
+.thumb
+.thumb_func
+
+.align 2
+
+.global armFunc
+.global armFuncR0
+.global armFuncR0R1
+.global armFuncObjLast
+.global armFuncR0ObjLast
+
+.type armFunc, %function
+.type armFuncR0, %function
+.type armFuncR0R1, %function
+.type armFuncObjLast, %function
+.type armFuncR0ObjLast, %function
+
+/* --------------------------------------------------------------------------------------------*/
+armFunc:
+    .fnstart
+
+    push    {r4-r8, r10, r11, lr}   /* sp must be 8-byte alignment for ABI compliance, so the pushed registers must be even */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    /* Load float and double args into d0-d7 and s0-s15 */
+    add       r10, r6, #272 /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov       r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargs
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+
+    it ge
+    ldrge   r0, [r6]
+    cmp     r7, #8
+
+    it ge
+    ldrge   r1, [r6, #4]
+    cmp     r7, #12
+
+    it ge
+    ldrge   r2, [r6, #8]
+    cmp     r7, #16
+
+    it ge
+    ldrge   r3, [r6, #12]
+
+stackargs:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargs
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargsloop:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargsloop
+    mov     sp, r12
+
+nomoreargs:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64 r10, {d0-d7}   /* Copy contents of registers d0-d7 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+    .fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncObjLast:
+    .fnstart
+
+    push {r4-r8, r10, r11, lr}  /* We´re storing r11 just to keep the stack aligned to an 8 byte boundary */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    mov     r0, r3          /* objlast. might get overwritten */
+    mov     r5, #0          /* This will hold an offset of #4 only if objlast couldn´t be placed into an "r" register */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsFuncObjLast
+
+    mov     r5, r3          /* store objlast in r5 temporarily */
+
+    /* Load the first 4 arguments into r0-r3 */
+    cmp     r7, #4
+
+    it ge
+    ldrge   r0, [r6]
+    cmp     r7, #8
+
+    it ge
+    ldrge   r1, [r6,#4]
+
+    it lt
+    movlt   r1, r5
+    cmp     r7, #12
+
+    it ge
+    ldrge   r2, [r6,#8]
+
+    it lt
+    movlt   r2, r5
+    cmp     r7, #16
+
+    it ge
+    ldrge   r3, [r6,#12]
+
+    ittt lt
+    movlt   r3, r5
+    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
+    blt     stackargsFuncObjLast    /* If objlast got placed into a register, go to stackargsFuncObjLast */
+
+    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
+    mov     r5, #4                  /* Set r5 with an offset of #4, so objlast can be loaded into the stack */
+
+stackargsFuncObjLast:
+    ldr     r7, [r6, #268]  /* Load stack size into r7 */
+    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
+    cmp     r7, #0          /* Check for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncObjLast:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncObjLast
+    mov     sp, r12
+
+nomoreargsarmFuncObjLast:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop   {r4-r8, r10,r11, pc}
+
+    .fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0ObjLast:
+    .fnstart
+
+    push    {r4-r8, r10, r11, lr}
+
+    ldr     r5, [sp,#32]   /* objlast to temp reg */
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+
+    mov     r0, r3      /* r0 explicitly set */
+    mov     r1, r5      /* objlast.  might get overwritten */
+    mov     r5, #0      /* This will hold an offset of #4 or #8 if objlast or one arg couldn´t be placed into an "r" register */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsFuncR0ObjLast
+
+    mov     r5, r1          /* store objlast in r5 temporarily */
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #4
+
+    it ge
+    ldrge   r1, [r6]
+    cmp     r7, #8
+
+    it ge
+    ldrge   r2, [r6,#4]
+
+    it lt
+    movlt   r2, r5
+    cmp     r7, #12
+
+    it ge
+    ldrge   r3, [r6,#8]
+
+    ittt lt
+    movlt   r3, r5
+    movlt   r5, #0                  /* If objlast got placed into a register, r5 = 0 */
+    blt     stackargsFuncR0ObjLast  /* If objlast got placed into a register, go to stackargsFuncR0ObjLast */
+
+    cmp     r7, #16                 /* Else if we have one last arg set the offset accordingly and store the arg in the array */
+
+    itt ge
+    ldrge   r7, [r6, #12]
+    strge   r7, [r6, #8]
+
+    str     r5, [r6, #12]           /* Put objlast in r6 + 12 */
+    mov     r5, #0
+
+    it ge
+    movge   r5, #4                  /* Set r5 with an offset of #4 if there´s one last arg that couldn´t be placed in r registers */
+    add     r5, r5, #4              /* Set r5 with an offset of + #4, so objlast can be loaded into the stack */
+
+stackargsFuncR0ObjLast:
+    ldr     r7, [r6, #268]  /* Load stack size into r7 */
+    add     r7, r7, r5      /* Add the offset placed in r5 (could be #0 or #4) */
+    cmp     r7, #0          /* Check for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0ObjLast
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r5      /* r6 = r6 - r5 (r5 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0ObjLast:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0ObjLast
+    mov     sp, r12
+
+nomoreargsarmFuncR0ObjLast:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+    .fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0:
+    .fnstart
+
+    push {r4-r8, r10, r11, lr}
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r11, #0 /* This will hold an offset of #4 only if the last arg that should have been placed into an "r" reg needs to go to the stack */
+    mov     r0, r3  /* r0 explicitly set */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r0-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsarmFuncR0
+
+    /* Load the first 3 arguments into r1-r3 */
+    cmp     r7, #4
+
+    it ge
+    ldrge   r1, [r6]
+    cmp     r7, #8
+
+    it ge
+    ldrge   r2, [r6, #4]
+    cmp     r7, #12
+
+    it ge
+    ldrge   r3, [r6, #8]
+    cmp     r7, #16
+
+    it ge
+    movge   r11, #4         /* If there is still one arg to be placed, set the offset in r11 to #4 */
+
+stackargsarmFuncR0:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4) */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0
+    mov     sp, r12
+
+nomoreargsarmFuncR0:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+    .fnend
+
+/* --------------------------------------------------------------------------------------------*/
+armFuncR0R1:
+    .fnstart
+
+    push {r4-r8, r10, r11, lr}
+
+    mov     r6, r0  /* arg table */
+    movs    r7, r1  /* arg size (also set the condition code flags so that we detect if there are no arguments) */
+    mov     r4, r2  /* function address */
+    mov     r11, #0 /* This will hold an offset of #4 or #8 only if the last arg (or last 2 args) that should have been placed into "r" regs need to go to the stack */
+
+    mov     r0, r3          /* r0 explicitly set */
+    ldr     r1, [sp, #32]   /* r1 explicitly set too */
+
+    /* Load float and double args into d0-d7 and s0-s15 (r10 holds pointer to first float value) */
+    add     r10, r6, #272   /* r10 (r6 + 272) points to the first value for the VFP registers */
+    mov     r8, #0
+    vldmia.64 r10, {d0-d7}  /* Load contents starting at r10 into registers d0-d7 */
+
+    /* If there are no arguments to set into r2-r3 */
+    /* go check if there are arguments for the stack */
+    beq     stackargsarmFuncR0R1
+
+    /* Load the first 2 arguments into r2-r3 */
+    cmp     r7, #4
+
+    it ge
+    ldrge   r2, [r6]
+    cmp     r7, #8
+
+    it ge
+    ldrge   r3, [r6, #4]
+    cmp     r7, #12
+
+    it ge
+    movge   r11, #4         /* If there is a third arg to be placed, set the offset in r11 to #4 */
+
+    cmp     r7, #16
+
+    it ge
+    movge   r11, #8         /* If there is a fourth arg to be placed, set the offset in r11 to #8 */
+
+    itt lt
+    ldrlt   r7, [r6, #8]    /* Else copy the third arg to the correct place in the array */
+    strlt   r7, [r6, #12]
+
+stackargsarmFuncR0R1:
+    ldr     r5, [r6, #268]  /* Load stack size into r5 */
+    add     r5, r11         /* Add the offset placed in r11 (could be #0 or #4 or #8) */
+    movs    r7, r5          /* Load stack size into r7, checking for 0 args */
+
+    /* If there are no args for the stack, branch */
+    beq     nomoreargsarmFuncR0R1
+
+    /* Load the rest of the arguments onto the stack */
+    /* Ensure 8-byte stack alignment */
+    mov     r8, sp
+    sub     sp, sp, r7
+    add     r6, r6, #16     /* Set r6 to point to the first arg to be placed on the stack */
+
+    sub     r12, sp, #8
+    sub     r6, r6, r11     /* r6 = r6 - r11 (r11 can be #0 or #4 or #8) */
+    bic     r12, r12, #7    /* thumb mode couldn't support "bic  sp, sp, #7" instruction */
+    sub     r8, r8, r12
+    mov     sp, r12         /* copy size != frame size, so store frame start sp, r12(ip) is not callee saved register */
+
+stackargslooparmFuncR0R1:
+    ldr     r5, [r6], #4
+    subs    r7, r7, #4
+    str     r5, [sp], #4
+    bne     stackargslooparmFuncR0R1
+    mov     sp, r12
+
+nomoreargsarmFuncR0R1:
+    blx     r4
+    add     sp, sp, r8
+    vstmia.64   r10, {d0-d7}    /* Copy contents of registers d0-d10 to the address stored in r10 */
+
+    pop {r4-r8, r10, r11, pc}
+
+    .fnend
+
+#endif
+
+#endif /* !AS_MAX_PORTABILITY */
+
diff --git a/Sources/AngelScript/source/as_callfunc_arm_xcode.S b/Sources/AngelScript/source/as_callfunc_arm_xcode.S
old mode 100755
new mode 100644
index e77277476..235e242f3
--- a/Sources/AngelScript/source/as_callfunc_arm_xcode.S
+++ b/Sources/AngelScript/source/as_callfunc_arm_xcode.S
@@ -1,242 +1,242 @@
-/*
-  AngelCode Scripting Library
-  Copyright (c) 2003-2015 Andreas Jonsson
-
-  This software is provided 'as-is', without any express or implied
-  warranty. In no event will the authors be held liable for any
-  damages arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any
-  purpose, including commercial applications, and to alter it and
-  redistribute it freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you
-     must not claim that you wrote the original software. If you use
-     this software in a product, an acknowledgment in the product
-     documentation would be appreciated but is not required.
-
-  2. Altered source versions must be plainly marked as such, and
-     must not be misrepresented as being the original software.
-
-  3. This notice may not be removed or altered from any source
-     distribution.
-
-  The original version of this library can be located at:
-  http://www.angelcode.com/angelscript/
-
-  Andreas Jonsson
-  andreas@angelcode.com
-*/
-
-
-// Assembly routines for the ARM call convention
-// Written by Fredrik Ehnbom in June 2009
-
-// Adapted to GNUC by darktemplar216 in September 2009
-// Small fixed to work under XCode GCC by Gilad Novik in October 2009
-
-#if !defined(AS_MAX_PORTABILITY)
-
-#if defined(__arm__) || defined(__ARM__)
-
-.align 2
-.globl _armFunc
-.globl _armFuncR0
-.globl _armFuncR0R1
-.globl _armFuncObjLast
-.globl _armFuncR0ObjLast
-    
-_armFunc:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  // arg table
-    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
-    mov     r4, r2  // function address
-    mov     r8, #0
-
-    beq     nomoreargs
-
-    // Load the first 4 arguments into r0-r3
-    cmp     r7, #4
-    ldrge   r0, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r1, [r6],#4
-    cmp     r7, #3*4
-    ldrge   r2, [r6],#4
-    cmp     r7, #4*4
-    ldrge   r3, [r6],#4
-    ble     nomoreargs
-
-    // Load the rest of the arguments onto the stack
-    sub     r7, r7, #4*4    // skip the 4 registers already loaded into r0-r3
-    sub     sp, sp, r7
-    mov     r8, r7
-stackargsloop:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargsloop
-nomoreargs:
-    sub     sp, sp, r8
-    blx     r4
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-_armFuncObjLast:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  // arg table
-    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
-    mov     r4, r2  // function address
-    mov     r8, #0
-
-    mov     r0, r3          // objlast. might get overwritten
-    str     r3, [sp, #-4]!  // objlast again.
-
-    beq     nomoreargsarmFuncObjLast
-
-    // Load the first 4 arguments into r0-r3
-    cmp     r7, #4
-    ldrge   r0, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r1, [r6],#4
-    ldrlt   r1, [sp]    
-    cmp     r7, #3*4
-    ldrge   r2, [r6],#4
-    ldrlt   r2, [sp]
-    cmp     r7, #4*4
-    ldrge   r3, [r6],#4
-    ldrlt   r3, [sp]
-    ble     nomoreargsarmFuncObjLast
-
-    // Load the rest of the arguments onto the stack
-    sub     r7, r7, #4*4    // skip the 4 registers already loaded into r0-r3
-    sub     sp, sp, r7
-    mov     r8, r7
-stackargslooparmFuncObjLast:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncObjLast
-nomoreargsarmFuncObjLast:
-    sub     sp, sp, r8
-    blx     r4
-    add     sp, sp, r8
-    add     sp, sp, #4
-    ldmia   sp!, {r4-r8, pc}
-
-_armFuncR0ObjLast:
-    stmdb   sp!, {r4-r8, lr}
-    ldr     r7, [sp,#6*4]
-    str     r7, [sp,#-4]!
-
-    mov     r6, r0  // arg table
-    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
-    mov     r4, r2  // function address
-    mov     r8, #0
-
-    mov     r0, r3      // r0 explicitly set
-    ldr     r1, [sp]    // objlast.  might get overwritten
-
-    beq     nomoreargsarmFuncR0ObjLast
-
-    // Load the first 3 arguments into r1-r3
-    cmp     r7, #1*4
-    ldrge   r1, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r2, [r6],#4
-    ldrlt   r2, [sp]
-    cmp     r7, #3*4
-    ldrge   r3, [r6],#4
-    ldrlt   r3, [sp]
-    ble     nomoreargsarmFuncR0ObjLast
-
-    // Load the rest of the arguments onto the stack
-    sub     r7, r7, #3*4    // skip the 3 registers already loaded into r1-r3
-    sub     sp, sp, r7
-    mov     r8, r7
-stackargslooparmFuncR0ObjLast:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncR0ObjLast
-nomoreargsarmFuncR0ObjLast:
-    sub     sp, sp, r8
-    blx     r4
-    add     sp, sp, r8
-    add     sp, sp, #4
-    ldmia   sp!, {r4-r8, pc}
-
-
-_armFuncR0:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  // arg table
-    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
-    mov     r4, r2  // function address
-    mov     r8, #0
-
-    mov     r0, r3  // r0 explicitly set
-
-    beq     nomoreargsarmFuncR0
-
-    // Load the first 3 arguments into r1-r3
-    cmp     r7, #1*4
-    ldrge   r1, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r2, [r6],#4
-    cmp     r7, #3*4
-    ldrge   r3, [r6],#4
-    ble     nomoreargsarmFuncR0
-
-    // Load the rest of the arguments onto the stack
-    sub     r7, r7, #3*4    // skip the 3 registers already loaded into r1-r3
-    sub     sp, sp, r7
-    mov     r8, r7
-stackargslooparmFuncR0:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncR0
-nomoreargsarmFuncR0:
-    sub     sp, sp, r8
-    blx     r4
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-
-_armFuncR0R1:
-    stmdb   sp!, {r4-r8, lr}
-    mov     r6, r0  // arg table
-    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
-    mov     r4, r2  // function address
-    mov     r8, #0
-
-    mov     r0, r3          // r0 explicitly set
-    ldr     r1, [sp, #6*4]  // r1 explicitly set too
-
-    beq     nomoreargsarmFuncR0R1
-
-    // Load the first 2 arguments into r2-r3
-    cmp     r7, #1*4
-    ldrge   r2, [r6],#4
-    cmp     r7, #2*4
-    ldrge   r3, [r6],#4
-    ble     nomoreargsarmFuncR0R1
-
-    // Load the rest of the arguments onto the stack
-    sub     r7, r7, #2*4    // skip the 2 registers already loaded into r2-r3
-    sub     sp, sp, r7
-    mov     r8, r7
-stackargslooparmFuncR0R1:
-    ldr     r5, [r6], #4
-    str     r5, [sp], #4
-    subs    r7, r7, #4
-    bne     stackargslooparmFuncR0R1
-nomoreargsarmFuncR0R1:
-    sub     sp, sp, r8
-    blx     r4
-    add     sp, sp, r8
-    ldmia   sp!, {r4-r8, pc}
-
-#endif
-
-#endif /* !AS_MAX_PORTABILITY */
-
+/*
+  AngelCode Scripting Library
+  Copyright (c) 2003-2015 Andreas Jonsson
+
+  This software is provided 'as-is', without any express or implied
+  warranty. In no event will the authors be held liable for any
+  damages arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any
+  purpose, including commercial applications, and to alter it and
+  redistribute it freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you
+     must not claim that you wrote the original software. If you use
+     this software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+
+  2. Altered source versions must be plainly marked as such, and
+     must not be misrepresented as being the original software.
+
+  3. This notice may not be removed or altered from any source
+     distribution.
+
+  The original version of this library can be located at:
+  http://www.angelcode.com/angelscript/
+
+  Andreas Jonsson
+  andreas@angelcode.com
+*/
+
+
+// Assembly routines for the ARM call convention
+// Written by Fredrik Ehnbom in June 2009
+
+// Adapted to GNUC by darktemplar216 in September 2009
+// Small fixed to work under XCode GCC by Gilad Novik in October 2009
+
+#if !defined(AS_MAX_PORTABILITY)
+
+#if defined(__arm__) || defined(__ARM__)
+
+.align 2
+.globl _armFunc
+.globl _armFuncR0
+.globl _armFuncR0R1
+.globl _armFuncObjLast
+.globl _armFuncR0ObjLast
+    
+_armFunc:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  // arg table
+    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
+    mov     r4, r2  // function address
+    mov     r8, #0
+
+    beq     nomoreargs
+
+    // Load the first 4 arguments into r0-r3
+    cmp     r7, #4
+    ldrge   r0, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r1, [r6],#4
+    cmp     r7, #3*4
+    ldrge   r2, [r6],#4
+    cmp     r7, #4*4
+    ldrge   r3, [r6],#4
+    ble     nomoreargs
+
+    // Load the rest of the arguments onto the stack
+    sub     r7, r7, #4*4    // skip the 4 registers already loaded into r0-r3
+    sub     sp, sp, r7
+    mov     r8, r7
+stackargsloop:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargsloop
+nomoreargs:
+    sub     sp, sp, r8
+    blx     r4
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+_armFuncObjLast:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  // arg table
+    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
+    mov     r4, r2  // function address
+    mov     r8, #0
+
+    mov     r0, r3          // objlast. might get overwritten
+    str     r3, [sp, #-4]!  // objlast again.
+
+    beq     nomoreargsarmFuncObjLast
+
+    // Load the first 4 arguments into r0-r3
+    cmp     r7, #4
+    ldrge   r0, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r1, [r6],#4
+    ldrlt   r1, [sp]    
+    cmp     r7, #3*4
+    ldrge   r2, [r6],#4
+    ldrlt   r2, [sp]
+    cmp     r7, #4*4
+    ldrge   r3, [r6],#4
+    ldrlt   r3, [sp]
+    ble     nomoreargsarmFuncObjLast
+
+    // Load the rest of the arguments onto the stack
+    sub     r7, r7, #4*4    // skip the 4 registers already loaded into r0-r3
+    sub     sp, sp, r7
+    mov     r8, r7
+stackargslooparmFuncObjLast:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncObjLast
+nomoreargsarmFuncObjLast:
+    sub     sp, sp, r8
+    blx     r4
+    add     sp, sp, r8
+    add     sp, sp, #4
+    ldmia   sp!, {r4-r8, pc}
+
+_armFuncR0ObjLast:
+    stmdb   sp!, {r4-r8, lr}
+    ldr     r7, [sp,#6*4]
+    str     r7, [sp,#-4]!
+
+    mov     r6, r0  // arg table
+    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
+    mov     r4, r2  // function address
+    mov     r8, #0
+
+    mov     r0, r3      // r0 explicitly set
+    ldr     r1, [sp]    // objlast.  might get overwritten
+
+    beq     nomoreargsarmFuncR0ObjLast
+
+    // Load the first 3 arguments into r1-r3
+    cmp     r7, #1*4
+    ldrge   r1, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r2, [r6],#4
+    ldrlt   r2, [sp]
+    cmp     r7, #3*4
+    ldrge   r3, [r6],#4
+    ldrlt   r3, [sp]
+    ble     nomoreargsarmFuncR0ObjLast
+
+    // Load the rest of the arguments onto the stack
+    sub     r7, r7, #3*4    // skip the 3 registers already loaded into r1-r3
+    sub     sp, sp, r7
+    mov     r8, r7
+stackargslooparmFuncR0ObjLast:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncR0ObjLast
+nomoreargsarmFuncR0ObjLast:
+    sub     sp, sp, r8
+    blx     r4
+    add     sp, sp, r8
+    add     sp, sp, #4
+    ldmia   sp!, {r4-r8, pc}
+
+
+_armFuncR0:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  // arg table
+    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
+    mov     r4, r2  // function address
+    mov     r8, #0
+
+    mov     r0, r3  // r0 explicitly set
+
+    beq     nomoreargsarmFuncR0
+
+    // Load the first 3 arguments into r1-r3
+    cmp     r7, #1*4
+    ldrge   r1, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r2, [r6],#4
+    cmp     r7, #3*4
+    ldrge   r3, [r6],#4
+    ble     nomoreargsarmFuncR0
+
+    // Load the rest of the arguments onto the stack
+    sub     r7, r7, #3*4    // skip the 3 registers already loaded into r1-r3
+    sub     sp, sp, r7
+    mov     r8, r7
+stackargslooparmFuncR0:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncR0
+nomoreargsarmFuncR0:
+    sub     sp, sp, r8
+    blx     r4
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+
+_armFuncR0R1:
+    stmdb   sp!, {r4-r8, lr}
+    mov     r6, r0  // arg table
+    movs    r7, r1  // arg size (also set the condition code flags so that we detect if there are no arguments)
+    mov     r4, r2  // function address
+    mov     r8, #0
+
+    mov     r0, r3          // r0 explicitly set
+    ldr     r1, [sp, #6*4]  // r1 explicitly set too
+
+    beq     nomoreargsarmFuncR0R1
+
+    // Load the first 2 arguments into r2-r3
+    cmp     r7, #1*4
+    ldrge   r2, [r6],#4
+    cmp     r7, #2*4
+    ldrge   r3, [r6],#4
+    ble     nomoreargsarmFuncR0R1
+
+    // Load the rest of the arguments onto the stack
+    sub     r7, r7, #2*4    // skip the 2 registers already loaded into r2-r3
+    sub     sp, sp, r7
+    mov     r8, r7
+stackargslooparmFuncR0R1:
+    ldr     r5, [r6], #4
+    str     r5, [sp], #4
+    subs    r7, r7, #4
+    bne     stackargslooparmFuncR0R1
+nomoreargsarmFuncR0R1:
+    sub     sp, sp, r8
+    blx     r4
+    add     sp, sp, r8
+    ldmia   sp!, {r4-r8, pc}
+
+#endif
+
+#endif /* !AS_MAX_PORTABILITY */
+
diff --git a/Sources/AngelScript/source/as_callfunc_mips.cpp b/Sources/AngelScript/source/as_callfunc_mips.cpp
old mode 100755
new mode 100644
index 2b8f12186..be7d18952
--- a/Sources/AngelScript/source/as_callfunc_mips.cpp
+++ b/Sources/AngelScript/source/as_callfunc_mips.cpp
@@ -1,735 +1,735 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc_mips.cpp
-//
-// These functions handle the actual calling of system functions
-//
-// This version is MIPS specific and was originally written
-// by Manu Evans in April, 2006 for Playstation Portable (PSP)
-//
-// Support for Linux with MIPS was added by Andreas Jonsson in April, 2015
-//
-
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_MIPS
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_tokendef.h"
-#include "as_context.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#if !defined(AS_ANDROID)
-#include <regdef.h>
-#endif
-
-BEGIN_AS_NAMESPACE
-
-#if defined(__linux__) && defined(_ABIO32)
-
-// The MIPS ABI used by Linux is implemented here
-// (Tested on CI20 MIPS Creator with Debian Linux)
-//
-// ref: SYSTEM V 
-//      APPLICATION BINARY INTERFACE
-//      MIPS RISC Processor
-//      http://math-atlas.sourceforge.net/devel/assembly/mipsabi32.pdf
-//
-// ref: MIPS Instruction Reference
-//      http://www.mrc.uidaho.edu/mrc/people/jff/digital/MIPSir.html
-
-union SFloatRegs
-{
-	union { double d0; struct { float f0; asDWORD dummy0; };};
-	union { double d1; struct { float f1; asDWORD dummy1; };};
-} ;
-
-extern "C" asQWORD mipsFunc(asUINT argSize, asDWORD *argBuffer, void *func, SFloatRegs &floatRegs);
-asDWORD GetReturnedFloat();
-asQWORD GetReturnedDouble();
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
-{
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-	int callConv = sysFunc->callConv;
-
-	asQWORD retQW = 0;
-
-	void *func = (void*)sysFunc->func;
-	void **vftable;
-
-	asDWORD argBuffer[128]; // Ought to be big enough
-	asASSERT( sysFunc->paramSize < 128 );
-	
-	asDWORD argOffset = 0;
-	
-	SFloatRegs floatRegs;
-	asDWORD floatOffset = 0;
-	
-	// If the application function returns the value in memory then
-	// the first argument must be the pointer to that memory
-	if( sysFunc->hostReturnInMemory )
-	{
-		asASSERT( retPointer );
-		argBuffer[argOffset++] = (asPWORD)retPointer;
-	}
-	
-	if( callConv == ICC_CDECL_OBJFIRST || callConv == ICC_CDECL_OBJFIRST_RETURNINMEM ||
-		callConv == ICC_THISCALL || callConv == ICC_THISCALL_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL || callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
-		callConv == ICC_THISCALL_OBJFIRST || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
-		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM || 
-		callConv == ICC_THISCALL_OBJLAST || callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
-		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
-	{
-		// Add the object pointer as the first argument
-		argBuffer[argOffset++] = (asPWORD)obj;
-	}
-	
-	if( callConv == ICC_THISCALL_OBJFIRST || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
-		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
-	{
-		// Add the second object pointer 
-		argBuffer[argOffset++] = (asPWORD)secondObject;
-	}
-	
-	int spos = 0;
-	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-	{
-		asCDataType &paramType = descr->parameterTypes[n];
-		if( paramType.IsObject() && !paramType.IsObjectHandle() && !paramType.IsReference() )
-		{
-			if( paramType.GetTypeInfo()->flags & COMPLEX_MASK )
-			{
-				// The object is passed by reference
-				argBuffer[argOffset++] = args[spos++];
-			}
-			else
-			{
-				// Ensure 8byte alignment for classes that need it
-				if( (paramType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALIGN8) && (argOffset & 1) )
-					argOffset++;
-			
-				// Copy the object's memory to the buffer
-				memcpy(&argBuffer[argOffset], *(void**)(args+spos), paramType.GetSizeInMemoryBytes());
-				// Delete the original memory
-				engine->CallFree(*(char**)(args+spos));
-				spos++;
-				argOffset += paramType.GetSizeInMemoryDWords();
-			}
-		}
-		else if( paramType.GetTokenType() == ttQuestion )
-		{
-			// Copy both pointer and type id
-			argBuffer[argOffset++] = args[spos++];
-			argBuffer[argOffset++] = args[spos++];
-		}
-		else
-		{
-			// The first 2 floats or doubles are loaded into the float registers.
-			// Actually this is only done if they are the first arguments to the function, 
-			// but it doesn't cause any harm to load them into the registers even if they 
-			// won't be used so we don't need to check if they really are the first args.
-			if( floatOffset == 0 )
-			{
-				if( paramType.GetTokenType() == ttFloat )
-					floatRegs.f0 = *reinterpret_cast<float*>(&args[spos]);
-				else if( paramType.GetTokenType() == ttDouble )
-					floatRegs.d0 = *reinterpret_cast<double*>(&args[spos]);
-				floatOffset++;
-			}
-			else if( floatOffset == 1 )
-			{
-				if( paramType.GetTokenType() == ttFloat )
-					floatRegs.f1 = *reinterpret_cast<float*>(&args[spos]);
-				else if( paramType.GetTokenType() == ttDouble )
-					floatRegs.d1 = *reinterpret_cast<double*>(&args[spos]);
-				floatOffset++;
-			}
-		
-			// Copy the value directly
-			if( paramType.GetSizeOnStackDWords() > 1 )
-			{
-				// Make sure the argument is 8byte aligned
-				if( argOffset & 1 )
-					argOffset++;
-				*reinterpret_cast<asQWORD*>(&argBuffer[argOffset]) = *reinterpret_cast<asQWORD*>(&args[spos]);
-				argOffset += 2;
-				spos += 2;
-			}
-			else
-				argBuffer[argOffset++] = args[spos++];
-		}
-	}
-	
-	if( callConv == ICC_CDECL_OBJLAST || callConv == ICC_CDECL_OBJLAST_RETURNINMEM )
-	{
-		// Add the object pointer as the last argument
-		argBuffer[argOffset++] = (asPWORD)obj;
-	}
-
-	if( callConv == ICC_THISCALL_OBJLAST || callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
-		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
-	{
-		// Add the second object pointer 
-		argBuffer[argOffset++] = (asPWORD)secondObject;
-	}
-
-	switch( callConv )
-	{
-	case ICC_CDECL:
-	case ICC_CDECL_RETURNINMEM:
-	case ICC_STDCALL:
-	case ICC_STDCALL_RETURNINMEM:
-	case ICC_CDECL_OBJLAST:
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-	case ICC_CDECL_OBJFIRST:
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-	case ICC_THISCALL:
-	case ICC_THISCALL_RETURNINMEM:
-	case ICC_THISCALL_OBJFIRST:
-	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_THISCALL_OBJLAST:
-	case ICC_THISCALL_OBJLAST_RETURNINMEM:
-		retQW = mipsFunc(argOffset*4, argBuffer, func, floatRegs);
-		break;
-
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJLAST:
-	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
-		// Get virtual function table from the object pointer
-		vftable = *(void***)obj;
-		retQW = mipsFunc(argOffset*4, argBuffer, vftable[asPWORD(func)>>2], floatRegs);
-		break;
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-
-	return retQW;
-}
-
-asDWORD GetReturnedFloat()
-{
-	asDWORD f;
-
-	asm("swc1 $f0, %0\n" : "=m"(f));
-
-	return f;
-}
-
-asQWORD GetReturnedDouble()
-{
-	asQWORD d = 0;
-
-	asm("sdc1 $f0, %0\n" : "=m"(d));
-
-	return d;
-}
-
-// asQWORD mipsFunc(asUINT argSize, asDWORD *argBuffer, void *func, SFloatRegs &floatRegs);
-// $2,$3                   $4                $5               $6                $7
-asm(
-"	.text\n"
-//"	.align 2\n"
-"	.cfi_startproc\n"
-"	.global mipsFunc\n"
-"	.ent	mipsFunc\n"
-"mipsFunc:\n"
-//"	.frame	$fp,64,$31		# vars= 0, regs= 0/0, args= 0, gp= 0\n"
-//"	.mask	0x00000000,0\n"
-//"	.fmask	0x00000000,0\n"
-"	.set	noreorder\n"
-"	.set	nomacro\n"
-
-// align the stack frame to 8 bytes
-"	addiu	$12, $4, 7\n"		// t4 ($12) = argSize ($4) + 7
-"	li		$13, -8\n"			// t5 ($13) = 0xfffffffffffffff8
-"	and		$12, $12, $13\n"	// t4 ($12) &= t5 ($13). t4 holds the size of the argument block
-// It is required that the caller reserves space for at least 16 bytes even if there are less than 4 arguments
-// and add 8 bytes for the return pointer and s0 ($16) backup
-"	addiu	$13, $12, 24\n"		// t5 = t4 + 24. t5 ($13) holds the total size of the stack frame (including return pointer)
-// save the s0 register (so we can use it to remember where our return pointer is lives)
-"	sw		$16, -4($sp)\n"		// store the s0 register (so we can use it to remember how big our stack frame is)
-"	.cfi_offset 16, -4\n"
-// store the return pointer
-"	sw		$31, -8($sp)\n"
-"	.cfi_offset 31, -8\n"
-// keep original stack pointer
-"	move	$16, $sp\n"
-"	.cfi_def_cfa_register 16\n"
-// push the stack
-"	subu	$sp, $sp, $13\n"
-
-// store the argument in temporary registers
-"	addiu	$25, $6, 0\n"		// t9 ($25) holds the function pointer (must be t9 for position independent code)
-"	addiu	$3, $4, 0\n"		// v1 ($3) holds the size of the argument buffer
-"	move	$15, $5\n"			// t7 ($15) holds the pointer to the argBuffer
-"	move	$14, $7\n"			// t6 ($14) holds the values for the float registers
-
-// load integer registers
-"	lw		$4, 0($15)\n"		// a0 ($4)
-"	lw		$5, 4($15)\n"		// a1 ($5)
-"	lw		$6, 8($15)\n"		// a2 ($6)
-"	lw		$7, 12($15)\n"		// a3 ($7)
-
-// load float registers
-"	ldc1	$f12, 8($14)\n"
-"	ldc1	$f14, 0($14)\n"
-
-// skip stack parameters if there are 4 or less as they are moved into the registers
-"	addi	$14, $3, -16\n"		// The first 4 args were already loaded into registers
-"	blez	$14, andCall\n"
-"	nop\n"
-
-// push stack parameters
-"pushArgs:\n"
-"	addi	$3, -4\n"
-// load from $15 + stack bytes ($3)
-"	addu	$14, $15, $3\n"
-"	lw		$14, 0($14)\n"
-// store to $sp + stack bytes ($3)
-"	addu	$13, $sp, $3\n"
-"	sw		$14, 0($13)\n"
-// if there are more, loop...
-"	bne		$3, $0, pushArgs\n"
-"	nop\n"
-
-// and call the function
-"andCall:\n"
-"	jalr	$25\n"
-"	nop\n"
-
-// restore original stack pointer
-"	move	$sp, $16\n"
-// restore the return pointer
-"	lw		$31, -8($sp)\n"
-// restore the original value of $16
-"	lw		$16, -4($sp)\n"
-// and return from the function
-"	jr		$31\n"
-"	nop\n"
-
-"	.set	macro\n"
-"	.set	reorder\n"
-"	.end	mipsFunc\n"
-"	.cfi_endproc\n"
-"	.size	mipsFunc, .-mipsFunc\n"
-);
-
-#else // !(defined(__linux__) && defined(_ABIO32))
-
-// The MIPS ABI used by PSP and PS2 is implemented here
-
-#define AS_MIPS_MAX_ARGS 32
-#define AS_NUM_REG_FLOATS 8
-#define AS_NUM_REG_INTS 8
-
-// The array used to send values to the correct places.
-// first 0-8 regular values to load into the a0-a3, t0-t3 registers
-// then 0-8 float values to load into the f12-f19 registers
-// then (AS_MIPS_MAX_ARGS - 16) values to load onto the stack
-// the +1 is for when CallThis (object methods) is used
-// extra +1 when returning in memory
-extern "C" {
-// TODO: This array shouldn't be global. It should be a local array in CallSystemFunctionNative
-asDWORD mipsArgs[AS_MIPS_MAX_ARGS + 1 + 1];
-}
-
-// Loads all data into the correct places and calls the function.
-// intArgSize is the size in bytes for how much data to put in int registers
-// floatArgSize is the size in bytes for how much data to put in float registers
-// stackArgSize is the size in bytes for how much data to put on the callstack
-extern "C" asQWORD mipsFunc(int intArgSize, int floatArgSize, int stackArgSize, asDWORD func);
-
-// puts the arguments in the correct place in the mipsArgs-array. See comments above.
-// This could be done better.
-inline void splitArgs(const asDWORD *args, int argNum, int &numRegIntArgs, int &numRegFloatArgs, int &numRestArgs, int hostFlags)
-{
-	int i;
-
-	int argBit = 1;
-	for (i = 0; i < argNum; i++)
-	{
-		if (hostFlags & argBit)
-		{
-			if (numRegFloatArgs < AS_NUM_REG_FLOATS)
-			{
-				// put in float register
-				mipsArgs[AS_NUM_REG_INTS + numRegFloatArgs] = args[i];
-				numRegFloatArgs++;
-			}
-			else
-			{
-				// put in stack
-				mipsArgs[AS_NUM_REG_INTS + AS_NUM_REG_FLOATS + numRestArgs] = args[i];
-				numRestArgs++;
-			}
-		}
-		else
-		{
-			if (numRegIntArgs < AS_NUM_REG_INTS)
-			{
-				// put in int register
-				mipsArgs[numRegIntArgs] = args[i];
-				numRegIntArgs++;
-			}
-			else
-			{
-				// put in stack
-				mipsArgs[AS_NUM_REG_INTS + AS_NUM_REG_FLOATS + numRestArgs] = args[i];
-				numRestArgs++;
-			}
-		}
-		argBit <<= 1;
-	}
-}
-
-asQWORD CallCDeclFunction(const asDWORD *args, int argSize, asDWORD func, int flags)
-{
-	int argNum = argSize >> 2;
-
-	int intArgs = 0;
-	int floatArgs = 0;
-	int restArgs = 0;
-
-	// put the arguments in the correct places in the mipsArgs array
-	if(argNum > 0)
-		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
-
-	return mipsFunc(intArgs << 2, floatArgs << 2, restArgs << 2, func);
-}
-
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the first parameter is the object
-asQWORD CallThisCallFunction(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
-{
-	int argNum = argSize >> 2;
-
-	int intArgs = 1;
-	int floatArgs = 0;
-	int restArgs = 0;
-
-	mipsArgs[0] = (asDWORD) obj;
-
-	// put the arguments in the correct places in the mipsArgs array
-	if (argNum > 0)
-		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
-
-	return mipsFunc(intArgs << 2, floatArgs << 2, restArgs << 2, func);
-}
-
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the last parameter is the object
-asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
-{
-	int argNum = argSize >> 2;
-
-	int intArgs = 0;
-	int floatArgs = 0;
-	int restArgs = 0;
-
-	// put the arguments in the correct places in the mipsArgs array
-	if(argNum > 0)
-		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
-
-	if(intArgs < AS_NUM_REG_INTS)
-	{
-		mipsArgs[intArgs] = (asDWORD) obj;
-		intArgs++;
-	}
-	else
-	{
-		mipsArgs[AS_NUM_REG_INTS + AS_NUM_REG_FLOATS + restArgs] = (asDWORD) obj;
-		restArgs++;
-	}
-
-	return mipsFunc(intArgs << 2, floatArgs << 2, restArgs << 2, func);
-}
-
-asDWORD GetReturnedFloat()
-{
-	asDWORD f;
-
-	asm("swc1 $f0, %0\n" : "=m"(f));
-
-	return f;
-}
-
-asQWORD GetReturnedDouble()
-{
-	asQWORD d = 0;
-
-	asm("sdc1 $f0, %0\n" : "=m"(d));
-
-	return d;
-}
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
-{
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-	int callConv = sysFunc->callConv;
-
-	// TODO: Mips does not yet support THISCALL_OBJFIRST/LAST
-
-	asQWORD retQW = 0;
-
-	void    *func              = (void*)sysFunc->func;
-	int      paramSize         = sysFunc->paramSize;
-	asDWORD *vftable;
-
-	if( descr->returnType.IsObject() && !descr->returnType.IsReference() && !descr->returnType.IsObjectHandle() )
-	{
-		mipsArgs[AS_MIPS_MAX_ARGS+1] = (asDWORD) retPointer;
-	}
-
-	asASSERT(descr->parameterTypes.GetLength() <= AS_MIPS_MAX_ARGS);
-
-	// mark all float arguments
-	int argBit = 1;
-	int hostFlags = 0;
-	int intArgs = 0;
-	for( size_t a = 0; a < descr->parameterTypes.GetLength(); a++ )
-	{
-		if (descr->parameterTypes[a].IsFloatType()) 
-			hostFlags |= argBit;
-		else 
-			intArgs++;
-		argBit <<= 1;
-	}
-
-	asDWORD paramBuffer[64];
-	if( sysFunc->takesObjByVal )
-	{
-		paramSize = 0;
-		int spos = 0;
-		int dpos = 1;
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					paramSize++;
-				}
-				else
-#endif
-				{
-					// Copy the object's memory to the buffer
-					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-					// Delete the original memory
-					engine->CallFree(*(char**)(args+spos));
-					spos++;
-					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
-				}
-			}
-			else
-			{
-				// Copy the value directly
-				paramBuffer[dpos++] = args[spos++];
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-					paramBuffer[dpos++] = args[spos++];
-				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-			}
-		}
-		// Keep a free location at the beginning
-		args = &paramBuffer[1];
-	}
-
-	switch( callConv )
-	{
-	case ICC_CDECL:
-	case ICC_CDECL_RETURNINMEM:
-	case ICC_STDCALL:
-	case ICC_STDCALL_RETURNINMEM:
-		retQW = CallCDeclFunction(args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	case ICC_THISCALL:
-	case ICC_THISCALL_RETURNINMEM:
-		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-		// Get virtual function table from the object pointer
-		vftable = *(asDWORD**)obj;
-		retQW = CallThisCallFunction(obj, args, paramSize<<2, vftable[asDWORD(func)>>2], hostFlags);
-		break;
-	case ICC_CDECL_OBJLAST:
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-		retQW = CallThisCallFunction_objLast(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	case ICC_CDECL_OBJFIRST:
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-
-	return retQW;
-}
-
-
-asm(
-"	.text\n"
-//"	.align 2\n"
-"	.global mipsFunc\n"
-"	.ent	mipsFunc\n"
-"mipsFunc:\n"
-//"	.frame	$fp,64,$31		# vars= 0, regs= 0/0, args= 0, gp= 0\n"
-//"	.mask	0x00000000,0\n"
-//"	.fmask	0x00000000,0\n"
-"	.set	noreorder\n"
-"	.set	nomacro\n"
-// align the stack frame to 8 bytes
-"	addiu	$12, $6, 7\n"
-"	li		$13, -8\n"			// 0xfffffffffffffff8
-"	and		$12, $12, $13\n"	// t4 holds the size of the argument block
-// and add 8 bytes for the return pointer and s0 backup
-"	addiu	$13, $12, 8\n"		// t5 holds the total size of the stack frame (including return pointer)
-// save the s0 register (so we can use it to remember where our return pointer is lives)
-"	sw		$16, -4($sp)\n"		// store the s0 register (so we can use it to remember how big our stack frame is)
-// push the stack
-"	subu	$sp, $sp, $13\n"
-// find the return address, place in s0
-"	addu	$16, $sp, $12\n"
-// store the return pointer
-"	sw		$31, 0($16)\n"
-
-// backup our function params
-"	addiu	$2, $7, 0\n"
-"	addiu	$3, $6, 0\n"
-
-// get global mipsArgs[] array pointer
-//"	lui		$15, %hi(mipsArgs)\n"
-//"	addiu	$15, $15, %lo(mipsArgs)\n"
-// we'll use the macro instead because SN Systems doesnt like %hi/%lo
-".set macro\n"
-" la  $15, mipsArgs\n"
-".set nomacro\n"
-// load register params
-"	lw		$4, 0($15)\n"
-"	lw		$5, 4($15)\n"
-"	lw		$6, 8($15)\n"
-"	lw		$7, 12($15)\n"
-"	lw		$8, 16($15)\n"
-"	lw		$9, 20($15)\n"
-"	lw		$10, 24($15)\n"
-"	lw		$11, 28($15)\n"
-
-// load float params
-"	lwc1	$f12, 32($15)\n"
-"	lwc1	$f13, 36($15)\n"
-"	lwc1	$f14, 40($15)\n"
-"	lwc1	$f15, 44($15)\n"
-"	lwc1	$f16, 48($15)\n"
-"	lwc1	$f17, 52($15)\n"
-"	lwc1	$f18, 56($15)\n"
-"	lwc1	$f19, 60($15)\n"
-
-// skip stack paramaters if there are none
-"	beq		$3, $0, andCall\n"
-
-// push stack paramaters
-"	addiu	$15, $15, 64\n"
-"pushArgs:\n"
-"	addiu	$3, -4\n"
-// load from $15 + stack bytes ($3)
-"	addu	$14, $15, $3\n"
-"	lw		$14, 0($14)\n"
-// store to $sp + stack bytes ($3)
-"	addu	$13, $sp, $3\n"
-"	sw		$14, 0($13)\n"
-// if there are more, loop...
-"	bne		$3, $0, pushArgs\n"
-"	nop\n"
-
-// and call the function
-"andCall:\n"
-"	jal		$2\n"
-"	nop\n"
-
-// restore the return pointer
-"	lw		$31, 0($16)\n"
-// pop the stack pointer (remembering the return pointer was 8 bytes below the top)
-"	addiu	$sp, $16, 8\n"
-// and return from the function
-"	jr		$31\n"
-// restore the s0 register (in the branch delay slot)
-"	lw		$16, -4($sp)\n"
-"	.set	macro\n"
-"	.set	reorder\n"
-"	.end	mipsFunc\n"
-"	.size	mipsFunc, .-mipsFunc\n"
-);
-
-#endif // PSP and PS2 MIPS ABI
-	
-END_AS_NAMESPACE
-
-#endif // AS_MIPS
-#endif // AS_MAX_PORTABILITY
-
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_mips.cpp
+//
+// These functions handle the actual calling of system functions
+//
+// This version is MIPS specific and was originally written
+// by Manu Evans in April, 2006 for Playstation Portable (PSP)
+//
+// Support for Linux with MIPS was added by Andreas Jonsson in April, 2015
+//
+
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_MIPS
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#if !defined(AS_ANDROID)
+#include <regdef.h>
+#endif
+
+BEGIN_AS_NAMESPACE
+
+#if defined(__linux__) && defined(_ABIO32)
+
+// The MIPS ABI used by Linux is implemented here
+// (Tested on CI20 MIPS Creator with Debian Linux)
+//
+// ref: SYSTEM V 
+//      APPLICATION BINARY INTERFACE
+//      MIPS RISC Processor
+//      http://math-atlas.sourceforge.net/devel/assembly/mipsabi32.pdf
+//
+// ref: MIPS Instruction Reference
+//      http://www.mrc.uidaho.edu/mrc/people/jff/digital/MIPSir.html
+
+union SFloatRegs
+{
+	union { double d0; struct { float f0; asDWORD dummy0; };};
+	union { double d1; struct { float f1; asDWORD dummy1; };};
+} ;
+
+extern "C" asQWORD mipsFunc(asUINT argSize, asDWORD *argBuffer, void *func, SFloatRegs &floatRegs);
+asDWORD GetReturnedFloat();
+asQWORD GetReturnedDouble();
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
+{
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+	int callConv = sysFunc->callConv;
+
+	asQWORD retQW = 0;
+
+	void *func = (void*)sysFunc->func;
+	void **vftable;
+
+	asDWORD argBuffer[128]; // Ought to be big enough
+	asASSERT( sysFunc->paramSize < 128 );
+	
+	asDWORD argOffset = 0;
+	
+	SFloatRegs floatRegs;
+	asDWORD floatOffset = 0;
+	
+	// If the application function returns the value in memory then
+	// the first argument must be the pointer to that memory
+	if( sysFunc->hostReturnInMemory )
+	{
+		asASSERT( retPointer );
+		argBuffer[argOffset++] = (asPWORD)retPointer;
+	}
+	
+	if( callConv == ICC_CDECL_OBJFIRST || callConv == ICC_CDECL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_THISCALL || callConv == ICC_THISCALL_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL || callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
+		callConv == ICC_THISCALL_OBJFIRST || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM || 
+		callConv == ICC_THISCALL_OBJLAST || callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the first argument
+		argBuffer[argOffset++] = (asPWORD)obj;
+	}
+	
+	if( callConv == ICC_THISCALL_OBJFIRST || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the second object pointer 
+		argBuffer[argOffset++] = (asPWORD)secondObject;
+	}
+	
+	int spos = 0;
+	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+	{
+		asCDataType &paramType = descr->parameterTypes[n];
+		if( paramType.IsObject() && !paramType.IsObjectHandle() && !paramType.IsReference() )
+		{
+			if( paramType.GetTypeInfo()->flags & COMPLEX_MASK )
+			{
+				// The object is passed by reference
+				argBuffer[argOffset++] = args[spos++];
+			}
+			else
+			{
+				// Ensure 8byte alignment for classes that need it
+				if( (paramType.GetTypeInfo()->flags & asOBJ_APP_CLASS_ALIGN8) && (argOffset & 1) )
+					argOffset++;
+			
+				// Copy the object's memory to the buffer
+				memcpy(&argBuffer[argOffset], *(void**)(args+spos), paramType.GetSizeInMemoryBytes());
+				// Delete the original memory
+				engine->CallFree(*(char**)(args+spos));
+				spos++;
+				argOffset += paramType.GetSizeInMemoryDWords();
+			}
+		}
+		else if( paramType.GetTokenType() == ttQuestion )
+		{
+			// Copy both pointer and type id
+			argBuffer[argOffset++] = args[spos++];
+			argBuffer[argOffset++] = args[spos++];
+		}
+		else
+		{
+			// The first 2 floats or doubles are loaded into the float registers.
+			// Actually this is only done if they are the first arguments to the function, 
+			// but it doesn't cause any harm to load them into the registers even if they 
+			// won't be used so we don't need to check if they really are the first args.
+			if( floatOffset == 0 )
+			{
+				if( paramType.GetTokenType() == ttFloat )
+					floatRegs.f0 = *reinterpret_cast<float*>(&args[spos]);
+				else if( paramType.GetTokenType() == ttDouble )
+					floatRegs.d0 = *reinterpret_cast<double*>(&args[spos]);
+				floatOffset++;
+			}
+			else if( floatOffset == 1 )
+			{
+				if( paramType.GetTokenType() == ttFloat )
+					floatRegs.f1 = *reinterpret_cast<float*>(&args[spos]);
+				else if( paramType.GetTokenType() == ttDouble )
+					floatRegs.d1 = *reinterpret_cast<double*>(&args[spos]);
+				floatOffset++;
+			}
+		
+			// Copy the value directly
+			if( paramType.GetSizeOnStackDWords() > 1 )
+			{
+				// Make sure the argument is 8byte aligned
+				if( argOffset & 1 )
+					argOffset++;
+				*reinterpret_cast<asQWORD*>(&argBuffer[argOffset]) = *reinterpret_cast<asQWORD*>(&args[spos]);
+				argOffset += 2;
+				spos += 2;
+			}
+			else
+				argBuffer[argOffset++] = args[spos++];
+		}
+	}
+	
+	if( callConv == ICC_CDECL_OBJLAST || callConv == ICC_CDECL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last argument
+		argBuffer[argOffset++] = (asPWORD)obj;
+	}
+
+	if( callConv == ICC_THISCALL_OBJLAST || callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM || callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Add the second object pointer 
+		argBuffer[argOffset++] = (asPWORD)secondObject;
+	}
+
+	switch( callConv )
+	{
+	case ICC_CDECL:
+	case ICC_CDECL_RETURNINMEM:
+	case ICC_STDCALL:
+	case ICC_STDCALL_RETURNINMEM:
+	case ICC_CDECL_OBJLAST:
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+	case ICC_CDECL_OBJFIRST:
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL:
+	case ICC_THISCALL_RETURNINMEM:
+	case ICC_THISCALL_OBJFIRST:
+	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL_OBJLAST:
+	case ICC_THISCALL_OBJLAST_RETURNINMEM:
+		retQW = mipsFunc(argOffset*4, argBuffer, func, floatRegs);
+		break;
+
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJLAST:
+	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
+		// Get virtual function table from the object pointer
+		vftable = *(void***)obj;
+		retQW = mipsFunc(argOffset*4, argBuffer, vftable[asPWORD(func)>>2], floatRegs);
+		break;
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+
+	return retQW;
+}
+
+asDWORD GetReturnedFloat()
+{
+	asDWORD f;
+
+	asm("swc1 $f0, %0\n" : "=m"(f));
+
+	return f;
+}
+
+asQWORD GetReturnedDouble()
+{
+	asQWORD d = 0;
+
+	asm("sdc1 $f0, %0\n" : "=m"(d));
+
+	return d;
+}
+
+// asQWORD mipsFunc(asUINT argSize, asDWORD *argBuffer, void *func, SFloatRegs &floatRegs);
+// $2,$3                   $4                $5               $6                $7
+asm(
+"	.text\n"
+//"	.align 2\n"
+"	.cfi_startproc\n"
+"	.global mipsFunc\n"
+"	.ent	mipsFunc\n"
+"mipsFunc:\n"
+//"	.frame	$fp,64,$31		# vars= 0, regs= 0/0, args= 0, gp= 0\n"
+//"	.mask	0x00000000,0\n"
+//"	.fmask	0x00000000,0\n"
+"	.set	noreorder\n"
+"	.set	nomacro\n"
+
+// align the stack frame to 8 bytes
+"	addiu	$12, $4, 7\n"		// t4 ($12) = argSize ($4) + 7
+"	li		$13, -8\n"			// t5 ($13) = 0xfffffffffffffff8
+"	and		$12, $12, $13\n"	// t4 ($12) &= t5 ($13). t4 holds the size of the argument block
+// It is required that the caller reserves space for at least 16 bytes even if there are less than 4 arguments
+// and add 8 bytes for the return pointer and s0 ($16) backup
+"	addiu	$13, $12, 24\n"		// t5 = t4 + 24. t5 ($13) holds the total size of the stack frame (including return pointer)
+// save the s0 register (so we can use it to remember where our return pointer is lives)
+"	sw		$16, -4($sp)\n"		// store the s0 register (so we can use it to remember how big our stack frame is)
+"	.cfi_offset 16, -4\n"
+// store the return pointer
+"	sw		$31, -8($sp)\n"
+"	.cfi_offset 31, -8\n"
+// keep original stack pointer
+"	move	$16, $sp\n"
+"	.cfi_def_cfa_register 16\n"
+// push the stack
+"	subu	$sp, $sp, $13\n"
+
+// store the argument in temporary registers
+"	addiu	$25, $6, 0\n"		// t9 ($25) holds the function pointer (must be t9 for position independent code)
+"	addiu	$3, $4, 0\n"		// v1 ($3) holds the size of the argument buffer
+"	move	$15, $5\n"			// t7 ($15) holds the pointer to the argBuffer
+"	move	$14, $7\n"			// t6 ($14) holds the values for the float registers
+
+// load integer registers
+"	lw		$4, 0($15)\n"		// a0 ($4)
+"	lw		$5, 4($15)\n"		// a1 ($5)
+"	lw		$6, 8($15)\n"		// a2 ($6)
+"	lw		$7, 12($15)\n"		// a3 ($7)
+
+// load float registers
+"	ldc1	$f12, 8($14)\n"
+"	ldc1	$f14, 0($14)\n"
+
+// skip stack parameters if there are 4 or less as they are moved into the registers
+"	addi	$14, $3, -16\n"		// The first 4 args were already loaded into registers
+"	blez	$14, andCall\n"
+"	nop\n"
+
+// push stack parameters
+"pushArgs:\n"
+"	addi	$3, -4\n"
+// load from $15 + stack bytes ($3)
+"	addu	$14, $15, $3\n"
+"	lw		$14, 0($14)\n"
+// store to $sp + stack bytes ($3)
+"	addu	$13, $sp, $3\n"
+"	sw		$14, 0($13)\n"
+// if there are more, loop...
+"	bne		$3, $0, pushArgs\n"
+"	nop\n"
+
+// and call the function
+"andCall:\n"
+"	jalr	$25\n"
+"	nop\n"
+
+// restore original stack pointer
+"	move	$sp, $16\n"
+// restore the return pointer
+"	lw		$31, -8($sp)\n"
+// restore the original value of $16
+"	lw		$16, -4($sp)\n"
+// and return from the function
+"	jr		$31\n"
+"	nop\n"
+
+"	.set	macro\n"
+"	.set	reorder\n"
+"	.end	mipsFunc\n"
+"	.cfi_endproc\n"
+"	.size	mipsFunc, .-mipsFunc\n"
+);
+
+#else // !(defined(__linux__) && defined(_ABIO32))
+
+// The MIPS ABI used by PSP and PS2 is implemented here
+
+#define AS_MIPS_MAX_ARGS 32
+#define AS_NUM_REG_FLOATS 8
+#define AS_NUM_REG_INTS 8
+
+// The array used to send values to the correct places.
+// first 0-8 regular values to load into the a0-a3, t0-t3 registers
+// then 0-8 float values to load into the f12-f19 registers
+// then (AS_MIPS_MAX_ARGS - 16) values to load onto the stack
+// the +1 is for when CallThis (object methods) is used
+// extra +1 when returning in memory
+extern "C" {
+// TODO: This array shouldn't be global. It should be a local array in CallSystemFunctionNative
+asDWORD mipsArgs[AS_MIPS_MAX_ARGS + 1 + 1];
+}
+
+// Loads all data into the correct places and calls the function.
+// intArgSize is the size in bytes for how much data to put in int registers
+// floatArgSize is the size in bytes for how much data to put in float registers
+// stackArgSize is the size in bytes for how much data to put on the callstack
+extern "C" asQWORD mipsFunc(int intArgSize, int floatArgSize, int stackArgSize, asDWORD func);
+
+// puts the arguments in the correct place in the mipsArgs-array. See comments above.
+// This could be done better.
+inline void splitArgs(const asDWORD *args, int argNum, int &numRegIntArgs, int &numRegFloatArgs, int &numRestArgs, int hostFlags)
+{
+	int i;
+
+	int argBit = 1;
+	for (i = 0; i < argNum; i++)
+	{
+		if (hostFlags & argBit)
+		{
+			if (numRegFloatArgs < AS_NUM_REG_FLOATS)
+			{
+				// put in float register
+				mipsArgs[AS_NUM_REG_INTS + numRegFloatArgs] = args[i];
+				numRegFloatArgs++;
+			}
+			else
+			{
+				// put in stack
+				mipsArgs[AS_NUM_REG_INTS + AS_NUM_REG_FLOATS + numRestArgs] = args[i];
+				numRestArgs++;
+			}
+		}
+		else
+		{
+			if (numRegIntArgs < AS_NUM_REG_INTS)
+			{
+				// put in int register
+				mipsArgs[numRegIntArgs] = args[i];
+				numRegIntArgs++;
+			}
+			else
+			{
+				// put in stack
+				mipsArgs[AS_NUM_REG_INTS + AS_NUM_REG_FLOATS + numRestArgs] = args[i];
+				numRestArgs++;
+			}
+		}
+		argBit <<= 1;
+	}
+}
+
+asQWORD CallCDeclFunction(const asDWORD *args, int argSize, asDWORD func, int flags)
+{
+	int argNum = argSize >> 2;
+
+	int intArgs = 0;
+	int floatArgs = 0;
+	int restArgs = 0;
+
+	// put the arguments in the correct places in the mipsArgs array
+	if(argNum > 0)
+		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
+
+	return mipsFunc(intArgs << 2, floatArgs << 2, restArgs << 2, func);
+}
+
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the first parameter is the object
+asQWORD CallThisCallFunction(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
+{
+	int argNum = argSize >> 2;
+
+	int intArgs = 1;
+	int floatArgs = 0;
+	int restArgs = 0;
+
+	mipsArgs[0] = (asDWORD) obj;
+
+	// put the arguments in the correct places in the mipsArgs array
+	if (argNum > 0)
+		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
+
+	return mipsFunc(intArgs << 2, floatArgs << 2, restArgs << 2, func);
+}
+
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the last parameter is the object
+asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
+{
+	int argNum = argSize >> 2;
+
+	int intArgs = 0;
+	int floatArgs = 0;
+	int restArgs = 0;
+
+	// put the arguments in the correct places in the mipsArgs array
+	if(argNum > 0)
+		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
+
+	if(intArgs < AS_NUM_REG_INTS)
+	{
+		mipsArgs[intArgs] = (asDWORD) obj;
+		intArgs++;
+	}
+	else
+	{
+		mipsArgs[AS_NUM_REG_INTS + AS_NUM_REG_FLOATS + restArgs] = (asDWORD) obj;
+		restArgs++;
+	}
+
+	return mipsFunc(intArgs << 2, floatArgs << 2, restArgs << 2, func);
+}
+
+asDWORD GetReturnedFloat()
+{
+	asDWORD f;
+
+	asm("swc1 $f0, %0\n" : "=m"(f));
+
+	return f;
+}
+
+asQWORD GetReturnedDouble()
+{
+	asQWORD d = 0;
+
+	asm("sdc1 $f0, %0\n" : "=m"(d));
+
+	return d;
+}
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
+{
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+	int callConv = sysFunc->callConv;
+
+	// TODO: Mips does not yet support THISCALL_OBJFIRST/LAST
+
+	asQWORD retQW = 0;
+
+	void    *func              = (void*)sysFunc->func;
+	int      paramSize         = sysFunc->paramSize;
+	asDWORD *vftable;
+
+	if( descr->returnType.IsObject() && !descr->returnType.IsReference() && !descr->returnType.IsObjectHandle() )
+	{
+		mipsArgs[AS_MIPS_MAX_ARGS+1] = (asDWORD) retPointer;
+	}
+
+	asASSERT(descr->parameterTypes.GetLength() <= AS_MIPS_MAX_ARGS);
+
+	// mark all float arguments
+	int argBit = 1;
+	int hostFlags = 0;
+	int intArgs = 0;
+	for( size_t a = 0; a < descr->parameterTypes.GetLength(); a++ )
+	{
+		if (descr->parameterTypes[a].IsFloatType()) 
+			hostFlags |= argBit;
+		else 
+			intArgs++;
+		argBit <<= 1;
+	}
+
+	asDWORD paramBuffer[64];
+	if( sysFunc->takesObjByVal )
+	{
+		paramSize = 0;
+		int spos = 0;
+		int dpos = 1;
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					paramSize++;
+				}
+				else
+#endif
+				{
+					// Copy the object's memory to the buffer
+					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+					// Delete the original memory
+					engine->CallFree(*(char**)(args+spos));
+					spos++;
+					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
+				}
+			}
+			else
+			{
+				// Copy the value directly
+				paramBuffer[dpos++] = args[spos++];
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+					paramBuffer[dpos++] = args[spos++];
+				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+			}
+		}
+		// Keep a free location at the beginning
+		args = &paramBuffer[1];
+	}
+
+	switch( callConv )
+	{
+	case ICC_CDECL:
+	case ICC_CDECL_RETURNINMEM:
+	case ICC_STDCALL:
+	case ICC_STDCALL_RETURNINMEM:
+		retQW = CallCDeclFunction(args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	case ICC_THISCALL:
+	case ICC_THISCALL_RETURNINMEM:
+		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+		// Get virtual function table from the object pointer
+		vftable = *(asDWORD**)obj;
+		retQW = CallThisCallFunction(obj, args, paramSize<<2, vftable[asDWORD(func)>>2], hostFlags);
+		break;
+	case ICC_CDECL_OBJLAST:
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+		retQW = CallThisCallFunction_objLast(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	case ICC_CDECL_OBJFIRST:
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+
+	return retQW;
+}
+
+
+asm(
+"	.text\n"
+//"	.align 2\n"
+"	.global mipsFunc\n"
+"	.ent	mipsFunc\n"
+"mipsFunc:\n"
+//"	.frame	$fp,64,$31		# vars= 0, regs= 0/0, args= 0, gp= 0\n"
+//"	.mask	0x00000000,0\n"
+//"	.fmask	0x00000000,0\n"
+"	.set	noreorder\n"
+"	.set	nomacro\n"
+// align the stack frame to 8 bytes
+"	addiu	$12, $6, 7\n"
+"	li		$13, -8\n"			// 0xfffffffffffffff8
+"	and		$12, $12, $13\n"	// t4 holds the size of the argument block
+// and add 8 bytes for the return pointer and s0 backup
+"	addiu	$13, $12, 8\n"		// t5 holds the total size of the stack frame (including return pointer)
+// save the s0 register (so we can use it to remember where our return pointer is lives)
+"	sw		$16, -4($sp)\n"		// store the s0 register (so we can use it to remember how big our stack frame is)
+// push the stack
+"	subu	$sp, $sp, $13\n"
+// find the return address, place in s0
+"	addu	$16, $sp, $12\n"
+// store the return pointer
+"	sw		$31, 0($16)\n"
+
+// backup our function params
+"	addiu	$2, $7, 0\n"
+"	addiu	$3, $6, 0\n"
+
+// get global mipsArgs[] array pointer
+//"	lui		$15, %hi(mipsArgs)\n"
+//"	addiu	$15, $15, %lo(mipsArgs)\n"
+// we'll use the macro instead because SN Systems doesnt like %hi/%lo
+".set macro\n"
+" la  $15, mipsArgs\n"
+".set nomacro\n"
+// load register params
+"	lw		$4, 0($15)\n"
+"	lw		$5, 4($15)\n"
+"	lw		$6, 8($15)\n"
+"	lw		$7, 12($15)\n"
+"	lw		$8, 16($15)\n"
+"	lw		$9, 20($15)\n"
+"	lw		$10, 24($15)\n"
+"	lw		$11, 28($15)\n"
+
+// load float params
+"	lwc1	$f12, 32($15)\n"
+"	lwc1	$f13, 36($15)\n"
+"	lwc1	$f14, 40($15)\n"
+"	lwc1	$f15, 44($15)\n"
+"	lwc1	$f16, 48($15)\n"
+"	lwc1	$f17, 52($15)\n"
+"	lwc1	$f18, 56($15)\n"
+"	lwc1	$f19, 60($15)\n"
+
+// skip stack paramaters if there are none
+"	beq		$3, $0, andCall\n"
+
+// push stack paramaters
+"	addiu	$15, $15, 64\n"
+"pushArgs:\n"
+"	addiu	$3, -4\n"
+// load from $15 + stack bytes ($3)
+"	addu	$14, $15, $3\n"
+"	lw		$14, 0($14)\n"
+// store to $sp + stack bytes ($3)
+"	addu	$13, $sp, $3\n"
+"	sw		$14, 0($13)\n"
+// if there are more, loop...
+"	bne		$3, $0, pushArgs\n"
+"	nop\n"
+
+// and call the function
+"andCall:\n"
+"	jal		$2\n"
+"	nop\n"
+
+// restore the return pointer
+"	lw		$31, 0($16)\n"
+// pop the stack pointer (remembering the return pointer was 8 bytes below the top)
+"	addiu	$sp, $16, 8\n"
+// and return from the function
+"	jr		$31\n"
+// restore the s0 register (in the branch delay slot)
+"	lw		$16, -4($sp)\n"
+"	.set	macro\n"
+"	.set	reorder\n"
+"	.end	mipsFunc\n"
+"	.size	mipsFunc, .-mipsFunc\n"
+);
+
+#endif // PSP and PS2 MIPS ABI
+	
+END_AS_NAMESPACE
+
+#endif // AS_MIPS
+#endif // AS_MAX_PORTABILITY
+
+
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_ppc.cpp b/Sources/AngelScript/source/as_callfunc_ppc.cpp
old mode 100755
new mode 100644
index 676de9165..053221fe9
--- a/Sources/AngelScript/source/as_callfunc_ppc.cpp
+++ b/Sources/AngelScript/source/as_callfunc_ppc.cpp
@@ -1,674 +1,674 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc_ppc.cpp
-//
-// These functions handle the actual calling of system functions
-//
-// This version is PPC specific
-//
-
-#include <stdio.h>
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_PPC
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_tokendef.h"
-#include "as_context.h"
-
-#include <stdlib.h>
-
-BEGIN_AS_NAMESPACE
-
-// This part was originally written by Pecan Heber, June 2006, for
-// use on MacOS X with 32bit PPC processor. He based the code on the
-// code in as_callfunc_sh4.cpp
-
-#define AS_PPC_MAX_ARGS 32
-
-// The array used to send values to the correct places.
-// Contains a byte of argTypes to indicate the register tYpe to load
-// or zero if end of arguments
-// The +1 is for when CallThis (object methods) is used
-// Extra +1 when returning in memory
-// Extra +1 in ppcArgsType to ensure zero end-of-args marker
-
-// TODO: multithread: We need to remove these global variables for thread-safety
-
-enum argTypes { ppcENDARG, ppcINTARG, ppcFLOATARG, ppcDOUBLEARG };
-static asDWORD ppcArgs[2*AS_PPC_MAX_ARGS + 1 + 1];
-
-// Using extern "C" because we use this symbol name in the assembly code
-extern "C"
-{
-	static asBYTE ppcArgsType[2*AS_PPC_MAX_ARGS + 1 + 1 + 1];
-}
-
-// NOTE: these values are for PowerPC 32 bit. 
-#define PPC_LINKAGE_SIZE  (24)                                   // how big the PPC linkage area is in a stack frame
-#define PPC_NUM_REGSTORE  (9)                                    // how many registers of the PPC we need to store/restore for ppcFunc()
-#define PPC_REGSTORE_SIZE (4*PPC_NUM_REGSTORE)                   // how many bytes are required for register store/restore
-#define EXTRA_STACK_SIZE  (PPC_LINKAGE_SIZE + PPC_REGSTORE_SIZE) // memory required, not including parameters, for the stack frame
-#define PPC_STACK_SIZE(numParams)  (-( ( ((((numParams)<8)?8:(numParams))<<2) + EXTRA_STACK_SIZE + 15 ) & ~15 ))  // calculates the total stack size needed for ppcFunc64, must pad to 16bytes
-
-// Loads all data into the correct places and calls the function.
-// ppcArgsType is an array containing a byte type (enum argTypes) for each argument.
-// stackArgSize is the size in bytes for how much data to put on the stack frame
-extern "C" asQWORD ppcFunc(const asDWORD* argsPtr, int StackArgSize, asDWORD func);
-
-asm(" .text\n"
-	" .align 2\n"		  // align the code to 1 << 2 = 4 bytes
-	" .globl _ppcFunc\n"
-	"_ppcFunc:\n"
-
-	// We're receiving the following parameters
-	
-	// r3 : argsPtr
-	// r4 : StackArgSize
-	// r5 : func
-
-	// The following registers are used through out the function
-	
-	// r31 : the address of the label address, as reference for all other labels
-	// r30 : temporary variable
-	// r29 : arg list pointer
-	// r28 : number of FPR registers used by the parameters
-	// r27 : the function pointer that will be called
-	// r26 : the location of the parameters for the call
-	// r25 : arg type list pointer
-	// r24 : temporary variable
-	// r23 : number of GPR registers used by the parameters
-	// r1  : this is stack pointer
-	// r0  : temporary variable
-	// f0  : temporary variable
-
-	// We need to store some of the registers for restoral before returning to caller
-	
-	// lr - always stored in 8(r1) - this is the return address
-	// cr - not required to be stored, but if it is, its place is in 4(r1) - this is the condition register 
-	// r1 - always stored in 0(r1) - this is the stack pointer
-	// r11 
-	// r13 to r31 
-	// f14 to f31
-
-	// Store register values and setup our stack frame
-	" mflr  r0            \n"   // move the return address into r0
-	" stw   r0, 8(r1)     \n"   // Store the return address on the stack
-	" stmw  r23, -36(r1)  \n"   // Store registers r23 to r31 on the stack
-	" stwux r1, r1, r4    \n"   // Increase the stack with the needed space and store the original value in the destination	
-	
-	// Obtain an address that we'll use as our position of reference when obtaining addresses of other labels
-	" bl    address         \n"
-	"address:               \n"
-	" mflr  r31             \n"
-
-	// initial registers for the function
-	" mr    r29, r3       \n"   // (r29) args list
-	" mr    r27, r5       \n"   // load the function pointer to call.  func actually holds the pointer to our function
-	" addi  r26, r1, 24   \n"   // setup the pointer to the parameter area to the function we're going to call
-	" sub   r0, r0, r0    \n"   // zero out r0
-	" mr    r23, r0       \n"   // zero out r23, which holds the number of used GPR registers
-	" mr    r28, r0       \n"   // zero our r22, which holds the number of used float registers
-	
-	// load the global ppcArgsType which holds the types of arguments for each argument
-	" addis r25, r31, ha16(_ppcArgsType - address) \n" // load the upper 16 bits of the address to r25
-	" la    r25, lo16(_ppcArgsType - address)(r25) \n" // load the lower 16 bits of the address to r25
-	" subi  r25, r25, 1    \n"   // since we increment r25 on its use, we'll pre-decrement it
-
-	// loop through the arguments
-	"ppcNextArg:           \n"
-	" addi r25, r25, 1     \n"   // increment r25, our arg type pointer
-	// switch based on the current argument type (0:end, 1:int, 2:float 3:double)
-	" lbz  r24, 0(r25)     \n"   // load the current argument type (it's a byte)
-	" mulli r24, r24, 4    \n"   // our jump table has 4 bytes per case (1 instruction)
-	" addis r30, r31, ha16(ppcTypeSwitch - address) \n"   // load the address of the jump table for the switch
-	" la    r30, lo16(ppcTypeSwitch - address)(r30) \n"
-	
-	" add    r0, r30, r24  \n"   // offset by our argument type
-	" mtctr  r0            \n"   // load the jump address into CTR
-	" bctr                 \n"   // jump into the jump table/switch
-	" nop                  \n"
-	
-	// the jump table/switch based on the current argument type
-	"ppcTypeSwitch:        \n"
-	" b ppcArgsEnd         \n"
-	" b ppcArgIsInteger    \n"
-	" b ppcArgIsFloat      \n"
-	" b ppcArgIsDouble     \n"
-	
-	// when we get here we have finished processing all the arguments
-	// everything is ready to go to call the function
-	"ppcArgsEnd:           \n"
-	" mtctr r27            \n"   // the function pointer is stored in r27, load that into CTR
-	" bctrl                \n"   // call the function.  We have to do it this way so that the LR gets the proper
-	" nop                  \n"   // return value (the next instruction below).  So we have to branch from CTR instead of LR.
-	
-	// Restore registers and caller's stack frame, then return to caller
-	" lwz   r1, 0(r1)      \n"   // restore the caller's stack pointer
-	" lwz   r0, 8(r1)      \n"   // load in the caller's LR
-	" mtlr  r0             \n"   // restore the caller's LR
-	" lmw   r23, -36(r1)   \n"   // restore registers r23 to r31 from the stack
-	" blr                  \n"   // return back to the caller
-	" nop                  \n"
-	
-	// Integer argument (GPR register)
-	"ppcArgIsInteger:             \n"
-	" addis r30, r31, ha16(ppcLoadIntReg - address) \n" // load the address to the jump table for integer registers
-	" la    r30, lo16(ppcLoadIntReg - address)(r30) \n"
-	" mulli r0, r23, 8            \n"    // each item in the jump table is 2 instructions (8 bytes)
-	" add   r0, r0, r30           \n"    // calculate ppcLoadIntReg[numUsedGPRRegs]
-	" lwz   r30, 0(r29)           \n"    // load the next argument from the argument list into r30
-	" cmpwi r23, 8                \n"    // we can only load GPR3 through GPR10 (8 registers)
-	" bgt   ppcLoadIntRegUpd      \n"    // if we're beyond 8 GPR registers, we're in the stack, go there
-	" mtctr r0                    \n"    // load the address of our ppcLoadIntReg jump table (we're below 8 GPR registers)
-	" bctr                        \n"    // load the argument into a GPR register
-	" nop                         \n"
-	// jump table for GPR registers, for the first 8 GPR arguments
-	"ppcLoadIntReg:               \n"
-	" mr    r3, r30               \n"    // arg0 (to r3)
-	" b     ppcLoadIntRegUpd      \n"
-	" mr    r4, r30               \n"    // arg1 (to r4)
-	" b     ppcLoadIntRegUpd      \n"
-	" mr    r5, r30               \n"    // arg2 (to r5)
-	" b     ppcLoadIntRegUpd      \n"
-	" mr    r6, r30               \n"    // arg3 (to r6)
-	" b     ppcLoadIntRegUpd      \n"
-	" mr    r7, r30               \n"    // arg4 (to r7)
-	" b     ppcLoadIntRegUpd      \n"
-	" mr    r8, r30               \n"    // arg5 (to r8)
-	" b     ppcLoadIntRegUpd      \n"
-	" mr    r9, r30               \n"    // arg6 (to r9)
-	" b     ppcLoadIntRegUpd      \n"
-	" mr    r10, r30              \n"    // arg7 (to r10)
-	" b     ppcLoadIntRegUpd      \n"
-	// all GPR arguments still go on the stack
-	"ppcLoadIntRegUpd:            \n"
-	" stw   r30, 0(r26)           \n"    // store the argument into the next slot on the stack's argument list
-	" addi  r23, r23, 1           \n"    // count a used GPR register
-	" addi  r29, r29, 4           \n"    // move to the next argument on the list
-	" addi  r26, r26, 4           \n"    // adjust our argument stack pointer for the next
-	" b     ppcNextArg            \n"    // next argument
-
-	// single Float argument
-	"ppcArgIsFloat:\n"
-	" addis r30, r31, ha16(ppcLoadFloatReg - address) \n" // get the base address of the float register jump table
-	" la    r30, lo16(ppcLoadFloatReg - address)(r30) \n"
-	" mulli r0, r28, 8           \n"     // each jump table entry is 8 bytes
-	" add   r0, r0, r30          \n"     // calculate the offset to ppcLoadFloatReg[numUsedFloatReg]
-	" lfs   f0, 0(r29)           \n"     // load the next argument as a float into f0
-	" cmpwi r28, 13              \n"     // can't load more than 13 float/double registers
-	" bgt   ppcLoadFloatRegUpd   \n"     // if we're beyond 13 registers, just fall to inserting into the stack
-	" mtctr r0                   \n"     // jump into the float jump table
-	" bctr                       \n"
-	" nop                        \n"
-	// jump table for float registers, for the first 13 float arguments
-	"ppcLoadFloatReg:            \n"
-	" fmr   f1, f0               \n"     // arg0 (f1)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f2, f0               \n"     // arg1 (f2)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f3, f0               \n"     // arg2 (f3)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f4, f0               \n"     // arg3 (f4)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f5, f0               \n"     // arg4 (f5)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f6, f0               \n"     // arg5 (f6)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f7, f0               \n"     // arg6 (f7)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f8, f0               \n"     // arg7 (f8)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f9, f0               \n"     // arg8 (f9)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f10, f0              \n"     // arg9 (f10)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f11, f0              \n"     // arg10 (f11)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f12, f0              \n"     // arg11 (f12)
-	" b     ppcLoadFloatRegUpd   \n"
-	" fmr   f13, f0              \n"     // arg12 (f13)
-	" b     ppcLoadFloatRegUpd   \n"
-	" nop                        \n"
-	// all float arguments still go on the stack
-	"ppcLoadFloatRegUpd:         \n"
-	" stfs  f0, 0(r26)           \n"     // store, as a single float, f0 (current argument) on to the stack argument list
-	" addi  r23, r23, 1          \n"     // a float register eats up a GPR register
-	" addi  r28, r28, 1          \n"     // ...and, of course, a float register
-	" addi  r29, r29, 4          \n"     // move to the next argument in the list
-	" addi  r26, r26, 4          \n"     // move to the next stack slot
-	" b     ppcNextArg           \n"     // on to the next argument
-	" nop                        \n"
-	
-	// double Float argument
-	"ppcArgIsDouble:             \n"
-	" addis r30, r31, ha16(ppcLoadDoubleReg - address) \n" // load the base address of the jump table for double registers
-	" la    r30, lo16(ppcLoadDoubleReg - address)(r30) \n"
-	" mulli r0, r28, 8           \n"     // each slot of the jump table is 8 bytes
-	" add   r0, r0, r30          \n"     // calculate ppcLoadDoubleReg[numUsedFloatReg]
-	" lfd   f0, 0(r29)           \n"     // load the next argument, as a double float, into f0
-	" cmpwi r28, 13              \n"     // the first 13 floats must go into float registers also
-	" bgt   ppcLoadDoubleRegUpd  \n"     // if we're beyond 13, then just put on to the stack
-	" mtctr r0                   \n"     // we're under 13, first load our register
-	" bctr                       \n"     // jump into the jump table
-	" nop                        \n"
-	// jump table for float registers, for the first 13 float arguments
-	"ppcLoadDoubleReg:           \n"
-	" fmr   f1, f0               \n"     // arg0 (f1)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f2, f0               \n"     // arg1 (f2)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f3, f0               \n"     // arg2 (f3)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f4, f0               \n"     // arg3 (f4)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f5, f0               \n"     // arg4 (f5)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f6, f0               \n"     // arg5 (f6)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f7, f0               \n"     // arg6 (f7)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f8, f0               \n"     // arg7 (f8)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f9, f0               \n"     // arg8 (f9)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f10, f0              \n"     // arg9 (f10)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f11, f0              \n"     // arg10 (f11)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f12, f0              \n"     // arg11 (f12)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" fmr   f13, f0              \n"     // arg12 (f13)
-	" b     ppcLoadDoubleRegUpd  \n"
-	" nop                        \n"
-	// all float arguments still go on the stack
-	"ppcLoadDoubleRegUpd: \n"
-	" stfd  f0, 0(r26)     \n"    // store f0, as a double, into the argument list on the stack
-	" addi  r23, r23, 2   \n"     // a double float eats up two GPRs
-	" addi  r28, r28, 1   \n"     // ...and, of course, a float
-	" addi  r29, r29, 8   \n"     // increment to our next argument we need to process (8 bytes for the 64bit float)
-	" addi  r26, r26, 8   \n"     // increment to the next slot on the argument list on the stack (8 bytes)
-	" b     ppcNextArg    \n"     // on to the next argument
-	" nop                 \n"
-);
-
-asDWORD GetReturnedFloat()
-{
-	asDWORD f;
-	asm(" stfs f1, %0\n" : "=m"(f));
-	return f;
-}
-
-asQWORD GetReturnedDouble()
-{
-	asQWORD f;
-	asm(" stfd f1, %0\n" : "=m"(f));
-	return f;
-}
-
-// puts the arguments in the correct place in the stack array. See comments above.
-void stackArgs(const asDWORD *args, const asBYTE *argsType, int& numIntArgs, int& numFloatArgs, int& numDoubleArgs)
-{
-	int i;
-	int argWordPos = numIntArgs + numFloatArgs + (numDoubleArgs*2);
-	int typeOffset = numIntArgs + numFloatArgs + numDoubleArgs;
-
-	int typeIndex;
-	for( i = 0, typeIndex = 0; ; i++, typeIndex++ )
-	{
-		// store the type
-		ppcArgsType[typeOffset++] = argsType[typeIndex];
-		if( argsType[typeIndex] == ppcENDARG )
-			break;
-
-		switch( argsType[typeIndex] )
-		{
-		case ppcFLOATARG:
-			// stow float
-			ppcArgs[argWordPos] = args[i]; // it's just a bit copy
-			numFloatArgs++;
-			argWordPos++; //add one word
-			break;
-
-		case ppcDOUBLEARG:
-			// stow double
-			memcpy( &ppcArgs[argWordPos], &args[i], sizeof(double) ); // we have to do this because of alignment
-			numDoubleArgs++;
-			argWordPos+=2; //add two words
-			i++;//doubles take up 2 argument slots
-			break;
-
-		case ppcINTARG:
-			// stow register
-			ppcArgs[argWordPos] = args[i];
-			numIntArgs++;
-			argWordPos++;
-			break;
-		}
-	}
-
-	// close off the argument list (if we have max args we won't close it off until here)
-	ppcArgsType[typeOffset] = ppcENDARG;
-}
-
-static asQWORD CallCDeclFunction(const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
-{
-	int baseArgCount = 0;
-	if( retInMemory )
-	{
-		// the first argument is the 'return in memory' pointer
-		ppcArgs[0]     = (asDWORD)retInMemory;
-		ppcArgsType[0] = ppcINTARG;
-		ppcArgsType[1] = ppcENDARG;
-		baseArgCount   = 1;
-	}
-
-	// put the arguments in the correct places in the ppcArgs array
-	int numTotalArgs = baseArgCount;
-	if( argSize > 0 )
-	{
-		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0;
-		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs );
-		numTotalArgs = intArgs + floatArgs + 2*doubleArgs; // doubles occupy two slots
-	}
-	else
-	{
-		// no arguments, cap the type list
-		ppcArgsType[baseArgCount] = ppcENDARG;
-	}
-
-	// call the function with the arguments
-	return ppcFunc( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
-}
-
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the first parameter is the object (unless we are returning in memory)
-static asQWORD CallThisCallFunction(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory )
-{
-	int baseArgCount = 0;
-	if( retInMemory )
-	{
-		// the first argument is the 'return in memory' pointer
-		ppcArgs[0]     = (asDWORD)retInMemory;
-		ppcArgsType[0] = ppcINTARG;
-		ppcArgsType[1] = ppcENDARG;
-		baseArgCount = 1;
-	}
-
-	// the first argument is the 'this' of the object
-	ppcArgs[baseArgCount]       = (asDWORD)obj;
-	ppcArgsType[baseArgCount++] = ppcINTARG;
-	ppcArgsType[baseArgCount]   = ppcENDARG;
-
-	// put the arguments in the correct places in the ppcArgs array
-	int numTotalArgs = baseArgCount;
-	if( argSize > 0 )
-	{
-		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0;
-		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs );
-		numTotalArgs = intArgs + floatArgs + 2*doubleArgs; // doubles occupy two slots
-	}
-
-	// call the function with the arguments
-	return ppcFunc( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func);
-}
-
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the last parameter is the object 
-// NOTE: on PPC the order for the args is reversed
-static asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
-{
-	UNUSED_VAR(argSize);
-	int baseArgCount = 0;
-	if( retInMemory )
-	{
-		// the first argument is the 'return in memory' pointer
-		ppcArgs[0]     = (asDWORD)retInMemory;
-		ppcArgsType[0] = ppcINTARG;
-		ppcArgsType[1] = ppcENDARG;
-		baseArgCount = 1;
-	}
-
-	// stack any of the arguments
-	int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0;
-	stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs );
-	int numTotalArgs = intArgs + floatArgs + doubleArgs;
-
-	// can we fit the object in at the end?
-	if( numTotalArgs < AS_PPC_MAX_ARGS )
-	{
-		// put the object pointer at the end
-		int argPos = intArgs + floatArgs + (doubleArgs * 2);
-		ppcArgs[argPos]             = (asDWORD)obj;
-		ppcArgsType[numTotalArgs++] = ppcINTARG;
-		ppcArgsType[numTotalArgs]   = ppcENDARG;
-	}
-
-	// call the function with the arguments
-	return ppcFunc( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
-}
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
-{
-	// TODO: PPC does not yet support THISCALL_OBJFIRST/LAST
-
-	// use a working array of types, we'll configure the final one in stackArgs
-	asBYTE argsType[2*AS_PPC_MAX_ARGS + 1 + 1 + 1];
-	memset( argsType, 0, sizeof(argsType));
-
-	asCScriptEngine            *engine  = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-
-	asQWORD  retQW           = 0;
-	void    *func            = (void*)sysFunc->func;
-	int      paramSize       = sysFunc->paramSize;
-	asDWORD *vftable         = NULL;
-	int      a, s;
-
-	// convert the parameters that are < 4 bytes from little endian to big endian
-	int argDwordOffset = 0;
-	for( a = 0; a < (int)descr->parameterTypes.GetLength(); a++ )
-	{
-		int numBytes = descr->parameterTypes[a].GetSizeInMemoryBytes();
-		if( numBytes >= 4 || descr->parameterTypes[a].IsReference() || descr->parameterTypes[a].IsObjectHandle() )
-		{
-			argDwordOffset += descr->parameterTypes[a].GetSizeOnStackDWords();
-			continue;
-		}
-
-		// flip
-		asASSERT( numBytes == 1 || numBytes == 2 );
-		switch( numBytes )
-		{
-		case 1:
-			{
-				volatile asBYTE *bPtr = (asBYTE*)ARG_DW(args[argDwordOffset]);
-				asBYTE t = bPtr[0];
-				bPtr[0] = bPtr[3];
-				bPtr[3] = t;
-				t = bPtr[1];
-				bPtr[1] = bPtr[2];
-				bPtr[2] = t;
-			}
-			break;
-		case 2:
-			{
-				volatile asWORD *wPtr = (asWORD*)ARG_DW(args[argDwordOffset]);
-				asWORD t = wPtr[0];
-				wPtr[0] = wPtr[1];
-				wPtr[1] = t;
-			}
-			break;
-		}
-		argDwordOffset++;
-	}
-
-	// mark all float/double/int arguments
-	if( !sysFunc->takesObjByVal )
-	{
-		for( s = 0, a = 0; s < (int)descr->parameterTypes.GetLength(); s++, a++ )
-		{
-			if( descr->parameterTypes[s].IsFloatType() && !descr->parameterTypes[s].IsReference() )
-			{
-				argsType[a] = ppcFLOATARG;
-			}
-			else if( descr->parameterTypes[s].IsDoubleType() && !descr->parameterTypes[s].IsReference() )
-			{
-				argsType[a] = ppcDOUBLEARG;
-			}
-			else
-			{
-				argsType[a] = ppcINTARG;
-				if( descr->parameterTypes[s].GetSizeOnStackDWords() == 2 )
-				{
-					// Add an extra integer argument for the extra size
-					a++;
-					argsType[a] = ppcINTARG;
-				}
-			}
-		}
-	}
-
-	asDWORD paramBuffer[64];
-	if( sysFunc->takesObjByVal )
-	{
-		paramSize = 0;
-		int spos = 0;
-		int dpos = 1;
-
-        int a = 0;
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					argsType[a++] = ppcINTARG;
-					paramBuffer[dpos++] = args[spos++];
-					paramSize++;
-				}
-				else
-#endif
-				{
-					// TODO: Probably have to handle asOBJ_APP_FLOAT as a primitive
-
-					// Copy the object's memory to the buffer
-					memcpy( &paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes() );
-
-					// Delete the original memory
-					engine->CallFree(*(char**)(args+spos) );
-					spos++;
-					asUINT dwords = descr->parameterTypes[n].GetSizeInMemoryDWords();
-					dpos += dwords;
-					paramSize += dwords;
-					for( asUINT i = 0; i < dwords; i++ )
-						argsType[a++] = ppcINTARG;
-				}
-			}
-			else
-			{
-				// Copy the value directly
-				paramBuffer[dpos++] = args[spos++];
-				if( descr->parameterTypes[n].IsFloatType() && !descr->parameterTypes[n].IsReference() )
-					argsType[a++] = ppcFLOATARG;
-				else if( descr->parameterTypes[n].IsDoubleType() && !descr->parameterTypes[n].IsReference() )
-					argsType[a++] = ppcDOUBLEARG;
-				else
-					argsType[a++] = ppcINTARG;
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					if( !descr->parameterTypes[n].IsDoubleType() ) // Double already knows it is 2 dwords
-						argsType[a++] = ppcINTARG;
-				}
-				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-			}
-		}
-
-		// Keep a free location at the beginning
-		args = &paramBuffer[1];
-	}
-	
-	int callConv = sysFunc->callConv;
-	switch( callConv )
-	{
-	case ICC_CDECL:
-	case ICC_CDECL_RETURNINMEM:
-	case ICC_STDCALL:
-	case ICC_STDCALL_RETURNINMEM:
-		retQW = CallCDeclFunction( args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	case ICC_THISCALL:
-	case ICC_THISCALL_RETURNINMEM:
-		retQW = CallThisCallFunction(obj, args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-		// Get virtual function table from the object pointer
-		vftable = *(asDWORD**)obj;
-		retQW = CallThisCallFunction( obj, args, argsType, paramSize, vftable[asDWORD(func)>>2], retPointer );
-		break;
-	case ICC_CDECL_OBJLAST:
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-		retQW = CallThisCallFunction_objLast( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	case ICC_CDECL_OBJFIRST:
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-		retQW = CallThisCallFunction( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_PPC
-#endif // AS_MAX_PORTABILITY
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_ppc.cpp
+//
+// These functions handle the actual calling of system functions
+//
+// This version is PPC specific
+//
+
+#include <stdio.h>
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_PPC
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+#include <stdlib.h>
+
+BEGIN_AS_NAMESPACE
+
+// This part was originally written by Pecan Heber, June 2006, for
+// use on MacOS X with 32bit PPC processor. He based the code on the
+// code in as_callfunc_sh4.cpp
+
+#define AS_PPC_MAX_ARGS 32
+
+// The array used to send values to the correct places.
+// Contains a byte of argTypes to indicate the register tYpe to load
+// or zero if end of arguments
+// The +1 is for when CallThis (object methods) is used
+// Extra +1 when returning in memory
+// Extra +1 in ppcArgsType to ensure zero end-of-args marker
+
+// TODO: multithread: We need to remove these global variables for thread-safety
+
+enum argTypes { ppcENDARG, ppcINTARG, ppcFLOATARG, ppcDOUBLEARG };
+static asDWORD ppcArgs[2*AS_PPC_MAX_ARGS + 1 + 1];
+
+// Using extern "C" because we use this symbol name in the assembly code
+extern "C"
+{
+	static asBYTE ppcArgsType[2*AS_PPC_MAX_ARGS + 1 + 1 + 1];
+}
+
+// NOTE: these values are for PowerPC 32 bit. 
+#define PPC_LINKAGE_SIZE  (24)                                   // how big the PPC linkage area is in a stack frame
+#define PPC_NUM_REGSTORE  (9)                                    // how many registers of the PPC we need to store/restore for ppcFunc()
+#define PPC_REGSTORE_SIZE (4*PPC_NUM_REGSTORE)                   // how many bytes are required for register store/restore
+#define EXTRA_STACK_SIZE  (PPC_LINKAGE_SIZE + PPC_REGSTORE_SIZE) // memory required, not including parameters, for the stack frame
+#define PPC_STACK_SIZE(numParams)  (-( ( ((((numParams)<8)?8:(numParams))<<2) + EXTRA_STACK_SIZE + 15 ) & ~15 ))  // calculates the total stack size needed for ppcFunc64, must pad to 16bytes
+
+// Loads all data into the correct places and calls the function.
+// ppcArgsType is an array containing a byte type (enum argTypes) for each argument.
+// stackArgSize is the size in bytes for how much data to put on the stack frame
+extern "C" asQWORD ppcFunc(const asDWORD* argsPtr, int StackArgSize, asDWORD func);
+
+asm(" .text\n"
+	" .align 2\n"		  // align the code to 1 << 2 = 4 bytes
+	" .globl _ppcFunc\n"
+	"_ppcFunc:\n"
+
+	// We're receiving the following parameters
+	
+	// r3 : argsPtr
+	// r4 : StackArgSize
+	// r5 : func
+
+	// The following registers are used through out the function
+	
+	// r31 : the address of the label address, as reference for all other labels
+	// r30 : temporary variable
+	// r29 : arg list pointer
+	// r28 : number of FPR registers used by the parameters
+	// r27 : the function pointer that will be called
+	// r26 : the location of the parameters for the call
+	// r25 : arg type list pointer
+	// r24 : temporary variable
+	// r23 : number of GPR registers used by the parameters
+	// r1  : this is stack pointer
+	// r0  : temporary variable
+	// f0  : temporary variable
+
+	// We need to store some of the registers for restoral before returning to caller
+	
+	// lr - always stored in 8(r1) - this is the return address
+	// cr - not required to be stored, but if it is, its place is in 4(r1) - this is the condition register 
+	// r1 - always stored in 0(r1) - this is the stack pointer
+	// r11 
+	// r13 to r31 
+	// f14 to f31
+
+	// Store register values and setup our stack frame
+	" mflr  r0            \n"   // move the return address into r0
+	" stw   r0, 8(r1)     \n"   // Store the return address on the stack
+	" stmw  r23, -36(r1)  \n"   // Store registers r23 to r31 on the stack
+	" stwux r1, r1, r4    \n"   // Increase the stack with the needed space and store the original value in the destination	
+	
+	// Obtain an address that we'll use as our position of reference when obtaining addresses of other labels
+	" bl    address         \n"
+	"address:               \n"
+	" mflr  r31             \n"
+
+	// initial registers for the function
+	" mr    r29, r3       \n"   // (r29) args list
+	" mr    r27, r5       \n"   // load the function pointer to call.  func actually holds the pointer to our function
+	" addi  r26, r1, 24   \n"   // setup the pointer to the parameter area to the function we're going to call
+	" sub   r0, r0, r0    \n"   // zero out r0
+	" mr    r23, r0       \n"   // zero out r23, which holds the number of used GPR registers
+	" mr    r28, r0       \n"   // zero our r22, which holds the number of used float registers
+	
+	// load the global ppcArgsType which holds the types of arguments for each argument
+	" addis r25, r31, ha16(_ppcArgsType - address) \n" // load the upper 16 bits of the address to r25
+	" la    r25, lo16(_ppcArgsType - address)(r25) \n" // load the lower 16 bits of the address to r25
+	" subi  r25, r25, 1    \n"   // since we increment r25 on its use, we'll pre-decrement it
+
+	// loop through the arguments
+	"ppcNextArg:           \n"
+	" addi r25, r25, 1     \n"   // increment r25, our arg type pointer
+	// switch based on the current argument type (0:end, 1:int, 2:float 3:double)
+	" lbz  r24, 0(r25)     \n"   // load the current argument type (it's a byte)
+	" mulli r24, r24, 4    \n"   // our jump table has 4 bytes per case (1 instruction)
+	" addis r30, r31, ha16(ppcTypeSwitch - address) \n"   // load the address of the jump table for the switch
+	" la    r30, lo16(ppcTypeSwitch - address)(r30) \n"
+	
+	" add    r0, r30, r24  \n"   // offset by our argument type
+	" mtctr  r0            \n"   // load the jump address into CTR
+	" bctr                 \n"   // jump into the jump table/switch
+	" nop                  \n"
+	
+	// the jump table/switch based on the current argument type
+	"ppcTypeSwitch:        \n"
+	" b ppcArgsEnd         \n"
+	" b ppcArgIsInteger    \n"
+	" b ppcArgIsFloat      \n"
+	" b ppcArgIsDouble     \n"
+	
+	// when we get here we have finished processing all the arguments
+	// everything is ready to go to call the function
+	"ppcArgsEnd:           \n"
+	" mtctr r27            \n"   // the function pointer is stored in r27, load that into CTR
+	" bctrl                \n"   // call the function.  We have to do it this way so that the LR gets the proper
+	" nop                  \n"   // return value (the next instruction below).  So we have to branch from CTR instead of LR.
+	
+	// Restore registers and caller's stack frame, then return to caller
+	" lwz   r1, 0(r1)      \n"   // restore the caller's stack pointer
+	" lwz   r0, 8(r1)      \n"   // load in the caller's LR
+	" mtlr  r0             \n"   // restore the caller's LR
+	" lmw   r23, -36(r1)   \n"   // restore registers r23 to r31 from the stack
+	" blr                  \n"   // return back to the caller
+	" nop                  \n"
+	
+	// Integer argument (GPR register)
+	"ppcArgIsInteger:             \n"
+	" addis r30, r31, ha16(ppcLoadIntReg - address) \n" // load the address to the jump table for integer registers
+	" la    r30, lo16(ppcLoadIntReg - address)(r30) \n"
+	" mulli r0, r23, 8            \n"    // each item in the jump table is 2 instructions (8 bytes)
+	" add   r0, r0, r30           \n"    // calculate ppcLoadIntReg[numUsedGPRRegs]
+	" lwz   r30, 0(r29)           \n"    // load the next argument from the argument list into r30
+	" cmpwi r23, 8                \n"    // we can only load GPR3 through GPR10 (8 registers)
+	" bgt   ppcLoadIntRegUpd      \n"    // if we're beyond 8 GPR registers, we're in the stack, go there
+	" mtctr r0                    \n"    // load the address of our ppcLoadIntReg jump table (we're below 8 GPR registers)
+	" bctr                        \n"    // load the argument into a GPR register
+	" nop                         \n"
+	// jump table for GPR registers, for the first 8 GPR arguments
+	"ppcLoadIntReg:               \n"
+	" mr    r3, r30               \n"    // arg0 (to r3)
+	" b     ppcLoadIntRegUpd      \n"
+	" mr    r4, r30               \n"    // arg1 (to r4)
+	" b     ppcLoadIntRegUpd      \n"
+	" mr    r5, r30               \n"    // arg2 (to r5)
+	" b     ppcLoadIntRegUpd      \n"
+	" mr    r6, r30               \n"    // arg3 (to r6)
+	" b     ppcLoadIntRegUpd      \n"
+	" mr    r7, r30               \n"    // arg4 (to r7)
+	" b     ppcLoadIntRegUpd      \n"
+	" mr    r8, r30               \n"    // arg5 (to r8)
+	" b     ppcLoadIntRegUpd      \n"
+	" mr    r9, r30               \n"    // arg6 (to r9)
+	" b     ppcLoadIntRegUpd      \n"
+	" mr    r10, r30              \n"    // arg7 (to r10)
+	" b     ppcLoadIntRegUpd      \n"
+	// all GPR arguments still go on the stack
+	"ppcLoadIntRegUpd:            \n"
+	" stw   r30, 0(r26)           \n"    // store the argument into the next slot on the stack's argument list
+	" addi  r23, r23, 1           \n"    // count a used GPR register
+	" addi  r29, r29, 4           \n"    // move to the next argument on the list
+	" addi  r26, r26, 4           \n"    // adjust our argument stack pointer for the next
+	" b     ppcNextArg            \n"    // next argument
+
+	// single Float argument
+	"ppcArgIsFloat:\n"
+	" addis r30, r31, ha16(ppcLoadFloatReg - address) \n" // get the base address of the float register jump table
+	" la    r30, lo16(ppcLoadFloatReg - address)(r30) \n"
+	" mulli r0, r28, 8           \n"     // each jump table entry is 8 bytes
+	" add   r0, r0, r30          \n"     // calculate the offset to ppcLoadFloatReg[numUsedFloatReg]
+	" lfs   f0, 0(r29)           \n"     // load the next argument as a float into f0
+	" cmpwi r28, 13              \n"     // can't load more than 13 float/double registers
+	" bgt   ppcLoadFloatRegUpd   \n"     // if we're beyond 13 registers, just fall to inserting into the stack
+	" mtctr r0                   \n"     // jump into the float jump table
+	" bctr                       \n"
+	" nop                        \n"
+	// jump table for float registers, for the first 13 float arguments
+	"ppcLoadFloatReg:            \n"
+	" fmr   f1, f0               \n"     // arg0 (f1)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f2, f0               \n"     // arg1 (f2)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f3, f0               \n"     // arg2 (f3)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f4, f0               \n"     // arg3 (f4)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f5, f0               \n"     // arg4 (f5)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f6, f0               \n"     // arg5 (f6)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f7, f0               \n"     // arg6 (f7)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f8, f0               \n"     // arg7 (f8)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f9, f0               \n"     // arg8 (f9)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f10, f0              \n"     // arg9 (f10)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f11, f0              \n"     // arg10 (f11)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f12, f0              \n"     // arg11 (f12)
+	" b     ppcLoadFloatRegUpd   \n"
+	" fmr   f13, f0              \n"     // arg12 (f13)
+	" b     ppcLoadFloatRegUpd   \n"
+	" nop                        \n"
+	// all float arguments still go on the stack
+	"ppcLoadFloatRegUpd:         \n"
+	" stfs  f0, 0(r26)           \n"     // store, as a single float, f0 (current argument) on to the stack argument list
+	" addi  r23, r23, 1          \n"     // a float register eats up a GPR register
+	" addi  r28, r28, 1          \n"     // ...and, of course, a float register
+	" addi  r29, r29, 4          \n"     // move to the next argument in the list
+	" addi  r26, r26, 4          \n"     // move to the next stack slot
+	" b     ppcNextArg           \n"     // on to the next argument
+	" nop                        \n"
+	
+	// double Float argument
+	"ppcArgIsDouble:             \n"
+	" addis r30, r31, ha16(ppcLoadDoubleReg - address) \n" // load the base address of the jump table for double registers
+	" la    r30, lo16(ppcLoadDoubleReg - address)(r30) \n"
+	" mulli r0, r28, 8           \n"     // each slot of the jump table is 8 bytes
+	" add   r0, r0, r30          \n"     // calculate ppcLoadDoubleReg[numUsedFloatReg]
+	" lfd   f0, 0(r29)           \n"     // load the next argument, as a double float, into f0
+	" cmpwi r28, 13              \n"     // the first 13 floats must go into float registers also
+	" bgt   ppcLoadDoubleRegUpd  \n"     // if we're beyond 13, then just put on to the stack
+	" mtctr r0                   \n"     // we're under 13, first load our register
+	" bctr                       \n"     // jump into the jump table
+	" nop                        \n"
+	// jump table for float registers, for the first 13 float arguments
+	"ppcLoadDoubleReg:           \n"
+	" fmr   f1, f0               \n"     // arg0 (f1)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f2, f0               \n"     // arg1 (f2)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f3, f0               \n"     // arg2 (f3)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f4, f0               \n"     // arg3 (f4)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f5, f0               \n"     // arg4 (f5)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f6, f0               \n"     // arg5 (f6)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f7, f0               \n"     // arg6 (f7)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f8, f0               \n"     // arg7 (f8)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f9, f0               \n"     // arg8 (f9)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f10, f0              \n"     // arg9 (f10)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f11, f0              \n"     // arg10 (f11)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f12, f0              \n"     // arg11 (f12)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" fmr   f13, f0              \n"     // arg12 (f13)
+	" b     ppcLoadDoubleRegUpd  \n"
+	" nop                        \n"
+	// all float arguments still go on the stack
+	"ppcLoadDoubleRegUpd: \n"
+	" stfd  f0, 0(r26)     \n"    // store f0, as a double, into the argument list on the stack
+	" addi  r23, r23, 2   \n"     // a double float eats up two GPRs
+	" addi  r28, r28, 1   \n"     // ...and, of course, a float
+	" addi  r29, r29, 8   \n"     // increment to our next argument we need to process (8 bytes for the 64bit float)
+	" addi  r26, r26, 8   \n"     // increment to the next slot on the argument list on the stack (8 bytes)
+	" b     ppcNextArg    \n"     // on to the next argument
+	" nop                 \n"
+);
+
+asDWORD GetReturnedFloat()
+{
+	asDWORD f;
+	asm(" stfs f1, %0\n" : "=m"(f));
+	return f;
+}
+
+asQWORD GetReturnedDouble()
+{
+	asQWORD f;
+	asm(" stfd f1, %0\n" : "=m"(f));
+	return f;
+}
+
+// puts the arguments in the correct place in the stack array. See comments above.
+void stackArgs(const asDWORD *args, const asBYTE *argsType, int& numIntArgs, int& numFloatArgs, int& numDoubleArgs)
+{
+	int i;
+	int argWordPos = numIntArgs + numFloatArgs + (numDoubleArgs*2);
+	int typeOffset = numIntArgs + numFloatArgs + numDoubleArgs;
+
+	int typeIndex;
+	for( i = 0, typeIndex = 0; ; i++, typeIndex++ )
+	{
+		// store the type
+		ppcArgsType[typeOffset++] = argsType[typeIndex];
+		if( argsType[typeIndex] == ppcENDARG )
+			break;
+
+		switch( argsType[typeIndex] )
+		{
+		case ppcFLOATARG:
+			// stow float
+			ppcArgs[argWordPos] = args[i]; // it's just a bit copy
+			numFloatArgs++;
+			argWordPos++; //add one word
+			break;
+
+		case ppcDOUBLEARG:
+			// stow double
+			memcpy( &ppcArgs[argWordPos], &args[i], sizeof(double) ); // we have to do this because of alignment
+			numDoubleArgs++;
+			argWordPos+=2; //add two words
+			i++;//doubles take up 2 argument slots
+			break;
+
+		case ppcINTARG:
+			// stow register
+			ppcArgs[argWordPos] = args[i];
+			numIntArgs++;
+			argWordPos++;
+			break;
+		}
+	}
+
+	// close off the argument list (if we have max args we won't close it off until here)
+	ppcArgsType[typeOffset] = ppcENDARG;
+}
+
+static asQWORD CallCDeclFunction(const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
+{
+	int baseArgCount = 0;
+	if( retInMemory )
+	{
+		// the first argument is the 'return in memory' pointer
+		ppcArgs[0]     = (asDWORD)retInMemory;
+		ppcArgsType[0] = ppcINTARG;
+		ppcArgsType[1] = ppcENDARG;
+		baseArgCount   = 1;
+	}
+
+	// put the arguments in the correct places in the ppcArgs array
+	int numTotalArgs = baseArgCount;
+	if( argSize > 0 )
+	{
+		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0;
+		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs );
+		numTotalArgs = intArgs + floatArgs + 2*doubleArgs; // doubles occupy two slots
+	}
+	else
+	{
+		// no arguments, cap the type list
+		ppcArgsType[baseArgCount] = ppcENDARG;
+	}
+
+	// call the function with the arguments
+	return ppcFunc( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
+}
+
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the first parameter is the object (unless we are returning in memory)
+static asQWORD CallThisCallFunction(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory )
+{
+	int baseArgCount = 0;
+	if( retInMemory )
+	{
+		// the first argument is the 'return in memory' pointer
+		ppcArgs[0]     = (asDWORD)retInMemory;
+		ppcArgsType[0] = ppcINTARG;
+		ppcArgsType[1] = ppcENDARG;
+		baseArgCount = 1;
+	}
+
+	// the first argument is the 'this' of the object
+	ppcArgs[baseArgCount]       = (asDWORD)obj;
+	ppcArgsType[baseArgCount++] = ppcINTARG;
+	ppcArgsType[baseArgCount]   = ppcENDARG;
+
+	// put the arguments in the correct places in the ppcArgs array
+	int numTotalArgs = baseArgCount;
+	if( argSize > 0 )
+	{
+		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0;
+		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs );
+		numTotalArgs = intArgs + floatArgs + 2*doubleArgs; // doubles occupy two slots
+	}
+
+	// call the function with the arguments
+	return ppcFunc( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func);
+}
+
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the last parameter is the object 
+// NOTE: on PPC the order for the args is reversed
+static asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
+{
+	UNUSED_VAR(argSize);
+	int baseArgCount = 0;
+	if( retInMemory )
+	{
+		// the first argument is the 'return in memory' pointer
+		ppcArgs[0]     = (asDWORD)retInMemory;
+		ppcArgsType[0] = ppcINTARG;
+		ppcArgsType[1] = ppcENDARG;
+		baseArgCount = 1;
+	}
+
+	// stack any of the arguments
+	int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0;
+	stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs );
+	int numTotalArgs = intArgs + floatArgs + doubleArgs;
+
+	// can we fit the object in at the end?
+	if( numTotalArgs < AS_PPC_MAX_ARGS )
+	{
+		// put the object pointer at the end
+		int argPos = intArgs + floatArgs + (doubleArgs * 2);
+		ppcArgs[argPos]             = (asDWORD)obj;
+		ppcArgsType[numTotalArgs++] = ppcINTARG;
+		ppcArgsType[numTotalArgs]   = ppcENDARG;
+	}
+
+	// call the function with the arguments
+	return ppcFunc( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
+}
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
+{
+	// TODO: PPC does not yet support THISCALL_OBJFIRST/LAST
+
+	// use a working array of types, we'll configure the final one in stackArgs
+	asBYTE argsType[2*AS_PPC_MAX_ARGS + 1 + 1 + 1];
+	memset( argsType, 0, sizeof(argsType));
+
+	asCScriptEngine            *engine  = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+
+	asQWORD  retQW           = 0;
+	void    *func            = (void*)sysFunc->func;
+	int      paramSize       = sysFunc->paramSize;
+	asDWORD *vftable         = NULL;
+	int      a, s;
+
+	// convert the parameters that are < 4 bytes from little endian to big endian
+	int argDwordOffset = 0;
+	for( a = 0; a < (int)descr->parameterTypes.GetLength(); a++ )
+	{
+		int numBytes = descr->parameterTypes[a].GetSizeInMemoryBytes();
+		if( numBytes >= 4 || descr->parameterTypes[a].IsReference() || descr->parameterTypes[a].IsObjectHandle() )
+		{
+			argDwordOffset += descr->parameterTypes[a].GetSizeOnStackDWords();
+			continue;
+		}
+
+		// flip
+		asASSERT( numBytes == 1 || numBytes == 2 );
+		switch( numBytes )
+		{
+		case 1:
+			{
+				volatile asBYTE *bPtr = (asBYTE*)ARG_DW(args[argDwordOffset]);
+				asBYTE t = bPtr[0];
+				bPtr[0] = bPtr[3];
+				bPtr[3] = t;
+				t = bPtr[1];
+				bPtr[1] = bPtr[2];
+				bPtr[2] = t;
+			}
+			break;
+		case 2:
+			{
+				volatile asWORD *wPtr = (asWORD*)ARG_DW(args[argDwordOffset]);
+				asWORD t = wPtr[0];
+				wPtr[0] = wPtr[1];
+				wPtr[1] = t;
+			}
+			break;
+		}
+		argDwordOffset++;
+	}
+
+	// mark all float/double/int arguments
+	if( !sysFunc->takesObjByVal )
+	{
+		for( s = 0, a = 0; s < (int)descr->parameterTypes.GetLength(); s++, a++ )
+		{
+			if( descr->parameterTypes[s].IsFloatType() && !descr->parameterTypes[s].IsReference() )
+			{
+				argsType[a] = ppcFLOATARG;
+			}
+			else if( descr->parameterTypes[s].IsDoubleType() && !descr->parameterTypes[s].IsReference() )
+			{
+				argsType[a] = ppcDOUBLEARG;
+			}
+			else
+			{
+				argsType[a] = ppcINTARG;
+				if( descr->parameterTypes[s].GetSizeOnStackDWords() == 2 )
+				{
+					// Add an extra integer argument for the extra size
+					a++;
+					argsType[a] = ppcINTARG;
+				}
+			}
+		}
+	}
+
+	asDWORD paramBuffer[64];
+	if( sysFunc->takesObjByVal )
+	{
+		paramSize = 0;
+		int spos = 0;
+		int dpos = 1;
+
+        int a = 0;
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					argsType[a++] = ppcINTARG;
+					paramBuffer[dpos++] = args[spos++];
+					paramSize++;
+				}
+				else
+#endif
+				{
+					// TODO: Probably have to handle asOBJ_APP_FLOAT as a primitive
+
+					// Copy the object's memory to the buffer
+					memcpy( &paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes() );
+
+					// Delete the original memory
+					engine->CallFree(*(char**)(args+spos) );
+					spos++;
+					asUINT dwords = descr->parameterTypes[n].GetSizeInMemoryDWords();
+					dpos += dwords;
+					paramSize += dwords;
+					for( asUINT i = 0; i < dwords; i++ )
+						argsType[a++] = ppcINTARG;
+				}
+			}
+			else
+			{
+				// Copy the value directly
+				paramBuffer[dpos++] = args[spos++];
+				if( descr->parameterTypes[n].IsFloatType() && !descr->parameterTypes[n].IsReference() )
+					argsType[a++] = ppcFLOATARG;
+				else if( descr->parameterTypes[n].IsDoubleType() && !descr->parameterTypes[n].IsReference() )
+					argsType[a++] = ppcDOUBLEARG;
+				else
+					argsType[a++] = ppcINTARG;
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					if( !descr->parameterTypes[n].IsDoubleType() ) // Double already knows it is 2 dwords
+						argsType[a++] = ppcINTARG;
+				}
+				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+			}
+		}
+
+		// Keep a free location at the beginning
+		args = &paramBuffer[1];
+	}
+	
+	int callConv = sysFunc->callConv;
+	switch( callConv )
+	{
+	case ICC_CDECL:
+	case ICC_CDECL_RETURNINMEM:
+	case ICC_STDCALL:
+	case ICC_STDCALL_RETURNINMEM:
+		retQW = CallCDeclFunction( args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	case ICC_THISCALL:
+	case ICC_THISCALL_RETURNINMEM:
+		retQW = CallThisCallFunction(obj, args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+		// Get virtual function table from the object pointer
+		vftable = *(asDWORD**)obj;
+		retQW = CallThisCallFunction( obj, args, argsType, paramSize, vftable[asDWORD(func)>>2], retPointer );
+		break;
+	case ICC_CDECL_OBJLAST:
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+		retQW = CallThisCallFunction_objLast( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	case ICC_CDECL_OBJFIRST:
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+		retQW = CallThisCallFunction( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_PPC
+#endif // AS_MAX_PORTABILITY
+
diff --git a/Sources/AngelScript/source/as_callfunc_ppc_64.cpp b/Sources/AngelScript/source/as_callfunc_ppc_64.cpp
old mode 100755
new mode 100644
index c2fb28265..275f6152b
--- a/Sources/AngelScript/source/as_callfunc_ppc_64.cpp
+++ b/Sources/AngelScript/source/as_callfunc_ppc_64.cpp
@@ -1,768 +1,773 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc_ppc_64.cpp
-//
-// These functions handle the actual calling of system functions
-//
-// This version is 64 bit PPC specific
-//
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_PPC_64
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_tokendef.h"
-#include "as_context.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __SNC__
-#include "ppu_asm_intrinsics.h"
-#endif
-
-
-BEGIN_AS_NAMESPACE
-
-// This part was written and tested by Jeff Slutter 
-// from Reactor Zero, Abril, 2007, for PlayStation 3, which 
-// is a PowerPC 64bit based architecture. Even though it is
-// 64bit it seems the pointer size is still 32bit.
-
-// It still remains to be seen how well this code works
-// on other PPC platforms, such as XBox 360, GameCube.
-
-#define AS_PPC_MAX_ARGS 32
-
-// The array used to send values to the correct places.
-// Contains a byte of argTypes to indicate the register type to load
-//    or zero if end of arguments
-// The +1 is for when CallThis (object methods) is used
-// Extra +1 when returning in memory
-// Extra +1 in ppcArgsType to ensure zero end-of-args marker
-
-// TODO: multithread: The global variables must be removed to make the code thread safe
-
-extern "C"
-{
-	enum argTypes { ppcENDARG = 0, ppcINTARG = 1, ppcFLOATARG = 2, ppcDOUBLEARG = 3, ppcLONGARG = 4 };
-	static asBYTE ppcArgsType[AS_PPC_MAX_ARGS + 1 + 1 + 1];
-	static asDWORD ppcArgs[2*AS_PPC_MAX_ARGS + 1 + 1];
-}
-
-// NOTE: these values are for PowerPC 64 bit.  I'm sure things are different for PowerPC 32bit, but I don't have one.
-//       I'm pretty sure that PPC 32bit sets up a stack frame slightly different (only 24 bytes for linkage area for instance)
-#define PPC_LINKAGE_SIZE  (0x30)                                 // how big the PPC linkage area is in a stack frame
-#define PPC_NUM_REGSTORE  (10)                                   // how many registers of the PPC we need to store/restore for ppcFunc64()
-#define PPC_REGSTORE_SIZE (8*PPC_NUM_REGSTORE)                   // how many bytes are required for register store/restore
-#define EXTRA_STACK_SIZE  (PPC_LINKAGE_SIZE + PPC_REGSTORE_SIZE) // memory required, not including parameters, for the stack frame
-#define PPC_STACK_SIZE(numParams)  ( -(( ( (((numParams)<8)?8:(numParams))<<3) + EXTRA_STACK_SIZE + 15 ) & ~15) ) // calculates the total stack size needed for ppcFunc64, must pad to 16bytes
-
-// This is PowerPC 64 bit specific
-// Loads all data into the correct places and calls the function.
-// ppcArgsType is an array containing a byte type (enum argTypes) for each argument.
-// StackArgSizeInBytes is the size in bytes of the stack frame (takes into account linkage area, etc. must be multiple of 16)
-extern "C" asQWORD ppcFunc64(const asDWORD* argsPtr, int StackArgSizeInBytes, asDWORD func);
-asm(""
-	".text\n"
-	".align 4\n"
-	".p2align 4,,15\n"
-	".globl .ppcFunc64\n"
-	".ppcFunc64:\n"
-
-	// function prolog
-	"std %r22, -0x08(%r1)\n"  // we need a register other than r0, to store the old stack pointer
-	"mr    %r22, %r1\n"       // store the old stack pointer, for now (to make storing registers easier)
-	"stdux %r1, %r1, %r4\n"   // atomically store and update the stack pointer for the new stack frame (in case of a signal/interrupt)
-	"mflr %r0\n"              // get the caller's LR register
-	"std %r0,  0x10(%r22)\n"  // store the caller's LR register
-	"std %r23, -0x10(%r22)\n" //
-	"std %r24, -0x18(%r22)\n" //
-	"std %r25, -0x20(%r22)\n" //
-	"std %r26, -0x28(%r22)\n" //
-	"std %r27, -0x30(%r22)\n" //
-	"std %r28, -0x38(%r22)\n" //
-	"std %r29, -0x40(%r22)\n" //
-	"std %r30, -0x48(%r22)\n" //
-	"std %r31, -0x50(%r22)\n" //
-	"std %r3, 0x30(%r22)\n"   // save our parameters
-	"std %r4, 0x38(%r22)\n"   //
-	"std %r5, 0x40(%r22)\n"   //
-	"mr  %r31, %r1\n"         // functions tend to store the stack pointer here too
-
-	// initial registers for the function
-	"mr %r29, %r3\n"         // (r29) args list
-	"lwz %r27, 0(%r5)\n"     // load the function pointer to call.  func actually holds the pointer to our function
-	"addi %r26, %r1, 0x30\n" // setup the pointer to the parameter area to the function we're going to call
-	"sub %r0,%r0,%r0\n"      // zero out r0
-	"mr  %r23,%r0\n"         // zero out r23, which holds the number of used GPR registers
-	"mr  %r22,%r0\n"         // zero our r22, which holds the number of used float registers
-	
-	// load the global ppcArgsType which holds the types of arguments for each argument
-	"lis %r25, ppcArgsType@ha\n"       // load the upper 16 bits of the address to r25
-	"addi %r25, %r25, ppcArgsType@l\n" // load the lower 16 bits of the address to r25
-	"subi %r25, %r25, 1\n"             // since we increment r25 on its use, we'll pre-decrement it
-
-	// loop through the arguments
-	"ppcNextArg:\n"
-	"addi %r25, %r25, 1\n"         // increment r25, our arg type pointer
-	// switch based on the current argument type (0:end, 1:int, 2:float 3:double)
-	"lbz %r24, 0(%r25)\n"          // load the current argument type (it's a byte)
-	"mulli %r24, %r24, 4\n"        // our jump table has 4 bytes per case (1 instruction)
-	"lis %r30, ppcTypeSwitch@ha\n" // load the address of the jump table for the switch
-	"addi %r30, %r30, ppcTypeSwitch@l\n"
-	"add %r0, %r30, %r24\n"        // offset by our argument type
-	"mtctr %r0\n"                  // load the jump address into CTR
-	"bctr\n"                       // jump into the jump table/switch
-	"nop\n"
-	// the jump table/switch based on the current argument type
-	"ppcTypeSwitch:\n"
-	"b ppcArgsEnd\n"
-	"b ppcArgIsInteger\n"
-	"b ppcArgIsFloat\n"
-	"b ppcArgIsDouble\n"
-	"b ppcArgIsLong\n"
-
-	// when we get here we have finished processing all the arguments
-	// everything is ready to go to call the function
-	"ppcArgsEnd:\n"
-	"mtctr %r27\n"        // the function pointer is stored in r27, load that into CTR
-	"bctrl\n"             // call the function.  We have to do it this way so that the LR gets the proper
-	"nop\n"               // return value (the next instruction below).  So we have to branch from CTR instead of LR.
-	// when we get here, the function has returned, this is the function epilog
-	"ld %r11,0x00(%r1)\n"    // load in the caller's stack pointer
-	"ld %r0,0x10(%r11)\n"    // load in the caller's LR
-	"mtlr %r0\n"             // restore the caller's LR
-	"ld %r22, -0x08(%r11)\n" // load registers
-	"ld %r23, -0x10(%r11)\n" //
-	"ld %r24, -0x18(%r11)\n" //
-	"ld %r25, -0x20(%r11)\n" //
-	"ld %r26, -0x28(%r11)\n" //
-	"ld %r27, -0x30(%r11)\n" //
-	"ld %r28, -0x38(%r11)\n" //
-	"ld %r29, -0x40(%r11)\n" //
-	"ld %r30, -0x48(%r11)\n" //
-	"ld %r31, -0x50(%r11)\n" //
-	"mr %r1, %r11\n"         // restore the caller's SP
-	"blr\n"                  // return back to the caller
-	"nop\n"
-	// Integer argument (GPR register)
-	"ppcArgIsInteger:\n"
-	"lis %r30,ppcLoadIntReg@ha\n"  // load the address to the jump table for integer registers
-	"addi %r30, %r30, ppcLoadIntReg@l\n"
-	"mulli %r0, %r23, 8\n"         // each item in the jump table is 2 instructions (8 bytes)
-	"add %r0, %r0, %r30\n"         // calculate ppcLoadIntReg[numUsedGPRRegs]
-	"lwz %r30,0(%r29)\n"           // load the next argument from the argument list into r30
-	"cmpwi %r23, 8\n"              // we can only load GPR3 through GPR10 (8 registers)
-	"bgt ppcLoadIntRegUpd\n"       // if we're beyond 8 GPR registers, we're in the stack, go there
-	"mtctr %r0\n"                  // load the address of our ppcLoadIntReg jump table (we're below 8 GPR registers)
-	"bctr\n"                       // load the argument into a GPR register
-	"nop\n"
-	// jump table for GPR registers, for the first 8 GPR arguments
-	"ppcLoadIntReg:\n"
-	"mr %r3,%r30\n"         // arg0 (to r3)
-	"b ppcLoadIntRegUpd\n"
-	"mr %r4,%r30\n"         // arg1 (to r4)
-	"b ppcLoadIntRegUpd\n"
-	"mr %r5,%r30\n"         // arg2 (to r5)
-	"b ppcLoadIntRegUpd\n"
-	"mr %r6,%r30\n"         // arg3 (to r6)
-	"b ppcLoadIntRegUpd\n"
-	"mr %r7,%r30\n"         // arg4 (to r7)
-	"b ppcLoadIntRegUpd\n"
-	"mr %r8,%r30\n"         // arg5 (to r8)
-	"b ppcLoadIntRegUpd\n"
-	"mr %r9,%r30\n"         // arg6 (to r9)
-	"b ppcLoadIntRegUpd\n"
-	"mr %r10,%r30\n"        // arg7 (to r10)
-	"b ppcLoadIntRegUpd\n"
-
-	// all GPR arguments still go on the stack
-	"ppcLoadIntRegUpd:\n"
-	"std  %r30,0(%r26)\n"   // store the argument into the next slot on the stack's argument list
-	"addi %r23, %r23, 1\n"  // count a used GPR register
-	"addi %r29, %r29, 4\n"  // move to the next argument on the list
-	"addi %r26, %r26, 8\n"  // adjust our argument stack pointer for the next
-	"b ppcNextArg\n"        // next argument
-
-	// single Float argument
-	"ppcArgIsFloat:\n"
-	"lis %r30,ppcLoadFloatReg@ha\n"   // get the base address of the float register jump table
-	"addi %r30, %r30, ppcLoadFloatReg@l\n"
-	"mulli %r0, %r22 ,8\n"            // each jump table entry is 8 bytes
-	"add %r0, %r0, %r30\n"            // calculate the offset to ppcLoadFloatReg[numUsedFloatReg]
-	"lfs 0, 0(%r29)\n"                // load the next argument as a float into f0
-	"cmpwi %r22, 13\n"                // can't load more than 13 float/double registers
-	"bgt ppcLoadFloatRegUpd\n"        // if we're beyond 13 registers, just fall to inserting into the stack
-	"mtctr %r0\n"                     // jump into the float jump table
-	"bctr\n"
-	"nop\n"
-	// jump table for float registers, for the first 13 float arguments
-	"ppcLoadFloatReg:\n"
-	"fmr 1,0\n"                // arg0 (f1)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 2,0\n"                // arg1 (f2)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 3,0\n"                // arg2 (f3)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 4,0\n"                // arg3 (f4)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 5,0\n"                // arg4 (f5)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 6,0\n"                // arg5 (f6)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 7,0\n"                // arg6 (f7)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 8,0\n"                // arg7 (f8)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 9,0\n"                // arg8 (f9)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 10,0\n"               // arg9 (f10)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 11,0\n"               // arg10 (f11)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 12,0\n"               // arg11 (f12)
-	"b ppcLoadFloatRegUpd\n"
-	"fmr 13,0\n"               // arg12 (f13)
-	"b ppcLoadFloatRegUpd\n"
-	"nop\n"
-	// all float arguments still go on the stack
-	"ppcLoadFloatRegUpd:\n"
-	"stfs 0, 0x04(%r26)\n"     // store, as a single float, f0 (current argument) on to the stack argument list
-	"addi %r23, %r23, 1\n"     // a float register eats up a GPR register
-	"addi %r22, %r22, 1\n"     // ...and, of course, a float register
-	"addi %r29, %r29, 4\n"     // move to the next argument in the list
-	"addi %r26, %r26, 8\n"     // move to the next stack slot
-	"b ppcNextArg\n"           // on to the next argument
-	"nop\n"
-	// double Float argument
-	"ppcArgIsDouble:\n"
-	"lis %r30, ppcLoadDoubleReg@ha\n" // load the base address of the jump table for double registers
-	"addi %r30, %r30, ppcLoadDoubleReg@l\n"
-	"mulli %r0, %r22, 8\n"            // each slot of the jump table is 8 bytes
-	"add %r0, %r0, %r30\n"            // calculate ppcLoadDoubleReg[numUsedFloatReg]
-	"lfd 0, 0(%r29)\n"                // load the next argument, as a double float, into f0
-	"cmpwi %r22,13\n"                 // the first 13 floats must go into float registers also
-	"bgt ppcLoadDoubleRegUpd\n"       // if we're beyond 13, then just put on to the stack
-	"mtctr %r0\n"                     // we're under 13, first load our register
-	"bctr\n"                          // jump into the jump table
-	"nop\n"
-	// jump table for float registers, for the first 13 float arguments
-	"ppcLoadDoubleReg:\n"
-	"fmr 1,0\n"                // arg0 (f1)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 2,0\n"                // arg1 (f2)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 3,0\n"                // arg2 (f3)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 4,0\n"                // arg3 (f4)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 5,0\n"                // arg4 (f5)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 6,0\n"                // arg5 (f6)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 7,0\n"                // arg6 (f7)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 8,0\n"                // arg7 (f8)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 9,0\n"                // arg8 (f9)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 10,0\n"               // arg9 (f10)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 11,0\n"               // arg10 (f11)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 12,0\n"               // arg11 (f12)
-	"b ppcLoadDoubleRegUpd\n"
-	"fmr 13,0\n"               // arg12 (f13)
-	"b ppcLoadDoubleRegUpd\n"
-	"nop\n"
-	// all float arguments still go on the stack
-	"ppcLoadDoubleRegUpd:\n"
-	"stfd 0,0(%r26)\n"         // store f0, as a double, into the argument list on the stack
-	"addi %r23, %r23, 1\n"     // a double float eats up one GPR
-	"addi %r22, %r22, 1\n"     // ...and, of course, a float
-	"addi %r29, %r29, 8\n"     // increment to our next argument we need to process (8 bytes for the 64bit float)
-	"addi %r26, %r26, 8\n"     // increment to the next slot on the argument list on the stack (8 bytes)
-	"b ppcNextArg\n"           // on to the next argument
-	"nop\n"
-
-	// Long (64 bit int) argument
-	"ppcArgIsLong:\n"
-	"lis %r30,ppcLoadLongReg@ha\n"  // load the address to the jump table for integer64
-	"addi %r30, %r30, ppcLoadLongReg@l\n"
-	"mulli %r0, %r23, 8\n"         // each item in the jump table is 2 instructions (8 bytes)
-	"add %r0, %r0, %r30\n"         // calculate ppcLoadLongReg[numUsedGPRRegs]
-	"ld  %r30,0(%r29)\n"           // load the next argument from the argument list into r30
-	"cmpwi %r23, 8\n"              // we can only load GPR3 through GPR10 (8 registers)
-	"bgt ppcLoadLongRegUpd\n"      // if we're beyond 8 GPR registers, we're in the stack, go there
-	"mtctr %r0\n"                  // load the address of our ppcLoadLongReg jump table (we're below 8 GPR registers)
-	"bctr\n"                       // load the argument into a GPR register
-	"nop\n"
-	// jump table for GPR registers, for the first 8 GPR arguments
-	"ppcLoadLongReg:\n"
-	"mr %r3,%r30\n"         // arg0 (to r3)
-	"b ppcLoadLongRegUpd\n"
-	"mr %r4,%r30\n"         // arg1 (to r4)
-	"b ppcLoadLongRegUpd\n"
-	"mr %r5,%r30\n"         // arg2 (to r5)
-	"b ppcLoadLongRegUpd\n"
-	"mr %r6,%r30\n"         // arg3 (to r6)
-	"b ppcLoadLongRegUpd\n"
-	"mr %r7,%r30\n"         // arg4 (to r7)
-	"b ppcLoadLongRegUpd\n"
-	"mr %r8,%r30\n"         // arg5 (to r8)
-	"b ppcLoadLongRegUpd\n"
-	"mr %r9,%r30\n"         // arg6 (to r9)
-	"b ppcLoadLongRegUpd\n"
-	"mr %r10,%r30\n"        // arg7 (to r10)
-	"b ppcLoadLongRegUpd\n"
-
-	// all GPR arguments still go on the stack
-	"ppcLoadLongRegUpd:\n"
-	"std  %r30,0(%r26)\n"   // store the argument into the next slot on the stack's argument list
-	"addi %r23, %r23, 1\n"  // count a used GPR register
-	"addi %r29, %r29, 8\n"  // move to the next argument on the list
-	"addi %r26, %r26, 8\n"  // adjust our argument stack pointer for the next
-	"b ppcNextArg\n"        // next argument
-);
-
-static asDWORD GetReturnedFloat(void)
-{
-	asDWORD f;
-#ifdef __SNC__
-	__stfs( __freg(1), 0, (void*)&f);
-#else
-	asm(" stfs 1, %0\n" : "=m"(f));
-#endif
-	return f;
-}
-
-static asQWORD GetReturnedDouble(void)
-{
-	asQWORD f;
-#ifdef __SNC__
-	__stfd( __freg(1), 0, (void*)&f);
-#else
-	asm(" stfd 1, %0\n" : "=m"(f));
-#endif
-	return f;
-}
-
-// puts the arguments in the correct place in the stack array. See comments above.
-static void stackArgs( const asDWORD *args, const asBYTE *argsType, int &numIntArgs, int &numFloatArgs, int &numDoubleArgs, int &numLongArgs )
-{
-	// initialize our offset based on any already placed arguments
-	int i;
-	int argWordPos = numIntArgs + numFloatArgs + (numDoubleArgs*2) + (numLongArgs*2);
-	int typeOffset = numIntArgs + numFloatArgs + numDoubleArgs + numLongArgs;
-
-	int typeIndex;
-	for( i = 0, typeIndex = 0; ; i++, typeIndex++ )
-	{
-		// store the type
-		ppcArgsType[typeOffset++] = argsType[typeIndex];
-		if( argsType[typeIndex] == ppcENDARG )
-			break;
-
-		switch( argsType[typeIndex] )
-		{
-		case ppcFLOATARG:
-			{
-				// stow float
-				ppcArgs[argWordPos] = args[i]; // it's just a bit copy
-				numFloatArgs++;
-				argWordPos++; //add one word
-			}
-			break;
-
-		case ppcDOUBLEARG:
-			{
-				// stow double
-				memcpy( &ppcArgs[argWordPos], &args[i], sizeof(double) ); // we have to do this because of alignment
-				numDoubleArgs++;
-				argWordPos+=2; //add two words
-				i++;//doubles take up 2 argument slots
-			}
-			break;
-
-		case ppcINTARG:
-			{
-				// stow register
-				ppcArgs[argWordPos] = args[i];
-				numIntArgs++;
-				argWordPos++;
-			}
-			break;
-
-		case ppcLONGARG:
-			{
-				// stow long
-				memcpy( &ppcArgs[argWordPos], &args[i], 8 ); // for alignment purposes, we use memcpy
-				numLongArgs++;
-				argWordPos += 2; // add two words
-				i++; // longs take up 2 argument slots
-			}
-			break;
-		}
-	}
-
-	// close off the argument list (if we have max args we won't close it off until here)
-	ppcArgsType[typeOffset] = ppcENDARG;
-}
-
-static asQWORD CallCDeclFunction(const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
-{
-	int baseArgCount = 0;
-	if( retInMemory )
-	{
-		// the first argument is the 'return in memory' pointer
-		ppcArgs[0]     = (asDWORD)retInMemory;
-		ppcArgsType[0] = ppcINTARG;
-		ppcArgsType[1] = ppcENDARG;
-		baseArgCount   = 1;
-	}
-
-	// put the arguments in the correct places in the ppcArgs array
-	int numTotalArgs = baseArgCount;
-	if( argSize > 0 )
-	{
-		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0, longArgs = 0;
-		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs, longArgs );
-		numTotalArgs = intArgs + floatArgs + doubleArgs + longArgs;
-	}
-	else
-	{
-		// no arguments, cap the type list
-		ppcArgsType[baseArgCount] = ppcENDARG;
-	}
-
-	// call the function with the arguments
-	return ppcFunc64( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
-}
-
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the first parameter is the object (unless we are returning in memory)
-static asQWORD CallThisCallFunction(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory )
-{
-	int baseArgCount = 0;
-	if( retInMemory )
-	{
-		// the first argument is the 'return in memory' pointer
-		ppcArgs[0]     = (asDWORD)retInMemory;
-		ppcArgsType[0] = ppcINTARG;
-		ppcArgsType[1] = ppcENDARG;
-		baseArgCount   = 1;
-	}
-
-	// the first argument is the 'this' of the object
-	ppcArgs[baseArgCount]       = (asDWORD)obj;
-	ppcArgsType[baseArgCount++] = ppcINTARG;
-	ppcArgsType[baseArgCount]   = ppcENDARG;
-
-	// put the arguments in the correct places in the ppcArgs array
-	int numTotalArgs = baseArgCount;
-	if( argSize > 0 )
-	{
-		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0, longArgs = 0;
-		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs, longArgs );
-		numTotalArgs = intArgs + floatArgs + doubleArgs + longArgs;
-	}
-
-	// call the function with the arguments
-	return ppcFunc64( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func);
-}
-
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the last parameter is the object 
-// NOTE: on PPC the order for the args is reversed
-static asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
-{
-	UNUSED_VAR(argSize);
-	int baseArgCount = 0;
-	if( retInMemory )
-	{
-		// the first argument is the 'return in memory' pointer
-		ppcArgs[0]     = (asDWORD)retInMemory;
-		ppcArgsType[0] = ppcINTARG;
-		ppcArgsType[1] = ppcENDARG;
-		baseArgCount = 1;
-	}
-
-	// stack any of the arguments
-	int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0, longArgs = 0;
-	stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs, longArgs );
-	int numTotalArgs = intArgs + floatArgs + doubleArgs;
-
-	// can we fit the object in at the end?
-	if( numTotalArgs < AS_PPC_MAX_ARGS )
-	{
-		// put the object pointer at the end
-		int argPos = intArgs + floatArgs + (doubleArgs * 2) + (longArgs *2);
-		ppcArgs[argPos]             = (asDWORD)obj;
-		ppcArgsType[numTotalArgs++] = ppcINTARG;
-		ppcArgsType[numTotalArgs]   = ppcENDARG;
-	}
-
-	// call the function with the arguments
-	return ppcFunc64( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
-}
-
-// returns true if the given parameter is a 'variable argument'
-inline bool IsVariableArgument( asCDataType type )
-{
-	return (type.GetTokenType() == ttQuestion) ? true : false;
-}
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
-{
-	// TODO: PPC 64 does not yet support THISCALL_OBJFIRST/LAST
-
-	// use a working array of types, we'll configure the final one in stackArgs
-	asBYTE argsType[AS_PPC_MAX_ARGS + 1 + 1 + 1];
-	memset( argsType, 0, sizeof(argsType));
-
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-
-	int callConv = sysFunc->callConv;
-
-	asQWORD  retQW           = 0;
-	void    *func            = (void*)sysFunc->func;
-	int      paramSize       = sysFunc->paramSize;
-	asDWORD *vftable         = NULL;
-	int      a;
-
-	// convert the parameters that are < 4 bytes from little endian to big endian
-	int argDwordOffset = 0;
-	int totalArgumentCount = 0;
-
-	for( a = 0; a < (int)descr->parameterTypes.GetLength(); ++a )
-	{
-		// get the size for the parameter
-		int numBytes = descr->parameterTypes[a].GetSizeInMemoryBytes();
-		++totalArgumentCount;
-
-		// is this a variable argument?
-		// for variable arguments, the typeID will always follow...but we know it is 4 bytes
-		// so we can skip that parameter automatically.
-		bool isVarArg = IsVariableArgument( descr->parameterTypes[a] );
-		if( isVarArg )
-		{
-			++totalArgumentCount;
-		}
-
-		if( numBytes >= 4 || descr->parameterTypes[a].IsReference() || descr->parameterTypes[a].IsObjectHandle() )
-		{
-			// DWORD or larger parameter --- no flipping needed
-			argDwordOffset += descr->parameterTypes[a].GetSizeOnStackDWords();
-		}
-		else
-		{
-			// flip
-			asASSERT( numBytes == 1 || numBytes == 2 );
-			switch( numBytes )
-			{
-			case 1:
-				{
-					volatile asBYTE *bPtr = (asBYTE*)ARG_DW(args[argDwordOffset]);
-					asBYTE t = bPtr[0];
-					bPtr[0] = bPtr[3];
-					bPtr[3] = t;
-					t = bPtr[1];
-					bPtr[1] = bPtr[2];
-					bPtr[2] = t;
-				}
-				break;
-			case 2:
-				{
-					volatile asWORD *wPtr = (asWORD*)ARG_DW(args[argDwordOffset]);
-					asWORD t = wPtr[0];
-					wPtr[0] = wPtr[1];
-					wPtr[1] = t;
-				}
-				break;
-			}
-			++argDwordOffset;
-		}
-
-		if( isVarArg )
-		{
-			// skip the implicit typeID
-			++argDwordOffset;
-		}
-	}
-
-	asASSERT( totalArgumentCount <= AS_PPC_MAX_ARGS );
-
-	// mark all float/double/int arguments
-	int argIndex = 0;
-	for( a = 0; a < (int)descr->parameterTypes.GetLength(); ++a, ++argIndex )
-	{
-		// get the base type
-		argsType[argIndex] = ppcINTARG;
-		if( descr->parameterTypes[a].IsFloatType() && !descr->parameterTypes[a].IsReference() )
-		{
-			argsType[argIndex] = ppcFLOATARG;
-		}
-		if( descr->parameterTypes[a].IsDoubleType() && !descr->parameterTypes[a].IsReference() )
-		{
-			argsType[argIndex] = ppcDOUBLEARG;
-		}
-		if( descr->parameterTypes[a].GetSizeOnStackDWords() == 2 && !descr->parameterTypes[a].IsDoubleType() && !descr->parameterTypes[a].IsReference() )
-		{
-			argsType[argIndex] = ppcLONGARG;
-		}
-
-		// if it is a variable argument, account for the typeID
-		if( IsVariableArgument(descr->parameterTypes[a]) )
-		{
-			// implicitly add another parameter (AFTER the parameter above), for the TypeID
-			argsType[++argIndex] = ppcINTARG;
-		}
-	}
-	asASSERT( argIndex == totalArgumentCount );
-
-	asDWORD paramBuffer[64];
-	if( sysFunc->takesObjByVal )
-	{
-		paramSize = 0;
-		int spos = 0;
-		int dpos = 1;
-
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
-				!(descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_ARRAY) )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					++paramSize;
-				}
-				else
-#endif
-				{
-					// NOTE: we may have to do endian flipping here
-
-					// Copy the object's memory to the buffer
-					memcpy( &paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes() );
-
-					// Delete the original memory
-					engine->CallFree( *(char**)(args+spos) );
-					spos++;
-					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
-				}
-			}
-			else
-			{
-				// Copy the value directly
-				paramBuffer[dpos++] = args[spos++];
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-				{
-					paramBuffer[dpos++] = args[spos++];
-				}
-				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-			}
-
-			// if this was a variable argument parameter, then account for the implicit typeID
-			if( IsVariableArgument( descr->parameterTypes[n] ) )
-			{
-				// the TypeID is just a DWORD
-				paramBuffer[dpos++] = args[spos++];
-				++paramSize;
-			}
-		}
-
-		// Keep a free location at the beginning
-		args = &paramBuffer[1];
-	}
-	
-	// one last verification to make sure things are how we expect
-	switch( callConv )
-	{
-	case ICC_CDECL:
-	case ICC_CDECL_RETURNINMEM:
-	case ICC_STDCALL:
-	case ICC_STDCALL_RETURNINMEM:
-		retQW = CallCDeclFunction( args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	case ICC_THISCALL:
-	case ICC_THISCALL_RETURNINMEM:
-		retQW = CallThisCallFunction(obj, args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-		// Get virtual function table from the object pointer
-		vftable = *(asDWORD**)obj;
-		retQW = CallThisCallFunction( obj, args, argsType, paramSize, vftable[asDWORD(func)>>2], retPointer );
-		break;
-	case ICC_CDECL_OBJLAST:
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-		retQW = CallThisCallFunction_objLast( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	case ICC_CDECL_OBJFIRST:
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-		retQW = CallThisCallFunction( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
-		break;
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	if( sysFunc->hostReturnFloat )
-	{
-		// If the return is a float value we need to get the value from the FP register
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-	else if( sysFunc->hostReturnSize == 1 )
-	{
-		// Move the bits to the higher value to compensate for the adjustment that the caller does
-		retQW <<= 32;
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_PPC_64
-#endif // AS_MAX_PORTABILITY
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2016 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_ppc_64.cpp
+//
+// These functions handle the actual calling of system functions
+//
+// This version is 64 bit PPC specific
+//
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_PPC_64
+#if AS_PTR_SIZE == 2
+// TODO: Add support for PPC 64bit platforms with 64bit pointers, for example Linux PPC64 (big endian) and PPC64 (little endian)
+#error This code has not been prepared for PPC with 64bit pointers. Most likely the ABI is different
+#else
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef __SNC__
+#include "ppu_asm_intrinsics.h"
+#endif
+
+
+BEGIN_AS_NAMESPACE
+
+// This part was written and tested by Jeff Slutter 
+// from Reactor Zero, Abril, 2007, for PlayStation 3, which 
+// is a PowerPC 64bit based architecture. Even though it is
+// 64bit it seems the pointer size is still 32bit.
+
+// It still remains to be seen how well this code works
+// on other PPC platforms, such as XBox 360, GameCube.
+
+#define AS_PPC_MAX_ARGS 32
+
+// The array used to send values to the correct places.
+// Contains a byte of argTypes to indicate the register type to load
+//    or zero if end of arguments
+// The +1 is for when CallThis (object methods) is used
+// Extra +1 when returning in memory
+// Extra +1 in ppcArgsType to ensure zero end-of-args marker
+
+// TODO: multithread: The global variables must be removed to make the code thread safe
+
+extern "C"
+{
+	enum argTypes { ppcENDARG = 0, ppcINTARG = 1, ppcFLOATARG = 2, ppcDOUBLEARG = 3, ppcLONGARG = 4 };
+	static asBYTE ppcArgsType[AS_PPC_MAX_ARGS + 1 + 1 + 1];
+	static asDWORD ppcArgs[2*AS_PPC_MAX_ARGS + 1 + 1];
+}
+
+// NOTE: these values are for PowerPC 64 bit.  I'm sure things are different for PowerPC 32bit, but I don't have one.
+//       I'm pretty sure that PPC 32bit sets up a stack frame slightly different (only 24 bytes for linkage area for instance)
+#define PPC_LINKAGE_SIZE  (0x30)                                 // how big the PPC linkage area is in a stack frame
+#define PPC_NUM_REGSTORE  (10)                                   // how many registers of the PPC we need to store/restore for ppcFunc64()
+#define PPC_REGSTORE_SIZE (8*PPC_NUM_REGSTORE)                   // how many bytes are required for register store/restore
+#define EXTRA_STACK_SIZE  (PPC_LINKAGE_SIZE + PPC_REGSTORE_SIZE) // memory required, not including parameters, for the stack frame
+#define PPC_STACK_SIZE(numParams)  ( -(( ( (((numParams)<8)?8:(numParams))<<3) + EXTRA_STACK_SIZE + 15 ) & ~15) ) // calculates the total stack size needed for ppcFunc64, must pad to 16bytes
+
+// This is PowerPC 64 bit specific
+// Loads all data into the correct places and calls the function.
+// ppcArgsType is an array containing a byte type (enum argTypes) for each argument.
+// StackArgSizeInBytes is the size in bytes of the stack frame (takes into account linkage area, etc. must be multiple of 16)
+extern "C" asQWORD ppcFunc64(const asDWORD* argsPtr, int StackArgSizeInBytes, asDWORD func);
+asm(""
+	".text\n"
+	".align 4\n"
+	".p2align 4,,15\n"
+	".globl .ppcFunc64\n"
+	".ppcFunc64:\n"
+
+	// function prolog
+	"std %r22, -0x08(%r1)\n"  // we need a register other than r0, to store the old stack pointer
+	"mr    %r22, %r1\n"       // store the old stack pointer, for now (to make storing registers easier)
+	"stdux %r1, %r1, %r4\n"   // atomically store and update the stack pointer for the new stack frame (in case of a signal/interrupt)
+	"mflr %r0\n"              // get the caller's LR register
+	"std %r0,  0x10(%r22)\n"  // store the caller's LR register
+	"std %r23, -0x10(%r22)\n" //
+	"std %r24, -0x18(%r22)\n" //
+	"std %r25, -0x20(%r22)\n" //
+	"std %r26, -0x28(%r22)\n" //
+	"std %r27, -0x30(%r22)\n" //
+	"std %r28, -0x38(%r22)\n" //
+	"std %r29, -0x40(%r22)\n" //
+	"std %r30, -0x48(%r22)\n" //
+	"std %r31, -0x50(%r22)\n" //
+	"std %r3, 0x30(%r22)\n"   // save our parameters
+	"std %r4, 0x38(%r22)\n"   //
+	"std %r5, 0x40(%r22)\n"   //
+	"mr  %r31, %r1\n"         // functions tend to store the stack pointer here too
+
+	// initial registers for the function
+	"mr %r29, %r3\n"         // (r29) args list
+	"lwz %r27, 0(%r5)\n"     // load the function pointer to call.  func actually holds the pointer to our function
+	"addi %r26, %r1, 0x30\n" // setup the pointer to the parameter area to the function we're going to call
+	"sub %r0,%r0,%r0\n"      // zero out r0
+	"mr  %r23,%r0\n"         // zero out r23, which holds the number of used GPR registers
+	"mr  %r22,%r0\n"         // zero our r22, which holds the number of used float registers
+	
+	// load the global ppcArgsType which holds the types of arguments for each argument
+	"lis %r25, ppcArgsType@ha\n"       // load the upper 16 bits of the address to r25
+	"addi %r25, %r25, ppcArgsType@l\n" // load the lower 16 bits of the address to r25
+	"subi %r25, %r25, 1\n"             // since we increment r25 on its use, we'll pre-decrement it
+
+	// loop through the arguments
+	"ppcNextArg:\n"
+	"addi %r25, %r25, 1\n"         // increment r25, our arg type pointer
+	// switch based on the current argument type (0:end, 1:int, 2:float 3:double)
+	"lbz %r24, 0(%r25)\n"          // load the current argument type (it's a byte)
+	"mulli %r24, %r24, 4\n"        // our jump table has 4 bytes per case (1 instruction)
+	"lis %r30, ppcTypeSwitch@ha\n" // load the address of the jump table for the switch
+	"addi %r30, %r30, ppcTypeSwitch@l\n"
+	"add %r0, %r30, %r24\n"        // offset by our argument type
+	"mtctr %r0\n"                  // load the jump address into CTR
+	"bctr\n"                       // jump into the jump table/switch
+	"nop\n"
+	// the jump table/switch based on the current argument type
+	"ppcTypeSwitch:\n"
+	"b ppcArgsEnd\n"
+	"b ppcArgIsInteger\n"
+	"b ppcArgIsFloat\n"
+	"b ppcArgIsDouble\n"
+	"b ppcArgIsLong\n"
+
+	// when we get here we have finished processing all the arguments
+	// everything is ready to go to call the function
+	"ppcArgsEnd:\n"
+	"mtctr %r27\n"        // the function pointer is stored in r27, load that into CTR
+	"bctrl\n"             // call the function.  We have to do it this way so that the LR gets the proper
+	"nop\n"               // return value (the next instruction below).  So we have to branch from CTR instead of LR.
+	// when we get here, the function has returned, this is the function epilog
+	"ld %r11,0x00(%r1)\n"    // load in the caller's stack pointer
+	"ld %r0,0x10(%r11)\n"    // load in the caller's LR
+	"mtlr %r0\n"             // restore the caller's LR
+	"ld %r22, -0x08(%r11)\n" // load registers
+	"ld %r23, -0x10(%r11)\n" //
+	"ld %r24, -0x18(%r11)\n" //
+	"ld %r25, -0x20(%r11)\n" //
+	"ld %r26, -0x28(%r11)\n" //
+	"ld %r27, -0x30(%r11)\n" //
+	"ld %r28, -0x38(%r11)\n" //
+	"ld %r29, -0x40(%r11)\n" //
+	"ld %r30, -0x48(%r11)\n" //
+	"ld %r31, -0x50(%r11)\n" //
+	"mr %r1, %r11\n"         // restore the caller's SP
+	"blr\n"                  // return back to the caller
+	"nop\n"
+	// Integer argument (GPR register)
+	"ppcArgIsInteger:\n"
+	"lis %r30,ppcLoadIntReg@ha\n"  // load the address to the jump table for integer registers
+	"addi %r30, %r30, ppcLoadIntReg@l\n"
+	"mulli %r0, %r23, 8\n"         // each item in the jump table is 2 instructions (8 bytes)
+	"add %r0, %r0, %r30\n"         // calculate ppcLoadIntReg[numUsedGPRRegs]
+	"lwz %r30,0(%r29)\n"           // load the next argument from the argument list into r30
+	"cmpwi %r23, 8\n"              // we can only load GPR3 through GPR10 (8 registers)
+	"bgt ppcLoadIntRegUpd\n"       // if we're beyond 8 GPR registers, we're in the stack, go there
+	"mtctr %r0\n"                  // load the address of our ppcLoadIntReg jump table (we're below 8 GPR registers)
+	"bctr\n"                       // load the argument into a GPR register
+	"nop\n"
+	// jump table for GPR registers, for the first 8 GPR arguments
+	"ppcLoadIntReg:\n"
+	"mr %r3,%r30\n"         // arg0 (to r3)
+	"b ppcLoadIntRegUpd\n"
+	"mr %r4,%r30\n"         // arg1 (to r4)
+	"b ppcLoadIntRegUpd\n"
+	"mr %r5,%r30\n"         // arg2 (to r5)
+	"b ppcLoadIntRegUpd\n"
+	"mr %r6,%r30\n"         // arg3 (to r6)
+	"b ppcLoadIntRegUpd\n"
+	"mr %r7,%r30\n"         // arg4 (to r7)
+	"b ppcLoadIntRegUpd\n"
+	"mr %r8,%r30\n"         // arg5 (to r8)
+	"b ppcLoadIntRegUpd\n"
+	"mr %r9,%r30\n"         // arg6 (to r9)
+	"b ppcLoadIntRegUpd\n"
+	"mr %r10,%r30\n"        // arg7 (to r10)
+	"b ppcLoadIntRegUpd\n"
+
+	// all GPR arguments still go on the stack
+	"ppcLoadIntRegUpd:\n"
+	"std  %r30,0(%r26)\n"   // store the argument into the next slot on the stack's argument list
+	"addi %r23, %r23, 1\n"  // count a used GPR register
+	"addi %r29, %r29, 4\n"  // move to the next argument on the list
+	"addi %r26, %r26, 8\n"  // adjust our argument stack pointer for the next
+	"b ppcNextArg\n"        // next argument
+
+	// single Float argument
+	"ppcArgIsFloat:\n"
+	"lis %r30,ppcLoadFloatReg@ha\n"   // get the base address of the float register jump table
+	"addi %r30, %r30, ppcLoadFloatReg@l\n"
+	"mulli %r0, %r22 ,8\n"            // each jump table entry is 8 bytes
+	"add %r0, %r0, %r30\n"            // calculate the offset to ppcLoadFloatReg[numUsedFloatReg]
+	"lfs 0, 0(%r29)\n"                // load the next argument as a float into f0
+	"cmpwi %r22, 13\n"                // can't load more than 13 float/double registers
+	"bgt ppcLoadFloatRegUpd\n"        // if we're beyond 13 registers, just fall to inserting into the stack
+	"mtctr %r0\n"                     // jump into the float jump table
+	"bctr\n"
+	"nop\n"
+	// jump table for float registers, for the first 13 float arguments
+	"ppcLoadFloatReg:\n"
+	"fmr 1,0\n"                // arg0 (f1)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 2,0\n"                // arg1 (f2)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 3,0\n"                // arg2 (f3)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 4,0\n"                // arg3 (f4)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 5,0\n"                // arg4 (f5)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 6,0\n"                // arg5 (f6)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 7,0\n"                // arg6 (f7)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 8,0\n"                // arg7 (f8)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 9,0\n"                // arg8 (f9)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 10,0\n"               // arg9 (f10)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 11,0\n"               // arg10 (f11)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 12,0\n"               // arg11 (f12)
+	"b ppcLoadFloatRegUpd\n"
+	"fmr 13,0\n"               // arg12 (f13)
+	"b ppcLoadFloatRegUpd\n"
+	"nop\n"
+	// all float arguments still go on the stack
+	"ppcLoadFloatRegUpd:\n"
+	"stfs 0, 0x04(%r26)\n"     // store, as a single float, f0 (current argument) on to the stack argument list
+	"addi %r23, %r23, 1\n"     // a float register eats up a GPR register
+	"addi %r22, %r22, 1\n"     // ...and, of course, a float register
+	"addi %r29, %r29, 4\n"     // move to the next argument in the list
+	"addi %r26, %r26, 8\n"     // move to the next stack slot
+	"b ppcNextArg\n"           // on to the next argument
+	"nop\n"
+	// double Float argument
+	"ppcArgIsDouble:\n"
+	"lis %r30, ppcLoadDoubleReg@ha\n" // load the base address of the jump table for double registers
+	"addi %r30, %r30, ppcLoadDoubleReg@l\n"
+	"mulli %r0, %r22, 8\n"            // each slot of the jump table is 8 bytes
+	"add %r0, %r0, %r30\n"            // calculate ppcLoadDoubleReg[numUsedFloatReg]
+	"lfd 0, 0(%r29)\n"                // load the next argument, as a double float, into f0
+	"cmpwi %r22,13\n"                 // the first 13 floats must go into float registers also
+	"bgt ppcLoadDoubleRegUpd\n"       // if we're beyond 13, then just put on to the stack
+	"mtctr %r0\n"                     // we're under 13, first load our register
+	"bctr\n"                          // jump into the jump table
+	"nop\n"
+	// jump table for float registers, for the first 13 float arguments
+	"ppcLoadDoubleReg:\n"
+	"fmr 1,0\n"                // arg0 (f1)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 2,0\n"                // arg1 (f2)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 3,0\n"                // arg2 (f3)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 4,0\n"                // arg3 (f4)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 5,0\n"                // arg4 (f5)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 6,0\n"                // arg5 (f6)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 7,0\n"                // arg6 (f7)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 8,0\n"                // arg7 (f8)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 9,0\n"                // arg8 (f9)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 10,0\n"               // arg9 (f10)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 11,0\n"               // arg10 (f11)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 12,0\n"               // arg11 (f12)
+	"b ppcLoadDoubleRegUpd\n"
+	"fmr 13,0\n"               // arg12 (f13)
+	"b ppcLoadDoubleRegUpd\n"
+	"nop\n"
+	// all float arguments still go on the stack
+	"ppcLoadDoubleRegUpd:\n"
+	"stfd 0,0(%r26)\n"         // store f0, as a double, into the argument list on the stack
+	"addi %r23, %r23, 1\n"     // a double float eats up one GPR
+	"addi %r22, %r22, 1\n"     // ...and, of course, a float
+	"addi %r29, %r29, 8\n"     // increment to our next argument we need to process (8 bytes for the 64bit float)
+	"addi %r26, %r26, 8\n"     // increment to the next slot on the argument list on the stack (8 bytes)
+	"b ppcNextArg\n"           // on to the next argument
+	"nop\n"
+
+	// Long (64 bit int) argument
+	"ppcArgIsLong:\n"
+	"lis %r30,ppcLoadLongReg@ha\n"  // load the address to the jump table for integer64
+	"addi %r30, %r30, ppcLoadLongReg@l\n"
+	"mulli %r0, %r23, 8\n"         // each item in the jump table is 2 instructions (8 bytes)
+	"add %r0, %r0, %r30\n"         // calculate ppcLoadLongReg[numUsedGPRRegs]
+	"ld  %r30,0(%r29)\n"           // load the next argument from the argument list into r30
+	"cmpwi %r23, 8\n"              // we can only load GPR3 through GPR10 (8 registers)
+	"bgt ppcLoadLongRegUpd\n"      // if we're beyond 8 GPR registers, we're in the stack, go there
+	"mtctr %r0\n"                  // load the address of our ppcLoadLongReg jump table (we're below 8 GPR registers)
+	"bctr\n"                       // load the argument into a GPR register
+	"nop\n"
+	// jump table for GPR registers, for the first 8 GPR arguments
+	"ppcLoadLongReg:\n"
+	"mr %r3,%r30\n"         // arg0 (to r3)
+	"b ppcLoadLongRegUpd\n"
+	"mr %r4,%r30\n"         // arg1 (to r4)
+	"b ppcLoadLongRegUpd\n"
+	"mr %r5,%r30\n"         // arg2 (to r5)
+	"b ppcLoadLongRegUpd\n"
+	"mr %r6,%r30\n"         // arg3 (to r6)
+	"b ppcLoadLongRegUpd\n"
+	"mr %r7,%r30\n"         // arg4 (to r7)
+	"b ppcLoadLongRegUpd\n"
+	"mr %r8,%r30\n"         // arg5 (to r8)
+	"b ppcLoadLongRegUpd\n"
+	"mr %r9,%r30\n"         // arg6 (to r9)
+	"b ppcLoadLongRegUpd\n"
+	"mr %r10,%r30\n"        // arg7 (to r10)
+	"b ppcLoadLongRegUpd\n"
+
+	// all GPR arguments still go on the stack
+	"ppcLoadLongRegUpd:\n"
+	"std  %r30,0(%r26)\n"   // store the argument into the next slot on the stack's argument list
+	"addi %r23, %r23, 1\n"  // count a used GPR register
+	"addi %r29, %r29, 8\n"  // move to the next argument on the list
+	"addi %r26, %r26, 8\n"  // adjust our argument stack pointer for the next
+	"b ppcNextArg\n"        // next argument
+);
+
+static asDWORD GetReturnedFloat(void)
+{
+	asDWORD f;
+#ifdef __SNC__
+	__stfs( __freg(1), 0, (void*)&f);
+#else
+	asm(" stfs 1, %0\n" : "=m"(f));
+#endif
+	return f;
+}
+
+static asQWORD GetReturnedDouble(void)
+{
+	asQWORD f;
+#ifdef __SNC__
+	__stfd( __freg(1), 0, (void*)&f);
+#else
+	asm(" stfd 1, %0\n" : "=m"(f));
+#endif
+	return f;
+}
+
+// puts the arguments in the correct place in the stack array. See comments above.
+static void stackArgs( const asDWORD *args, const asBYTE *argsType, int &numIntArgs, int &numFloatArgs, int &numDoubleArgs, int &numLongArgs )
+{
+	// initialize our offset based on any already placed arguments
+	int i;
+	int argWordPos = numIntArgs + numFloatArgs + (numDoubleArgs*2) + (numLongArgs*2);
+	int typeOffset = numIntArgs + numFloatArgs + numDoubleArgs + numLongArgs;
+
+	int typeIndex;
+	for( i = 0, typeIndex = 0; ; i++, typeIndex++ )
+	{
+		// store the type
+		ppcArgsType[typeOffset++] = argsType[typeIndex];
+		if( argsType[typeIndex] == ppcENDARG )
+			break;
+
+		switch( argsType[typeIndex] )
+		{
+		case ppcFLOATARG:
+			{
+				// stow float
+				ppcArgs[argWordPos] = args[i]; // it's just a bit copy
+				numFloatArgs++;
+				argWordPos++; //add one word
+			}
+			break;
+
+		case ppcDOUBLEARG:
+			{
+				// stow double
+				memcpy( &ppcArgs[argWordPos], &args[i], sizeof(double) ); // we have to do this because of alignment
+				numDoubleArgs++;
+				argWordPos+=2; //add two words
+				i++;//doubles take up 2 argument slots
+			}
+			break;
+
+		case ppcINTARG:
+			{
+				// stow register
+				ppcArgs[argWordPos] = args[i];
+				numIntArgs++;
+				argWordPos++;
+			}
+			break;
+
+		case ppcLONGARG:
+			{
+				// stow long
+				memcpy( &ppcArgs[argWordPos], &args[i], 8 ); // for alignment purposes, we use memcpy
+				numLongArgs++;
+				argWordPos += 2; // add two words
+				i++; // longs take up 2 argument slots
+			}
+			break;
+		}
+	}
+
+	// close off the argument list (if we have max args we won't close it off until here)
+	ppcArgsType[typeOffset] = ppcENDARG;
+}
+
+static asQWORD CallCDeclFunction(const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
+{
+	int baseArgCount = 0;
+	if( retInMemory )
+	{
+		// the first argument is the 'return in memory' pointer
+		ppcArgs[0]     = (asDWORD)retInMemory;
+		ppcArgsType[0] = ppcINTARG;
+		ppcArgsType[1] = ppcENDARG;
+		baseArgCount   = 1;
+	}
+
+	// put the arguments in the correct places in the ppcArgs array
+	int numTotalArgs = baseArgCount;
+	if( argSize > 0 )
+	{
+		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0, longArgs = 0;
+		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs, longArgs );
+		numTotalArgs = intArgs + floatArgs + doubleArgs + longArgs;
+	}
+	else
+	{
+		// no arguments, cap the type list
+		ppcArgsType[baseArgCount] = ppcENDARG;
+	}
+
+	// call the function with the arguments
+	return ppcFunc64( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
+}
+
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the first parameter is the object (unless we are returning in memory)
+static asQWORD CallThisCallFunction(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory )
+{
+	int baseArgCount = 0;
+	if( retInMemory )
+	{
+		// the first argument is the 'return in memory' pointer
+		ppcArgs[0]     = (asDWORD)retInMemory;
+		ppcArgsType[0] = ppcINTARG;
+		ppcArgsType[1] = ppcENDARG;
+		baseArgCount   = 1;
+	}
+
+	// the first argument is the 'this' of the object
+	ppcArgs[baseArgCount]       = (asDWORD)obj;
+	ppcArgsType[baseArgCount++] = ppcINTARG;
+	ppcArgsType[baseArgCount]   = ppcENDARG;
+
+	// put the arguments in the correct places in the ppcArgs array
+	int numTotalArgs = baseArgCount;
+	if( argSize > 0 )
+	{
+		int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0, longArgs = 0;
+		stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs, longArgs );
+		numTotalArgs = intArgs + floatArgs + doubleArgs + longArgs;
+	}
+
+	// call the function with the arguments
+	return ppcFunc64( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func);
+}
+
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the last parameter is the object 
+// NOTE: on PPC the order for the args is reversed
+static asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD* pArgs, const asBYTE *pArgsType, int argSize, asDWORD func, void *retInMemory)
+{
+	UNUSED_VAR(argSize);
+	int baseArgCount = 0;
+	if( retInMemory )
+	{
+		// the first argument is the 'return in memory' pointer
+		ppcArgs[0]     = (asDWORD)retInMemory;
+		ppcArgsType[0] = ppcINTARG;
+		ppcArgsType[1] = ppcENDARG;
+		baseArgCount = 1;
+	}
+
+	// stack any of the arguments
+	int intArgs = baseArgCount, floatArgs = 0, doubleArgs = 0, longArgs = 0;
+	stackArgs( pArgs, pArgsType, intArgs, floatArgs, doubleArgs, longArgs );
+	int numTotalArgs = intArgs + floatArgs + doubleArgs;
+
+	// can we fit the object in at the end?
+	if( numTotalArgs < AS_PPC_MAX_ARGS )
+	{
+		// put the object pointer at the end
+		int argPos = intArgs + floatArgs + (doubleArgs * 2) + (longArgs *2);
+		ppcArgs[argPos]             = (asDWORD)obj;
+		ppcArgsType[numTotalArgs++] = ppcINTARG;
+		ppcArgsType[numTotalArgs]   = ppcENDARG;
+	}
+
+	// call the function with the arguments
+	return ppcFunc64( ppcArgs, PPC_STACK_SIZE(numTotalArgs), func );
+}
+
+// returns true if the given parameter is a 'variable argument'
+inline bool IsVariableArgument( asCDataType type )
+{
+	return (type.GetTokenType() == ttQuestion) ? true : false;
+}
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
+{
+	// TODO: PPC 64 does not yet support THISCALL_OBJFIRST/LAST
+
+	// use a working array of types, we'll configure the final one in stackArgs
+	asBYTE argsType[AS_PPC_MAX_ARGS + 1 + 1 + 1];
+	memset( argsType, 0, sizeof(argsType));
+
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+
+	int callConv = sysFunc->callConv;
+
+	asQWORD  retQW           = 0;
+	void    *func            = (void*)sysFunc->func;
+	int      paramSize       = sysFunc->paramSize;
+	asDWORD *vftable         = NULL;
+	int      a;
+
+	// convert the parameters that are < 4 bytes from little endian to big endian
+	int argDwordOffset = 0;
+	int totalArgumentCount = 0;
+
+	for( a = 0; a < (int)descr->parameterTypes.GetLength(); ++a )
+	{
+		// get the size for the parameter
+		int numBytes = descr->parameterTypes[a].GetSizeInMemoryBytes();
+		++totalArgumentCount;
+
+		// is this a variable argument?
+		// for variable arguments, the typeID will always follow...but we know it is 4 bytes
+		// so we can skip that parameter automatically.
+		bool isVarArg = IsVariableArgument( descr->parameterTypes[a] );
+		if( isVarArg )
+		{
+			++totalArgumentCount;
+		}
+
+		if( numBytes >= 4 || descr->parameterTypes[a].IsReference() || descr->parameterTypes[a].IsObjectHandle() )
+		{
+			// DWORD or larger parameter --- no flipping needed
+			argDwordOffset += descr->parameterTypes[a].GetSizeOnStackDWords();
+		}
+		else
+		{
+			// flip
+			asASSERT( numBytes == 1 || numBytes == 2 );
+			switch( numBytes )
+			{
+			case 1:
+				{
+					volatile asBYTE *bPtr = (asBYTE*)ARG_DW(args[argDwordOffset]);
+					asBYTE t = bPtr[0];
+					bPtr[0] = bPtr[3];
+					bPtr[3] = t;
+					t = bPtr[1];
+					bPtr[1] = bPtr[2];
+					bPtr[2] = t;
+				}
+				break;
+			case 2:
+				{
+					volatile asWORD *wPtr = (asWORD*)ARG_DW(args[argDwordOffset]);
+					asWORD t = wPtr[0];
+					wPtr[0] = wPtr[1];
+					wPtr[1] = t;
+				}
+				break;
+			}
+			++argDwordOffset;
+		}
+
+		if( isVarArg )
+		{
+			// skip the implicit typeID
+			++argDwordOffset;
+		}
+	}
+
+	asASSERT( totalArgumentCount <= AS_PPC_MAX_ARGS );
+
+	// mark all float/double/int arguments
+	int argIndex = 0;
+	for( a = 0; a < (int)descr->parameterTypes.GetLength(); ++a, ++argIndex )
+	{
+		// get the base type
+		argsType[argIndex] = ppcINTARG;
+		if( descr->parameterTypes[a].IsFloatType() && !descr->parameterTypes[a].IsReference() )
+		{
+			argsType[argIndex] = ppcFLOATARG;
+		}
+		if( descr->parameterTypes[a].IsDoubleType() && !descr->parameterTypes[a].IsReference() )
+		{
+			argsType[argIndex] = ppcDOUBLEARG;
+		}
+		if( descr->parameterTypes[a].GetSizeOnStackDWords() == 2 && !descr->parameterTypes[a].IsDoubleType() && !descr->parameterTypes[a].IsReference() )
+		{
+			argsType[argIndex] = ppcLONGARG;
+		}
+
+		// if it is a variable argument, account for the typeID
+		if( IsVariableArgument(descr->parameterTypes[a]) )
+		{
+			// implicitly add another parameter (AFTER the parameter above), for the TypeID
+			argsType[++argIndex] = ppcINTARG;
+		}
+	}
+	asASSERT( argIndex == totalArgumentCount );
+
+	asDWORD paramBuffer[64];
+	if( sysFunc->takesObjByVal )
+	{
+		paramSize = 0;
+		int spos = 0;
+		int dpos = 1;
+
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() &&
+				!(descr->parameterTypes[n].GetTypeInfo()->flags & asOBJ_APP_ARRAY) )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					++paramSize;
+				}
+				else
+#endif
+				{
+					// NOTE: we may have to do endian flipping here
+
+					// Copy the object's memory to the buffer
+					memcpy( &paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes() );
+
+					// Delete the original memory
+					engine->CallFree( *(char**)(args+spos) );
+					spos++;
+					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
+				}
+			}
+			else
+			{
+				// Copy the value directly
+				paramBuffer[dpos++] = args[spos++];
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+				{
+					paramBuffer[dpos++] = args[spos++];
+				}
+				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+			}
+
+			// if this was a variable argument parameter, then account for the implicit typeID
+			if( IsVariableArgument( descr->parameterTypes[n] ) )
+			{
+				// the TypeID is just a DWORD
+				paramBuffer[dpos++] = args[spos++];
+				++paramSize;
+			}
+		}
+
+		// Keep a free location at the beginning
+		args = &paramBuffer[1];
+	}
+	
+	// one last verification to make sure things are how we expect
+	switch( callConv )
+	{
+	case ICC_CDECL:
+	case ICC_CDECL_RETURNINMEM:
+	case ICC_STDCALL:
+	case ICC_STDCALL_RETURNINMEM:
+		retQW = CallCDeclFunction( args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	case ICC_THISCALL:
+	case ICC_THISCALL_RETURNINMEM:
+		retQW = CallThisCallFunction(obj, args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+		// Get virtual function table from the object pointer
+		vftable = *(asDWORD**)obj;
+		retQW = CallThisCallFunction( obj, args, argsType, paramSize, vftable[asDWORD(func)>>2], retPointer );
+		break;
+	case ICC_CDECL_OBJLAST:
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+		retQW = CallThisCallFunction_objLast( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	case ICC_CDECL_OBJFIRST:
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+		retQW = CallThisCallFunction( obj, args, argsType, paramSize, (asDWORD)func, retPointer );
+		break;
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	if( sysFunc->hostReturnFloat )
+	{
+		// If the return is a float value we need to get the value from the FP register
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+	else if( sysFunc->hostReturnSize == 1 )
+	{
+		// Move the bits to the higher value to compensate for the adjustment that the caller does
+		retQW <<= 32;
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_PTR_SIZE == 2
+#endif // AS_PPC_64
+#endif // AS_MAX_PORTABILITY
+
diff --git a/Sources/AngelScript/source/as_callfunc_sh4.cpp b/Sources/AngelScript/source/as_callfunc_sh4.cpp
old mode 100755
new mode 100644
index ab969804a..b24be9a54
--- a/Sources/AngelScript/source/as_callfunc_sh4.cpp
+++ b/Sources/AngelScript/source/as_callfunc_sh4.cpp
@@ -1,393 +1,393 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc_sh4.cpp
-//
-// These functions handle the actual calling of system functions
-//
-// This version is SH4 specific and was originally written
-// by Fredrik Ehnbom in May, 2004
-// Later updated for angelscript 2.0.0 by Fredrik Ehnbom in Jan, 2005
-
-// References:
-// * http://www.renesas.com/avs/resource/japan/eng/pdf/mpumcu/e602156_sh4.pdf
-// * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wcechp40/html/_callsh4_SH_4_Calling_Standard.asp
-
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_SH4
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_tokendef.h"
-#include "as_context.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-BEGIN_AS_NAMESPACE
-
-#define AS_SH4_MAX_ARGS 32
-// The array used to send values to the correct places.
-// first 0-4 regular values to load into the r4-r7 registers
-// then 0-8 float values to load into the fr4-fr11 registers
-// then (AS_SH4_MAX_ARGS - 12) values to load onto the stack
-// the +1 is for when CallThis (object methods) is used
-// extra +1 when returning in memory
-extern "C" {
-static asDWORD sh4Args[AS_SH4_MAX_ARGS + 1 + 1];
-}
-
-// Loads all data into the correct places and calls the function.
-// intArgSize is the size in bytes for how much data to put in int registers
-// floatArgSize is the size in bytes for how much data to put in float registers
-// stackArgSize is the size in bytes for how much data to put on the callstack
-extern "C" asQWORD sh4Func(int intArgSize, int floatArgSize, int stackArgSize, asDWORD func);
-
-asm(""
-"	.align 4\n"
-"	.global _sh4Func\n"
-"_sh4Func:\n"
-"	mov.l	r14,@-r15\n"
-"	mov.l	r13,@-r15\n"
-"	mov.l	r12,@-r15\n"
-"	sts.l	pr,@-r15\n"		// must be saved since we call a subroutine
-"	mov	r7, r14\n"		// func
-"	mov	r6, r13\n"		// stackArgSize
-"	mov.l	r5,@-r15\n"		// floatArgSize
-"	mov.l	sh4Args,r0\n"
-"	pref	@r0\n"
-"	mov	r4, r1\n"		// intArgsize
-"	mov	#33*4,r2\n"
-"	extu.b	r2,r2\n"		// make unsigned (33*4 = 132 => 128)
-"	mov.l	@(r0,r2), r2\n"		// r2 has adress for when returning in memory
-"_sh4f_intarguments:\n"			// copy all the int arguments to the respective registers
-"	mov	#4*2*2,r3\n"		// calculate how many bytes to skip
-"	sub	r1,r3\n"
-"	braf	r3\n"
-"	add	#-4,r1\n"		// we are indexing the array backwards, so subtract one (delayed slot)
-"	mov.l	@(r0,r1),r7\n"		// 4 arguments
-"	add	#-4,r1\n"
-"	mov.l	@(r0,r1),r6\n"		// 3 arguments
-"	add	#-4,r1\n"
-"	mov.l	@(r0,r1),r5\n"		// 2 arguments
-"	add	#-4,r1\n"
-"	mov.l	@(r0,r1),r4\n"		// 1 argument
-"	nop\n"
-"_sh4f_floatarguments:\n"		// copy all the float arguments to the respective registers
-"	add	#4*4, r0\n"
-"	mov.l	@r15+,r1\n"		// floatArgSize
-"	mov	#8*2*2,r3\n"		// calculate how many bytes to skip
-"	sub	r1,r3\n"
-"	braf	r3\n"
-"	add	#-4,r1\n"		// we are indexing the array backwards, so subtract one (delayed slot)
-"	fmov.s	@(r0,r1),fr11\n"	// 8 arguments
-"	add	#-4,r1\n"
-"	fmov.s	@(r0,r1),fr10\n"	// 7 arguments
-"	add	#-4,r1\n"
-"	fmov.s	@(r0,r1),fr9\n"		// 6 arguments
-"	add	#-4,r1\n"
-"	fmov.s	@(r0,r1),fr8\n"		// 5 arguments
-"	add	#-4,r1\n"
-"	fmov.s	@(r0,r1),fr7\n"		// 4 arguments
-"	add	#-4,r1\n"
-"	fmov.s	@(r0,r1),fr6\n"		// 3 arguments
-"	add	#-4,r1\n"
-"	fmov.s	@(r0,r1),fr5\n"		// 2 arguments
-"	add	#-4,r1\n"
-"	fmov.s	@(r0,r1),fr4\n"		// 1 argument
-"	nop\n"
-"_sh4f_stackarguments:\n"		// copy all the stack argument onto the stack
-"	add	#8*4, r0\n"
-"	mov	r0, r1\n"
-"	mov	#0, r0\n"		// init position counter (also used as a 0-check on the line after)
-"	cmp/eq	r0, r13\n"
-"	bt	_sh4f_functioncall\n"	// no arguments to push onto the stack
-"	mov	r13, r3\n"		// stackArgSize
-"	sub	r3,r15\n"		// "allocate" space on the stack
-"	shlr2	r3\n"			// make into a counter
-"_sh4f_stackloop:\n"
-"	mov.l	@r1+, r12\n"
-"	mov.l	r12, @(r0, r15)\n"
-"	add	#4, r0\n"
-"	dt	r3\n"
-"	bf	_sh4f_stackloop\n"
-"_sh4f_functioncall:\n"
-"	jsr	@r14\n"			// no arguments
-"	nop\n"
-"	add	r13, r15\n"		// restore stack position
-"	lds.l	@r15+,pr\n"
-"	mov.l	@r15+, r12\n"
-"	mov.l	@r15+, r13\n"
-"	rts\n"
-"	mov.l	@r15+, r14\n"		// delayed slot
-"\n"
-"	.align 4\n"
-"sh4Args:\n"
-"	.long	_sh4Args\n"
-);
-
-// puts the arguments in the correct place in the sh4Args-array. See comments above.
-// This could be done better.
-inline void splitArgs(const asDWORD *args, int argNum, int &numRegIntArgs, int &numRegFloatArgs, int &numRestArgs, int hostFlags) {
-	int i;
-
-	int argBit = 1;
-	for (i = 0; i < argNum; i++) {
-		if (hostFlags & argBit) {
-			if (numRegFloatArgs < 12 - 4) {
-				// put in float register
-				sh4Args[4 + numRegFloatArgs] = args[i];
-				numRegFloatArgs++;
-			} else {
-				// put in stack
-				sh4Args[4 + 8 + numRestArgs] = args[i];
-				numRestArgs++;
-			}
-		} else {
-			if (numRegIntArgs < 8 - 4) {
-				// put in int register
-				sh4Args[numRegIntArgs] = args[i];
-				numRegIntArgs++;
-			} else {
-				// put in stack
-				sh4Args[4 + 8 + numRestArgs] = args[i];
-				numRestArgs++;
-			}
-		}
-		argBit <<= 1;
-	}
-}
-asQWORD CallCDeclFunction(const asDWORD *args, int argSize, asDWORD func, int flags)
-{
-	int argNum = argSize >> 2;
-
-	int intArgs = 0;
-	int floatArgs = 0;
-	int restArgs = 0;
-
-	// put the arguments in the correct places in the sh4Args array
-	if (argNum > 0)
-		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
-
-	return sh4Func(intArgs << 2, floatArgs << 2, restArgs << 2, func);
-}
-
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the first parameter is the object
-asQWORD CallThisCallFunction(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
-{
-	int argNum = argSize >> 2;
-
-	int intArgs = 1;
-	int floatArgs = 0;
-	int restArgs = 0;
-
-	sh4Args[0] = (asDWORD) obj;
-	
-	// put the arguments in the correct places in the sh4Args array
-	if (argNum >= 1)
-		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
-
-	return sh4Func(intArgs << 2, floatArgs << 2, restArgs << 2, func);
-}
-// This function is identical to CallCDeclFunction, with the only difference that
-// the value in the last parameter is the object
-asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
-{
-	int argNum = argSize >> 2;
-
-	int intArgs = 0;
-	int floatArgs = 0;
-	int restArgs = 0;
-
-
-	// put the arguments in the correct places in the sh4Args array
-	if (argNum >= 1)
-		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
-
-	if (intArgs < 4) {
-		sh4Args[intArgs] = (asDWORD) obj;
-		intArgs++;
-	} else {
-		sh4Args[4 + 8 + restArgs] = (asDWORD) obj;
-		restArgs++;
-	}
-	
-
-	return sh4Func(intArgs << 2, floatArgs << 2, restArgs << 2, func);
-}
-
-asDWORD GetReturnedFloat()
-{
-	asDWORD f;
-
-	asm("fmov.s	fr0, %0\n" : "=m"(f));
-
-	return f;
-}
-
-// sizeof(double) == 4 with sh-elf-gcc (3.4.0) -m4
-// so this isn't really used...
-asQWORD GetReturnedDouble()
-{
-	asQWORD d;
-
-	asm("fmov	dr0, %0\n" : "=m"(d));
-
-	return d;
-}
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
-{
-	// TODO: SH4 does not yet support THISCALL_OBJFIRST/LAST
-
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-	int callConv = sysFunc->callConv;
-
-	asQWORD retQW = 0;
-
-	void    *func              = (void*)sysFunc->func;
-	int      paramSize         = sysFunc->paramSize;
-	asDWORD *vftable;
-
-	if( descr->returnType.IsObject() && !descr->returnType.IsReference() && !descr->returnType.IsObjectHandle() )
-	{
-		sh4Args[AS_SH4_MAX_ARGS+1] = (asDWORD) retPointer;
-	}
-
-	asASSERT(descr->parameterTypes.GetLength() <= 32);
-
-	// mark all float arguments
-	int argBit = 1;
-	int hostFlags = 0;
-	int intArgs = 0;
-	for( asUINT a = 0; a < descr->parameterTypes.GetLength(); a++ ) {
-		if (descr->parameterTypes[a].IsFloatType()) {
-			hostFlags |= argBit;
-		} else intArgs++;
-		argBit <<= 1;
-	}
-
-	asDWORD paramBuffer[64];
-	if( sysFunc->takesObjByVal )
-	{
-		paramSize = 0;
-		int spos = 0;
-		int dpos = 1;
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					paramSize++;
-				}
-				else
-#endif
-				{
-					// Copy the object's memory to the buffer
-					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-					// Delete the original memory
-					engine->CallFree(*(char**)(args+spos));
-					spos++;
-					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
-				}
-			}
-			else
-			{
-				// Copy the value directly
-				paramBuffer[dpos++] = args[spos++];
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-					paramBuffer[dpos++] = args[spos++];
-				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-			}
-		}
-		// Keep a free location at the beginning
-		args = &paramBuffer[1];
-	}
-
-	switch( callConv )
-	{
-	case ICC_CDECL:
-	case ICC_CDECL_RETURNINMEM:
-	case ICC_STDCALL:
-	case ICC_STDCALL_RETURNINMEM:
-		retQW = CallCDeclFunction(args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	case ICC_THISCALL:
-	case ICC_THISCALL_RETURNINMEM:
-		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-		// Get virtual function table from the object pointer
-		vftable = *(asDWORD**)obj;
-		retQW = CallThisCallFunction(obj, args, paramSize<<2, vftable[asDWORD(func)>>2], hostFlags);
-		break;
-	case ICC_CDECL_OBJLAST:
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-		retQW = CallThisCallFunction_objLast(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	case ICC_CDECL_OBJFIRST:
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
-		break;
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_SH4
-#endif // AS_MAX_PORTABILITY
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_sh4.cpp
+//
+// These functions handle the actual calling of system functions
+//
+// This version is SH4 specific and was originally written
+// by Fredrik Ehnbom in May, 2004
+// Later updated for angelscript 2.0.0 by Fredrik Ehnbom in Jan, 2005
+
+// References:
+// * http://www.renesas.com/avs/resource/japan/eng/pdf/mpumcu/e602156_sh4.pdf
+// * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wcechp40/html/_callsh4_SH_4_Calling_Standard.asp
+
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_SH4
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+BEGIN_AS_NAMESPACE
+
+#define AS_SH4_MAX_ARGS 32
+// The array used to send values to the correct places.
+// first 0-4 regular values to load into the r4-r7 registers
+// then 0-8 float values to load into the fr4-fr11 registers
+// then (AS_SH4_MAX_ARGS - 12) values to load onto the stack
+// the +1 is for when CallThis (object methods) is used
+// extra +1 when returning in memory
+extern "C" {
+static asDWORD sh4Args[AS_SH4_MAX_ARGS + 1 + 1];
+}
+
+// Loads all data into the correct places and calls the function.
+// intArgSize is the size in bytes for how much data to put in int registers
+// floatArgSize is the size in bytes for how much data to put in float registers
+// stackArgSize is the size in bytes for how much data to put on the callstack
+extern "C" asQWORD sh4Func(int intArgSize, int floatArgSize, int stackArgSize, asDWORD func);
+
+asm(""
+"	.align 4\n"
+"	.global _sh4Func\n"
+"_sh4Func:\n"
+"	mov.l	r14,@-r15\n"
+"	mov.l	r13,@-r15\n"
+"	mov.l	r12,@-r15\n"
+"	sts.l	pr,@-r15\n"		// must be saved since we call a subroutine
+"	mov	r7, r14\n"		// func
+"	mov	r6, r13\n"		// stackArgSize
+"	mov.l	r5,@-r15\n"		// floatArgSize
+"	mov.l	sh4Args,r0\n"
+"	pref	@r0\n"
+"	mov	r4, r1\n"		// intArgsize
+"	mov	#33*4,r2\n"
+"	extu.b	r2,r2\n"		// make unsigned (33*4 = 132 => 128)
+"	mov.l	@(r0,r2), r2\n"		// r2 has adress for when returning in memory
+"_sh4f_intarguments:\n"			// copy all the int arguments to the respective registers
+"	mov	#4*2*2,r3\n"		// calculate how many bytes to skip
+"	sub	r1,r3\n"
+"	braf	r3\n"
+"	add	#-4,r1\n"		// we are indexing the array backwards, so subtract one (delayed slot)
+"	mov.l	@(r0,r1),r7\n"		// 4 arguments
+"	add	#-4,r1\n"
+"	mov.l	@(r0,r1),r6\n"		// 3 arguments
+"	add	#-4,r1\n"
+"	mov.l	@(r0,r1),r5\n"		// 2 arguments
+"	add	#-4,r1\n"
+"	mov.l	@(r0,r1),r4\n"		// 1 argument
+"	nop\n"
+"_sh4f_floatarguments:\n"		// copy all the float arguments to the respective registers
+"	add	#4*4, r0\n"
+"	mov.l	@r15+,r1\n"		// floatArgSize
+"	mov	#8*2*2,r3\n"		// calculate how many bytes to skip
+"	sub	r1,r3\n"
+"	braf	r3\n"
+"	add	#-4,r1\n"		// we are indexing the array backwards, so subtract one (delayed slot)
+"	fmov.s	@(r0,r1),fr11\n"	// 8 arguments
+"	add	#-4,r1\n"
+"	fmov.s	@(r0,r1),fr10\n"	// 7 arguments
+"	add	#-4,r1\n"
+"	fmov.s	@(r0,r1),fr9\n"		// 6 arguments
+"	add	#-4,r1\n"
+"	fmov.s	@(r0,r1),fr8\n"		// 5 arguments
+"	add	#-4,r1\n"
+"	fmov.s	@(r0,r1),fr7\n"		// 4 arguments
+"	add	#-4,r1\n"
+"	fmov.s	@(r0,r1),fr6\n"		// 3 arguments
+"	add	#-4,r1\n"
+"	fmov.s	@(r0,r1),fr5\n"		// 2 arguments
+"	add	#-4,r1\n"
+"	fmov.s	@(r0,r1),fr4\n"		// 1 argument
+"	nop\n"
+"_sh4f_stackarguments:\n"		// copy all the stack argument onto the stack
+"	add	#8*4, r0\n"
+"	mov	r0, r1\n"
+"	mov	#0, r0\n"		// init position counter (also used as a 0-check on the line after)
+"	cmp/eq	r0, r13\n"
+"	bt	_sh4f_functioncall\n"	// no arguments to push onto the stack
+"	mov	r13, r3\n"		// stackArgSize
+"	sub	r3,r15\n"		// "allocate" space on the stack
+"	shlr2	r3\n"			// make into a counter
+"_sh4f_stackloop:\n"
+"	mov.l	@r1+, r12\n"
+"	mov.l	r12, @(r0, r15)\n"
+"	add	#4, r0\n"
+"	dt	r3\n"
+"	bf	_sh4f_stackloop\n"
+"_sh4f_functioncall:\n"
+"	jsr	@r14\n"			// no arguments
+"	nop\n"
+"	add	r13, r15\n"		// restore stack position
+"	lds.l	@r15+,pr\n"
+"	mov.l	@r15+, r12\n"
+"	mov.l	@r15+, r13\n"
+"	rts\n"
+"	mov.l	@r15+, r14\n"		// delayed slot
+"\n"
+"	.align 4\n"
+"sh4Args:\n"
+"	.long	_sh4Args\n"
+);
+
+// puts the arguments in the correct place in the sh4Args-array. See comments above.
+// This could be done better.
+inline void splitArgs(const asDWORD *args, int argNum, int &numRegIntArgs, int &numRegFloatArgs, int &numRestArgs, int hostFlags) {
+	int i;
+
+	int argBit = 1;
+	for (i = 0; i < argNum; i++) {
+		if (hostFlags & argBit) {
+			if (numRegFloatArgs < 12 - 4) {
+				// put in float register
+				sh4Args[4 + numRegFloatArgs] = args[i];
+				numRegFloatArgs++;
+			} else {
+				// put in stack
+				sh4Args[4 + 8 + numRestArgs] = args[i];
+				numRestArgs++;
+			}
+		} else {
+			if (numRegIntArgs < 8 - 4) {
+				// put in int register
+				sh4Args[numRegIntArgs] = args[i];
+				numRegIntArgs++;
+			} else {
+				// put in stack
+				sh4Args[4 + 8 + numRestArgs] = args[i];
+				numRestArgs++;
+			}
+		}
+		argBit <<= 1;
+	}
+}
+asQWORD CallCDeclFunction(const asDWORD *args, int argSize, asDWORD func, int flags)
+{
+	int argNum = argSize >> 2;
+
+	int intArgs = 0;
+	int floatArgs = 0;
+	int restArgs = 0;
+
+	// put the arguments in the correct places in the sh4Args array
+	if (argNum > 0)
+		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
+
+	return sh4Func(intArgs << 2, floatArgs << 2, restArgs << 2, func);
+}
+
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the first parameter is the object
+asQWORD CallThisCallFunction(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
+{
+	int argNum = argSize >> 2;
+
+	int intArgs = 1;
+	int floatArgs = 0;
+	int restArgs = 0;
+
+	sh4Args[0] = (asDWORD) obj;
+	
+	// put the arguments in the correct places in the sh4Args array
+	if (argNum >= 1)
+		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
+
+	return sh4Func(intArgs << 2, floatArgs << 2, restArgs << 2, func);
+}
+// This function is identical to CallCDeclFunction, with the only difference that
+// the value in the last parameter is the object
+asQWORD CallThisCallFunction_objLast(const void *obj, const asDWORD *args, int argSize, asDWORD func, int flags)
+{
+	int argNum = argSize >> 2;
+
+	int intArgs = 0;
+	int floatArgs = 0;
+	int restArgs = 0;
+
+
+	// put the arguments in the correct places in the sh4Args array
+	if (argNum >= 1)
+		splitArgs(args, argNum, intArgs, floatArgs, restArgs, flags);
+
+	if (intArgs < 4) {
+		sh4Args[intArgs] = (asDWORD) obj;
+		intArgs++;
+	} else {
+		sh4Args[4 + 8 + restArgs] = (asDWORD) obj;
+		restArgs++;
+	}
+	
+
+	return sh4Func(intArgs << 2, floatArgs << 2, restArgs << 2, func);
+}
+
+asDWORD GetReturnedFloat()
+{
+	asDWORD f;
+
+	asm("fmov.s	fr0, %0\n" : "=m"(f));
+
+	return f;
+}
+
+// sizeof(double) == 4 with sh-elf-gcc (3.4.0) -m4
+// so this isn't really used...
+asQWORD GetReturnedDouble()
+{
+	asQWORD d;
+
+	asm("fmov	dr0, %0\n" : "=m"(d));
+
+	return d;
+}
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
+{
+	// TODO: SH4 does not yet support THISCALL_OBJFIRST/LAST
+
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+	int callConv = sysFunc->callConv;
+
+	asQWORD retQW = 0;
+
+	void    *func              = (void*)sysFunc->func;
+	int      paramSize         = sysFunc->paramSize;
+	asDWORD *vftable;
+
+	if( descr->returnType.IsObject() && !descr->returnType.IsReference() && !descr->returnType.IsObjectHandle() )
+	{
+		sh4Args[AS_SH4_MAX_ARGS+1] = (asDWORD) retPointer;
+	}
+
+	asASSERT(descr->parameterTypes.GetLength() <= 32);
+
+	// mark all float arguments
+	int argBit = 1;
+	int hostFlags = 0;
+	int intArgs = 0;
+	for( asUINT a = 0; a < descr->parameterTypes.GetLength(); a++ ) {
+		if (descr->parameterTypes[a].IsFloatType()) {
+			hostFlags |= argBit;
+		} else intArgs++;
+		argBit <<= 1;
+	}
+
+	asDWORD paramBuffer[64];
+	if( sysFunc->takesObjByVal )
+	{
+		paramSize = 0;
+		int spos = 0;
+		int dpos = 1;
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					paramSize++;
+				}
+				else
+#endif
+				{
+					// Copy the object's memory to the buffer
+					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+					// Delete the original memory
+					engine->CallFree(*(char**)(args+spos));
+					spos++;
+					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
+				}
+			}
+			else
+			{
+				// Copy the value directly
+				paramBuffer[dpos++] = args[spos++];
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+					paramBuffer[dpos++] = args[spos++];
+				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+			}
+		}
+		// Keep a free location at the beginning
+		args = &paramBuffer[1];
+	}
+
+	switch( callConv )
+	{
+	case ICC_CDECL:
+	case ICC_CDECL_RETURNINMEM:
+	case ICC_STDCALL:
+	case ICC_STDCALL_RETURNINMEM:
+		retQW = CallCDeclFunction(args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	case ICC_THISCALL:
+	case ICC_THISCALL_RETURNINMEM:
+		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+		// Get virtual function table from the object pointer
+		vftable = *(asDWORD**)obj;
+		retQW = CallThisCallFunction(obj, args, paramSize<<2, vftable[asDWORD(func)>>2], hostFlags);
+		break;
+	case ICC_CDECL_OBJLAST:
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+		retQW = CallThisCallFunction_objLast(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	case ICC_CDECL_OBJFIRST:
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+		retQW = CallThisCallFunction(obj, args, paramSize<<2, (asDWORD)func, hostFlags);
+		break;
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_SH4
+#endif // AS_MAX_PORTABILITY
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_x64_gcc.cpp b/Sources/AngelScript/source/as_callfunc_x64_gcc.cpp
old mode 100755
new mode 100644
index e5bdf0518..ad6c27fb6
--- a/Sources/AngelScript/source/as_callfunc_x64_gcc.cpp
+++ b/Sources/AngelScript/source/as_callfunc_x64_gcc.cpp
@@ -1,6 +1,6 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
+   Copyright (c) 2003-2017 Andreas Jonsson
 
    This software is provided 'as-is', without any express or implied
    warranty. In no event will the authors be held liable for any
diff --git a/Sources/AngelScript/source/as_callfunc_x64_mingw.cpp b/Sources/AngelScript/source/as_callfunc_x64_mingw.cpp
old mode 100755
new mode 100644
index 2eb63ff3c..1c5bdb552
--- a/Sources/AngelScript/source/as_callfunc_x64_mingw.cpp
+++ b/Sources/AngelScript/source/as_callfunc_x64_mingw.cpp
@@ -1,348 +1,348 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-//
-// This code was adapted from as_callfunc_x64_msvc by _Vicious_ on August 20th, 2011.
-//
-// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
-//
-
-#include <stdio.h>
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_X64_MINGW
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_context.h"
-
-BEGIN_AS_NAMESPACE
-
-static asQWORD __attribute__((noinline)) CallX64(const asQWORD *args, const asQWORD *floatArgs, const int paramSize, asQWORD func)
-{
-	volatile asQWORD ret = 0;
-
-	__asm__ __volatile__ (
-		"# Move the parameters into registers before the rsp is modified\n"
-		"mov %1, %%r10\n" // r10 = args
-		"mov %2, %%r11\n" // r11 = floatArgs
-		"xor %%r12, %%r12\n"
-		"mov %3, %%r12d\n"
-		"mov %4, %%r14\n" // r14 = func
-
-        "# Store the stack pointer in r15 since it is guaranteed not to change over a function call\n"
-        "mov %%rsp, %%r15\n"
-
-		"# Allocate space on the stack for the arguments\n"
-		"# Make room for at least 4 arguments even if there are less. When\n"
-		"# the compiler does optimizations for speed it may use these for \n"
-		"# temporary storage.\n"
-		"mov %%r12, %%rdi\n"
-		"add $32,%%edi\n"
-
-		"# Make sure the stack pointer is 16byte aligned so the\n"
-		"# whole program optimizations will work properly\n"
-		"# TODO: runtime optimize: Can this be optimized with fewer instructions?\n"
-		"mov %%rsp,%%rsi\n"
-		"sub %%rdi,%%rsi\n"
-		"and $0x8,%%rsi\n"
-		"add %%rsi,%%rdi\n"
-		"sub %%rdi,%%rsp\n"
-
-		"# Jump straight to calling the function if no parameters\n"
-		"cmp $0,%%r12 # Compare paramSize with 0\n"
-		"je callfunc # Jump to call funtion if (paramSize == 0)\n"
-
-		"# Copy arguments from script stack to application stack\n"
-		"# Order is (first to last):\n"
-		"# rcx, rdx, r8, r9 & everything else goes on stack\n"
-		"movq   (%%r10),%%rcx\n"
-		"movq  8(%%r10),%%rdx\n"
-		"movq 16(%%r10),%%r8\n"
-		"movq 24(%%r10),%%r9\n"
-
-		"# Negate the 4 params from the size to be copied\n"
-		"sub $32,%%r12d\n"
-		"js copyfloat # Jump if negative result\n"
-		"jz copyfloat # Jump if zero result\n"
-
-		"# Now copy all remaining params onto stack allowing space for first four\n"
-		"# params to be flushed back to the stack if required by the callee.\n"
-		"add $32,%%r10 # Position input pointer 4 args ahead\n"
-		"mov %%rsp,%%r13 # Put the stack pointer into r13\n"
-		"add $32,%%r13 # Leave space for first 4 args on stack\n"
-
-	"copyoverflow:\n"
-		"movq (%%r10),%%rdi # Read param from source stack into rdi\n"
-		"movq %%rdi,(%%r13) # Copy param to real stack\n"
-		"add $8,%%r13 # Move virtual stack pointer\n"
-		"add $8,%%r10 # Move source stack pointer\n"
-		"sub $8,%%r12d # Decrement remaining count\n"
-		"jnz copyoverflow # Continue if more params\n"
-
-	"copyfloat:\n"
-		"# Any floating point params?\n"
-		"cmp $0,%%r11\n"
-		"je callfunc\n"
-
-		"movlpd   (%%r11),%%xmm0\n"
-		"movlpd  8(%%r11),%%xmm1\n"
-		"movlpd 16(%%r11),%%xmm2\n"
-		"movlpd 24(%%r11),%%xmm3\n"
-
-	"callfunc:\n"
-		"call *%%r14\n"
-
-        "# restore stack pointer\n"
-        "mov %%r15, %%rsp\n"
-
-		"lea  %0, %%rbx\n"     // Load the address of the ret variable into rbx
-		"movq %%rax,(%%rbx)\n" // Copy the returned value into the ret variable
-
- 		: // no output
-		: "m" (ret), "r" (args), "r" (floatArgs), "r" (paramSize), "r" (func)
-		: "rdi", "rsi", "rsp", "rbx", "r10", "r11", "%r12", "r13", "r14", "r15"
-	);
-
-	return ret;
-}
-
-static asDWORD GetReturnedFloat()
-{
-	volatile asDWORD ret = 0;
-
-	__asm__ __volatile__ (
-		"lea      %0, %%rax\n"
-		"movss    %%xmm0, (%%rax)"
-		: /* no output */
-		: "m" (ret)
-		: "%rax"
-	);
-
-	return ret;
-}
-
-static asQWORD GetReturnedDouble()
-{
-	volatile asQWORD ret = 0;
-
-	__asm__ __volatile__ (
-		"lea     %0, %%rax\n"
-		"movlpd  %%xmm0, (%%rax)"
-		: /* no optput */
-		: "m" (ret)
-		: "%rax"
-	);
-
-	return ret;
-}
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
-{
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-
-	asQWORD  retQW             = 0;
-	void    *func              = (void*)sysFunc->func;
-	asUINT   paramSize         = 0; // QWords
-	void   **vftable;
-
-	asQWORD  allArgBuffer[64];
-	asQWORD  floatArgBuffer[4];
-
-	int callConv = sysFunc->callConv;
-
-	if( sysFunc->hostReturnInMemory )
-	{
-		// The return is made in memory
-		callConv++;
-
-		// Set the return pointer as the first argument
-		allArgBuffer[paramSize++] = (asQWORD)retPointer;
-	}
-
-#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
-	if( callConv == ICC_THISCALL ||
-		callConv == ICC_THISCALL_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL ||
-		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
-#else
-	// Optimization to avoid check 12 values (all ICC_ that contains THISCALL)
-	if( (callConv >= ICC_THISCALL && callConv <= ICC_VIRTUAL_THISCALL_RETURNINMEM) ||
-		(callConv >= ICC_THISCALL_OBJLAST && callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
-#endif
-	{
-		// Add the object pointer as the first parameter
-		allArgBuffer[paramSize++] = (asQWORD)obj;
-	}
-
-	if( callConv == ICC_CDECL_OBJFIRST ||
-		callConv == ICC_CDECL_OBJFIRST_RETURNINMEM )
-	{
-		// Add the object pointer as the first parameter
-		allArgBuffer[paramSize++] = (asQWORD)obj;
-	}
-#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
-	else if( callConv == ICC_THISCALL_OBJFIRST ||
-		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
-	{
-		// Add the object pointer as the first parameter
-		allArgBuffer[paramSize++] = (asQWORD)secondObject;
-	}
-#endif
-
-#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
-	if( callConv == ICC_VIRTUAL_THISCALL ||
-		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
-#else
-	if( callConv == ICC_VIRTUAL_THISCALL ||
-		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
-#endif
-	{
-		// Get the true function pointer from the virtual function table
-		vftable = *(void***)obj;
-		func = vftable[asPWORD(func)>>3];
-	}
-
-	// Move the arguments to the buffer
-	asUINT dpos = paramSize;
-	asUINT spos = 0;
-	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-	{
-		if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
-		{
-			if( descr->parameterTypes[n].GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ||
-				(descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK) )
-			{
-				allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
-				spos += AS_PTR_SIZE;
-				paramSize++;
-			}
-			else
-			{
-				// Copy the object's memory to the buffer
-				memcpy(&allArgBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-
-				// Delete the original memory
-				engine->CallFree(*(char**)(args+spos));
-				spos += AS_PTR_SIZE;
-				asUINT dwords = descr->parameterTypes[n].GetSizeInMemoryDWords();
-				asUINT qwords = (dwords >> 1) + (dwords & 1);
-				dpos      += qwords;
-				paramSize += qwords;
-			}
-		}
-		else if( descr->parameterTypes[n].GetTokenType() == ttQuestion )
-		{
-			// Copy the reference and the type id
-			allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
-			spos += 2;
-			allArgBuffer[dpos++] = args[spos++];
-			paramSize += 2;
-		}
-		else
-		{
-			// Copy the value directly
-			asUINT dwords = descr->parameterTypes[n].GetSizeOnStackDWords();
-			if( dwords > 1 )
-			{
-				allArgBuffer[dpos] = *(asQWORD*)&args[spos];
-
-				// Double arguments are moved to a separate buffer in order to be placed in the XMM registers,
-				// though this is only done for first 4 arguments, the rest are placed on the stack
-				if( paramSize < 4 && descr->parameterTypes[n].IsDoubleType() )
-					floatArgBuffer[dpos] = *(asQWORD*)&args[spos];
-
-				dpos++;
-				spos += 2;
-			}
-			else
-			{
-				allArgBuffer[dpos] = args[spos];
-
-				// Float arguments are moved to a separate buffer in order to be placed in the XMM registers,
-				// though this is only done for first 4 arguments, the rest are placed on the stack
-				if( paramSize < 4 && descr->parameterTypes[n].IsFloatType() )
-					floatArgBuffer[dpos] = args[spos];
-
-				dpos++;
-				spos++;
-			}
-
-			paramSize++;
-		}
-	}
-
-	if( callConv == ICC_CDECL_OBJLAST ||
-		callConv == ICC_CDECL_OBJLAST_RETURNINMEM )
-	{
-		// Add the object pointer as the last parameter
-		allArgBuffer[paramSize++] = (asQWORD)obj;
-	}
-#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
-	else if( callConv == ICC_THISCALL_OBJLAST ||
-		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
-	{
-		// Add the object pointer as the last parameter
-		allArgBuffer[paramSize++] = (asQWORD)secondObject;
-	}
-#endif
-
-	retQW = CallX64(allArgBuffer, floatArgBuffer, paramSize*8, (asPWORD)func);
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_X64_MSVC
-#endif // AS_MAX_PORTABILITY
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+//
+// This code was adapted from as_callfunc_x64_msvc by _Vicious_ on August 20th, 2011.
+//
+// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
+//
+
+#include <stdio.h>
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_X64_MINGW
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_context.h"
+
+BEGIN_AS_NAMESPACE
+
+static asQWORD __attribute__((noinline)) CallX64(const asQWORD *args, const asQWORD *floatArgs, const int paramSize, asQWORD func)
+{
+	volatile asQWORD ret = 0;
+
+	__asm__ __volatile__ (
+		"# Move the parameters into registers before the rsp is modified\n"
+		"mov %1, %%r10\n" // r10 = args
+		"mov %2, %%r11\n" // r11 = floatArgs
+		"xor %%r12, %%r12\n"
+		"mov %3, %%r12d\n"
+		"mov %4, %%r14\n" // r14 = func
+
+        "# Store the stack pointer in r15 since it is guaranteed not to change over a function call\n"
+        "mov %%rsp, %%r15\n"
+
+		"# Allocate space on the stack for the arguments\n"
+		"# Make room for at least 4 arguments even if there are less. When\n"
+		"# the compiler does optimizations for speed it may use these for \n"
+		"# temporary storage.\n"
+		"mov %%r12, %%rdi\n"
+		"add $32,%%edi\n"
+
+		"# Make sure the stack pointer is 16byte aligned so the\n"
+		"# whole program optimizations will work properly\n"
+		"# TODO: runtime optimize: Can this be optimized with fewer instructions?\n"
+		"mov %%rsp,%%rsi\n"
+		"sub %%rdi,%%rsi\n"
+		"and $0x8,%%rsi\n"
+		"add %%rsi,%%rdi\n"
+		"sub %%rdi,%%rsp\n"
+
+		"# Jump straight to calling the function if no parameters\n"
+		"cmp $0,%%r12 # Compare paramSize with 0\n"
+		"je callfunc # Jump to call funtion if (paramSize == 0)\n"
+
+		"# Copy arguments from script stack to application stack\n"
+		"# Order is (first to last):\n"
+		"# rcx, rdx, r8, r9 & everything else goes on stack\n"
+		"movq   (%%r10),%%rcx\n"
+		"movq  8(%%r10),%%rdx\n"
+		"movq 16(%%r10),%%r8\n"
+		"movq 24(%%r10),%%r9\n"
+
+		"# Negate the 4 params from the size to be copied\n"
+		"sub $32,%%r12d\n"
+		"js copyfloat # Jump if negative result\n"
+		"jz copyfloat # Jump if zero result\n"
+
+		"# Now copy all remaining params onto stack allowing space for first four\n"
+		"# params to be flushed back to the stack if required by the callee.\n"
+		"add $32,%%r10 # Position input pointer 4 args ahead\n"
+		"mov %%rsp,%%r13 # Put the stack pointer into r13\n"
+		"add $32,%%r13 # Leave space for first 4 args on stack\n"
+
+	"copyoverflow:\n"
+		"movq (%%r10),%%rdi # Read param from source stack into rdi\n"
+		"movq %%rdi,(%%r13) # Copy param to real stack\n"
+		"add $8,%%r13 # Move virtual stack pointer\n"
+		"add $8,%%r10 # Move source stack pointer\n"
+		"sub $8,%%r12d # Decrement remaining count\n"
+		"jnz copyoverflow # Continue if more params\n"
+
+	"copyfloat:\n"
+		"# Any floating point params?\n"
+		"cmp $0,%%r11\n"
+		"je callfunc\n"
+
+		"movlpd   (%%r11),%%xmm0\n"
+		"movlpd  8(%%r11),%%xmm1\n"
+		"movlpd 16(%%r11),%%xmm2\n"
+		"movlpd 24(%%r11),%%xmm3\n"
+
+	"callfunc:\n"
+		"call *%%r14\n"
+
+        "# restore stack pointer\n"
+        "mov %%r15, %%rsp\n"
+
+		"lea  %0, %%rbx\n"     // Load the address of the ret variable into rbx
+		"movq %%rax,(%%rbx)\n" // Copy the returned value into the ret variable
+
+ 		: // no output
+		: "m" (ret), "r" (args), "r" (floatArgs), "r" (paramSize), "r" (func)
+		: "rdi", "rsi", "rsp", "rbx", "r10", "r11", "%r12", "r13", "r14", "r15"
+	);
+
+	return ret;
+}
+
+static asDWORD GetReturnedFloat()
+{
+	volatile asDWORD ret = 0;
+
+	__asm__ __volatile__ (
+		"lea      %0, %%rax\n"
+		"movss    %%xmm0, (%%rax)"
+		: /* no output */
+		: "m" (ret)
+		: "%rax"
+	);
+
+	return ret;
+}
+
+static asQWORD GetReturnedDouble()
+{
+	volatile asQWORD ret = 0;
+
+	__asm__ __volatile__ (
+		"lea     %0, %%rax\n"
+		"movlpd  %%xmm0, (%%rax)"
+		: /* no optput */
+		: "m" (ret)
+		: "%rax"
+	);
+
+	return ret;
+}
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
+{
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+
+	asQWORD  retQW             = 0;
+	void    *func              = (void*)sysFunc->func;
+	asUINT   paramSize         = 0; // QWords
+	void   **vftable;
+
+	asQWORD  allArgBuffer[64];
+	asQWORD  floatArgBuffer[4];
+
+	int callConv = sysFunc->callConv;
+
+	if( sysFunc->hostReturnInMemory )
+	{
+		// The return is made in memory
+		callConv++;
+
+		// Set the return pointer as the first argument
+		allArgBuffer[paramSize++] = (asQWORD)retPointer;
+	}
+
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+	if( callConv == ICC_THISCALL ||
+		callConv == ICC_THISCALL_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL ||
+		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
+#else
+	// Optimization to avoid check 12 values (all ICC_ that contains THISCALL)
+	if( (callConv >= ICC_THISCALL && callConv <= ICC_VIRTUAL_THISCALL_RETURNINMEM) ||
+		(callConv >= ICC_THISCALL_OBJLAST && callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+#endif
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)obj;
+	}
+
+	if( callConv == ICC_CDECL_OBJFIRST ||
+		callConv == ICC_CDECL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)obj;
+	}
+#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
+	else if( callConv == ICC_THISCALL_OBJFIRST ||
+		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
+#endif
+
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+	if( callConv == ICC_VIRTUAL_THISCALL ||
+		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM )
+#else
+	if( callConv == ICC_VIRTUAL_THISCALL ||
+		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+#endif
+	{
+		// Get the true function pointer from the virtual function table
+		vftable = *(void***)obj;
+		func = vftable[asPWORD(func)>>3];
+	}
+
+	// Move the arguments to the buffer
+	asUINT dpos = paramSize;
+	asUINT spos = 0;
+	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+	{
+		if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+		{
+			if( descr->parameterTypes[n].GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ||
+				(descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK) )
+			{
+				allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
+				spos += AS_PTR_SIZE;
+				paramSize++;
+			}
+			else
+			{
+				// Copy the object's memory to the buffer
+				memcpy(&allArgBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+
+				// Delete the original memory
+				engine->CallFree(*(char**)(args+spos));
+				spos += AS_PTR_SIZE;
+				asUINT dwords = descr->parameterTypes[n].GetSizeInMemoryDWords();
+				asUINT qwords = (dwords >> 1) + (dwords & 1);
+				dpos      += qwords;
+				paramSize += qwords;
+			}
+		}
+		else if( descr->parameterTypes[n].GetTokenType() == ttQuestion )
+		{
+			// Copy the reference and the type id
+			allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
+			spos += 2;
+			allArgBuffer[dpos++] = args[spos++];
+			paramSize += 2;
+		}
+		else
+		{
+			// Copy the value directly
+			asUINT dwords = descr->parameterTypes[n].GetSizeOnStackDWords();
+			if( dwords > 1 )
+			{
+				allArgBuffer[dpos] = *(asQWORD*)&args[spos];
+
+				// Double arguments are moved to a separate buffer in order to be placed in the XMM registers,
+				// though this is only done for first 4 arguments, the rest are placed on the stack
+				if( paramSize < 4 && descr->parameterTypes[n].IsDoubleType() )
+					floatArgBuffer[dpos] = *(asQWORD*)&args[spos];
+
+				dpos++;
+				spos += 2;
+			}
+			else
+			{
+				allArgBuffer[dpos] = args[spos];
+
+				// Float arguments are moved to a separate buffer in order to be placed in the XMM registers,
+				// though this is only done for first 4 arguments, the rest are placed on the stack
+				if( paramSize < 4 && descr->parameterTypes[n].IsFloatType() )
+					floatArgBuffer[dpos] = args[spos];
+
+				dpos++;
+				spos++;
+			}
+
+			paramSize++;
+		}
+	}
+
+	if( callConv == ICC_CDECL_OBJLAST ||
+		callConv == ICC_CDECL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		allArgBuffer[paramSize++] = (asQWORD)obj;
+	}
+#ifndef AS_NO_THISCALL_FUNCTOR_METHOD
+	else if( callConv == ICC_THISCALL_OBJLAST ||
+		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
+#endif
+
+	retQW = CallX64(allArgBuffer, floatArgBuffer, paramSize*8, (asPWORD)func);
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_X64_MSVC
+#endif // AS_MAX_PORTABILITY
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_x64_msvc.cpp b/Sources/AngelScript/source/as_callfunc_x64_msvc.cpp
old mode 100755
new mode 100644
index cb12d47b2..8af5adc01
--- a/Sources/AngelScript/source/as_callfunc_x64_msvc.cpp
+++ b/Sources/AngelScript/source/as_callfunc_x64_msvc.cpp
@@ -1,217 +1,217 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-//
-// Added support for thiscall methods by Jordi Oliveras Rovira in April, 2014.
-//
-
-#include <stdio.h>
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_X64_MSVC
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_context.h"
-
-BEGIN_AS_NAMESPACE
-
-// These functions are implemented in as_callfunc_x64_msvc.asm
-extern "C" asQWORD CallX64(const asQWORD *args, const asQWORD *floatArgs, int paramSize, asQWORD func);
-extern "C" asDWORD GetReturnedFloat();
-extern "C" asQWORD GetReturnedDouble();
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
-{
-	asCScriptEngine *engine = context->m_engine;
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-
-	asQWORD  retQW             = 0;
-	void    *func              = (void*)sysFunc->func;
-	asUINT   paramSize         = 0; // QWords
-	void   **vftable;
-
-	asQWORD  allArgBuffer[64];
-	asQWORD  floatArgBuffer[4];
-
-	int callConv = sysFunc->callConv;
-
-	// Optimization to avoid check 12 values (all ICC_ that contains THISCALL)
-	if( (callConv >= ICC_THISCALL && callConv <= ICC_VIRTUAL_THISCALL_RETURNINMEM) ||
-		(callConv >= ICC_THISCALL_OBJLAST && callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
-	{
-		// Add the object pointer as the first parameter
-		allArgBuffer[paramSize++] = (asQWORD)obj;
-	}
-
-	if( sysFunc->hostReturnInMemory )
-	{
-		// The return is made in memory
-		callConv++;
-
-		// Set the return pointer as the first argument
-		allArgBuffer[paramSize++] = (asQWORD)retPointer;
-	}
-
-	if( callConv == ICC_CDECL_OBJFIRST ||
-		callConv == ICC_CDECL_OBJFIRST_RETURNINMEM )
-	{
-		// Add the object pointer as the first parameter
-		allArgBuffer[paramSize++] = (asQWORD)obj;
-	}
-	else if( callConv == ICC_THISCALL_OBJFIRST ||
-		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
-	{
-		// Add the object pointer as the first parameter
-		allArgBuffer[paramSize++] = (asQWORD)secondObject;
-	}
-
-	if( callConv == ICC_VIRTUAL_THISCALL ||
-		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
-	{
-		// Get the true function pointer from the virtual function table
-		vftable = *(void***)obj;
-		func = vftable[asPWORD(func)>>2];
-	}
-
-	// Move the arguments to the buffer
-	asUINT dpos = paramSize;
-	asUINT spos = 0;
-	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-	{
-		asCDataType &dt = descr->parameterTypes[n];
-		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
-		{
-			if( dt.GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ||
-				(dt.GetTypeInfo()->flags & COMPLEX_MASK) )
-			{
-				allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
-				spos += AS_PTR_SIZE;
-				paramSize++;
-			}
-			else
-			{
-				// Copy the object's memory to the buffer
-				memcpy(&allArgBuffer[dpos], *(void**)(args+spos), dt.GetSizeInMemoryBytes());
-
-				// Delete the original memory
-				engine->CallFree(*(char**)(args+spos));
-				spos += AS_PTR_SIZE;
-				asUINT dwords = dt.GetSizeInMemoryDWords();
-				asUINT qwords = (dwords >> 1) + (dwords & 1);
-				dpos      += qwords;
-				paramSize += qwords;
-			}
-		}
-		else if( dt.GetTokenType() == ttQuestion )
-		{
-			// Copy the reference and the type id
-			allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
-			spos += 2;
-			allArgBuffer[dpos++] = args[spos++];
-			paramSize += 2;
-		}
-		else
-		{
-			// Copy the value directly
-			asUINT dwords = dt.GetSizeOnStackDWords();
-			if( dwords > 1 )
-			{
-				allArgBuffer[dpos] = *(asQWORD*)&args[spos];
-
-				// Double arguments are moved to a separate buffer in order to be placed in the XMM registers,
-				// though this is only done for first 4 arguments, the rest are placed on the stack
-				if( paramSize < 4 && dt.IsDoubleType() )
-					floatArgBuffer[dpos] = *(asQWORD*)&args[spos];
-
-				dpos++;
-				spos += 2;
-			}
-			else
-			{
-				allArgBuffer[dpos] = args[spos];
-
-				// Float arguments are moved to a separate buffer in order to be placed in the XMM registers,
-				// though this is only done for first 4 arguments, the rest are placed on the stack
-				if( paramSize < 4 && dt.IsFloatType() )
-					floatArgBuffer[dpos] = args[spos];
-				
-				dpos++;
-				spos++;
-			}
-
-			paramSize++;
-		}
-	}
-
-	if( callConv == ICC_CDECL_OBJLAST ||
-		callConv == ICC_CDECL_OBJLAST_RETURNINMEM )
-	{
-		// Add the object pointer as the last parameter
-		allArgBuffer[paramSize++] = (asQWORD)obj;
-	}
-	else if( callConv == ICC_THISCALL_OBJLAST ||
-		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
-		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
-	{
-		// Add the object pointer as the last parameter
-		allArgBuffer[paramSize++] = (asQWORD)secondObject;
-	}
-
-	retQW = CallX64(allArgBuffer, floatArgBuffer, paramSize*8, (asPWORD)func);
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_X64_MSVC
-#endif // AS_MAX_PORTABILITY
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+//
+// Added support for thiscall methods by Jordi Oliveras Rovira in April, 2014.
+//
+
+#include <stdio.h>
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_X64_MSVC
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_context.h"
+
+BEGIN_AS_NAMESPACE
+
+// These functions are implemented in as_callfunc_x64_msvc.asm
+extern "C" asQWORD CallX64(const asQWORD *args, const asQWORD *floatArgs, int paramSize, asQWORD func);
+extern "C" asDWORD GetReturnedFloat();
+extern "C" asQWORD GetReturnedDouble();
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
+{
+	asCScriptEngine *engine = context->m_engine;
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+
+	asQWORD  retQW             = 0;
+	void    *func              = (void*)sysFunc->func;
+	asUINT   paramSize         = 0; // QWords
+	void   **vftable;
+
+	asQWORD  allArgBuffer[64];
+	asQWORD  floatArgBuffer[4];
+
+	int callConv = sysFunc->callConv;
+
+	// Optimization to avoid check 12 values (all ICC_ that contains THISCALL)
+	if( (callConv >= ICC_THISCALL && callConv <= ICC_VIRTUAL_THISCALL_RETURNINMEM) ||
+		(callConv >= ICC_THISCALL_OBJLAST && callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)obj;
+	}
+
+	if( sysFunc->hostReturnInMemory )
+	{
+		// The return is made in memory
+		callConv++;
+
+		// Set the return pointer as the first argument
+		allArgBuffer[paramSize++] = (asQWORD)retPointer;
+	}
+
+	if( callConv == ICC_CDECL_OBJFIRST ||
+		callConv == ICC_CDECL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)obj;
+	}
+	else if( callConv == ICC_THISCALL_OBJFIRST ||
+		callConv == ICC_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM )
+	{
+		// Add the object pointer as the first parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
+
+	if( callConv == ICC_VIRTUAL_THISCALL ||
+		callConv == ICC_VIRTUAL_THISCALL_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Get the true function pointer from the virtual function table
+		vftable = *(void***)obj;
+		func = vftable[asPWORD(func)>>2];
+	}
+
+	// Move the arguments to the buffer
+	asUINT dpos = paramSize;
+	asUINT spos = 0;
+	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+	{
+		asCDataType &dt = descr->parameterTypes[n];
+		if( dt.IsObject() && !dt.IsObjectHandle() && !dt.IsReference() )
+		{
+			if( dt.GetSizeInMemoryDWords() >= AS_LARGE_OBJ_MIN_SIZE ||
+				(dt.GetTypeInfo()->flags & COMPLEX_MASK) )
+			{
+				allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
+				spos += AS_PTR_SIZE;
+				paramSize++;
+			}
+			else
+			{
+				// Copy the object's memory to the buffer
+				memcpy(&allArgBuffer[dpos], *(void**)(args+spos), dt.GetSizeInMemoryBytes());
+
+				// Delete the original memory
+				engine->CallFree(*(char**)(args+spos));
+				spos += AS_PTR_SIZE;
+				asUINT dwords = dt.GetSizeInMemoryDWords();
+				asUINT qwords = (dwords >> 1) + (dwords & 1);
+				dpos      += qwords;
+				paramSize += qwords;
+			}
+		}
+		else if( dt.GetTokenType() == ttQuestion )
+		{
+			// Copy the reference and the type id
+			allArgBuffer[dpos++] = *(asQWORD*)&args[spos];
+			spos += 2;
+			allArgBuffer[dpos++] = args[spos++];
+			paramSize += 2;
+		}
+		else
+		{
+			// Copy the value directly
+			asUINT dwords = dt.GetSizeOnStackDWords();
+			if( dwords > 1 )
+			{
+				allArgBuffer[dpos] = *(asQWORD*)&args[spos];
+
+				// Double arguments are moved to a separate buffer in order to be placed in the XMM registers,
+				// though this is only done for first 4 arguments, the rest are placed on the stack
+				if( paramSize < 4 && dt.IsDoubleType() )
+					floatArgBuffer[dpos] = *(asQWORD*)&args[spos];
+
+				dpos++;
+				spos += 2;
+			}
+			else
+			{
+				allArgBuffer[dpos] = args[spos];
+
+				// Float arguments are moved to a separate buffer in order to be placed in the XMM registers,
+				// though this is only done for first 4 arguments, the rest are placed on the stack
+				if( paramSize < 4 && dt.IsFloatType() )
+					floatArgBuffer[dpos] = args[spos];
+				
+				dpos++;
+				spos++;
+			}
+
+			paramSize++;
+		}
+	}
+
+	if( callConv == ICC_CDECL_OBJLAST ||
+		callConv == ICC_CDECL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		allArgBuffer[paramSize++] = (asQWORD)obj;
+	}
+	else if( callConv == ICC_THISCALL_OBJLAST ||
+		callConv == ICC_THISCALL_OBJLAST_RETURNINMEM ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST ||
+		callConv == ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM )
+	{
+		// Add the object pointer as the last parameter
+		allArgBuffer[paramSize++] = (asQWORD)secondObject;
+	}
+
+	retQW = CallX64(allArgBuffer, floatArgBuffer, paramSize*8, (asPWORD)func);
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_X64_MSVC
+#endif // AS_MAX_PORTABILITY
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_x64_msvc_asm.asm b/Sources/AngelScript/source/as_callfunc_x64_msvc_asm.asm
old mode 100755
new mode 100644
index 80c53ed87..f4cd1acc6
--- a/Sources/AngelScript/source/as_callfunc_x64_msvc_asm.asm
+++ b/Sources/AngelScript/source/as_callfunc_x64_msvc_asm.asm
@@ -1,208 +1,208 @@
-;
-;  AngelCode Scripting Library
-;  Copyright (c) 2003-2011 Andreas Jonsson
-;
-;  This software is provided 'as-is', without any express or implied 
-;  warranty. In no event will the authors be held liable for any 
-;  damages arising from the use of this software.
-;
-;  Permission is granted to anyone to use this software for any 
-;  purpose, including commercial applications, and to alter it and 
-;  redistribute it freely, subject to the following restrictions:
-;
-;  1. The origin of this software must not be misrepresented; you 
-;     must not claim that you wrote the original software. If you use
-;     this software in a product, an acknowledgment in the product 
-;     documentation would be appreciated but is not required.
-;
-;  2. Altered source versions must be plainly marked as such, and 
-;     must not be misrepresented as being the original software.
-;
-;  3. This notice may not be removed or altered from any source 
-;     distribution.
-;
-;  The original version of this library can be located at:
-;  http://www.angelcode.com/angelscript/
-;
-;  Andreas Jonsson
-;  andreas@angelcode.com
-;
-
-.code
-PUBLIC CallX64
-
-; asQWORD CallX64(const asQWORD *args, const asQWORD *floatArgs, int paramSize, asQWORD func)
-
-CallX64 PROC FRAME
-
-	; PROLOG
-
-	; We must save preserved registers that are used
-	; TODO: No need to save unused registers
-
-	push rbp
-.pushreg rbp
-	push rsi
-.pushreg rsi
-	push r11
-.pushreg r11
-	push rdi
-.pushreg rdi
-	push r12
-.pushreg r12
-	push r13
-.pushreg r13
-	push r14
-.pushreg r14
-	push r15
-.pushreg r15
-	push rbx
-.pushreg rbx
-	sub rsp, 050h
-.allocstack 050h
-	mov rbp, rsp
-.setframe rbp, 0
-.endprolog
-
-	; Move function param to non-scratch register
-	mov r14, r9		; r14 = function
-
-	; Allocate space on the stack for the arguments
-	; Make room for at least 4 arguments even if there are less. When
-    ; the compiler does optimizations for speed it may use these for 
-	; temporary storage.
-	mov rdi, r8
-	add rdi, 32
-
-	; Make sure the stack pointer is 16byte aligned so the
-	; whole program optimizations will work properly
-	; TODO: optimize: Can this be optimized with fewer instructions?
-	mov rsi, rsp
-	sub rsi, rdi
-	and rsi, 8h
-	add rdi, rsi	
-	sub rsp, rdi
-		
-	; Jump straight to calling the function if no parameters
-	cmp r8d, 0		; Compare paramSize with 0
-	je	callfunc	; Jump to call funtion if (paramSize == 0)
-
-	; Move params to non-scratch registers
-	mov rsi, rcx	; rsi = pArgs
-	mov r11, rdx	; r11 = pFloatArgs (can be NULL)
-	mov r12d, r8d	; r12 = paramSize
-	
-	; Copy arguments from script stack to application stack
-	; Order is (first to last):
-	; rcx, rdx, r8, r9 & everything else goes on stack
-	mov rcx, qword ptr [rsi]
-	mov rdx, qword ptr [rsi + 8]
-	mov r8,  qword ptr [rsi + 16]
-	mov r9,  qword ptr [rsi + 24]
-	
-	; Negate the 4 params from the size to be copied
-	sub r12d, 32
-	js  copyfloat	; Jump if negative result
-	jz	copyfloat	; Jump if zero result
-	
-	; Now copy all remaining params onto stack allowing space for first four
-	; params to be flushed back to the stack if required by the callee.
-	
-	add rsi, 32		; Position input pointer 4 args ahead
-	mov r13, rsp	; Put the stack pointer into r13
-	add r13, 32	 	; Leave space for first 4 args on stack
-
-copyoverflow:
-	mov r15, qword ptr [rsi]	; Read param from source stack into r15
-	mov qword ptr [r13], r15	; Copy param to real stack
-	add r13, 8					; Move virtual stack pointer
-	add rsi, 8					; Move source stack pointer
-	sub r12d, 8					; Decrement remaining count
-	jnz copyoverflow			; Continue if more params
-
-copyfloat:
-	; Any floating point params?
-	cmp r11, 0
-	je  callfunc
-	
-	movlpd xmm0, qword ptr [r11]
-	movlpd xmm1, qword ptr [r11 + 8]
-	movlpd xmm2, qword ptr [r11 + 16]
-	movlpd xmm3, qword ptr [r11 + 24]
-	
-callfunc:
-	
-	; Call function
-	call r14
-	
-	; Restore the stack
-	mov rsp, rbp
-		
-	; EPILOG: Restore stack & preserved registers
-	add rsp, 050h
-	pop rbx
-	pop r15
-	pop r14
-	pop r13
-	pop r12
-	pop rdi
-	pop r11
-	pop rsi
-	pop rbp
-
-	; return value in RAX
-	ret
-
-CallX64 ENDP
-
-
-PUBLIC GetReturnedFloat
-
-; asDWORD GetReturnedFloat()
-
-GetReturnedFloat PROC FRAME
-
-	; PROLOG: Store registers and allocate stack space
-	
-	sub rsp, 8   ; We'll need 4 bytes for temporary storage (8 bytes with alignment)
-.allocstack 8
-.endprolog
-
-	; Move the float value from the XMM0 register to RAX register
-	movss dword ptr [rsp], xmm0
-	mov   eax, dword ptr [rsp]
-	
-	; EPILOG: Clean up
-	
-	add rsp, 8
-
-	ret
-
-GetReturnedFloat ENDP
-
-
-PUBLIC GetReturnedDouble
-
-; asDWORD GetReturnedDouble()
-
-GetReturnedDouble PROC FRAME
-
-	; PROLOG: Store registers and allocate stack space
-	
-	sub rsp, 8	; We'll need 8 bytes for temporary storage
-.allocstack 8
-.endprolog
-
-	; Move the double value from the XMM0 register to the RAX register
-	movlpd qword ptr [rsp], xmm0
-	mov    rax, qword ptr [rsp]
-	
-	; EPILOG: Clean up
-	
-	add rsp, 8
-	
-	ret
-	
-GetReturnedDouble ENDP
-
+;
+;  AngelCode Scripting Library
+;  Copyright (c) 2003-2011 Andreas Jonsson
+;
+;  This software is provided 'as-is', without any express or implied 
+;  warranty. In no event will the authors be held liable for any 
+;  damages arising from the use of this software.
+;
+;  Permission is granted to anyone to use this software for any 
+;  purpose, including commercial applications, and to alter it and 
+;  redistribute it freely, subject to the following restrictions:
+;
+;  1. The origin of this software must not be misrepresented; you 
+;     must not claim that you wrote the original software. If you use
+;     this software in a product, an acknowledgment in the product 
+;     documentation would be appreciated but is not required.
+;
+;  2. Altered source versions must be plainly marked as such, and 
+;     must not be misrepresented as being the original software.
+;
+;  3. This notice may not be removed or altered from any source 
+;     distribution.
+;
+;  The original version of this library can be located at:
+;  http://www.angelcode.com/angelscript/
+;
+;  Andreas Jonsson
+;  andreas@angelcode.com
+;
+
+.code
+PUBLIC CallX64
+
+; asQWORD CallX64(const asQWORD *args, const asQWORD *floatArgs, int paramSize, asQWORD func)
+
+CallX64 PROC FRAME
+
+	; PROLOG
+
+	; We must save preserved registers that are used
+	; TODO: No need to save unused registers
+
+	push rbp
+.pushreg rbp
+	push rsi
+.pushreg rsi
+	push r11
+.pushreg r11
+	push rdi
+.pushreg rdi
+	push r12
+.pushreg r12
+	push r13
+.pushreg r13
+	push r14
+.pushreg r14
+	push r15
+.pushreg r15
+	push rbx
+.pushreg rbx
+	sub rsp, 050h
+.allocstack 050h
+	mov rbp, rsp
+.setframe rbp, 0
+.endprolog
+
+	; Move function param to non-scratch register
+	mov r14, r9		; r14 = function
+
+	; Allocate space on the stack for the arguments
+	; Make room for at least 4 arguments even if there are less. When
+    ; the compiler does optimizations for speed it may use these for 
+	; temporary storage.
+	mov rdi, r8
+	add rdi, 32
+
+	; Make sure the stack pointer is 16byte aligned so the
+	; whole program optimizations will work properly
+	; TODO: optimize: Can this be optimized with fewer instructions?
+	mov rsi, rsp
+	sub rsi, rdi
+	and rsi, 8h
+	add rdi, rsi	
+	sub rsp, rdi
+		
+	; Jump straight to calling the function if no parameters
+	cmp r8d, 0		; Compare paramSize with 0
+	je	callfunc	; Jump to call funtion if (paramSize == 0)
+
+	; Move params to non-scratch registers
+	mov rsi, rcx	; rsi = pArgs
+	mov r11, rdx	; r11 = pFloatArgs (can be NULL)
+	mov r12d, r8d	; r12 = paramSize
+	
+	; Copy arguments from script stack to application stack
+	; Order is (first to last):
+	; rcx, rdx, r8, r9 & everything else goes on stack
+	mov rcx, qword ptr [rsi]
+	mov rdx, qword ptr [rsi + 8]
+	mov r8,  qword ptr [rsi + 16]
+	mov r9,  qword ptr [rsi + 24]
+	
+	; Negate the 4 params from the size to be copied
+	sub r12d, 32
+	js  copyfloat	; Jump if negative result
+	jz	copyfloat	; Jump if zero result
+	
+	; Now copy all remaining params onto stack allowing space for first four
+	; params to be flushed back to the stack if required by the callee.
+	
+	add rsi, 32		; Position input pointer 4 args ahead
+	mov r13, rsp	; Put the stack pointer into r13
+	add r13, 32	 	; Leave space for first 4 args on stack
+
+copyoverflow:
+	mov r15, qword ptr [rsi]	; Read param from source stack into r15
+	mov qword ptr [r13], r15	; Copy param to real stack
+	add r13, 8					; Move virtual stack pointer
+	add rsi, 8					; Move source stack pointer
+	sub r12d, 8					; Decrement remaining count
+	jnz copyoverflow			; Continue if more params
+
+copyfloat:
+	; Any floating point params?
+	cmp r11, 0
+	je  callfunc
+	
+	movlpd xmm0, qword ptr [r11]
+	movlpd xmm1, qword ptr [r11 + 8]
+	movlpd xmm2, qword ptr [r11 + 16]
+	movlpd xmm3, qword ptr [r11 + 24]
+	
+callfunc:
+	
+	; Call function
+	call r14
+	
+	; Restore the stack
+	mov rsp, rbp
+		
+	; EPILOG: Restore stack & preserved registers
+	add rsp, 050h
+	pop rbx
+	pop r15
+	pop r14
+	pop r13
+	pop r12
+	pop rdi
+	pop r11
+	pop rsi
+	pop rbp
+
+	; return value in RAX
+	ret
+
+CallX64 ENDP
+
+
+PUBLIC GetReturnedFloat
+
+; asDWORD GetReturnedFloat()
+
+GetReturnedFloat PROC FRAME
+
+	; PROLOG: Store registers and allocate stack space
+	
+	sub rsp, 8   ; We'll need 4 bytes for temporary storage (8 bytes with alignment)
+.allocstack 8
+.endprolog
+
+	; Move the float value from the XMM0 register to RAX register
+	movss dword ptr [rsp], xmm0
+	mov   eax, dword ptr [rsp]
+	
+	; EPILOG: Clean up
+	
+	add rsp, 8
+
+	ret
+
+GetReturnedFloat ENDP
+
+
+PUBLIC GetReturnedDouble
+
+; asDWORD GetReturnedDouble()
+
+GetReturnedDouble PROC FRAME
+
+	; PROLOG: Store registers and allocate stack space
+	
+	sub rsp, 8	; We'll need 8 bytes for temporary storage
+.allocstack 8
+.endprolog
+
+	; Move the double value from the XMM0 register to the RAX register
+	movlpd qword ptr [rsp], xmm0
+	mov    rax, qword ptr [rsp]
+	
+	; EPILOG: Clean up
+	
+	add rsp, 8
+	
+	ret
+	
+GetReturnedDouble ENDP
+
 END
\ No newline at end of file
diff --git a/Sources/AngelScript/source/as_callfunc_x86.cpp b/Sources/AngelScript/source/as_callfunc_x86.cpp
old mode 100755
new mode 100644
index e1fc4a217..551f41a12
--- a/Sources/AngelScript/source/as_callfunc_x86.cpp
+++ b/Sources/AngelScript/source/as_callfunc_x86.cpp
@@ -1,1514 +1,1514 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc_x86.cpp
-//
-// These functions handle the actual calling of system functions
-//
-// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
-//
-
-
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#ifdef AS_X86
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_tokendef.h"
-#include "as_context.h"
-
-BEGIN_AS_NAMESPACE
-
-//
-// With some compile level optimizations the functions don't clear the FPU
-// stack themselves. So we have to do it as part of calling the native functions,
-// as the compiler will not be able to predict when it is supposed to do it by
-// itself due to the dynamic nature of scripts
-//
-// - fninit clears the FPU stack and the FPU control word
-// - emms only clears the FPU stack, while preserving the FPU control word
-//
-// By default I use fninit as it seems to be what works for most people,
-// but some may find it necessary to define this as emms instead.
-//
-// TODO: Figure out when one or the other must be used, and a way to
-//       configure this automatically in as_config.h
-//
-#ifndef CLEAR_FPU_STACK
-#define CLEAR_FPU_STACK fninit
-#endif
-
-// These macros are just to allow me to use the above macro in the GNUC style inline assembly
-#define _S(x) _TOSTRING(x)
-#define _TOSTRING(x) #x
-
-// Prototypes
-asQWORD CallCDeclFunction(const asDWORD *args, int paramSize, asFUNCTION_t func);
-asQWORD CallCDeclFunctionObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func);
-asQWORD CallCDeclFunctionObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func);
-asQWORD CallCDeclFunctionRetByRef(const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr);
-asQWORD CallCDeclFunctionRetByRefObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr);
-asQWORD CallCDeclFunctionRetByRefObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr);
-asQWORD CallSTDCallFunction(const asDWORD *args, int paramSize, asFUNCTION_t func);
-asQWORD CallThisCallFunction(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func);
-asQWORD CallThisCallFunctionRetByRef(const void *, const asDWORD *, int, asFUNCTION_t, void *retPtr);
-
-asDWORD GetReturnedFloat();
-asQWORD GetReturnedDouble();
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
-{
-	asCScriptEngine            *engine    = context->m_engine;
-	asSSystemFunctionInterface *sysFunc   = descr->sysFuncIntf;
-
-	asQWORD retQW = 0;
-
-	// Prepare the parameters
-	asDWORD paramBuffer[64];
-	int callConv = sysFunc->callConv;
-
-	// Changed because need check for ICC_THISCALL_OBJFIRST or
-	// ICC_THISCALL_OBJLAST if sysFunc->takesObjByVal (avoid copy code)
-	// Check if is THISCALL_OBJ* calling convention (in this case needs to add secondObject pointer into stack).
-	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
-	int paramSize = isThisCallMethod || sysFunc->takesObjByVal ? 0 : sysFunc->paramSize;
-
-	int dpos = 1;
-
-	if( isThisCallMethod && 
-		(callConv >= ICC_THISCALL_OBJFIRST &&
-		 callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
-	{
-		// Add the object pointer as the first parameter
-		paramBuffer[dpos++] = (asDWORD)secondObject;
-		paramSize++;
-	}
-
-	if( sysFunc->takesObjByVal || isThisCallMethod )
-	{
-		int spos = 0;
-
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					paramSize++;
-				}
-				else
-#endif
-				{
-					// Copy the object's memory to the buffer
-					// TODO: bug: Must call the object's copy constructor instead of doing a memcpy, 
-					//            as the object may hold a pointer to itself. It's not enough to 
-					//            change only this memcpy as the assembler routine also makes a copy
-					//            of paramBuffer to the final stack location. To avoid the second 
-					//            copy the C++ routine should point paramBuffer to the final stack
-					//            position and copy the values directly to that location. The assembler
-					//            routines then don't need to copy anything, and will just be 
-					//            responsible for setting up the registers and the stack frame appropriately.
-					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
-
-					// Delete the original memory
-					engine->CallFree(*(char**)(args+spos));
-					spos++;
-					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
-				}
-			}
-			else
-			{
-				// Copy the value directly
-				paramBuffer[dpos++] = args[spos++];
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-					paramBuffer[dpos++] = args[spos++];
-				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-			}
-		}
-		// Keep a free location at the beginning
-		args = &paramBuffer[1];
-	}
-
-	if( isThisCallMethod && 
-		(callConv >= ICC_THISCALL_OBJLAST &&
-		 callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
-	{
-		// Add the object pointer as the last parameter
-		paramBuffer[dpos++] = (asDWORD)secondObject;
-		paramSize++;
-	}
-
-	// Make the actual call
-	asFUNCTION_t func = sysFunc->func;
-	if( sysFunc->hostReturnInMemory )
-		callConv++;
-
-	switch( callConv )
-	{
-	case ICC_CDECL:
-		retQW = CallCDeclFunction(args, paramSize<<2, func);
-		break;
-
-	case ICC_CDECL_RETURNINMEM:
-		retQW = CallCDeclFunctionRetByRef(args, paramSize<<2, func, retPointer);
-		break;
-
-	case ICC_STDCALL:
-		retQW = CallSTDCallFunction(args, paramSize<<2, func);
-		break;
-
-	case ICC_STDCALL_RETURNINMEM:
-		// Push the return pointer on the stack
-		paramSize++;
-		args--;
-		*(asPWORD*)args = (size_t)retPointer;
-
-		retQW = CallSTDCallFunction(args, paramSize<<2, func);
-		break;
-
-	case ICC_THISCALL:
-	case ICC_THISCALL_OBJFIRST:
-	case ICC_THISCALL_OBJLAST:
-		retQW = CallThisCallFunction(obj, args, paramSize<<2, func);
-		break;
-
-	case ICC_THISCALL_RETURNINMEM:
-	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_THISCALL_OBJLAST_RETURNINMEM:
-		retQW = CallThisCallFunctionRetByRef(obj, args, paramSize<<2, func, retPointer);
-		break;
-
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST:
-	case ICC_VIRTUAL_THISCALL_OBJLAST:
-		{
-			// Get virtual function table from the object pointer
-			asFUNCTION_t *vftable = *(asFUNCTION_t**)obj;
-			retQW = CallThisCallFunction(obj, args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2]);
-		}
-		break;
-
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
-	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
-		{
-			// Get virtual function table from the object pointer
-			asFUNCTION_t *vftable = *(asFUNCTION_t**)obj;
-			retQW = CallThisCallFunctionRetByRef(obj, args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], retPointer);
-		}
-		break;
-
-	case ICC_CDECL_OBJLAST:
-		retQW = CallCDeclFunctionObjLast(obj, args, paramSize<<2, func);
-		break;
-
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-		// Call the system object method as a cdecl with the obj ref as the last parameter
-		retQW = CallCDeclFunctionRetByRefObjLast(obj, args, paramSize<<2, func, retPointer);
-		break;
-
-	case ICC_CDECL_OBJFIRST:
-		// Call the system object method as a cdecl with the obj ref as the first parameter
-		retQW = CallCDeclFunctionObjFirst(obj, args, paramSize<<2, func);
-		break;
-
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-		// Call the system object method as a cdecl with the obj ref as the first parameter
-		retQW = CallCDeclFunctionRetByRefObjFirst(obj, args, paramSize<<2, func, retPointer);
-		break;
-
-	default:
-		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
-	}
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-
-	return retQW;
-}
-
-// On GCC we need to prevent the compiler from inlining these assembler routines when
-// optimizing for speed (-O3), as the loop labels get duplicated which cause compile errors.
-
-#ifdef __GNUC__
-    #define NOINLINE __attribute ((__noinline__))
-#else
-    #define NOINLINE
-#endif
-
-
-asQWORD NOINLINE CallCDeclFunction(const asDWORD *args, int paramSize, asFUNCTION_t func)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-		// Call function
-		call [func]
-
-		// Pop arguments from stack
-		add  esp, paramSize
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	// It is not possible to rely on ESP or BSP to refer to variables or arguments on the stack
-	// depending on compiler settings BSP may not even be used, and the ESP is not always on the
-	// same offset from the local variables. Because the code adjusts the ESP register it is not
-	// possible to inform the arguments through symbolic names below.
-
-	// It's not also not possible to rely on the memory layout of the function arguments, because
-	// on some compiler versions and settings the arguments may be copied to local variables with a
-	// different ordering before they are accessed by the rest of the code.
-
-	// I'm copying the arguments into this array where I know the exact memory layout. The address
-	// of this array will then be passed to the inline asm in the EDX register.
-	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
-	asm __volatile__(
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  4(%%ebx), %%eax  \n" // paramSize
-		"addl  $4, %%eax        \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		// Copy all arguments to the stack and call the function
-		"movl  4(%%ebx), %%ecx  \n" // paramSize
-		"movl  0(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy          \n"
-		"copyloop:              \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop         \n"
-		"endcopy:               \n"
-		"call  *8(%%ebx)        \n"
-		"addl  4(%%ebx), %%esp  \n" // pop arguments
-
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-asQWORD NOINLINE CallCDeclFunctionObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Push the object pointer as the last argument to the function
-		push obj
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-		// Call function
-		call [func]
-
-		// Pop arguments from stack
-		add  esp, paramSize
-		add  esp, 4
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  8(%%ebx), %%eax  \n" // paramSize
-		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		"pushl 0(%%ebx)         \n" // obj
-		"movl  8(%%ebx), %%ecx  \n" // paramSize
-		"movl  4(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy8         \n"
-		"copyloop8:             \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop8        \n"
-		"endcopy8:              \n"
-		"call  *12(%%ebx)       \n"
-		"addl  8(%%ebx), %%esp  \n" // pop arguments
-		"addl  $4, %%esp        \n" // pop obj
-
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-asQWORD NOINLINE CallCDeclFunctionObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-		// push object as first parameter
-		push obj
-
-		// Call function
-		call [func]
-
-		// Pop arguments from stack
-		add  esp, paramSize
-		add  esp, 4
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  8(%%ebx), %%eax  \n" // paramSize
-		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		"movl  8(%%ebx), %%ecx  \n" // paramSize
-		"movl  4(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy6         \n"
-		"copyloop6:             \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop6        \n"
-		"endcopy6:              \n"
-		"pushl 0(%%ebx)         \n" // push obj
-		"call  *12(%%ebx)       \n"
-		"addl  8(%%ebx), %%esp  \n" // pop arguments
-		"addl  $4, %%esp        \n" // pop obj
-
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-asQWORD NOINLINE CallCDeclFunctionRetByRefObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-		// Push the object pointer
-		push obj
-
-		// Push the return pointer
-		push retPtr;
-
-		// Call function
-		call [func]
-
-		// Pop arguments from stack
-		add  esp, paramSize
-
-#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
-		// Pop the return pointer
-		add  esp, 8
-#else
-		add  esp, 4
-#endif
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  8(%%ebx), %%eax  \n" // paramSize
-		"addl  $12, %%eax       \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		"movl  8(%%ebx), %%ecx  \n" // paramSize
-		"movl  4(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy5         \n"
-		"copyloop5:             \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop5        \n"
-		"endcopy5:              \n"
-		"pushl 0(%%ebx)         \n" // push object first
-		"pushl 16(%%ebx)        \n" // retPtr
-		"call  *12(%%ebx)       \n" // func
-		"addl  8(%%ebx), %%esp  \n" // pop arguments
-#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
-		"addl  $8, %%esp        \n" // Pop the return pointer and object pointer
-#else
-		"addl  $4, %%esp        \n" // Pop the object pointer
-#endif
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-#endif
-
-	return retQW;
-}
-
-asQWORD NOINLINE CallCDeclFunctionRetByRef(const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-		// Push the return pointer
-		push retPtr;
-
-		// Call function
-		call [func]
-
-		// Pop arguments from stack
-		add  esp, paramSize
-
-#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
-		// Pop the return pointer
-		add  esp, 4
-#endif
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-
-		// return value in EAX or EAX:EDX
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  4(%%ebx), %%eax  \n" // paramSize
-		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		"movl  4(%%ebx), %%ecx  \n" // paramSize
-		"movl  0(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy7         \n"
-		"copyloop7:             \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop7        \n"
-		"endcopy7:              \n"
-		"pushl 12(%%ebx)        \n" // retPtr
-		"call  *8(%%ebx)        \n" // func
-		"addl  4(%%ebx), %%esp  \n" // pop arguments
-#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
-		"addl  $4, %%esp        \n" // Pop the return pointer
-#endif
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-asQWORD NOINLINE CallCDeclFunctionRetByRefObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		push obj
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-		// Push the return pointer
-		push retPtr;
-
-		// Call function
-		call [func]
-
-		// Pop arguments from stack
-		add  esp, paramSize
-		add  esp, 4
-
-#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
-		// Pop the return pointer
-		add  esp, 4
-#endif
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  8(%%ebx), %%eax  \n" // paramSize
-		"addl  $12, %%eax       \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		"pushl 0(%%ebx)         \n" // obj
-		"movl  8(%%ebx), %%ecx  \n" // paramSize
-		"movl  4(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy4         \n"
-		"copyloop4:             \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop4        \n"
-		"endcopy4:              \n"
-		"pushl 16(%%ebx)        \n" // retPtr
-		"call  *12(%%ebx)       \n" // func
-		"addl  8(%%ebx), %%esp  \n" // pop arguments
-#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
-		"addl  $8, %%esp        \n" // Pop the return pointer and object pointer
-#else
-		"addl  $4, %%esp        \n" // Pop the object pointer
-#endif
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-asQWORD NOINLINE CallSTDCallFunction(const asDWORD *args, int paramSize, asFUNCTION_t func)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-		// Call function
-		call [func]
-
-		// The callee already removed parameters from the stack
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  4(%%ebx), %%eax  \n" // paramSize
-		"addl  $4, %%eax        \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		"movl  4(%%ebx), %%ecx  \n" // paramSize
-		"movl  0(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy2         \n"
-		"copyloop2:             \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop2        \n"
-		"endcopy2:              \n"
-		"call  *8(%%ebx)        \n" // callee pops the arguments
-
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-
-asQWORD NOINLINE CallThisCallFunction(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		// Push the object pointer on the stack
-		push obj
-#else
-		// Move object pointer to ECX
-		mov  ecx, obj
-#endif
-
-		// Call function
-		call [func]
-
-#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
-		// Pop arguments
-		add  esp, paramSize
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		// Pop object pointer
-		add esp, 4
-#endif
-#endif
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)    "\n"
-		"pushl %%ebx            \n"
-		"movl  %%edx, %%ebx     \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  8(%%ebx), %%eax  \n" // paramSize
-		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx     \n"
-		"subl  %%eax, %%ecx     \n"
-		"andl  $15, %%ecx       \n"
-		"movl  %%esp, %%eax     \n"
-		"subl  %%ecx, %%esp     \n"
-		"pushl %%eax            \n" // Store the original stack pointer
-
-		"movl  8(%%ebx), %%ecx  \n" // paramSize
-		"movl  4(%%ebx), %%eax  \n" // args
-		"addl  %%ecx, %%eax     \n" // push all arguments on the stack
-		"cmp   $0, %%ecx        \n"
-		"je    endcopy1         \n"
-		"copyloop1:             \n"
-		"subl  $4, %%eax        \n"
-		"pushl (%%eax)          \n"
-		"subl  $4, %%ecx        \n"
-		"jne   copyloop1        \n"
-		"endcopy1:              \n"
-		"movl  0(%%ebx), %%ecx  \n" // move obj into ECX
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		"pushl %%ecx            \n" // push obj on the stack
-#endif
-		"call  *12(%%ebx)       \n"
-#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
-		"addl  8(%%ebx), %%esp  \n" // pop arguments
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		"addl  $4, %%esp        \n" // pop obj
-#endif
-#endif
-		// Pop the alignment bytes
-		"popl  %%esp            \n"
-		"popl  %%ebx            \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-asQWORD NOINLINE CallThisCallFunctionRetByRef(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
-{
-	volatile asQWORD retQW = 0;
-
-#if defined ASM_INTEL
-
-	// Copy the data to the real stack. If we fail to do
-	// this we may run into trouble in case of exceptions.
-	__asm
-	{
-		// We must save registers that are used
-		push ecx
-
-		// Clear the FPU stack, in case the called function doesn't do it by itself
-		CLEAR_FPU_STACK
-
-		// Copy arguments from script
-		// stack to application stack
-		mov  ecx, paramSize
-		mov  eax, args
-		add  eax, ecx
-		cmp  ecx, 0
-		je   endcopy
-copyloop:
-		sub  eax, 4
-		push dword ptr [eax]
-		sub  ecx, 4
-		jne  copyloop
-endcopy:
-
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		// Push the object pointer on the stack
-		push obj
-#else
-		// Move object pointer to ECX
-		mov  ecx, obj
-#endif
-
-		// Push the return pointer
-		push retPtr
-
-		// Call function
-		call [func]
-
-#ifndef THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
-		// Pop the return pointer
-		add  esp, 4
-#endif
-
-#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
-		// Pop arguments
-		add  esp, paramSize
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		// Pop object pointer
-		add esp, 4
-#endif
-#endif
-
-		// Copy return value from EAX:EDX
-		lea  ecx, retQW
-		mov  [ecx], eax
-		mov  4[ecx], edx
-
-		// Restore registers
-		pop  ecx
-	}
-
-#elif defined ASM_AT_N_T
-
-	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
-
-	asm __volatile__ (
-#ifdef __OPTIMIZE__
-		// When compiled with optimizations the stack unwind doesn't work properly, 
-		// causing exceptions to crash the application. By adding this prologue
-		// and the epilogue below, the stack unwind works as it should. 
-		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
-		"pushl %%ebp               \n"
-		".cfi_adjust_cfa_offset 4  \n"
-		".cfi_rel_offset ebp, 0    \n"
-		"movl %%esp, %%ebp         \n"
-		".cfi_def_cfa_register ebp \n"
-#endif
-		_S(CLEAR_FPU_STACK)   "\n"
-		"pushl %%ebx           \n"
-		"movl  %%edx, %%ebx    \n"
-
-		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
-		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
-		// to calculate how much we will put on the stack during this call.
-		"movl  8(%%ebx), %%eax \n" // paramSize
-		"addl  $12, %%eax      \n" // counting esp that we will push on the stack
-		"movl  %%esp, %%ecx    \n"
-		"subl  %%eax, %%ecx    \n"
-		"andl  $15, %%ecx      \n"
-		"movl  %%esp, %%eax    \n"
-		"subl  %%ecx, %%esp    \n"
-		"pushl %%eax           \n" // Store the original stack pointer
-
-		"movl  8(%%ebx), %%ecx \n" // paramSize
-		"movl  4(%%ebx), %%eax \n" // args
-		"addl  %%ecx, %%eax    \n" // push all arguments to the stack
-		"cmp   $0, %%ecx       \n"
-		"je    endcopy3        \n"
-		"copyloop3:            \n"
-		"subl  $4, %%eax       \n"
-		"pushl (%%eax)         \n"
-		"subl  $4, %%ecx       \n"
-		"jne   copyloop3       \n"
-		"endcopy3:             \n"
-#ifdef AS_MINGW47
-		// MinGW made some strange choices with 4.7 and the thiscall calling convention,
-		// returning an object in memory is completely different from when not returning
-		// in memory
-		"pushl 0(%%ebx)        \n" // push obj on the stack
-		"movl 16(%%ebx), %%ecx \n" // move the return pointer into ECX
-		"call  *12(%%ebx)      \n" // call the function
-#else
-		"movl  0(%%ebx), %%ecx \n" // move obj into ECX
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		"pushl %%ecx           \n" // push obj on the stack
-#endif
-		"pushl 16(%%ebx)       \n" // push retPtr on the stack
-		"call  *12(%%ebx)      \n"
-#ifndef THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
-		"addl  $4, %%esp       \n" // pop return pointer
-#endif
-#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
-		"addl  8(%%ebx), %%esp \n" // pop arguments
-#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-		"addl  $4, %%esp       \n" // pop the object pointer
-#endif
-#endif
-#endif // AS_MINGW47
-		// Pop the alignment bytes
-		"popl  %%esp           \n"
-		"popl  %%ebx           \n"
-#ifdef __OPTIMIZE__
-		// Epilogue
-		"movl %%ebp, %%esp         \n"
-		".cfi_def_cfa_register esp \n"
-		"popl %%ebp                \n"
-		".cfi_adjust_cfa_offset -4 \n"
-		".cfi_restore ebp          \n"
-#endif
-		// Copy EAX:EDX to retQW. As the stack pointer has been
-		// restored it is now safe to access the local variable
-		"leal  %1, %%ecx        \n"
-		"movl  %%eax, 0(%%ecx)  \n"
-		"movl  %%edx, 4(%%ecx)  \n"
-		:                           // output
-		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
-		: "%eax", "%ecx"            // clobber
-		);
-
-#endif
-
-	return retQW;
-}
-
-asDWORD GetReturnedFloat()
-{
-	asDWORD f;
-
-#if defined ASM_INTEL
-
-	// Get the float value from ST0
-	__asm fstp dword ptr [f]
-
-#elif defined ASM_AT_N_T
-
-	asm("fstps %0 \n" : "=m" (f));
-
-#endif
-
-	return f;
-}
-
-asQWORD GetReturnedDouble()
-{
-	asQWORD d;
-
-#if defined ASM_INTEL
-
-	// Get the double value from ST0
-	__asm fstp qword ptr [d]
-
-#elif defined ASM_AT_N_T
-
-	asm("fstpl %0 \n" : "=m" (d));
-
-#endif
-
-	return d;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_X86
-#endif // AS_MAX_PORTABILITY
-
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2018 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_x86.cpp
+//
+// These functions handle the actual calling of system functions
+//
+// Added support for functor methods by Jordi Oliveras Rovira in April, 2014.
+//
+
+
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#ifdef AS_X86
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+BEGIN_AS_NAMESPACE
+
+//
+// With some compile level optimizations the functions don't clear the FPU
+// stack themselves. So we have to do it as part of calling the native functions,
+// as the compiler will not be able to predict when it is supposed to do it by
+// itself due to the dynamic nature of scripts
+//
+// - fninit clears the FPU stack and the FPU control word
+// - emms only clears the FPU stack, while preserving the FPU control word
+//
+// By default I use fninit as it seems to be what works for most people,
+// but some may find it necessary to define this as emms instead.
+//
+// TODO: Figure out when one or the other must be used, and a way to
+//       configure this automatically in as_config.h
+//
+#ifndef CLEAR_FPU_STACK
+#define CLEAR_FPU_STACK fninit
+#endif
+
+// These macros are just to allow me to use the above macro in the GNUC style inline assembly
+#define _S(x) _TOSTRING(x)
+#define _TOSTRING(x) #x
+
+// Prototypes
+asQWORD CallCDeclFunction(const asDWORD *args, int paramSize, asFUNCTION_t func);
+asQWORD CallCDeclFunctionObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func);
+asQWORD CallCDeclFunctionObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func);
+asQWORD CallCDeclFunctionRetByRef(const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr);
+asQWORD CallCDeclFunctionRetByRefObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr);
+asQWORD CallCDeclFunctionRetByRefObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr);
+asQWORD CallSTDCallFunction(const asDWORD *args, int paramSize, asFUNCTION_t func);
+asQWORD CallThisCallFunction(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func);
+asQWORD CallThisCallFunctionRetByRef(const void *, const asDWORD *, int, asFUNCTION_t, void *retPtr);
+
+asDWORD GetReturnedFloat();
+asQWORD GetReturnedDouble();
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void *secondObject)
+{
+	asCScriptEngine            *engine    = context->m_engine;
+	asSSystemFunctionInterface *sysFunc   = descr->sysFuncIntf;
+
+	asQWORD retQW = 0;
+
+	// Prepare the parameters
+	asDWORD paramBuffer[64];
+	int callConv = sysFunc->callConv;
+
+	// Changed because need check for ICC_THISCALL_OBJFIRST or
+	// ICC_THISCALL_OBJLAST if sysFunc->takesObjByVal (avoid copy code)
+	// Check if is THISCALL_OBJ* calling convention (in this case needs to add secondObject pointer into stack).
+	bool isThisCallMethod = callConv >= ICC_THISCALL_OBJLAST;
+	int paramSize = isThisCallMethod || sysFunc->takesObjByVal ? 0 : sysFunc->paramSize;
+
+	int dpos = 1;
+
+	if( isThisCallMethod &&
+		(callConv >= ICC_THISCALL_OBJFIRST &&
+		 callConv <= ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM) )
+	{
+		// Add the object pointer as the first parameter
+		paramBuffer[dpos++] = (asDWORD)secondObject;
+		paramSize++;
+	}
+
+	if( sysFunc->takesObjByVal || isThisCallMethod )
+	{
+		int spos = 0;
+
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			if( descr->parameterTypes[n].IsObject() && !descr->parameterTypes[n].IsObjectHandle() && !descr->parameterTypes[n].IsReference() )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					paramSize++;
+				}
+				else
+#endif
+				{
+					// Copy the object's memory to the buffer
+					// TODO: bug: Must call the object's copy constructor instead of doing a memcpy,
+					//            as the object may hold a pointer to itself. It's not enough to
+					//            change only this memcpy as the assembler routine also makes a copy
+					//            of paramBuffer to the final stack location. To avoid the second
+					//            copy the C++ routine should point paramBuffer to the final stack
+					//            position and copy the values directly to that location. The assembler
+					//            routines then don't need to copy anything, and will just be
+					//            responsible for setting up the registers and the stack frame appropriately.
+					memcpy(&paramBuffer[dpos], *(void**)(args+spos), descr->parameterTypes[n].GetSizeInMemoryBytes());
+
+					// Delete the original memory
+					engine->CallFree(*(char**)(args+spos));
+					spos++;
+					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
+				}
+			}
+			else
+			{
+				// Copy the value directly
+				paramBuffer[dpos++] = args[spos++];
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+					paramBuffer[dpos++] = args[spos++];
+				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+			}
+		}
+		// Keep a free location at the beginning
+		args = &paramBuffer[1];
+	}
+
+	if( isThisCallMethod &&
+		(callConv >= ICC_THISCALL_OBJLAST &&
+		 callConv <= ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM) )
+	{
+		// Add the object pointer as the last parameter
+		paramBuffer[dpos++] = (asDWORD)secondObject;
+		paramSize++;
+	}
+
+	// Make the actual call
+	asFUNCTION_t func = sysFunc->func;
+	if( sysFunc->hostReturnInMemory )
+		callConv++;
+
+	switch( callConv )
+	{
+	case ICC_CDECL:
+		retQW = CallCDeclFunction(args, paramSize<<2, func);
+		break;
+
+	case ICC_CDECL_RETURNINMEM:
+		retQW = CallCDeclFunctionRetByRef(args, paramSize<<2, func, retPointer);
+		break;
+
+	case ICC_STDCALL:
+		retQW = CallSTDCallFunction(args, paramSize<<2, func);
+		break;
+
+	case ICC_STDCALL_RETURNINMEM:
+		// Push the return pointer on the stack
+		paramSize++;
+		args--;
+		*(asPWORD*)args = (size_t)retPointer;
+
+		retQW = CallSTDCallFunction(args, paramSize<<2, func);
+		break;
+
+	case ICC_THISCALL:
+	case ICC_THISCALL_OBJFIRST:
+	case ICC_THISCALL_OBJLAST:
+		retQW = CallThisCallFunction(obj, args, paramSize<<2, func);
+		break;
+
+	case ICC_THISCALL_RETURNINMEM:
+	case ICC_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_THISCALL_OBJLAST_RETURNINMEM:
+		retQW = CallThisCallFunctionRetByRef(obj, args, paramSize<<2, func, retPointer);
+		break;
+
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST:
+	case ICC_VIRTUAL_THISCALL_OBJLAST:
+		{
+			// Get virtual function table from the object pointer
+			asFUNCTION_t *vftable = *(asFUNCTION_t**)obj;
+			retQW = CallThisCallFunction(obj, args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2]);
+		}
+		break;
+
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJFIRST_RETURNINMEM:
+	case ICC_VIRTUAL_THISCALL_OBJLAST_RETURNINMEM:
+		{
+			// Get virtual function table from the object pointer
+			asFUNCTION_t *vftable = *(asFUNCTION_t**)obj;
+			retQW = CallThisCallFunctionRetByRef(obj, args, paramSize<<2, vftable[FuncPtrToUInt(func)>>2], retPointer);
+		}
+		break;
+
+	case ICC_CDECL_OBJLAST:
+		retQW = CallCDeclFunctionObjLast(obj, args, paramSize<<2, func);
+		break;
+
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+		// Call the system object method as a cdecl with the obj ref as the last parameter
+		retQW = CallCDeclFunctionRetByRefObjLast(obj, args, paramSize<<2, func, retPointer);
+		break;
+
+	case ICC_CDECL_OBJFIRST:
+		// Call the system object method as a cdecl with the obj ref as the first parameter
+		retQW = CallCDeclFunctionObjFirst(obj, args, paramSize<<2, func);
+		break;
+
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+		// Call the system object method as a cdecl with the obj ref as the first parameter
+		retQW = CallCDeclFunctionRetByRefObjFirst(obj, args, paramSize<<2, func, retPointer);
+		break;
+
+	default:
+		context->SetInternalException(TXT_INVALID_CALLING_CONVENTION);
+	}
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+
+	return retQW;
+}
+
+// On GCC we need to prevent the compiler from inlining these assembler routines when
+// optimizing for speed (-O3), as the loop labels get duplicated which cause compile errors.
+
+#ifdef __GNUC__
+    #define NOINLINE __attribute ((__noinline__))
+#else
+    #define NOINLINE
+#endif
+
+
+asQWORD NOINLINE CallCDeclFunction(const asDWORD *args, int paramSize, asFUNCTION_t func)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+		// Call function
+		call [func]
+
+		// Pop arguments from stack
+		add  esp, paramSize
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	// It is not possible to rely on ESP or BSP to refer to variables or arguments on the stack
+	// depending on compiler settings BSP may not even be used, and the ESP is not always on the
+	// same offset from the local variables. Because the code adjusts the ESP register it is not
+	// possible to inform the arguments through symbolic names below.
+
+	// It's not also not possible to rely on the memory layout of the function arguments, because
+	// on some compiler versions and settings the arguments may be copied to local variables with a
+	// different ordering before they are accessed by the rest of the code.
+
+	// I'm copying the arguments into this array where I know the exact memory layout. The address
+	// of this array will then be passed to the inline asm in the EDX register.
+	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+
+	asm __volatile__(
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  4(%%ebx), %%eax  \n" // paramSize
+		"addl  $4, %%eax        \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		// Copy all arguments to the stack and call the function
+		"movl  4(%%ebx), %%ecx  \n" // paramSize
+		"movl  0(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy          \n"
+		"copyloop:              \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop         \n"
+		"endcopy:               \n"
+		"call  *8(%%ebx)        \n"
+		"addl  4(%%ebx), %%esp  \n" // pop arguments
+
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+asQWORD NOINLINE CallCDeclFunctionObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Push the object pointer as the last argument to the function
+		push obj
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+		// Call function
+		call [func]
+
+		// Pop arguments from stack
+		add  esp, paramSize
+		add  esp, 4
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  8(%%ebx), %%eax  \n" // paramSize
+		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		"pushl 0(%%ebx)         \n" // obj
+		"movl  8(%%ebx), %%ecx  \n" // paramSize
+		"movl  4(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy8         \n"
+		"copyloop8:             \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop8        \n"
+		"endcopy8:              \n"
+		"call  *12(%%ebx)       \n"
+		"addl  8(%%ebx), %%esp  \n" // pop arguments
+		"addl  $4, %%esp        \n" // pop obj
+
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+asQWORD NOINLINE CallCDeclFunctionObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+		// push object as first parameter
+		push obj
+
+		// Call function
+		call [func]
+
+		// Pop arguments from stack
+		add  esp, paramSize
+		add  esp, 4
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  8(%%ebx), %%eax  \n" // paramSize
+		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		"movl  8(%%ebx), %%ecx  \n" // paramSize
+		"movl  4(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy6         \n"
+		"copyloop6:             \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop6        \n"
+		"endcopy6:              \n"
+		"pushl 0(%%ebx)         \n" // push obj
+		"call  *12(%%ebx)       \n"
+		"addl  8(%%ebx), %%esp  \n" // pop arguments
+		"addl  $4, %%esp        \n" // pop obj
+
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+asQWORD NOINLINE CallCDeclFunctionRetByRefObjFirst(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+		// Push the object pointer
+		push obj
+
+		// Push the return pointer
+		push retPtr;
+
+		// Call function
+		call [func]
+
+		// Pop arguments from stack
+		add  esp, paramSize
+
+#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
+		// Pop the return pointer
+		add  esp, 8
+#else
+		add  esp, 4
+#endif
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  8(%%ebx), %%eax  \n" // paramSize
+		"addl  $12, %%eax       \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		"movl  8(%%ebx), %%ecx  \n" // paramSize
+		"movl  4(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy5         \n"
+		"copyloop5:             \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop5        \n"
+		"endcopy5:              \n"
+		"pushl 0(%%ebx)         \n" // push object first
+		"pushl 16(%%ebx)        \n" // retPtr
+		"call  *12(%%ebx)       \n" // func
+		"addl  8(%%ebx), %%esp  \n" // pop arguments
+#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
+		"addl  $8, %%esp        \n" // Pop the return pointer and object pointer
+#else
+		"addl  $4, %%esp        \n" // Pop the object pointer
+#endif
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+#endif
+
+	return retQW;
+}
+
+asQWORD NOINLINE CallCDeclFunctionRetByRef(const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+		// Push the return pointer
+		push retPtr;
+
+		// Call function
+		call [func]
+
+		// Pop arguments from stack
+		add  esp, paramSize
+
+#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
+		// Pop the return pointer
+		add  esp, 4
+#endif
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+
+		// return value in EAX or EAX:EDX
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  4(%%ebx), %%eax  \n" // paramSize
+		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		"movl  4(%%ebx), %%ecx  \n" // paramSize
+		"movl  0(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy7         \n"
+		"copyloop7:             \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop7        \n"
+		"endcopy7:              \n"
+		"pushl 12(%%ebx)        \n" // retPtr
+		"call  *8(%%ebx)        \n" // func
+		"addl  4(%%ebx), %%esp  \n" // pop arguments
+#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
+		"addl  $4, %%esp        \n" // Pop the return pointer
+#endif
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+asQWORD NOINLINE CallCDeclFunctionRetByRefObjLast(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		push obj
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+		// Push the return pointer
+		push retPtr;
+
+		// Call function
+		call [func]
+
+		// Pop arguments from stack
+		add  esp, paramSize
+		add  esp, 4
+
+#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
+		// Pop the return pointer
+		add  esp, 4
+#endif
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  8(%%ebx), %%eax  \n" // paramSize
+		"addl  $12, %%eax       \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		"pushl 0(%%ebx)         \n" // obj
+		"movl  8(%%ebx), %%ecx  \n" // paramSize
+		"movl  4(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy4         \n"
+		"copyloop4:             \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop4        \n"
+		"endcopy4:              \n"
+		"pushl 16(%%ebx)        \n" // retPtr
+		"call  *12(%%ebx)       \n" // func
+		"addl  8(%%ebx), %%esp  \n" // pop arguments
+#ifndef CALLEE_POPS_HIDDEN_RETURN_POINTER
+		"addl  $8, %%esp        \n" // Pop the return pointer and object pointer
+#else
+		"addl  $4, %%esp        \n" // Pop the object pointer
+#endif
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+asQWORD NOINLINE CallSTDCallFunction(const asDWORD *args, int paramSize, asFUNCTION_t func)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+		// Call function
+		call [func]
+
+		// The callee already removed parameters from the stack
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  4(%%ebx), %%eax  \n" // paramSize
+		"addl  $4, %%eax        \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		"movl  4(%%ebx), %%ecx  \n" // paramSize
+		"movl  0(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy2         \n"
+		"copyloop2:             \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop2        \n"
+		"endcopy2:              \n"
+		"call  *8(%%ebx)        \n" // callee pops the arguments
+
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+
+asQWORD NOINLINE CallThisCallFunction(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		// Push the object pointer on the stack
+		push obj
+#else
+		// Move object pointer to ECX
+		mov  ecx, obj
+#endif
+
+		// Call function
+		call [func]
+
+#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
+		// Pop arguments
+		add  esp, paramSize
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		// Pop object pointer
+		add esp, 4
+#endif
+#endif
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)    "\n"
+		"pushl %%ebx            \n"
+		"movl  %%edx, %%ebx     \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  8(%%ebx), %%eax  \n" // paramSize
+		"addl  $8, %%eax        \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx     \n"
+		"subl  %%eax, %%ecx     \n"
+		"andl  $15, %%ecx       \n"
+		"movl  %%esp, %%eax     \n"
+		"subl  %%ecx, %%esp     \n"
+		"pushl %%eax            \n" // Store the original stack pointer
+
+		"movl  8(%%ebx), %%ecx  \n" // paramSize
+		"movl  4(%%ebx), %%eax  \n" // args
+		"addl  %%ecx, %%eax     \n" // push all arguments on the stack
+		"cmp   $0, %%ecx        \n"
+		"je    endcopy1         \n"
+		"copyloop1:             \n"
+		"subl  $4, %%eax        \n"
+		"pushl (%%eax)          \n"
+		"subl  $4, %%ecx        \n"
+		"jne   copyloop1        \n"
+		"endcopy1:              \n"
+		"movl  0(%%ebx), %%ecx  \n" // move obj into ECX
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		"pushl %%ecx            \n" // push obj on the stack
+#endif
+		"call  *12(%%ebx)       \n"
+#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
+		"addl  8(%%ebx), %%esp  \n" // pop arguments
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		"addl  $4, %%esp        \n" // pop obj
+#endif
+#endif
+		// Pop the alignment bytes
+		"popl  %%esp            \n"
+		"popl  %%ebx            \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+asQWORD NOINLINE CallThisCallFunctionRetByRef(const void *obj, const asDWORD *args, int paramSize, asFUNCTION_t func, void *retPtr)
+{
+	volatile asQWORD retQW = 0;
+
+#if defined ASM_INTEL
+
+	// Copy the data to the real stack. If we fail to do
+	// this we may run into trouble in case of exceptions.
+	__asm
+	{
+		// We must save registers that are used
+		push ecx
+
+		// Clear the FPU stack, in case the called function doesn't do it by itself
+		CLEAR_FPU_STACK
+
+		// Copy arguments from script
+		// stack to application stack
+		mov  ecx, paramSize
+		mov  eax, args
+		add  eax, ecx
+		cmp  ecx, 0
+		je   endcopy
+copyloop:
+		sub  eax, 4
+		push dword ptr [eax]
+		sub  ecx, 4
+		jne  copyloop
+endcopy:
+
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		// Push the object pointer on the stack
+		push obj
+#else
+		// Move object pointer to ECX
+		mov  ecx, obj
+#endif
+
+		// Push the return pointer
+		push retPtr
+
+		// Call function
+		call [func]
+
+#ifndef THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
+		// Pop the return pointer
+		add  esp, 4
+#endif
+
+#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
+		// Pop arguments
+		add  esp, paramSize
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		// Pop object pointer
+		add esp, 4
+#endif
+#endif
+
+		// Copy return value from EAX:EDX
+		lea  ecx, retQW
+		mov  [ecx], eax
+		mov  4[ecx], edx
+
+		// Restore registers
+		pop  ecx
+	}
+
+#elif defined ASM_AT_N_T
+
+	volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)};
+
+	asm __volatile__ (
+#ifdef __OPTIMIZE__
+		// When compiled with optimizations the stack unwind doesn't work properly,
+		// causing exceptions to crash the application. By adding this prologue
+		// and the epilogue below, the stack unwind works as it should.
+		// TODO: runtime optimize: The prologue/epilogue shouldn't be needed if the correct cfi directives are used below
+		"pushl %%ebp               \n"
+		".cfi_adjust_cfa_offset 4  \n"
+		".cfi_rel_offset ebp, 0    \n"
+		"movl %%esp, %%ebp         \n"
+		".cfi_def_cfa_register ebp \n"
+#endif
+		_S(CLEAR_FPU_STACK)   "\n"
+		"pushl %%ebx           \n"
+		"movl  %%edx, %%ebx    \n"
+
+		// Need to align the stack pointer so that it is aligned to 16 bytes when making the function call.
+		// It is assumed that when entering this function, the stack pointer is already aligned, so we need
+		// to calculate how much we will put on the stack during this call.
+		"movl  8(%%ebx), %%eax \n" // paramSize
+		"addl  $12, %%eax      \n" // counting esp that we will push on the stack
+		"movl  %%esp, %%ecx    \n"
+		"subl  %%eax, %%ecx    \n"
+		"andl  $15, %%ecx      \n"
+		"movl  %%esp, %%eax    \n"
+		"subl  %%ecx, %%esp    \n"
+		"pushl %%eax           \n" // Store the original stack pointer
+
+		"movl  8(%%ebx), %%ecx \n" // paramSize
+		"movl  4(%%ebx), %%eax \n" // args
+		"addl  %%ecx, %%eax    \n" // push all arguments to the stack
+		"cmp   $0, %%ecx       \n"
+		"je    endcopy3        \n"
+		"copyloop3:            \n"
+		"subl  $4, %%eax       \n"
+		"pushl (%%eax)         \n"
+		"subl  $4, %%ecx       \n"
+		"jne   copyloop3       \n"
+		"endcopy3:             \n"
+#ifdef AS_MINGW47
+		// MinGW made some strange choices with 4.7 and the thiscall calling convention,
+		// returning an object in memory is completely different from when not returning
+		// in memory
+		"pushl 0(%%ebx)        \n" // push obj on the stack
+		"movl 16(%%ebx), %%ecx \n" // move the return pointer into ECX
+		"call  *12(%%ebx)      \n" // call the function
+#else
+		"movl  0(%%ebx), %%ecx \n" // move obj into ECX
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		"pushl %%ecx           \n" // push obj on the stack
+#endif
+		"pushl 16(%%ebx)       \n" // push retPtr on the stack
+		"call  *12(%%ebx)      \n"
+#ifndef THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
+		"addl  $4, %%esp       \n" // pop return pointer
+#endif
+#ifndef THISCALL_CALLEE_POPS_ARGUMENTS
+		"addl  8(%%ebx), %%esp \n" // pop arguments
+#ifdef THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+		"addl  $4, %%esp       \n" // pop the object pointer
+#endif
+#endif
+#endif // AS_MINGW47
+		// Pop the alignment bytes
+		"popl  %%esp           \n"
+		"popl  %%ebx           \n"
+#ifdef __OPTIMIZE__
+		// Epilogue
+		"movl %%ebp, %%esp         \n"
+		".cfi_def_cfa_register esp \n"
+		"popl %%ebp                \n"
+		".cfi_adjust_cfa_offset -4 \n"
+		".cfi_restore ebp          \n"
+#endif
+		// Copy EAX:EDX to retQW. As the stack pointer has been
+		// restored it is now safe to access the local variable
+		"leal  %1, %%ecx        \n"
+		"movl  %%eax, 0(%%ecx)  \n"
+		"movl  %%edx, 4(%%ecx)  \n"
+		:                           // output
+		: "d"(a), "m"(retQW)        // input - pass pointer of args in edx, pass pointer of retQW in memory argument
+		: "%eax", "%ecx"            // clobber
+		);
+
+#endif
+
+	return retQW;
+}
+
+asDWORD GetReturnedFloat()
+{
+	asDWORD f;
+
+#if defined ASM_INTEL
+
+	// Get the float value from ST0
+	__asm fstp dword ptr [f]
+
+#elif defined ASM_AT_N_T
+
+	asm("fstps %0 \n" : "=m" (f));
+
+#endif
+
+	return f;
+}
+
+asQWORD GetReturnedDouble()
+{
+	asQWORD d;
+
+#if defined ASM_INTEL
+
+	// Get the double value from ST0
+	__asm fstp qword ptr [d]
+
+#elif defined ASM_AT_N_T
+
+	asm("fstpl %0 \n" : "=m" (d));
+
+#endif
+
+	return d;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_X86
+#endif // AS_MAX_PORTABILITY
+
+
+
+
diff --git a/Sources/AngelScript/source/as_callfunc_xenon.cpp b/Sources/AngelScript/source/as_callfunc_xenon.cpp
old mode 100755
new mode 100644
index 563be6b49..c52055e99
--- a/Sources/AngelScript/source/as_callfunc_xenon.cpp
+++ b/Sources/AngelScript/source/as_callfunc_xenon.cpp
@@ -1,737 +1,737 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_callfunc_xenon.cpp
-//
-// These functions handle the actual calling of system functions
-//
-// This version is Xenon specific
-// Modified from as_callfunc_ppc.cpp by Laszlo Perneky February 2007
-//
-// Modified by Cyril Tissier March 2010:
-// various fixes in 'float' args passing / function return
-// properly handling 'double' type
-// various fixes in asm ppcFunc
-// fix for variable arguments
-//
-// Modified by Anthony Clark May 2015
-// Fixed the issue where int64 and uint64 could not be passed nativly
-// few minor fixes within asm ppcFunc to handle int64 and uint64
-
-
-// XBox 360 calling convention
-// ===========================
-// I've yet to find an official document with the ABI for XBox 360, 
-// but I'll describe what I've gathered from the code and tests
-// performed by the AngelScript community.
-//
-// Arguments are passed in the following registers:
-// r3  - r10   : integer/pointer arguments (each register is 64bit)
-// fr1 - fr13  : float/double arguments    (each register is 64bit)
-// 
-// Arguments that don't fit in the registers will be pushed on the stack.
-// 
-// When a float or double is passed as argument, its value will be placed
-// in the next available float register, but it will also reserve general
-// purpose register. 
-// 
-// Example: void foo(float a, int b). a will be passed in fr1 and b in r4.
-//
-// For each argument passed to a function an 8byte slot is reserved on the 
-// stack, so that the function can offload the value there if needed. The
-// first slot is at r1+20, the next at r1+28, etc.
-//
-// If the function is a class method, the this pointer is passed as hidden 
-// first argument. If the function returns an object in memory, the address
-// for that memory is passed as hidden first argument.
-//
-// Return value are placed in the following registers:
-// r3  : integer/pointer values
-// fr1 : float/double values
-//
-// Rules for registers
-// r1          : stack pointer
-// r14-r31     : nonvolatile, i.e. their values must be preserved
-// fr14-fr31   : nonvolatile, i.e. their values must be preserved
-// r0, r2, r13 : dedicated. I'm not sure what it means, but it is probably best not to use them
-//
-// The stack pointer must always be aligned at 8 bytes.
-//
-// References:
-// https://www-01.ibm.com/chips/techlib/techlib.nsf/techdocs/852569B20050FF77852569970071B0D6/$file/eabi_app.pdf
-//
-// TODO: The code doesn't handle objects passed by value (unless they are max 4 bytes in size)
-
-
-
-#include "as_config.h"
-
-#ifndef AS_MAX_PORTABILITY
-#if defined(AS_XENON)
-
-#include "as_callfunc.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-#include "as_tokendef.h"
-#include "as_context.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <xtl.h>
-
-BEGIN_AS_NAMESPACE
-
-#define AS_PPC_MAX_ARGS         32
-#define AS_PPC_THISCALL_REG     1
-#define AS_PPC_RETURNINMEM_REG  1
-#define AS_PPC_ENDOFARGS        1
-
-// The array used to send values to the correct places.
-// Contains a byte of argTypes to indicate the register type to load, or zero if end of arguments
-enum argTypes
-{
-	ppcENDARG    = 0,
-	ppcINTARG    = 1,
-	ppcFLOATARG  = 2,
-	ppcDOUBLEARG = 3
-};
-
-// Loads all data into the correct places and calls the function.
-// pArgs     is the array of the argument values
-// pArgTypes is an array containing a byte indicating the type (enum argTypes) for each argument.
-// dwFunc    is the address of the function that will be called
-asQWORD __declspec( naked ) ppcFunc(const asQWORD* pArgs, asDWORD dwFunc, const asBYTE* pArgTypes)
-{
-	__asm
-	{
-_ppcFunc:
-		// Prologue
-		// Read and stack the link register (return address)
-		mflr    r12
-		stw     r12,-8(r1)
-
-		// Backup all non-volatile registers we use in this function
-		std     r31,-10h(r1) // stack pointer for pushing arguments
-		std     r27,-18h(r1) // dwFunc
-		std     r26,-20h(r1) // pArgs
-		std     r25,-28h(r1) // pArgTypes
-		std     r24,-30h(r1) // current arg type
-		std     r23,-38h(r1) // counter for used GPRs
-		std     r22,-40h(r1) // counter for used float registers
-
-		// Setup the stack frame to make room for the backup of registers
-		// and the arguments that will be passed to the application function.
-		// 512 bytes is enough for about 50 arguments plus backup of 8
-		// TODO: Should perhaps make this dynamic based on number of arguments
-		stwu	r1,-200h(r1)
-
-//////////////////////////////////////////////////////////////////////////
-// Initialize local variables
-//////////////////////////////////////////////////////////////////////////
-
-		// r31 is our pointer into the stack where the arguments will be place
-		// The MSVC optimizer seems to rely on nobody copying the r1 register directly
-		// so we can't just do a simple 'addi r31, r1, 14h' as the optimizer may
-		// end up moving this instruction to before the update of r1 above. 
-		// Instead we'll read the previous stack pointer from the stack, and then 
-		// subtract to get the correct offset.
-		lwz		r31, 0(r1)
-		subi	r31, r31, 1ECh	// prev r1 - 512 + 20 = curr r1 + 20
-
-		mr r26, r3			// pArgs
-		mr r27, r4			// dwFunc
-		mr r25, r5			// pArgTypes
-
-		// Counting of used/assigned GPR's
-		sub  r23, r23, r23
-		// Counting of used/assigned Float Registers
-		sub  r22, r22, r22
-
-		// Begin loading and stacking registers
-		subi r25, r25, 1
-
-//////////////////////////////////////////////////////////////////////////
-// Fetch the next argument
-//////////////////////////////////////////////////////////////////////////
-ppcNextArg:
-		// Increment rArgTypePtr
-		addi r25, r25, 1
-		// Get data type
-		lbz r24, 0(r25)
-
-		// r24 holds the data type
-		cmplwi cr6, r24, 0
-		beq    cr6, ppcArgsEnd
-		cmplwi cr6, r24, 1
-		beq    cr6, ppcArgIsInteger
-		cmplwi cr6, r24, 2
-		beq    cr6, ppcArgIsFloat
-		cmplwi cr6, r24, 3
-		beq    cr6, ppcArgIsDouble
-
-//////////////////////////////////////////////////////////////////////////
-// Load and stack integer arguments
-//////////////////////////////////////////////////////////////////////////
-ppcArgIsInteger:
-		// Get the arg from the stack
-		ld  r12, 0(r26)
-
-		// r23 holds the integer arg count so far
-		cmplwi cr6, r23, 0
-		beq    cr6, ppcLoadIntReg0
-		cmplwi cr6, r23, 1
-		beq    cr6, ppcLoadIntReg1
-		cmplwi cr6, r23, 2
-		beq    cr6, ppcLoadIntReg2
-		cmplwi cr6, r23, 3
-		beq    cr6, ppcLoadIntReg3
-		cmplwi cr6, r23, 4
-		beq    cr6, ppcLoadIntReg4
-		cmplwi cr6, r23, 5
-		beq    cr6, ppcLoadIntReg5
-		cmplwi cr6, r23, 6
-		beq    cr6, ppcLoadIntReg6
-		cmplwi cr6, r23, 7
-		beq    cr6, ppcLoadIntReg7
-
-		// no more than 8 parameters
-		b		ppcLoadIntRegUpd
-
-		ppcLoadIntReg0:
-		mr r3, r12
-		b ppcLoadIntRegUpd
-		ppcLoadIntReg1:
-		mr r4, r12
-		b ppcLoadIntRegUpd
-		ppcLoadIntReg2:
-		mr r5, r12
-		b ppcLoadIntRegUpd
-		ppcLoadIntReg3:
-		mr r6, r12
-		b ppcLoadIntRegUpd
-		ppcLoadIntReg4:
-		mr r7, r12
-		b ppcLoadIntRegUpd
-		ppcLoadIntReg5:
-		mr r8, r12
-		b ppcLoadIntRegUpd
-		ppcLoadIntReg6:
-		mr r9, r12
-		b ppcLoadIntRegUpd
-		ppcLoadIntReg7:
-		mr r10, r12
-		b ppcLoadIntRegUpd
-
-		ppcLoadIntRegUpd:
-		std	    r12, 0(r31)			// push on the stack
-		addi	r31, r31, 8			// inc stack by 1 reg
-
-		addi r23, r23, 1			// Increment used int register count
-		addi r26, r26, 8			// Increment pArgs
-		b ppcNextArg				// Call next arg
-
-//////////////////////////////////////////////////////////////////////////
-// Load and stack float arguments
-//////////////////////////////////////////////////////////////////////////
-ppcArgIsFloat:
-		// Get the arg from the stack
-		lfs fr0, 0(r26)
-
-		// r22 holds the float arg count so far
-		cmplwi cr6, r22, 0
-		beq    cr6, ppcLoadFloatReg0
-		cmplwi cr6, r22, 1
-		beq    cr6, ppcLoadFloatReg1
-		cmplwi cr6, r22, 2
-		beq    cr6, ppcLoadFloatReg2
-		cmplwi cr6, r22, 3
-		beq    cr6, ppcLoadFloatReg3
-		cmplwi cr6, r22, 4
-		beq    cr6, ppcLoadFloatReg4
-		cmplwi cr6, r22, 5
-		beq    cr6, ppcLoadFloatReg5
-		cmplwi cr6, r22, 6
-		beq    cr6, ppcLoadFloatReg6
-		cmplwi cr6, r22, 7
-		beq    cr6, ppcLoadFloatReg7
-		cmplwi cr6, r22, 8
-		beq    cr6, ppcLoadFloatReg8
-		cmplwi cr6, r22, 9
-		beq    cr6, ppcLoadFloatReg9
-		cmplwi cr6, r22, 10
-		beq    cr6, ppcLoadFloatReg10
-		cmplwi cr6, r22, 11
-		beq    cr6, ppcLoadFloatReg11
-		cmplwi cr6, r22, 12
-		beq    cr6, ppcLoadFloatReg12
-
-		// no more than 12 parameters
-		b		ppcLoadFloatRegUpd
-
-		ppcLoadFloatReg0:
-		fmr fr1, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg1:
-		fmr fr2, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg2:
-		fmr fr3, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg3:
-		fmr fr4, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg4:
-		fmr fr5, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg5:
-		fmr fr6, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg6:
-		fmr fr7, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg7:
-		fmr fr8, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg8:
-		fmr fr9, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg9:
-		fmr fr10, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg10:
-		fmr fr11, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg11:
-		fmr fr12, fr0
-		b ppcLoadFloatRegUpd
-		ppcLoadFloatReg12:
-		fmr fr13, fr0
-		b ppcLoadFloatRegUpd
-
-		ppcLoadFloatRegUpd:
-		stfs	fr0, 0(r31)			// push on the stack
-		addi	r31, r31, 8			// inc stack by 1 reg
-		
-		addi r22, r22, 1			// Increment used float register count
-		addi r23, r23, 1			// Increment used int register count - a float reg eats up a GPR		
-		addi r26, r26, 4			// Increment pArgs
-		b ppcNextArg				// Call next arg
-
-//////////////////////////////////////////////////////////////////////////
-// Load and stack double float arguments
-//////////////////////////////////////////////////////////////////////////
-ppcArgIsDouble:
-		// Get the arg from the stack
-		lfd fr0, 0(r26)
-
-		// r22 holds the float arg count so far
-		cmplwi cr6, r22, 0
-		beq    cr6, ppcLoadDoubleReg0
-		cmplwi cr6, r22, 1
-		beq    cr6, ppcLoadDoubleReg1
-		cmplwi cr6, r22, 2
-		beq    cr6, ppcLoadDoubleReg2
-		cmplwi cr6, r22, 3
-		beq    cr6, ppcLoadDoubleReg3
-		cmplwi cr6, r22, 4
-		beq    cr6, ppcLoadDoubleReg4
-		cmplwi cr6, r22, 5
-		beq    cr6, ppcLoadDoubleReg5
-		cmplwi cr6, r22, 6
-		beq    cr6, ppcLoadDoubleReg6
-		cmplwi cr6, r22, 7
-		beq    cr6, ppcLoadDoubleReg7
-		cmplwi cr6, r22, 8
-		beq    cr6, ppcLoadDoubleReg8
-		cmplwi cr6, r22, 9
-		beq    cr6, ppcLoadDoubleReg9
-		cmplwi cr6, r22, 10
-		beq    cr6, ppcLoadDoubleReg10
-		cmplwi cr6, r22, 11
-		beq    cr6, ppcLoadDoubleReg11
-		cmplwi cr6, r22, 12
-		beq    cr6, ppcLoadDoubleReg12
-
-		// no more than 12 parameters
-		b      ppcLoadDoubleRegUpd
-
-		ppcLoadDoubleReg0:
-		fmr fr1, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg1:
-		fmr fr2, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg2:
-		fmr fr3, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg3:
-		fmr fr4, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg4:
-		fmr fr5, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg5:
-		fmr fr6, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg6:
-		fmr fr7, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg7:
-		fmr fr8, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg8:
-		fmr fr9, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg9:
-		fmr fr10, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg10:
-		fmr fr11, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg11:
-		fmr fr12, fr0
-		b ppcLoadDoubleRegUpd
-		ppcLoadDoubleReg12:
-		fmr fr13, fr0
-		b ppcLoadDoubleRegUpd
-
-		ppcLoadDoubleRegUpd:
-		stfd	fr0, 0(r31)			// push on the stack
-		addi	r31, r31, 8			// inc stack by 1 reg
-		
-		addi r22, r22, 1			// Increment used float register count		
-		addi r23, r23, 1			// Increment used int register count
-		addi r26, r26, 8			// Increment pArgs
-		b ppcNextArg
-
-//////////////////////////////////////////////////////////////////////////
-// Finished
-//////////////////////////////////////////////////////////////////////////
-ppcArgsEnd:
-		// Call the function
-		mtctr r27
-		bctrl
-
-		// Epilogue
-		// Restore callers stack
-		addi	r1, r1, 200h
-
-		// restore all registers we used in this fct
-		ld     r22,-40h(r1)
-		ld     r23,-38h(r1)
-		ld     r24,-30h(r1)
-		ld     r25,-28h(r1)
-		ld     r26,-20h(r1)
-		ld     r27,-18h(r1)
-		ld     r31,-10h(r1)
-
-		// Fetch return link to caller
-		lwz     r12,-8(r1)
-		mtlr	r12
-		blr
-	}
-}
-
-asDWORD GetReturnedFloat()
-{
-	// This variable must be declared volatile so that the 
-	// compiler optimizations do not remove its initialization
-	// with the fr1 register due to believing the fr1 register
-	// isn't initialized.
-	volatile asDWORD f;
-
-	__asm
-	{
-		stfs fr1, f
-	}
-
-	return f;
-}
-
-asQWORD GetReturnedDouble()
-{
-	// This variable must be declared volatile so that the 
-	// compiler optimizations do not remove its initialization
-	// with the fr1 register due to believing the fr1 register
-	// isn't initialized.
-	volatile asQWORD f;
-
-	__asm
-	{
-		stfd fr1, f
-	}
-
-	return f;
-}
-
-// returns true if the given parameter is a 'variable argument'
-inline bool IsVariableArgument( asCDataType type )
-{
-	return (type.GetTokenType() == ttQuestion) ? true : false;
-}
-
-asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
-{
-	// TODO: Xenon does not yet support THISCALL_OBJFIRST/LAST
-
-	asCScriptEngine            *engine    = context->m_engine;
-	asSSystemFunctionInterface *sysFunc   = descr->sysFuncIntf;	
-	int                         callConv  = sysFunc->callConv;
-	asQWORD                     retQW     = 0;
-	void                       *func      = (void*)sysFunc->func;
-	asDWORD                    *vftable;
-
-	// Pack the arguments into an array that ppcFunc() can use to load each CPU register properly
-	asBYTE  ppcArgsType[AS_PPC_MAX_ARGS + AS_PPC_RETURNINMEM_REG + AS_PPC_THISCALL_REG + AS_PPC_ENDOFARGS];
-	asQWORD ppcArgs[AS_PPC_MAX_ARGS + AS_PPC_RETURNINMEM_REG + AS_PPC_THISCALL_REG];
-	int     argsCnt = 0;
-
-	// If the function returns an object in memory, we allocate the memory and put the ptr to the front (will go to r3)
-	if( sysFunc->hostReturnInMemory )
-	{
-		ppcArgs[argsCnt] = (asDWORD)retPointer;
-		ppcArgsType[argsCnt] = ppcINTARG;
-		argsCnt++;
-	}
-
-	// If we have an object and it's not objectlast, then we put it as the first arg
-	if ( obj &&
-		 callConv != ICC_CDECL_OBJLAST &&
-		 callConv != ICC_CDECL_OBJLAST_RETURNINMEM )
-	{
-		ppcArgs[argsCnt] = (asDWORD)obj;
-		ppcArgsType[argsCnt] = ppcINTARG;
-		argsCnt++;
-	}
-
-	// If the function takes any objects by value, they must be copied 
-	// to the stack, shifting the other arguments as necessary. paramBuffer
-	// will then replace the args pointer that was received from the VM.
-	// TODO: Is this really how XBox 360 passes objects by value?
-	asDWORD paramBuffer[AS_PPC_MAX_ARGS];
-	if( sysFunc->takesObjByVal )
-	{
-		int paramSize = 0;
-		int spos = 0;
-		int dpos = 1;
-
-		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-		{
-			// Parameter object by value
-			if( descr->parameterTypes[n].IsObject() && 
-				!descr->parameterTypes[n].IsObjectHandle() &&
-				!descr->parameterTypes[n].IsReference() )
-			{
-#ifdef COMPLEX_OBJS_PASSED_BY_REF
-				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
-				{
-					paramBuffer[dpos++] = args[spos++];
-					paramSize++;
-				}
-				else
-#endif
-				{
-					// Copy the object's memory to the buffer
-					memcpy( &paramBuffer[dpos], *(void**)(args + spos), descr->parameterTypes[n].GetSizeInMemoryBytes() );
-
-					// Delete the original memory
-					engine->CallFree(*(char**)(args + spos));
-
-					spos++;
-					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
-					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
-				}
-			}
-			else
-			{
-				// Copy the value directly
-				paramBuffer[dpos++] = args[spos++];
-				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
-					paramBuffer[dpos++] = args[spos++];
-				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
-			}
-
-			// If this was a variable argument parameter, then account for the implicit typeId
-			if( IsVariableArgument( descr->parameterTypes[n] ) )
-			{
-				// the TypeId is just a DWORD
-				paramBuffer[dpos++] = args[spos++];
-				++paramSize;
-			}
-		}
-
-		// Keep a free location at the beginning
-		args = &paramBuffer[1];
-
-		asASSERT( paramSize <= AS_PPC_MAX_ARGS );
-	}
-
-
-	const asUINT paramCount = (asUINT)descr->parameterTypes.GetLength();
-
-	asBYTE * pCurArgType		= (asBYTE*)&ppcArgsType[argsCnt];
-	asBYTE * pCurFixedArgValue	= (asBYTE*)&ppcArgs[argsCnt];
-	asBYTE * pCurStackArgValue	= (asBYTE*)args;
-
-	for( asUINT n = 0; n < paramCount; n++ )
-	{		
-		argsCnt++;
-
-		if (descr->parameterTypes[n].IsFloatType() && !descr->parameterTypes[n].IsReference())
-		{
-			*pCurArgType++ = ppcFLOATARG;
-
-			*((float*) pCurFixedArgValue) = *((float*) pCurStackArgValue);
-
-			pCurFixedArgValue += 4;
-			pCurStackArgValue += 4;
-		}
-		else if (descr->parameterTypes[n].IsDoubleType() && !descr->parameterTypes[n].IsReference())
-		{
-			*pCurArgType++ = ppcDOUBLEARG;
-
-			*((double*) pCurFixedArgValue) = *((double*) pCurStackArgValue);
-
-			pCurFixedArgValue += 8;
-			pCurStackArgValue += 8;
-		}
-		else
-		{
-			// TODO: The code also ignore the fact that large objects
-			//       passed by value has been copied to the stack
-			//       in the above loop.
-
-			*pCurArgType++ = ppcINTARG;
-
-			*((asQWORD*) pCurFixedArgValue) = *((asUINT*) pCurStackArgValue);
-
-			if( !descr->parameterTypes[n].IsReference() )
-			{
-				// If the arg is not 4 bytes which we coppied, lets do it again the right way
-				asUINT numBytes = descr->parameterTypes[n].GetSizeInMemoryBytes();
-				if( numBytes == 1 )
-				{
-					*((asQWORD*) pCurFixedArgValue) = *((asBYTE*) pCurStackArgValue);
-				}
-				else if( numBytes == 2 )
-				{
-					*((asQWORD*) pCurFixedArgValue) = *((asWORD*) pCurStackArgValue);
-				}
-				else if( numBytes == 8 )
-				{
-					*((asQWORD*) pCurFixedArgValue) = *((asQWORD*) pCurStackArgValue);
-					pCurStackArgValue += 4; // Increase our cur stack arg value by 4 bytes to = 8 total later
-				}
-			}
-
-			pCurFixedArgValue += 8;
-			pCurStackArgValue += 4;
-
-			// if it is a variable argument, account for the typeId
-			// implicitly add another parameter (AFTER the parameter above) for the typeId
-			if( IsVariableArgument(descr->parameterTypes[n]) )
-			{			
-				argsCnt++;
-
-				*pCurArgType++ = ppcINTARG;
-
-				*((int*) pCurFixedArgValue) = *((int*) pCurStackArgValue);
-
-				pCurFixedArgValue += 4;
-				pCurStackArgValue += 4;
-			}
-		}
-	}
-
-	// Add the arg list end indicator
-	ppcArgsType[argsCnt] = ppcENDARG;
-
-	switch( callConv )
-	{
-	case ICC_CDECL:
-	case ICC_CDECL_RETURNINMEM:
-	case ICC_STDCALL:
-	case ICC_STDCALL_RETURNINMEM:
-	case ICC_THISCALL:
-	case ICC_THISCALL_RETURNINMEM:
-	case ICC_CDECL_OBJFIRST:
-	case ICC_CDECL_OBJFIRST_RETURNINMEM:
-	{
-		retQW = ppcFunc( ppcArgs, (asDWORD)func, ppcArgsType );
-		break;
-	}
-	case ICC_VIRTUAL_THISCALL:
-	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
-	{
-		// Get virtual function table from the object pointer
-		vftable = *(asDWORD**)obj;
-		retQW = ppcFunc( ppcArgs, vftable[asDWORD(func)>>2], ppcArgsType );
-		break;
-	}
-	case ICC_CDECL_OBJLAST:
-	case ICC_CDECL_OBJLAST_RETURNINMEM:
-	{
-		// Add the object pointer as the last argument
-		ppcArgsType[argsCnt++] = ppcINTARG;
-		ppcArgsType[argsCnt] = ppcENDARG;
-		*((asQWORD*)pCurFixedArgValue) = (asPWORD)obj;
-		retQW = ppcFunc( ppcArgs, (asDWORD)func, ppcArgsType );
-		break;
-	}
-	default:
-		context->SetInternalException( TXT_INVALID_CALLING_CONVENTION );
-	}
-
-	// If the return is a float value we need to get the value from the FP register
-	if( sysFunc->hostReturnFloat )
-	{
-		if( sysFunc->hostReturnSize == 1 )
-			*(asDWORD*)&retQW = GetReturnedFloat();
-		else
-			retQW = GetReturnedDouble();
-	}
-	else if( sysFunc->hostReturnSize == 1 )
-	{
-		// Move the bits to the higher value to compensate for the adjustment that the caller does
-		retQW <<= 32;
-	}
-
-	return retQW;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_XENON
-#endif // AS_MAX_PORTABILITY
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_callfunc_xenon.cpp
+//
+// These functions handle the actual calling of system functions
+//
+// This version is Xenon specific
+// Modified from as_callfunc_ppc.cpp by Laszlo Perneky February 2007
+//
+// Modified by Cyril Tissier March 2010:
+// various fixes in 'float' args passing / function return
+// properly handling 'double' type
+// various fixes in asm ppcFunc
+// fix for variable arguments
+//
+// Modified by Anthony Clark May 2015
+// Fixed the issue where int64 and uint64 could not be passed nativly
+// few minor fixes within asm ppcFunc to handle int64 and uint64
+
+
+// XBox 360 calling convention
+// ===========================
+// I've yet to find an official document with the ABI for XBox 360, 
+// but I'll describe what I've gathered from the code and tests
+// performed by the AngelScript community.
+//
+// Arguments are passed in the following registers:
+// r3  - r10   : integer/pointer arguments (each register is 64bit)
+// fr1 - fr13  : float/double arguments    (each register is 64bit)
+// 
+// Arguments that don't fit in the registers will be pushed on the stack.
+// 
+// When a float or double is passed as argument, its value will be placed
+// in the next available float register, but it will also reserve general
+// purpose register. 
+// 
+// Example: void foo(float a, int b). a will be passed in fr1 and b in r4.
+//
+// For each argument passed to a function an 8byte slot is reserved on the 
+// stack, so that the function can offload the value there if needed. The
+// first slot is at r1+20, the next at r1+28, etc.
+//
+// If the function is a class method, the this pointer is passed as hidden 
+// first argument. If the function returns an object in memory, the address
+// for that memory is passed as hidden first argument.
+//
+// Return value are placed in the following registers:
+// r3  : integer/pointer values
+// fr1 : float/double values
+//
+// Rules for registers
+// r1          : stack pointer
+// r14-r31     : nonvolatile, i.e. their values must be preserved
+// fr14-fr31   : nonvolatile, i.e. their values must be preserved
+// r0, r2, r13 : dedicated. I'm not sure what it means, but it is probably best not to use them
+//
+// The stack pointer must always be aligned at 8 bytes.
+//
+// References:
+// https://www-01.ibm.com/chips/techlib/techlib.nsf/techdocs/852569B20050FF77852569970071B0D6/$file/eabi_app.pdf
+//
+// TODO: The code doesn't handle objects passed by value (unless they are max 4 bytes in size)
+
+
+
+#include "as_config.h"
+
+#ifndef AS_MAX_PORTABILITY
+#if defined(AS_XENON)
+
+#include "as_callfunc.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+#include "as_tokendef.h"
+#include "as_context.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <xtl.h>
+
+BEGIN_AS_NAMESPACE
+
+#define AS_PPC_MAX_ARGS         32
+#define AS_PPC_THISCALL_REG     1
+#define AS_PPC_RETURNINMEM_REG  1
+#define AS_PPC_ENDOFARGS        1
+
+// The array used to send values to the correct places.
+// Contains a byte of argTypes to indicate the register type to load, or zero if end of arguments
+enum argTypes
+{
+	ppcENDARG    = 0,
+	ppcINTARG    = 1,
+	ppcFLOATARG  = 2,
+	ppcDOUBLEARG = 3
+};
+
+// Loads all data into the correct places and calls the function.
+// pArgs     is the array of the argument values
+// pArgTypes is an array containing a byte indicating the type (enum argTypes) for each argument.
+// dwFunc    is the address of the function that will be called
+asQWORD __declspec( naked ) ppcFunc(const asQWORD* pArgs, asDWORD dwFunc, const asBYTE* pArgTypes)
+{
+	__asm
+	{
+_ppcFunc:
+		// Prologue
+		// Read and stack the link register (return address)
+		mflr    r12
+		stw     r12,-8(r1)
+
+		// Backup all non-volatile registers we use in this function
+		std     r31,-10h(r1) // stack pointer for pushing arguments
+		std     r27,-18h(r1) // dwFunc
+		std     r26,-20h(r1) // pArgs
+		std     r25,-28h(r1) // pArgTypes
+		std     r24,-30h(r1) // current arg type
+		std     r23,-38h(r1) // counter for used GPRs
+		std     r22,-40h(r1) // counter for used float registers
+
+		// Setup the stack frame to make room for the backup of registers
+		// and the arguments that will be passed to the application function.
+		// 512 bytes is enough for about 50 arguments plus backup of 8
+		// TODO: Should perhaps make this dynamic based on number of arguments
+		stwu	r1,-200h(r1)
+
+//////////////////////////////////////////////////////////////////////////
+// Initialize local variables
+//////////////////////////////////////////////////////////////////////////
+
+		// r31 is our pointer into the stack where the arguments will be place
+		// The MSVC optimizer seems to rely on nobody copying the r1 register directly
+		// so we can't just do a simple 'addi r31, r1, 14h' as the optimizer may
+		// end up moving this instruction to before the update of r1 above. 
+		// Instead we'll read the previous stack pointer from the stack, and then 
+		// subtract to get the correct offset.
+		lwz		r31, 0(r1)
+		subi	r31, r31, 1ECh	// prev r1 - 512 + 20 = curr r1 + 20
+
+		mr r26, r3			// pArgs
+		mr r27, r4			// dwFunc
+		mr r25, r5			// pArgTypes
+
+		// Counting of used/assigned GPR's
+		sub  r23, r23, r23
+		// Counting of used/assigned Float Registers
+		sub  r22, r22, r22
+
+		// Begin loading and stacking registers
+		subi r25, r25, 1
+
+//////////////////////////////////////////////////////////////////////////
+// Fetch the next argument
+//////////////////////////////////////////////////////////////////////////
+ppcNextArg:
+		// Increment rArgTypePtr
+		addi r25, r25, 1
+		// Get data type
+		lbz r24, 0(r25)
+
+		// r24 holds the data type
+		cmplwi cr6, r24, 0
+		beq    cr6, ppcArgsEnd
+		cmplwi cr6, r24, 1
+		beq    cr6, ppcArgIsInteger
+		cmplwi cr6, r24, 2
+		beq    cr6, ppcArgIsFloat
+		cmplwi cr6, r24, 3
+		beq    cr6, ppcArgIsDouble
+
+//////////////////////////////////////////////////////////////////////////
+// Load and stack integer arguments
+//////////////////////////////////////////////////////////////////////////
+ppcArgIsInteger:
+		// Get the arg from the stack
+		ld  r12, 0(r26)
+
+		// r23 holds the integer arg count so far
+		cmplwi cr6, r23, 0
+		beq    cr6, ppcLoadIntReg0
+		cmplwi cr6, r23, 1
+		beq    cr6, ppcLoadIntReg1
+		cmplwi cr6, r23, 2
+		beq    cr6, ppcLoadIntReg2
+		cmplwi cr6, r23, 3
+		beq    cr6, ppcLoadIntReg3
+		cmplwi cr6, r23, 4
+		beq    cr6, ppcLoadIntReg4
+		cmplwi cr6, r23, 5
+		beq    cr6, ppcLoadIntReg5
+		cmplwi cr6, r23, 6
+		beq    cr6, ppcLoadIntReg6
+		cmplwi cr6, r23, 7
+		beq    cr6, ppcLoadIntReg7
+
+		// no more than 8 parameters
+		b		ppcLoadIntRegUpd
+
+		ppcLoadIntReg0:
+		mr r3, r12
+		b ppcLoadIntRegUpd
+		ppcLoadIntReg1:
+		mr r4, r12
+		b ppcLoadIntRegUpd
+		ppcLoadIntReg2:
+		mr r5, r12
+		b ppcLoadIntRegUpd
+		ppcLoadIntReg3:
+		mr r6, r12
+		b ppcLoadIntRegUpd
+		ppcLoadIntReg4:
+		mr r7, r12
+		b ppcLoadIntRegUpd
+		ppcLoadIntReg5:
+		mr r8, r12
+		b ppcLoadIntRegUpd
+		ppcLoadIntReg6:
+		mr r9, r12
+		b ppcLoadIntRegUpd
+		ppcLoadIntReg7:
+		mr r10, r12
+		b ppcLoadIntRegUpd
+
+		ppcLoadIntRegUpd:
+		std	    r12, 0(r31)			// push on the stack
+		addi	r31, r31, 8			// inc stack by 1 reg
+
+		addi r23, r23, 1			// Increment used int register count
+		addi r26, r26, 8			// Increment pArgs
+		b ppcNextArg				// Call next arg
+
+//////////////////////////////////////////////////////////////////////////
+// Load and stack float arguments
+//////////////////////////////////////////////////////////////////////////
+ppcArgIsFloat:
+		// Get the arg from the stack
+		lfs fr0, 0(r26)
+
+		// r22 holds the float arg count so far
+		cmplwi cr6, r22, 0
+		beq    cr6, ppcLoadFloatReg0
+		cmplwi cr6, r22, 1
+		beq    cr6, ppcLoadFloatReg1
+		cmplwi cr6, r22, 2
+		beq    cr6, ppcLoadFloatReg2
+		cmplwi cr6, r22, 3
+		beq    cr6, ppcLoadFloatReg3
+		cmplwi cr6, r22, 4
+		beq    cr6, ppcLoadFloatReg4
+		cmplwi cr6, r22, 5
+		beq    cr6, ppcLoadFloatReg5
+		cmplwi cr6, r22, 6
+		beq    cr6, ppcLoadFloatReg6
+		cmplwi cr6, r22, 7
+		beq    cr6, ppcLoadFloatReg7
+		cmplwi cr6, r22, 8
+		beq    cr6, ppcLoadFloatReg8
+		cmplwi cr6, r22, 9
+		beq    cr6, ppcLoadFloatReg9
+		cmplwi cr6, r22, 10
+		beq    cr6, ppcLoadFloatReg10
+		cmplwi cr6, r22, 11
+		beq    cr6, ppcLoadFloatReg11
+		cmplwi cr6, r22, 12
+		beq    cr6, ppcLoadFloatReg12
+
+		// no more than 12 parameters
+		b		ppcLoadFloatRegUpd
+
+		ppcLoadFloatReg0:
+		fmr fr1, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg1:
+		fmr fr2, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg2:
+		fmr fr3, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg3:
+		fmr fr4, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg4:
+		fmr fr5, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg5:
+		fmr fr6, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg6:
+		fmr fr7, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg7:
+		fmr fr8, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg8:
+		fmr fr9, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg9:
+		fmr fr10, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg10:
+		fmr fr11, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg11:
+		fmr fr12, fr0
+		b ppcLoadFloatRegUpd
+		ppcLoadFloatReg12:
+		fmr fr13, fr0
+		b ppcLoadFloatRegUpd
+
+		ppcLoadFloatRegUpd:
+		stfs	fr0, 0(r31)			// push on the stack
+		addi	r31, r31, 8			// inc stack by 1 reg
+		
+		addi r22, r22, 1			// Increment used float register count
+		addi r23, r23, 1			// Increment used int register count - a float reg eats up a GPR		
+		addi r26, r26, 4			// Increment pArgs
+		b ppcNextArg				// Call next arg
+
+//////////////////////////////////////////////////////////////////////////
+// Load and stack double float arguments
+//////////////////////////////////////////////////////////////////////////
+ppcArgIsDouble:
+		// Get the arg from the stack
+		lfd fr0, 0(r26)
+
+		// r22 holds the float arg count so far
+		cmplwi cr6, r22, 0
+		beq    cr6, ppcLoadDoubleReg0
+		cmplwi cr6, r22, 1
+		beq    cr6, ppcLoadDoubleReg1
+		cmplwi cr6, r22, 2
+		beq    cr6, ppcLoadDoubleReg2
+		cmplwi cr6, r22, 3
+		beq    cr6, ppcLoadDoubleReg3
+		cmplwi cr6, r22, 4
+		beq    cr6, ppcLoadDoubleReg4
+		cmplwi cr6, r22, 5
+		beq    cr6, ppcLoadDoubleReg5
+		cmplwi cr6, r22, 6
+		beq    cr6, ppcLoadDoubleReg6
+		cmplwi cr6, r22, 7
+		beq    cr6, ppcLoadDoubleReg7
+		cmplwi cr6, r22, 8
+		beq    cr6, ppcLoadDoubleReg8
+		cmplwi cr6, r22, 9
+		beq    cr6, ppcLoadDoubleReg9
+		cmplwi cr6, r22, 10
+		beq    cr6, ppcLoadDoubleReg10
+		cmplwi cr6, r22, 11
+		beq    cr6, ppcLoadDoubleReg11
+		cmplwi cr6, r22, 12
+		beq    cr6, ppcLoadDoubleReg12
+
+		// no more than 12 parameters
+		b      ppcLoadDoubleRegUpd
+
+		ppcLoadDoubleReg0:
+		fmr fr1, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg1:
+		fmr fr2, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg2:
+		fmr fr3, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg3:
+		fmr fr4, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg4:
+		fmr fr5, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg5:
+		fmr fr6, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg6:
+		fmr fr7, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg7:
+		fmr fr8, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg8:
+		fmr fr9, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg9:
+		fmr fr10, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg10:
+		fmr fr11, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg11:
+		fmr fr12, fr0
+		b ppcLoadDoubleRegUpd
+		ppcLoadDoubleReg12:
+		fmr fr13, fr0
+		b ppcLoadDoubleRegUpd
+
+		ppcLoadDoubleRegUpd:
+		stfd	fr0, 0(r31)			// push on the stack
+		addi	r31, r31, 8			// inc stack by 1 reg
+		
+		addi r22, r22, 1			// Increment used float register count		
+		addi r23, r23, 1			// Increment used int register count
+		addi r26, r26, 8			// Increment pArgs
+		b ppcNextArg
+
+//////////////////////////////////////////////////////////////////////////
+// Finished
+//////////////////////////////////////////////////////////////////////////
+ppcArgsEnd:
+		// Call the function
+		mtctr r27
+		bctrl
+
+		// Epilogue
+		// Restore callers stack
+		addi	r1, r1, 200h
+
+		// restore all registers we used in this fct
+		ld     r22,-40h(r1)
+		ld     r23,-38h(r1)
+		ld     r24,-30h(r1)
+		ld     r25,-28h(r1)
+		ld     r26,-20h(r1)
+		ld     r27,-18h(r1)
+		ld     r31,-10h(r1)
+
+		// Fetch return link to caller
+		lwz     r12,-8(r1)
+		mtlr	r12
+		blr
+	}
+}
+
+asDWORD GetReturnedFloat()
+{
+	// This variable must be declared volatile so that the 
+	// compiler optimizations do not remove its initialization
+	// with the fr1 register due to believing the fr1 register
+	// isn't initialized.
+	volatile asDWORD f;
+
+	__asm
+	{
+		stfs fr1, f
+	}
+
+	return f;
+}
+
+asQWORD GetReturnedDouble()
+{
+	// This variable must be declared volatile so that the 
+	// compiler optimizations do not remove its initialization
+	// with the fr1 register due to believing the fr1 register
+	// isn't initialized.
+	volatile asQWORD f;
+
+	__asm
+	{
+		stfd fr1, f
+	}
+
+	return f;
+}
+
+// returns true if the given parameter is a 'variable argument'
+inline bool IsVariableArgument( asCDataType type )
+{
+	return (type.GetTokenType() == ttQuestion) ? true : false;
+}
+
+asQWORD CallSystemFunctionNative(asCContext *context, asCScriptFunction *descr, void *obj, asDWORD *args, void *retPointer, asQWORD &/*retQW2*/, void */*secondObject*/)
+{
+	// TODO: Xenon does not yet support THISCALL_OBJFIRST/LAST
+
+	asCScriptEngine            *engine    = context->m_engine;
+	asSSystemFunctionInterface *sysFunc   = descr->sysFuncIntf;	
+	int                         callConv  = sysFunc->callConv;
+	asQWORD                     retQW     = 0;
+	void                       *func      = (void*)sysFunc->func;
+	asDWORD                    *vftable;
+
+	// Pack the arguments into an array that ppcFunc() can use to load each CPU register properly
+	asBYTE  ppcArgsType[AS_PPC_MAX_ARGS + AS_PPC_RETURNINMEM_REG + AS_PPC_THISCALL_REG + AS_PPC_ENDOFARGS];
+	asQWORD ppcArgs[AS_PPC_MAX_ARGS + AS_PPC_RETURNINMEM_REG + AS_PPC_THISCALL_REG];
+	int     argsCnt = 0;
+
+	// If the function returns an object in memory, we allocate the memory and put the ptr to the front (will go to r3)
+	if( sysFunc->hostReturnInMemory )
+	{
+		ppcArgs[argsCnt] = (asDWORD)retPointer;
+		ppcArgsType[argsCnt] = ppcINTARG;
+		argsCnt++;
+	}
+
+	// If we have an object and it's not objectlast, then we put it as the first arg
+	if ( obj &&
+		 callConv != ICC_CDECL_OBJLAST &&
+		 callConv != ICC_CDECL_OBJLAST_RETURNINMEM )
+	{
+		ppcArgs[argsCnt] = (asDWORD)obj;
+		ppcArgsType[argsCnt] = ppcINTARG;
+		argsCnt++;
+	}
+
+	// If the function takes any objects by value, they must be copied 
+	// to the stack, shifting the other arguments as necessary. paramBuffer
+	// will then replace the args pointer that was received from the VM.
+	// TODO: Is this really how XBox 360 passes objects by value?
+	asDWORD paramBuffer[AS_PPC_MAX_ARGS];
+	if( sysFunc->takesObjByVal )
+	{
+		int paramSize = 0;
+		int spos = 0;
+		int dpos = 1;
+
+		for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+		{
+			// Parameter object by value
+			if( descr->parameterTypes[n].IsObject() && 
+				!descr->parameterTypes[n].IsObjectHandle() &&
+				!descr->parameterTypes[n].IsReference() )
+			{
+#ifdef COMPLEX_OBJS_PASSED_BY_REF
+				if( descr->parameterTypes[n].GetTypeInfo()->flags & COMPLEX_MASK )
+				{
+					paramBuffer[dpos++] = args[spos++];
+					paramSize++;
+				}
+				else
+#endif
+				{
+					// Copy the object's memory to the buffer
+					memcpy( &paramBuffer[dpos], *(void**)(args + spos), descr->parameterTypes[n].GetSizeInMemoryBytes() );
+
+					// Delete the original memory
+					engine->CallFree(*(char**)(args + spos));
+
+					spos++;
+					dpos += descr->parameterTypes[n].GetSizeInMemoryDWords();
+					paramSize += descr->parameterTypes[n].GetSizeInMemoryDWords();
+				}
+			}
+			else
+			{
+				// Copy the value directly
+				paramBuffer[dpos++] = args[spos++];
+				if( descr->parameterTypes[n].GetSizeOnStackDWords() > 1 )
+					paramBuffer[dpos++] = args[spos++];
+				paramSize += descr->parameterTypes[n].GetSizeOnStackDWords();
+			}
+
+			// If this was a variable argument parameter, then account for the implicit typeId
+			if( IsVariableArgument( descr->parameterTypes[n] ) )
+			{
+				// the TypeId is just a DWORD
+				paramBuffer[dpos++] = args[spos++];
+				++paramSize;
+			}
+		}
+
+		// Keep a free location at the beginning
+		args = &paramBuffer[1];
+
+		asASSERT( paramSize <= AS_PPC_MAX_ARGS );
+	}
+
+
+	const asUINT paramCount = (asUINT)descr->parameterTypes.GetLength();
+
+	asBYTE * pCurArgType		= (asBYTE*)&ppcArgsType[argsCnt];
+	asBYTE * pCurFixedArgValue	= (asBYTE*)&ppcArgs[argsCnt];
+	asBYTE * pCurStackArgValue	= (asBYTE*)args;
+
+	for( asUINT n = 0; n < paramCount; n++ )
+	{		
+		argsCnt++;
+
+		if (descr->parameterTypes[n].IsFloatType() && !descr->parameterTypes[n].IsReference())
+		{
+			*pCurArgType++ = ppcFLOATARG;
+
+			*((float*) pCurFixedArgValue) = *((float*) pCurStackArgValue);
+
+			pCurFixedArgValue += 4;
+			pCurStackArgValue += 4;
+		}
+		else if (descr->parameterTypes[n].IsDoubleType() && !descr->parameterTypes[n].IsReference())
+		{
+			*pCurArgType++ = ppcDOUBLEARG;
+
+			*((double*) pCurFixedArgValue) = *((double*) pCurStackArgValue);
+
+			pCurFixedArgValue += 8;
+			pCurStackArgValue += 8;
+		}
+		else
+		{
+			// TODO: The code also ignore the fact that large objects
+			//       passed by value has been copied to the stack
+			//       in the above loop.
+
+			*pCurArgType++ = ppcINTARG;
+
+			*((asQWORD*) pCurFixedArgValue) = *((asUINT*) pCurStackArgValue);
+
+			if( !descr->parameterTypes[n].IsReference() )
+			{
+				// If the arg is not 4 bytes which we coppied, lets do it again the right way
+				asUINT numBytes = descr->parameterTypes[n].GetSizeInMemoryBytes();
+				if( numBytes == 1 )
+				{
+					*((asQWORD*) pCurFixedArgValue) = *((asBYTE*) pCurStackArgValue);
+				}
+				else if( numBytes == 2 )
+				{
+					*((asQWORD*) pCurFixedArgValue) = *((asWORD*) pCurStackArgValue);
+				}
+				else if( numBytes == 8 )
+				{
+					*((asQWORD*) pCurFixedArgValue) = *((asQWORD*) pCurStackArgValue);
+					pCurStackArgValue += 4; // Increase our cur stack arg value by 4 bytes to = 8 total later
+				}
+			}
+
+			pCurFixedArgValue += 8;
+			pCurStackArgValue += 4;
+
+			// if it is a variable argument, account for the typeId
+			// implicitly add another parameter (AFTER the parameter above) for the typeId
+			if( IsVariableArgument(descr->parameterTypes[n]) )
+			{			
+				argsCnt++;
+
+				*pCurArgType++ = ppcINTARG;
+
+				*((int*) pCurFixedArgValue) = *((int*) pCurStackArgValue);
+
+				pCurFixedArgValue += 4;
+				pCurStackArgValue += 4;
+			}
+		}
+	}
+
+	// Add the arg list end indicator
+	ppcArgsType[argsCnt] = ppcENDARG;
+
+	switch( callConv )
+	{
+	case ICC_CDECL:
+	case ICC_CDECL_RETURNINMEM:
+	case ICC_STDCALL:
+	case ICC_STDCALL_RETURNINMEM:
+	case ICC_THISCALL:
+	case ICC_THISCALL_RETURNINMEM:
+	case ICC_CDECL_OBJFIRST:
+	case ICC_CDECL_OBJFIRST_RETURNINMEM:
+	{
+		retQW = ppcFunc( ppcArgs, (asDWORD)func, ppcArgsType );
+		break;
+	}
+	case ICC_VIRTUAL_THISCALL:
+	case ICC_VIRTUAL_THISCALL_RETURNINMEM:
+	{
+		// Get virtual function table from the object pointer
+		vftable = *(asDWORD**)obj;
+		retQW = ppcFunc( ppcArgs, vftable[asDWORD(func)>>2], ppcArgsType );
+		break;
+	}
+	case ICC_CDECL_OBJLAST:
+	case ICC_CDECL_OBJLAST_RETURNINMEM:
+	{
+		// Add the object pointer as the last argument
+		ppcArgsType[argsCnt++] = ppcINTARG;
+		ppcArgsType[argsCnt] = ppcENDARG;
+		*((asQWORD*)pCurFixedArgValue) = (asPWORD)obj;
+		retQW = ppcFunc( ppcArgs, (asDWORD)func, ppcArgsType );
+		break;
+	}
+	default:
+		context->SetInternalException( TXT_INVALID_CALLING_CONVENTION );
+	}
+
+	// If the return is a float value we need to get the value from the FP register
+	if( sysFunc->hostReturnFloat )
+	{
+		if( sysFunc->hostReturnSize == 1 )
+			*(asDWORD*)&retQW = GetReturnedFloat();
+		else
+			retQW = GetReturnedDouble();
+	}
+	else if( sysFunc->hostReturnSize == 1 )
+	{
+		// Move the bits to the higher value to compensate for the adjustment that the caller does
+		retQW <<= 32;
+	}
+
+	return retQW;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_XENON
+#endif // AS_MAX_PORTABILITY
+
+
+
diff --git a/Sources/AngelScript/source/as_compiler.cpp b/Sources/AngelScript/source/as_compiler.cpp
old mode 100755
new mode 100644
index 1d24ac076..1f4f67ce4
--- a/Sources/AngelScript/source/as_compiler.cpp
+++ b/Sources/AngelScript/source/as_compiler.cpp
@@ -1,15021 +1,16587 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_compiler.cpp
-//
-// The class that does the actual compilation of the functions
-//
-
-#include <math.h> // fmodf() pow()
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_compiler.h"
-#include "as_tokendef.h"
-#include "as_tokenizer.h"
-#include "as_string_util.h"
-#include "as_texts.h"
-#include "as_parser.h"
-#include "as_debug.h"
-#include "as_context.h"  // as_powi()
-
-BEGIN_AS_NAMESPACE
-
-//
-// The calling convention rules for script functions:
-// - If a class method returns a reference, the caller must guarantee the object pointer stays alive until the function returns, and the reference is no longer going to be used
-// - If a class method doesn't return a reference, it must guarantee by itself that the this pointer stays alive during the function call. If no outside access is made, then the function is guaranteed to stay alive and nothing needs to be done
-// - The object pointer is always passed as the first argument, position 0
-// - If the function returns a value type the caller must reserve the memory for this and pass the pointer as the first argument after the object pointer
-//
-
-
-
-
-
-// TODO: I must correct the interpretation of a reference to objects in the compiler.
-//       A reference should mean that a pointer to the object is on the stack.
-//       No expression should end up as non-references to objects, as the actual object is
-//       never put on the stack.
-//       Local variables are declared as non-references, but the expression should be a reference to the variable.
-//       Function parameters of called functions can also be non-references, but in that case it means the
-//       object will be passed by value (currently on the heap, which will be moved to the application stack).
-//
-//       The compiler shouldn't use the asCDataType::IsReference. The datatype should always be stored as non-references.
-//       Instead the compiler should keep track of references in TypeInfo, where it should also state how the reference
-//       is currently stored, i.e. in variable, in register, on stack, etc.
-
-asCCompiler::asCCompiler(asCScriptEngine *engine) : byteCode(engine)
-{
-	builder = 0;
-	script = 0;
-
-	variables = 0;
-	isProcessingDeferredParams = false;
-	isCompilingDefaultArg = false;
-	noCodeOutput = 0;
-}
-
-asCCompiler::~asCCompiler()
-{
-	while( variables )
-	{
-		asCVariableScope *var = variables;
-		variables = variables->parent;
-
-		asDELETE(var,asCVariableScope);
-	}
-}
-
-void asCCompiler::Reset(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptFunction *in_outFunc)
-{
-	this->builder = in_builder;
-	this->engine = in_builder->engine;
-	this->script = in_script;
-	this->outFunc = in_outFunc;
-
-	hasCompileErrors = false;
-
-	m_isConstructor       = false;
-	m_isConstructorCalled = false;
-	m_classDecl           = 0;
-	m_globalVar           = 0;
-
-	nextLabel = 0;
-	breakLabels.SetLength(0);
-	continueLabels.SetLength(0);
-
-	numLambdas = 0;
-
-	byteCode.ClearAll();
-}
-
-int asCCompiler::CompileDefaultConstructor(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptNode *in_node, asCScriptFunction *in_outFunc, sClassDeclaration *in_classDecl)
-{
-	Reset(in_builder, in_script, in_outFunc);
-
-	m_classDecl = in_classDecl;
-
-	// Insert a JitEntry at the start of the function for JIT compilers
-	byteCode.InstrPTR(asBC_JitEntry, 0);
-
-	// Add a variable scope that might be needed to declare dummy variables
-	// in case the member initialization refers to undefined symbols.
-	AddVariableScope();
-
-	// Initialize the class members that have no explicit expression first. This will allow the
-	// base class' constructor to access these members without worry they will be uninitialized.
-	// This can happen if the base class' constructor calls a method that is overridden by the derived class
-	CompileMemberInitialization(&byteCode, true);
-
-	// If the class is derived from another, then the base class' default constructor must be called
-	if( outFunc->objectType->derivedFrom )
-	{
-		// Make sure the base class really has a default constructor
-		if( outFunc->objectType->derivedFrom->beh.construct == 0 )
-			Error(TEXT_BASE_DOESNT_HAVE_DEF_CONSTR, in_node);
-
-		// Call the base class' default constructor
-		byteCode.InstrSHORT(asBC_PSF, 0);
-		byteCode.Instr(asBC_RDSPtr);
-		byteCode.Call(asBC_CALL, outFunc->objectType->derivedFrom->beh.construct, AS_PTR_SIZE);
-	}
-
-	// Initialize the class members that explicit expressions afterwards. This allow the expressions
-	// to access the base class members without worry they will be uninitialized
-	CompileMemberInitialization(&byteCode, false);
-	byteCode.OptimizeLocally(tempVariableOffsets);
-
-	// If there are compile errors, there is no reason to build the final code
-	if( hasCompileErrors )
-		return -1;
-
-	// Pop the object pointer from the stack
-	byteCode.Ret(AS_PTR_SIZE);
-
-	// Count total variable size
-	int varSize = GetVariableOffset((int)variableAllocations.GetLength()) - 1;
-	outFunc->scriptData->variableSpace = varSize;
-
-	FinalizeFunction();
-
-#ifdef AS_DEBUG
-	// DEBUG: output byte code
-	byteCode.DebugOutput(("__" + outFunc->objectType->name + "_" + outFunc->name + "__defconstr.txt").AddressOf(), in_outFunc);
-#endif
-
-	return 0;
-}
-
-int asCCompiler::CompileFactory(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptFunction *in_outFunc)
-{
-	Reset(in_builder, in_script, in_outFunc);
-
-	// Insert a JitEntry at the start of the function for JIT compilers
-	byteCode.InstrPTR(asBC_JitEntry, 0);
-
-	// Find the corresponding constructor
-	asCDataType dt = asCDataType::CreateType(outFunc->returnType.GetTypeInfo(), false);
-	int constructor = 0;
-	for( unsigned int n = 0; n < dt.GetBehaviour()->factories.GetLength(); n++ )
-	{
-		if( dt.GetBehaviour()->factories[n] == outFunc->id )
-		{
-			constructor = dt.GetBehaviour()->constructors[n];
-			break;
-		}
-	}
-
-	// Allocate the class and instantiate it with the constructor
-	int varOffset = AllocateVariable(dt, true);
-
-	outFunc->scriptData->variableSpace = AS_PTR_SIZE;
-	byteCode.InstrSHORT(asBC_PSF, (short)varOffset);
-
-	// Copy all arguments to the top of the stack
-	// TODO: runtime optimize: Might be interesting to have a specific instruction for copying all arguments
-	int offset = (int)outFunc->GetSpaceNeededForArguments();
-	for( int a = int(outFunc->parameterTypes.GetLength()) - 1; a >= 0; a-- )
-	{
-		if( !outFunc->parameterTypes[a].IsPrimitive() ||
-			outFunc->parameterTypes[a].IsReference() )
-		{
-			offset -= AS_PTR_SIZE;
-			byteCode.InstrSHORT(asBC_PshVPtr, short(-offset));
-		}
-		else
-		{
-			if( outFunc->parameterTypes[a].GetSizeOnStackDWords() == 2 )
-			{
-				offset -= 2;
-				byteCode.InstrSHORT(asBC_PshV8, short(-offset));
-			}
-			else
-			{
-				offset -= 1;
-				byteCode.InstrSHORT(asBC_PshV4, short(-offset));
-			}
-		}
-	}
-
-	int argDwords = (int)outFunc->GetSpaceNeededForArguments();
-	byteCode.Alloc(asBC_ALLOC, dt.GetTypeInfo(), constructor, argDwords + AS_PTR_SIZE);
-
-	// Return a handle to the newly created object
-	byteCode.InstrSHORT(asBC_LOADOBJ, (short)varOffset);
-
-	byteCode.Ret(argDwords);
-
-	FinalizeFunction();
-
-	// Tell the virtual machine not to clean up parameters on exception
-	outFunc->dontCleanUpOnException = true;
-
-/*
-#ifdef AS_DEBUG
-	// DEBUG: output byte code
-	asCString args;
-	args.Format("%d", outFunc->parameterTypes.GetLength());
-	byteCode.DebugOutput(("__" + outFunc->name + "__factory" + args + ".txt").AddressOf(), engine);
-#endif
-*/
-	return 0;
-}
-
-void asCCompiler::FinalizeFunction()
-{
-	TimeIt("asCCompiler::FinalizeFunction");
-
-	asASSERT( outFunc->scriptData );
-	asUINT n;
-
-	// Finalize the bytecode
-	byteCode.Finalize(tempVariableOffsets);
-
-	byteCode.ExtractObjectVariableInfo(outFunc);
-
-	// Compile the list of object variables for the exception handler
-	// Start with the variables allocated on the heap, and then the ones allocated on the stack
-	for( n = 0; n < variableAllocations.GetLength(); n++ )
-	{
-		if( (variableAllocations[n].IsObject() || variableAllocations[n].IsFuncdef()) && !variableAllocations[n].IsReference() )
-		{
-			if( variableIsOnHeap[n] )
-			{
-				outFunc->scriptData->objVariableTypes.PushLast(variableAllocations[n].GetTypeInfo());
-				outFunc->scriptData->objVariablePos.PushLast(GetVariableOffset(n));
-			}
-		}
-	}
-	outFunc->scriptData->objVariablesOnHeap = asUINT(outFunc->scriptData->objVariablePos.GetLength());
-	for( n = 0; n < variableAllocations.GetLength(); n++ )
-	{
-		if( (variableAllocations[n].IsObject() || variableAllocations[n].IsFuncdef()) && !variableAllocations[n].IsReference() )
-		{
-			if( !variableIsOnHeap[n] )
-			{
-				outFunc->scriptData->objVariableTypes.PushLast(variableAllocations[n].GetTypeInfo());
-				outFunc->scriptData->objVariablePos.PushLast(GetVariableOffset(n));
-			}
-		}
-	}
-
-	// Copy byte code to the function
-	asASSERT( outFunc->scriptData->byteCode.GetLength() == 0 );
-	outFunc->scriptData->byteCode.SetLength(byteCode.GetSize());
-	byteCode.Output(outFunc->scriptData->byteCode.AddressOf());
-	outFunc->AddReferences();
-	outFunc->scriptData->stackNeeded = byteCode.largestStackUsed + outFunc->scriptData->variableSpace;
-	outFunc->scriptData->lineNumbers = byteCode.lineNumbers;
-
-	// Extract the script section indexes too if there are any entries that are different from the function's script section
-	int lastIdx = outFunc->scriptData->scriptSectionIdx;
-	for( n = 0; n < byteCode.sectionIdxs.GetLength(); n++ )
-	{
-		if( byteCode.sectionIdxs[n] != lastIdx )
-		{
-			lastIdx = byteCode.sectionIdxs[n];
-			outFunc->scriptData->sectionIdxs.PushLast(byteCode.lineNumbers[n*2]);
-			outFunc->scriptData->sectionIdxs.PushLast(lastIdx);
-		}
-	}
-}
-
-// internal
-int asCCompiler::SetupParametersAndReturnVariable(asCArray<asCString> &parameterNames, asCScriptNode *func)
-{
-	int stackPos = 0;
-
-	if( outFunc->objectType )
-		stackPos = -AS_PTR_SIZE; // The first parameter is the pointer to the object
-
-	// Add the first variable scope, which the parameters and
-	// variables declared in the outermost statement block is
-	// part of.
-	AddVariableScope();
-
-	bool isDestructor = false;
-	asCDataType returnType;
-
-	// Examine return type
-	returnType = outFunc->returnType;
-
-	// Check if this is a constructor or destructor
-	if( returnType.GetTokenType() == ttVoid && outFunc->objectType )
-	{
-		if( outFunc->name[0] == '~' )
-			isDestructor = true;
-		else if( outFunc->objectType->name == outFunc->name )
-			m_isConstructor = true;
-	}
-
-	// Is the return type allowed?
-	if( returnType != asCDataType::CreatePrimitive(ttVoid, false) &&
-		!returnType.CanBeInstantiated() )
-	{
-		// TODO: Hasn't this been validated by the builder already?
-		asCString str;
-		str.Format(TXT_RETURN_CANT_BE_s, returnType.Format(outFunc->nameSpace).AddressOf());
-		Error(str, func);
-	}
-
-	// If the return type is a value type returned by value the address of the
-	// location where the value will be stored is pushed on the stack before
-	// the arguments
-	if( !(isDestructor || m_isConstructor) && outFunc->DoesReturnOnStack() )
-		stackPos -= AS_PTR_SIZE;
-
-	asCVariableScope vs(0);
-
-	// Declare parameters
-	asUINT n;
-	for( n = 0; n < parameterNames.GetLength(); n++ )
-	{
-		// Get the parameter type
-		asCDataType &type = outFunc->parameterTypes[n];
-		asETypeModifiers inoutFlag = n < outFunc->inOutFlags.GetLength() ? outFunc->inOutFlags[n] : asTM_NONE;
-
-		// Is the data type allowed?
-		// TODO: Hasn't this been validated by the builder already?
-		if( (type.IsReference() && inoutFlag != asTM_INOUTREF && !type.CanBeInstantiated()) ||
-			(!type.IsReference() && !type.CanBeInstantiated()) )
-		{
-			asCString parm = type.Format(outFunc->nameSpace);
-			if( inoutFlag == asTM_INREF )
-				parm += "in";
-			else if( inoutFlag == asTM_OUTREF )
-				parm += "out";
-
-			asCString str;
-			str.Format(TXT_PARAMETER_CANT_BE_s, parm.AddressOf());
-			Error(str, func);
-		}
-
-		// If the parameter has a name then declare it as variable
-		if( parameterNames[n] != "" )
-		{
-			asCString &name = parameterNames[n];
-			if( vs.DeclareVariable(name.AddressOf(), type, stackPos, true) < 0 )
-			{
-				// TODO: It might be an out-of-memory too
-				Error(TXT_PARAMETER_ALREADY_DECLARED, func);
-			}
-
-			// Add marker for variable declaration
-			byteCode.VarDecl((int)outFunc->scriptData->variables.GetLength());
-			outFunc->AddVariable(name, type, stackPos);
-		}
-		else
-			vs.DeclareVariable("", type, stackPos, true);
-
-		// Move to next parameter
-		stackPos -= type.GetSizeOnStackDWords();
-	}
-
-	for( n = asUINT(vs.variables.GetLength()); n-- > 0; )
-		variables->DeclareVariable(vs.variables[n]->name.AddressOf(), vs.variables[n]->type, vs.variables[n]->stackOffset, vs.variables[n]->onHeap);
-
-	variables->DeclareVariable("return", returnType, stackPos, true);
-
-	return stackPos;
-}
-
-void asCCompiler::CompileMemberInitialization(asCByteCode *bc, bool onlyDefaults)
-{
-	asASSERT( m_classDecl );
-
-	// Initialize each member in the order they were declared
-	for( asUINT n = 0; n < outFunc->objectType->properties.GetLength(); n++ )
-	{
-		asCObjectProperty *prop = outFunc->objectType->properties[n];
-
-		// Check if the property has an initialization expression
-		asCScriptNode *declNode = 0;
-		asCScriptNode *initNode = 0;
-		asCScriptCode *initScript = 0;
-		for( asUINT m = 0; m < m_classDecl->propInits.GetLength(); m++ )
-		{
-			if( m_classDecl->propInits[m].name == prop->name )
-			{
-				declNode   = m_classDecl->propInits[m].declNode;
-				initNode   = m_classDecl->propInits[m].initNode;
-				initScript = m_classDecl->propInits[m].file;
-				break;
-			}
-		}
-
-		// If declNode is null, the property was inherited in which case
-		// it was already initialized by the base class' constructor
-		if( declNode )
-		{
-			if( initNode )
-			{
-				if( onlyDefaults )
-					continue;
-
-#ifdef AS_NO_MEMBER_INIT
-				// Give an error as the initialization in the declaration has been disabled
-				asCScriptCode *origScript = script;
-				script = initScript;
-				Error("Initialization of members in declaration is not supported", initNode);
-				script = origScript;
-
-				// Clear the initialization node
-				initNode = 0;
-				initScript = script;
-#else
-				// Re-parse the initialization expression as the parser now knows the types, which it didn't earlier
-				asCParser parser(builder);
-				int r = parser.ParseVarInit(initScript, initNode);
-				if( r < 0 )
-					continue;
-
-				initNode = parser.GetScriptNode();
-#endif
-			}
-			else
-			{
-				if( !onlyDefaults )
-					continue;
-			}
-
-#ifdef AS_NO_MEMBER_INIT
-			// The initialization will be done in the asCScriptObject constructor, so
-			// here we should just validate that the member has a default constructor
-			if( prop->type.IsObject() &&
-				!prop->type.IsObjectHandle() &&
-				(((prop->type.GetTypeInfo()->flags & asOBJ_REF) &&
-				  prop->type.GetBehaviour()->factory == 0) ||
-				 ((prop->type.GetTypeInfo()->flags & asOBJ_VALUE) &&
-				  prop->type.GetBehaviour()->construct == 0 &&
-				  !(prop->type.GetTypeInfo()->flags & asOBJ_POD))) )
-			{
-				// Class has no default factory/constructor.
-				asCString str;
-				// TODO: funcdef: asCDataType should have a GetTypeName()
-				if( prop->type.GetFuncDef() )
-					str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, prop->type.GetFuncDef()->GetName());
-				else
-					str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, prop->type.GetTypeInfo()->GetName());
-				Error(str, declNode);
-			}
-#else
-			// Temporarily set the script that is being compiled to where the member initialization is declared.
-			// The script can be different when including mixin classes from a different script section
-			asCScriptCode *origScript = script;
-			script = initScript;
-
-			// Add a line instruction with the position of the declaration
-			LineInstr(bc, declNode->tokenPos);
-
-			// Compile the initialization
-			asQWORD constantValue;
-			asCByteCode bcInit(engine);
-			CompileInitialization(initNode, &bcInit, prop->type, declNode, prop->byteOffset, &constantValue, 2);
-			bcInit.OptimizeLocally(tempVariableOffsets);
-			bc->AddCode(&bcInit);
-
-			script = origScript;
-#endif
-		}
-	}
-}
-
-// Entry
-int asCCompiler::CompileFunction(asCBuilder *in_builder, asCScriptCode *in_script, asCArray<asCString> &in_parameterNames, asCScriptNode *in_func, asCScriptFunction *in_outFunc, sClassDeclaration *in_classDecl)
-{
-	TimeIt("asCCompiler::CompileFunction");
-
-	Reset(in_builder, in_script, in_outFunc);
-	int buildErrors = builder->numErrors;
-
-	int stackPos = SetupParametersAndReturnVariable(in_parameterNames, in_func);
-
-	//--------------------------------------------
-	// Compile the statement block
-
-	if( m_isConstructor )
-		m_classDecl = in_classDecl;
-
-	// We need to parse the statement block now
-	asCScriptNode *blockBegin;
-
-	// If the function signature was implicit, e.g. virtual property accessor or
-	// lambda function, then the received node already is the statement block
-	if( in_func->nodeType != snStatementBlock )
-		blockBegin = in_func->lastChild;
-	else
-		blockBegin = in_func;
-
-	// TODO: memory: We can parse the statement block one statement at a time, thus save even more memory
-	// TODO: optimize: For large functions, the parsing of the statement block can take a long time. Presumably because a lot of memory needs to be allocated
-	asCParser parser(builder);
-	int r = parser.ParseStatementBlock(script, blockBegin);
-	if( r < 0 ) return -1;
-	asCScriptNode *block = parser.GetScriptNode();
-
-	// Reserve a label for the cleanup code
-	nextLabel++;
-
-	bool hasReturn;
-	asCByteCode bc(engine);
-	LineInstr(&bc, blockBegin->tokenPos);
-	CompileStatementBlock(block, false, &hasReturn, &bc);
-	LineInstr(&bc, blockBegin->tokenPos + blockBegin->tokenLength);
-
-	// Make sure there is a return in all paths (if not return type is void)
-	// Don't bother with this check if there are compiler errors, e.g. Unreachable code
-	if( !hasCompileErrors && outFunc->returnType != asCDataType::CreatePrimitive(ttVoid, false) )
-	{
-		if( hasReturn == false )
-			Error(TXT_NOT_ALL_PATHS_RETURN, blockBegin);
-	}
-
-	//------------------------------------------------
-	// Concatenate the bytecode
-
-	// Insert a JitEntry at the start of the function for JIT compilers
-	byteCode.InstrPTR(asBC_JitEntry, 0);
-
-	if( outFunc->objectType )
-	{
-		if( m_isConstructor )
-		{
-			if( outFunc->objectType->derivedFrom )
-			{
-				// Call the base class' default constructor unless called manually in the code
-				if( !m_isConstructorCalled )
-				{
-					if( outFunc->objectType->derivedFrom->beh.construct )
-					{
-						// Initialize members without explicit expression first
-						CompileMemberInitialization(&byteCode, true);
-
-						// Call base class' constructor
-						asCByteCode tmpBC(engine);
-						tmpBC.InstrSHORT(asBC_PSF, 0);
-						tmpBC.Instr(asBC_RDSPtr);
-						tmpBC.Call(asBC_CALL, outFunc->objectType->derivedFrom->beh.construct, AS_PTR_SIZE);
-						tmpBC.OptimizeLocally(tempVariableOffsets);
-						byteCode.AddCode(&tmpBC);
-
-						// Add the initialization of the members with explicit expressions
-						CompileMemberInitialization(&byteCode, false);
-					}
-					else
-						Error(TEXT_BASE_DOESNT_HAVE_DEF_CONSTR, blockBegin);
-				}
-				else
-				{
-					// Only initialize members that don't have an explicit expression
-					// The members that are explicitly initialized will be initialized after the call to base class' constructor
-					CompileMemberInitialization(&byteCode, true);
-				}
-			}
-			else
-			{
-				// Add the initialization of the members
-				CompileMemberInitialization(&byteCode, true);
-				CompileMemberInitialization(&byteCode, false);
-			}
-		}
-	}
-
-	// Add the code for the statement block
-	byteCode.AddCode(&bc);
-
-	// Count total variable size
-	int varSize = GetVariableOffset((int)variableAllocations.GetLength()) - 1;
-	outFunc->scriptData->variableSpace = varSize;
-
-	// Deallocate all local variables
-	int n;
-	for( n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
-	{
-		sVariable *v = variables->variables[n];
-		if( v->stackOffset > 0 )
-		{
-			// Call variables destructors
-			if( v->name != "return" && v->name != "return address" )
-				CallDestructor(v->type, v->stackOffset, v->onHeap, &byteCode);
-
-			DeallocateVariable(v->stackOffset);
-		}
-	}
-
-	// This is the label that return statements jump to
-	// in order to exit the function
-	byteCode.Label(0);
-
-	// Call destructors for function parameters
-	for( n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
-	{
-		sVariable *v = variables->variables[n];
-		if( v->stackOffset <= 0 )
-		{
-			// Call variable destructors here, for variables not yet destroyed
-			if( v->name != "return" && v->name != "return address" )
-				CallDestructor(v->type, v->stackOffset, v->onHeap, &byteCode);
-		}
-
-		// Do not deallocate parameters
-	}
-
-	// Check if the number of labels in the functions isn't too many to be handled
-	if( nextLabel >= (1<<15) )
-		Error(TXT_TOO_MANY_JUMP_LABELS, in_func);
-
-	// If there are compile errors, there is no reason to build the final code
-	if( hasCompileErrors || builder->numErrors != buildErrors )
-		return -1;
-
-	// At this point there should be no variables allocated
-	asASSERT(variableAllocations.GetLength() == freeVariables.GetLength());
-
-	// Remove the variable scope
-	RemoveVariableScope();
-
-	byteCode.Ret(-stackPos);
-
-	FinalizeFunction();
-
-#ifdef AS_DEBUG
-	// DEBUG: output byte code
-	if( outFunc->objectType )
-		byteCode.DebugOutput(("__" + outFunc->objectType->name + "_" + outFunc->name + ".txt").AddressOf(), in_outFunc);
-	else
-		byteCode.DebugOutput(("__" + outFunc->name + ".txt").AddressOf(), in_outFunc);
-#endif
-
-	return 0;
-}
-
-int asCCompiler::CallCopyConstructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool isGlobalVar, bool derefDest)
-{
-	if( !type.IsObject() )
-		return 0;
-
-	// CallCopyConstructor should not be called for object handles.
-	asASSERT( !type.IsObjectHandle() );
-
-	asCArray<asCExprContext*> args;
-	args.PushLast(arg);
-
-	// The reference parameter must be pushed on the stack
-	asASSERT( arg->type.dataType.GetTypeInfo() == type.GetTypeInfo() );
-
-	// Since we're calling the copy constructor, we have to trust the function to not do
-	// anything stupid otherwise we will just enter a loop, as we try to make temporary
-	// copies of the argument in order to guarantee safety.
-
-
-	if( type.GetTypeInfo()->flags & asOBJ_REF )
-	{
-		asCExprContext ctx(engine);
-
-		int func = 0;
-		asSTypeBehaviour *beh = type.GetBehaviour();
-		if( beh ) func = beh->copyfactory;
-
-		if( func > 0 )
-		{
-			if( !isGlobalVar )
-			{
-				// Call factory and store the handle in the given variable
-				PerformFunctionCall(func, &ctx, false, &args, type.GetTypeInfo()->CastToObjectType(), true, offset);
-
-				// Pop the reference left by the function call
-				ctx.bc.Instr(asBC_PopPtr);
-			}
-			else
-			{
-				// Call factory
-				PerformFunctionCall(func, &ctx, false, &args, type.GetTypeInfo()->CastToObjectType());
-
-				// Store the returned handle in the global variable
-				ctx.bc.Instr(asBC_RDSPtr);
-				ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-				ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
-				ctx.bc.Instr(asBC_PopPtr);
-				ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
-			}
-
-			bc->AddCode(&ctx.bc);
-
-			return 0;
-		}
-	}
-	else
-	{
-		asSTypeBehaviour *beh = type.GetBehaviour();
-		int func = beh ? beh->copyconstruct : 0;
-		if( func > 0 )
-		{
-			// Push the address where the object will be stored on the stack, before the argument
-			// TODO: When the context is serializable this probably has to be changed, since this
-			//       pointer can remain on the stack while the context is suspended. There is no
-			//       risk the pointer becomes invalid though, there is just no easy way to serialize it.
-			asCByteCode tmp(engine);
-			if( isGlobalVar )
-				tmp.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-			else if( isObjectOnHeap )
-				tmp.InstrSHORT(asBC_PSF, (short)offset);
-			tmp.AddCode(bc);
-			bc->AddCode(&tmp);
-
-			// When the object is allocated on the stack the object pointer
-			// must be pushed on the stack after the arguments
-			if( !isObjectOnHeap )
-			{
-				asASSERT( !isGlobalVar );
-				bc->InstrSHORT(asBC_PSF, (short)offset);
-				if( derefDest )
-				{
-					// The variable is a reference to the real location, so we need to dereference it
-					bc->Instr(asBC_RDSPtr);
-				}
-			}
-
-			asCExprContext ctx(engine);
-			PerformFunctionCall(func, &ctx, isObjectOnHeap, &args, type.GetTypeInfo()->CastToObjectType());
-
-			bc->AddCode(&ctx.bc);
-
-			// TODO: value on stack: This probably needs to be done in PerformFunctionCall
-			// Mark the object as initialized
-			if( !isObjectOnHeap )
-				bc->ObjInfo(offset, asOBJ_INIT);
-
-
-			return 0;
-		}
-	}
-
-	// Class has no copy constructor/factory.
-	asCString str;
-	str.Format(TXT_NO_COPY_CONSTRUCTOR_FOR_s, type.GetTypeInfo()->GetName());
-	Error(str, node);
-
-	return -1;
-}
-
-int asCCompiler::CallDefaultConstructor(const asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem, bool derefDest)
-{
-	if( !type.IsObject() || type.IsObjectHandle() )
-		return 0;
-
-	if( type.GetTypeInfo()->flags & asOBJ_REF )
-	{
-		asCExprContext ctx(engine);
-		ctx.exprNode = node;
-
-		int func = 0;
-		asSTypeBehaviour *beh = type.GetBehaviour();
-		if( beh )
-		{
-			func = beh->factory;
-
-			// If no trivial default factory is found, look for a factory where all params have default args
-			if( func == 0 )
-			{
-				for( asUINT n = 0; n < beh->factories.GetLength(); n++ )
-				{
-					asCScriptFunction *f = engine->scriptFunctions[beh->factories[n]];
-					if( f->defaultArgs.GetLength() == f->parameterTypes.GetLength() &&
-						f->defaultArgs[0] != 0 )
-					{
-						func = beh->factories[n];
-						break;
-					}
-				}
-			}
-		}
-
-		if( func > 0 )
-		{
-			asCArray<asCExprContext *> args;
-			asCScriptFunction *f = engine->scriptFunctions[func];
-			if( f->parameterTypes.GetLength() )
-			{
-				// Add the default values for arguments not explicitly supplied
-				CompileDefaultAndNamedArgs(node, args, func, type.GetTypeInfo()->CastToObjectType());
-
-				PrepareFunctionCall(func, &ctx.bc, args);
-
-				MoveArgsToStack(func, &ctx.bc, args, false);
-			}
-
-			if( isVarGlobOrMem == 0 )
-			{
-				// Call factory and store the handle in the given variable
-				PerformFunctionCall(func, &ctx, false, &args, type.GetTypeInfo()->CastToObjectType(), true, offset);
-
-				// Pop the reference left by the function call
-				ctx.bc.Instr(asBC_PopPtr);
-			}
-			else
-			{
-				// Call factory
-				PerformFunctionCall(func, &ctx, false, &args, type.GetTypeInfo()->CastToObjectType());
-
-				// TODO: runtime optimize: Should have a way of storing the object pointer directly to the destination
-				//                         instead of first storing it in a local variable and then copying it to the
-				//                         destination.
-
-				if( !(type.GetTypeInfo()->flags & asOBJ_SCOPED) )
-				{
-					// Only dereference the variable if not a scoped type
-					ctx.bc.Instr(asBC_RDSPtr);
-				}
-
-				if( isVarGlobOrMem == 1 )
-				{
-					// Store the returned handle in the global variable
-					ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-				}
-				else
-				{
-					// Store the returned handle in the class member
-					ctx.bc.InstrSHORT(asBC_PSF, 0);
-					ctx.bc.Instr(asBC_RDSPtr);
-					ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-				}
-
-				if( type.GetTypeInfo()->flags & asOBJ_SCOPED )
-				{
-					// For scoped typed we must move the reference from the local
-					// variable rather than copy it as there is no AddRef behaviour
-					ctx.bc.InstrSHORT_DW(asBC_COPY, AS_PTR_SIZE, asTYPEID_OBJHANDLE | engine->GetTypeIdFromDataType(type));
-
-					// Clear the local variable so the reference isn't released
-					ctx.bc.InstrSHORT(asBC_ClrVPtr, ctx.type.stackOffset);
-				}
-				else
-				{
-					if( type.IsFuncdef() )
-						ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-					else
-						ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
-				}
-				ctx.bc.Instr(asBC_PopPtr);
-				ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
-			}
-
-			bc->AddCode(&ctx.bc);
-
-			// Cleanup
-			for( asUINT n = 0; n < args.GetLength(); n++ )
-				if( args[n] )
-				{
-					asDELETE(args[n], asCExprContext);
-				}
-
-			return 0;
-		}
-	}
-	else
-	{
-		asCExprContext ctx(engine);
-		ctx.exprNode = node;
-
-		asSTypeBehaviour *beh = type.GetBehaviour();
-
-		int func = 0;
-		if( beh )
-		{
-			func = beh->construct;
-
-			// If no trivial default constructor is found, look for a constructor where all params have default args
-			if( func == 0 )
-			{
-				for( asUINT n = 0; n < beh->constructors.GetLength(); n++ )
-				{
-					asCScriptFunction *f = engine->scriptFunctions[beh->constructors[n]];
-					if( f->defaultArgs.GetLength() == f->parameterTypes.GetLength() &&
-						f->defaultArgs[0] != 0 )
-					{
-						func = beh->constructors[n];
-						break;
-					}
-				}
-			}
-		}
-
-		// Allocate and initialize with the default constructor
-		if( func != 0 || (type.GetTypeInfo()->flags & asOBJ_POD) )
-		{
-			asCArray<asCExprContext *> args;
-			asCScriptFunction *f = engine->scriptFunctions[func];
-			if( f && f->parameterTypes.GetLength() )
-			{
-				// Add the default values for arguments not explicitly supplied
-				CompileDefaultAndNamedArgs(node, args, func, type.GetTypeInfo()->CastToObjectType());
-
-				PrepareFunctionCall(func, &ctx.bc, args);
-
-				MoveArgsToStack(func, &ctx.bc, args, false);
-			}
-
-			if( !isObjectOnHeap )
-			{
-				if( isVarGlobOrMem == 0 )
-				{
-					// There is nothing to do if there is no function,
-					// as the memory is already allocated on the stack
-					if( func )
-					{
-						// Call the constructor as a normal function
-						bc->InstrSHORT(asBC_PSF, (short)offset);
-						if( derefDest )
-							bc->Instr(asBC_RDSPtr);
-
-						asCExprContext ctxCall(engine);
-						PerformFunctionCall(func, &ctxCall, false, 0, type.GetTypeInfo()->CastToObjectType());
-						bc->AddCode(&ctxCall.bc);
-
-						// TODO: value on stack: This probably needs to be done in PerformFunctionCall
-						// Mark the object as initialized
-						bc->ObjInfo(offset, asOBJ_INIT);
-					}
-				}
-				else if( isVarGlobOrMem == 2 )
-				{
-					// Only POD types can be allocated inline in script classes
-					asASSERT( type.GetTypeInfo()->flags & asOBJ_POD );
-
-					if( func )
-					{
-						// Call the constructor as a normal function
-						bc->InstrSHORT(asBC_PSF, 0);
-						bc->Instr(asBC_RDSPtr);
-						bc->InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-
-						asCExprContext ctxCall(engine);
-						PerformFunctionCall(func, &ctxCall, false, 0, type.GetTypeInfo()->CastToObjectType());
-						bc->AddCode(&ctxCall.bc);
-					}
-				}
-				else
-				{
-					asASSERT( false );
-				}
-			}
-			else
-			{
-				if( isVarGlobOrMem == 0 )
-					bc->InstrSHORT(asBC_PSF, (short)offset);
-				else if( isVarGlobOrMem == 1 )
-					bc->InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-				else
-				{
-					bc->InstrSHORT(asBC_PSF, 0);
-					bc->Instr(asBC_RDSPtr);
-					bc->InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-				}
-
-				if( (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) )
-				{
-					asCScriptFunction *descr = engine->scriptFunctions[func];
-					asASSERT( descr->funcType == asFUNC_SCRIPT );
-
-					// Find the id of the real constructor and not the generated stub
-					asUINT id = 0;
-					asDWORD *funcBc = descr->scriptData->byteCode.AddressOf();
-					while( funcBc )
-					{
-						if( (*(asBYTE*)funcBc) == asBC_CALLSYS )
-						{
-							id = asBC_INTARG(funcBc);
-							break;
-						}
-						funcBc += asBCTypeSize[asBCInfo[*(asBYTE*)funcBc].type];
-					}
-
-					asASSERT( id );
-
-					bc->InstrPTR(asBC_OBJTYPE, type.GetTypeInfo());
-					bc->Alloc(asBC_ALLOC, type.GetTypeInfo(), id, AS_PTR_SIZE + AS_PTR_SIZE);
-				}
-				else
-					bc->Alloc(asBC_ALLOC, type.GetTypeInfo(), func, AS_PTR_SIZE);
-			}
-
-			// Cleanup
-			for( asUINT n = 0; n < args.GetLength(); n++ )
-				if( args[n] )
-				{
-					asDELETE(args[n], asCExprContext);
-				}
-
-			return 0;
-		}
-	}
-
-	// Class has no default factory/constructor.
-	asCString str;
-	str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, type.GetTypeInfo()->GetName());
-	Error(str, node);
-
-	return -1;
-}
-
-void asCCompiler::CallDestructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc)
-{
-	if( !type.IsReference() )
-	{
-		// Call destructor for the data type
-		if( type.IsObject() || type.IsFuncdef() )
-		{
-			// The null pointer doesn't need to be destroyed
-			if( type.IsNullHandle() )
-				return;
-
-			// Nothing is done for list pattern types, as this is taken care of by the CompileInitList method
-			if( type.GetTypeInfo()->flags & asOBJ_LIST_PATTERN )
-				return;
-
-			if( isObjectOnHeap || type.IsObjectHandle() )
-			{
-				// Free the memory
-				if (type.IsFuncdef())
-					bc->InstrW_PTR(asBC_FREE, (short)offset, &engine->functionBehaviours);
-				else
-					bc->InstrW_PTR(asBC_FREE, (short)offset, type.GetTypeInfo());
-			}
-			else
-			{
-				asASSERT( type.GetTypeInfo()->GetFlags() & asOBJ_VALUE );
-
-				if( type.GetBehaviour()->destruct )
-				{
-					// Call the destructor as a regular function
-					asCExprContext ctx(engine);
-					ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
-					PerformFunctionCall(type.GetBehaviour()->destruct, &ctx);
-					ctx.bc.OptimizeLocally(tempVariableOffsets);
-					bc->AddCode(&ctx.bc);
-				}
-
-				// TODO: Value on stack: This probably needs to be done in PerformFunctionCall
-				// Mark the object as destroyed
-				bc->ObjInfo(offset, asOBJ_UNINIT);
-			}
-		}
-	}
-}
-
-void asCCompiler::LineInstr(asCByteCode *bc, size_t pos)
-{
-	int r, c;
-	script->ConvertPosToRowCol(pos, &r, &c);
-	bc->Line(r, c, script->idx);
-}
-
-void asCCompiler::CompileStatementBlock(asCScriptNode *block, bool ownVariableScope, bool *hasReturn, asCByteCode *bc)
-{
-	*hasReturn = false;
-	bool isFinished = false;
-	bool hasUnreachableCode = false;
-	bool hasReturnBefore = false;
-
-	if( ownVariableScope )
-	{
-		bc->Block(true);
-		AddVariableScope();
-	}
-
-	asCScriptNode *node = block->firstChild;
-	while( node )
-	{
-#ifdef AS_DEBUG
-		// Keep the current line in a variable so it will be easier
-		// to determine where in a script an assert is occurring.
-		int currentLine = 0;
-		script->ConvertPosToRowCol(node->tokenPos, &currentLine, 0);
-#endif
-
-		if( !hasUnreachableCode && (*hasReturn || isFinished) )
-		{
-			// Empty statements don't count
-			if( node->nodeType != snExpressionStatement || node->firstChild )
-			{
-				hasUnreachableCode = true;
-				Warning(TXT_UNREACHABLE_CODE, node);
-			}
-
-			if( *hasReturn )
-				hasReturnBefore = true;
-		}
-
-		if( node->nodeType == snBreak || node->nodeType == snContinue )
-			isFinished = true;
-
-		asCByteCode statement(engine);
-		if( node->nodeType == snDeclaration )
-			CompileDeclaration(node, &statement);
-		else
-			CompileStatement(node, hasReturn, &statement);
-
-		// Ignore missing returns in unreachable code paths
-		if( !(*hasReturn) && hasReturnBefore )
-			*hasReturn = true;
-
-		LineInstr(bc, node->tokenPos);
-		bc->AddCode(&statement);
-
-		if( !hasCompileErrors )
-		{
-			asASSERT( tempVariables.GetLength() == 0 );
-			asASSERT( reservedVariables.GetLength() == 0 );
-		}
-
-		node = node->next;
-	}
-
-	if( ownVariableScope )
-	{
-		// Deallocate variables in this block, in reverse order
-		for( int n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
-		{
-			sVariable *v = variables->variables[n];
-
-			// Call variable destructors here, for variables not yet destroyed
-			// If the block is terminated with a break, continue, or
-			// return the variables are already destroyed
-			if( !isFinished && !*hasReturn )
-				CallDestructor(v->type, v->stackOffset, v->onHeap, bc);
-
-			// Don't deallocate function parameters
-			if( v->stackOffset > 0 )
-				DeallocateVariable(v->stackOffset);
-		}
-
-		RemoveVariableScope();
-		bc->Block(false);
-	}
-}
-
-// Entry
-int asCCompiler::CompileGlobalVariable(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptNode *in_node, sGlobalVariableDescription *in_gvar, asCScriptFunction *in_outFunc)
-{
-	Reset(in_builder, in_script, in_outFunc);
-	m_globalVar = in_gvar;
-
-	// Add a variable scope (even though variables can't be declared)
-	AddVariableScope();
-
-	in_gvar->isPureConstant = false;
-
-	// Parse the initialization nodes
-	asCParser parser(builder);
-	if (in_node)
-	{
-		int r = parser.ParseVarInit(in_script, in_node);
-		if (r < 0)
-			return r;
-
-		in_node = parser.GetScriptNode();
-	}
-
-	asCExprContext compiledCtx(engine);
-	bool preCompiled = false;
-	if (in_gvar->datatype.IsAuto())
-	{
-		preCompiled = CompileAutoType(in_gvar->datatype, compiledCtx, in_node, in_gvar->declaredAtNode);
-		if (!preCompiled)
-		{
-			// If it wasn't possible to determine the type from the expression then there 
-			// is no need to continue with the initialization. The error was already reported
-			// in CompileAutoType.
-			return -1;
-		}
-	}
-	if( in_gvar->property == 0 )
-	{
-		in_gvar->property = builder->module->AllocateGlobalProperty(in_gvar->name.AddressOf(), in_gvar->datatype, in_gvar->ns);
-		in_gvar->index = in_gvar->property->id;
-	}
-
-	// Compile the expression
-	asCExprContext ctx(engine);
-	asQWORD constantValue = 0;
-	if( CompileInitialization(in_node, &ctx.bc, in_gvar->datatype, in_gvar->declaredAtNode, in_gvar->index, &constantValue, 1, preCompiled ? &compiledCtx : 0) )
-	{
-		// Should the variable be marked as pure constant?
-		if( in_gvar->datatype.IsPrimitive() && in_gvar->datatype.IsReadOnly() )
-		{
-			in_gvar->isPureConstant = true;
-			in_gvar->constantValue = constantValue;
-		}
-	}
-
-	// Concatenate the bytecode
-	int varSize = GetVariableOffset((int)variableAllocations.GetLength()) - 1;
-
-	// Add information on the line number for the global variable
-	size_t pos = 0;
-	if( in_gvar->declaredAtNode )
-		pos = in_gvar->declaredAtNode->tokenPos;
-	else if( in_gvar->initializationNode )
-		pos = in_gvar->initializationNode->tokenPos;
-	LineInstr(&byteCode, pos);
-
-	// Reserve space for all local variables
-	outFunc->scriptData->variableSpace = varSize;
-
-	ctx.bc.OptimizeLocally(tempVariableOffsets);
-
-	byteCode.AddCode(&ctx.bc);
-
-	// Deallocate variables in this block, in reverse order
-	for( int n = (int)variables->variables.GetLength() - 1; n >= 0; --n )
-	{
-		sVariable *v = variables->variables[n];
-
-		// Call variable destructors here, for variables not yet destroyed
-		CallDestructor(v->type, v->stackOffset, v->onHeap, &byteCode);
-
-		DeallocateVariable(v->stackOffset);
-	}
-
-	if( hasCompileErrors ) return -1;
-
-	// At this point there should be no variables allocated
-	asASSERT(variableAllocations.GetLength() == freeVariables.GetLength());
-
-	// Remove the variable scope again
-	RemoveVariableScope();
-
-	byteCode.Ret(0);
-
-	FinalizeFunction();
-
-#ifdef AS_DEBUG
-	// DEBUG: output byte code
-	byteCode.DebugOutput(("___init_" + in_gvar->name + ".txt").AddressOf(), outFunc);
-#endif
-
-	return 0;
-}
-
-void asCCompiler::DetermineSingleFunc(asCExprContext *ctx, asCScriptNode *node)
-{
-	// Don't do anything if this is not a deferred global function
-	if( !ctx->IsGlobalFunc() )
-		return;
-
-	// Determine the namespace
-	asSNameSpace *ns = 0;
-	asCString name = "";
-	int pos = ctx->methodName.FindLast("::");
-	if( pos >= 0 )
-	{
-		asCString nsName = ctx->methodName.SubString(0, pos+2);
-
-		// Cut off the ::
-		if( nsName.GetLength() > 2 )
-			nsName.SetLength(nsName.GetLength()-2);
-
-		ns = DetermineNameSpace(nsName);
-		name = ctx->methodName.SubString(pos+2);
-	}
-	else
-	{
-		DetermineNameSpace("");
-		name = ctx->methodName;
-	}
-
-	asCArray<int> funcs;
-	if( ns )
-		builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
-
-	// CompileVariableAccess should guarantee that at least one function is exists
-	asASSERT( funcs.GetLength() > 0 );
-
-	if( funcs.GetLength() > 1 )
-	{
-		asCString str;
-		str.Format(TXT_MULTIPLE_MATCHING_SIGNATURES_TO_s, ctx->methodName.AddressOf());
-		Error(str, node);
-
-		// Fall through so the compiler can continue as if only one function was matching
-	}
-
-	// A shared object may not access global functions unless they too are shared (e.g. registered functions)
-	if( !builder->GetFunctionDescription(funcs[0])->IsShared() &&
-		outFunc->IsShared() )
-	{
-		asCString msg;
-		msg.Format(TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s, builder->GetFunctionDescription(funcs[0])->GetDeclaration());
-		Error(msg, node);
-
-		// Fall through so the compiler can continue anyway
-	}
-
-	// Push the function pointer on the stack
-	ctx->bc.InstrPTR(asBC_FuncPtr, builder->GetFunctionDescription(funcs[0]));
-	ctx->type.Set(asCDataType::CreateType(engine->FindMatchingFuncdef(builder->GetFunctionDescription(funcs[0]), builder->module), false));
-	ctx->type.dataType.MakeHandle(true);
-	ctx->type.isExplicitHandle = true;
-	ctx->methodName = "";
-}
-
-void asCCompiler::CompileInitAsCopy(asCDataType &dt, int offset, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool derefDestination)
-{
-	bool isObjectOnHeap = derefDestination ? false : IsVariableOnHeap(offset);
-
-	// Use copy constructor if available.
-	if( dt.GetTypeInfo()->CastToObjectType() && dt.GetTypeInfo()->CastToObjectType()->beh.copyconstruct )
-	{
-		PrepareForAssignment(&dt, arg, node, true);
-		int r = CallCopyConstructor(dt, offset, isObjectOnHeap, bc, arg, node, 0, derefDestination);
-		if( r < 0 && tempVariables.Exists(offset) )
-			Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
-	}
-	else
-	{
-		// TODO: Need to reserve variables, as the default constructor may need
-		//       to allocate temporary variables to compute default args
-
-		// Allocate and construct the temporary object before whatever is already in the bytecode
-		asCByteCode tmpBC(engine);
-		int r = CallDefaultConstructor(dt, offset, isObjectOnHeap, &tmpBC, node, 0, derefDestination);
-		if( r < 0 )
-		{
-			if( tempVariables.Exists(offset) )
-				Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
-			return;
-		}
-
-		tmpBC.AddCode(bc);
-		bc->AddCode(&tmpBC);
-
-		// Assign the evaluated expression to the temporary variable
-		PrepareForAssignment(&dt, arg, node, true);
-		bc->AddCode(&arg->bc);
-
-		// Call the opAssign method to assign the value to the temporary object
-		dt.MakeReference(isObjectOnHeap);
-		asCExprValue type;
-		type.Set(dt);
-		type.isTemporary = true;
-		type.stackOffset = (short)offset;
-
-		if( dt.IsObjectHandle() )
-			type.isExplicitHandle = true;
-
-		bc->InstrSHORT(asBC_PSF, (short)offset);
-		if( derefDestination )
-			bc->Instr(asBC_RDSPtr);
-
-		r = PerformAssignment(&type, &arg->type, bc, node);
-		if( r < 0 )
-		{
-			if( tempVariables.Exists(offset) )
-				Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
-			return;
-		}
-
-		// Pop the reference that was pushed on the stack if the result is an object
-		if( type.dataType.IsObject() || type.dataType.IsFuncdef() )
-			bc->Instr(asBC_PopPtr);
-
-		// If the assignment operator returned an object by value it will
-		// be in a temporary variable which we need to destroy now
-		if( type.isTemporary && type.stackOffset != (short)offset )
-			ReleaseTemporaryVariable(type.stackOffset, bc);
-
-		// Release the original value too in case it is a temporary
-		ReleaseTemporaryVariable(arg->type, bc);
-	}
-}
-
-int asCCompiler::PrepareArgument(asCDataType *paramType, asCExprContext *ctx, asCScriptNode *node, bool isFunction, int refType, bool isMakingCopy)
-{
-	asCDataType param = *paramType;
-	if( paramType->GetTokenType() == ttQuestion )
-	{
-		// The function is expecting a var type. If the argument is a function name, we must now decide which function it is
-		DetermineSingleFunc(ctx, node);
-
-		// Since the function is expecting a var type ?, then we don't want to convert the argument to anything else
-		param = ctx->type.dataType;
-		param.MakeHandle(ctx->type.isExplicitHandle || ctx->type.IsNullConstant());
-
-		// Treat the void expression like a null handle when working with var types
-		if( ctx->IsVoidExpression() )
-			param = asCDataType::CreateNullHandle();
-
-		// If value assign is disabled for reference types, then make
-		// sure to always pass the handle to ? parameters
-		if( builder->engine->ep.disallowValueAssignForRefType &&
-			ctx->type.dataType.GetTypeInfo() && (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCOPED) )
-		{
-			param.MakeHandle(true);
-		}
-
-		param.MakeReference(paramType->IsReference());
-		param.MakeReadOnly(paramType->IsReadOnly());
-	}
-	else
-		param = *paramType;
-
-	asCDataType dt = param;
-
-	// Need to protect arguments by reference
-	if( isFunction && dt.IsReference() )
-	{
-		// Allocate a temporary variable of the same type as the argument
-		dt.MakeReference(false);
-		dt.MakeReadOnly(false);
-
-		int offset;
-		if( refType == asTM_INREF )
-		{
-			ProcessPropertyGetAccessor(ctx, node);
-
-			// Add the type id as hidden arg if the parameter is a ? type
-			if( paramType->GetTokenType() == ttQuestion )
-			{
-				asCByteCode tmpBC(engine);
-
-				// Place the type id on the stack as a hidden parameter
-				tmpBC.InstrDWORD(asBC_TYPEID, engine->GetTypeIdFromDataType(param));
-
-				// Insert the code before the expression code
-				tmpBC.AddCode(&ctx->bc);
-				ctx->bc.AddCode(&tmpBC);
-			}
-
-			if( dt.IsPrimitive() )
-			{
-				// If the reference is const, then it is not necessary to make a copy if the value already is a variable
-				// Even if the same variable is passed in another argument as non-const then there is no problem
-				IsVariableInitialized(&ctx->type, node);
-
-				if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
-				ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true);
-
-				if( !(param.IsReadOnly() && ctx->type.isVariable) )
-					ConvertToTempVariable(ctx);
-
-				PushVariableOnStack(ctx, true);
-				ctx->type.dataType.MakeReadOnly(param.IsReadOnly());
-			}
-			else if( ctx->type.dataType.IsNullHandle() )
-			{
-				// Make sure the argument type can support handles (or is itself a handle)
-				if( !dt.SupportHandles() && !dt.IsObjectHandle() )
-				{
-					asCString str;
-					str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), param.Format(outFunc->nameSpace).AddressOf());
-					Error(str, node);
-
-					ctx->type.Set(param);
-					return -1;
-				}
-
-				// Need to initialize a local temporary variable to
-				// represent the null handle when passed as reference
-				asASSERT( ctx->bc.GetLastInstr() == asBC_PshNull );
-				ctx->bc.Instr(asBC_PopPtr);
-
-				dt.MakeHandle(true);
-				offset = AllocateVariableNotIn(dt, true, false, ctx);
-
-				// Push the reference to the variable on the stack
-				ctx->bc.InstrWORD(asBC_PSF, (short)offset);
-
-				ctx->type.SetVariable(dt, offset, true);
-			}
-			else
-			{
-				IsVariableInitialized(&ctx->type, node);
-
-				if( !isMakingCopy )
-				{
-					// Even though the parameter expects a reference, it is only meant to be
-					// used as input value and doesn't have to refer to the actual object, so it
-					// is OK to do an implicit conversion.
-					ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true);
-					if( !ctx->type.dataType.IsEqualExceptRefAndConst(param) )
-					{
-						asCString str;
-						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), param.Format(outFunc->nameSpace).AddressOf());
-						Error(str, node);
-
-						ctx->type.Set(param);
-						return -1;
-					}
-
-					// The compiler must guarantee that the object stays alive during the execution
-					// of the function, and it must also guarantee that the value isn't modified by
-					// the function.
-
-					// If the argument is a temporary local variable then it is safe to be passed to
-					// the function as it is, since the local variable will stay alive, and since it
-					// is temporary there is no side effect if the function modifies it.
-
-					// If the parameter is read-only and therefore guaranteed not to be modified by the
-					// function, then it is enough that the variable is local to guarantee the lifetime.
-					if( !ctx->type.isTemporary && !(param.IsReadOnly() && ctx->type.isVariable) )
-					{
-						if( ctx->type.dataType.IsFuncdef() || ((ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && param.IsReadOnly() && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCOPED)) )
-						{
-							// Funcdefs only need an extra handle to guarantee the lifetime.
-
-							// If the object is a reference type (except scoped reference types), and the
-							// parameter is a const reference, then it is not necessary to make a copy of the
-							// object. The compiler just needs to hold a handle to guarantee the lifetime.
-
-							// Allocate a handle variable
-							dt.MakeHandle(true);
-							offset = AllocateVariableNotIn(dt, true, false, ctx);
-
-							// Copy the handle
-							Dereference(ctx, true);
-							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
-							if (ctx->type.dataType.IsFuncdef())
-								ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-							else
-								ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
-							ctx->bc.Instr(asBC_PopPtr);
-							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
-
-							// The type should be set to the param type instead of dt to guarantee
-							// that the expression keeps the correct type for variable ? args. Otherwise
-							// MoveArgsToStack will use the wrong bytecode to move the arg to the stack
-							ctx->type.SetVariable(param, offset, true);
-						}
-						else
-						{
-							// Make a copy of the object to guarantee that the original isn't modified
-							asASSERT(!dt.IsFuncdef());
-
-							// Allocate and initialize a temporary local object
-							offset = AllocateVariableNotIn(dt, true, false, ctx);
-							CompileInitAsCopy(dt, offset, &ctx->bc, ctx, node, false);
-
-							// Push the object pointer on the stack
-							ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-							if( dt.IsObject() && !dt.IsObjectHandle() )
-								ctx->bc.Instr(asBC_RDSPtr);
-
-							// Set the resulting type
-							ctx->type.Set(dt);
-							ctx->type.isTemporary = true;
-							ctx->type.stackOffset = short(offset);
-							if( dt.IsObjectHandle() )
-								ctx->type.isExplicitHandle = true;
-							ctx->type.dataType.MakeReference(false);
-							if( paramType->IsReadOnly() )
-								ctx->type.dataType.MakeReadOnly(true);
-						}
-					}
-				}
-				else
-				{
-					// We must guarantee that the address to the value is on the stack
-					if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) &&
-						!ctx->type.dataType.IsObjectHandle() &&
-						ctx->type.dataType.IsReference() )
-						Dereference(ctx, true);
-				}
-			}
-		}
-		else if( refType == asTM_OUTREF )
-		{
-			// Add the type id as hidden arg if the parameter is a ? type
-			if( paramType->GetTokenType() == ttQuestion )
-			{
-				asCByteCode tmpBC(engine);
-
-				// Place the type id on the stack as a hidden parameter
-				tmpBC.InstrDWORD(asBC_TYPEID, engine->GetTypeIdFromDataType(param));
-
-				// Insert the code before the expression code
-				tmpBC.AddCode(&ctx->bc);
-				ctx->bc.AddCode(&tmpBC);
-			}
-
-			// If the expression is marked as clean, then it can be used directly
-			// without the need to allocate another temporary value as it is known
-			// that the argument has no other value than the default
-			if( ctx->isCleanArg )
-			{
-				// Must be a local variable
-				asASSERT( ctx->type.isVariable );
-			}
-			else
-			{
-				// Make sure the variable is not used in the expression
-				offset = AllocateVariableNotIn(dt, true, false, ctx);
-
-				if( dt.IsPrimitive() )
-				{
-					ctx->type.SetVariable(dt, offset, true);
-					PushVariableOnStack(ctx, true);
-				}
-				else
-				{
-					// TODO: Need to reserve variables, as the default constructor may need
-					//       to allocate temporary variables to compute default args
-
-					// Allocate and construct the temporary object
-					asCByteCode tmpBC(engine);
-					CallDefaultConstructor(dt, offset, IsVariableOnHeap(offset), &tmpBC, node);
-
-					// Insert the code before the expression code
-					tmpBC.AddCode(&ctx->bc);
-					ctx->bc.AddCode(&tmpBC);
-
-					dt.MakeReference(!(dt.IsObject() || dt.IsFuncdef()) || dt.IsObjectHandle());
-					asCExprValue type;
-					type.Set(dt);
-					type.isTemporary = true;
-					type.stackOffset = (short)offset;
-
-					ctx->type = type;
-
-					ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-					if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsObjectHandle() )
-						ctx->bc.Instr(asBC_RDSPtr);
-				}
-
-				// After the function returns the temporary variable will
-				// be assigned to the expression, if it is a valid lvalue
-			}
-		}
-		else if( refType == asTM_INOUTREF )
-		{
-			ProcessPropertyGetAccessor(ctx, node);
-
-			// Add the type id as hidden arg if the parameter is a ? type
-			if( paramType->GetTokenType() == ttQuestion )
-			{
-				asCByteCode tmpBC(engine);
-
-				// Place the type id on the stack as a hidden parameter
-				tmpBC.InstrDWORD(asBC_TYPEID, engine->GetTypeIdFromDataType(param));
-
-				// Insert the code before the expression code
-				tmpBC.AddCode(&ctx->bc);
-				ctx->bc.AddCode(&tmpBC);
-			}
-
-			// Literal constants cannot be passed to inout ref arguments
-			if( !ctx->type.isVariable && ctx->type.isConstant )
-			{
-				// Unless unsafe references are turned on and the reference is const
-				if( param.IsReadOnly() && engine->ep.allowUnsafeReferences )
-				{
-					// Since the parameter is a const & make a copy.
-					ConvertToTempVariable(ctx);
-					ctx->type.dataType.MakeReadOnly(true);
-				}
-				else
-				{
-					Error(TXT_NOT_VALID_REFERENCE, node);
-					return -1;
-				}
-			}
-
-			// Perform implicit ref cast if necessary, but don't allow the implicit conversion to create new objects
-			if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && ctx->type.dataType.GetTypeInfo() != dt.GetTypeInfo() )
-				ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true, false);
-
-			// Only objects that support object handles
-			// can be guaranteed to be safe. Local variables are
-			// already safe, so there is no need to add an extra
-			// references
-			if( !engine->ep.allowUnsafeReferences &&
-				!ctx->type.isVariable &&
-				(ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) &&
-				!ctx->type.dataType.IsObjectHandle() &&
-				((ctx->type.dataType.GetBehaviour()->addref &&
-				  ctx->type.dataType.GetBehaviour()->release) ||
-				 (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_NOCOUNT) ||
-				 ctx->type.dataType.IsFuncdef()) )
-			{
-				// Store a handle to the object as local variable
-				asCExprContext tmp(engine);
-				dt = ctx->type.dataType;
-				dt.MakeHandle(true);
-				dt.MakeReference(false);
-
-				offset = AllocateVariableNotIn(dt, true, false, ctx);
-
-				// Copy the handle
-				if( !ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsReference() )
-					ctx->bc.Instr(asBC_RDSPtr);
-				ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
-				if( ctx->type.dataType.IsFuncdef() )
-					ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-				else
-					ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
-				ctx->bc.Instr(asBC_PopPtr);
-				ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
-
-				dt.MakeHandle(false);
-				dt.MakeReference(true);
-
-				// Release previous temporary variable stored in the context (if any)
-				if( ctx->type.isTemporary )
-					ReleaseTemporaryVariable(ctx->type.stackOffset, &ctx->bc);
-
-				ctx->type.SetVariable(dt, offset, true);
-			}
-
-			// Make sure the reference to the value is on the stack
-			// For objects, the reference needs to be dereferenced so the pointer on the stack is to the actual object
-			// For handles, the reference shouldn't be changed because the pointer on the stack should be to the handle
-			if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && ctx->type.dataType.IsReference() && !param.IsObjectHandle() )
-				Dereference(ctx, true);
-			else if( ctx->type.isVariable && !(ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) )
-				ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-			else if( ctx->type.dataType.IsPrimitive() )
-				ctx->bc.Instr(asBC_PshRPtr);
-			else if( ctx->type.dataType.IsObjectHandle() && !ctx->type.dataType.IsReference() )
-				ImplicitConversion(ctx, param, node, asIC_IMPLICIT_CONV, true, false);
-		}
-	}
-	else
-	{
-		ProcessPropertyGetAccessor(ctx, node);
-
-		if( dt.IsPrimitive() )
-		{
-			IsVariableInitialized(&ctx->type, node);
-
-			if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
-
-			// Implicitly convert primitives to the parameter type
-			ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV);
-
-			if( ctx->type.isVariable )
-			{
-				PushVariableOnStack(ctx, dt.IsReference());
-			}
-			else if( ctx->type.isConstant )
-			{
-				ConvertToVariable(ctx);
-				PushVariableOnStack(ctx, dt.IsReference());
-			}
-		}
-		else
-		{
-			IsVariableInitialized(&ctx->type, node);
-
-			// Implicitly convert primitives to the parameter type
-			ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV);
-
-			// Was the conversion successful?
-			if( !ctx->type.dataType.IsEqualExceptRef(dt) )
-			{
-				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), dt.Format(outFunc->nameSpace).AddressOf());
-				Error(str, node);
-
-				ctx->type.Set(dt);
-				return -1;
-			}
-
-			if( dt.IsObjectHandle() )
-				ctx->type.isExplicitHandle = true;
-
-			if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsNullHandle() && !dt.IsReference() )
-			{
-				// Objects passed by value must be placed in temporary variables
-				// so that they are guaranteed to not be referenced anywhere else.
-				// The object must also be allocated on the heap, as the memory will
-				// be deleted by the called function.
-
-				// Handles passed by value must also be placed in a temporary variable
-				// to guarantee that the object referred to isn't freed too early.
-
-				// TODO: value on stack: How can we avoid this unnecessary allocation?
-
-				// Don't make temporary copies of handles if it is going to be used 
-				// for handle assignment anyway, i.e. REFCPY.
-				if( !(!isFunction && isMakingCopy && ctx->type.dataType.IsObjectHandle() && ctx->type.isVariable) )
-					PrepareTemporaryVariable(node, ctx, true);
-			}
-		}
-	}
-
-	// Don't put any pointer on the stack yet
-	if( param.IsReference() || ((param.IsObject() || param.IsFuncdef()) && !param.IsNullHandle()) )
-	{
-		// &inout parameter may leave the reference on the stack already
-		if( refType != asTM_INOUTREF )
-		{
-			asASSERT( ctx->type.isVariable || ctx->type.isTemporary || isMakingCopy );
-
-			if( ctx->type.isVariable || ctx->type.isTemporary )
-			{
-				ctx->bc.Instr(asBC_PopPtr);
-				ctx->bc.InstrSHORT(asBC_VAR, ctx->type.stackOffset);
-
-				ProcessDeferredParams(ctx);
-			}
-		}
-	}
-
-	return 0;
-}
-
-void asCCompiler::PrepareFunctionCall(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args)
-{
-	// When a match has been found, compile the final byte code using correct parameter types
-	asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
-
-	asASSERT( descr->parameterTypes.GetLength() == args.GetLength() );
-
-	// If the function being called is the opAssign or copy constructor for the same type
-	// as the argument, then we should avoid making temporary copy of the argument
-	bool makingCopy = false;
-	if( descr->parameterTypes.GetLength() == 1 &&
-		descr->parameterTypes[0].IsEqualExceptRefAndConst(args[0]->type.dataType) &&
-		(((descr->name == "opAssign" || descr->name == "$beh0") && descr->objectType && descr->objectType == args[0]->type.dataType.GetTypeInfo()) ||
-		 (descr->objectType == 0 && args[0]->type.dataType.GetTypeInfo() && descr->name == args[0]->type.dataType.GetTypeInfo()->name)) )
-		makingCopy = true;
-
-	// Add code for arguments
-	asCExprContext e(engine);
-	for( int n = (int)args.GetLength()-1; n >= 0; n-- )
-	{
-		// Make sure PrepareArgument doesn't use any variable that is already
-		// being used by any of the following argument expressions
-		int l = int(reservedVariables.GetLength());
-		for( int m = n-1; m >= 0; m-- )
-			args[m]->bc.GetVarsUsed(reservedVariables);
-
-		PrepareArgument2(&e, args[n], &descr->parameterTypes[n], true, descr->inOutFlags[n], makingCopy);
-		reservedVariables.SetLength(l);
-	}
-
-	bc->AddCode(&e.bc);
-}
-
-void asCCompiler::MoveArgsToStack(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args, bool addOneToOffset)
-{
-	asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
-
-	int offset = 0;
-	if( addOneToOffset )
-		offset += AS_PTR_SIZE;
-
-	// The address of where the return value should be stored is push on top of the arguments
-	if( descr->DoesReturnOnStack() )
-		offset += AS_PTR_SIZE;
-
-#ifdef AS_DEBUG
-	// If the function being called is the opAssign or copy constructor for the same type
-	// as the argument, then we should avoid making temporary copy of the argument
-	bool makingCopy = false;
-	if( descr->parameterTypes.GetLength() == 1 &&
-		descr->parameterTypes[0].IsEqualExceptRefAndConst(args[0]->type.dataType) &&
-		(((descr->name == "opAssign" || descr->name == "$beh0") && descr->objectType && descr->objectType == args[0]->type.dataType.GetTypeInfo()) ||
-		 (descr->objectType == 0 && args[0]->type.dataType.GetTypeInfo() && descr->name == args[0]->type.dataType.GetTypeInfo()->name)) )
-		makingCopy = true;
-#endif
-
-	// Move the objects that are sent by value to the stack just before the call
-	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
-	{
-		if( descr->parameterTypes[n].IsReference() )
-		{
-			if( (descr->parameterTypes[n].IsObject() || descr->parameterTypes[n].IsFuncdef()) && !descr->parameterTypes[n].IsObjectHandle() )
-			{
-				if( descr->inOutFlags[n] != asTM_INOUTREF )
-				{
-#ifdef AS_DEBUG
-					// This assert is inside AS_DEBUG because of the variable makingCopy which is only defined in debug mode
-					asASSERT( args[n]->type.isVariable || args[n]->type.isTemporary || makingCopy );
-#endif
-
-					if( (args[n]->type.isVariable || args[n]->type.isTemporary) )
-					{
-						if( !IsVariableOnHeap(args[n]->type.stackOffset) )
-							// TODO: runtime optimize: Actually the reference can be pushed on the stack directly
-							//                         as the value allocated on the stack is guaranteed to be safe
-							bc->InstrWORD(asBC_GETREF, (asWORD)offset);
-						else
-							bc->InstrWORD(asBC_GETOBJREF, (asWORD)offset);
-					}
-				}
-				if( args[n]->type.dataType.IsObjectHandle() )
-					bc->InstrWORD(asBC_ChkNullS, (asWORD)offset);
-			}
-			else if( descr->inOutFlags[n] != asTM_INOUTREF )
-			{
-				if( descr->parameterTypes[n].GetTokenType() == ttQuestion &&
-					(args[n]->type.dataType.IsObject() || args[n]->type.dataType.IsFuncdef()) && 
-					!args[n]->type.dataType.IsObjectHandle() )
-				{
-					// Send the object as a reference to the object,
-					// and not to the variable holding the object
-					if( !IsVariableOnHeap(args[n]->type.stackOffset) )
-						// TODO: runtime optimize: Actually the reference can be pushed on the stack directly
-						//                         as the value allocated on the stack is guaranteed to be safe
-						bc->InstrWORD(asBC_GETREF, (asWORD)offset);
-					else
-						bc->InstrWORD(asBC_GETOBJREF, (asWORD)offset);
-				}
-				else
-				{
-					bc->InstrWORD(asBC_GETREF, (asWORD)offset);
-				}
-			}
-		}
-		else if( descr->parameterTypes[n].IsObject() || descr->parameterTypes[n].IsFuncdef() )
-		{
-			// TODO: value on stack: What can we do to avoid this unnecessary allocation?
-			// The object must be allocated on the heap, because this memory will be deleted in as_callfunc_xxx
-			asASSERT(IsVariableOnHeap(args[n]->type.stackOffset));
-
-			// The pointer in the variable will be moved to the stack
-			bc->InstrWORD(asBC_GETOBJ, (asWORD)offset);
-
-			// Deallocate the variable slot so it can be reused, but do not attempt to
-			// free the content of the variable since it was moved to the stack for the call
-			DeallocateVariable(args[n]->type.stackOffset);
-			args[n]->type.isTemporary = false;
-		}
-
-		offset += descr->parameterTypes[n].GetSizeOnStackDWords();
-	}
-}
-
-int asCCompiler::CompileArgumentList(asCScriptNode *node, asCArray<asCExprContext*> &args, asCArray<asSNamedArgument> &namedArgs)
-{
-	asASSERT(node->nodeType == snArgList);
-
-	// Count arguments
-	asCScriptNode *arg = node->firstChild;
-	int argCount = 0;
-	while( arg )
-	{
-		if( arg->nodeType != snNamedArgument )
-			argCount++;
-		arg = arg->next;
-	}
-
-	// Prepare the arrays
-	args.SetLength(argCount);
-	int n;
-	for( n = 0; n < argCount; n++ )
-		args[n] = 0;
-
-	n = argCount-1;
-
-	// Compile the arguments in reverse order (as they will be pushed on the stack)
-	bool anyErrors = false, inPositionalArguments = false;
-	arg = node->lastChild;
-	while( arg )
-	{
-		asCScriptNode *asgNode = arg, *namedNode = 0;
-		if( asgNode->nodeType == snNamedArgument )
-		{
-			if( inPositionalArguments )
-			{
-				Error(TXT_POS_ARG_AFTER_NAMED_ARG, node);
-				return -1;
-			}
-
-			asgNode = arg->firstChild->next;
-			namedNode = arg->firstChild;
-
-			asASSERT( namedNode->nodeType == snIdentifier );
-		}
-		else
-			inPositionalArguments = true;
-
-		asCExprContext expr(engine);
-		int r = CompileAssignment(asgNode, &expr);
-		if( r < 0 ) anyErrors = true;
-
-		asCExprContext *ctx = asNEW(asCExprContext)(engine);
-		if( ctx == 0 )
-		{
-			// Out of memory
-			return -1;
-		}
-		MergeExprBytecodeAndType(ctx, &expr);
-
-		if( inPositionalArguments )
-		{
-			args[n] = ctx;
-			n--;
-		}
-		else
-		{
-			asSNamedArgument namedArg;
-			namedArg.name = asCString(&script->code[namedNode->tokenPos], namedNode->tokenLength);
-			namedArg.ctx = ctx;
-
-			// Error out when multiple arguments with the same name are passed
-			for( asUINT a = 0; a < namedArgs.GetLength(); ++a )
-			{
-				if( namedArgs[a].name == namedArg.name )
-				{
-					Error(TXT_DUPLICATE_NAMED_ARG, asgNode);
-					anyErrors = true;
-					break;
-				}
-			}
-
-			namedArgs.PushLast(namedArg);
-		}
-
-		arg = arg->prev;
-	}
-
-	return anyErrors ? -1 : 0;
-}
-
-int asCCompiler::CompileDefaultAndNamedArgs(asCScriptNode *node, asCArray<asCExprContext*> &args, int funcId, asCObjectType *objectType, asCArray<asSNamedArgument> *namedArgs)
-{
-	asCScriptFunction *func = builder->GetFunctionDescription(funcId);
-	if( func == 0 || args.GetLength() >= (asUINT)func->GetParamCount() )
-		return 0;
-
-	// Make sure to use the real function for virtual functions
-	if( func->funcType == asFUNC_VIRTUAL )
-	{
-		asASSERT( objectType );
-		func = objectType->virtualFunctionTable[func->vfTableIdx];
-	}
-
-	// Make sure none of the variables used in the previous arguments are reused in the default arguments
-	bool anyErrors = false;
-	int prevReservedVars = reservedVariables.GetLength();
-	
-	int explicitArgs = (int)args.GetLength();
-
-	for( int p = 0; p < explicitArgs; p++ )
-		args[p]->bc.GetVarsUsed(reservedVariables);
-
-	// Make space for all the new arguments
-	args.SetLength(func->parameterTypes.GetLength());
-	for( asUINT c = explicitArgs; c < args.GetLength(); c++ )
-		args[c] = 0;
-
-	// Add the named arguments to the argument list in the right position
-	if( namedArgs )
-	{
-		for( asUINT n = 0; n < namedArgs->GetLength(); ++n )
-		{
-			asSNamedArgument &named = (*namedArgs)[n];
-			named.ctx->bc.GetVarsUsed(reservedVariables);
-
-			// Find the right spot to put it in
-			asUINT index = asUINT(-1);
-			for( asUINT j = 0; j < func->parameterTypes.GetLength(); ++j )
-			{
-				if( func->parameterNames[j] == (*namedArgs)[n].name )
-				{
-					index = j;
-					break;
-				}
-			}
-
-			asASSERT( index < args.GetLength() );
-			args[index] = named.ctx;
-			named.ctx = 0;
-		}
-	}
-
-	// Compile the arguments in reverse order (as they will be pushed on the stack)
-	for( int n = (int)func->parameterTypes.GetLength() - 1; n >= explicitArgs; n-- )
-	{
-		if( args[n] != 0 ) continue;
-		if( func->defaultArgs[n] == 0 ) { anyErrors = true; continue; }
-
-		// Parse the default arg string
-		asCParser parser(builder);
-		asCScriptCode code;
-		code.SetCode("default arg", func->defaultArgs[n]->AddressOf(), false);
-		int r = parser.ParseExpression(&code);
-		if( r < 0 )
-		{
-			asCString msg;
-			msg.Format(TXT_FAILED_TO_COMPILE_DEF_ARG_d_IN_FUNC_s, n, func->GetDeclaration());
-			Error(msg, node);
-			anyErrors = true;
-			continue;
-		}
-
-		asCScriptNode *arg = parser.GetScriptNode();
-
-		// Temporarily set the script code to the default arg expression
-		asCScriptCode *origScript = script;
-		script = &code;
-
-		// Don't allow the expression to access local variables
-		isCompilingDefaultArg = true;
-
-		// Temporarily set the namespace in the output function to the namespace of the called
-		// function so that the default arguments are evaluated in the correct namespace
-		asSNameSpace *origNameSpace = outFunc->nameSpace;
-		outFunc->nameSpace = func->nameSpace;
-
-		asCExprContext expr(engine);
-		r = CompileExpression(arg, &expr);
-
-		// Restore the namespace
-		outFunc->nameSpace = origNameSpace;
-
-		// Don't allow address of class method
-		if( expr.methodName != "" )
-		{
-			// TODO: Improve error message
-			Error(TXT_DEF_ARG_TYPE_DOESNT_MATCH, arg);
-			r = -1;
-		}
-
-		// Make sure the expression can be implicitly converted to the parameter type
-		if( r >= 0 )
-		{
-			asCArray<int> funcs;
-			funcs.PushLast(func->id);
-			asCArray<asSOverloadCandidate> matches;
-			if( MatchArgument(funcs, matches, &expr, n) == 0 )
-			{
-				Error(TXT_DEF_ARG_TYPE_DOESNT_MATCH, arg);
-				r = -1;
-			}
-		}
-
-		isCompilingDefaultArg = false;
-
-		script = origScript;
-
-		if( r < 0 )
-		{
-			asCString msg;
-			msg.Format(TXT_FAILED_TO_COMPILE_DEF_ARG_d_IN_FUNC_s, n, func->GetDeclaration());
-			Error(msg, node);
-			anyErrors = true;
-			continue;
-		}
-
-		args[n] = asNEW(asCExprContext)(engine);
-		if( args[n] == 0 )
-		{
-			// Out of memory
-			reservedVariables.SetLength(prevReservedVars);
-			return -1;
-		}
-
-		MergeExprBytecodeAndType(args[n], &expr);
-	}
-
-	reservedVariables.SetLength(prevReservedVars);
-	return anyErrors ? -1 : 0;
-}
-
-asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asCExprContext*> &args, asCScriptNode *node, const char *name, asCArray<asSNamedArgument> *namedArgs, asCObjectType *objectType, bool isConstMethod, bool silent, bool allowObjectConstruct, const asCString &scope)
-{
-	asCArray<int> origFuncs = funcs; // Keep the original list for error message
-	asUINT cost = 0;
-	asUINT n;
-
-	if( funcs.GetLength() > 0 )
-	{
-		// Check the number of parameters in the found functions
-		asUINT totalArgs = (asUINT)args.GetLength();
-		if( namedArgs != 0 )
-			totalArgs += (asUINT)namedArgs->GetLength();
-
-		for( n = 0; n < funcs.GetLength(); ++n )
-		{
-			asCScriptFunction *desc = builder->GetFunctionDescription(funcs[n]);
-
-			if( desc->parameterTypes.GetLength() != totalArgs )
-			{
-				bool noMatch = true;
-				if( totalArgs < desc->parameterTypes.GetLength() )
-				{
-					// For virtual functions, the default args are defined in the real function of the object
-					if( desc->funcType == asFUNC_VIRTUAL )
-						desc = objectType->virtualFunctionTable[desc->vfTableIdx];
-
-					// Count the number of default args
-					asUINT defaultArgs = 0;
-					for( asUINT d = 0; d < desc->defaultArgs.GetLength(); d++ )
-						if( desc->defaultArgs[d] )
-							defaultArgs++;
-
-					if( totalArgs >= desc->parameterTypes.GetLength() - defaultArgs )
-						noMatch = false;
-				}
-
-				if( noMatch )
-				{
-					// remove it from the list
-					if( n == funcs.GetLength()-1 )
-						funcs.PopLast();
-					else
-						funcs[n] = funcs.PopLast();
-					n--;
-				}
-			}
-		}
-
-		// Match functions with the parameters, and discard those that do not match
-		asCArray<asSOverloadCandidate> matchingFuncs;
-		matchingFuncs.SetLengthNoConstruct( funcs.GetLength() );
-		for ( n = 0; n < funcs.GetLength(); ++n )
-		{
-			matchingFuncs[n].funcId = funcs[n];
-			matchingFuncs[n].cost = 0;
-		}
-
-		// Match positionally passed arguments
-		for( n = 0; n < args.GetLength(); ++n )
-		{
-			asCArray<asSOverloadCandidate> tempFuncs;
-			MatchArgument(funcs, tempFuncs, args[n], n, allowObjectConstruct);
-
-			// Intersect the found functions with the list of matching functions
-			for( asUINT f = 0; f < matchingFuncs.GetLength(); f++ )
-			{
-				asUINT c;
-				for( c = 0; c < tempFuncs.GetLength(); c++ )
-				{
-					if( matchingFuncs[f].funcId == tempFuncs[c].funcId )
-					{
-						// Sum argument cost
-						matchingFuncs[f].cost += tempFuncs[c].cost;
-						break;
-
-					} // End if match
-				}
-
-				// Was the function a match?
-				if( c == tempFuncs.GetLength() )
-				{
-					// No, remove it from the list
-					if( f == matchingFuncs.GetLength()-1 )
-						matchingFuncs.PopLast();
-					else
-						matchingFuncs[f] = matchingFuncs.PopLast();
-					f--;
-				}
-			}
-		}
-
-		// Match named arguments
-		if( namedArgs != 0 )
-		{
-			for( asUINT i = 0; i < matchingFuncs.GetLength(); ++i )
-			{
-				asCScriptFunction *desc = builder->GetFunctionDescription(matchingFuncs[i].funcId);
-				if( desc->funcType == asFUNC_VIRTUAL )
-					desc = objectType->virtualFunctionTable[desc->vfTableIdx];
-
-				// Match every named argument to an argument in the function
-				for( n = 0; n < namedArgs->GetLength(); ++n )
-					(*namedArgs)[n].match = asUINT(-1);
-
-				bool matchedAll = true;
-				for( asUINT j = 0; j < desc->parameterTypes.GetLength(); ++j )
-				{
-					asUINT match = asUINT(-1);
-					for( n = 0; n < namedArgs->GetLength(); ++n )
-					{
-						asSNamedArgument &namedArg = (*namedArgs)[n];
-						if( desc->parameterNames[j] == namedArg.name )
-						{
-							namedArg.match = j;
-							match = n;
-							break;
-						}
-					}
-
-					// Check that every position is filled somehow
-					if( j >= args.GetLength() )
-					{
-						if( match == asUINT(-1) && !desc->defaultArgs[j] )
-						{
-							// No argument was found for this, and there is no
-							// default, so it doesn't work.
-							matchedAll = false;
-							break;
-						}
-					}
-					else
-					{
-						if( match != asUINT(-1) )
-						{
-							// Can't name an argument that was already passed
-							matchedAll = false;
-							break;
-						}
-					}
-				}
-
-				// Check that every named argument was matched
-				if( matchedAll )
-				{
-					for( n = 0; n < namedArgs->GetLength(); ++n )
-					{
-						asSNamedArgument &named = (*namedArgs)[n];
-
-						if( named.match == asUINT(-1) )
-						{
-							matchedAll = false;
-							break;
-						}
-
-						// Add to the cost
-						cost = MatchArgument(desc, named.ctx, named.match, allowObjectConstruct);
-						if( cost == asUINT(-1) )
-						{
-							matchedAll = false;
-							break;
-						}
-
-						matchingFuncs[i].cost += cost;
-					}
-				}
-
-				if( !matchedAll )
-				{
-					// Remove the function, we didn't match all the arguments.
-					if( i == matchingFuncs.GetLength()-1 )
-						matchingFuncs.PopLast();
-					else
-						matchingFuncs[i] = matchingFuncs.PopLast();
-					i--;
-				}
-			}
-		}
-
-		// Select the overload(s) with the lowest overall cost
-		funcs.SetLength(0);
-		asUINT bestCost = asUINT(-1);
-		for( n = 0; n < matchingFuncs.GetLength(); ++n )
-		{
-			cost = matchingFuncs[n].cost;
-			if( cost < bestCost )
-			{
-				funcs.SetLength(0);
-				bestCost = cost;
-			}
-			if( cost == bestCost )
-				funcs.PushLast( matchingFuncs[n].funcId );
-		}
-
-		// Cost returned is equivalent to the best cost discovered
-		cost = bestCost;
-	}
-
-	if( !isConstMethod )
-		FilterConst(funcs);
-
-	if( funcs.GetLength() != 1 && !silent )
-	{
-		// Build a readable string of the function with parameter types
-		bool attemptsPassingClassMethod = false;
-		asCString str;
-		if( scope != "" && scope != "::" )
-			str = scope + "::";
-		str += name;
-		str += "(";
-		for( n = 0; n < args.GetLength(); n++ )
-		{
-			if( n > 0 )
-				str += ", ";
-			if( args[n]->methodName != "" )
-			{
-				if( args[n]->IsClassMethod() )
-				{
-					attemptsPassingClassMethod = true;
-					str += args[n]->type.dataType.GetTypeInfo()->GetName();
-					str += "::";
-				}
-				str += args[n]->methodName;
-			}
-			else
-				str += args[n]->type.dataType.Format(outFunc->nameSpace);
-		}
-		if( namedArgs != 0 )
-		{
-			for( n = 0; n < namedArgs->GetLength(); n++ )
-			{
-				if( n > 0 || args.GetLength() )
-					str += ", ";
-
-				asSNamedArgument &named = (*namedArgs)[n];
-				str += named.name;
-				str += "=";
-				if( named.ctx->methodName != "" )
-					str += named.ctx->methodName;
-				else
-					str += named.ctx->type.dataType.Format(outFunc->nameSpace);
-			}
-		}
-		str += ")";
-
-		if( isConstMethod )
-			str += " const";
-
-		if( objectType && scope == "" )
-			str = objectType->name + "::" + str;
-
-		if( funcs.GetLength() == 0 )
-		{
-			str.Format(TXT_NO_MATCHING_SIGNATURES_TO_s, str.AddressOf());
-			Error(str, node);
-
-			if( attemptsPassingClassMethod )
-			{
-				// Class methods must use delegate objects
-				Error(TXT_CANNOT_PASS_CLASS_METHOD_AS_ARG, node);
-			}
-			else
-			{
-				// Print the list of candidates
-				if( origFuncs.GetLength() > 0 )
-				{
-					int r = 0, c = 0;
-					asASSERT( node );
-					if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-					builder->WriteInfo(script->name.AddressOf(), TXT_CANDIDATES_ARE, r, c, false);
-					PrintMatchingFuncs(origFuncs, node, objectType);
-				}
-			}
-		}
-		else
-		{
-			asASSERT( attemptsPassingClassMethod == false );
-
-			str.Format(TXT_MULTIPLE_MATCHING_SIGNATURES_TO_s, str.AddressOf());
-			Error(str, node);
-
-			PrintMatchingFuncs(funcs, node, objectType);
-		}
-	}
-
-	return cost;
-}
-
-bool asCCompiler::CompileAutoType(asCDataType &type, asCExprContext &compiledCtx, asCScriptNode *node, asCScriptNode *errNode)
-{
-	if( node && node->nodeType == snAssignment )
-	{
-		int r = CompileAssignment(node, &compiledCtx);
-		if( r >= 0 )
-		{
-			// Must not have unused ambiguous names
-			if (compiledCtx.IsClassMethod() || compiledCtx.IsGlobalFunc())
-			{
-				// TODO: Should mention that the problem is the ambiguous name
-				Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
-				return false;
-			}
-
-			// Must not have unused anonymous functions
-			if (compiledCtx.IsLambda())
-			{
-				// TODO: Should mention that the problem is the anonymous function
-				Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
-				return false;
-			}
-
-			// Must not be a null handle
-			if (compiledCtx.type.dataType.IsNullHandle())
-			{
-				// TODO: Should mention that the problem is the null pointer
-				Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
-				return false;
-			}
-
-			asCDataType newType = compiledCtx.type.dataType;
-
-			// Handle const qualifier on auto
-			if (type.IsReadOnly())
-				newType.MakeReadOnly(true);
-			else if (newType.IsPrimitive())
-				newType.MakeReadOnly(false);
-
-			// Handle reference/value stuff
-			newType.MakeReference(false);
-			if (!newType.IsObjectHandle())
-			{
-				// We got a value object or an object reference.
-				// Turn the variable into a handle if specified
-				// as auto@, otherwise make it a 'value'.
-				if (type.IsHandleToAuto())
-				{
-					if (newType.MakeHandle(true) < 0)
-					{
-						Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, errNode);
-						return false;
-					}
-				}
-			}
-
-			type = newType;
-			return true;
-		}
-
-		return false;
-	}
-	else
-	{
-		Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
-		type = asCDataType::CreatePrimitive(ttInt, false);
-		return false;
-	}
-}
-
-void asCCompiler::CompileDeclaration(asCScriptNode *decl, asCByteCode *bc)
-{
-	// Get the data type
-	asCDataType type = builder->CreateDataTypeFromNode(decl->firstChild, script, outFunc->nameSpace, false, outFunc->objectType);
-
-	// Declare all variables in this declaration
-	asCScriptNode *node = decl->firstChild->next;
-	while( node )
-	{
-		// If this is an auto type, we have to compile the assignment now to figure out the type
-		asCExprContext compiledCtx(engine);
-		bool preCompiled = false;
-		if (type.IsAuto())
-		{
-			preCompiled = CompileAutoType(type, compiledCtx, node->next, node);
-			if (!preCompiled)
-			{
-				// If it wasn't possible to determine the type from the expression then there 
-				// is no need to continue with the initialization. The error was already reported
-				// in CompileAutoType.
-				return;
-			}
-		}
-
-		// Is the type allowed?
-		if( !type.CanBeInstantiated() )
-		{
-			asCString str;
-			if( type.IsAbstractClass() )
-				str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, type.Format(outFunc->nameSpace).AddressOf());
-			else if( type.IsInterface() )
-				str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, type.Format(outFunc->nameSpace).AddressOf());
-			else
-				// TODO: Improve error message to explain why
-				str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-
-			// Don't continue, as it will most likely lead to further 
-			// errors that may just mislead the script writer
-			return;
-		}
-
-		// A shared object may not declare variables of non-shared types
-		if( outFunc->IsShared() )
-		{
-			asCTypeInfo *ot = type.GetTypeInfo();
-			if( ot && !ot->IsShared() )
-			{
-				asCString msg;
-				msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, ot->name.AddressOf());
-				Error(msg, decl);
-			}
-		}
-
-		// Get the name of the identifier
-		asCString name(&script->code[node->tokenPos], node->tokenLength);
-
-		// Verify that the name isn't used by a dynamic data type
-		// TODO: Must check against registered funcdefs too
-		if( engine->GetRegisteredType(name.AddressOf(), outFunc->nameSpace) != 0 )
-		{
-			asCString str;
-			str.Format(TXT_ILLEGAL_VARIABLE_NAME_s, name.AddressOf());
-			Error(str, node);
-		}
-
-		int offset = AllocateVariable(type, false);
-		if( variables->DeclareVariable(name.AddressOf(), type, offset, IsVariableOnHeap(offset)) < 0 )
-		{
-			// TODO: It might be an out-of-memory too
-
-			asCString str;
-			str.Format(TXT_s_ALREADY_DECLARED, name.AddressOf());
-			Error(str, node);
-
-			// Don't continue after this error, as it will just
-			// lead to more errors that are likely false
-			return;
-		}
-		else
-		{
-			// Warn if this variable hides another variable in a higher scope
-			if( variables->parent && variables->parent->GetVariable(name.AddressOf()) )
-			{
-				asCString str;
-				str.Format(TXT_s_HIDES_VAR_IN_OUTER_SCOPE, name.AddressOf());
-				Warning(str, node);
-			}
-		}
-
-		// Add marker that the variable has been declared
-		bc->VarDecl((int)outFunc->scriptData->variables.GetLength());
-		outFunc->AddVariable(name, type, offset);
-
-		// Keep the node for the variable decl
-		asCScriptNode *varNode = node;
-
-		node = node->next;
-
-		if( node == 0 || node->nodeType == snIdentifier )
-		{
-			// Initialize with default constructor
-			CompileInitialization(0, bc, type, varNode, offset, 0, 0);
-		}
-		else
-		{
-			// Compile the initialization expression
-			asQWORD constantValue = 0;
-			if( CompileInitialization(node, bc, type, varNode, offset, &constantValue, 0, preCompiled ? &compiledCtx : 0) )
-			{
-				// Check if the variable should be marked as pure constant
-				if( type.IsPrimitive() && type.IsReadOnly() )
-				{
-					sVariable *v = variables->GetVariable(name.AddressOf());
-					v->isPureConstant = true;
-					v->constantValue = constantValue;
-				}
-			}
-			node = node->next;
-		}
-	}
-
-	bc->OptimizeLocally(tempVariableOffsets);
-}
-
-// Returns true if the initialization expression is a constant expression
-bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem, asCExprContext *preCompiled)
-{
-	bool isConstantExpression = false;
-	if( node && node->nodeType == snArgList )
-	{
-		// Make sure it is an object and not a handle
-		if( type.GetTypeInfo() == 0 || type.IsObjectHandle() )
-		{
-			Error(TXT_MUST_BE_OBJECT, node);
-		}
-		else
-		{
-			// Compile the arguments
-			asCArray<asCExprContext *> args;
-			asCArray<asSNamedArgument> namedArgs;
-			if( CompileArgumentList(node, args, namedArgs) >= 0 )
-			{
-				// Find all constructors
-				asCArray<int> funcs;
-				asSTypeBehaviour *beh = type.GetBehaviour();
-				if( beh )
-				{
-					if( type.GetTypeInfo()->flags & asOBJ_REF )
-						funcs = beh->factories;
-					else
-						funcs = beh->constructors;
-				}
-
-				asCString str = type.Format(outFunc->nameSpace);
-				MatchFunctions(funcs, args, node, str.AddressOf(), &namedArgs);
-
-				if( funcs.GetLength() == 1 )
-				{
-					// Add the default values for arguments not explicitly supplied
-					int r = CompileDefaultAndNamedArgs(node, args, funcs[0], type.GetTypeInfo()->CastToObjectType(), &namedArgs);
-
-					if( r == asSUCCESS )
-					{
-						asCExprContext ctx(engine);
-						if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_REF) )
-						{
-							if( isVarGlobOrMem == 0 )
-								MakeFunctionCall(&ctx, funcs[0], 0, args, node, true, offset);
-							else
-							{
-								MakeFunctionCall(&ctx, funcs[0], 0, args, node);
-								ctx.bc.Instr(asBC_RDSPtr);
-								if( isVarGlobOrMem == 1 )
-								{
-									// Store the returned handle in the global variable
-									ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-								}
-								else
-								{
-									// Store the returned handle in the member
-									ctx.bc.InstrSHORT(asBC_PSF, 0);
-									ctx.bc.Instr(asBC_RDSPtr);
-									ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-								}
-								if( type.IsFuncdef())
-									ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-								else
-									ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
-								ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
-							}
-
-							// Pop the reference left by the function call
-							ctx.bc.Instr(asBC_PopPtr);
-						}
-						else
-						{
-							bool onHeap = false;
-
-							if( isVarGlobOrMem == 0 )
-							{
-								// When the object is allocated on the heap, the address where the
-								// reference will be stored must be pushed on the stack before the
-								// arguments. This reference on the stack is safe, even if the script
-								// is suspended during the evaluation of the arguments.
-								onHeap = IsVariableOnHeap(offset);
-								if( onHeap )
-									ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
-							}
-							else if( isVarGlobOrMem == 1 )
-							{
-								// Push the address of the location where the variable will be stored on the stack.
-								// This reference is safe, because the addresses of the global variables cannot change.
-								onHeap = true;
-								ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-							}
-							else
-							{
-								// Value types may be allocated inline if they are POD types
-								onHeap = !(type.IsObject() || type.IsFuncdef()) || type.IsReference() || (type.GetTypeInfo()->flags & asOBJ_REF);
-								if( onHeap )
-								{
-									ctx.bc.InstrSHORT(asBC_PSF, 0);
-									ctx.bc.Instr(asBC_RDSPtr);
-									ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-								}
-							}
-
-							PrepareFunctionCall(funcs[0], &ctx.bc, args);
-							MoveArgsToStack(funcs[0], &ctx.bc, args, false);
-
-							// When the object is allocated on the stack, the address to the
-							// object is pushed on the stack after the arguments as the object pointer
-							if( !onHeap )
-							{
-								if( isVarGlobOrMem == 2 )
-								{
-									ctx.bc.InstrSHORT(asBC_PSF, 0);
-									ctx.bc.Instr(asBC_RDSPtr);
-									ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-								}
-								else
-								{
-									ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
-								}
-							}
-
-							PerformFunctionCall(funcs[0], &ctx, onHeap, &args, type.GetTypeInfo()->CastToObjectType());
-
-							if( isVarGlobOrMem == 0 )
-							{
-								// Mark the object in the local variable as initialized
-								ctx.bc.ObjInfo(offset, asOBJ_INIT);
-							}
-						}
-						bc->AddCode(&ctx.bc);
-					}
-				}
-			}
-
-			// Cleanup
-			for( asUINT n = 0; n < args.GetLength(); n++ )
-				if( args[n] )
-				{
-					asDELETE(args[n], asCExprContext);
-				}
-			for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
-				if( namedArgs[n].ctx )
-				{
-					asDELETE(namedArgs[n].ctx, asCExprContext);
-				}
-		}
-	}
-	else if( node && node->nodeType == snInitList )
-	{
-		asCExprValue ti;
-		ti.Set(type);
-		ti.isVariable = (isVarGlobOrMem == 0);
-		ti.isTemporary = false;
-		ti.stackOffset = (short)offset;
-		ti.isLValue = true;
-
-		CompileInitList(&ti, node, bc, isVarGlobOrMem);
-	}
-	else if( node && node->nodeType == snAssignment )
-	{
-		// Compile the expression
-		asCExprContext newExpr(engine);
-		asCExprContext* expr;
-		int r = 0;
-
-		if( preCompiled )
-		{
-			expr = preCompiled;
-		}
-		else
-		{
-			expr = &newExpr;
-			r = CompileAssignment(node, expr);
-		}
-
-		// Look for appropriate constructor
-		asCArray<int> funcs;
-		asCArray<asCExprContext *> args;
-
-		// Handles must use the handle assignment operation.
-		// Types that are ASHANDLE must not allow the use of the constructor in this case,
-		// because it is ambiguous whether a value assignment or handle assignment will be done.
-		// Only do this if the expression is of the same type, as the expression is an assignment 
-		// and an initialization constructor may not have the same meaning.
-		// TODO: Should allow initialization constructor if it is declared as allowed for implicit conversions.
-		if( !type.IsObjectHandle() && !expr->type.isExplicitHandle &&
-			!(type.GetTypeInfo() && (type.GetTypeInfo()->GetFlags() & asOBJ_ASHANDLE)) &&
-			type.IsEqualExceptRefAndConst(expr->type.dataType) )
-		{
-			asSTypeBehaviour *beh = type.GetBehaviour();
-			if( beh )
-			{
-				if( type.GetTypeInfo()->flags & asOBJ_REF )
-					funcs = beh->factories;
-				else
-					funcs = beh->constructors;
-			}
-
-			asCString str = type.Format(outFunc->nameSpace);
-			args.PushLast(expr);
-			MatchFunctions(funcs, args, node, str.AddressOf(), 0, 0, 0, true);
-
-			// Make sure the argument is of the right type (and not just compatible with the expression)
-			if (funcs.GetLength() == 1)
-			{
-				asCScriptFunction *f = engine->scriptFunctions[funcs[0]];
-				if (!f->parameterTypes[0].IsEqualExceptRefAndConst(expr->type.dataType))
-					funcs.PopLast();
-			}
-		}
-
-		if( funcs.GetLength() == 1 )
-		{
-			// Use the constructor
-
-			// TODO: clean-up: A large part of this is identical to the initalization with argList above
-
-			// Add the default values for arguments not explicitly supplied
-			r = CompileDefaultAndNamedArgs(node, args, funcs[0], type.GetTypeInfo()->CastToObjectType());
-
-			if( r == asSUCCESS )
-			{
-				asCExprContext ctx(engine);
-				if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_REF) )
-				{
-					if( isVarGlobOrMem == 0 )
-						MakeFunctionCall(&ctx, funcs[0], 0, args, node, true, offset);
-					else
-					{
-						MakeFunctionCall(&ctx, funcs[0], 0, args, node);
-						ctx.bc.Instr(asBC_RDSPtr);
-						if( isVarGlobOrMem == 1 )
-						{
-							// Store the returned handle in the global variable
-							ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-						}
-						else
-						{
-							// Store the returned handle in the member
-							ctx.bc.InstrSHORT(asBC_PSF, 0);
-							ctx.bc.Instr(asBC_RDSPtr);
-							ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-						}
-						if( type.IsFuncdef() )
-							ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-						else
-							ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
-						ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
-					}
-
-					// Pop the reference left by the function call
-					ctx.bc.Instr(asBC_PopPtr);
-				}
-				else
-				{
-					bool onHeap = false;
-
-					if( isVarGlobOrMem == 0 )
-					{
-						// When the object is allocated on the heap, the address where the
-						// reference will be stored must be pushed on the stack before the
-						// arguments. This reference on the stack is safe, even if the script
-						// is suspended during the evaluation of the arguments.
-						onHeap = IsVariableOnHeap(offset);
-						if( onHeap )
-							ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
-					}
-					else if( isVarGlobOrMem == 1 )
-					{
-						// Push the address of the location where the variable will be stored on the stack.
-						// This reference is safe, because the addresses of the global variables cannot change.
-						onHeap = true;
-						ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-					}
-					else
-					{
-						// Value types may be allocated inline if they are POD types
-						onHeap = !(type.IsObject() || type.IsFuncdef()) || type.IsReference() || (type.GetTypeInfo()->flags & asOBJ_REF);
-						if( onHeap )
-						{
-							ctx.bc.InstrSHORT(asBC_PSF, 0);
-							ctx.bc.Instr(asBC_RDSPtr);
-							ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-						}
-					}
-
-					PrepareFunctionCall(funcs[0], &ctx.bc, args);
-					MoveArgsToStack(funcs[0], &ctx.bc, args, false);
-
-					// When the object is allocated on the stack, the address to the
-					// object is pushed on the stack after the arguments as the object pointer
-					if( !onHeap )
-					{
-						if( isVarGlobOrMem == 2 )
-						{
-							ctx.bc.InstrSHORT(asBC_PSF, 0);
-							ctx.bc.Instr(asBC_RDSPtr);
-							ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-						}
-						else
-						{
-							ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
-						}
-					}
-
-					PerformFunctionCall(funcs[0], &ctx, onHeap, &args, type.GetTypeInfo()->CastToObjectType());
-
-					if( isVarGlobOrMem == 0 )
-					{
-						// Mark the object in the local variable as initialized
-						ctx.bc.ObjInfo(offset, asOBJ_INIT);
-					}
-				}
-				bc->AddCode(&ctx.bc);
-			}
-		}
-		else
-		{
-			// Call the default constructur, then call the assignment operator
-			asCExprContext ctx(engine);
-
-			// Call the default constructor here
-			if( isVarGlobOrMem == 0 )
-				CallDefaultConstructor(type, offset, IsVariableOnHeap(offset), &ctx.bc, errNode);
-			else if( isVarGlobOrMem == 1 )
-				CallDefaultConstructor(type, offset, true, &ctx.bc, errNode, isVarGlobOrMem);
-			else if( isVarGlobOrMem == 2 )
-				CallDefaultConstructor(type, offset, type.IsReference(), &ctx.bc, errNode, isVarGlobOrMem);
-
-			if( r >= 0 )
-			{
-				if( type.IsPrimitive() )
-				{
-					if( type.IsReadOnly() && expr->type.isConstant )
-					{
-						ImplicitConversion(expr, type, node, asIC_IMPLICIT_CONV);
-
-						// Tell caller that the expression is a constant so it can mark the variable as pure constant
-						isConstantExpression = true;
-						*constantValue = expr->type.GetConstantData();
-					}
-
-					asCExprContext lctx(engine);
-					if( isVarGlobOrMem == 0 )
-						lctx.type.SetVariable(type, offset, false);
-					else if( isVarGlobOrMem == 1 )
-					{
-						lctx.type.Set(type);
-						lctx.type.dataType.MakeReference(true);
-
-						// If it is an enum value, i.e. offset is negative, that is being compiled then
-						// we skip this as the bytecode won't be used anyway, only the constant value
-						if( offset >= 0 )
-							lctx.bc.InstrPTR(asBC_LDG, engine->globalProperties[offset]->GetAddressOfValue());
-					}
-					else
-					{
-						asASSERT( isVarGlobOrMem == 2 );
-						lctx.type.Set(type);
-						lctx.type.dataType.MakeReference(true);
-
-						// Load the reference of the primitive member into the register
-						lctx.bc.InstrSHORT(asBC_PSF, 0);
-						lctx.bc.Instr(asBC_RDSPtr);
-						lctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-						lctx.bc.Instr(asBC_PopRPtr);
-					}
-					lctx.type.dataType.MakeReadOnly(false);
-					lctx.type.isLValue = true;
-
-					DoAssignment(&ctx, &lctx, expr, node, node, ttAssignment, node);
-					ProcessDeferredParams(&ctx);
-				}
-				else
-				{
-					// TODO: runtime optimize: Here we should look for the best matching constructor, instead of
-					//                         just the copy constructor. Only if no appropriate constructor is
-					//                         available should the assignment operator be used.
-
-					asCExprContext lexpr(engine);
-					lexpr.type.Set(type);
-					if( isVarGlobOrMem == 0 )
-						lexpr.type.dataType.MakeReference(IsVariableOnHeap(offset));
-					else if( isVarGlobOrMem == 1 )
-						lexpr.type.dataType.MakeReference(true);
-					else if( isVarGlobOrMem == 2 )
-					{
-						if( !lexpr.type.dataType.IsObject() || lexpr.type.dataType.IsFuncdef() || (lexpr.type.dataType.GetTypeInfo()->flags & asOBJ_REF) )
-							lexpr.type.dataType.MakeReference(true);
-					}
-
-					// Allow initialization of constant variables
-					lexpr.type.dataType.MakeReadOnly(false);
-
-					if( type.IsObjectHandle() )
-						lexpr.type.isExplicitHandle = true;
-
-					if( isVarGlobOrMem == 0 )
-					{
-						lexpr.bc.InstrSHORT(asBC_PSF, (short)offset);
-						lexpr.type.stackOffset = (short)offset;
-						lexpr.type.isVariable = true;
-					}
-					else if( isVarGlobOrMem == 1 )
-					{
-						lexpr.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
-					}
-					else
-					{
-						lexpr.bc.InstrSHORT(asBC_PSF, 0);
-						lexpr.bc.Instr(asBC_RDSPtr);
-						lexpr.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-						lexpr.type.stackOffset = -1;
-					}
-					lexpr.type.isLValue = true;
-
-
-					// If left expression resolves into a registered type
-					// check if the assignment operator is overloaded, and check
-					// the type of the right hand expression. If none is found
-					// the default action is a direct copy if it is the same type
-					// and a simple assignment.
-					bool assigned = false;
-					// Even though an ASHANDLE can be an explicit handle the overloaded operator needs to be called
-					if( (lexpr.type.dataType.IsObject() || lexpr.type.dataType.IsFuncdef()) && (!lexpr.type.isExplicitHandle || (lexpr.type.dataType.GetTypeInfo() && (lexpr.type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE))) )
-					{
-						bool useHndlAssign = lexpr.type.dataType.IsHandleToAsHandleType();
-						assigned = CompileOverloadedDualOperator(node, &lexpr, expr, &ctx, useHndlAssign);
-						if( assigned )
-						{
-							// Pop the resulting value
-							if( !ctx.type.dataType.IsPrimitive() )
-								ctx.bc.Instr(asBC_PopPtr);
-
-							// Release the argument
-							ProcessDeferredParams(&ctx);
-
-							// Release temporary variable that may be allocated by the overloaded operator
-							ReleaseTemporaryVariable(ctx.type, &ctx.bc);
-						}
-					}
-
-					if( !assigned )
-					{
-						PrepareForAssignment(&lexpr.type.dataType, expr, node, false);
-
-						// If the expression is constant and the variable also is constant
-						// then mark the variable as pure constant. This will allow the compiler
-						// to optimize expressions with this variable.
-						if( type.IsReadOnly() && expr->type.isConstant )
-						{
-							isConstantExpression = true;
-							*constantValue = expr->type.GetConstantQW();
-						}
-
-						// Add expression code to bytecode
-						MergeExprBytecode(&ctx, expr);
-
-						// Add byte code for storing value of expression in variable
-						ctx.bc.AddCode(&lexpr.bc);
-
-						PerformAssignment(&lexpr.type, &expr->type, &ctx.bc, errNode);
-
-						// Release temporary variables used by expression
-						ReleaseTemporaryVariable(expr->type, &ctx.bc);
-
-						ctx.bc.Instr(asBC_PopPtr);
-
-						ProcessDeferredParams(&ctx);
-					}
-				}
-			}
-
-			bc->AddCode(&ctx.bc);
-		}
-	}
-	else
-	{
-		asASSERT( node == 0 );
-
-		// Call the default constructor here, as no explicit initialization is done
-		if( isVarGlobOrMem == 0 )
-			CallDefaultConstructor(type, offset, IsVariableOnHeap(offset), bc, errNode);
-		else if( isVarGlobOrMem == 1 )
-			CallDefaultConstructor(type, offset, true, bc, errNode, isVarGlobOrMem);
-		else if( isVarGlobOrMem == 2 )
-		{
-			if( !(type.IsObject() || type.IsFuncdef()) || type.IsReference() || (type.GetTypeInfo()->flags & asOBJ_REF) )
-				CallDefaultConstructor(type, offset, true, bc, errNode, isVarGlobOrMem);
-			else
-				CallDefaultConstructor(type, offset, false, bc, errNode, isVarGlobOrMem);
-		}
-	}
-
-	return isConstantExpression;
-}
-
-void asCCompiler::CompileInitList(asCExprValue *var, asCScriptNode *node, asCByteCode *bc, int isVarGlobOrMem)
-{
-	// Check if the type supports initialization lists
-	if( var->dataType.GetTypeInfo() == 0 ||
-		var->dataType.GetBehaviour()->listFactory == 0 )
-	{
-		asCString str;
-		str.Format(TXT_INIT_LIST_CANNOT_BE_USED_WITH_s, var->dataType.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-		return;
-	}
-
-	// Construct the buffer with the elements
-
-	// Find the list factory
-	int funcId = var->dataType.GetBehaviour()->listFactory;
-	asASSERT( engine->scriptFunctions[funcId]->listPattern );
-
-	// TODO: runtime optimize: A future optimization should be to use the stack space directly
-	//                         for small buffers so that the dynamic allocation is skipped
-
-	// Create a new special object type for the lists. Both asCRestore and the
-	// context exception handler will need this to know how to parse the buffer.
-	asCObjectType *listPatternType = engine->GetListPatternType(funcId);
-
-	// Allocate a temporary variable to hold the pointer to the buffer
-	int bufferVar = AllocateVariable(asCDataType::CreateType(listPatternType, false), true);
-	asUINT bufferSize = 0;
-
-	// Evaluate all elements of the list
-	asCExprContext valueExpr(engine);
-	asCScriptNode *el = node;
-	asSListPatternNode *patternNode = engine->scriptFunctions[listPatternType->templateSubTypes[0].GetBehaviour()->listFactory]->listPattern;
-	int elementsInSubList = -1;
-	int r = CompileInitListElement(patternNode, el, engine->GetTypeIdFromDataType(asCDataType::CreateType(listPatternType, false)), short(bufferVar), bufferSize, valueExpr.bc, elementsInSubList);
-	asASSERT( r || patternNode == 0 );
-	UNUSED_VAR(r);
-
-	// After all values have been evaluated we know the final size of the buffer
-	asCExprContext allocExpr(engine);
-	allocExpr.bc.InstrSHORT_DW(asBC_AllocMem, short(bufferVar), bufferSize);
-
-	// Merge the bytecode into the final sequence
-	bc->AddCode(&allocExpr.bc);
-	bc->AddCode(&valueExpr.bc);
-
-	// The object itself is the last to be created and will receive the pointer to the buffer
-	asCArray<asCExprContext *> args;
-	asCExprContext arg1(engine);
-	arg1.type.Set(asCDataType::CreatePrimitive(ttUInt, false));
-	arg1.type.dataType.MakeReference(true);
-	arg1.bc.InstrSHORT(asBC_PshVPtr, short(bufferVar));
-	args.PushLast(&arg1);
-
-	asCExprContext ctx(engine);
-
-	if( var->isVariable )
-	{
-		asASSERT( isVarGlobOrMem == 0 );
-
-		if( var->dataType.GetTypeInfo()->GetFlags() & asOBJ_REF )
-		{
-			ctx.bc.AddCode(&arg1.bc);
-
-			// Call factory and store the handle in the given variable
-			PerformFunctionCall(funcId, &ctx, false, &args, 0, true, var->stackOffset);
-			ctx.bc.Instr(asBC_PopPtr);
-		}
-		else
-		{
-			// Call the constructor
-
-			// When the object is allocated on the heap, the address where the
-			// reference will be stored must be pushed on the stack before the
-			// arguments. This reference on the stack is safe, even if the script
-			// is suspended during the evaluation of the arguments.
-			bool onHeap = IsVariableOnHeap(var->stackOffset);
-			if( onHeap )
-				ctx.bc.InstrSHORT(asBC_PSF, var->stackOffset);
-
-			ctx.bc.AddCode(&arg1.bc);
-
-			// When the object is allocated on the stack, the address to the
-			// object is pushed on the stack after the arguments as the object pointer
-			if( !onHeap )
-				ctx.bc.InstrSHORT(asBC_PSF, var->stackOffset);
-
-			PerformFunctionCall(funcId, &ctx, onHeap, &args, var->dataType.GetTypeInfo()->CastToObjectType());
-
-			// Mark the object in the local variable as initialized
-			ctx.bc.ObjInfo(var->stackOffset, asOBJ_INIT);
-		}
-	}
-	else
-	{
-		if( var->dataType.GetTypeInfo()->GetFlags() & asOBJ_REF )
-		{
-			ctx.bc.AddCode(&arg1.bc);
-
-			PerformFunctionCall(funcId, &ctx, false, &args);
-
-			ctx.bc.Instr(asBC_RDSPtr);
-			if( isVarGlobOrMem == 1 )
-			{
-				// Store the returned handle in the global variable
-				ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[var->stackOffset]->GetAddressOfValue());
-			}
-			else
-			{
-				// Store the returned handle in the member
-				ctx.bc.InstrSHORT(asBC_PSF, 0);
-				ctx.bc.Instr(asBC_RDSPtr);
-				ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)var->stackOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-			}
-			if (var->dataType.IsFuncdef())
-				ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-			else
-				ctx.bc.InstrPTR(asBC_REFCPY, var->dataType.GetTypeInfo());
-			ctx.bc.Instr(asBC_PopPtr);
-			ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
-		}
-		else
-		{
-			bool onHeap = true;
-
-			// Put the address where the object pointer will be placed on the stack
-			if( isVarGlobOrMem == 1 )
-				ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[var->stackOffset]->GetAddressOfValue());
-			else
-			{
-				onHeap = !(var->dataType.IsObject() || var->dataType.IsFuncdef()) || var->dataType.IsReference() || (var->dataType.GetTypeInfo()->flags & asOBJ_REF);
-				if( onHeap )
-				{
-					ctx.bc.InstrSHORT(asBC_PSF, 0);
-					ctx.bc.Instr(asBC_RDSPtr);
-					ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)var->stackOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-				}
-			}
-
-			// Add the address of the list buffer as the argument
-			ctx.bc.AddCode(&arg1.bc);
-
-			if( !onHeap )
-			{
-				ctx.bc.InstrSHORT(asBC_PSF, 0);
-				ctx.bc.Instr(asBC_RDSPtr);
-				ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)var->stackOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
-			}
-
-			// Call the ALLOC instruction to allocate memory and invoke constructor
-			PerformFunctionCall(funcId, &ctx, onHeap, &args, var->dataType.GetTypeInfo()->CastToObjectType());
-		}
-	}
-
-	bc->AddCode(&ctx.bc);
-
-	// Free the temporary buffer. The FREE instruction will make sure to destroy
-	// each element in the buffer so there is no need to do this manually
-	bc->InstrW_PTR(asBC_FREE, short(bufferVar), listPatternType);
-	ReleaseTemporaryVariable(bufferVar, bc);
-}
-
-int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &bcInit, int &elementsInSubList)
-{
-	if( patternNode->type == asLPT_START )
-	{
-		if( valueNode == 0 || valueNode->nodeType != snInitList )
-		{
-			Error(TXT_EXPECTED_LIST, valueNode);
-			return -1;
-		}
-
-		// Compile all values until asLPT_END
-		patternNode = patternNode->next;
-		asCScriptNode *node = valueNode->firstChild;
-		while( patternNode->type != asLPT_END )
-		{
-			// Check for missing value here, else the error reporting will not have a source position to report the error for
-			if( node == 0 && patternNode->type == asLPT_TYPE )
-			{
-				Error(TXT_NOT_ENOUGH_VALUES_FOR_LIST, valueNode);
-				return -1;
-			}
-
-			asCScriptNode *errNode = node;
-			int r = CompileInitListElement(patternNode, node, bufferTypeId, bufferVar, bufferSize, bcInit, elementsInSubList);
-			if( r < 0 ) return r;
-
-			if( r == 1 )
-			{
-				asASSERT( engine->ep.disallowEmptyListElements );
-				// Empty elements in the middle are not allowed
-				Error(TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED, errNode);
-			}
-
-			asASSERT( patternNode );
-		}
-
-		if( node )
-		{
-			Error(TXT_TOO_MANY_VALUES_FOR_LIST, valueNode);
-			return -1;
-		}
-
-		// Move to the next node
-		valueNode = valueNode->next;
-		patternNode = patternNode->next;
-	}
-	else if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
-	{
-		// TODO: list: repeat_inner should make sure the list has the same size as the inner list, i.e. square area
-		// TODO: list: repeat_prev should make sure the list is the same size as the previous
-
-		asEListPatternNodeType repeatType = patternNode->type;
-		asCScriptNode *firstValue = valueNode;
-
-		// The following values will be repeated N times
-		patternNode = patternNode->next;
-
-		// Keep track of the patternNode so it can be reset
-		asSListPatternNode *nextNode = patternNode;
-
-		// Align the buffer size to 4 bytes in case previous value was smaller than 4 bytes
-		if( bufferSize & 0x3 )
-			bufferSize += 4 - (bufferSize & 0x3);
-
-		// The first dword will hold the number of elements in the list
-		asDWORD currSize = bufferSize;
-		bufferSize += 4;
-		asUINT countElements = 0;
-
-		int elementsInSubSubList = -1;
-
-		asCExprContext ctx(engine);
-		while( valueNode )
-		{
-			patternNode = nextNode;
-			asCScriptNode *errNode = valueNode;
-			int r = CompileInitListElement(patternNode, valueNode, bufferTypeId, bufferVar, bufferSize, ctx.bc, elementsInSubSubList);
-			if( r < 0 ) return r;
-
-			if( r == 0 )
-				countElements++;
-			else 
-			{
-				asASSERT( r == 1 && engine->ep.disallowEmptyListElements );
-				if( valueNode )
-				{
-					// Empty elements in the middle are not allowed
-					Error(TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED, errNode);
-				}
-			}
-		}
-
-		if( countElements == 0 )
-		{
-			// Skip the sub pattern that was expected to be repeated, otherwise the caller will try to match these when we return
-			patternNode = nextNode;
-			if( patternNode->type == asLPT_TYPE )
-				patternNode = patternNode->next;
-			else if( patternNode->type == asLPT_START )
-			{
-				int subCount = 1;
-				do
-				{
-					patternNode = patternNode->next;
-					if( patternNode->type == asLPT_START )
-						subCount++;
-					else if( patternNode->type == asLPT_END )
-						subCount--;
-				} while( subCount > 0 );
-				patternNode = patternNode->next;
-			}
-		}
-
-		// For repeat_same each repeated sublist must have the same size to form a rectangular array
-		if( repeatType == asLPT_REPEAT_SAME && elementsInSubList != -1 && asUINT(elementsInSubList) != countElements )
-		{
-			if( countElements < asUINT(elementsInSubList) )
-				Error(TXT_NOT_ENOUGH_VALUES_FOR_LIST, firstValue);
-			else
-				Error(TXT_TOO_MANY_VALUES_FOR_LIST, firstValue);
-
-			return -1;
-		}
-		else
-		{
-			// Return to caller the amount of elments in this sublist
-			elementsInSubList = countElements;
-		}
-
-		// The first dword in the buffer will hold the number of elements
-		bcInit.InstrSHORT_DW_DW(asBC_SetListSize, bufferVar, currSize, countElements);
-
-		// Add the values
-		bcInit.AddCode(&ctx.bc);
-	}
-	else if( patternNode->type == asLPT_TYPE )
-	{
-		bool isEmpty = false;
-
-		// Determine the size of the element
-		asUINT size = 0;
-
-		asCDataType dt = reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType;
-
-		if( valueNode->nodeType == snAssignment || valueNode->nodeType == snInitList )
-		{
-			asCExprContext lctx(engine);
-			asCExprContext rctx(engine);
-
-			if( valueNode->nodeType == snAssignment )
-			{
-				// Compile the assignment expression
-				CompileAssignment(valueNode, &rctx);
-
-				if( dt.GetTokenType() == ttQuestion )
-				{
-					// Make sure the type is not ambiguous
-					DetermineSingleFunc(&rctx, valueNode);
-
-					// We now know the type
-					dt = rctx.type.dataType;
-					dt.MakeReadOnly(false);
-					dt.MakeReference(false);
-
-					// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
-					if( bufferSize & 0x3 )
-						bufferSize += 4 - (bufferSize & 0x3);
-
-					// Place the type id in the buffer
-					bcInit.InstrSHORT_DW_DW(asBC_SetListType, bufferVar, bufferSize, engine->GetTypeIdFromDataType(dt));
-					bufferSize += 4;
-				}
-			}
-			else if( valueNode->nodeType == snInitList )
-			{
-				if( dt.GetTokenType() == ttQuestion )
-				{
-					// Can't use init lists with var type as it is not possible to determine what type should be allocated
-					asCString str;
-					str.Format(TXT_INIT_LIST_CANNOT_BE_USED_WITH_s, "?");
-					Error(str.AddressOf(), valueNode);
-					rctx.type.SetDummy();
-					dt = rctx.type.dataType;
-				}
-				else
-				{
-					// Allocate a temporary variable that will be initialized with the list
-					int offset = AllocateVariable(dt, true);
-
-					rctx.type.Set(dt);
-					rctx.type.isVariable = true;
-					rctx.type.isTemporary = true;
-					rctx.type.stackOffset = (short)offset;
-
-					CompileInitList(&rctx.type, valueNode, &rctx.bc, 0);
-
-					// Put the object on the stack
-					rctx.bc.InstrSHORT(asBC_PSF, rctx.type.stackOffset);
-
-					// It is a reference that we place on the stack
-					rctx.type.dataType.MakeReference(true);
-				}
-			}
-
-			// Determine size of the element
-			if( dt.IsPrimitive() || (!dt.IsNullHandle() && (dt.GetTypeInfo()->flags & asOBJ_VALUE)) )
-				size = dt.GetSizeInMemoryBytes();
-			else
-				size = AS_PTR_SIZE*4;
-
-			// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
-			if( size >= 4 && (bufferSize & 0x3) )
-				bufferSize += 4 - (bufferSize & 0x3);
-
-			// Compile the lvalue
-			lctx.bc.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
-			lctx.type.Set(dt);
-			lctx.type.isLValue = true;
-			if( dt.IsPrimitive() )
-			{
-				lctx.bc.Instr(asBC_PopRPtr);
-				lctx.type.dataType.MakeReference(true);
-			}
-			else if( dt.IsObjectHandle() ||
-					 dt.GetTypeInfo()->flags & asOBJ_REF )
-			{
-				lctx.type.isExplicitHandle = true;
-				lctx.type.dataType.MakeReference(true);
-			}
-			else
-			{
-				asASSERT( dt.GetTypeInfo()->flags & asOBJ_VALUE );
-
-				// Make sure the object has been constructed before the assignment
-				// TODO: runtime optimize: Use copy constructor instead of assignment to initialize the objects
-				asSTypeBehaviour *beh = dt.GetBehaviour();
-				int func = 0;
-				if( beh ) func = beh->construct;
-				if( func == 0 && (dt.GetTypeInfo()->flags & asOBJ_POD) == 0 )
-				{
-					asCString str;
-					str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetTypeInfo()->GetName());
-					Error(str, valueNode);
-				}
-				else if( func )
-				{
-					// Call the constructor as a normal function
-					bcInit.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
-
-					asCExprContext ctx(engine);
-					PerformFunctionCall(func, &ctx, false, 0, dt.GetTypeInfo()->CastToObjectType());
-					bcInit.AddCode(&ctx.bc);
-				}
-			}
-
-			if( lctx.type.dataType.IsNullHandle() )
-			{
-				// Don't add any code to assign a null handle. RefCpy doesn't work without a known type. 
-				// The buffer is already initialized to zero in asBC_AllocMem anyway.
-				asASSERT( rctx.bc.GetLastInstr() == asBC_PshNull );
-				asASSERT( reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType.GetTokenType() == ttQuestion );
-			}
-			else
-			{
-				asCExprContext ctx(engine);
-				DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
-
-				if( !lctx.type.dataType.IsPrimitive() )
-					ctx.bc.Instr(asBC_PopPtr);
-
-				// Release temporary variables used by expression
-				ReleaseTemporaryVariable(ctx.type, &ctx.bc);
-
-				ProcessDeferredParams(&ctx);
-
-				bcInit.AddCode(&ctx.bc);
-			}
-		}
-		else
-		{
-			if( builder->engine->ep.disallowEmptyListElements )
-			{
-				// Empty elements are not allowed, except if it is the last in the list
-				isEmpty = true;
-			}
-			else
-			{
-				// There is no specific value so we need to fill it with a default value
-				if( dt.GetTokenType() == ttQuestion )
-				{
-					// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
-					if( bufferSize & 0x3 )
-						bufferSize += 4 - (bufferSize & 0x3);
-
-					// Place the type id for a null handle in the buffer
-					bcInit.InstrSHORT_DW_DW(asBC_SetListType, bufferVar, bufferSize, 0);
-					bufferSize += 4;
-
-					dt = asCDataType::CreateNullHandle();
-
-					// No need to initialize the handle as the buffer is already initialized with zeroes
-				}
-				else if( dt.GetTypeInfo() && dt.GetTypeInfo()->flags & asOBJ_VALUE )
-				{
-					// For value types with default constructor we need to call the constructor
-					asSTypeBehaviour *beh = dt.GetBehaviour();
-					int func = 0;
-					if( beh ) func = beh->construct;
-					if( func == 0 && (dt.GetTypeInfo()->flags & asOBJ_POD) == 0 )
-					{
-						asCString str;
-						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetTypeInfo()->GetName());
-						Error(str, valueNode);
-					}
-					else if( func )
-					{
-						// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
-						if( bufferSize & 0x3 )
-							bufferSize += 4 - (bufferSize & 0x3);
-
-						// Call the constructor as a normal function
-						bcInit.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
-
-						asCExprContext ctx(engine);
-						PerformFunctionCall(func, &ctx, false, 0, dt.GetTypeInfo()->CastToObjectType());
-						bcInit.AddCode(&ctx.bc);
-					}
-				}
-				else if( !dt.IsObjectHandle() && dt.GetTypeInfo() && dt.GetTypeInfo()->flags & asOBJ_REF )
-				{
-					// For ref types (not handles) we need to call the default factory
-					asSTypeBehaviour *beh = dt.GetBehaviour();
-					int func = 0;
-					if( beh ) func = beh->factory;
-					if( func == 0 )
-					{
-						asCString str;
-						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetTypeInfo()->GetName());
-						Error(str, valueNode);
-					}
-					else if( func )
-					{
-						asCExprContext rctx(engine);
-						PerformFunctionCall(func, &rctx, false, 0, dt.GetTypeInfo()->CastToObjectType());
-
-						// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
-						if( bufferSize & 0x3 )
-							bufferSize += 4 - (bufferSize & 0x3);
-
-						asCExprContext lctx(engine);
-						lctx.bc.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
-						lctx.type.Set(dt);
-						lctx.type.isLValue = true;
-						lctx.type.isExplicitHandle = true;
-						lctx.type.dataType.MakeReference(true);
-
-						asCExprContext ctx(engine);
-						DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
-
-						if( !lctx.type.dataType.IsPrimitive() )
-							ctx.bc.Instr(asBC_PopPtr);
-
-						// Release temporary variables used by expression
-						ReleaseTemporaryVariable(ctx.type, &ctx.bc);
-
-						ProcessDeferredParams(&ctx);
-
-						bcInit.AddCode(&ctx.bc);
-					}
-				}
-			}
-		}
-
-		if( !isEmpty )
-		{
-			// Determine size of the element
-			if( dt.IsPrimitive() || (!dt.IsNullHandle() && (dt.GetTypeInfo()->flags & asOBJ_VALUE)) )
-				size = dt.GetSizeInMemoryBytes();
-			else
-				size = AS_PTR_SIZE*4;
-			asASSERT( size <= 4 || (size & 0x3) == 0 );
-
-			bufferSize += size;
-		}
-
-		// Move to the next element
-		patternNode = patternNode->next;
-		valueNode = valueNode->next;
-
-		if( isEmpty )
-		{
-			// The caller will determine if the empty element should be ignored or not
-			return 1;
-		}
-	}
-	else
-		asASSERT( false );
-
-	return 0;
-}
-
-void asCCompiler::CompileStatement(asCScriptNode *statement, bool *hasReturn, asCByteCode *bc)
-{
-	// Don't clear the hasReturn flag if this is an empty statement
-	// to avoid false errors of 'not all paths return'
-	if( statement->nodeType != snExpressionStatement || statement->firstChild )
-		*hasReturn = false;
-
-	if( statement->nodeType == snStatementBlock )
-		CompileStatementBlock(statement, true, hasReturn, bc);
-	else if( statement->nodeType == snIf )
-		CompileIfStatement(statement, hasReturn, bc);
-	else if( statement->nodeType == snFor )
-		CompileForStatement(statement, bc);
-	else if( statement->nodeType == snWhile )
-		CompileWhileStatement(statement, bc);
-	else if( statement->nodeType == snDoWhile )
-		CompileDoWhileStatement(statement, bc);
-	else if( statement->nodeType == snExpressionStatement )
-		CompileExpressionStatement(statement, bc);
-	else if( statement->nodeType == snBreak )
-		CompileBreakStatement(statement, bc);
-	else if( statement->nodeType == snContinue )
-		CompileContinueStatement(statement, bc);
-	else if( statement->nodeType == snSwitch )
-		CompileSwitchStatement(statement, hasReturn, bc);
-	else if( statement->nodeType == snReturn )
-	{
-		CompileReturnStatement(statement, bc);
-		*hasReturn = true;
-	}
-}
-
-void asCCompiler::CompileSwitchStatement(asCScriptNode *snode, bool *, asCByteCode *bc)
-{
-	// TODO: inheritance: Must guarantee that all options in the switch case call a constructor, or that none call it.
-
-	// Reserve label for break statements
-	int breakLabel = nextLabel++;
-	breakLabels.PushLast(breakLabel);
-
-	// Add a variable scope that will be used by CompileBreak
-	// to know where to stop deallocating variables
-	AddVariableScope(true, false);
-
-	//---------------------------
-	// Compile the switch expression
-	//-------------------------------
-
-	// Compile the switch expression
-	asCExprContext expr(engine);
-	CompileAssignment(snode->firstChild, &expr);
-
-	// Verify that the expression is a primitive type
-	if( !expr.type.dataType.IsIntegerType() && !expr.type.dataType.IsUnsignedType() )
-	{
-		Error(TXT_SWITCH_MUST_BE_INTEGRAL, snode->firstChild);
-		return;
-	}
-
-	ProcessPropertyGetAccessor(&expr, snode);
-
-	// TODO: Need to support 64bit integers
-	// Convert the expression to a 32bit variable
-	asCDataType to;
-	if( expr.type.dataType.IsIntegerType() )
-		to.SetTokenType(ttInt);
-	else if( expr.type.dataType.IsUnsignedType() )
-		to.SetTokenType(ttUInt);
-
-	// Make sure the value is in a variable
-	if( expr.type.dataType.IsReference() )
-		ConvertToVariable(&expr);
-
-	ImplicitConversion(&expr, to, snode->firstChild, asIC_IMPLICIT_CONV, true);
-
-	ConvertToVariable(&expr);
-	int offset = expr.type.stackOffset;
-
-	ProcessDeferredParams(&expr);
-
-	//-------------------------------
-	// Determine case values and labels
-	//--------------------------------
-
-	// Remember the first label so that we can later pass the
-	// correct label to each CompileCase()
-	int firstCaseLabel = nextLabel;
-	int defaultLabel = 0;
-
-	asCArray<int> caseValues;
-	asCArray<int> caseLabels;
-
-	// Compile all case comparisons and make them jump to the right label
-	asCScriptNode *cnode = snode->firstChild->next;
-	while( cnode )
-	{
-		// Each case should have a constant expression
-		if( cnode->firstChild && cnode->firstChild->nodeType == snExpression )
-		{
-			// Compile expression
-			asCExprContext c(engine);
-			CompileExpression(cnode->firstChild, &c);
-
-			// Verify that the result is a constant
-			if( !c.type.isConstant )
-				Error(TXT_SWITCH_CASE_MUST_BE_CONSTANT, cnode->firstChild);
-
-			// Verify that the result is an integral number
-			if( !c.type.dataType.IsIntegerType() && !c.type.dataType.IsUnsignedType() )
-				Error(TXT_SWITCH_MUST_BE_INTEGRAL, cnode->firstChild);
-
-			ImplicitConversion(&c, to, cnode->firstChild, asIC_IMPLICIT_CONV, true);
-
-			// Has this case been declared already?
-			if( caseValues.IndexOf(c.type.GetConstantDW()) >= 0 )
-			{
-				Error(TXT_DUPLICATE_SWITCH_CASE, cnode->firstChild);
-			}
-
-			// TODO: Optimize: We can insert the numbers sorted already
-
-			// Store constant for later use
-			caseValues.PushLast(c.type.GetConstantDW());
-
-			// Reserve label for this case
-			caseLabels.PushLast(nextLabel++);
-		}
-		else
-		{
-			// TODO: It shouldn't be necessary for the default case to be the last one.
-			// Is default the last case?
-			if( cnode->next )
-			{
-				Error(TXT_DEFAULT_MUST_BE_LAST, cnode);
-				break;
-			}
-
-			// Reserve label for this case
-			defaultLabel = nextLabel++;
-		}
-
-		cnode = cnode->next;
-	}
-
-    // check for empty switch
-	if (caseValues.GetLength() == 0)
-	{
-		Error(TXT_EMPTY_SWITCH, snode);
-		return;
-	}
-
-	if( defaultLabel == 0 )
-		defaultLabel = breakLabel;
-
-	//---------------------------------
-    // Output the optimized case comparisons
-	// with jumps to the case code
-	//------------------------------------
-
-	// Sort the case values by increasing value. Do the sort together with the labels
-	// A simple bubble sort is sufficient since we don't expect a huge number of values
-	for( asUINT fwd = 1; fwd < caseValues.GetLength(); fwd++ )
-	{
-		for( int bck = fwd - 1; bck >= 0; bck-- )
-		{
-			int bckp = bck + 1;
-			if( caseValues[bck] > caseValues[bckp] )
-			{
-				// Swap the values in both arrays
-				int swap = caseValues[bckp];
-				caseValues[bckp] = caseValues[bck];
-				caseValues[bck] = swap;
-
-				swap = caseLabels[bckp];
-				caseLabels[bckp] = caseLabels[bck];
-				caseLabels[bck] = swap;
-			}
-			else
-				break;
-		}
-	}
-
-	// Find ranges of consecutive numbers
-	asCArray<int> ranges;
-	ranges.PushLast(0);
-	asUINT n;
-	for( n = 1; n < caseValues.GetLength(); ++n )
-	{
-		// We can join numbers that are less than 5 numbers
-		// apart since the output code will still be smaller
-		if( caseValues[n] > caseValues[n-1] + 5 )
-			ranges.PushLast(n);
-	}
-
-	// If the value is larger than the largest case value, jump to default
-	int tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
-	expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[caseValues.GetLength()-1]);
-	expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
-	expr.bc.InstrDWORD(asBC_JP, defaultLabel);
-	ReleaseTemporaryVariable(tmpOffset, &expr.bc);
-
-	// TODO: runtime optimize: We could possibly optimize this even more by doing a
-	//                         binary search instead of a linear search through the ranges
-
-	// For each range
-	int range;
-	for( range = 0; range < (int)ranges.GetLength(); range++ )
-	{
-		// Find the largest value in this range
-		int maxRange = caseValues[ranges[range]];
-		int index = ranges[range];
-		for( ; (index < (int)caseValues.GetLength()) && (caseValues[index] <= maxRange + 5); index++ )
-			maxRange = caseValues[index];
-
-		// If there are only 2 numbers then it is better to compare them directly
-		if( index - ranges[range] > 2 )
-		{
-			// If the value is smaller than the smallest case value in the range, jump to default
-			tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
-			expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[ranges[range]]);
-			expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
-			expr.bc.InstrDWORD(asBC_JS, defaultLabel);
-			ReleaseTemporaryVariable(tmpOffset, &expr.bc);
-
-			int nextRangeLabel = nextLabel++;
-			// If this is the last range we don't have to make this test
-			if( range < (int)ranges.GetLength() - 1 )
-			{
-				// If the value is larger than the largest case value in the range, jump to the next range
-				tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
-				expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, maxRange);
-				expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
-				expr.bc.InstrDWORD(asBC_JP, nextRangeLabel);
-				ReleaseTemporaryVariable(tmpOffset, &expr.bc);
-			}
-
-			// Jump forward according to the value
-			tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
-			expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[ranges[range]]);
-			expr.bc.InstrW_W_W(asBC_SUBi, tmpOffset, offset, tmpOffset);
-			ReleaseTemporaryVariable(tmpOffset, &expr.bc);
-			expr.bc.JmpP(tmpOffset, maxRange - caseValues[ranges[range]]);
-
-			// Add the list of jumps to the correct labels (any holes, jump to default)
-			index = ranges[range];
-			for( int i = caseValues[index]; i <= maxRange; i++ )
-			{
-				if( caseValues[index] == i )
-					expr.bc.InstrINT(asBC_JMP, caseLabels[index++]);
-				else
-					expr.bc.InstrINT(asBC_JMP, defaultLabel);
-			}
-
-			expr.bc.Label((short)nextRangeLabel);
-		}
-		else
-		{
-			// Simply make a comparison with each value
-			for( int i = ranges[range]; i < index; ++i )
-			{
-				tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
-				expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[i]);
-				expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
-				expr.bc.InstrDWORD(asBC_JZ, caseLabels[i]);
-				ReleaseTemporaryVariable(tmpOffset, &expr.bc);
-			}
-		}
-	}
-
-	// Catch any value that falls trough
-	expr.bc.InstrINT(asBC_JMP, defaultLabel);
-
-	// Release the temporary variable previously stored
-	ReleaseTemporaryVariable(expr.type, &expr.bc);
-
-	// TODO: optimize: Should optimize each piece individually
-	expr.bc.OptimizeLocally(tempVariableOffsets);
-
-	//----------------------------------
-    // Output case implementations
-	//----------------------------------
-
-	// Compile case implementations, each one with the label before it
-	cnode = snode->firstChild->next;
-	while( cnode )
-	{
-		// Each case should have a constant expression
-		if( cnode->firstChild && cnode->firstChild->nodeType == snExpression )
-		{
-			expr.bc.Label((short)firstCaseLabel++);
-
-			CompileCase(cnode->firstChild->next, &expr.bc);
-		}
-		else
-		{
-			expr.bc.Label((short)defaultLabel);
-
-			// Is default the last case?
-			if( cnode->next )
-			{
-				// We've already reported this error
-				break;
-			}
-
-			CompileCase(cnode->firstChild, &expr.bc);
-		}
-
-		cnode = cnode->next;
-	}
-
-	//--------------------------------
-
-	bc->AddCode(&expr.bc);
-
-	// Add break label
-	bc->Label((short)breakLabel);
-
-	breakLabels.PopLast();
-	RemoveVariableScope();
-}
-
-void asCCompiler::CompileCase(asCScriptNode *node, asCByteCode *bc)
-{
-	bool isFinished = false;
-	bool hasReturn = false;
-	bool hasUnreachableCode = false;
-	while( node )
-	{
-		if( !hasUnreachableCode && (hasReturn || isFinished) )
-		{
-			hasUnreachableCode = true;
-			Warning(TXT_UNREACHABLE_CODE, node);
-			break;
-		}
-
-		if( node->nodeType == snBreak || node->nodeType == snContinue )
-			isFinished = true;
-
-		asCByteCode statement(engine);
-		if( node->nodeType == snDeclaration )
-		{
-			Error(TXT_DECL_IN_SWITCH, node);
-
-			// Compile it anyway to avoid further compiler errors
-			CompileDeclaration(node, &statement);
-		}
-		else
-			CompileStatement(node, &hasReturn, &statement);
-
-		LineInstr(bc, node->tokenPos);
-		bc->AddCode(&statement);
-
-		if( !hasCompileErrors )
-			asASSERT( tempVariables.GetLength() == 0 );
-
-		node = node->next;
-	}
-}
-
-void asCCompiler::CompileIfStatement(asCScriptNode *inode, bool *hasReturn, asCByteCode *bc)
-{
-	// We will use one label for the if statement
-	// and possibly another for the else statement
-	int afterLabel = nextLabel++;
-
-	// Compile the expression
-	asCExprContext expr(engine);
-	int r = CompileAssignment(inode->firstChild, &expr);
-	if( r == 0 )
-	{
-		// Allow value types to be converted to bool using 'bool opImplConv()'
-		if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-			ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), inode, asIC_IMPLICIT_CONV);
-
-		if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
-			Error(TXT_EXPR_MUST_BE_BOOL, inode->firstChild);
-		else
-		{
-			if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
-			ProcessDeferredParams(&expr);
-
-			if( !expr.type.isConstant )
-			{
-				ProcessPropertyGetAccessor(&expr, inode);
-
-				ConvertToVariable(&expr);
-
-				// Add a test
-				expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
-				expr.bc.Instr(asBC_ClrHi);
-				expr.bc.InstrDWORD(asBC_JZ, afterLabel);
-				ReleaseTemporaryVariable(expr.type, &expr.bc);
-
-				expr.bc.OptimizeLocally(tempVariableOffsets);
-				bc->AddCode(&expr.bc);
-			}
-#if AS_SIZEOF_BOOL == 1
-			else if( expr.type.GetConstantB() == 0 )
-#else
-			else if (expr.type.GetConstantDW() == 0)
-#endif
-			{
-				// Jump to the else case
-				bc->InstrINT(asBC_JMP, afterLabel);
-
-				// TODO: Should we warn that the expression will always go to the else?
-			}
-		}
-	}
-
-	// Compile the if statement
-	bool origIsConstructorCalled = m_isConstructorCalled;
-
-	bool hasReturn1;
-	asCByteCode ifBC(engine);
-	CompileStatement(inode->firstChild->next, &hasReturn1, &ifBC);
-
-	// Add the byte code
-	LineInstr(bc, inode->firstChild->next->tokenPos);
-	bc->AddCode(&ifBC);
-
-	if( inode->firstChild->next->nodeType == snExpressionStatement && inode->firstChild->next->firstChild == 0 )
-	{
-		// Don't allow  if( expr );
-		Error(TXT_IF_WITH_EMPTY_STATEMENT, inode->firstChild->next);
-	}
-
-	// If one of the statements call the constructor, the other must as well
-	// otherwise it is possible the constructor is never called
-	bool constructorCall1 = false;
-	bool constructorCall2 = false;
-	if( !origIsConstructorCalled && m_isConstructorCalled )
-		constructorCall1 = true;
-
-	// Do we have an else statement?
-	if( inode->firstChild->next != inode->lastChild )
-	{
-		// Reset the constructor called flag so the else statement can call the constructor too
-		m_isConstructorCalled = origIsConstructorCalled;
-
-		int afterElse = 0;
-		if( !hasReturn1 )
-		{
-			afterElse = nextLabel++;
-
-			// Add jump to after the else statement
-			bc->InstrINT(asBC_JMP, afterElse);
-		}
-
-		// Add label for the else statement
-		bc->Label((short)afterLabel);
-
-		bool hasReturn2;
-		asCByteCode elseBC(engine);
-		CompileStatement(inode->lastChild, &hasReturn2, &elseBC);
-
-		// Add byte code for the else statement
-		LineInstr(bc, inode->lastChild->tokenPos);
-		bc->AddCode(&elseBC);
-
-		if( inode->lastChild->nodeType == snExpressionStatement && inode->lastChild->firstChild == 0 )
-		{
-			// Don't allow  if( expr ) {} else;
-			Error(TXT_ELSE_WITH_EMPTY_STATEMENT, inode->lastChild);
-		}
-
-		if( !hasReturn1 )
-		{
-			// Add label for the end of else statement
-			bc->Label((short)afterElse);
-		}
-
-		// The if statement only has return if both alternatives have
-		*hasReturn = hasReturn1 && hasReturn2;
-
-		if( !origIsConstructorCalled && m_isConstructorCalled )
-			constructorCall2 = true;
-	}
-	else
-	{
-		// Add label for the end of if statement
-		bc->Label((short)afterLabel);
-		*hasReturn = false;
-	}
-
-	// Make sure both or neither conditions call a constructor
-	if( (constructorCall1 && !constructorCall2) ||
-		(constructorCall2 && !constructorCall1) )
-	{
-		Error(TXT_BOTH_CONDITIONS_MUST_CALL_CONSTRUCTOR, inode);
-	}
-
-	m_isConstructorCalled = origIsConstructorCalled || constructorCall1 || constructorCall2;
-}
-
-void asCCompiler::CompileForStatement(asCScriptNode *fnode, asCByteCode *bc)
-{
-	// Add a variable scope that will be used by CompileBreak/Continue to know where to stop deallocating variables
-	AddVariableScope(true, true);
-
-	// We will use three labels for the for loop
-	int conditionLabel = nextLabel++;
-	int afterLabel = nextLabel++;
-	int continueLabel = nextLabel++;
-	int insideLabel = nextLabel++;
-
-	continueLabels.PushLast(continueLabel);
-	breakLabels.PushLast(afterLabel);
-
-	//---------------------------------------
-	// Compile the initialization statement
-	asCByteCode initBC(engine);
-	LineInstr(&initBC, fnode->firstChild->tokenPos);
-	if( fnode->firstChild->nodeType == snDeclaration )
-		CompileDeclaration(fnode->firstChild, &initBC);
-	else
-		CompileExpressionStatement(fnode->firstChild, &initBC);
-
-	//-----------------------------------
-	// Compile the condition statement
-	asCExprContext expr(engine);
-	asCScriptNode *second = fnode->firstChild->next;
-	if( second->firstChild )
-	{
-		int r = CompileAssignment(second->firstChild, &expr);
-		if( r >= 0 )
-		{
-			// Allow value types to be converted to bool using 'bool opImplConv()'
-			if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-				ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), second->firstChild, asIC_IMPLICIT_CONV);
-
-			if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
-				Error(TXT_EXPR_MUST_BE_BOOL, second);
-			else
-			{
-				if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
-				ProcessDeferredParams(&expr);
-
-				ProcessPropertyGetAccessor(&expr, second);
-
-				// If expression is false exit the loop
-				ConvertToVariable(&expr);
-				expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
-				expr.bc.Instr(asBC_ClrHi);
-				expr.bc.InstrDWORD(asBC_JNZ, insideLabel);
-				ReleaseTemporaryVariable(expr.type, &expr.bc);
-
-				expr.bc.OptimizeLocally(tempVariableOffsets);
-
-				// Prepend the line instruction for the condition
-				asCByteCode tmp(engine);
-				LineInstr(&tmp, second->firstChild->tokenPos);
-				tmp.AddCode(&expr.bc);
-				expr.bc.AddCode(&tmp);
-			}
-		}
-	}
-
-	//---------------------------
-	// Compile the increment statement(s)
-	asCByteCode nextBC(engine);
-	asCScriptNode *cnode = second->next;
-	while( cnode && cnode->nodeType == snExpressionStatement && cnode != fnode->lastChild )
-	{
-		LineInstr(&nextBC, cnode->tokenPos);
-		CompileExpressionStatement(cnode, &nextBC);
-		cnode = cnode->next;
-	}
-
-	//------------------------------
-	// Compile loop statement
-	bool hasReturn;
-	asCByteCode forBC(engine);
-	CompileStatement(fnode->lastChild, &hasReturn, &forBC);
-
-	//-------------------------------
-	// Join the code pieces
-	bc->AddCode(&initBC);
-	bc->InstrDWORD(asBC_JMP, conditionLabel);
-
-	bc->Label((short)insideLabel);
-
-	// Add a suspend bytecode inside the loop to guarantee
-	// that the application can suspend the execution
-	bc->Instr(asBC_SUSPEND);
-	bc->InstrPTR(asBC_JitEntry, 0);
-
-	LineInstr(bc, fnode->lastChild->tokenPos);
-	bc->AddCode(&forBC);
-
-	bc->Label((short)continueLabel);
-	bc->AddCode(&nextBC);
-
-	bc->Label((short)conditionLabel);
-	if( expr.bc.GetLastInstr() == -1 )
-		// There is no condition, so we just always jump
-		bc->InstrDWORD(asBC_JMP, insideLabel);
-	else
-		bc->AddCode(&expr.bc);
-
-	bc->Label((short)afterLabel);
-
-	continueLabels.PopLast();
-	breakLabels.PopLast();
-
-	// Deallocate variables in this block, in reverse order
-	for( int n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
-	{
-		sVariable *v = variables->variables[n];
-
-		// Call variable destructors here, for variables not yet destroyed
-		CallDestructor(v->type, v->stackOffset, v->onHeap, bc);
-
-		// Don't deallocate function parameters
-		if( v->stackOffset > 0 )
-			DeallocateVariable(v->stackOffset);
-	}
-
-	RemoveVariableScope();
-}
-
-void asCCompiler::CompileWhileStatement(asCScriptNode *wnode, asCByteCode *bc)
-{
-	// Add a variable scope that will be used by CompileBreak/Continue to know where to stop deallocating variables
-	AddVariableScope(true, true);
-
-	// We will use two labels for the while loop
-	int beforeLabel = nextLabel++;
-	int afterLabel = nextLabel++;
-
-	continueLabels.PushLast(beforeLabel);
-	breakLabels.PushLast(afterLabel);
-
-	// Add label before the expression
-	bc->Label((short)beforeLabel);
-
-	// Compile expression
-	asCExprContext expr(engine);
-	int r = CompileAssignment(wnode->firstChild, &expr);
-	if( r == 0 )
-	{
-		// Allow value types to be converted to bool using 'bool opImplConv()'
-		if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-			ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), wnode->firstChild, asIC_IMPLICIT_CONV);
-
-		if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
-			Error(TXT_EXPR_MUST_BE_BOOL, wnode->firstChild);
-		else
-		{
-			if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
-			ProcessDeferredParams(&expr);
-
-			ProcessPropertyGetAccessor(&expr, wnode);
-
-			// Add byte code for the expression
-			ConvertToVariable(&expr);
-
-			// Jump to end of statement if expression is false
-			expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
-			expr.bc.Instr(asBC_ClrHi);
-			expr.bc.InstrDWORD(asBC_JZ, afterLabel);
-			ReleaseTemporaryVariable(expr.type, &expr.bc);
-
-			expr.bc.OptimizeLocally(tempVariableOffsets);
-			bc->AddCode(&expr.bc);
-		}
-	}
-
-	// Add a suspend bytecode inside the loop to guarantee
-	// that the application can suspend the execution
-	bc->Instr(asBC_SUSPEND);
-	bc->InstrPTR(asBC_JitEntry, 0);
-
-	// Compile statement
-	bool hasReturn;
-	asCByteCode whileBC(engine);
-	CompileStatement(wnode->lastChild, &hasReturn, &whileBC);
-
-	// Add byte code for the statement
-	LineInstr(bc, wnode->lastChild->tokenPos);
-	bc->AddCode(&whileBC);
-
-	// Jump to the expression
-	bc->InstrINT(asBC_JMP, beforeLabel);
-
-	// Add label after the statement
-	bc->Label((short)afterLabel);
-
-	continueLabels.PopLast();
-	breakLabels.PopLast();
-
-	RemoveVariableScope();
-}
-
-void asCCompiler::CompileDoWhileStatement(asCScriptNode *wnode, asCByteCode *bc)
-{
-	// Add a variable scope that will be used by CompileBreak/Continue to know where to stop deallocating variables
-	AddVariableScope(true, true);
-
-	// We will use two labels for the while loop
-	int beforeLabel = nextLabel++;
-	int beforeTest = nextLabel++;
-	int afterLabel = nextLabel++;
-
-	continueLabels.PushLast(beforeTest);
-	breakLabels.PushLast(afterLabel);
-
-	// Add label before the statement
-	bc->Label((short)beforeLabel);
-
-	// Compile statement
-	bool hasReturn;
-	asCByteCode whileBC(engine);
-	CompileStatement(wnode->firstChild, &hasReturn, &whileBC);
-
-	// Add byte code for the statement
-	LineInstr(bc, wnode->firstChild->tokenPos);
-	bc->AddCode(&whileBC);
-
-	// Add label before the expression
-	bc->Label((short)beforeTest);
-
-	// Add a suspend bytecode inside the loop to guarantee
-	// that the application can suspend the execution
-	bc->Instr(asBC_SUSPEND);
-	bc->InstrPTR(asBC_JitEntry, 0);
-
-	// Add a line instruction
-	LineInstr(bc, wnode->lastChild->tokenPos);
-
-	// Compile expression
-	asCExprContext expr(engine);
-	CompileAssignment(wnode->lastChild, &expr);
-
-	// Allow value types to be converted to bool using 'bool opImplConv()'
-	if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-		ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), wnode->lastChild, asIC_IMPLICIT_CONV);
-
-	if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
-		Error(TXT_EXPR_MUST_BE_BOOL, wnode->firstChild);
-	else
-	{
-		if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
-		ProcessDeferredParams(&expr);
-
-		ProcessPropertyGetAccessor(&expr, wnode);
-
-		// Add byte code for the expression
-		ConvertToVariable(&expr);
-
-		// Jump to next iteration if expression is true
-		expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
-		expr.bc.Instr(asBC_ClrHi);
-		expr.bc.InstrDWORD(asBC_JNZ, beforeLabel);
-		ReleaseTemporaryVariable(expr.type, &expr.bc);
-
-		expr.bc.OptimizeLocally(tempVariableOffsets);
-		bc->AddCode(&expr.bc);
-	}
-
-	// Add label after the statement
-	bc->Label((short)afterLabel);
-
-	continueLabels.PopLast();
-	breakLabels.PopLast();
-
-	RemoveVariableScope();
-}
-
-void asCCompiler::CompileBreakStatement(asCScriptNode *node, asCByteCode *bc)
-{
-	if( breakLabels.GetLength() == 0 )
-	{
-		Error(TXT_INVALID_BREAK, node);
-		return;
-	}
-
-	// Add destructor calls for all variables that will go out of scope
-	// Put this clean up in a block to allow exception handler to understand them
-	bc->Block(true);
-	asCVariableScope *vs = variables;
-	while( !vs->isBreakScope )
-	{
-		for( int n = (int)vs->variables.GetLength() - 1; n >= 0; n-- )
-			CallDestructor(vs->variables[n]->type, vs->variables[n]->stackOffset, vs->variables[n]->onHeap, bc);
-
-		vs = vs->parent;
-	}
-	bc->Block(false);
-
-	bc->InstrINT(asBC_JMP, breakLabels[breakLabels.GetLength()-1]);
-}
-
-void asCCompiler::CompileContinueStatement(asCScriptNode *node, asCByteCode *bc)
-{
-	if( continueLabels.GetLength() == 0 )
-	{
-		Error(TXT_INVALID_CONTINUE, node);
-		return;
-	}
-
-	// Add destructor calls for all variables that will go out of scope
-	// Put this clean up in a block to allow exception handler to understand them
-	bc->Block(true);
-	asCVariableScope *vs = variables;
-	while( !vs->isContinueScope )
-	{
-		for( int n = (int)vs->variables.GetLength() - 1; n >= 0; n-- )
-			CallDestructor(vs->variables[n]->type, vs->variables[n]->stackOffset, vs->variables[n]->onHeap, bc);
-
-		vs = vs->parent;
-	}
-	bc->Block(false);
-
-	bc->InstrINT(asBC_JMP, continueLabels[continueLabels.GetLength()-1]);
-}
-
-void asCCompiler::CompileExpressionStatement(asCScriptNode *enode, asCByteCode *bc)
-{
-	if( enode->firstChild )
-	{
-		// Compile the expression
-		asCExprContext expr(engine);
-		CompileAssignment(enode->firstChild, &expr);
-
-		// Must not have unused ambiguous names
-		if( expr.IsClassMethod() || expr.IsGlobalFunc() )
-			Error(TXT_INVALID_EXPRESSION_AMBIGUOUS_NAME, enode);
-
-		// Must not have unused anonymous functions
-		if( expr.IsLambda() )
-			Error(TXT_INVALID_EXPRESSION_LAMBDA, enode);
-
-		// If we get here and there is still an unprocessed property
-		// accessor, then process it as a get access. Don't call if there is
-		// already a compile error, or we might report an error that is not valid
-		if( !hasCompileErrors )
-			ProcessPropertyGetAccessor(&expr, enode);
-
-		// Pop the value from the stack
-		if( !expr.type.dataType.IsPrimitive() )
-			expr.bc.Instr(asBC_PopPtr);
-
-		// Release temporary variables used by expression
-		ReleaseTemporaryVariable(expr.type, &expr.bc);
-
-		ProcessDeferredParams(&expr);
-
-		expr.bc.OptimizeLocally(tempVariableOffsets);
-		bc->AddCode(&expr.bc);
-	}
-}
-
-void asCCompiler::PrepareTemporaryVariable(asCScriptNode *node, asCExprContext *ctx, bool forceOnHeap)
-{
-	// The input can be either an object or funcdef, either as handle or reference
-	asASSERT(ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef());
-
-	// If the object already is stored in temporary variable then nothing needs to be done
-	// Note, a type can be temporary without being a variable, in which case it is holding off
-	// on releasing a previously used object.
-	if( ctx->type.isTemporary && ctx->type.isVariable &&
-		!(forceOnHeap && !IsVariableOnHeap(ctx->type.stackOffset)) )
-	{
-		// If the temporary object is currently not a reference
-		// the expression needs to be reevaluated to a reference
-		if( !ctx->type.dataType.IsReference() )
-		{
-			ctx->bc.Instr(asBC_PopPtr);
-			ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-			ctx->type.dataType.MakeReference(true);
-		}
-
-		return;
-	}
-
-	// Allocate temporary variable
-	asCDataType dt = ctx->type.dataType;
-	dt.MakeReference(false);
-	dt.MakeReadOnly(false);
-
-	int offset = AllocateVariable(dt, true, forceOnHeap);
-
-	// Objects stored on the stack are not considered references
-	dt.MakeReference(IsVariableOnHeap(offset));
-
-	asCExprValue lvalue;
-	lvalue.Set(dt);
-	lvalue.isExplicitHandle = ctx->type.isExplicitHandle;
-	bool isExplicitHandle = ctx->type.isExplicitHandle;
-
-	CompileInitAsCopy(dt, offset, &ctx->bc, ctx, node, false);
-
-	// Push the reference to the temporary variable on the stack
-	ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-
-	ctx->type.Set(dt);
-	ctx->type.isTemporary = true;
-	ctx->type.stackOffset = (short)offset;
-	ctx->type.isVariable = true;
-	ctx->type.isExplicitHandle = isExplicitHandle;
-	ctx->type.dataType.MakeReference(IsVariableOnHeap(offset));
-}
-
-void asCCompiler::CompileReturnStatement(asCScriptNode *rnode, asCByteCode *bc)
-{
-	// Get return type and location
-	sVariable *v = variables->GetVariable("return");
-
-	// Basic validations
-	if( v->type.GetSizeOnStackDWords() > 0 && !rnode->firstChild )
-	{
-		Error(TXT_MUST_RETURN_VALUE, rnode);
-		return;
-	}
-	else if( v->type.GetSizeOnStackDWords() == 0 && rnode->firstChild )
-	{
-		Error(TXT_CANT_RETURN_VALUE, rnode);
-		return;
-	}
-
-	// Compile the expression
-	if( rnode->firstChild )
-	{
-		// Compile the expression
-		asCExprContext expr(engine);
-		int r = CompileAssignment(rnode->firstChild, &expr);
-		if( r < 0 ) return;
-
-		if( v->type.IsReference() )
-		{
-			// The expression that gives the reference must not use any of the
-			// variables that must be destroyed upon exit, because then it means
-			// reference will stay alive while the clean-up is done, which could
-			// potentially mean that the reference is invalidated by the clean-up.
-			//
-			// When the function is returning a reference, the clean-up of the
-			// variables must be done before the evaluation of the expression.
-			//
-			// A reference to a global variable, or a class member for class methods
-			// should be allowed to be returned.
-
-			if( !(expr.type.dataType.IsReference() ||
-				  (expr.type.dataType.IsObject() && !expr.type.dataType.IsObjectHandle())) )
-			{
-				// Clean up the potential deferred parameters
-				ProcessDeferredParams(&expr);
-				Error(TXT_NOT_VALID_REFERENCE, rnode);
-				return;
-			}
-
-			// No references to local variables, temporary variables, or parameters
-			// are allowed to be returned, since they go out of scope when the function
-			// returns. Even reference parameters are disallowed, since it is not possible
-			// to know the scope of them. The exception is the 'this' pointer, which
-			// is treated by the compiler as a local variable, but isn't really so.
-			if( (expr.type.isVariable && !(expr.type.stackOffset == 0 && outFunc->objectType)) || expr.type.isTemporary )
-			{
-				// Clean up the potential deferred parameters
-				ProcessDeferredParams(&expr);
-				Error(TXT_CANNOT_RETURN_REF_TO_LOCAL, rnode);
-				return;
-			}
-
-			// The type must match exactly as we cannot convert
-			// the reference without loosing the original value
-			if( !(v->type.IsEqualExceptConst(expr.type.dataType) ||
-				  ((expr.type.dataType.IsObject() || expr.type.dataType.IsFuncdef()) &&
-				   !expr.type.dataType.IsObjectHandle() &&
-				   v->type.IsEqualExceptRefAndConst(expr.type.dataType))) ||
-				(!v->type.IsReadOnly() && expr.type.dataType.IsReadOnly()) )
-			{
-				// Clean up the potential deferred parameters
-				ProcessDeferredParams(&expr);
-				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
-				Error(str, rnode);
-				return;
-			}
-
-			// The expression must not have any deferred expressions, because the evaluation
-			// of these cannot be done without keeping the reference which is not safe
-			if( expr.deferredParams.GetLength() )
-			{
-				// Clean up the potential deferred parameters
-				ProcessDeferredParams(&expr);
-				Error(TXT_REF_CANT_BE_RETURNED_DEFERRED_PARAM, rnode);
-				return;
-			}
-
-			// Make sure the expression isn't using any local variables that
-			// will need to be cleaned up before the function completes
-			asCArray<int> usedVars;
-			expr.bc.GetVarsUsed(usedVars);
-			for( asUINT n = 0; n < usedVars.GetLength(); n++ )
-			{
-				int var = GetVariableSlot(usedVars[n]);
-				if( var != -1 )
-				{
-					asCDataType dt = variableAllocations[var];
-					if( dt.IsObject() )
-					{
-						ProcessDeferredParams(&expr);
-						Error(TXT_REF_CANT_BE_RETURNED_LOCAL_VARS, rnode);
-						return;
-					}
-				}
-			}
-
-			// Can't return the reference if could point to a local variable
-			if( expr.type.isRefToLocal )
-			{
-				ProcessDeferredParams(&expr);
-				Error(TXT_REF_CANT_BE_TO_LOCAL_VAR, rnode);
-				return;
-			}
-
-			// All objects in the function must be cleaned up before the expression
-			// is evaluated, otherwise there is a possibility that the cleanup will
-			// invalidate the reference.
-
-			// Destroy the local variables before loading
-			// the reference into the register. This will
-			// be done before the expression is evaluated.
-			DestroyVariables(bc);
-
-
-			// For primitives the reference is already in the register,
-			// but for non-primitives the reference is on the stack so we
-			// need to load it into the register
-			if( !expr.type.dataType.IsPrimitive() )
-			{
-				if( !expr.type.dataType.IsObjectHandle() &&
-					expr.type.dataType.IsReference() )
-					expr.bc.Instr(asBC_RDSPtr);
-
-				expr.bc.Instr(asBC_PopRPtr);
-			}
-
-			// There are no temporaries to release so we're done
-		}
-		else // if( !v->type.IsReference() )
-		{
-			ProcessPropertyGetAccessor(&expr, rnode);
-
-			// Prepare the value for assignment
-			IsVariableInitialized(&expr.type, rnode->firstChild);
-
-			if( v->type.IsPrimitive() )
-			{
-				if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
-
-				// Implicitly convert the value to the return type
-				ImplicitConversion(&expr, v->type, rnode->firstChild, asIC_IMPLICIT_CONV);
-
-				// Verify that the conversion was successful
-				if( expr.type.dataType != v->type )
-				{
-					asCString str;
-					str.Format(TXT_NO_CONVERSION_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
-					Error(str, rnode);
-					return;
-				}
-				else
-				{
-					ConvertToVariable(&expr);
-
-					// Clean up the local variables and process deferred parameters
-					DestroyVariables(&expr.bc);
-					ProcessDeferredParams(&expr);
-
-					ReleaseTemporaryVariable(expr.type, &expr.bc);
-
-					// Load the variable in the register
-					if( v->type.GetSizeOnStackDWords() == 1 )
-						expr.bc.InstrSHORT(asBC_CpyVtoR4, expr.type.stackOffset);
-					else
-						expr.bc.InstrSHORT(asBC_CpyVtoR8, expr.type.stackOffset);
-				}
-			}
-			else if( v->type.IsObject() || v->type.IsFuncdef() )
-			{
-				// Value types are returned on the stack, in a location
-				// that has been reserved by the calling function.
-				if( outFunc->DoesReturnOnStack() )
-				{
-					// TODO: runtime optimize: If the return type has a constructor that takes the type of the expression,
-					//                         it should be called directly instead of first converting the expression and
-					//                         then copy the value.
-					if( !v->type.IsEqualExceptRefAndConst(expr.type.dataType) )
-					{
-						ImplicitConversion(&expr, v->type, rnode->firstChild, asIC_IMPLICIT_CONV);
-						if( !v->type.IsEqualExceptRefAndConst(expr.type.dataType) )
-						{
-							asCString str;
-							str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
-							Error(str, rnode->firstChild);
-							return;
-						}
-					}
-
-					int offset = outFunc->objectType ? -AS_PTR_SIZE : 0;
-					CompileInitAsCopy(v->type, offset, &expr.bc, &expr, rnode->firstChild, true);
-
-					// Clean up the local variables and process deferred parameters
-					DestroyVariables(&expr.bc);
-					ProcessDeferredParams(&expr);
-				}
-				else
-				{
-					asASSERT( (v->type.GetTypeInfo()->flags & asOBJ_REF) || v->type.IsFuncdef() );
-
-					// Prepare the expression to be loaded into the object
-					// register. This will place the reference in local variable
-					PrepareArgument(&v->type, &expr, rnode->firstChild, false, 0);
-
-					// Pop the reference to the temporary variable
-					expr.bc.Instr(asBC_PopPtr);
-
-					// Clean up the local variables and process deferred parameters
-					DestroyVariables(&expr.bc);
-					ProcessDeferredParams(&expr);
-
-					// Load the object pointer into the object register
-					// LOADOBJ also clears the address in the variable
-					expr.bc.InstrSHORT(asBC_LOADOBJ, expr.type.stackOffset);
-
-					// LOADOBJ cleared the address in the variable so the object will not be freed
-					// here, but the temporary variable must still be freed so the slot can be reused
-					// By releasing without the bytecode we do just that.
-					ReleaseTemporaryVariable(expr.type, 0);
-				}
-			}
-		}
-
-		expr.bc.OptimizeLocally(tempVariableOffsets);
-		bc->AddCode(&expr.bc);
-	}
-	else
-	{
-		// For functions that don't return anything
-		// we just detroy the local variables
-		DestroyVariables(bc);
-	}
-
-	// Jump to the end of the function
-	bc->InstrINT(asBC_JMP, 0);
-}
-
-void asCCompiler::DestroyVariables(asCByteCode *bc)
-{
-	// Call destructor on all variables except for the function parameters
-	// Put the clean-up in a block to allow exception handler to understand this
-	bc->Block(true);
-	asCVariableScope *vs = variables;
-	while( vs )
-	{
-		for( int n = (int)vs->variables.GetLength() - 1; n >= 0; n-- )
-			if( vs->variables[n]->stackOffset > 0 )
-				CallDestructor(vs->variables[n]->type, vs->variables[n]->stackOffset, vs->variables[n]->onHeap, bc);
-
-		vs = vs->parent;
-	}
-	bc->Block(false);
-}
-
-void asCCompiler::AddVariableScope(bool isBreakScope, bool isContinueScope)
-{
-	variables = asNEW(asCVariableScope)(variables);
-	if( variables == 0 )
-	{
-		// Out of memory
-		return;
-	}
-	variables->isBreakScope    = isBreakScope;
-	variables->isContinueScope = isContinueScope;
-}
-
-void asCCompiler::RemoveVariableScope()
-{
-	if( variables )
-	{
-		asCVariableScope *var = variables;
-		variables = variables->parent;
-		asDELETE(var,asCVariableScope);
-	}
-}
-
-void asCCompiler::Error(const asCString &msg, asCScriptNode *node)
-{
-	asCString str;
-
-	int r = 0, c = 0;
-	asASSERT( node );
-	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-	builder->WriteError(script->name, msg, r, c);
-
-	hasCompileErrors = true;
-}
-
-void asCCompiler::Warning(const asCString &msg, asCScriptNode *node)
-{
-	asCString str;
-
-	int r = 0, c = 0;
-	asASSERT( node );
-	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-	builder->WriteWarning(script->name, msg, r, c);
-}
-
-void asCCompiler::Information(const asCString &msg, asCScriptNode *node)
-{
-	asCString str;
-
-	int r = 0, c = 0;
-	asASSERT( node );
-	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-	builder->WriteInfo(script->name, msg, r, c, false);
-}
-
-void asCCompiler::PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node, asCObjectType *inType)
-{
-	int r = 0, c = 0;
-	asASSERT( node );
-	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
-
-	for( unsigned int n = 0; n < funcs.GetLength(); n++ )
-	{
-		asCScriptFunction *func = builder->GetFunctionDescription(funcs[n]);
-		if( inType && func->funcType == asFUNC_VIRTUAL )
-			func = inType->virtualFunctionTable[func->vfTableIdx];
-
-		builder->WriteInfo(script->name, func->GetDeclaration(true, false, true), r, c, false);
-	}
-}
-
-int asCCompiler::AllocateVariableNotIn(const asCDataType &type, bool isTemporary, bool forceOnHeap, asCExprContext *ctx)
-{
-	int l = int(reservedVariables.GetLength());
-	ctx->bc.GetVarsUsed(reservedVariables);
-	int var = AllocateVariable(type, isTemporary, forceOnHeap);
-	reservedVariables.SetLength(l);
-	return var;
-}
-
-int asCCompiler::AllocateVariable(const asCDataType &type, bool isTemporary, bool forceOnHeap)
-{
-	asCDataType t(type);
-	t.MakeReference(false);
-
-	if( t.IsPrimitive() && t.GetSizeOnStackDWords() == 1 )
-		t.SetTokenType(ttInt);
-
-	if( t.IsPrimitive() && t.GetSizeOnStackDWords() == 2 )
-		t.SetTokenType(ttDouble);
-
-	// Only null handles have the token type unrecognized token
-	asASSERT( t.IsObjectHandle() || t.GetTokenType() != ttUnrecognizedToken );
-
-	bool isOnHeap = true;
-	if( t.IsPrimitive() ||
-		(t.GetTypeInfo() && (t.GetTypeInfo()->GetFlags() & asOBJ_VALUE) && !forceOnHeap) )
-	{
-		// Primitives and value types (unless overridden) are allocated on the stack
-		isOnHeap = false;
-	}
-
-	// Find a free location with the same type
-	for( asUINT n = 0; n < freeVariables.GetLength(); n++ )
-	{
-		int slot = freeVariables[n];
-
-		if( variableAllocations[slot].IsEqualExceptConst(t) &&
-			variableIsTemporary[slot] == isTemporary &&
-			variableIsOnHeap[slot] == isOnHeap )
-		{
-			// We can't return by slot, must count variable sizes
-			int offset = GetVariableOffset(slot);
-
-			// Verify that it is not in the list of reserved variables
-			bool isUsed = false;
-			if( reservedVariables.GetLength() )
-				isUsed = reservedVariables.Exists(offset);
-
-			if( !isUsed )
-			{
-				if( n != freeVariables.GetLength() - 1 )
-					freeVariables[n] = freeVariables.PopLast();
-				else
-					freeVariables.PopLast();
-
-				if( isTemporary )
-					tempVariables.PushLast(offset);
-
-				return offset;
-			}
-		}
-	}
-
-	variableAllocations.PushLast(t);
-	variableIsTemporary.PushLast(isTemporary);
-	variableIsOnHeap.PushLast(isOnHeap);
-
-	int offset = GetVariableOffset((int)variableAllocations.GetLength()-1);
-
-	if( isTemporary )
-	{
-		// Add offset to the currently allocated temporary variables
-		tempVariables.PushLast(offset);
-
-		// Add offset to all known offsets to temporary variables, whether allocated or not
-		tempVariableOffsets.PushLast(offset);
-	}
-
-	return offset;
-}
-
-int asCCompiler::GetVariableOffset(int varIndex)
-{
-	// Return offset to the last dword on the stack
-
-	// Start at 1 as offset 0 is reserved for the this pointer (or first argument for global functions)
-	int varOffset = 1;
-
-	// Skip lower variables
-	for( int n = 0; n < varIndex; n++ )
-	{
-		if( !variableIsOnHeap[n] && variableAllocations[n].IsObject() )
-			varOffset += variableAllocations[n].GetSizeInMemoryDWords();
-		else
-			varOffset += variableAllocations[n].GetSizeOnStackDWords();
-	}
-
-	if( varIndex < (int)variableAllocations.GetLength() )
-	{
-		// For variables larger than 1 dword the returned offset should be to the last dword
-		int size;
-		if( !variableIsOnHeap[varIndex] && variableAllocations[varIndex].IsObject() )
-			size = variableAllocations[varIndex].GetSizeInMemoryDWords();
-		else
-			size = variableAllocations[varIndex].GetSizeOnStackDWords();
-		if( size > 1 )
-			varOffset += size-1;
-	}
-
-	return varOffset;
-}
-
-
-int asCCompiler::GetVariableSlot(int offset)
-{
-	int varOffset = 1;
-	for( asUINT n = 0; n < variableAllocations.GetLength(); n++ )
-	{
-		if( !variableIsOnHeap[n] && variableAllocations[n].IsObject() )
-			varOffset += -1 + variableAllocations[n].GetSizeInMemoryDWords();
-		else
-			varOffset += -1 + variableAllocations[n].GetSizeOnStackDWords();
-
-		if( varOffset == offset )
-			return n;
-
-		varOffset++;
-	}
-
-	return -1;
-}
-
-bool asCCompiler::IsVariableOnHeap(int offset)
-{
-	int varSlot = GetVariableSlot(offset);
-	if( varSlot < 0 )
-	{
-		// This happens for function arguments that are considered as on the heap
-		return true;
-	}
-
-	return variableIsOnHeap[varSlot];
-}
-
-void asCCompiler::DeallocateVariable(int offset)
-{
-	// Remove temporary variable
-	int n;
-	for( n = 0; n < (int)tempVariables.GetLength(); n++ )
-	{
-		if( offset == tempVariables[n] )
-		{
-			if( n == (int)tempVariables.GetLength()-1 )
-				tempVariables.PopLast();
-			else
-				tempVariables[n] = tempVariables.PopLast();
-			break;
-		}
-	}
-
-	// Mark the variable slot available for new allocations
-	n = GetVariableSlot(offset);
-	if( n != -1 )
-	{
-		freeVariables.PushLast(n);
-		return;
-	}
-
-	// We might get here if the variable was implicitly declared
-	// because it was used before a formal declaration, in this case
-	// the offset is 0x7FFF
-
-	asASSERT(offset == 0x7FFF);
-}
-
-void asCCompiler::ReleaseTemporaryVariable(asCExprValue &t, asCByteCode *bc)
-{
-	if( t.isTemporary )
-	{
-		ReleaseTemporaryVariable(t.stackOffset, bc);
-		t.isTemporary = false;
-	}
-}
-
-void asCCompiler::ReleaseTemporaryVariable(int offset, asCByteCode *bc)
-{
-	asASSERT( tempVariables.Exists(offset) );
-
-	if( bc )
-	{
-		// We need to call the destructor on the true variable type
-		int n = GetVariableSlot(offset);
-		asASSERT( n >= 0 );
-		if( n >= 0 )
-		{
-			asCDataType dt = variableAllocations[n];
-			bool isOnHeap = variableIsOnHeap[n];
-
-			// Call destructor
-			CallDestructor(dt, offset, isOnHeap, bc);
-		}
-	}
-
-	DeallocateVariable(offset);
-}
-
-void asCCompiler::Dereference(asCExprContext *ctx, bool generateCode)
-{
-	if( ctx->type.dataType.IsReference() )
-	{
-		if( ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef() )
-		{
-			ctx->type.dataType.MakeReference(false);
-			if( generateCode )
-				ctx->bc.Instr(asBC_RDSPtr);
-		}
-		else
-		{
-			// This should never happen as primitives are treated differently
-			asASSERT(false);
-		}
-	}
-}
-
-bool asCCompiler::IsVariableInitialized(asCExprValue *type, asCScriptNode *node)
-{
-	// No need to check if there is no variable scope
-	if( variables == 0 ) return true;
-
-	// Temporary variables are assumed to be initialized
-	if( type->isTemporary ) return true;
-
-	// Verify that it is a variable
-	if( !type->isVariable ) return true;
-
-	// Find the variable
-	sVariable *v = variables->GetVariableByOffset(type->stackOffset);
-
-	// The variable isn't found if it is a constant, in which case it is guaranteed to be initialized
-	if( v == 0 ) return true;
-
-	if( v->isInitialized ) return true;
-
-	// Complex types don't need this test
-	if( v->type.IsObject() || v->type.IsFuncdef() ) return true;
-
-	// Mark as initialized so that the user will not be bothered again
-	v->isInitialized = true;
-
-	// Write warning
-	asCString str;
-	str.Format(TXT_s_NOT_INITIALIZED, (const char *)v->name.AddressOf());
-	Warning(str, node);
-
-	return false;
-}
-
-void asCCompiler::PrepareOperand(asCExprContext *ctx, asCScriptNode *node)
-{
-	// Check if the variable is initialized (if it indeed is a variable)
-	IsVariableInitialized(&ctx->type, node);
-
-	asCDataType to = ctx->type.dataType;
-	to.MakeReference(false);
-
-	ImplicitConversion(ctx, to, node, asIC_IMPLICIT_CONV);
-
-	ProcessDeferredParams(ctx);
-}
-
-void asCCompiler::PrepareForAssignment(asCDataType *lvalue, asCExprContext *rctx, asCScriptNode *node, bool toTemporary, asCExprContext *lvalueExpr)
-{
-	// Reserve the temporary variables used in the lvalue expression so they won't end up being used by the rvalue too
-	int l = int(reservedVariables.GetLength());
-	if( lvalueExpr ) lvalueExpr->bc.GetVarsUsed(reservedVariables);
-
-
-	ProcessPropertyGetAccessor(rctx, node);
-
-	// Make sure the rvalue is initialized if it is a variable
-	IsVariableInitialized(&rctx->type, node);
-
-	if( lvalue->IsPrimitive() )
-	{
-		if( rctx->type.dataType.IsPrimitive() )
-		{
-			if( rctx->type.dataType.IsReference() )
-			{
-				// Cannot do implicit conversion of references so we first convert the reference to a variable
-				ConvertToVariableNotIn(rctx, lvalueExpr);
-			}
-		}
-
-		// Implicitly convert the value to the right type
-		ImplicitConversion(rctx, *lvalue, node, asIC_IMPLICIT_CONV);
-
-		// Check data type
-		if( !lvalue->IsEqualExceptRefAndConst(rctx->type.dataType) )
-		{
-			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lvalue->Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-
-			rctx->type.SetDummy();
-		}
-
-		// Make sure the rvalue is a variable
-		if( !rctx->type.isVariable )
-			ConvertToVariableNotIn(rctx, lvalueExpr);
-	}
-	else
-	{
-		asCDataType to = *lvalue;
-		to.MakeReference(false);
-
-		// TODO: ImplicitConversion should know to do this by itself
-		// First convert to a handle which will do a reference cast
-		if( !lvalue->IsObjectHandle() &&
-			(lvalue->GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) )
-			to.MakeHandle(true);
-
-		// Don't allow the implicit conversion to create an object
-		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true, !toTemporary);
-
-		if( !lvalue->IsObjectHandle() &&
-			(lvalue->GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) )
-		{
-			// Then convert to a reference, which will validate the handle
-			to.MakeHandle(false);
-			ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true, !toTemporary);
-		}
-
-		// Check data type
-		if( !lvalue->IsEqualExceptRefAndConst(rctx->type.dataType) )
-		{
-			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lvalue->Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-		}
-		else
-		{
-			// If the assignment will be made with the copy behaviour then the rvalue must not be a reference
-			asASSERT(!lvalue->IsObject() || !rctx->type.dataType.IsReference());
-		}
-	}
-
-	// Unreserve variables
-	reservedVariables.SetLength(l);
-}
-
-bool asCCompiler::IsLValue(asCExprValue &type)
-{
-	if( !type.isLValue ) return false;
-	if( type.dataType.IsReadOnly() ) return false;
-	if( !type.dataType.IsObject() && !type.isVariable && !type.dataType.IsReference() ) return false;
-	return true;
-}
-
-int asCCompiler::PerformAssignment(asCExprValue *lvalue, asCExprValue *rvalue, asCByteCode *bc, asCScriptNode *node)
-{
-	if( lvalue->dataType.IsReadOnly() )
-	{
-		Error(TXT_REF_IS_READ_ONLY, node);
-		return -1;
-	}
-
-	if( lvalue->dataType.IsPrimitive() )
-	{
-		if( lvalue->isVariable )
-		{
-			// Copy the value between the variables directly
-			if( lvalue->dataType.GetSizeInMemoryDWords() == 1 )
-				bc->InstrW_W(asBC_CpyVtoV4, lvalue->stackOffset, rvalue->stackOffset);
-			else
-				bc->InstrW_W(asBC_CpyVtoV8, lvalue->stackOffset, rvalue->stackOffset);
-
-			// Mark variable as initialized
-			sVariable *v = variables->GetVariableByOffset(lvalue->stackOffset);
-			if( v ) v->isInitialized = true;
-		}
-		else if( lvalue->dataType.IsReference() )
-		{
-			// Copy the value of the variable to the reference in the register
-			int s = lvalue->dataType.GetSizeInMemoryBytes();
-			if( s == 1 )
-				bc->InstrSHORT(asBC_WRTV1, rvalue->stackOffset);
-			else if( s == 2 )
-				bc->InstrSHORT(asBC_WRTV2, rvalue->stackOffset);
-			else if( s == 4 )
-				bc->InstrSHORT(asBC_WRTV4, rvalue->stackOffset);
-			else if( s == 8 )
-				bc->InstrSHORT(asBC_WRTV8, rvalue->stackOffset);
-		}
-		else
-		{
-			Error(TXT_NOT_VALID_LVALUE, node);
-			return -1;
-		}
-	}
-	else if( !lvalue->isExplicitHandle )
-	{
-		asCExprContext ctx(engine);
-		ctx.type = *lvalue;
-		Dereference(&ctx, true);
-		*lvalue = ctx.type;
-		bc->AddCode(&ctx.bc);
-
-		asSTypeBehaviour *beh = lvalue->dataType.GetBehaviour();
-		if( beh && beh->copy && beh->copy != engine->scriptTypeBehaviours.beh.copy )
-		{
-			asCExprContext res(engine);
-			PerformFunctionCall(beh->copy, &res, false, 0, lvalue->dataType.GetTypeInfo()->CastToObjectType());
-
-			bc->AddCode(&res.bc);
-			*lvalue = res.type;
-		}
-		else if( beh && beh->copy == engine->scriptTypeBehaviours.beh.copy )
-		{
-			// Call the default copy operator for script classes
-			// This is done differently because the default copy operator
-			// is registered as returning int&, but in reality it returns
-			// a reference to the object.
-			// TODO: Avoid this special case by implementing a copystub for
-			//       script classes that uses the default copy operator
-			bc->Call(asBC_CALLSYS, beh->copy, 2*AS_PTR_SIZE);
-			bc->Instr(asBC_PshRPtr);
-		}
-		else
-		{
-			// Default copy operator
-			if( lvalue->dataType.GetSizeInMemoryDWords() == 0 ||
-				!(lvalue->dataType.GetTypeInfo()->flags & asOBJ_POD) )
-			{
-				asCString msg;
-				msg.Format(TXT_NO_DEFAULT_COPY_OP_FOR_s, lvalue->dataType.GetTypeInfo()->name.AddressOf());
-				Error(msg, node);
-				return -1;
-			}
-
-			// Copy larger data types from a reference
-			// TODO: runtime optimize: COPY should pop both arguments and store the reference in the register.
-			bc->InstrSHORT_DW(asBC_COPY, (short)lvalue->dataType.GetSizeInMemoryDWords(), engine->GetTypeIdFromDataType(lvalue->dataType));
-		}
-	}
-	else
-	{
-		// TODO: The object handle can be stored in a variable as well
-		if( !lvalue->dataType.IsReference() )
-		{
-			Error(TXT_NOT_VALID_REFERENCE, node);
-			return -1;
-		}
-
-		if( lvalue->dataType.IsFuncdef() )
-			bc->InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-		else
-			bc->InstrPTR(asBC_REFCPY, lvalue->dataType.GetTypeInfo());
-
-		// Mark variable as initialized
-		if( variables )
-		{
-			sVariable *v = variables->GetVariableByOffset(lvalue->stackOffset);
-			if( v ) v->isInitialized = true;
-		}
-	}
-
-	return 0;
-}
-
-bool asCCompiler::CompileRefCast(asCExprContext *ctx, const asCDataType &to, bool isExplicit, asCScriptNode *node, bool generateCode)
-{
-	bool conversionDone = false;
-
-	asCArray<int> ops;
-	asUINT n;
-
-	// A ref cast must not remove the constness
-	bool isConst = ctx->type.dataType.IsObjectConst();
-
-	// Find a suitable opCast or opImplCast method
-	asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-	for( n = 0; ot && n < ot->methods.GetLength(); n++ )
-	{
-		asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-		if( (isExplicit && func->name == "opCast") ||
-			func->name == "opImplCast" )
-		{
-			// Is the operator for the output type?
-			if( func->returnType.GetTypeInfo() != to.GetTypeInfo() )
-				continue;
-
-			// Can't call a non-const function on a const object
-			if( isConst && !func->IsReadOnly() )
-				continue;
-
-			ops.PushLast(func->id);
-		}
-	}
-
-	// Filter the list by constness to remove const methods if there are matching non-const methods
-	FilterConst(ops, !isConst);
-
-	// It shouldn't be possible to have more than one
-	// TODO: Should be allowed to have different behaviours for const and non-const references
-	asASSERT( ops.GetLength() <= 1 );
-
-	// Should only have one behaviour for each output type
-	if( ops.GetLength() == 1 )
-	{
-		conversionDone = true;
-		if( generateCode )
-		{
-			// TODO: runtime optimize: Instead of producing bytecode for checking if the handle is
-			//                         null, we can create a special CALLSYS instruction that checks
-			//                         if the object pointer is null and if so sets the object register
-			//                         to null directly without executing the function.
-			//
-			//                         Alternatively I could force the ref cast behaviours be global
-			//                         functions with 1 parameter, even though they should still be
-			//                         registered with RegisterObjectBehaviour()
-
-			if( (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_NOHANDLE))
-			{
-				// Add code to avoid calling the cast behaviour if the handle is already null,
-				// because that will raise a null pointer exception due to the cast behaviour
-				// being a class method, and the this pointer cannot be null.
-
-				if (!ctx->type.isVariable)
-				{
-					Dereference(ctx, true);
-					ConvertToVariable(ctx);
-				}
-
-				// The reference on the stack will not be used
-				ctx->bc.Instr(asBC_PopPtr);
-
-				// TODO: runtime optimize: should have immediate comparison for null pointer
-				int offset = AllocateVariable(asCDataType::CreateNullHandle(), true);
-				// TODO: runtime optimize: ClrVPtr is not necessary, because the VM should initialize the variable to null anyway (it is currently not done for null pointers though)
-				ctx->bc.InstrSHORT(asBC_ClrVPtr, (asWORD)offset);
-				ctx->bc.InstrW_W(asBC_CmpPtr, ctx->type.stackOffset, offset);
-				DeallocateVariable(offset);
-
-				int afterLabel = nextLabel++;
-				ctx->bc.InstrDWORD(asBC_JZ, afterLabel);
-
-				// Call the cast operator
-				ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-				ctx->bc.Instr(asBC_RDSPtr);
-				ctx->type.dataType.MakeReference(false);
-
-				asCArray<asCExprContext *> args;
-				MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-				ctx->bc.Instr(asBC_PopPtr);
-
-				int endLabel = nextLabel++;
-
-				ctx->bc.InstrINT(asBC_JMP, endLabel);
-				ctx->bc.Label((short)afterLabel);
-
-				// Make a NULL pointer
-				ctx->bc.InstrSHORT(asBC_ClrVPtr, ctx->type.stackOffset);
-				ctx->bc.Label((short)endLabel);
-
-				// Push the reference to the handle on the stack
-				ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-			}
-			else
-			{
-				// Value types cannot be null, so there is no need to check for this.
-
-				// Likewise for reference types that are registered with asOBJ_NOHANDLE
-				// as those are only expected as registered global properties that cannot
-				// be modified anyway.
-
-				// Call the cast operator
-				asCArray<asCExprContext *> args;
-				MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-			}
-		}
-		else
-		{
-			asCScriptFunction *func = engine->scriptFunctions[ops[0]];
-			ctx->type.Set(func->returnType);
-		}
-	}
-	else if( ops.GetLength() == 0 && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) )
-	{
-		// Check for the generic ref cast method: void opCast(?&out)
-		for( n = 0; ot && n < ot->methods.GetLength(); n++ )
-		{
-			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-			if( (isExplicit && func->name == "opCast") ||
-				func->name == "opImplCast" )
-			{
-				// Does the operator take the ?&out parameter?
-				if( func->returnType.GetTokenType() != ttVoid ||
-					func->parameterTypes.GetLength() != 1 ||
-					func->parameterTypes[0].GetTokenType() != ttQuestion ||
-					func->inOutFlags[0] != asTM_OUTREF )
-					continue;
-
-				ops.PushLast(func->id);
-			}
-		}
-
-		// It shouldn't be possible to have more than one
-		// TODO: Should be allowed to have different implementations for const and non-const references
-		asASSERT( ops.GetLength() <= 1 );
-
-		if( ops.GetLength() == 1 )
-		{
-			conversionDone = true;
-			if( generateCode )
-			{
-				asASSERT(to.IsObjectHandle());
-
-				// Allocate a temporary variable of the requested handle type
-				int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
-
-				// Pass the reference of that variable to the function as output parameter
-				asCDataType toRef(to);
-				toRef.MakeReference(true);
-				asCArray<asCExprContext *> args;
-				asCExprContext arg(engine);
-				arg.bc.InstrSHORT(asBC_PSF, (short)stackOffset);
-				// Don't mark the variable as temporary, so it won't be freed too early
-				arg.type.SetVariable(toRef, stackOffset, false);
-				arg.type.isLValue = true;
-				arg.type.isExplicitHandle = true;
-				args.PushLast(&arg);
-
-				// Call the behaviour method
-				MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-
-				// Use the reference to the variable as the result of the expression
-				// Now we can mark the variable as temporary
-				ctx->type.SetVariable(toRef, stackOffset, true);
-				ctx->bc.InstrSHORT(asBC_PSF, (short)stackOffset);
-			}
-			else
-			{
-				// All casts are legal
-				ctx->type.Set(to);
-			}
-		}
-	}
-
-	// If the script object didn't implement a matching opCast or opImplCast 
-	// then check if the desired type is part of the hierarchy
-	if( !conversionDone && (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) )
-	{
-		// We need it to be a reference
-		if( !ctx->type.dataType.IsReference() )
-		{
-			asCDataType toRef = ctx->type.dataType;
-			toRef.MakeReference(true);
-			ImplicitConversion(ctx, toRef, 0, isExplicit ? asIC_EXPLICIT_REF_CAST : asIC_IMPLICIT_CONV, generateCode);
-		}
-
-		if( isExplicit )
-		{
-			// Allow dynamic cast between object handles (only for script objects).
-			// At run time this may result in a null handle,
-			// which when used will throw an exception
-			conversionDone = true;
-			if( generateCode )
-			{
-				ctx->bc.InstrDWORD(asBC_Cast, engine->GetTypeIdFromDataType(to));
-
-				// Allocate a temporary variable for the returned object
-				int returnOffset = AllocateVariable(to, true);
-
-				// Move the pointer from the object register to the temporary variable
-				ctx->bc.InstrSHORT(asBC_STOREOBJ, (short)returnOffset);
-
-				ctx->bc.InstrSHORT(asBC_PSF, (short)returnOffset);
-
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-				ctx->type.SetVariable(to, returnOffset, true);
-				ctx->type.dataType.MakeReference(true);
-			}
-			else
-			{
-				ctx->type.dataType = to;
-				ctx->type.dataType.MakeReference(true);
-			}
-		}
-		else
-		{
-			if( ctx->type.dataType.GetTypeInfo()->CastToObjectType()->DerivesFrom(to.GetTypeInfo()->CastToObjectType()) )
-			{
-				conversionDone = true;
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-			}
-		}
-
-		// A ref cast must not remove the constness
-		if( isConst )
-			ctx->type.dataType.MakeHandleToConst(true);
-	}
-
-	return conversionDone;
-}
-
-asUINT asCCompiler::ImplicitConvPrimitiveToPrimitive(asCExprContext *ctx, const asCDataType &toOrig, asCScriptNode *node, EImplicitConv convType, bool generateCode)
-{
-	asCDataType to = toOrig;
-	to.MakeReference(false);
-	asASSERT( !ctx->type.dataType.IsReference() );
-
-	// Maybe no conversion is needed
-	if( to.IsEqualExceptConst(ctx->type.dataType) )
-	{
-		// A primitive is const or not
-		ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
-		return asCC_NO_CONV;
-	}
-
-	// Is the conversion an ambiguous enum value?
-	if( ctx->enumValue != "" )
-	{
-		if( to.IsEnumType() )
-		{
-			// Attempt to resolve an ambiguous enum value
-			asCDataType out;
-			asDWORD value;
-			if( builder->GetEnumValueFromType(to.GetTypeInfo()->CastToEnumType(), ctx->enumValue.AddressOf(), out, value) )
-			{
-				ctx->type.SetConstantDW(out, value);
-				ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
-
-				// Reset the enum value since we no longer need it
-				ctx->enumValue = "";
-
-				// It wasn't really a conversion. The compiler just resolved the ambiguity (or not)
-				return asCC_NO_CONV;
-			}
-		}
-
-		// The enum value is ambiguous
-		if( node && generateCode )
-			Error(TXT_FOUND_MULTIPLE_ENUM_VALUES, node);
-
-		// Set a dummy to allow the compiler to try to continue the conversion
-		ctx->type.SetDummy();
-	}
-
-	// Determine the cost of this conversion
-	asUINT cost = asCC_NO_CONV;
-	if( (to.IsIntegerType() || to.IsUnsignedType()) && (ctx->type.dataType.IsFloatType() || ctx->type.dataType.IsDoubleType()) )
-		cost = asCC_INT_FLOAT_CONV;
-	else if ((to.IsFloatType() || to.IsDoubleType()) && (ctx->type.dataType.IsIntegerType() || ctx->type.dataType.IsUnsignedType()))
-		cost = asCC_INT_FLOAT_CONV;
-	else if (ctx->type.dataType.IsEnumType() && to.IsIntegerType() && to.GetSizeInMemoryBytes() == ctx->type.dataType.GetSizeInMemoryBytes() )
-		cost = asCC_ENUM_SAME_SIZE_CONV;
-	else if (ctx->type.dataType.IsEnumType() && to.IsIntegerType() && to.GetSizeInMemoryBytes() != ctx->type.dataType.GetSizeInMemoryBytes())
-		cost = asCC_ENUM_DIFF_SIZE_CONV;
-	else if( to.IsUnsignedType() && ctx->type.dataType.IsIntegerType() )
-		cost = asCC_SIGNED_CONV;
-	else if( to.IsIntegerType() && ctx->type.dataType.IsUnsignedType() )
-		cost = asCC_SIGNED_CONV;
-	else if( to.GetSizeInMemoryBytes() != ctx->type.dataType.GetSizeInMemoryBytes() )
-		cost = asCC_PRIMITIVE_SIZE_CONV;
-
-	// Start by implicitly converting constant values
-	if( ctx->type.isConstant )
-	{
-		ImplicitConversionConstant(ctx, to, node, convType);
-		ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
-		return cost;
-	}
-
-	// Allow implicit conversion between numbers
-	if( generateCode )
-	{
-		// When generating the code the decision has already been made, so we don't bother determining the cost
-
-		// Convert smaller types to 32bit first
-		int s = ctx->type.dataType.GetSizeInMemoryBytes();
-		if( s < 4 )
-		{
-			ConvertToTempVariable(ctx);
-			if( ctx->type.dataType.IsIntegerType() )
-			{
-				if( s == 1 )
-					ctx->bc.InstrSHORT(asBC_sbTOi, ctx->type.stackOffset);
-				else if( s == 2 )
-					ctx->bc.InstrSHORT(asBC_swTOi, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(ttInt);
-			}
-			else if( ctx->type.dataType.IsUnsignedType() )
-			{
-				if( s == 1 )
-					ctx->bc.InstrSHORT(asBC_ubTOi, ctx->type.stackOffset);
-				else if( s == 2 )
-					ctx->bc.InstrSHORT(asBC_uwTOi, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(ttUInt);
-			}
-		}
-
-		if( (to.IsIntegerType() && to.GetSizeInMemoryDWords() == 1 && !to.IsEnumType()) ||
-			(to.IsEnumType() && convType == asIC_EXPLICIT_VAL_CAST) )
-		{
-			if( ctx->type.dataType.IsIntegerType() ||
-				ctx->type.dataType.IsUnsignedType() )
-			{
-				if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-				{
-					ctx->type.dataType.SetTokenType(to.GetTokenType());
-					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-				}
-				else
-				{
-					ConvertToTempVariable(ctx);
-					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-					int offset = AllocateVariable(to, true);
-					ctx->bc.InstrW_W(asBC_i64TOi, offset, ctx->type.stackOffset);
-					ctx->type.SetVariable(to, offset, true);
-				}
-			}
-			else if( ctx->type.dataType.IsFloatType() )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_fTOi, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-			else if( ctx->type.dataType.IsDoubleType() )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_dTOi, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-
-			// Convert to smaller integer if necessary
-			s = to.GetSizeInMemoryBytes();
-			if( s < 4 )
-			{
-				ConvertToTempVariable(ctx);
-				if( s == 1 )
-					ctx->bc.InstrSHORT(asBC_iTOb, ctx->type.stackOffset);
-				else if( s == 2 )
-					ctx->bc.InstrSHORT(asBC_iTOw, ctx->type.stackOffset);
-			}
-		}
-		else if( to.IsIntegerType() && to.GetSizeInMemoryDWords() == 2 )
-		{
-			if( ctx->type.dataType.IsIntegerType() ||
-				ctx->type.dataType.IsUnsignedType() )
-			{
-				if( ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-				{
-					ctx->type.dataType.SetTokenType(to.GetTokenType());
-					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-				}
-				else
-				{
-					ConvertToTempVariable(ctx);
-					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-					int offset = AllocateVariable(to, true);
-					if( ctx->type.dataType.IsUnsignedType() )
-						ctx->bc.InstrW_W(asBC_uTOi64, offset, ctx->type.stackOffset);
-					else
-						ctx->bc.InstrW_W(asBC_iTOi64, offset, ctx->type.stackOffset);
-					ctx->type.SetVariable(to, offset, true);
-				}
-			}
-			else if( ctx->type.dataType.IsFloatType() )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_fTOi64, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-			else if( ctx->type.dataType.IsDoubleType() )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_dTOi64, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-		}
-		else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 1  )
-		{
-			if( ctx->type.dataType.IsIntegerType() ||
-				ctx->type.dataType.IsUnsignedType() )
-			{
-				if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-				{
-					ctx->type.dataType.SetTokenType(to.GetTokenType());
-					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-				}
-				else
-				{
-					ConvertToTempVariable(ctx);
-					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-					int offset = AllocateVariable(to, true);
-					ctx->bc.InstrW_W(asBC_i64TOi, offset, ctx->type.stackOffset);
-					ctx->type.SetVariable(to, offset, true);
-				}
-			}
-			else if( ctx->type.dataType.IsFloatType() )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_fTOu, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-			else if( ctx->type.dataType.IsDoubleType() )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_dTOu, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-
-			// Convert to smaller integer if necessary
-			s = to.GetSizeInMemoryBytes();
-			if( s < 4 )
-			{
-				ConvertToTempVariable(ctx);
-				if( s == 1 )
-					ctx->bc.InstrSHORT(asBC_iTOb, ctx->type.stackOffset);
-				else if( s == 2 )
-					ctx->bc.InstrSHORT(asBC_iTOw, ctx->type.stackOffset);
-			}
-		}
-		else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 2 )
-		{
-			if( ctx->type.dataType.IsIntegerType() ||
-				ctx->type.dataType.IsUnsignedType() )
-			{
-				if( ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-				{
-					ctx->type.dataType.SetTokenType(to.GetTokenType());
-					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-				}
-				else
-				{
-					ConvertToTempVariable(ctx);
-					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-					int offset = AllocateVariable(to, true);
-					if( ctx->type.dataType.IsUnsignedType() )
-						ctx->bc.InstrW_W(asBC_uTOi64, offset, ctx->type.stackOffset);
-					else
-						ctx->bc.InstrW_W(asBC_iTOi64, offset, ctx->type.stackOffset);
-					ctx->type.SetVariable(to, offset, true);
-				}
-			}
-			else if( ctx->type.dataType.IsFloatType() )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_fTOu64, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-			else if( ctx->type.dataType.IsDoubleType() )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_dTOu64, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-
-				if( convType != asIC_EXPLICIT_VAL_CAST )
-					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
-			}
-		}
-		else if( to.IsFloatType() )
-		{
-			if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_iTOf, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-			}
-			else if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_i64TOf, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-			}
-			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_uTOf, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-			}
-			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_u64TOf, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-			}
-			else if( ctx->type.dataType.IsDoubleType() )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_dTOf, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-			}
-		}
-		else if( to.IsDoubleType() )
-		{
-			if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_iTOd, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-			}
-			else if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_i64TOd, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-			}
-			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_uTOd, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-			}
-			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				ConvertToTempVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_u64TOd, ctx->type.stackOffset);
-				ctx->type.dataType.SetTokenType(to.GetTokenType());
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-			}
-			else if( ctx->type.dataType.IsFloatType() )
-			{
-				ConvertToTempVariable(ctx);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-				int offset = AllocateVariable(to, true);
-				ctx->bc.InstrW_W(asBC_fTOd, offset, ctx->type.stackOffset);
-				ctx->type.SetVariable(to, offset, true);
-			}
-		}
-	}
-	else
-	{
-		if( ((to.IsIntegerType() && !to.IsEnumType()) || to.IsUnsignedType() ||
-			 to.IsFloatType()   || to.IsDoubleType() ||
-			 (to.IsEnumType() && convType == asIC_EXPLICIT_VAL_CAST)) &&
-			(ctx->type.dataType.IsIntegerType() || ctx->type.dataType.IsUnsignedType() ||
-			 ctx->type.dataType.IsFloatType()   || ctx->type.dataType.IsDoubleType()) )
-		{
-			ctx->type.dataType.SetTokenType(to.GetTokenType());
-			ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-		}
-	}
-
-	// Primitive types on the stack, can be const or non-const
-	ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
-	return cost;
-}
-
-asUINT asCCompiler::ImplicitConvLambdaToFunc(asCExprContext *ctx, const asCDataType &to, asCScriptNode * /*node*/, EImplicitConv /*convType*/, bool generateCode)
-{
-	asASSERT( to.IsFuncdef() && ctx->IsLambda() );
-
-	// Check that the lambda has the correct amount of arguments
-	asUINT count = 0;
-	asCScriptNode *argNode = ctx->exprNode->firstChild;
-	while( argNode->nodeType == snIdentifier )
-	{
-		count++;
-		argNode = argNode->next;
-	}
-	asASSERT( argNode->nodeType == snStatementBlock );
-
-	asCScriptFunction *funcDef = to.GetTypeInfo()->CastToFuncdefType()->funcdef;
-	if( funcDef->parameterTypes.GetLength() != count )
-		return asCC_NO_CONV;
-
-	// The Lambda can be used as this funcdef
-	ctx->type.dataType = to;
-
-	if( generateCode )
-	{
-		// Build a unique name for the anonymous function
-		asCString name;
-		if( m_globalVar )
-			name.Format("$%s$%d", m_globalVar->name.AddressOf(), numLambdas++);
-		else
-			name.Format("$%s$%d", outFunc->GetDeclaration(), numLambdas++);
-
-		// Register the lambda with the builder for later compilation
-		asCScriptFunction *func = builder->RegisterLambda(ctx->exprNode, script, funcDef, name, outFunc->nameSpace);
-		asASSERT( func == 0 || funcDef->IsSignatureExceptNameEqual(func) );
-		ctx->bc.InstrPTR(asBC_FuncPtr, func);
-
-		// Clear the expression node as it is no longer valid
-		ctx->exprNode = 0;
-	}
-
-	return asCC_CONST_CONV;
-}
-
-asUINT asCCompiler::ImplicitConversion(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode, bool allowObjectConstruct)
-{
-	asASSERT( ctx->type.dataType.GetTokenType() != ttUnrecognizedToken ||
-		      ctx->type.dataType.IsNullHandle() );
-
-	if( to.IsFuncdef() && ctx->IsLambda() )
-		return ImplicitConvLambdaToFunc(ctx, to, node, convType, generateCode);
-
-	// No conversion from void to any other type
-	if( ctx->type.dataType.GetTokenType() == ttVoid )
-		return asCC_NO_CONV;
-
-	// No conversion from class method to any type (it requires delegate)
-	if( ctx->IsClassMethod() )
-		return asCC_NO_CONV;
-
-	// Do we want a var type?
-	if( to.GetTokenType() == ttQuestion )
-	{
-		// Any type can be converted to a var type, but only when not generating code
-		asASSERT( !generateCode );
-
-		ctx->type.dataType = to;
-
-		return asCC_VARIABLE_CONV;
-	}
-	// Do we want a primitive?
-	else if( to.IsPrimitive() )
-	{
-		if( !ctx->type.dataType.IsPrimitive() )
-			return ImplicitConvObjectToPrimitive(ctx, to, node, convType, generateCode);
-		else
-			return ImplicitConvPrimitiveToPrimitive(ctx, to, node, convType, generateCode);
-	}
-	else // The target is a complex type
-	{
-		if( ctx->type.dataType.IsPrimitive() )
-			return ImplicitConvPrimitiveToObject(ctx, to, node, convType, generateCode, allowObjectConstruct);
-		else if( ctx->type.IsNullConstant() || ctx->type.dataType.GetTypeInfo() )
-			return ImplicitConvObjectToObject(ctx, to, node, convType, generateCode, allowObjectConstruct);
-	}
-
-	return asCC_NO_CONV;
-}
-
-asUINT asCCompiler::ImplicitConvObjectToPrimitive(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode)
-{
-	if( ctx->type.isExplicitHandle )
-	{
-		// An explicit handle cannot be converted to a primitive
-		if( convType != asIC_IMPLICIT_CONV && node )
-		{
-			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-		}
-		return asCC_NO_CONV;
-	}
-
-	// TODO: Must use the const cast behaviour if the object is read-only
-
-	// Find matching value cast behaviours
-	// Here we're only interested in those that convert the type to a primitive type
-	asCArray<int> funcs;
-	asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-	if( ot == 0 )
-	{
-		if( convType != asIC_IMPLICIT_CONV && node )
-		{
-			asCString str;
-			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-		}
-		return asCC_NO_CONV;
-	}
-
-
-	if( convType == asIC_EXPLICIT_VAL_CAST )
-	{
-		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
-		{
-			// accept both implicit and explicit cast
-			asCScriptFunction *mthd = engine->scriptFunctions[ot->methods[n]];
-			if( (mthd->name == "opConv" || mthd->name == "opImplConv") &&
-				mthd->parameterTypes.GetLength() == 0 &&
-				mthd->returnType.IsPrimitive() )
-				funcs.PushLast(ot->methods[n]);
-		}
-	}
-	else
-	{
-		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
-		{
-			// accept only implicit cast
-			asCScriptFunction *mthd = engine->scriptFunctions[ot->methods[n]];
-			if( mthd->name == "opImplConv" &&
-				mthd->parameterTypes.GetLength() == 0 &&
-				mthd->returnType.IsPrimitive() )
-				funcs.PushLast(ot->methods[n]);
-		}
-	}
-
-	int funcId = 0;
-	if( to.IsMathType() )
-	{
-		// This matrix describes the priorities of the types to search for, for each target type
-		// The first column is the target type, the priorities goes from left to right
-		eTokenType matchMtx[10][10] =
-		{
-			{ttDouble, ttFloat,  ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
-			{ttFloat,  ttDouble, ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
-			{ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
-			{ttUInt64, ttInt64,  ttUInt,   ttInt,    ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
-			{ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
-			{ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
-			{ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt8,   ttUInt8,  ttDouble, ttFloat},
-			{ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
-			{ttInt8,   ttUInt8,  ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttDouble, ttFloat},
-			{ttUInt8,  ttInt8,   ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttDouble, ttFloat},
-		};
-
-		// Which row to use?
-		eTokenType *row = 0;
-		for( unsigned int type = 0; type < 10; type++ )
-		{
-			if( to.GetTokenType() == matchMtx[type][0] )
-			{
-				row = &matchMtx[type][0];
-				break;
-			}
-		}
-
-		// Find the best matching cast operator
-		if( row )
-		{
-			asCDataType target(to);
-
-			// Priority goes from left to right in the matrix
-			for( unsigned int attempt = 0; attempt < 10 && funcId == 0; attempt++ )
-			{
-				target.SetTokenType(row[attempt]);
-				for( unsigned int n = 0; n < funcs.GetLength(); n++ )
-				{
-					asCScriptFunction *descr = builder->GetFunctionDescription(funcs[n]);
-					if( descr->returnType.IsEqualExceptRefAndConst(target) )
-					{
-						funcId = funcs[n];
-						break;
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		// Only accept the exact conversion for non-math types
-
-		// Find the matching cast operator
-		for( unsigned int n = 0; n < funcs.GetLength(); n++ )
-		{
-			asCScriptFunction *descr = builder->GetFunctionDescription(funcs[n]);
-			if( descr->returnType.IsEqualExceptRefAndConst(to) )
-			{
-				funcId = funcs[n];
-				break;
-			}
-		}
-	}
-
-	// Did we find a suitable function?
-	if( funcId != 0 )
-	{
-		asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
-		if( generateCode )
-		{
-			Dereference(ctx, true);
-			PerformFunctionCall(funcId, ctx);
-		}
-		else
-			ctx->type.Set(descr->returnType);
-
-		// Allow one more implicit conversion to another primitive type
-		return asCC_OBJ_TO_PRIMITIVE_CONV + ImplicitConversion(ctx, to, node, convType, generateCode, false);
-	}
-
-	// TODO: clean-up: This part is similar to what is in ImplicitConvObjectValue
-	// If no direct conversion is found we should look for the generic form 'void opConv(?&out)'
-	funcs.SetLength(0);
-	for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
-	{
-		asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-		if( ((convType == asIC_EXPLICIT_VAL_CAST) && func->name == "opConv") ||
-			func->name == "opImplConv" )
-		{
-			// Does the operator take the ?&out parameter?
-			if( func->returnType != asCDataType::CreatePrimitive(ttVoid, false) ||
-				func->parameterTypes.GetLength() != 1 ||
-				func->parameterTypes[0].GetTokenType() != ttQuestion ||
-				func->inOutFlags[0] != asTM_OUTREF )
-				continue;
-
-			funcs.PushLast(ot->methods[n]);
-		}
-	}
-
-	// TODO: If there are multiple valid value casts, then we must choose the most appropriate one
-	asASSERT( funcs.GetLength() <= 1 );
-
-	if( funcs.GetLength() == 1 )
-	{
-		if( generateCode )
-		{
-			// Allocate a temporary variable of the requested type
-			int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
-			CallDefaultConstructor(to, stackOffset, IsVariableOnHeap(stackOffset), &ctx->bc, node);
-
-			// Pass the reference of that variable to the function as output parameter
-			asCDataType toRef(to);
-			toRef.MakeReference(true);
-			toRef.MakeReadOnly(false);
-			asCArray<asCExprContext *> args;
-			asCExprContext arg(engine);
-			// Don't mark the variable as temporary, so it won't be freed too early
-			arg.type.SetVariable(toRef, stackOffset, false);
-			arg.type.isLValue = true;
-			arg.exprNode = node;
-			args.PushLast(&arg);
-
-			// Call the behaviour method
-			MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-
-			// Use the reference to the variable as the result of the expression
-			// Now we can mark the variable as temporary
-			toRef.MakeReference(false);
-			ctx->type.SetVariable(toRef, stackOffset, true);
-		}
-		else
-			ctx->type.Set(to);
-
-		return asCC_OBJ_TO_PRIMITIVE_CONV;
-	}
-
-	if( convType != asIC_IMPLICIT_CONV && node )
-	{
-		asCString str;
-		str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-	}
-
-	return asCC_NO_CONV;
-}
-
-
-asUINT asCCompiler::ImplicitConvObjectRef(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode)
-{
-	// Convert null to any object type handle, but not to a non-handle type
-	if( ctx->type.IsNullConstant() && ctx->methodName == "" )
-	{
-		if( to.IsObjectHandle() )
-		{
-			ctx->type.dataType = to;
-			return asCC_REF_CONV;
-		}
-		return asCC_NO_CONV;
-	}
-
-	asASSERT(ctx->type.dataType.GetTypeInfo() || ctx->methodName != "");
-
-	// First attempt to convert the base type without instantiating another instance
-	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() && ctx->methodName == "" )
-	{
-		// If the to type is an interface and the from type implements it, then we can convert it immediately
-		if( ctx->type.dataType.GetTypeInfo()->Implements(to.GetTypeInfo()) )
-		{
-			ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-			return asCC_REF_CONV;
-		}
-		// If the to type is a class and the from type derives from it, then we can convert it immediately
-		else if( ctx->type.dataType.GetTypeInfo()->DerivesFrom(to.GetTypeInfo()) )
-		{
-			ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-			return asCC_REF_CONV;
-		}
-		// If the types are not equal yet, then we may still be able to find a reference cast
-		else if( ctx->type.dataType.GetTypeInfo() != to.GetTypeInfo() )
-		{
-			// We may still be able to find an implicit ref cast behaviour
-			CompileRefCast(ctx, to, convType == asIC_EXPLICIT_REF_CAST, node, generateCode);
-
-			// Was the conversion done?
-			if( ctx->type.dataType.GetTypeInfo() == to.GetTypeInfo() )
-				return asCC_REF_CONV;
-		}
-	}
-
-	// Convert matching function types
-	if( to.IsFuncdef() )
-	{
-		// If the input expression is already a funcdef, check if it can be converted
-		if( ctx->type.dataType.IsFuncdef() &&
-			to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() )
-		{
-			asCScriptFunction *toFunc = to.GetTypeInfo()->CastToFuncdefType()->funcdef;
-			asCScriptFunction *fromFunc = ctx->type.dataType.GetTypeInfo()->CastToFuncdefType()->funcdef;
-			if( toFunc->IsSignatureExceptNameEqual(fromFunc) )
-			{
-				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
-				return asCC_REF_CONV;
-			}
-		}
-
-		// If the input expression is a deferred function ref, check if there is a matching func
-		if( ctx->methodName != "" )
-		{
-			// Determine the namespace
-			asSNameSpace *ns = 0;
-			asCString name = "";
-			int pos = ctx->methodName.FindLast("::");
-			if( pos >= 0 )
-			{
-				asCString nsName = ctx->methodName.SubString(0, pos+2);
-				// Trim off the last ::
-				if( nsName.GetLength() > 2 )
-					nsName.SetLength(nsName.GetLength()-2);
-				ns = DetermineNameSpace(nsName);
-				name = ctx->methodName.SubString(pos+2);
-			}
-			else
-			{
-				DetermineNameSpace("");
-				name = ctx->methodName;
-			}
-
-			asCArray<int> funcs;
-			if( ns )
-				builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
-
-			// Check if any of the functions have perfect match
-			asCScriptFunction *toFunc = to.GetTypeInfo()->CastToFuncdefType()->funcdef;
-			for( asUINT n = 0; n < funcs.GetLength(); n++ )
-			{
-				asCScriptFunction *func = builder->GetFunctionDescription(funcs[n]);
-				if( toFunc->IsSignatureExceptNameEqual(func) )
-				{
-					if( generateCode )
-					{
-						ctx->bc.InstrPTR(asBC_FuncPtr, func);
-
-						// Make sure the identified function is shared if we're compiling a shared function
-						if( !func->IsShared() && outFunc->IsShared() )
-						{
-							asCString msg;
-							msg.Format(TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s, func->GetDeclaration());
-							Error(msg, node);
-						}
-					}
-
-					ctx->type.dataType = asCDataType::CreateType(to.GetTypeInfo(), false);
-					return asCC_REF_CONV;
-				}
-			}
-		}
-	}
-
-	return asCC_NO_CONV;
-}
-
-asUINT asCCompiler::ImplicitConvObjectValue(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode)
-{
-	asUINT cost = asCC_NO_CONV;
-
-	// If the base type is still different, and we are allowed to instance
-	// another object then we can try an implicit value cast
-	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() )
-	{
-		// TODO: Implement support for implicit constructor/factory
-		asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-		if( ot == 0 )
-			return cost;
-
-		asCArray<int> funcs;
-		if( convType == asIC_EXPLICIT_VAL_CAST )
-		{
-			for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
-			{
-				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-
-				// accept both implicit and explicit cast
-				if( (func->name == "opConv" ||
-					 func->name == "opImplConv") &&
-					func->returnType.GetTypeInfo() == to.GetTypeInfo() &&
-					func->parameterTypes.GetLength() == 0 )
-					funcs.PushLast(ot->methods[n]);
-			}
-		}
-		else
-		{
-			for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
-			{
-				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-
-				// accept only implicit cast
-				if( func->name == "opImplConv" &&
-					func->returnType.GetTypeInfo() == to.GetTypeInfo() &&
-					func->parameterTypes.GetLength() == 0 )
-					funcs.PushLast(ot->methods[n]);
-			}
-		}
-
-		// TODO: If there are multiple valid value casts, then we must choose the most appropriate one
-		asASSERT( funcs.GetLength() <= 1 );
-
-		if( funcs.GetLength() == 1 )
-		{
-			asCScriptFunction *f = builder->GetFunctionDescription(funcs[0]);
-			if( generateCode )
-			{
-				Dereference(ctx, true);
-
-				bool useVariable = false;
-				int  stackOffset = 0;
-
-				if( f->DoesReturnOnStack() )
-				{
-					useVariable = true;
-					stackOffset = AllocateVariable(f->returnType, true);
-
-					// Push the pointer to the pre-allocated space for the return value
-					ctx->bc.InstrSHORT(asBC_PSF, short(stackOffset));
-
-					// The object pointer is already on the stack, but should be the top
-					// one, so we need to swap the pointers in order to get the correct
-					ctx->bc.Instr(asBC_SwapPtr);
-				}
-
-				PerformFunctionCall(funcs[0], ctx, false, 0, 0, useVariable, stackOffset);
-			}
-			else
-				ctx->type.Set(f->returnType);
-
-			cost = asCC_TO_OBJECT_CONV;
-		}
-		else
-		{
-			// TODO: cleanup: This part is similar to the second half of ImplicitConvObjectToPrimitive
-			// Look for a value cast with variable type
-			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
-			{
-				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-				if( ((convType == asIC_EXPLICIT_VAL_CAST) && func->name == "opConv") ||
-					func->name == "opImplConv" )
-				{
-					// Does the operator take the ?&out parameter?
-					if( func->returnType != asCDataType::CreatePrimitive(ttVoid, false) ||
-						func->parameterTypes.GetLength() != 1 ||
-						func->parameterTypes[0].GetTokenType() != ttQuestion ||
-						func->inOutFlags[0] != asTM_OUTREF )
-						continue;
-
-					funcs.PushLast(ot->methods[n]);
-				}
-			}
-
-			// TODO: If there are multiple valid value casts, then we must choose the most appropriate one
-			asASSERT( funcs.GetLength() <= 1 );
-
-			if( funcs.GetLength() == 1 )
-			{
-				cost = asCC_TO_OBJECT_CONV;
-				if( generateCode )
-				{
-					// Allocate a temporary variable of the requested type
-					int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
-					CallDefaultConstructor(to, stackOffset, IsVariableOnHeap(stackOffset), &ctx->bc, node);
-
-					// Pass the reference of that variable to the function as output parameter
-					asCDataType toRef(to);
-					toRef.MakeReference(false);
-					asCExprContext arg(engine);
-					arg.bc.InstrSHORT(asBC_PSF, (short)stackOffset);
-
-					// If this an object on the heap, the pointer must be dereferenced
-					if( IsVariableOnHeap(stackOffset) )
-						arg.bc.Instr(asBC_RDSPtr);
-
-					// Don't mark the variable as temporary, so it won't be freed too early
-					arg.type.SetVariable(toRef, stackOffset, false);
-					arg.type.isLValue = true;
-					arg.exprNode = node;
-
-					// Mark the argument as clean, so that MakeFunctionCall knows it 
-					// doesn't have to make a copy of it in order to protect the value
-					arg.isCleanArg = true;
-
-					// Call the behaviour method
-					asCArray<asCExprContext *> args;
-					args.PushLast(&arg);
-					MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-
-					// Use the reference to the variable as the result of the expression
-					// Now we can mark the variable as temporary
-					ctx->type.SetVariable(toRef, stackOffset, true);
-					ctx->bc.InstrSHORT(asBC_PSF, (short)stackOffset);
-				}
-				else
-				{
-					// All casts are legal
-					ctx->type.Set(to);
-				}
-			}
-		}
-	}
-
-	return cost;
-}
-
-asUINT asCCompiler::ImplicitConvObjectToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode, bool allowObjectConstruct)
-{
-	// First try a ref cast
-	asUINT cost = ImplicitConvObjectRef(ctx, to, node, convType, generateCode);
-
-	// If the desired type is an asOBJ_ASHANDLE then we'll assume it is allowed to implicitly
-	// construct the object through any of the available constructors
-	if( to.GetTypeInfo() && (to.GetTypeInfo()->flags & asOBJ_ASHANDLE) && to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() && allowObjectConstruct )
-	{
-		asCArray<int> funcs;
-		funcs = to.GetTypeInfo()->CastToObjectType()->beh.constructors;
-
-		asCArray<asCExprContext *> args;
-		args.PushLast(ctx);
-
-		cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, node, 0, 0, 0, false, true, false);
-
-		// Did we find a matching constructor?
-		if( funcs.GetLength() == 1 )
-		{
-			if( generateCode )
-			{
-				// If the ASHANDLE receives a variable type parameter, then we need to
-				// make sure the expression is treated as a handle and not as a value
-				asCScriptFunction *func = engine->scriptFunctions[funcs[0]];
-				if( func->parameterTypes[0].GetTokenType() == ttQuestion )
-				{
-					if( !ctx->type.isExplicitHandle )
-					{
-						asCDataType toHandle = ctx->type.dataType;
-						toHandle.MakeHandle(true);
-						toHandle.MakeReference(true);
-						toHandle.MakeHandleToConst(ctx->type.dataType.IsReadOnly());
-						ImplicitConversion(ctx, toHandle, node, asIC_IMPLICIT_CONV, true, false);
-
-						asASSERT( ctx->type.dataType.IsObjectHandle() );
-					}
-					ctx->type.isExplicitHandle = true;
-				}
-
-				// TODO: This should really reuse the code from CompileConstructCall
-
-				// Allocate the new object
-				asCExprValue tempObj;
-				tempObj.dataType = to;
-				tempObj.dataType.MakeReference(false);
-				tempObj.stackOffset = (short)AllocateVariable(tempObj.dataType, true);
-				tempObj.dataType.MakeReference(true);
-				tempObj.isTemporary = true;
-				tempObj.isVariable = true;
-
-				bool onHeap = IsVariableOnHeap(tempObj.stackOffset);
-
-				// Push the address of the object on the stack
-				asCExprContext e(engine);
-				if( onHeap )
-					e.bc.InstrSHORT(asBC_VAR, tempObj.stackOffset);
-
-				PrepareFunctionCall(funcs[0], &e.bc, args);
-				MoveArgsToStack(funcs[0], &e.bc, args, false);
-
-				// If the object is allocated on the stack, then call the constructor as a normal function
-				if( onHeap )
-				{
-					int offset = 0;
-					asCScriptFunction *descr = builder->GetFunctionDescription(funcs[0]);
-					offset = descr->parameterTypes[0].GetSizeOnStackDWords();
-
-					e.bc.InstrWORD(asBC_GETREF, (asWORD)offset);
-				}
-				else
-					e.bc.InstrSHORT(asBC_PSF, tempObj.stackOffset);
-
-				PerformFunctionCall(funcs[0], &e, onHeap, &args, tempObj.dataType.GetTypeInfo()->CastToObjectType());
-
-				// Add tag that the object has been initialized
-				e.bc.ObjInfo(tempObj.stackOffset, asOBJ_INIT);
-
-				// The constructor doesn't return anything,
-				// so we have to manually inform the type of
-				// the return value
-				e.type = tempObj;
-				if( !onHeap )
-					e.type.dataType.MakeReference(false);
-
-				// Push the address of the object on the stack again
-				e.bc.InstrSHORT(asBC_PSF, tempObj.stackOffset);
-
-				MergeExprBytecodeAndType(ctx, &e);
-			}
-			else
-			{
-				ctx->type.Set(asCDataType::CreateType(to.GetTypeInfo(), false));
-			}
-		}
-	}
-
-	// If the base type is still different, and we are allowed to instance
-	// another object then we can try an implicit value cast
-	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() && allowObjectConstruct )
-	{
-		// Attempt implicit value cast
-		cost = ImplicitConvObjectValue(ctx, to, node, convType, generateCode);
-	}
-
-	// If we still haven't converted the base type to the correct type, then there is
-	//  no need to continue as it is not possible to do the conversion
-	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() )
-		return asCC_NO_CONV;
-
-
-	if( to.IsObjectHandle() )
-	{
-		// There is no extra cost in converting to a handle
-
-		// reference to handle -> handle
-		// reference           -> handle
-		// object              -> handle
-		// handle              -> reference to handle
-		// reference           -> reference to handle
-		// object              -> reference to handle
-
-		// TODO: If the type is handle, then we can't use IsReadOnly to determine the constness of the basetype
-
-		// If the rvalue is a handle to a const object, then
-		// the lvalue must also be a handle to a const object
-		if( ctx->type.dataType.IsReadOnly() && !to.IsReadOnly() )
-		{
-			if( convType != asIC_IMPLICIT_CONV )
-			{
-				asASSERT(node);
-				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-				Error(str, node);
-			}
-		}
-
-		if( !ctx->type.dataType.IsObjectHandle() )
-		{
-			// An object type can be directly converted to a handle of the
-			// same type by doing a ref copy to a new variable
-			if( ctx->type.dataType.SupportHandles() )
-			{
-				asCDataType dt = ctx->type.dataType;
-				dt.MakeHandle(true);
-				dt.MakeReference(false);
-
-				if( generateCode )
-				{
-					// If the expression is already a local variable, then it is not
-					// necessary to do a ref copy, as the ref objects on the stack are
-					// really handles, only the handles cannot be modified.
-					if( ctx->type.isVariable )
-					{
-						bool isHandleToConst = ctx->type.dataType.IsReadOnly();
-						ctx->type.dataType.MakeReadOnly(false);
-						ctx->type.dataType.MakeHandle(true);
-						ctx->type.dataType.MakeReadOnly(true);
-						ctx->type.dataType.MakeHandleToConst(isHandleToConst);
-
-						if( to.IsReference() && !ctx->type.dataType.IsReference() )
-						{
-							ctx->bc.Instr(asBC_PopPtr);
-							ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-							ctx->type.dataType.MakeReference(true);
-						}
-						else if( ctx->type.dataType.IsReference() )
-						{
-							ctx->bc.Instr(asBC_RDSPtr);
-							ctx->type.dataType.MakeReference(false);
-						}
-					}
-					else
-					{
-						int offset = AllocateVariable(dt, true);
-
-						if( ctx->type.dataType.IsReference() )
-							ctx->bc.Instr(asBC_RDSPtr);
-						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-						if (dt.IsFuncdef())
-							ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-						else
-							ctx->bc.InstrPTR(asBC_REFCPY, dt.GetTypeInfo());
-						ctx->bc.Instr(asBC_PopPtr);
-						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-
-						ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-						if( to.IsReference() )
-							dt.MakeReference(true);
-						else
-							ctx->bc.Instr(asBC_RDSPtr);
-
-						ctx->type.SetVariable(dt, offset, true);
-					}
-				}
-				else
-					ctx->type.dataType = dt;
-
-				// When this conversion is done the expression is no longer an lvalue
-				ctx->type.isLValue = false;
-			}
-		}
-
-		if( ctx->type.dataType.IsObjectHandle() )
-		{
-			// A handle to non-const can be converted to a
-			// handle to const, but not the other way
-			if( to.IsHandleToConst() )
-				ctx->type.dataType.MakeHandleToConst(true);
-
-			// A const handle can be converted to a non-const
-			// handle and vice versa as the handle is just a value
-			ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
-		}
-
-		if( to.IsReference() && !ctx->type.dataType.IsReference() )
-		{
-			if( generateCode )
-			{
-				asASSERT( ctx->type.dataType.IsObjectHandle() );
-
-				// If the input type is a handle, then a simple ref copy is enough
-				bool isExplicitHandle = ctx->type.isExplicitHandle;
-				ctx->type.isExplicitHandle = ctx->type.dataType.IsObjectHandle();
-
-				// If the input type is read-only we'll need to temporarily
-				// remove this constness, otherwise the assignment will fail
-				bool typeIsReadOnly = ctx->type.dataType.IsReadOnly();
-				ctx->type.dataType.MakeReadOnly(false);
-
-				// If the object already is a temporary variable, then the copy
-				// doesn't have to be made as it is already a unique object
-				PrepareTemporaryVariable(node, ctx);
-
-				ctx->type.dataType.MakeReadOnly(typeIsReadOnly);
-				ctx->type.isExplicitHandle = isExplicitHandle;
-			}
-
-			// A non-reference can be converted to a reference,
-			// by putting the value in a temporary variable
-			ctx->type.dataType.MakeReference(true);
-
-			// Since it is a new temporary variable it doesn't have to be const
-			ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
-		}
-		else if( !to.IsReference() && ctx->type.dataType.IsReference() )
-		{
-			Dereference(ctx, generateCode);
-		}
-	}
-	else // if( !to.IsObjectHandle() )
-	{
-		if( !to.IsReference() )
-		{
-			// reference to handle -> object
-			// handle              -> object
-			// reference           -> object
-
-			// An implicit handle can be converted to an object by adding a check for null pointer
-			if( ctx->type.dataType.IsObjectHandle() && !ctx->type.isExplicitHandle )
-			{
-				if( generateCode )
-				{
-					if( ctx->type.dataType.IsReference() )
-					{
-						// The pointer on the stack refers to the handle
-						ctx->bc.Instr(asBC_ChkRefS);
-					}
-					else
-					{
-						// The pointer on the stack refers to the object
-						ctx->bc.Instr(asBC_CHKREF);
-					}
-				}
-
-				ctx->type.dataType.MakeHandle(false);
-			}
-
-			// A const object can be converted to a non-const object through a copy
-			if( ctx->type.dataType.IsReadOnly() && !to.IsReadOnly() &&
-				allowObjectConstruct )
-			{
-				// Does the object type allow a copy to be made?
-				if( ctx->type.dataType.CanBeCopied() )
-				{
-					if( generateCode )
-					{
-						// Make a temporary object with the copy
-						PrepareTemporaryVariable(node, ctx);
-					}
-
-					// In case the object was already in a temporary variable, then the function
-					// didn't really do anything so we need to remove the constness here
-					ctx->type.dataType.MakeReadOnly(false);
-
-					// Add the cost for the copy
-					cost += asCC_TO_OBJECT_CONV;
-				}
-			}
-
-			if( ctx->type.dataType.IsReference() )
-			{
-				// This may look strange, but a value type allocated on the stack is already
-				// correct, so nothing should be done other than remove the mark as reference.
-				// For types allocated on the heap, it is necessary to dereference the pointer
-				// that is currently on the stack
-				if( IsVariableOnHeap(ctx->type.stackOffset) )
-					Dereference(ctx, generateCode);
-				else
-					ctx->type.dataType.MakeReference(false);
-			}
-
-			// A non-const object can be converted to a const object directly
-			if( !ctx->type.dataType.IsReadOnly() && to.IsReadOnly() )
-			{
-				ctx->type.dataType.MakeReadOnly(true);
-			}
-		}
-		else // if( to.IsReference() )
-		{
-			// reference to handle -> reference
-			// handle              -> reference
-			// object              -> reference
-
-			if( ctx->type.dataType.IsReference() )
-			{
-				if( ctx->type.isExplicitHandle && ctx->type.dataType.GetTypeInfo() && (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
-				{
-					// ASHANDLE objects are really value types, so explicit handle can be removed
-					ctx->type.isExplicitHandle = false;
-					ctx->type.dataType.MakeHandle(false);
-				}
-
-				// A reference to a handle can be converted to a reference to an object
-				// by first reading the address, then verifying that it is not null
-				if( !to.IsObjectHandle() && ctx->type.dataType.IsObjectHandle() && !ctx->type.isExplicitHandle )
-				{
-					ctx->type.dataType.MakeHandle(false);
-					if( generateCode )
-						ctx->bc.Instr(asBC_ChkRefS);
-				}
-
-				// A reference to a non-const can be converted to a reference to a const
-				if( to.IsReadOnly() )
-					ctx->type.dataType.MakeReadOnly(true);
-				else if( ctx->type.dataType.IsReadOnly() && allowObjectConstruct )
-				{
-					// A reference to a const can be converted to a reference to a
-					// non-const by copying the object to a temporary variable
-					ctx->type.dataType.MakeReadOnly(false);
-
-					if( generateCode )
-					{
-						// If the object already is a temporary variable, then the copy
-						// doesn't have to be made as it is already a unique object
-						PrepareTemporaryVariable(node, ctx);
-					}
-
-					// Add the cost for the copy
-					cost += asCC_TO_OBJECT_CONV;
-				}
-			}
-			else // if( !ctx->type.dataType.IsReference() )
-			{
-				// A non-reference handle can be converted to a non-handle reference by checking against null handle
-				if( ctx->type.dataType.IsObjectHandle() )
-				{
-					bool readOnly = false;
-					if( ctx->type.dataType.IsHandleToConst() )
-						readOnly = true;
-
-					if( generateCode )
-					{
-						if( ctx->type.isVariable )
-							ctx->bc.InstrSHORT(asBC_ChkNullV, ctx->type.stackOffset);
-						else
-							ctx->bc.Instr(asBC_CHKREF);
-					}
-					ctx->type.dataType.MakeHandle(false);
-					ctx->type.dataType.MakeReference(true);
-
-					// Make sure a handle to const isn't converted to non-const reference
-					if( readOnly )
-						ctx->type.dataType.MakeReadOnly(true);
-				}
-				else
-				{
-					// A value type allocated on the stack is differentiated
-					// by it not being a reference. But it can be handled as
-					// reference by pushing the pointer on the stack
-					if( (ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) &&
-						(ctx->type.isVariable || ctx->type.isTemporary) &&
-						!IsVariableOnHeap(ctx->type.stackOffset) )
-					{
-						// Actually the pointer is already pushed on the stack in
-						// CompileVariableAccess, so we don't need to do anything else
-					}
-					else if( generateCode )
-					{
-						// A non-reference can be converted to a reference,
-						// by putting the value in a temporary variable
-
-						// If the input type is read-only we'll need to temporarily
-						// remove this constness, otherwise the assignment will fail
-						bool typeIsReadOnly = ctx->type.dataType.IsReadOnly();
-						ctx->type.dataType.MakeReadOnly(false);
-
-						// If the object already is a temporary variable, then the copy
-						// doesn't have to be made as it is already a unique object
-						PrepareTemporaryVariable(node, ctx);
-
-						ctx->type.dataType.MakeReadOnly(typeIsReadOnly);
-
-						// Add the cost for the copy
-						cost += asCC_TO_OBJECT_CONV;
-					}
-
-					// This may look strange as the conversion was to make the expression a reference
-					// but a value type allocated on the stack is a reference even without the type
-					// being marked as such.
-					ctx->type.dataType.MakeReference(IsVariableOnHeap(ctx->type.stackOffset));
-				}
-
-				// TODO: If the variable is an object allocated on the stack the following is not true as the copy may not have been made
-				// Since it is a new temporary variable it doesn't have to be const
-				ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
-			}
-		}
-	}
-
-	return cost;
-}
-
-asUINT asCCompiler::ImplicitConvPrimitiveToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode * /*node*/, EImplicitConv /*isExplicit*/, bool generateCode, bool /*allowObjectConstruct*/)
-{
-	// Reference types currently don't allow implicit conversion from primitive to object
-	// TODO: Allow implicit conversion to scoped reference types as they are supposed to appear like ordinary value types
-	asCObjectType *objType = to.GetTypeInfo()->CastToObjectType();
-	asASSERT( objType || to.GetTypeInfo()->CastToFuncdefType() );
-	if( !objType || (objType->flags & asOBJ_REF) )
-		return asCC_NO_CONV;
-
-	// For value types the object must have a constructor that takes a single primitive argument either by value or as input reference
-	asCArray<int> funcs;
-	for( asUINT n = 0; n < objType->beh.constructors.GetLength(); n++ )
-	{
-		asCScriptFunction *func = engine->scriptFunctions[objType->beh.constructors[n]];
-		if( func->parameterTypes.GetLength() == 1 &&
-			func->parameterTypes[0].IsPrimitive() &&
-			!(func->inOutFlags[0] & asTM_OUTREF) )
-		{
-			funcs.PushLast(func->id);
-		}
-	}
-
-	if( funcs.GetLength() == 0 )
-		return asCC_NO_CONV;
-
-	// Check if it is possible to choose a best match
-	asCExprContext arg(engine);
-	arg.type = ctx->type;
-	arg.exprNode = ctx->exprNode; // Use the same node for compiler messages
-	asCArray<asCExprContext*> args;
-	args.PushLast(&arg);
-	asUINT cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, 0, 0, 0, objType, false, true, false);
-	if( funcs.GetLength() != 1 )
-		return asCC_NO_CONV;
-
-	if( !generateCode )
-	{
-		ctx->type.Set(to);
-		return cost;
-	}
-
-	// TODO: clean up: This part is similar to CompileConstructCall(). It should be put in a common function
-
-	// Clear the type of ctx, as the type is moved to the arg
-	ctx->type.SetDummy();
-
-	// Value types and script types are allocated through the constructor
-	asCExprValue tempObj;
-	tempObj.dataType = to;
-	tempObj.stackOffset = (short)AllocateVariable(to, true);
-	tempObj.dataType.MakeReference(true);
-	tempObj.isTemporary = true;
-	tempObj.isVariable = true;
-
-	bool onHeap = IsVariableOnHeap(tempObj.stackOffset);
-
-	// Push the address of the object on the stack
-	if( onHeap )
-		ctx->bc.InstrSHORT(asBC_VAR, tempObj.stackOffset);
-
-	PrepareFunctionCall(funcs[0], &ctx->bc, args);
-	MoveArgsToStack(funcs[0], &ctx->bc, args, false);
-
-	if( !(objType->flags & asOBJ_REF) )
-	{
-		// If the object is allocated on the stack, then call the constructor as a normal function
-		if( onHeap )
-		{
-			int offset = 0;
-			asCScriptFunction *descr = builder->GetFunctionDescription(funcs[0]);
-			for( asUINT n = 0; n < args.GetLength(); n++ )
-				offset += descr->parameterTypes[n].GetSizeOnStackDWords();
-
-			ctx->bc.InstrWORD(asBC_GETREF, (asWORD)offset);
-		}
-		else
-			ctx->bc.InstrSHORT(asBC_PSF, tempObj.stackOffset);
-
-		PerformFunctionCall(funcs[0], ctx, onHeap, &args, tempObj.dataType.GetTypeInfo()->CastToObjectType());
-
-		// Add tag that the object has been initialized
-		ctx->bc.ObjInfo(tempObj.stackOffset, asOBJ_INIT);
-
-		// The constructor doesn't return anything,
-		// so we have to manually inform the type of
-		// the return value
-		ctx->type = tempObj;
-		if( !onHeap )
-			ctx->type.dataType.MakeReference(false);
-
-		// Push the address of the object on the stack again
-		ctx->bc.InstrSHORT(asBC_PSF, tempObj.stackOffset);
-	}
-	else
-	{
-		asASSERT( objType->flags & asOBJ_SCOPED );
-
-		// Call the factory to create the reference type
-		PerformFunctionCall(funcs[0], ctx, false, &args);
-	}
-
-	return cost;
-}
-
-void asCCompiler::ImplicitConversionConstant(asCExprContext *from, const asCDataType &to, asCScriptNode *node, EImplicitConv convType)
-{
-	asASSERT(from->type.isConstant);
-
-	// TODO: node should be the node of the value that is
-	//       converted (not the operator that provokes the implicit
-	//       conversion)
-
-	// If the base type is correct there is no more to do
-	if( to.IsEqualExceptRefAndConst(from->type.dataType) ) return;
-
-	// References cannot be constants
-	if( from->type.dataType.IsReference() ) return;
-
-	if( (to.IsIntegerType() && to.GetSizeInMemoryDWords() == 1 && !to.IsEnumType()) ||
-		(to.IsEnumType() && convType == asIC_EXPLICIT_VAL_CAST) )
-	{
-		if( from->type.dataType.IsFloatType() ||
-			from->type.dataType.IsDoubleType() ||
-			from->type.dataType.IsUnsignedType() ||
-			from->type.dataType.IsIntegerType() )
-		{
-			asCDataType targetDt;
-			if (to.IsEnumType())
-				targetDt = to;
-			else
-				targetDt = asCDataType::CreatePrimitive(ttInt, true);
-
-			// Transform the value
-			// Float constants can be implicitly converted to int
-			if( from->type.dataType.IsFloatType() )
-			{
-				float fc = from->type.GetConstantF();
-				int ic = int(fc);
-
-				if( float(ic) != fc )
-				{
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-				}
-
-				from->type.SetConstantDW(targetDt, ic);
-			}
-			// Double constants can be implicitly converted to int
-			else if( from->type.dataType.IsDoubleType() )
-			{
-				double fc = from->type.GetConstantD();
-				int ic = int(fc);
-
-				if( double(ic) != fc )
-				{
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-				}
-
-				from->type.SetConstantDW(targetDt, ic);
-			}
-			else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				// Verify that it is possible to convert to signed without getting negative
-				if( int(from->type.GetConstantDW()) < 0 )
-				{
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
-				}
-
-				// Convert to 32bit
-				if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-					from->type.SetConstantDW(targetDt, from->type.GetConstantB());
-				else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-					from->type.SetConstantDW(targetDt, from->type.GetConstantW());
-			}
-			else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				// Convert to 32bit
-				from->type.SetConstantDW(targetDt, int(from->type.GetConstantQW()));
-			}
-			else if (from->type.dataType.IsIntegerType() &&
-				from->type.dataType.GetSizeInMemoryBytes() < 4)
-			{
-				// Convert to 32bit
-				if (from->type.dataType.GetSizeInMemoryBytes() == 1)
-					from->type.SetConstantDW(targetDt, (signed char)from->type.GetConstantB());
-				else if (from->type.dataType.GetSizeInMemoryBytes() == 2)
-					from->type.SetConstantDW(targetDt, (short)from->type.GetConstantW());
-			}
-			
-			// Make sure the type was set
-			from->type.dataType = targetDt;
-		}
-
-		// Check if a downsize is necessary
-		if( to.IsIntegerType() &&
-			from->type.dataType.IsIntegerType() &&
-		    from->type.dataType.GetSizeInMemoryBytes() > to.GetSizeInMemoryBytes() )
-		{
-			// Verify if it is possible
-			if( to.GetSizeInMemoryBytes() == 1 )
-			{
-				if( asBYTE(from->type.GetConstantDW()) != from->type.GetConstantDW() )
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
-
-				from->type.SetConstantB(asCDataType::CreatePrimitive(to.GetTokenType(), true), char(from->type.GetConstantDW()));
-			}
-			else if( to.GetSizeInMemoryBytes() == 2 )
-			{
-				if( asWORD(from->type.GetConstantDW()) != from->type.GetConstantDW())
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
-
-				from->type.SetConstantW(asCDataType::CreatePrimitive(to.GetTokenType(), true), short(from->type.GetConstantDW()));
-			}
-		}
-	}
-	else if( to.IsIntegerType() && to.GetSizeInMemoryDWords() == 2 )
-	{
-		// Float constants can be implicitly converted to int
-		if( from->type.dataType.IsFloatType() )
-		{
-			float fc = from->type.GetConstantF();
-			asINT64 ic = asINT64(fc);
-
-			if( float(ic) != fc )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttInt64, true);
-			from->type.SetConstantQW(ic);
-		}
-		// Double constants can be implicitly converted to int
-		else if( from->type.dataType.IsDoubleType() )
-		{
-			double fc = from->type.GetConstantD();
-			asINT64 ic = asINT64(fc);
-
-			if( double(ic) != fc )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttInt64, true);
-			from->type.SetConstantQW(ic);
-		}
-		else if( from->type.dataType.IsUnsignedType() )
-		{
-			// Convert to 64bit
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				from->type.SetConstantQW(from->type.GetConstantB());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				from->type.SetConstantQW(from->type.GetConstantW());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
-				from->type.SetConstantQW(from->type.GetConstantDW());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 8 )
-			{
-				if( asINT64(from->type.GetConstantQW()) < 0 )
-				{
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
-				}
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttInt64, true);
-		}
-		else if( from->type.dataType.IsIntegerType() )
-		{
-			// Convert to 64bit
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), (signed char)from->type.GetConstantB());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), (short)from->type.GetConstantW());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), (int)from->type.GetConstantDW());
-		}
-	}
-	else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 1 )
-	{
-		if( from->type.dataType.IsFloatType() )
-		{
-			float fc = from->type.GetConstantF();
-			// Some compilers set the value to 0 when converting a negative float to unsigned int.
-			// To maintain a consistent behaviour across compilers we convert to int first.
-			asUINT uic = asUINT(int(fc));
-
-			if( float(uic) != fc )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttUInt, true);
-			from->type.SetConstantDW(uic);
-
-			// Try once more, in case of a smaller type
-			ImplicitConversionConstant(from, to, node, convType);
-		}
-		else if( from->type.dataType.IsDoubleType() )
-		{
-			double fc = from->type.GetConstantD();
-			// Some compilers set the value to 0 when converting a negative double to unsigned int.
-			// To maintain a consistent behaviour across compilers we convert to int first.
-			asUINT uic = asUINT(int(fc));
-
-			if( double(uic) != fc )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttUInt, true);
-			from->type.SetConstantDW(uic);
-
-			// Try once more, in case of a smaller type
-			ImplicitConversionConstant(from, to, node, convType);
-		}
-		else if( from->type.dataType.IsIntegerType() )
-		{
-			// Verify that it is possible to convert to unsigned without loosing negative
-			if( (from->type.dataType.GetSizeInMemoryBytes() > 4 && asINT64(from->type.GetConstantQW()) < 0) ||
-				(from->type.dataType.GetSizeInMemoryBytes() == 4 && int(from->type.GetConstantDW()) < 0) ||
-				(from->type.dataType.GetSizeInMemoryBytes() == 2 && short(from->type.GetConstantW()) < 0) ||
-				(from->type.dataType.GetSizeInMemoryBytes() == 1 && char(from->type.GetConstantB()) < 0))
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
-			}
-
-			// Check if any data is lost
-			if( from->type.dataType.GetSizeInMemoryBytes() > 4 && (from->type.GetConstantQW() >> 32) != 0 && (from->type.GetConstantQW() >> 32) != 0xFFFFFFFF )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
-			}
-
-			// Convert to 32bit
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (signed char)from->type.GetConstantB());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (short)from->type.GetConstantW());
-			else if (from->type.dataType.GetSizeInMemoryBytes() == 4 )
-				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (int)from->type.GetConstantDW());
-			else
-				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (int)(asINT64)from->type.GetConstantQW());
-
-			// Try once more, in case of a smaller type
-			ImplicitConversionConstant(from, to, node, convType);
-		}
-		else if( from->type.dataType.IsUnsignedType() &&
-		         from->type.dataType.GetSizeInMemoryBytes() < 4 )
-		{
-			// Convert to 32bit
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), from->type.GetConstantB());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), from->type.GetConstantW());
-
-			// Try once more, in case of a smaller type
-			ImplicitConversionConstant(from, to, node, convType);
-		}
-		else if( from->type.dataType.IsUnsignedType() &&
-		         from->type.dataType.GetSizeInMemoryBytes() > to.GetSizeInMemoryBytes() )
-		{
-			// Verify if it is possible
-			if( to.GetSizeInMemoryBytes() == 1 )
-			{
-				if( asBYTE(from->type.GetConstantDW()) != from->type.GetConstantDW() )
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
-
-				from->type.SetConstantB(asCDataType::CreatePrimitive(to.GetTokenType(), true), asBYTE(from->type.GetConstantDW()));
-			}
-			else if( to.GetSizeInMemoryBytes() == 2 )
-			{
-				if( asWORD(from->type.GetConstantDW()) != from->type.GetConstantDW())
-					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
-
-				from->type.SetConstantW(asCDataType::CreatePrimitive(to.GetTokenType(), true), asWORD(from->type.GetConstantDW()));
-			}
-		}
-	}
-	else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 2 )
-	{
-		if( from->type.dataType.IsFloatType() )
-		{
-			float fc = from->type.GetConstantF();
-			// Convert first to int64 then to uint64 to avoid negative float becoming 0 on gnuc base compilers
-			asQWORD uic = asQWORD(asINT64(fc));
-
-#if !defined(_MSC_VER) || _MSC_VER > 1200 // MSVC++ 6
-			// MSVC6 doesn't support this conversion
-			if( float(uic) != fc )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-#endif
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttUInt64, true);
-			from->type.SetConstantQW(uic);
-		}
-		else if( from->type.dataType.IsDoubleType() )
-		{
-			double fc = from->type.GetConstantD();
-			// Convert first to int64 then to uint64 to avoid negative float becoming 0 on gnuc base compilers
-			asQWORD uic = asQWORD(asINT64(fc));
-
-#if !defined(_MSC_VER) || _MSC_VER > 1200 // MSVC++ 6
-			// MSVC6 doesn't support this conversion
-			if( double(uic) != fc )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-#endif
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttUInt64, true);
-			from->type.SetConstantQW(uic);
-		}
-		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
-		{
-			// Convert to 64bit
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), (asINT64)(signed char)from->type.GetConstantB());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), (asINT64)(short)from->type.GetConstantW());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), (asINT64)(int)from->type.GetConstantDW());
-
-			// Verify that it is possible to convert to unsigned without loosing negative
-			if( asINT64(from->type.GetConstantQW()) < 0 )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttUInt64, true);
-		}
-		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
-		{
-			// Verify that it is possible to convert to unsigned without loosing negative
-			if( asINT64(from->type.GetConstantQW()) < 0 )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(ttUInt64, true);
-		}
-		else if( from->type.dataType.IsUnsignedType() )
-		{
-			// Convert to 64bit
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), from->type.GetConstantB());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), from->type.GetConstantW());
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
-				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), from->type.GetConstantDW());
-		}
-	}
-	else if( to.IsFloatType() )
-	{
-		if( from->type.dataType.IsDoubleType() )
-		{
-			double ic = from->type.GetConstantD();
-			float fc = float(ic);
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantF(fc);
-		}
-		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
-		{
-			// Must properly convert value in case the from value is smaller
-			int ic;
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				ic = (signed char)from->type.GetConstantB();
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				ic = (short)from->type.GetConstantW();
-			else
-				ic = (int)from->type.GetConstantDW();
-			float fc = float(ic);
-
-			if( int(fc) != ic )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantF(fc);
-		}
-		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
-		{
-			float fc = float(asINT64(from->type.GetConstantQW()));
-			if( asINT64(fc) != asINT64(from->type.GetConstantQW()) )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantF(fc);
-		}
-		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
-		{
-			// Must properly convert value in case the from value is smaller
-			unsigned int uic;
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				uic = from->type.GetConstantB();
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				uic = from->type.GetConstantW();
-			else
-				uic = from->type.GetConstantDW();
-			float fc = float(uic);
-
-			if( (unsigned int)(fc) != uic )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantF(fc);
-		}
-		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
-		{
-			float fc = float((asINT64)from->type.GetConstantQW());
-
-			if( asQWORD(fc) != from->type.GetConstantQW())
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantF(fc);
-		}
-	}
-	else if( to.IsDoubleType() )
-	{
-		if( from->type.dataType.IsFloatType() )
-		{
-			float ic = from->type.GetConstantF();
-			double fc = double(ic);
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantD(fc);
-		}
-		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
-		{
-			// Must properly convert value in case the from value is smaller
-			int ic;
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				ic = (signed char)from->type.GetConstantB();
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				ic = (short)from->type.GetConstantW();
-			else
-				ic = (int)from->type.GetConstantDW();
-			double fc = double(ic);
-
-			if( int(fc) != ic )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantD(fc);
-		}
-		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
-		{
-			double fc = double(asINT64(from->type.GetConstantQW()));
-
-			if( asINT64(fc) != asINT64(from->type.GetConstantQW()) )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantD(fc);
-		}
-		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
-		{
-			// Must properly convert value in case the from value is smaller
-			unsigned int uic;
-			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
-				uic = from->type.GetConstantB();
-			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
-				uic = from->type.GetConstantW();
-			else
-				uic = from->type.GetConstantDW();
-			double fc = double(uic);
-
-			if( (unsigned int)(fc) != uic )
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantD(fc);
-		}
-		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
-		{
-			double fc = double((asINT64)from->type.GetConstantQW());
-
-			if( asQWORD(fc) != from->type.GetConstantQW())
-			{
-				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
-			}
-
-			from->type.dataType = asCDataType::CreatePrimitive(to.GetTokenType(), true);
-			from->type.SetConstantD(fc);
-		}
-	}
-}
-
-int asCCompiler::DoAssignment(asCExprContext *ctx, asCExprContext *lctx, asCExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, eTokenType op, asCScriptNode *opNode)
-{
-	// Don't allow any operators on expressions that take address of class method
-	// If methodName is set but the type is not an object, then it is a global function
-	if( lctx->methodName != "" || rctx->IsClassMethod() )
-	{
-		Error(TXT_INVALID_OP_ON_METHOD, opNode);
-		return -1;
-	}
-
-	// Implicit handle types should always be treated as handles in assignments
-	if (lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE) )
-	{
-		lctx->type.dataType.MakeHandle(true);
-		lctx->type.isExplicitHandle = true;
-	}
-
-	// If the left hand expression is a property accessor, then that should be used
-	// to do the assignment instead of the ordinary operator. The exception is when
-	// the property accessor is for a handle property, and the operation is a value
-	// assignment.
-	if( (lctx->property_get || lctx->property_set) &&
-		!(lctx->type.dataType.IsObjectHandle() && !lctx->type.isExplicitHandle) )
-	{
-		if( op != ttAssignment )
-		{
-			// Generate the code for the compound assignment, i.e. get the value, apply operator, then set the value
-			return ProcessPropertyGetSetAccessor(ctx, lctx, rctx, op, opNode);
-		}
-
-		// It is not allowed to do a handle assignment on a property
-		// accessor that doesn't take a handle in the set accessor.
-		if( lctx->property_set && lctx->type.isExplicitHandle )
-		{
-			// set_opIndex has 2 arguments, where as normal setters have only 1
-			asCArray<asCDataType>& parameterTypes =
-				builder->GetFunctionDescription(lctx->property_set)->parameterTypes;
-			if( !parameterTypes[parameterTypes.GetLength() - 1].IsObjectHandle() )
-			{
-				// Process the property to free the memory
-				ProcessPropertySetAccessor(lctx, rctx, opNode);
-
-				Error(TXT_HANDLE_ASSIGN_ON_NON_HANDLE_PROP, opNode);
-				return -1;
-			}
-		}
-
-		MergeExprBytecodeAndType(ctx, lctx);
-
-		return ProcessPropertySetAccessor(ctx, rctx, opNode);
-	}
-	else if( lctx->property_get && lctx->type.dataType.IsObjectHandle() && !lctx->type.isExplicitHandle )
-	{
-		// Get the handle to the object that will be used for the value assignment
-		ProcessPropertyGetAccessor(lctx, opNode);
-	}
-
-	if( lctx->type.dataType.IsPrimitive() )
-	{
-		if( !lctx->type.isLValue )
-		{
-			Error(TXT_NOT_LVALUE, lexpr);
-			return -1;
-		}
-
-		if( op != ttAssignment )
-		{
-			// Compute the operator before the assignment
-			asCExprValue lvalue = lctx->type;
-
-			if( lctx->type.isTemporary && !lctx->type.isVariable )
-			{
-				// The temporary variable must not be freed until the
-				// assignment has been performed. lvalue still holds
-				// the information about the temporary variable
-				lctx->type.isTemporary = false;
-			}
-
-			asCExprContext o(engine);
-			CompileOperator(opNode, lctx, rctx, &o);
-			MergeExprBytecode(rctx, &o);
-			rctx->type = o.type;
-
-			// Convert the rvalue to the right type and validate it
-			PrepareForAssignment(&lvalue.dataType, rctx, rexpr, false);
-
-			MergeExprBytecode(ctx, rctx);
-			lctx->type = lvalue;
-
-			// The lvalue continues the same, either it was a variable, or a reference in the register
-		}
-		else
-		{
-			// Convert the rvalue to the right type and validate it
-			PrepareForAssignment(&lctx->type.dataType, rctx, rexpr, false, lctx);
-
-			MergeExprBytecode(ctx, rctx);
-			MergeExprBytecode(ctx, lctx);
-		}
-
-		ReleaseTemporaryVariable(rctx->type, &ctx->bc);
-
-		PerformAssignment(&lctx->type, &rctx->type, &ctx->bc, opNode);
-
-		ctx->type = lctx->type;
-	}
-	else if( lctx->type.isExplicitHandle )
-	{
-		if( !lctx->type.isLValue )
-		{
-			Error(TXT_NOT_LVALUE, lexpr);
-			return -1;
-		}
-
-		// Object handles don't have any compound assignment operators
-		if( op != ttAssignment )
-		{
-			asCString str;
-			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-			Error(str, lexpr);
-			return -1;
-		}
-
-		if( lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
-		{
-			// The object is a value type but that should be treated as a handle
-
-			// Make sure the right hand value is a handle
-			if( !rctx->type.isExplicitHandle &&
-				!(rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE)) )
-			{
-				// Function names can be considered handles already
-				if( rctx->methodName == "" )
-				{
-					asCDataType dt = rctx->type.dataType;
-					dt.MakeHandle(true);
-					dt.MakeReference(false);
-
-					PrepareArgument(&dt, rctx, rexpr, true, asTM_INREF);
-					if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
-					{
-						asCString str;
-						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-						Error(str, rexpr);
-						return -1;
-					}
-				}
-			}
-
-			if( CompileOverloadedDualOperator(opNode, lctx, rctx, ctx, true) )
-			{
-				// An overloaded assignment operator was found (or a compilation error occured)
-				return 0;
-			}
-
-			// The object must implement the opAssign method
-			asCString msg;
-			msg.Format(TXT_NO_APPROPRIATE_OPHNDLASSIGN_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-			Error(msg.AddressOf(), opNode);
-			return -1;
-		}
-		else
-		{
-			asCDataType dt = lctx->type.dataType;
-			dt.MakeReference(false);
-
-			PrepareArgument(&dt, rctx, rexpr, false, asTM_INREF , true);
-			if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
-			{
-				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-				Error(str, rexpr);
-				return -1;
-			}
-
-			MergeExprBytecode(ctx, rctx);
-			MergeExprBytecode(ctx, lctx);
-
-			ctx->bc.InstrWORD(asBC_GETOBJREF, AS_PTR_SIZE);
-
-			PerformAssignment(&lctx->type, &rctx->type, &ctx->bc, opNode);
-
-			ReleaseTemporaryVariable(rctx->type, &ctx->bc);
-
-			ctx->type = lctx->type;
-
-			// After the handle assignment the original handle is left on the stack
-			ctx->type.dataType.MakeReference(false);
-		}
-	}
-	else // if( lctx->type.dataType.IsObject() )
-	{
-		// The lvalue reference may be marked as a temporary, if for example
-		// it was originated as a handle returned from a function. In such
-		// cases it must be possible to assign values to it anyway.
-		if( lctx->type.dataType.IsObjectHandle() && !lctx->type.isExplicitHandle )
-		{
-			// Convert the handle to a object reference
-			asCDataType to;
-			to = lctx->type.dataType;
-			to.MakeHandle(false);
-			ImplicitConversion(lctx, to, lexpr, asIC_IMPLICIT_CONV);
-			lctx->type.isLValue = true; // Handle may not have been an lvalue, but the dereferenced object is
-		}
-
-		// Check for overloaded assignment operator
-		if( CompileOverloadedDualOperator(opNode, lctx, rctx, ctx) )
-		{
-			// An overloaded assignment operator was found (or a compilation error occured)
-			return 0;
-		}
-
-		// No registered operator was found. In case the operation is a direct
-		// assignment and the rvalue is the same type as the lvalue, then we can
-		// still use the byte-for-byte copy to do the assignment
-
-		if( op != ttAssignment )
-		{
-			asCString str;
-			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-			Error(str, lexpr);
-			return -1;
-		}
-
-		// If the left hand expression is simple, i.e. without any
-		// function calls or allocations of memory, then we can avoid
-		// doing a copy of the right hand expression (done by PrepareArgument).
-		// Instead the reference to the value can be placed directly on the
-		// stack.
-		//
-		// This optimization should only be done for value types, where
-		// the application developer is responsible for making the
-		// implementation safe against unwanted destruction of the input
-		// reference before the time.
-		bool simpleExpr = (lctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) && lctx->bc.IsSimpleExpression();
-
-		// Implicitly convert the rvalue to the type of the lvalue
-		bool needConversion = false;
-		if( !lctx->type.dataType.IsEqualExceptRefAndConst(rctx->type.dataType) )
-			needConversion = true;
-
-		if( !simpleExpr || needConversion )
-		{
-			asCDataType dt = lctx->type.dataType;
-			dt.MakeReference(true);
-			dt.MakeReadOnly(true);
-			int r = PrepareArgument(&dt, rctx, rexpr, true, 1, !needConversion);
-			if( r < 0 )
-				return -1;
-			if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
-			{
-				asCString str;
-				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-				Error(str, rexpr);
-				return -1;
-			}
-		}
-		else
-		{
-			// Process any property accessor first, before placing the final reference on the stack
-			ProcessPropertyGetAccessor(rctx, rexpr);
-
-			if( rctx->type.dataType.IsReference() && (!(rctx->type.isVariable || rctx->type.isTemporary) || IsVariableOnHeap(rctx->type.stackOffset)) )
-				rctx->bc.Instr(asBC_RDSPtr);
-		}
-
-		MergeExprBytecode(ctx, rctx);
-		MergeExprBytecode(ctx, lctx);
-
-		if( !simpleExpr || needConversion )
-		{
-			if( (rctx->type.isVariable || rctx->type.isTemporary) )
-			{
-				if( !IsVariableOnHeap(rctx->type.stackOffset) )
-					// TODO: runtime optimize: Actually the reference can be pushed on the stack directly
-					//                         as the value allocated on the stack is guaranteed to be safe.
-					//                         The bytecode optimizer should be able to determine this and optimize away the VAR + GETREF
-					ctx->bc.InstrWORD(asBC_GETREF, AS_PTR_SIZE);
-				else
-					ctx->bc.InstrWORD(asBC_GETOBJREF, AS_PTR_SIZE);
-			}
-		}
-
-		PerformAssignment(&lctx->type, &rctx->type, &ctx->bc, opNode);
-
-		ReleaseTemporaryVariable(rctx->type, &ctx->bc);
-
-		ctx->type = lctx->type;
-	}
-
-	return 0;
-}
-
-int asCCompiler::CompileAssignment(asCScriptNode *expr, asCExprContext *ctx)
-{
-	asCScriptNode *lexpr = expr->firstChild;
-	if( lexpr->next )
-	{
-		// Compile the two expression terms
-		asCExprContext lctx(engine), rctx(engine);
-		int rr = CompileAssignment(lexpr->next->next, &rctx);
-		int lr = CompileCondition(lexpr, &lctx);
-
-		if( lr >= 0 && rr >= 0 )
-			return DoAssignment(ctx, &lctx, &rctx, lexpr, lexpr->next->next, lexpr->next->tokenType, lexpr->next);
-
-		// Since the operands failed, the assignment was not computed
-		ctx->type.SetDummy();
-		return -1;
-	}
-
-	return CompileCondition(lexpr, ctx);
-}
-
-int asCCompiler::CompileCondition(asCScriptNode *expr, asCExprContext *ctx)
-{
-	asCExprValue ctype;
-
-	// Compile the conditional expression
-	asCScriptNode *cexpr = expr->firstChild;
-	if( cexpr->next )
-	{
-		//-------------------------------
-		// Compile the condition
-		asCExprContext e(engine);
-		int r = CompileExpression(cexpr, &e);
-		if( r < 0 )
-			e.type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
-
-		// Allow value types to be converted to bool using 'bool opImplConv()'
-		if( e.type.dataType.GetTypeInfo() && (e.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-			ImplicitConversion(&e, asCDataType::CreatePrimitive(ttBool, false), cexpr, asIC_IMPLICIT_CONV);
-
-		if( r >= 0 && !e.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
-		{
-			Error(TXT_EXPR_MUST_BE_BOOL, cexpr);
-			e.type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
-		}
-		ctype = e.type;
-
-		ProcessPropertyGetAccessor(&e, cexpr);
-
-		if( e.type.dataType.IsReference() ) ConvertToVariable(&e);
-		ProcessDeferredParams(&e);
-
-		//-------------------------------
-		// Compile the left expression
-		asCExprContext le(engine);
-		int lr = CompileAssignment(cexpr->next, &le);
-
-		// Resolve any function names already
-		DetermineSingleFunc(&le, cexpr->next);
-
-		//-------------------------------
-		// Compile the right expression
-		asCExprContext re(engine);
-		int rr = CompileAssignment(cexpr->next->next, &re);
-		DetermineSingleFunc(&re, cexpr->next->next);
-
-		if( lr >= 0 && rr >= 0 )
-		{
-			// Don't allow any operators on expressions that take address of class method
-			if( le.IsClassMethod() || re.IsClassMethod() )
-			{
-				Error(TXT_INVALID_OP_ON_METHOD, expr);
-				return -1;
-			}
-
-			ProcessPropertyGetAccessor(&le, cexpr->next);
-			ProcessPropertyGetAccessor(&re, cexpr->next->next);
-
-			bool isExplicitHandle = le.type.isExplicitHandle || re.type.isExplicitHandle;
-
-			// Allow a 0 or null in the first case to be implicitly converted to the second type
-			if( le.type.isConstant && le.type.GetConstantData() == 0 && le.type.dataType.IsIntegerType() )
-			{
-				asCDataType to = re.type.dataType;
-				to.MakeReference(false);
-				to.MakeReadOnly(true);
-				ImplicitConversionConstant(&le, to, cexpr->next, asIC_IMPLICIT_CONV);
-			}
-			else if( le.type.IsNullConstant() )
-			{
-				asCDataType to = re.type.dataType;
-				to.MakeHandle(true);
-				ImplicitConversion(&le, to, cexpr->next, asIC_IMPLICIT_CONV);
-			}
-
-			// Allow either case to be converted to const @ if the other is const @
-			if( (le.type.dataType.IsHandleToConst() && !le.type.IsNullConstant()) || (re.type.dataType.IsHandleToConst() && !re.type.dataType.IsNullHandle()) )
-			{
-				le.type.dataType.MakeHandleToConst(true);
-				re.type.dataType.MakeHandleToConst(true);
-			}
-
-			//---------------------------------
-			// Output the byte code
-			int afterLabel = nextLabel++;
-			int elseLabel = nextLabel++;
-
-			// If left expression is void, then we don't need to store the result
-			if( le.type.dataType.IsEqualExceptConst(asCDataType::CreatePrimitive(ttVoid, false)) )
-			{
-				// Put the code for the condition expression on the output
-				MergeExprBytecode(ctx, &e);
-
-				// Added the branch decision
-				ctx->type = e.type;
-				ConvertToVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_CpyVtoR4, ctx->type.stackOffset);
-				ctx->bc.Instr(asBC_ClrHi);
-				ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-				// Add the left expression
-				MergeExprBytecode(ctx, &le);
-				ctx->bc.InstrINT(asBC_JMP, afterLabel);
-
-				// Add the right expression
-				ctx->bc.Label((short)elseLabel);
-				MergeExprBytecode(ctx, &re);
-				ctx->bc.Label((short)afterLabel);
-
-				// Make sure both expressions have the same type
-				if( le.type.dataType != re.type.dataType )
-					Error(TXT_BOTH_MUST_BE_SAME, expr);
-
-				// Set the type of the result
-				ctx->type = le.type;
-			}
-			else if (le.type.IsNullConstant() && re.type.IsNullConstant())
-			{
-				// Special case for when both results are 'null'
-				// TODO: Other expressions where both results are identical literal constants can probably also be handled this way
-
-				// Put the code for the condition expression on the output
-				MergeExprBytecode(ctx, &e);
-
-				// Load the result into the register, but ignore the value since both paths give the same response
-				ctx->type = e.type;
-				ConvertToVariable(ctx);
-				ctx->bc.InstrSHORT(asBC_CpyVtoR4, ctx->type.stackOffset);
-				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-				// Return a null constant
-				ctx->bc.Instr(asBC_PshNull);
-				ctx->type.SetNullConstant();
-			}
-			else
-			{
-				// Allow "(a ? b : c) = d;" and "return (a ? b : c);" (where the latter returns the reference)
-				//
-				// Restrictions for the condition to be used as lvalue:
-				//  1. both b and c must be of the same type and be lvalue references
-				//  2. neither of the expressions can have any deferred arguments
-				//     that would have to be cleaned up after the reference
-				//  3. neither expression can be temporary
-				//
-				// If either expression is local, the resulting lvalue is not valid 
-				// for return since it is not allowed to return references to local 
-				// variables.
-				//
-				// The reference to the local variable must be loaded into the register,
-				// the resulting expression must not be considered as a local variable 
-				// with a stack offset (i.e. it will not be allowed to use asBC_VAR)
-
-				if( le.type.isLValue && re.type.isLValue &&
-					le.deferredParams.GetLength() == 0 && re.deferredParams.GetLength() ==0 &&
-					!le.type.isTemporary && !re.type.isTemporary &&
-					le.type.dataType == re.type.dataType )
-				{
-					// Put the code for the condition expression on the output
-					MergeExprBytecode(ctx, &e);
-
-					// Add the branch decision
-					ctx->type = e.type;
-					ConvertToVariable(ctx);
-					ctx->bc.InstrSHORT(asBC_CpyVtoR4, ctx->type.stackOffset);
-					ctx->bc.Instr(asBC_ClrHi);
-					ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
-					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-					// Start of the left expression
-					MergeExprBytecode(ctx, &le);
-					if( !le.type.dataType.IsReference() && le.type.isVariable )
-					{
-						// Load the address of the variable into the register
-						ctx->bc.InstrSHORT(asBC_LDV, le.type.stackOffset);
-					}
-
-					ctx->bc.InstrINT(asBC_JMP, afterLabel);
-
-					// Start of the right expression
-					ctx->bc.Label((short)elseLabel);
-
-					MergeExprBytecode(ctx, &re);
-					if( !re.type.dataType.IsReference() && re.type.isVariable )
-					{
-						// Load the address of the variable into the register
-						ctx->bc.InstrSHORT(asBC_LDV, re.type.stackOffset);
-					}
-
-					ctx->bc.Label((short)afterLabel);
-
-					// In case the options were to objects, it is necessary to dereference the pointer on 
-					// the stack so it will point to the actual object, instead of the variable
-					if( le.type.dataType.IsReference() && le.type.dataType.IsObject() && !le.type.dataType.IsObjectHandle() )
-					{
-						asASSERT( re.type.dataType.IsReference() && re.type.dataType.IsObject() && !re.type.dataType.IsObjectHandle() );
-
-						ctx->bc.Instr(asBC_RDSPtr);
-					}
-
-					// The result is an lvalue
-					ctx->type.isLValue = true;
-					ctx->type.dataType = le.type.dataType;
-					if( ctx->type.dataType.IsPrimitive() || ctx->type.dataType.IsObjectHandle() )
-						ctx->type.dataType.MakeReference(true);
-					else
-						ctx->type.dataType.MakeReference(false);
-
-					// It can't be a treated as a variable, since we don't know which one was used
-					ctx->type.isVariable = false;
-					ctx->type.isTemporary = false;
-
-					// Must remember if the reference was to a local variable, since it must not be allowed to be returned
-					ctx->type.isRefToLocal = le.type.isVariable || le.type.isRefToLocal || re.type.isVariable || re.type.isRefToLocal; 
-				}
-				else
-				{
-					// Allocate temporary variable and copy the result to that one
-					asCExprValue temp;
-					temp = le.type;
-					temp.dataType.MakeReference(false);
-					temp.dataType.MakeReadOnly(false);
-
-					// Make sure the variable isn't used in any of the expressions,
-					// as it would be overwritten which may cause crashes or less visible bugs
-					int l = int(reservedVariables.GetLength());
-					e.bc.GetVarsUsed(reservedVariables);
-					le.bc.GetVarsUsed(reservedVariables);
-					re.bc.GetVarsUsed(reservedVariables);
-					int offset = AllocateVariable(temp.dataType, true, false);
-					reservedVariables.SetLength(l);
-
-					temp.SetVariable(temp.dataType, offset, true);
-
-					// TODO: copy: Use copy constructor if available. See PrepareTemporaryVariable()
-
-					CallDefaultConstructor(temp.dataType, offset, IsVariableOnHeap(offset), &ctx->bc, expr);
-
-					// Put the code for the condition expression on the output
-					MergeExprBytecode(ctx, &e);
-
-					// Add the branch decision
-					ctx->type = e.type;
-					ConvertToVariable(ctx);
-					ctx->bc.InstrSHORT(asBC_CpyVtoR4, ctx->type.stackOffset);
-					ctx->bc.Instr(asBC_ClrHi);
-					ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
-					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-					// Assign the result of the left expression to the temporary variable
-					asCExprValue rtemp;
-					rtemp = temp;
-					if( rtemp.dataType.IsObjectHandle() )
-						rtemp.isExplicitHandle = true;
-
-					PrepareForAssignment(&rtemp.dataType, &le, cexpr->next, true);
-					MergeExprBytecode(ctx, &le);
-
-					if( !rtemp.dataType.IsPrimitive() )
-					{
-						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-						rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
-					}
-					asCExprValue result;
-					result = rtemp;
-					PerformAssignment(&result, &le.type, &ctx->bc, cexpr->next);
-					if( !result.dataType.IsPrimitive() )
-						ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
-
-					// Release the old temporary variable
-					ReleaseTemporaryVariable(le.type, &ctx->bc);
-
-					ctx->bc.InstrINT(asBC_JMP, afterLabel);
-
-					// Start of the right expression
-					ctx->bc.Label((short)elseLabel);
-
-					// Copy the result to the same temporary variable
-					PrepareForAssignment(&rtemp.dataType, &re, cexpr->next, true);
-					MergeExprBytecode(ctx, &re);
-
-					if( !rtemp.dataType.IsPrimitive() )
-					{
-						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-						rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
-					}
-					result = rtemp;
-					PerformAssignment(&result, &re.type, &ctx->bc, cexpr->next);
-					if( !result.dataType.IsPrimitive() )
-						ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
-
-					// Release the old temporary variable
-					ReleaseTemporaryVariable(re.type, &ctx->bc);
-
-					ctx->bc.Label((short)afterLabel);
-
-					// Make sure both expressions have the same type
-					if( !le.type.dataType.IsEqualExceptConst(re.type.dataType) )
-						Error(TXT_BOTH_MUST_BE_SAME, expr);
-
-					// Set the temporary variable as output
-					ctx->type = rtemp;
-					ctx->type.isExplicitHandle = isExplicitHandle;
-
-					if( !ctx->type.dataType.IsPrimitive() )
-					{
-						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-						ctx->type.dataType.MakeReference(IsVariableOnHeap(offset));
-					}
-
-					// Make sure the output isn't marked as being a literal constant
-					ctx->type.isConstant = false;
-				}
-			}
-		}
-		else
-		{
-			ctx->type.SetDummy();
-			return -1;
-		}
-	}
-	else
-		return CompileExpression(cexpr, ctx);
-
-	return 0;
-}
-
-int asCCompiler::CompileExpression(asCScriptNode *expr, asCExprContext *ctx)
-{
-	asASSERT(expr->nodeType == snExpression);
-
-	// Convert to polish post fix, i.e: a+b => ab+
-	asCArray<asCScriptNode *> postfix;
-	ConvertToPostFix(expr, postfix);
-
-	// Compile the postfix formatted expression
-	return CompilePostFixExpression(&postfix, ctx);
-}
-
-void asCCompiler::ConvertToPostFix(asCScriptNode *expr, asCArray<asCScriptNode *> &postfix)
-{
-	// The algorithm that I've implemented here is similar to
-	// Djikstra's Shunting Yard algorithm, though I didn't know it at the time.
-	// ref: http://en.wikipedia.org/wiki/Shunting-yard_algorithm
-
-	// Count the nodes in order to preallocate the buffers
-	int count = 0;
-	asCScriptNode *node = expr->firstChild;
-	while( node )
-	{
-		count++;
-		node = node->next;
-	}
-
-	asCArray<asCScriptNode *>  stackA(count);
-	asCArray<asCScriptNode *> &stackB = postfix;
-	stackB.Allocate(count, false);
-
-	node = expr->firstChild;
-	while( node )
-	{
-		int precedence = GetPrecedence(node);
-
-		while( stackA.GetLength() > 0 &&
-			   precedence <= GetPrecedence(stackA[stackA.GetLength()-1]) )
-			stackB.PushLast(stackA.PopLast());
-
-		stackA.PushLast(node);
-
-		node = node->next;
-	}
-
-	while( stackA.GetLength() > 0 )
-		stackB.PushLast(stackA.PopLast());
-}
-
-int asCCompiler::CompilePostFixExpression(asCArray<asCScriptNode *> *postfix, asCExprContext *ctx)
-{
-	// Shouldn't send any byte code
-	asASSERT(ctx->bc.GetLastInstr() == -1);
-
-	// Set the context to a dummy type to avoid further
-	// errors in case the expression fails to compile
-	ctx->type.SetDummy();
-
-	// Evaluate the operands and operators
-	asCArray<asCExprContext*> free;
-	asCArray<asCExprContext*> expr;
-	int ret = 0;
-	for( asUINT n = 0; ret == 0 && n < postfix->GetLength(); n++ )
-	{
-		asCScriptNode *node = (*postfix)[n];
-		if( node->nodeType == snExprTerm )
-		{
-			asCExprContext *e = free.GetLength() ? free.PopLast() : asNEW(asCExprContext)(engine);
-			expr.PushLast(e);
-			e->exprNode = node;
-			ret = CompileExpressionTerm(node, e);
-		}
-		else
-		{
-			asCExprContext *r = expr.PopLast();
-			asCExprContext *l = expr.PopLast();
-
-			// Now compile the operator
-			asCExprContext *e = free.GetLength() ? free.PopLast() : asNEW(asCExprContext)(engine);
-			ret = CompileOperator(node, l, r, e);
-
-			expr.PushLast(e);
-
-			// Free the operands
-			l->Clear();
-			free.PushLast(l);
-			r->Clear();
-			free.PushLast(r);
-		}
-	}
-
-	if( ret == 0 )
-	{
-		asASSERT(expr.GetLength() == 1);
-
-		// The final result should be moved to the output context
-		MergeExprBytecodeAndType(ctx, expr[0]);
-	}
-
-	// Clean up
-	for( asUINT e = 0; e < expr.GetLength(); e++ )
-		asDELETE(expr[e], asCExprContext);
-	for( asUINT f = 0; f < free.GetLength(); f++ )
-		asDELETE(free[f], asCExprContext);
-
-	return ret;
-}
-
-int asCCompiler::CompileExpressionTerm(asCScriptNode *node, asCExprContext *ctx)
-{
-	// Shouldn't send any byte code
-	asASSERT(ctx->bc.GetLastInstr() == -1);
-
-	// Check if this is an initialization of a temp object with an initialization list
-	if (node->firstChild && node->firstChild->nodeType == snDataType)
-	{
-		// TODO: It should be possible to infer the type of the object from where the
-		//       expression will be used. The compilation of the initialization list
-		//       should be deferred until it is known for what it will be used. It will
-		//       then for example be possible to write expressions like:
-		//
-		//       @dict = {{'key', 'value'}};
-		//       funcTakingArrayOfInt({1,2,3,4});
-
-		// Determine the type of the temporary object
-		asCDataType dt = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
-
-		// Do not allow constructing non-shared types in shared functions
-		if (outFunc->IsShared() &&
-			dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared())
-		{
-			asCString msg;
-			msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
-			Error(msg, node);
-		}
-
-		// Allocate and initialize the temporary object
-		int offset = AllocateVariable(dt, true);
-		CompileInitialization(node->lastChild, &ctx->bc, dt, node, offset, 0, 0);
-
-		// Push the reference to the object on the stack
-		ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-		ctx->type.SetVariable(dt, offset, true);
-		ctx->type.isLValue = false;
-
-		// If the variable is allocated on the heap we have a reference,
-		// otherwise the actual object pointer is pushed on the stack.
-		if (IsVariableOnHeap(offset))
-			ctx->type.dataType.MakeReference(true);
-
-		return 0;
-	}
-
-	// Set the type as a dummy by default, in case of any compiler errors
-	ctx->type.SetDummy();
-
-	// Compile the value node
-	asCScriptNode *vnode = node->firstChild;
-	while( vnode->nodeType != snExprValue )
-		vnode = vnode->next;
-
-	asCExprContext v(engine);
-	int r = CompileExpressionValue(vnode, &v); if( r < 0 ) return r;
-
-	// Compile post fix operators
-	asCScriptNode *pnode = vnode->next;
-	while( pnode )
-	{
-		r = CompileExpressionPostOp(pnode, &v); if( r < 0 ) return r;
-		pnode = pnode->next;
-	}
-
-	// Compile pre fix operators
-	pnode = vnode->prev;
-	while( pnode )
-	{
-		r = CompileExpressionPreOp(pnode, &v); if( r < 0 ) return r;
-		pnode = pnode->prev;
-	}
-
-	// Return the byte code and final type description
-	MergeExprBytecodeAndType(ctx, &v);
-
-	return 0;
-}
-
-int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &scope, asCExprContext *ctx, asCScriptNode *errNode, bool isOptional, bool noFunction, bool noGlobal, asCObjectType *objType)
-{
-	bool found = false;
-
-	// It is a local variable or parameter?
-	// This is not accessible by default arg expressions
-	sVariable *v = 0;
-	if( !isCompilingDefaultArg && scope == "" && !objType && variables )
-		v = variables->GetVariable(name.AddressOf());
-	if( v )
-	{
-		found = true;
-
-		if( v->isPureConstant )
-			ctx->type.SetConstantData(v->type, v->constantValue);
-		else if( v->type.IsPrimitive() )
-		{
-			if( v->type.IsReference() )
-			{
-				// Copy the reference into the register
-				ctx->bc.InstrSHORT(asBC_PshVPtr, (short)v->stackOffset);
-				ctx->bc.Instr(asBC_PopRPtr);
-				ctx->type.Set(v->type);
-			}
-			else
-				ctx->type.SetVariable(v->type, v->stackOffset, false);
-
-			// Set as lvalue unless it is a const variable
-			if( !v->type.IsReadOnly() )
-				ctx->type.isLValue = true;
-		}
-		else
-		{
-			ctx->bc.InstrSHORT(asBC_PSF, (short)v->stackOffset);
-			ctx->type.SetVariable(v->type, v->stackOffset, false);
-
-			// If the variable is allocated on the heap we have a reference,
-			// otherwise the actual object pointer is pushed on the stack.
-			if( v->onHeap || v->type.IsObjectHandle() ) ctx->type.dataType.MakeReference(true);
-
-			// Implicitly dereference handle parameters sent by reference
-			if( v->type.IsReference() && (!v->type.IsObject() || v->type.IsObjectHandle()) )
-				ctx->bc.Instr(asBC_RDSPtr);
-
-			// Set as lvalue unless it is a const variable
-			if (!v->type.IsReadOnly())
-				ctx->type.isLValue = true;
-		}
-	}
-
-	// Is it a class member?
-	// This is not accessible by default arg expressions
-	if( !isCompilingDefaultArg && !found && ((objType) || (outFunc && outFunc->objectType && scope == "")) )
-	{
-		if( name == THIS_TOKEN && !objType )
-		{
-			asCDataType dt = asCDataType::CreateType(outFunc->objectType, outFunc->isReadOnly);
-
-			// The object pointer is located at stack position 0
-			ctx->bc.InstrSHORT(asBC_PSF, 0);
-			ctx->type.SetVariable(dt, 0, false);
-			ctx->type.dataType.MakeReference(true);
-			ctx->type.isLValue = true;
-
-			found = true;
-		}
-
-		if( !found )
-		{
-			// See if there are any matching property accessors
-			asCExprContext access(engine);
-			if( objType )
-				access.type.Set(asCDataType::CreateType(objType, false));
-			else
-				access.type.Set(asCDataType::CreateType(outFunc->objectType, outFunc->isReadOnly));
-			access.type.dataType.MakeReference(true);
-			int r = 0;
-			if( errNode->next && errNode->next->tokenType == ttOpenBracket )
-			{
-				// This is an index access, check if there is a property accessor that takes an index arg
-				asCExprContext dummyArg(engine);
-				r = FindPropertyAccessor(name, &access, &dummyArg, errNode, 0, true);
-			}
-			if( r == 0 )
-			{
-				// Normal property access
-				r = FindPropertyAccessor(name, &access, errNode, 0, true);
-			}
-			if( r < 0 ) return -1;
-			if( access.property_get || access.property_set )
-			{
-				if( !objType )
-				{
-					// Prepare the bytecode for the member access
-					// This is only done when accessing through the implicit this pointer
-					ctx->bc.InstrSHORT(asBC_PSF, 0);
-				}
-				MergeExprBytecodeAndType(ctx, &access);
-
-				found = true;
-			}
-		}
-
-		if( !found )
-		{
-			asCDataType dt;
-			if( objType )
-				dt = asCDataType::CreateType(objType, false);
-			else
-				dt = asCDataType::CreateType(outFunc->objectType, false);
-			asCObjectProperty *prop = builder->GetObjectProperty(dt, name.AddressOf());
-			if( prop )
-			{
-				// Is the property access allowed?
-				if( prop->isPrivate && prop->isInherited )
-				{
-					if( engine->ep.privatePropAsProtected )
-					{
-						// The application is allowing inherited classes to access private properties of the parent
-						// class. This option is allowed to provide backwards compatibility with pre-2.30.0 versions
-						// as it was how the compiler behaved earlier.
-						asCString msg;
-						msg.Format(TXT_ACCESSING_PRIVATE_PROP_s, name.AddressOf());
-						Warning(msg, errNode);
-					}
-					else
-					{
-						asCString msg;
-						msg.Format(TXT_INHERITED_PRIVATE_PROP_ACCESS_s, name.AddressOf());
-						Error(msg, errNode);
-					}
-				}
-
-				if( !objType )
-				{
-					// The object pointer is located at stack position 0
-					// This is only done when accessing through the implicit this pointer
-					ctx->bc.InstrSHORT(asBC_PSF, 0);
-					ctx->type.SetVariable(dt, 0, false);
-					ctx->type.dataType.MakeReference(true);
-					Dereference(ctx, true);
-				}
-
-				// TODO: This is the same as what is in CompileExpressionPostOp
-				// Put the offset on the stack
-				ctx->bc.InstrSHORT_DW(asBC_ADDSi, (short)prop->byteOffset, engine->GetTypeIdFromDataType(dt));
-
-				if( prop->type.IsReference() )
-					ctx->bc.Instr(asBC_RDSPtr);
-
-				// Reference to primitive must be stored in the temp register
-				if( prop->type.IsPrimitive() )
-				{
-					// TODO: runtime optimize: The ADD offset command should store the reference in the register directly
-					ctx->bc.Instr(asBC_PopRPtr);
-				}
-
-				// Set the new type (keeping info about temp variable)
-				ctx->type.dataType = prop->type;
-				ctx->type.dataType.MakeReference(true);
-				ctx->type.isVariable = false;
-				ctx->type.isLValue = true;
-
-				if( ctx->type.dataType.IsObject() && !ctx->type.dataType.IsObjectHandle() )
-				{
-					// Objects that are members are not references
-					ctx->type.dataType.MakeReference(false);
-				}
-
-				// If the object reference is const, the property will also be const
-				ctx->type.dataType.MakeReadOnly(outFunc->isReadOnly);
-
-				found = true;
-			}
-			else if( outFunc->objectType )
-			{
-				// If it is not a property, it may still be the name of a method which can be used to create delegates
-				asCObjectType *ot = outFunc->objectType;
-				asCScriptFunction *func = 0;
-				for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
-				{
-					asCScriptFunction *f = engine->scriptFunctions[ot->methods[n]];
-					if( f->name == name &&
-					    (builder->module->accessMask & f->accessMask) )
-					{
-						func = f;
-						break;
-					}
-				}
-
-				if( func )
-				{
-					// An object method was found. Keep the name of the method in the expression, but
-					// don't actually modify the bytecode at this point since it is not yet known what
-					// the method will be used for, or even what overloaded method should be used.
-					ctx->methodName = name;
-
-					// Place the object pointer on the stack, as if the expression was this.func
-					if( !objType )
-					{
-						// The object pointer is located at stack position 0
-						// This is only done when accessing through the implicit this pointer
-						ctx->bc.InstrSHORT(asBC_PSF, 0);
-						ctx->type.SetVariable(asCDataType::CreateType(outFunc->objectType, false), 0, false);
-						ctx->type.dataType.MakeReference(true);
-						Dereference(ctx, true);
-					}
-
-					found = true;
-				}
-			}
-		}
-	}
-
-	// Recursively search parent namespaces for global entities
-	asCString currScope = scope;
-
-	// Get the namespace for this scope. This may return null if the scope is an enum
-	asSNameSpace *ns = DetermineNameSpace(currScope);
-	if( ns && currScope != "::" )
-		currScope = ns->name;
-
-	while( !found && !noGlobal && !objType )
-	{
-		// Is it a global property?
-		if( !found && ns )
-		{
-			// See if there are any matching global property accessors
-			asCExprContext access(engine);
-			int r = 0;
-			if( errNode->next && errNode->next->tokenType == ttOpenBracket )
-			{
-				// This is an index access, check if there is a property accessor that takes an index arg
-				asCExprContext dummyArg(engine);
-				r = FindPropertyAccessor(name, &access, &dummyArg, errNode, ns);
-			}
-			if( r == 0 )
-			{
-				// Normal property access
-				r = FindPropertyAccessor(name, &access, errNode, ns);
-			}
-			if( r < 0 ) return -1;
-			if( access.property_get || access.property_set )
-			{
-				// Prepare the bytecode for the function call
-				MergeExprBytecodeAndType(ctx, &access);
-
-				found = true;
-			}
-
-			// See if there is any matching global property
-			if( !found )
-			{
-				bool isCompiled = true;
-				bool isPureConstant = false;
-				bool isAppProp = false;
-				asQWORD constantValue = 0;
-				asCGlobalProperty *prop = builder->GetGlobalProperty(name.AddressOf(), ns, &isCompiled, &isPureConstant, &constantValue, &isAppProp);
-				if( prop )
-				{
-					found = true;
-
-					// Verify that the global property has been compiled already
-					if( isCompiled )
-					{
-						if( ctx->type.dataType.GetTypeInfo() && (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE) )
-						{
-							ctx->type.dataType.MakeHandle(true);
-							ctx->type.isExplicitHandle = true;
-						}
-
-						// If the global property is a pure constant
-						// we can allow the compiler to optimize it. Pure
-						// constants are global constant variables that were
-						// initialized by literal constants.
-						if (isPureConstant)
-							ctx->type.SetConstantData(prop->type, constantValue);
-						else
-						{
-							// A shared type must not access global vars, unless they
-							// too are shared, e.g. application registered vars
-							if( outFunc->IsShared() )
-							{
-								if( !isAppProp )
-								{
-									asCString str;
-									str.Format(TXT_SHARED_CANNOT_ACCESS_NON_SHARED_VAR_s, prop->name.AddressOf());
-									Error(str, errNode);
-
-									// Allow the compilation to continue to catch other problems
-								}
-							}
-
-							ctx->type.Set(prop->type);
-							ctx->type.isLValue = true;
-
-							if( ctx->type.dataType.IsPrimitive() )
-							{
-								// Load the address of the variable into the register
-								ctx->bc.InstrPTR(asBC_LDG, prop->GetAddressOfValue());
-
-								ctx->type.dataType.MakeReference(true);
-							}
-							else
-							{
-								// Push the address of the variable on the stack
-								ctx->bc.InstrPTR(asBC_PGA, prop->GetAddressOfValue());
-
-								// If the object is a value type or a non-handle variable to a reference type,
-								// then we must validate the existance as it could potentially be accessed
-								// before it is initialized.
-								// This check is not needed for application registered properties, since they
-								// are guaranteed to be valid by the application itself.
-								if( !isAppProp &&
-									((ctx->type.dataType.GetTypeInfo()->flags & asOBJ_VALUE) ||
-									 !ctx->type.dataType.IsObjectHandle()) )
-								{
-									ctx->bc.Instr(asBC_ChkRefS);
-								}
-
-								// If the address pushed on the stack is to a value type or an object
-								// handle, then mark the expression as a reference. Addresses to a reference
-								// type aren't marked as references to get correct behaviour
-								if( (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_VALUE) ||
-									ctx->type.dataType.IsObjectHandle() )
-								{
-									ctx->type.dataType.MakeReference(true);
-								}
-								else
-								{
-									asASSERT( (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !ctx->type.dataType.IsObjectHandle() );
-
-									// It's necessary to dereference the pointer so the pointer on the stack will point to the actual object
-									ctx->bc.Instr(asBC_RDSPtr);
-								}
-							}
-						}
-					}
-					else
-					{
-						asCString str;
-						str.Format(TXT_UNINITIALIZED_GLOBAL_VAR_s, prop->name.AddressOf());
-						Error(str, errNode);
-						return -1;
-					}
-				}
-			}
-		}
-
-		// Is it the name of a global function?
-		if( !noFunction && !found && ns )
-		{
-			asCArray<int> funcs;
-
-			builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
-
-			if( funcs.GetLength() > 0 )
-			{
-				found = true;
-
-				// Defer the evaluation of which function until it is actually used
-				// Store the namespace and name of the function for later
-				ctx->type.SetUndefinedFuncHandle(engine);
-				ctx->methodName = ns ? ns->name + "::" + name : name;
-			}
-		}
-
-		// Is it an enum value?
-		if( !found )
-		{
-			// The enum type may be declared in a namespace too
-			asCTypeInfo *scopeType = 0;
-			if( currScope != "" && currScope != "::" )
-			{
-				builder->GetNameSpaceByString(currScope, outFunc->objectType ? outFunc->objectType->nameSpace : outFunc->nameSpace, errNode, script, &scopeType, false);
-				if (scopeType->CastToEnumType() == 0)
-					scopeType = 0;
-			}
-
-			asDWORD value = 0;
-			asCDataType dt;
-			if( scopeType && builder->GetEnumValueFromType(scopeType->CastToEnumType(), name.AddressOf(), dt, value) )
-			{
-				// scoped enum value found
-				found = true;
-			}
-			else if( !engine->ep.requireEnumScope )
-			{
-				// Look for the enum value without explicitly informing the enum type
-				asSNameSpace *nsEnum = DetermineNameSpace(currScope);
-				int e = 0;
-				if(nsEnum)
-					e = builder->GetEnumValue(name.AddressOf(), dt, value, nsEnum);
-				if( e )
-				{
-					found = true;
-					if( e == 2 )
-					{
-						// Ambiguous enum value: Save the name for resolution later.
-						// The ambiguity could be resolved now, but I hesitate
-						// to store too much information in the context.
-						ctx->enumValue = name.AddressOf();
-
-						// We cannot set a dummy value because it will pass through
-						// cleanly as an integer.
-						ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttIdentifier, true), 0);
-						return 0;
-					}
-				}
-			}
-
-			if( found )
-			{
-				// Even if the enum type is not shared, and we're compiling a shared object,
-				// the use of the values are still allowed, since they are treated as constants.
-
-				// an enum value was resolved
-				ctx->type.SetConstantDW(dt, value);
-			}
-			else
-			{
-				// If nothing was found because the scope doesn't match a namespace or an enum
-				// then this should be reported as an error and the search interrupted
-				if( !ns && !scopeType )
-				{
-					ctx->type.SetDummy();
-					asCString str;
-					str.Format(TXT_UNKNOWN_SCOPE_s, scope.AddressOf());
-					Error(str, errNode);
-					return -1;
-				}
-			}
-		}
-
-		if( !found )
-		{
-			if( currScope == "" || currScope == "::" )
-				break;
-
-			// Move up to parent namespace
-			int pos = currScope.FindLast("::");
-			if( pos >= 0 )
-				currScope = currScope.SubString(0, pos);
-			else
-				currScope = "::";
-
-			if( ns )
-				ns = engine->GetParentNameSpace(ns);
-		}
-	}
-
-	// The name doesn't match any variable
-	if( !found )
-	{
-		// Give dummy value
-		ctx->type.SetDummy();
-
-		if( !isOptional )
-		{
-			// Prepend the scope to the name for the error message
-			asCString ename;
-			if( scope != "" && scope != "::" )
-				ename = scope + "::";
-			else
-				ename = scope;
-			ename += name;
-
-			asCString str;
-			str.Format(TXT_s_NOT_DECLARED, ename.AddressOf());
-			Error(str, errNode);
-
-			// Declare the variable now so that it will not be reported again
-			variables->DeclareVariable(name.AddressOf(), asCDataType::CreatePrimitive(ttInt, false), 0x7FFF, true);
-
-			// Mark the variable as initialized so that the user will not be bother by it again
-			v = variables->GetVariable(name.AddressOf());
-			asASSERT(v);
-			if( v ) v->isInitialized = true;
-		}
-
-		// Return -1 to signal that the variable wasn't found
-		return -1;
-	}
-
-	return 0;
-}
-
-int asCCompiler::CompileExpressionValue(asCScriptNode *node, asCExprContext *ctx)
-{
-	// Shouldn't receive any byte code
-	asASSERT(ctx->bc.GetLastInstr() == -1);
-
-	asCScriptNode *vnode = node->firstChild;
-	ctx->exprNode = vnode;
-	if( vnode->nodeType == snVariableAccess )
-	{
-		// Determine the scope resolution of the variable
-		asCString scope = builder->GetScopeFromNode(vnode->firstChild, script, &vnode);
-
-		// Determine the name of the variable
-		asASSERT(vnode->nodeType == snIdentifier );
-		asCString name(&script->code[vnode->tokenPos], vnode->tokenLength);
-
-		return CompileVariableAccess(name, scope, ctx, node);
-	}
-	else if( vnode->nodeType == snConstant )
-	{
-		if( vnode->tokenType == ttIntConstant )
-		{
-			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
-
-			asQWORD val = asStringScanUInt64(value.AddressOf(), 10, 0);
-
-			// Do we need 64 bits?
-			// If the 31st bit is set we'll treat the value as a signed 64bit number to avoid
-			// incorrect warnings about changing signs if the value is assigned to a 64bit variable
-			if( val>>31 )
-			{
-				// Only if the value uses the last bit of a 64bit word do we consider the number unsigned
-				if( val>>63 )
-					ctx->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), val);
-				else
-					ctx->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), val);
-			}
-			else
-				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), asDWORD(val));
-		}
-		else if( vnode->tokenType == ttBitsConstant )
-		{
-			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
-
-			// Let the function determine the radix from the prefix 0x = 16, 0d = 10, 0o = 8, or 0b = 2
-			// TODO: Check for overflow
-			asQWORD val = asStringScanUInt64(value.AddressOf(), 0, 0);
-
-			// Do we need 64 bits?
-			if( val>>32 )
-				ctx->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), val);
-			else
-				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), asDWORD(val));
-		}
-		else if( vnode->tokenType == ttFloatConstant )
-		{
-			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
-
-			// TODO: Check for overflow
-
-			size_t numScanned;
-			float v = float(asStringScanDouble(value.AddressOf(), &numScanned));
-			ctx->type.SetConstantF(asCDataType::CreatePrimitive(ttFloat, true), v);
-#ifndef AS_USE_DOUBLE_AS_FLOAT
-			// Don't check this if we have double as float, because then the whole token would be scanned (i.e. no f suffix)
-			asASSERT(numScanned == vnode->tokenLength - 1);
-#endif
-		}
-		else if( vnode->tokenType == ttDoubleConstant )
-		{
-			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
-
-			// TODO: Check for overflow
-
-			size_t numScanned;
-			double v = asStringScanDouble(value.AddressOf(), &numScanned);
-			ctx->type.SetConstantD(asCDataType::CreatePrimitive(ttDouble, true), v);
-			asASSERT(numScanned == vnode->tokenLength);
-		}
-		else if( vnode->tokenType == ttTrue ||
-			     vnode->tokenType == ttFalse )
-		{
-#if AS_SIZEOF_BOOL == 1
-			ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), vnode->tokenType == ttTrue ? VALUE_OF_BOOLEAN_TRUE : 0);
-#else
-			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), vnode->tokenType == ttTrue ? VALUE_OF_BOOLEAN_TRUE : 0);
-#endif
-		}
-		else if( vnode->tokenType == ttStringConstant ||
-			     vnode->tokenType == ttMultilineStringConstant ||
-				 vnode->tokenType == ttHeredocStringConstant )
-		{
-			asCString str;
-			asCScriptNode *snode = vnode->firstChild;
-			if( script->code[snode->tokenPos] == '\'' && engine->ep.useCharacterLiterals )
-			{
-				// Treat the single quoted string as a single character literal
-				str.Assign(&script->code[snode->tokenPos+1], snode->tokenLength-2);
-
-				asDWORD val = 0;
-				if( str.GetLength() && (unsigned char)str[0] > 127 && engine->ep.scanner == 1 )
-				{
-					// This is the start of a UTF8 encoded character. We need to decode it
-					val = asStringDecodeUTF8(str.AddressOf(), 0);
-					if( val == (asDWORD)-1 )
-						Error(TXT_INVALID_CHAR_LITERAL, vnode);
-				}
-				else
-				{
-					val = ProcessStringConstant(str, snode);
-					if( val == (asDWORD)-1 )
-						Error(TXT_INVALID_CHAR_LITERAL, vnode);
-				}
-
-				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), val);
-			}
-			else
-			{
-				// Process the string constants
-				while( snode )
-				{
-					asCString cat;
-					if( snode->tokenType == ttStringConstant )
-					{
-						cat.Assign(&script->code[snode->tokenPos+1], snode->tokenLength-2);
-						ProcessStringConstant(cat, snode);
-					}
-					else if( snode->tokenType == ttMultilineStringConstant )
-					{
-						if( !engine->ep.allowMultilineStrings )
-							Error(TXT_MULTILINE_STRINGS_NOT_ALLOWED, snode);
-
-						cat.Assign(&script->code[snode->tokenPos+1], snode->tokenLength-2);
-						ProcessStringConstant(cat, snode);
-					}
-					else if( snode->tokenType == ttHeredocStringConstant )
-					{
-						cat.Assign(&script->code[snode->tokenPos+3], snode->tokenLength-6);
-						ProcessHeredocStringConstant(cat, snode);
-					}
-
-					str += cat;
-
-					snode = snode->next;
-				}
-
-				// Call the string factory function to create a string object
-				asCScriptFunction *descr = engine->stringFactory;
-				if( descr == 0 )
-				{
-					// Error
-					Error(TXT_STRINGS_NOT_RECOGNIZED, vnode);
-
-					// Give dummy value
-					ctx->type.SetDummy();
-					return -1;
-				}
-				else
-				{
-					// Register the constant string with the engine
-					int id = engine->AddConstantString(str.AddressOf(), str.GetLength());
-					ctx->bc.InstrWORD(asBC_STR, (asWORD)id);
-
-					bool useVariable = false;
-					int stackOffset  = 0;
-
-					if( descr->DoesReturnOnStack() )
-					{
-						useVariable = true;
-						stackOffset = AllocateVariable(descr->returnType, true);
-						ctx->bc.InstrSHORT(asBC_PSF, short(stackOffset));
-					}
-
-					PerformFunctionCall(descr->id, ctx, false, 0, 0, useVariable, stackOffset);
-				}
-			}
-		}
-		else if( vnode->tokenType == ttNull )
-		{
-			ctx->bc.Instr(asBC_PshNull);
-			ctx->type.SetNullConstant();
-		}
-		else
-			asASSERT(false);
-	}
-	else if( vnode->nodeType == snFunctionCall )
-	{
-		// Determine the scope resolution
-		asCString scope = builder->GetScopeFromNode(vnode->firstChild, script);
-
-		return CompileFunctionCall(vnode, ctx, 0, false, scope);
-	}
-	else if( vnode->nodeType == snConstructCall )
-	{
-		return CompileConstructCall(vnode, ctx);
-	}
-	else if( vnode->nodeType == snAssignment )
-	{
-		asCExprContext e(engine);
-		int r = CompileAssignment(vnode, &e);
-		if( r < 0 )
-		{
-			ctx->type.SetDummy();
-			return r;
-		}
-		MergeExprBytecodeAndType(ctx, &e);
-	}
-	else if( vnode->nodeType == snCast )
-	{
-		// Implement the cast operator
-		return CompileConversion(vnode, ctx);
-	}
-	else if( vnode->nodeType == snUndefined && vnode->tokenType == ttVoid )
-	{
-		// This is a void expression
-		ctx->SetVoidExpression();
-	}
-	else if( vnode->nodeType == snFunction )
-	{
-		// This is an anonymous function
-		// Defer the evaluation of the function until it known where it 
-		// will be used, which is where the signature will be defined
-		ctx->SetLambda(vnode);
-	}
-	else
-		asASSERT(false);
-
-	return 0;
-}
-
-asUINT asCCompiler::ProcessStringConstant(asCString &cstr, asCScriptNode *node, bool processEscapeSequences)
-{
-	int charLiteral = -1;
-
-	// Process escape sequences
-	asCArray<char> str((int)cstr.GetLength());
-
-	for( asUINT n = 0; n < cstr.GetLength(); n++ )
-	{
-#ifdef AS_DOUBLEBYTE_CHARSET
-		// Double-byte charset is only allowed for ASCII and not UTF16 encoded strings
-		if( (cstr[n] & 0x80) && engine->ep.scanner == 0 && engine->ep.stringEncoding != 1 )
-		{
-			// This is the lead character of a double byte character
-			// include the trail character without checking it's value.
-			str.PushLast(cstr[n]);
-			n++;
-			str.PushLast(cstr[n]);
-			continue;
-		}
-#endif
-
-		asUINT val;
-
-		if( processEscapeSequences && cstr[n] == '\\' )
-		{
-			++n;
-			if( n == cstr.GetLength() )
-			{
-				if( charLiteral == -1 ) charLiteral = 0;
-				return charLiteral;
-			}
-
-			// Hexadecimal escape sequences will allow the construction of
-			// invalid unicode sequences, but the string should also work as
-			// a bytearray so we must support this. The code for working with
-			// unicode text must be prepared to handle invalid unicode sequences
-			if( cstr[n] == 'x' || cstr[n] == 'X' )
-			{
-				++n;
-				if( n == cstr.GetLength() ) break;
-
-				val = 0;
-				int c = engine->ep.stringEncoding == 1 ? 4 : 2;
-				for( ; c > 0 && n < cstr.GetLength(); c--, n++ )
-				{
-					if( cstr[n] >= '0' && cstr[n] <= '9' )
-						val = val*16 +  cstr[n] - '0';
-					else if( cstr[n] >= 'a' && cstr[n] <= 'f' )
-						val = val*16 + cstr[n] - 'a' + 10;
-					else if( cstr[n] >= 'A' && cstr[n] <= 'F' )
-						val = val*16 + cstr[n] - 'A' + 10;
-					else
-						break;
-				}
-
-				// Rewind one, since the loop will increment it again
-				n--;
-
-				// Hexadecimal escape sequences produce exact value, even if it is not proper unicode chars
-				if( engine->ep.stringEncoding == 0 )
-				{
-					str.PushLast((asBYTE)val);
-				}
-				else
-				{
-#ifndef AS_BIG_ENDIAN
-					str.PushLast((asBYTE)val);
-					str.PushLast((asBYTE)(val>>8));
-#else
-					str.PushLast((asBYTE)(val>>8));
-					str.PushLast((asBYTE)val);
-#endif
-				}
-				if( charLiteral == -1 ) charLiteral = val;
-				continue;
-			}
-			else if( cstr[n] == 'u' || cstr[n] == 'U' )
-			{
-				// \u expects 4 hex digits
-				// \U expects 8 hex digits
-				bool expect2 = cstr[n] == 'u';
-				int c = expect2 ? 4 : 8;
-
-				val = 0;
-
-				for( ; c > 0; c-- )
-				{
-					++n;
-					if( n == cstr.GetLength() ) break;
-
-					if( cstr[n] >= '0' && cstr[n] <= '9' )
-						val = val*16 + cstr[n] - '0';
-					else if( cstr[n] >= 'a' && cstr[n] <= 'f' )
-						val = val*16 + cstr[n] - 'a' + 10;
-					else if( cstr[n] >= 'A' && cstr[n] <= 'F' )
-						val = val*16 + cstr[n] - 'A' + 10;
-					else
-						break;
-				}
-
-				if( c != 0 )
-				{
-					// Give warning about invalid code point
-					// TODO: Need code position for warning
-					asCString msg;
-					msg.Format(TXT_INVALID_UNICODE_FORMAT_EXPECTED_d, expect2 ? 4 : 8);
-					Warning(msg, node);
-					continue;
-				}
-			}
-			else
-			{
-				if( cstr[n] == '"' )
-					val = '"';
-				else if( cstr[n] == '\'' )
-					val = '\'';
-				else if( cstr[n] == 'n' )
-					val = '\n';
-				else if( cstr[n] == 'r' )
-					val = '\r';
-				else if( cstr[n] == 't' )
-					val = '\t';
-				else if( cstr[n] == '0' )
-					val = '\0';
-				else if( cstr[n] == '\\' )
-					val = '\\';
-				else
-				{
-					// Invalid escape sequence
-					Warning(TXT_INVALID_ESCAPE_SEQUENCE, node);
-					continue;
-				}
-			}
-		}
-		else
-		{
-			if( engine->ep.scanner == 1 && (cstr[n] & 0x80) )
-			{
-				unsigned int len;
-				val = asStringDecodeUTF8(&cstr[n], &len);
-				if( val == 0xFFFFFFFF )
-				{
-					// Incorrect UTF8 encoding. Use only the first byte
-					// TODO: Need code position for warning
-					Warning(TXT_INVALID_UNICODE_SEQUENCE_IN_SRC, node);
-					val = (unsigned char)cstr[n];
-				}
-				else
-					n += len-1;
-			}
-			else
-				val = (unsigned char)cstr[n];
-		}
-
-		// Add the character to the final string
-		char encodedValue[5];
-		int len;
-		if( engine->ep.scanner == 1 && engine->ep.stringEncoding == 0 )
-		{
-			// Convert to UTF8 encoded
-			len = asStringEncodeUTF8(val, encodedValue);
-		}
-		else if( engine->ep.stringEncoding == 1 )
-		{
-			// Convert to 16bit wide character string (even if the script is scanned as ASCII)
-			len = asStringEncodeUTF16(val, encodedValue);
-		}
-		else
-		{
-			// Do not convert ASCII characters
-			encodedValue[0] = (asBYTE)val;
-			len = 1;
-		}
-
-		if( len < 0 )
-		{
-			// Give warning about invalid code point
-			// TODO: Need code position for warning
-			Warning(TXT_INVALID_UNICODE_VALUE, node);
-		}
-		else
-		{
-			// Add the encoded value to the final string
-			str.Concatenate(encodedValue, len);
-			if( charLiteral == -1 ) charLiteral = val;
-		}
-	}
-
-	cstr.Assign(str.AddressOf(), str.GetLength());
-	return charLiteral;
-}
-
-void asCCompiler::ProcessHeredocStringConstant(asCString &str, asCScriptNode *node)
-{
-	// Remove first line if it only contains whitespace
-	bool isMultiline = false;
-	int start;
-	for( start = 0; start < (int)str.GetLength(); start++ )
-	{
-		if( str[start] == '\n' )
-		{
-			isMultiline = true;
-
-			// Remove the linebreak as well
-			start++;
-			break;
-		}
-
-		if( str[start] != ' '  &&
-			str[start] != '\t' &&
-			str[start] != '\r' )
-		{
-			// Don't remove anything
-			start = 0;
-			break;
-		}
-	}
-
-	// Remove the line after the last line break if it only contains whitespaces
-	int end;
-	for( end = (int)str.GetLength() - 1; end >= 0; end-- )
-	{
-		if( str[end] == '\n' )
-		{
-			// Don't remove the last line break
-			end++;
-			break;
-		}
-
-		if( str[end] != ' '  &&
-			str[end] != '\t' &&
-			str[end] != '\r' )
-		{
-			// Don't remove anything
-			end = (int)str.GetLength();
-			break;
-		}
-	}
-
-	if( end < 0 ) end = 0;
-
-	asCString tmp;
-	if (end > start || engine->ep.heredocTrimMode != 2 )
-	{
-		// if heredocTrimMode == 0 the string shouldn't be trimmed
-		// if heredocTrimMode == 1 the string should only be trimmed if it is multiline
-		// if heredocTrimMode == 2 the string should always be trimmed
-		if (engine->ep.heredocTrimMode == 2 || (isMultiline && engine->ep.heredocTrimMode == 1))
-			tmp.Assign(&str[start], end - start);
-		else
-			tmp = str;
-	}
-
-	ProcessStringConstant(tmp, node, false);
-
-	str = tmp;
-}
-
-int asCCompiler::CompileConversion(asCScriptNode *node, asCExprContext *ctx)
-{
-	asCExprContext expr(engine);
-	asCDataType to;
-	bool anyErrors = false;
-	EImplicitConv convType;
-	if( node->nodeType == snConstructCall )
-	{
-		convType = asIC_EXPLICIT_VAL_CAST;
-
-		// Verify that there is only one argument
-		if( node->lastChild->firstChild == 0 ||
-			node->lastChild->firstChild != node->lastChild->lastChild )
-		{
-			Error(TXT_ONLY_ONE_ARGUMENT_IN_CAST, node->lastChild);
-			expr.type.SetDummy();
-			anyErrors = true;
-		}
-		else
-		{
-			// Compile the expression
-			int r = CompileAssignment(node->lastChild->firstChild, &expr);
-			if( r < 0 )
-				anyErrors = true;
-		}
-
-		// Determine the requested type
-		to = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
-		to.MakeReadOnly(true); // Default to const
-		asASSERT(to.IsPrimitive());
-	}
-	else
-	{
-		convType = asIC_EXPLICIT_REF_CAST;
-
-		// Compile the expression
-		int r = CompileAssignment(node->lastChild, &expr);
-		if( r < 0 )
-			anyErrors = true;
-
-		// Determine the requested type
-		to = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
-
-		// If the type support object handles, then use it
-		if( to.SupportHandles() )
-		{
-			to.MakeHandle(true);
-			if( expr.type.dataType.IsObjectConst() )
-				to.MakeHandleToConst(true);
-		}
-		else if( !to.IsObjectHandle() )
-		{
-			// The cast<type> operator can only be used for reference casts
-			Error(TXT_ILLEGAL_TARGET_TYPE_FOR_REF_CAST, node->firstChild);
-			anyErrors = true;
-		}
-	}
-
-	// Do not allow casting to non shared type if we're compiling a shared method
-	if( outFunc->IsShared() &&
-		to.GetTypeInfo() && !to.GetTypeInfo()->IsShared() )
-	{
-		asCString msg;
-		msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, to.GetTypeInfo()->name.AddressOf());
-		Error(msg, node);
-		anyErrors = true;
-	}
-
-	if( anyErrors )
-	{
-		// Assume that the error can be fixed and allow the compilation to continue
-		ctx->type.Set(to);
-		return -1;
-	}
-
-	ProcessPropertyGetAccessor(&expr, node);
-
-	// Don't allow any operators on expressions that take address of class method
-	if( expr.IsClassMethod() )
-	{
-		Error(TXT_INVALID_OP_ON_METHOD, node);
-		return -1;
-	}
-
-	// We don't want a reference for conversion casts
-	if( convType == asIC_EXPLICIT_VAL_CAST && expr.type.dataType.IsReference() )
-	{
-		if( expr.type.dataType.IsObject() )
-			Dereference(&expr, true);
-		else
-			ConvertToVariable(&expr);
-	}
-
-	ImplicitConversion(&expr, to, node, convType);
-
-	IsVariableInitialized(&expr.type, node);
-
-	// If no type conversion is really tried ignore it
-	if( to == expr.type.dataType )
-	{
-		// This will keep information about constant type
-		MergeExprBytecode(ctx, &expr);
-		ctx->type = expr.type;
-		return 0;
-	}
-
-	if( to.IsEqualExceptRefAndConst(expr.type.dataType) && to.IsPrimitive() )
-	{
-		MergeExprBytecode(ctx, &expr);
-		ctx->type = expr.type;
-		ctx->type.dataType.MakeReadOnly(true);
-		return 0;
-	}
-
-	// The implicit conversion already does most of the conversions permitted,
-	// here we'll only treat those conversions that require an explicit cast.
-
-	bool conversionOK = false;
-	if( !expr.type.isConstant && expr.type.dataType != asCDataType::CreatePrimitive(ttVoid, false) )
-	{
-		if( !expr.type.dataType.IsObject() )
-			ConvertToTempVariable(&expr);
-
-		if( to.IsObjectHandle() &&
-			expr.type.dataType.IsObjectHandle() &&
-			!(!to.IsHandleToConst() && expr.type.dataType.IsHandleToConst()) )
-		{
-			conversionOK = CompileRefCast(&expr, to, true, node);
-
-			MergeExprBytecode(ctx, &expr);
-			ctx->type = expr.type;
-		}
-	}
-
-	if( conversionOK )
-		return 0;
-
-	// Conversion not available
-	ctx->type.SetDummy();
-
-	asCString strTo, strFrom;
-
-	strTo = to.Format(outFunc->nameSpace);
-	strFrom = expr.type.dataType.Format(outFunc->nameSpace);
-
-	asCString msg;
-	msg.Format(TXT_NO_CONVERSION_s_TO_s, strFrom.AddressOf(), strTo.AddressOf());
-
-	Error(msg, node);
-	return -1;
-}
-
-void asCCompiler::AfterFunctionCall(int funcID, asCArray<asCExprContext*> &args, asCExprContext *ctx, bool deferAll)
-{
-	// deferAll is set to true if for example the function returns a reference, since in 
-	// this case the function might be returning a reference to one of the arguments.
-
-	asCScriptFunction *descr = builder->GetFunctionDescription(funcID);
-
-	// Parameters that are sent by reference should be assigned
-	// to the evaluated expression if it is an lvalue
-
-	// Evaluate the arguments from last to first
-	int n = (int)descr->parameterTypes.GetLength() - 1;
-	for( ; n >= 0; n-- )
-	{
-		// All &out arguments must be deferred, except if the argument is clean, in which case the actual reference was passed in to the function
-		// If deferAll is set all objects passed by reference or handle must be deferred
-		if( (descr->parameterTypes[n].IsReference() && (descr->inOutFlags[n] & asTM_OUTREF) && !args[n]->isCleanArg) ||
-			(descr->parameterTypes[n].IsObject() && deferAll && (descr->parameterTypes[n].IsReference() || descr->parameterTypes[n].IsObjectHandle())) )
-		{
-			asASSERT( !(descr->parameterTypes[n].IsReference() && (descr->inOutFlags[n] == asTM_OUTREF) && !args[n]->isCleanArg) || args[n]->origExpr );
-
-			// For &inout, only store the argument if it is for a temporary variable
-			if( engine->ep.allowUnsafeReferences ||
-				descr->inOutFlags[n] != asTM_INOUTREF || args[n]->type.isTemporary )
-			{
-				// Store the argument for later processing
-				asSDeferredParam outParam;
-				outParam.argNode = args[n]->exprNode;
-				outParam.argType = args[n]->type;
-				outParam.argInOutFlags = descr->inOutFlags[n];
-				outParam.origExpr = args[n]->origExpr;
-
-				ctx->deferredParams.PushLast(outParam);
-			}
-		}
-		else
-		{
-			// Release the temporary variable now
-			ReleaseTemporaryVariable(args[n]->type, &ctx->bc);
-		}
-
-		// Move the argument's deferred expressions over to the final expression
-		for( asUINT m = 0; m < args[n]->deferredParams.GetLength(); m++ )
-		{
-			ctx->deferredParams.PushLast(args[n]->deferredParams[m]);
-			args[n]->deferredParams[m].origExpr = 0;
-		}
-		args[n]->deferredParams.SetLength(0);
-	}
-}
-
-void asCCompiler::ProcessDeferredParams(asCExprContext *ctx)
-{
-	if( isProcessingDeferredParams ) return;
-
-	isProcessingDeferredParams = true;
-
-	for( asUINT n = 0; n < ctx->deferredParams.GetLength(); n++ )
-	{
-		asSDeferredParam outParam = ctx->deferredParams[n];
-		if( outParam.argInOutFlags < asTM_OUTREF ) // &in, or not reference
-		{
-			// Just release the variable
-			ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
-		}
-		else if( outParam.argInOutFlags == asTM_OUTREF )
-		{
-			asCExprContext *expr = outParam.origExpr;
-			outParam.origExpr = 0;
-
-			if( outParam.argType.dataType.IsObjectHandle() )
-			{
-				// Implicitly convert the value to a handle
-				if( expr->type.dataType.IsObjectHandle() )
-					expr->type.isExplicitHandle = true;
-			}
-
-			// Verify that the expression result in a lvalue, or a property accessor
-			if( IsLValue(expr->type) || expr->property_get || expr->property_set )
-			{
-				asCExprContext rctx(engine);
-				rctx.type = outParam.argType;
-				if( rctx.type.dataType.IsPrimitive() )
-					rctx.type.dataType.MakeReference(false);
-				else
-				{
-					rctx.bc.InstrSHORT(asBC_PSF, outParam.argType.stackOffset);
-					rctx.type.dataType.MakeReference(IsVariableOnHeap(outParam.argType.stackOffset));
-					if( expr->type.isExplicitHandle )
-						rctx.type.isExplicitHandle = true;
-				}
-
-				asCExprContext o(engine);
-				DoAssignment(&o, expr, &rctx, outParam.argNode, outParam.argNode, ttAssignment, outParam.argNode);
-
-				if( !o.type.dataType.IsPrimitive() ) o.bc.Instr(asBC_PopPtr);
-
-				// The assignment may itself have resulted in a new temporary variable, e.g. if
-				// the opAssign returns a non-reference. We must release this temporary variable
-				// since it won't be used
-				ReleaseTemporaryVariable(o.type, &o.bc);
-
-				MergeExprBytecode(ctx, &o);
-			}
-			else
-			{
-				// We must still evaluate the expression
-				MergeExprBytecode(ctx, expr);
-				if( !expr->IsVoidExpression() && (!expr->type.isConstant || expr->type.IsNullConstant()) )
-					ctx->bc.Instr(asBC_PopPtr);
-
-				// Give an error, except if the argument is void, null or 0 which indicate the argument is explicitly to be ignored
-				if( !expr->IsVoidExpression() && !expr->type.IsNullConstant() && !(expr->type.isConstant && expr->type.GetConstantData() == 0) )
-					Error(TXT_ARG_NOT_LVALUE, outParam.argNode);
-
-				ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
-			}
-
-			ReleaseTemporaryVariable(expr->type, &ctx->bc);
-
-			// Delete the original expression context
-			asDELETE(expr, asCExprContext);
-		}
-		else // &inout
-		{
-			if( outParam.argType.isTemporary )
-				ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
-			else if( !outParam.argType.isVariable )
-			{
-				if( outParam.argType.dataType.IsObject() &&
-					((outParam.argType.dataType.GetBehaviour()->addref &&
-					  outParam.argType.dataType.GetBehaviour()->release) ||
-					 (outParam.argType.dataType.GetTypeInfo()->flags & asOBJ_NOCOUNT)) )
-				{
-					// Release the object handle that was taken to guarantee the reference
-					ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
-				}
-			}
-		}
-	}
-
-	ctx->deferredParams.SetLength(0);
-	isProcessingDeferredParams = false;
-}
-
-
-int asCCompiler::CompileConstructCall(asCScriptNode *node, asCExprContext *ctx)
-{
-	// The first node is a datatype node
-	asCString name;
-	asCExprValue tempObj;
-	bool onHeap = true;
-	asCArray<int> funcs;
-	bool error = false;
-
-	// It is possible that the name is really a constructor
-	asCDataType dt;
-	dt = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
-	if( dt.IsPrimitive() )
-	{
-		// This is a cast to a primitive type
-		return CompileConversion(node, ctx);
-	}
-
-	if( dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE) )
-	{
-		// Types declared as implicit handle must not attempt to construct a handle
-		dt.MakeHandle(false);
-	}
-
-	// Don't accept syntax like object@(expr)
-	if( dt.IsObjectHandle() )
-	{
-		asCString str;
-		str.Format(TXT_CANT_CONSTRUCT_s_USE_REF_CAST, dt.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-		ctx->type.SetDummy();
-		return -1;
-	}
-
-	// Make sure the desired type can actually be instantiated
-	// Delegates are allowed to be created through construct calls, 
-	// even though they cannot be instantiated as variables
-	if( !dt.CanBeInstantiated() && !dt.IsFuncdef() )
-	{
-		asCString str;
-		if( dt.IsAbstractClass() )
-			str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(outFunc->nameSpace).AddressOf());
-		else if( dt.IsInterface() )
-			str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(outFunc->nameSpace).AddressOf());
-		else
-			// TODO: Improve error message to explain why
-			str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-		ctx->type.SetDummy();
-		return -1;
-	}
-
-	// Do not allow constructing non-shared types in shared functions
-	if( outFunc->IsShared() &&
-		dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared() )
-	{
-		asCString msg;
-		msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
-		Error(msg, node);
-		return -1;
-	}
-
-	// Compile the arguments
-	asCArray<asCExprContext *> args;
-	asCArray<asSNamedArgument> namedArgs;
-	asCArray<asCExprValue> temporaryVariables;
-	if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
-	{
-		// Check for a value cast behaviour
-		if( args.GetLength() == 1 && args[0]->type.dataType.GetTypeInfo() )
-		{
-			asCExprContext conv(engine);
-			conv.type = args[0]->type;
-			asUINT cost = ImplicitConversion(&conv, dt, node->lastChild, asIC_EXPLICIT_VAL_CAST, false);
-
-			// Don't use this if the cost is 0 because it would mean that nothing
-			// is done and the scipt wants a new value to be constructed
-			if( conv.type.dataType.IsEqualExceptRef(dt) && cost > 0 )
-			{
-				ImplicitConversion(args[0], dt, node->lastChild, asIC_EXPLICIT_VAL_CAST);
-
-				ctx->bc.AddCode(&args[0]->bc);
-				ctx->type = args[0]->type;
-
-				asDELETE(args[0], asCExprContext);
-
-				return 0;
-			}
-		}
-
-		// Check for possible constructor/factory
-		name = dt.Format(outFunc->nameSpace);
-
-		asSTypeBehaviour *beh = dt.GetBehaviour();
-
-		if( !(dt.GetTypeInfo()->flags & asOBJ_REF) && !dt.IsFuncdef() )
-		{
-			funcs = beh->constructors;
-
-			// Value types and script types are allocated through the constructor
-			tempObj.dataType = dt;
-			tempObj.stackOffset = (short)AllocateVariable(dt, true);
-			tempObj.dataType.MakeReference(true);
-			tempObj.isTemporary = true;
-			tempObj.isVariable = true;
-
-			onHeap = IsVariableOnHeap(tempObj.stackOffset);
-
-			// Push the address of the object on the stack
-			if( onHeap )
-				ctx->bc.InstrSHORT(asBC_VAR, tempObj.stackOffset);
-		}
-		else if( beh )
-			funcs = beh->factories;
-
-		// Special case: Allow calling func(void) with a void expression.
-		if( args.GetLength() == 1 && args[0]->type.dataType == asCDataType::CreatePrimitive(ttVoid, false) )
-		{
-			// Evaluate the expression before the function call
-			MergeExprBytecode(ctx, args[0]);
-			asDELETE(args[0], asCExprContext);
-			args.SetLength(0);
-		}
-
-		// Special case: If this is an object constructor and there are no arguments use the default constructor.
-		// If none has been registered, just allocate the variable and push it on the stack.
-		if( args.GetLength() == 0 )
-		{
-			beh = tempObj.dataType.GetBehaviour();
-			if( beh && beh->construct == 0 && !(dt.GetTypeInfo()->flags & asOBJ_REF) )
-			{
-				// Call the default constructor
-				ctx->type = tempObj;
-
-				if( onHeap )
-				{
-					asASSERT(ctx->bc.GetLastInstr() == asBC_VAR);
-					ctx->bc.RemoveLastInstr();
-				}
-
-				CallDefaultConstructor(tempObj.dataType, tempObj.stackOffset, IsVariableOnHeap(tempObj.stackOffset), &ctx->bc, node);
-
-				// Push the reference on the stack
-				ctx->bc.InstrSHORT(asBC_PSF, tempObj.stackOffset);
-				return 0;
-			}
-		}
-
-		// Special case: If this is a construction of a delegate and the expression names an object method
-		if( dt.IsFuncdef() && args.GetLength() == 1 && args[0]->methodName != "" )
-		{
-			// TODO: delegate: It is possible that the argument returns a function pointer already, in which
-			//                 case no object delegate will be created, but instead a delegate for a function pointer
-			//                 In theory a simple cast would be good in this case, but this is a construct call so it
-			//                 is expected that a new object is created.
-
-			dt.MakeHandle(true);
-			ctx->type.Set(dt);
-
-			// The delegate must be able to hold on to a reference to the object
-			if( !args[0]->type.dataType.SupportHandles() )
-			{
-				Error(TXT_CANNOT_CREATE_DELEGATE_FOR_NOREF_TYPES, node);
-				error = true;
-			}
-			else
-			{
-				// Filter the available object methods to find the one that matches the func def
-				asCObjectType *type = args[0]->type.dataType.GetTypeInfo()->CastToObjectType();
-				asCScriptFunction *bestMethod = 0;
-				for( asUINT n = 0; n < type->methods.GetLength(); n++ )
-				{
-					asCScriptFunction *func = engine->scriptFunctions[type->methods[n]];
-
-					if( func->name != args[0]->methodName )
-						continue;
-
-					// If the expression is for a const object, then only const methods should be accepted
-					if( args[0]->type.dataType.IsReadOnly() && !func->IsReadOnly() )
-						continue;
-
-					if( func->IsSignatureExceptNameAndObjectTypeEqual(dt.GetTypeInfo()->CastToFuncdefType()->funcdef) )
-					{
-						bestMethod = func;
-
-						// If the expression is non-const the non-const overloaded method has priority
-						if( args[0]->type.dataType.IsReadOnly() == func->IsReadOnly() )
-							break;
-					}
-				}
-
-				if( bestMethod )
-				{
-					// The object pointer is already on the stack
-					MergeExprBytecode(ctx, args[0]);
-
-					// Push the function pointer as an additional argument
-					ctx->bc.InstrPTR(asBC_FuncPtr, bestMethod);
-
-					// Call the factory function for the delegate
-					asCArray<int> delegateFuncs;
-					builder->GetFunctionDescriptions(DELEGATE_FACTORY, delegateFuncs, engine->nameSpaces[0]);
-					asASSERT(delegateFuncs.GetLength() == 1 );
-					ctx->bc.Call(asBC_CALLSYS , delegateFuncs[0], 2*AS_PTR_SIZE);
-
-					// Store the returned delegate in a temporary variable
-					int returnOffset = AllocateVariable(dt, true, false);
-					dt.MakeReference(true);
-					ctx->type.SetVariable(dt, returnOffset, true);
-					ctx->bc.InstrSHORT(asBC_STOREOBJ, (short)returnOffset);
-
-					// Push a reference to the temporary variable on the stack
-					ctx->bc.InstrSHORT(asBC_PSF, (short)returnOffset);
-
-					// Clean up arguments
-					ReleaseTemporaryVariable(args[0]->type, &ctx->bc);
-				}
-				else
-				{
-					asCString msg;
-					msg.Format(TXT_NO_MATCHING_SIGNATURES_TO_s, dt.GetTypeInfo()->CastToFuncdefType()->funcdef->GetDeclaration());
-					Error(msg.AddressOf(), node);
-					error = true;
-				}
-			}
-
-			// Clean-up arg
-			asDELETE(args[0], asCExprContext);
-			return error ? -1 : 0;
-		}
-
-		MatchFunctions(funcs, args, node, name.AddressOf(), &namedArgs, 0, false);
-
-		if( funcs.GetLength() != 1 )
-		{
-			// The error was reported by MatchFunctions()
-			error = true;
-
-			// Dummy value
-			ctx->type.SetDummy();
-		}
-		else
-		{
-			// TODO: Clean up: Merge this with MakeFunctionCall
-
-			// Add the default values for arguments not explicitly supplied
-			int r = CompileDefaultAndNamedArgs(node, args, funcs[0], dt.GetTypeInfo()->CastToObjectType(), &namedArgs);
-
-			if( r == asSUCCESS )
-			{
-				asCByteCode objBC(engine);
-
-				PrepareFunctionCall(funcs[0], &ctx->bc, args);
-
-				MoveArgsToStack(funcs[0], &ctx->bc, args, false);
-
-				if( !(dt.GetTypeInfo()->flags & asOBJ_REF) )
-				{
-					// If the object is allocated on the stack, then call the constructor as a normal function
-					if( onHeap )
-					{
-						int offset = 0;
-						asCScriptFunction *descr = builder->GetFunctionDescription(funcs[0]);
-						for( asUINT n = 0; n < args.GetLength(); n++ )
-							offset += descr->parameterTypes[n].GetSizeOnStackDWords();
-
-						ctx->bc.InstrWORD(asBC_GETREF, (asWORD)offset);
-					}
-					else
-						ctx->bc.InstrSHORT(asBC_PSF, tempObj.stackOffset);
-
-					PerformFunctionCall(funcs[0], ctx, onHeap, &args, tempObj.dataType.GetTypeInfo()->CastToObjectType());
-
-					// Add tag that the object has been initialized
-					ctx->bc.ObjInfo(tempObj.stackOffset, asOBJ_INIT);
-
-					// The constructor doesn't return anything,
-					// so we have to manually inform the type of
-					// the return value
-					ctx->type = tempObj;
-					if( !onHeap )
-						ctx->type.dataType.MakeReference(false);
-
-					// Push the address of the object on the stack again
-					ctx->bc.InstrSHORT(asBC_PSF, tempObj.stackOffset);
-				}
-				else
-				{
-					// Call the factory to create the reference type
-					PerformFunctionCall(funcs[0], ctx, false, &args);
-				}
-			}
-			else
-				error = true;
-		}
-	}
-	else
-	{
-		// Failed to compile the argument list, set the result to the dummy type
-		ctx->type.SetDummy();
-		error = true;
-	}
-
-	// Cleanup
-	for( asUINT n = 0; n < args.GetLength(); n++ )
-		if( args[n] )
-		{
-			asDELETE(args[n], asCExprContext);
-		}
-	for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
-		if( namedArgs[n].ctx )
-		{
-			asDELETE(namedArgs[n].ctx, asCExprContext);
-		}
-
-	return error ? -1 : 0;
-}
-
-
-int asCCompiler::CompileFunctionCall(asCScriptNode *node, asCExprContext *ctx, asCObjectType *objectType, bool objIsConst, const asCString &scope)
-{
-	asCExprValue tempObj;
-	asCArray<int> funcs;
-	int localVar = -1;
-	bool initializeMembers = false;
-	asCExprContext funcExpr(engine);
-
-	asCScriptNode *nm = node->lastChild->prev;
-	asCString name(&script->code[nm->tokenPos], nm->tokenLength);
-
-	// First check for a local variable as it would take precedence
-	// Must not allow function names, nor global variables to be returned in this instance
-	// If objectType is set then this is a post op expression and we shouldn't look for local variables
-	if( objectType == 0 )
-	{
-		localVar = CompileVariableAccess(name, scope, &funcExpr, node, true, true, true);
-		if( localVar >= 0 &&
-			!(funcExpr.type.dataType.IsFuncdef() || funcExpr.type.dataType.IsObject()) &&
-			funcExpr.methodName == "" )
-		{
-			// The variable is not a function or object with opCall
-			asCString msg;
-			msg.Format(TXT_NOT_A_FUNC_s_IS_VAR, name.AddressOf());
-			Error(msg, node);
-			return -1;
-		}
-
-		// If the name matches a method name, then reset the indicator that nothing was found
-		if( funcExpr.methodName != "" )
-			localVar = -1;
-	}
-
-	if( localVar < 0 )
-	{
-		// If this is an expression post op, or if a class method is
-		// being compiled, then we should look for matching class methods
-		if( objectType || (outFunc && outFunc->objectType && scope != "::") )
-		{
-			// If we're compiling a constructor and the name of the function is super then
-			// the constructor of the base class is being called.
-			// super cannot be prefixed with a scope operator
-			if( scope == "" && m_isConstructor && name == SUPER_TOKEN )
-			{
-				// If the class is not derived from anyone else, calling super should give an error
-				if( outFunc && outFunc->objectType->derivedFrom )
-					funcs = outFunc->objectType->derivedFrom->beh.constructors;
-
-				// Must not allow calling base class' constructor multiple times
-				if( continueLabels.GetLength() > 0 )
-				{
-					// If a continue label is set we are in a loop
-					Error(TXT_CANNOT_CALL_CONSTRUCTOR_IN_LOOPS, node);
-				}
-				else if( breakLabels.GetLength() > 0 )
-				{
-					// TODO: inheritance: Should eventually allow constructors in switch statements
-					// If a break label is set we are either in a loop or a switch statements
-					Error(TXT_CANNOT_CALL_CONSTRUCTOR_IN_SWITCH, node);
-				}
-				else if( m_isConstructorCalled )
-				{
-					Error(TXT_CANNOT_CALL_CONSTRUCTOR_TWICE, node);
-				}
-				m_isConstructorCalled = true;
-
-				// We need to initialize the class members, but only after all the deferred arguments have been completed
-				initializeMembers = true;
-			}
-			else
-			{
-				// The scope can be used to specify the base class
-				builder->GetObjectMethodDescriptions(name.AddressOf(), objectType ? objectType : outFunc->objectType, funcs, objIsConst, scope, node, script);
-			}
-
-			// It is still possible that there is a class member of a function type or a type with opCall methods
-			if( funcs.GetLength() == 0 )
-			{
-				int r = CompileVariableAccess(name, scope, &funcExpr, node, true, true, true, objectType);
-				if( r >= 0 &&
-					!(funcExpr.type.dataType.IsFuncdef() || funcExpr.type.dataType.IsObject()) &&
-					funcExpr.methodName == "" )
-				{
-					// The variable is not a function
-					asCString msg;
-					msg.Format(TXT_NOT_A_FUNC_s_IS_VAR, name.AddressOf());
-					Error(msg, node);
-					return -1;
-				}
-
-				// If the name is an access property, make sure the original value isn't
-				// dereferenced when calling the access property as part a dot post operator
-				if( objectType && (funcExpr.property_get || funcExpr.property_set) && !ctx->type.dataType.IsReference() )
-					funcExpr.property_ref = false;
-			}
-
-			// If a class method is being called implicitly, then add the this pointer for the call
-			if( funcs.GetLength() && !objectType )
-			{
-				objectType = outFunc->objectType;
-
-				asCDataType dt = asCDataType::CreateType(objectType, false);
-
-				// The object pointer is located at stack position 0
-				ctx->bc.InstrSHORT(asBC_PSF, 0);
-				ctx->type.SetVariable(dt, 0, false);
-				ctx->type.dataType.MakeReference(true);
-
-				Dereference(ctx, true);
-			}
-		}
-
-		// If it is not a class method or member function pointer,
-		// then look for global functions or global function pointers,
-		// unless this is an expression post op, incase only member
-		// functions are expected
-		if( objectType == 0 && funcs.GetLength() == 0 && (!funcExpr.type.dataType.IsFuncdef() || funcExpr.type.dataType.IsObject()) )
-		{
-			// The scope is used to define the namespace
-			asSNameSpace *ns = DetermineNameSpace(scope);
-			if( ns )
-			{
-				// Search recursively in parent namespaces
-				while( ns && funcs.GetLength() == 0 && !funcExpr.type.dataType.IsFuncdef() )
-				{
-					builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
-					if( funcs.GetLength() == 0 )
-					{
-						int r = CompileVariableAccess(name, scope, &funcExpr, node, true, true);
-						if( r >= 0 &&
-							!(funcExpr.type.dataType.IsFuncdef() || funcExpr.type.dataType.IsObject()) &&
-							funcExpr.methodName == "" )
-						{
-							// The variable is not a function
-							asCString msg;
-							msg.Format(TXT_NOT_A_FUNC_s_IS_VAR, name.AddressOf());
-							Error(msg, node);
-							return -1;
-						}
-					}
-
-					ns = engine->GetParentNameSpace(ns);
-				}
-			}
-			else
-			{
-				asCString msg;
-				msg.Format(TXT_NAMESPACE_s_DOESNT_EXIST, scope.AddressOf());
-				Error(msg, node);
-				return -1;
-			}
-		}
-	}
-
-	if( funcs.GetLength() == 0 )
-	{
-		if( funcExpr.type.dataType.IsFuncdef() )
-		{
-			funcs.PushLast(funcExpr.type.dataType.GetTypeInfo()->CastToFuncdefType()->funcdef->id);
-		}
-		else if( funcExpr.type.dataType.IsObject() )
-		{
-			// Keep information about temporary variables as deferred expression so it can be properly cleaned up after the call
-			if( ctx->type.isTemporary )
-			{
-				asASSERT( objectType );
-
-				asSDeferredParam deferred;
-				deferred.origExpr = 0;
-				deferred.argInOutFlags = asTM_INREF;
-				deferred.argNode = 0;
-				deferred.argType.SetVariable(ctx->type.dataType, ctx->type.stackOffset, true);
-
-				ctx->deferredParams.PushLast(deferred);
-			}
-			if( funcExpr.property_get == 0 )
-				Dereference(ctx, true);
-
-			// Add the bytecode for accessing the object on which opCall will be called
-			MergeExprBytecodeAndType(ctx, &funcExpr);
-			ProcessPropertyGetAccessor(ctx, node);
-			Dereference(ctx, true);
-
-			objectType = funcExpr.type.dataType.GetTypeInfo()->CastToObjectType();
-
-			// Get the opCall methods from the object type
-			if( funcExpr.type.dataType.IsObjectHandle() )
-				objIsConst = funcExpr.type.dataType.IsHandleToConst();
-			else
-				objIsConst = funcExpr.type.dataType.IsReadOnly();
-
-			builder->GetObjectMethodDescriptions("opCall", funcExpr.type.dataType.GetTypeInfo()->CastToObjectType(), funcs, objIsConst);
-		}
-	}
-
-	// Compile the arguments
-	asCArray<asCExprContext *> args;
-	asCArray<asSNamedArgument> namedArgs;
-
-	bool isOK = true;
-	if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
-	{
-		// Special case: Allow calling func(void) with an expression that evaluates to no datatype, but isn't exactly 'void'
-		if( args.GetLength() == 1 && args[0]->type.IsVoid() && !args[0]->IsVoidExpression() )
-		{
-			// Evaluate the expression before the function call
-			MergeExprBytecode(ctx, args[0]);
-			asDELETE(args[0], asCExprContext);
-			args.SetLength(0);
-		}
-
-		MatchFunctions(funcs, args, node, name.AddressOf(), &namedArgs, objectType, objIsConst, false, true, scope);
-
-		if( funcs.GetLength() != 1 )
-		{
-			// The error was reported by MatchFunctions()
-
-			// Dummy value
-			ctx->type.SetDummy();
-			isOK = false;
-		}
-		else
-		{
-			// Add the default values for arguments not explicitly supplied
-			int r = CompileDefaultAndNamedArgs(node, args, funcs[0], objectType, &namedArgs);
-
-			// TODO: funcdef: Do we have to make sure the handle is stored in a temporary variable, or
-			//                is it enough to make sure it is in a local variable?
-
-			// For function pointer we must guarantee that the function is safe, i.e.
-			// by first storing the function pointer in a local variable (if it isn't already in one)
-			if( r == asSUCCESS )
-			{
-				asCScriptFunction *func = builder->GetFunctionDescription(funcs[0]);
-				if( func->funcType == asFUNC_FUNCDEF )
-				{
-					if( objectType && funcExpr.property_get <= 0 )
-					{
-						// Dereference the object pointer to access the member
-						Dereference(ctx, true); 
-					}
-
-					if( funcExpr.property_get > 0 )
-					{
-						ProcessPropertyGetAccessor(&funcExpr, node);
-						Dereference(&funcExpr, true);
-					}
-					else
-					{
-						Dereference(&funcExpr, true);
-						ConvertToVariable(&funcExpr);
-					}
-
-					// The actual function should be called as if a global function
-					objectType = 0;
-
-					// The function call will be made directly from the local variable so the function pointer shouldn't be on the stack
-					funcExpr.bc.Instr(asBC_PopPtr);
-
-					asCExprValue tmp = ctx->type;
-					MergeExprBytecodeAndType(ctx, &funcExpr);
-					ReleaseTemporaryVariable(tmp, &ctx->bc);
-				}
-
-				MakeFunctionCall(ctx, funcs[0], objectType, args, node, false, 0, funcExpr.type.stackOffset);
-			}
-			else
-				isOK = false;
-		}
-	}
-	else
-	{
-		// Failed to compile the argument list, set the dummy type and continue compilation
-		ctx->type.SetDummy();
-		isOK = false;
-	}
-
-	// Cleanup
-	for( asUINT n = 0; n < args.GetLength(); n++ )
-		if( args[n] )
-		{
-			asDELETE(args[n], asCExprContext);
-		}
-	for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
-		if( namedArgs[n].ctx )
-		{
-			asDELETE(namedArgs[n].ctx, asCExprContext);
-		}
-
-	if( initializeMembers )
-	{
-		asASSERT( m_isConstructor );
-
-		// Need to initialize members here, as they may use the properties of the base class
-		// If there are multiple paths that call super(), then there will also be multiple
-		// locations with initializations of the members. It is not possible to consolidate
-		// these in one place, as the expressions for the initialization are evaluated where
-		// they are compiled, which means that they may access different variables depending
-		// on the scope where super() is called.
-		// Members that don't have an explicit initialization expression will be initialized
-		// beginning of the constructor as they are guaranteed not to use at the any
-		// members of the base class.
-		CompileMemberInitialization(&ctx->bc, false);
-	}
-
-	return isOK ? 0 : -1;
-}
-
-asSNameSpace *asCCompiler::DetermineNameSpace(const asCString &scope)
-{
-	asSNameSpace *ns;
-
-	if( scope == "" )
-	{
-		// When compiling default argument expression the correct namespace is stored in the outFunc even for objects
-		if( outFunc->nameSpace->name != "" || isCompilingDefaultArg )
-			ns = outFunc->nameSpace;
-		else if( outFunc->objectType && outFunc->objectType->nameSpace->name != "" )
-			ns = outFunc->objectType->nameSpace;
-		else
-			ns = engine->nameSpaces[0];
-	}
-	else if( scope == "::" )
-		ns = engine->nameSpaces[0];
-	else
-		ns = engine->FindNameSpace(scope.AddressOf());
-
-	return ns;
-}
-
-int asCCompiler::CompileExpressionPreOp(asCScriptNode *node, asCExprContext *ctx)
-{
-	int op = node->tokenType;
-
-	// Don't allow any prefix operators except handle on expressions that take address of class method
-	if( ctx->IsClassMethod() && op != ttHandle )
-	{
-		Error(TXT_INVALID_OP_ON_METHOD, node);
-		return -1;
-	}
-
-	// Don't allow any operators on void expressions
-	if( ctx->IsVoidExpression() )
-	{
-		Error(TXT_VOID_CANT_BE_OPERAND, node);
-		return -1;
-	}
-
-	IsVariableInitialized(&ctx->type, node);
-
-	if( op == ttHandle )
-	{
-		if( ctx->methodName != "" )
-		{
-			// Don't allow taking the handle of a handle
-			if( ctx->type.isExplicitHandle )
-			{
-				Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, node);
-				return -1;
-			}
-		}
-		else
-		{
-			// Don't allow taking handle of a handle, i.e. @@
-			if( ctx->type.isExplicitHandle )
-			{
-				Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, node);
-				return -1;
-			}
-
-			// @null is allowed even though it is implicit
-			if( !ctx->type.IsNullConstant() )
-			{
-				// Verify that the type allow its handle to be taken
-				if( !ctx->type.dataType.SupportHandles() && !ctx->type.dataType.IsObjectHandle() )
-				{
-					Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, node);
-					return -1;
-				}
-
-				// Objects that are not local variables are not references
-				// Objects allocated on the stack are also not marked as references
-				if( !ctx->type.dataType.IsReference() &&
-					!((ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && !ctx->type.isVariable) &&
-					!(ctx->type.isVariable && !IsVariableOnHeap(ctx->type.stackOffset)) )
-				{
-					Error(TXT_NOT_VALID_REFERENCE, node);
-					return -1;
-				}
-
-				// Convert the expression to a handle
-				if( !ctx->type.dataType.IsObjectHandle() && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
-				{
-					asCDataType to = ctx->type.dataType;
-					to.MakeHandle(true);
-					to.MakeReference(true);
-					to.MakeHandleToConst(ctx->type.dataType.IsReadOnly());
-					ImplicitConversion(ctx, to, node, asIC_IMPLICIT_CONV, true, false);
-
-					asASSERT( ctx->type.dataType.IsObjectHandle() );
-				}
-				else if( ctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE )
-				{
-					// For the ASHANDLE type we'll simply set the expression as a handle
-					ctx->type.dataType.MakeHandle(true);
-				}
-			}
-		}
-
-		// Mark the expression as an explicit handle to avoid implicit conversions to non-handle expressions
-		ctx->type.isExplicitHandle = true;
-	}
-	else if( (op == ttMinus || op == ttPlus || op == ttBitNot || op == ttInc || op == ttDec) && ctx->type.dataType.IsObject() )
-	{
-		// Look for the appropriate method
-		// There is no overloadable operator for unary plus
-		const char *opName = 0;
-		switch( op )
-		{
-		case ttMinus:  opName = "opNeg";    break;
-		case ttBitNot: opName = "opCom";    break;
-		case ttInc:    opName = "opPreInc"; break;
-		case ttDec:    opName = "opPreDec"; break;
-		}
-
-		if( opName )
-		{
-			// TODO: Should convert this to something similar to CompileOverloadedDualOperator2
-			ProcessPropertyGetAccessor(ctx, node);
-
-			// TODO: If the value isn't const, then first try to find the non const method, and if not found try to find the const method
-
-			// Find the correct method
-			bool isConst = ctx->type.dataType.IsObjectConst();
-			asCArray<int> funcs;
-			asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
-			{
-				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-				if( func->name == opName &&
-					func->parameterTypes.GetLength() == 0 &&
-					(!isConst || func->isReadOnly) )
-				{
-					funcs.PushLast(func->id);
-				}
-			}
-
-			// Did we find the method?
-			if( funcs.GetLength() == 1 )
-			{
-				asCArray<asCExprContext *> args;
-				MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-				return 0;
-			}
-			else if( funcs.GetLength() == 0 )
-			{
-				asCString str;
-				str = asCString(opName) + "()";
-				if( isConst )
-					str += " const";
-				str.Format(TXT_FUNCTION_s_NOT_FOUND, str.AddressOf());
-				Error(str, node);
-				ctx->type.SetDummy();
-				return -1;
-			}
-			else if( funcs.GetLength() > 1 )
-			{
-				Error(TXT_MORE_THAN_ONE_MATCHING_OP, node);
-				PrintMatchingFuncs(funcs, node);
-
-				ctx->type.SetDummy();
-				return -1;
-			}
-		}
-		else if( op == ttPlus )
-		{
-			Error(TXT_ILLEGAL_OPERATION, node);
-			ctx->type.SetDummy();
-			return -1;
-		}
-	}
-	else if( op == ttPlus || op == ttMinus )
-	{
-		// This is only for primitives. Objects are treated in the above block
-
-		// Make sure the type is a math type
-		if( !(ctx->type.dataType.IsIntegerType()  ||
-			  ctx->type.dataType.IsUnsignedType() ||
-			  ctx->type.dataType.IsFloatType()    ||
-			  ctx->type.dataType.IsDoubleType()     ) )
-		{
-			Error(TXT_ILLEGAL_OPERATION, node);
-			return -1;
-		}
-
-
-		ProcessPropertyGetAccessor(ctx, node);
-
-		asCDataType to = ctx->type.dataType;
-
-		if( ctx->type.dataType.IsUnsignedType() )
-		{
-			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
-				to = asCDataType::CreatePrimitive(ttInt8, false);
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
-				to = asCDataType::CreatePrimitive(ttInt16, false);
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 4 )
-				to = asCDataType::CreatePrimitive(ttInt, false);
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 8 )
-				to = asCDataType::CreatePrimitive(ttInt64, false);
-			else
-			{
-				Error(TXT_INVALID_TYPE, node);
-				return -1;
-			}
-		}
-
-		if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
-
-		// Use an explicit conversion in case of constants to avoid unnecessary warning about change of sign
-		ImplicitConversion(ctx, to, node, ctx->type.isConstant ? asIC_EXPLICIT_VAL_CAST : asIC_IMPLICIT_CONV);
-
-		if( !ctx->type.isConstant )
-		{
-			ConvertToTempVariable(ctx);
-			asASSERT(!ctx->type.isLValue);
-
-			if( op == ttMinus )
-			{
-				if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-					ctx->bc.InstrSHORT(asBC_NEGi, ctx->type.stackOffset);
-				else if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-					ctx->bc.InstrSHORT(asBC_NEGi64, ctx->type.stackOffset);
-				else if( ctx->type.dataType.IsFloatType() )
-					ctx->bc.InstrSHORT(asBC_NEGf, ctx->type.stackOffset);
-				else if( ctx->type.dataType.IsDoubleType() )
-					ctx->bc.InstrSHORT(asBC_NEGd, ctx->type.stackOffset);
-				else
-				{
-					Error(TXT_ILLEGAL_OPERATION, node);
-					return -1;
-				}
-
-				return 0;
-			}
-		}
-		else
-		{
-			if( op == ttMinus )
-			{
-				if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-					ctx->type.SetConstantDW(-(int)ctx->type.GetConstantDW());
-				else if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-					ctx->type.SetConstantQW(-(asINT64)ctx->type.GetConstantQW());
-				else if( ctx->type.dataType.IsFloatType() )
-					ctx->type.SetConstantF(-ctx->type.GetConstantF());
-				else if( ctx->type.dataType.IsDoubleType() )
-					ctx->type.SetConstantD(-ctx->type.GetConstantD());
-				else
-				{
-					Error(TXT_ILLEGAL_OPERATION, node);
-					return -1;
-				}
-
-				return 0;
-			}
-		}
-	}
-	else if( op == ttNot )
-	{
-		// Allow value types to be converted to bool using 'bool opImplConv()'
-		if( ctx->type.dataType.GetTypeInfo() && (ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-			ImplicitConversion(ctx, asCDataType::CreatePrimitive(ttBool, false), node, asIC_IMPLICIT_CONV);
-
-		if( ctx->type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
-		{
-			if( ctx->type.isConstant )
-			{
-				ctx->type.SetConstantDW(ctx->type.GetConstantDW() == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-				return 0;
-			}
-
-			ProcessPropertyGetAccessor(ctx, node);
-
-			ConvertToTempVariable(ctx);
-			asASSERT(!ctx->type.isLValue);
-
-			ctx->bc.InstrSHORT(asBC_NOT, ctx->type.stackOffset);
-		}
-		else
-		{
-			Error(TXT_ILLEGAL_OPERATION, node);
-			return -1;
-		}
-	}
-	else if( op == ttBitNot )
-	{
-		ProcessPropertyGetAccessor(ctx, node);
-
-		asCDataType to = ctx->type.dataType;
-
-		if( ctx->type.dataType.IsIntegerType() )
-		{
-			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
-				to = asCDataType::CreatePrimitive(ttUInt8, false);
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
-				to = asCDataType::CreatePrimitive(ttUInt16, false);
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 4 )
-				to = asCDataType::CreatePrimitive(ttUInt, false);
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 8 )
-				to = asCDataType::CreatePrimitive(ttUInt64, false);
-			else
-			{
-				Error(TXT_INVALID_TYPE, node);
-				return -1;
-			}
-		}
-
-		if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
-		ImplicitConversion(ctx, to, node, asIC_IMPLICIT_CONV);
-
-		if( ctx->type.dataType.IsUnsignedType() )
-		{
-			if( ctx->type.isConstant )
-			{
-				if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
-					ctx->type.SetConstantB(~ctx->type.GetConstantB());
-				else if (ctx->type.dataType.GetSizeInMemoryBytes() == 2)
-					ctx->type.SetConstantW(~ctx->type.GetConstantW());
-				else if (ctx->type.dataType.GetSizeInMemoryBytes() == 4)
-					ctx->type.SetConstantDW(~ctx->type.GetConstantDW());
-				else
-					ctx->type.SetConstantQW(~ctx->type.GetConstantQW());
-				return 0;
-			}
-
-			ConvertToTempVariable(ctx);
-			asASSERT(!ctx->type.isLValue);
-
-			if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-				ctx->bc.InstrSHORT(asBC_BNOT, ctx->type.stackOffset);
-			else
-				ctx->bc.InstrSHORT(asBC_BNOT64, ctx->type.stackOffset);
-		}
-		else
-		{
-			Error(TXT_ILLEGAL_OPERATION, node);
-			return -1;
-		}
-	}
-	else if( op == ttInc || op == ttDec )
-	{
-		// Need a reference to the primitive that will be updated
-		// The result of this expression is the same reference as before
-
-		// Make sure the reference isn't a temporary variable
-		if( ctx->type.isTemporary )
-		{
-			Error(TXT_REF_IS_TEMP, node);
-			return -1;
-		}
-		if( ctx->type.dataType.IsReadOnly() )
-		{
-			Error(TXT_REF_IS_READ_ONLY, node);
-			return -1;
-		}
-		if( ctx->property_get || ctx->property_set )
-		{
-			Error(TXT_INVALID_REF_PROP_ACCESS, node);
-			return -1;
-		}
-		if( !ctx->type.isLValue )
-		{
-			Error(TXT_NOT_LVALUE, node);
-			return -1;
-		}
-
-		if( ctx->type.isVariable && !ctx->type.dataType.IsReference() )
-			ConvertToReference(ctx);
-		else if( !ctx->type.dataType.IsReference() )
-		{
-			Error(TXT_NOT_VALID_REFERENCE, node);
-			return -1;
-		}
-
-		if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt64, false)) ||
-			ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt64, false)) )
-		{
-			if( op == ttInc )
-				ctx->bc.Instr(asBC_INCi64);
-			else
-				ctx->bc.Instr(asBC_DECi64);
-		}
-		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt, false)) ||
-			ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt, false)) )
-		{
-			if( op == ttInc )
-				ctx->bc.Instr(asBC_INCi);
-			else
-				ctx->bc.Instr(asBC_DECi);
-		}
-		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt16, false)) ||
-			     ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt16, false)) )
-		{
-			if( op == ttInc )
-				ctx->bc.Instr(asBC_INCi16);
-			else
-				ctx->bc.Instr(asBC_DECi16);
-		}
-		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt8, false)) ||
-			     ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt8, false)) )
-		{
-			if( op == ttInc )
-				ctx->bc.Instr(asBC_INCi8);
-			else
-				ctx->bc.Instr(asBC_DECi8);
-		}
-		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttFloat, false)) )
-		{
-			if( op == ttInc )
-				ctx->bc.Instr(asBC_INCf);
-			else
-				ctx->bc.Instr(asBC_DECf);
-		}
-		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttDouble, false)) )
-		{
-			if( op == ttInc )
-				ctx->bc.Instr(asBC_INCd);
-			else
-				ctx->bc.Instr(asBC_DECd);
-		}
-		else
-		{
-			Error(TXT_ILLEGAL_OPERATION, node);
-			return -1;
-		}
-	}
-	else
-	{
-		// Unknown operator
-		asASSERT(false);
-		return -1;
-	}
-
-	return 0;
-}
-
-void asCCompiler::ConvertToReference(asCExprContext *ctx)
-{
-	if( ctx->type.isVariable && !ctx->type.dataType.IsReference() )
-	{
-		ctx->bc.InstrSHORT(asBC_LDV, ctx->type.stackOffset);
-		ctx->type.dataType.MakeReference(true);
-		ctx->type.SetVariable(ctx->type.dataType, ctx->type.stackOffset, ctx->type.isTemporary);
-	}
-}
-
-int asCCompiler::FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess)
-{
-	return FindPropertyAccessor(name, ctx, 0, node, ns, isThisAccess);
-}
-
-int asCCompiler::FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess)
-{
-	if( engine->ep.propertyAccessorMode == 0 )
-	{
-		// Property accessors have been disabled by the application
-		return 0;
-	}
-
-	int getId = 0, setId = 0;
-	asCString getName = "get_" + name;
-	asCString setName = "set_" + name;
-	asCArray<int> multipleGetFuncs, multipleSetFuncs;
-
-	if( ctx->type.dataType.IsObject() )
-	{
-		asASSERT( ns == 0 );
-
-		// Don't look for property accessors in script classes if the script
-		// property accessors have been disabled by the application
-		if( !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) ||
-			engine->ep.propertyAccessorMode == 2 )
-		{
-			// Check if the object has any methods with the corresponding accessor name(s)
-			asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
-			{
-				asCScriptFunction *f = engine->scriptFunctions[ot->methods[n]];
-				// TODO: The type of the parameter should match the argument (unless the arg is a dummy)
-				if( f->name == getName && (int)f->parameterTypes.GetLength() == (arg?1:0) )
-				{
-					if( getId == 0 )
-						getId = ot->methods[n];
-					else
-					{
-						if( multipleGetFuncs.GetLength() == 0 )
-							multipleGetFuncs.PushLast(getId);
-
-						multipleGetFuncs.PushLast(ot->methods[n]);
-					}
-				}
-				// TODO: getset: If the parameter is a reference, it must not be an out reference. Should we allow inout ref?
-				if( f->name == setName && (int)f->parameterTypes.GetLength() == (arg?2:1) )
-				{
-					if( setId == 0 )
-						setId = ot->methods[n];
-					else
-					{
-						if( multipleSetFuncs.GetLength() == 0 )
-							multipleSetFuncs.PushLast(setId);
-
-						multipleSetFuncs.PushLast(ot->methods[n]);
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		asASSERT( ns != 0 );
-
-		// Look for appropriate global functions.
-		asCArray<int> funcs;
-		asUINT n;
-		builder->GetFunctionDescriptions(getName.AddressOf(), funcs, ns);
-		for( n = 0; n < funcs.GetLength(); n++ )
-		{
-			asCScriptFunction *f = builder->GetFunctionDescription(funcs[n]);
-			// TODO: The type of the parameter should match the argument (unless the arg is a dummy)
-			if( (int)f->parameterTypes.GetLength() == (arg?1:0) )
-			{
-				if( getId == 0 )
-					getId = funcs[n];
-				else
-				{
-					if( multipleGetFuncs.GetLength() == 0 )
-						multipleGetFuncs.PushLast(getId);
-
-					multipleGetFuncs.PushLast(funcs[n]);
-				}
-			}
-		}
-
-		funcs.SetLength(0);
-		builder->GetFunctionDescriptions(setName.AddressOf(), funcs, ns);
-		for( n = 0; n < funcs.GetLength(); n++ )
-		{
-			asCScriptFunction *f = builder->GetFunctionDescription(funcs[n]);
-			// TODO: getset: If the parameter is a reference, it must not be an out reference. Should we allow inout ref?
-			if( (int)f->parameterTypes.GetLength() == (arg?2:1) )
-			{
-				if( setId == 0 )
-					setId = funcs[n];
-				else
-				{
-					if( multipleSetFuncs.GetLength() == 0 )
-						multipleSetFuncs.PushLast(getId);
-
-					multipleSetFuncs.PushLast(funcs[n]);
-				}
-			}
-		}
-	}
-
-	bool isConst = ctx->type.dataType.IsObjectConst();
-
-	// Check for multiple matches
-	if( multipleGetFuncs.GetLength() > 0 )
-	{
-		// Filter the list by constness
-		FilterConst(multipleGetFuncs, !isConst);
-
-		if( multipleGetFuncs.GetLength() > 1 )
-		{
-			asCString str;
-			str.Format(TXT_MULTIPLE_PROP_GET_ACCESSOR_FOR_s, name.AddressOf());
-			Error(str, node);
-
-			PrintMatchingFuncs(multipleGetFuncs, node);
-
-			return -1;
-		}
-		else
-		{
-			// The id may have changed
-			getId = multipleGetFuncs[0];
-		}
-	}
-
-	if( multipleSetFuncs.GetLength() > 0 )
-	{
-		// Filter the list by constness
-		FilterConst(multipleSetFuncs, !isConst);
-
-		if( multipleSetFuncs.GetLength() > 1 )
-		{
-			asCString str;
-			str.Format(TXT_MULTIPLE_PROP_SET_ACCESSOR_FOR_s, name.AddressOf());
-			Error(str, node);
-
-			PrintMatchingFuncs(multipleSetFuncs, node);
-
-			return -1;
-		}
-		else
-		{
-			// The id may have changed
-			setId = multipleSetFuncs[0];
-		}
-	}
-
-	// Check for type compatibility between get and set accessor
-	if( getId && setId )
-	{
-		asCScriptFunction *getFunc = builder->GetFunctionDescription(getId);
-		asCScriptFunction *setFunc = builder->GetFunctionDescription(setId);
-
-		// It is permitted for a getter to return a handle and the setter to take a reference
-		int idx = (arg?1:0);
-		if( !getFunc->returnType.IsEqualExceptRefAndConst(setFunc->parameterTypes[idx]) &&
-			!((getFunc->returnType.IsObjectHandle() && !setFunc->parameterTypes[idx].IsObjectHandle()) &&
-			  (getFunc->returnType.GetTypeInfo() == setFunc->parameterTypes[idx].GetTypeInfo())) )
-		{
-			asCString str;
-			str.Format(TXT_GET_SET_ACCESSOR_TYPE_MISMATCH_FOR_s, name.AddressOf());
-			Error(str, node);
-
-			asCArray<int> funcs;
-			funcs.PushLast(getId);
-			funcs.PushLast(setId);
-
-			PrintMatchingFuncs(funcs, node);
-
-			return -1;
-		}
-	}
-
-	// Check if we are within one of the accessors
-	int realGetId = getId;
-	int realSetId = setId;
-	if( outFunc->objectType && isThisAccess )
-	{
-		// The property accessors would be virtual functions, so we need to find the real implementation
-		asCScriptFunction *getFunc = getId ? builder->GetFunctionDescription(getId) : 0;
-		if( getFunc &&
-			getFunc->funcType == asFUNC_VIRTUAL &&
-			outFunc->objectType->DerivesFrom(getFunc->objectType) )
-			realGetId = outFunc->objectType->virtualFunctionTable[getFunc->vfTableIdx]->id;
-		asCScriptFunction *setFunc = setId ? builder->GetFunctionDescription(setId) : 0;
-		if( setFunc &&
-			setFunc->funcType == asFUNC_VIRTUAL &&
-			outFunc->objectType->DerivesFrom(setFunc->objectType) )
-			realSetId = outFunc->objectType->virtualFunctionTable[setFunc->vfTableIdx]->id;
-	}
-
-	// Avoid recursive call, by not treating this as a property accessor call.
-	// This will also allow having the real property with the same name as the accessors.
-	if( (isThisAccess || outFunc->objectType == 0) &&
-		((realGetId && realGetId == outFunc->id) ||
-		 (realSetId && realSetId == outFunc->id)) )
-	{
-		getId = 0;
-		setId = 0;
-	}
-
-	// Check if the application has disabled script written property accessors
-	if( engine->ep.propertyAccessorMode == 1 )
-	{
-		if( getId && builder->GetFunctionDescription(getId)->funcType != asFUNC_SYSTEM )
-		  getId = 0;
-		if( setId && builder->GetFunctionDescription(setId)->funcType != asFUNC_SYSTEM )
-		  setId = 0;
-	}
-
-	if( getId || setId )
-	{
-		// Property accessors were found, but we don't know which is to be used yet, so
-		// we just prepare the bytecode for the method call, and then store the function ids
-		// so that the right one can be used when we get there.
-		ctx->property_get = getId;
-		ctx->property_set = setId;
-
-		if( ctx->type.dataType.IsObject() )
-		{
-			// If the object is read-only then we need to remember that
-			if( (!ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsReadOnly()) ||
-				(ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsHandleToConst()) )
-				ctx->property_const = true;
-			else
-				ctx->property_const = false;
-
-			// If the object is a handle then we need to remember that
-			ctx->property_handle = ctx->type.dataType.IsObjectHandle();
-			ctx->property_ref    = ctx->type.dataType.IsReference();
-		}
-
-		// The setter's parameter type is used as the property type,
-		// unless only the getter is available
-		asCDataType dt;
-		if( setId )
-			dt = builder->GetFunctionDescription(setId)->parameterTypes[(arg?1:0)];
-		else
-			dt = builder->GetFunctionDescription(getId)->returnType;
-
-		// Just change the type, the context must still maintain information
-		// about previous variable offset and the indicator of temporary variable.
-		int offset = ctx->type.stackOffset;
-		bool isTemp = ctx->type.isTemporary;
-		ctx->type.Set(dt);
-		ctx->type.stackOffset = (short)offset;
-		ctx->type.isTemporary = isTemp;
-		ctx->exprNode = node;
-
-		// Store the argument for later use
-		if( arg )
-		{
-			ctx->property_arg = asNEW(asCExprContext)(engine);
-			if( ctx->property_arg == 0 )
-			{
-				// Out of memory
-				return -1;
-			}
-
-			MergeExprBytecodeAndType(ctx->property_arg, arg);
-		}
-
-		return 1;
-	}
-
-	// No accessor was found
-	return 0;
-}
-
-int asCCompiler::ProcessPropertySetAccessor(asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node)
-{
-	// TODO: A lot of this code is similar to ProcessPropertyGetAccessor. Can we unify them?
-
-	if( !ctx->property_set )
-	{
-		Error(TXT_PROPERTY_HAS_NO_SET_ACCESSOR, node);
-		return -1;
-	}
-
-	asCScriptFunction *func = builder->GetFunctionDescription(ctx->property_set);
-
-	// Make sure the arg match the property
-	asCArray<int> funcs;
-	funcs.PushLast(ctx->property_set);
-	asCArray<asCExprContext *> args;
-	if( ctx->property_arg )
-		args.PushLast(ctx->property_arg);
-	args.PushLast(arg);
-	MatchFunctions(funcs, args, node, func->GetName(), 0, func->objectType, ctx->property_const);
-	if( funcs.GetLength() == 0 )
-	{
-		// MatchFunctions already reported the error
-		if( ctx->property_arg )
-		{
-			asDELETE(ctx->property_arg, asCExprContext);
-			ctx->property_arg = 0;
-		}
-		return -1;
-	}
-
-	if( func->objectType )
-	{
-		// Setup the context with the original type so the method call gets built correctly
-		ctx->type.dataType = asCDataType::CreateType(func->objectType, ctx->property_const);
-		if( ctx->property_handle ) ctx->type.dataType.MakeHandle(true);
-		if( ctx->property_ref )	ctx->type.dataType.MakeReference(true);
-
-		// Don't allow the call if the object is read-only and the property accessor is not const
-		if( ctx->property_const && !func->isReadOnly )
-		{
-			Error(TXT_NON_CONST_METHOD_ON_CONST_OBJ, node);
-			asCArray<int> funcCandidates;
-			funcCandidates.PushLast(ctx->property_set);
-			PrintMatchingFuncs(funcCandidates, node);
-		}
-	}
-
-	// Call the accessor
-	MakeFunctionCall(ctx, ctx->property_set, func->objectType, args, node);
-
-	ctx->property_get = 0;
-	ctx->property_set = 0;
-	if( ctx->property_arg )
-	{
-		asDELETE(ctx->property_arg, asCExprContext);
-		ctx->property_arg = 0;
-	}
-
-	return 0;
-}
-
-int asCCompiler::ProcessPropertyGetSetAccessor(asCExprContext *ctx, asCExprContext *lctx, asCExprContext *rctx, eTokenType op, asCScriptNode *errNode)
-{
-	// TODO: Perhaps it might be interesting to allow the definition of compound setters for better 
-	//       performance, e.g. set_add_prop, set_mul_prop, etc. With these it would also be possible 
-	//       to support value types, since it would be a single call
-
-	// Compound assignment for indexed property accessors is not supported yet
-	if( lctx->property_arg != 0 )
-	{
-		// Process the property to free the memory
-		ProcessPropertySetAccessor(lctx, rctx, errNode);
-		Error(TXT_COMPOUND_ASGN_WITH_IDX_PROP, errNode);
-		return -1;
-	}
-
-	// Compound assignments require both get and set accessors
-	if( lctx->property_set == 0 || lctx->property_get == 0 )
-	{
-		// Process the property to free the memory
-		ProcessPropertySetAccessor(lctx, rctx, errNode);
-		Error(TXT_COMPOUND_ASGN_REQUIRE_GET_SET, errNode);
-		return -1;
-	}
-
-	// Property accessors on value types (or scoped references types) are not supported since 
-	// it is not possible to guarantee that the object will stay alive between the two calls
-	asCScriptFunction *func = engine->scriptFunctions[lctx->property_set];
-	if( func->objectType && (func->objectType->flags & (asOBJ_VALUE | asOBJ_SCOPED)) )
-	{
-		// Process the property to free the memory
-		ProcessPropertySetAccessor(lctx, rctx, errNode);
-		Error(TXT_COMPOUND_ASGN_ON_VALUE_TYPE, errNode);
-		return -1;
-	}
-
-	// Translate the compound assignment to the corresponding dual operator
-	switch( op )
-	{
-	case ttAddAssign: op = ttPlus; break;
-	case ttSubAssign: op = ttMinus; break;
-	case ttMulAssign: op = ttStar; break;
-	case ttDivAssign: op = ttSlash; break;
-	case ttModAssign: op = ttPercent; break;
-	case ttPowAssign: op = ttStarStar; break;
-	
-	case ttAndAssign: op = ttAmp; break;
-	case ttOrAssign:  op = ttBitOr; break; 
-	case ttXorAssign: op = ttBitXor; break;
-
-	case ttShiftLeftAssign:   op = ttBitShiftLeft; break;
-	case ttShiftRightAAssign: op = ttBitShiftRightArith; break;
-	case ttShiftRightLAssign: op = ttBitShiftRight; break;
-
-	default: op = ttUnrecognizedToken; break;
-	}
-
-	if( op == ttUnrecognizedToken )
-	{
-		// Shouldn't happen
-		asASSERT(false); 
-
-		// Process the property to free the memory
-		ProcessPropertySetAccessor(lctx, rctx, errNode);
-		return -1;
-	}
-
-	asCExprContext before(engine);
-	if( func->objectType && (func->objectType->flags & (asOBJ_REF|asOBJ_SCOPED)) == asOBJ_REF )
-	{
-		// Keep a reference to the object in a local variable
-		before.bc.AddCode(&lctx->bc);
-
-		asUINT len = reservedVariables.GetLength();
-		rctx->bc.GetVarsUsed(reservedVariables);
-		before.bc.GetVarsUsed(reservedVariables);
-
-		asCDataType dt = asCDataType::CreateObjectHandle(func->objectType, false);
-		int offset = AllocateVariable(dt, true);
-
-		reservedVariables.SetLength(len);
-
-		before.type.SetVariable(dt, offset, true);
-
-		if( lctx->property_ref )
-			before.bc.Instr(asBC_RDSPtr);
-		before.bc.InstrSHORT(asBC_PSF, (short)offset);
-		before.bc.InstrPTR(asBC_REFCPY, func->objectType);
-		before.bc.Instr(asBC_PopPtr);
-
-		if( lctx->type.isTemporary )
-		{
-			// Add the release of the temporary variable as a deferred expression
-			asSDeferredParam deferred;
-			deferred.origExpr = 0;
-			deferred.argInOutFlags = asTM_INREF;
-			deferred.argNode = 0;
-			deferred.argType.SetVariable(ctx->type.dataType, lctx->type.stackOffset, true);
-			before.deferredParams.PushLast(deferred);
-		}
-
-		// Update the left expression to use the local variable
-		lctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-		lctx->type.stackOffset = (short)offset;
-		lctx->property_ref = true;
-
-		// Don't release the temporary variable too early
-		lctx->type.isTemporary = false;
-
-		ctx->bc.AddCode(&before.bc);
-	}
-
-	// Keep the original information on the property
-	asCExprContext llctx(engine);
-	llctx.type = lctx->type;
-	llctx.property_arg    = lctx->property_arg;
-	llctx.property_const  = lctx->property_const;
-	llctx.property_get    = lctx->property_get;
-	llctx.property_handle = lctx->property_handle;
-	llctx.property_ref    = lctx->property_ref;
-	llctx.property_set    = lctx->property_set;
-
-	// Compile the dual operator using the get accessor
-	CompileOperator(errNode, lctx, rctx, ctx, op);
-
-	// If we made a local variable to hold the reference it must be reused
-	if( before.type.stackOffset )
-		llctx.bc.InstrSHORT(asBC_PSF, before.type.stackOffset);
-
-	// Compile the assignment using the set accessor
-	ProcessPropertySetAccessor(&llctx, ctx, errNode);
-
-	MergeExprBytecodeAndType(ctx, &llctx);
-
-	if( before.type.stackOffset )
-		ReleaseTemporaryVariable(before.type.stackOffset, &ctx->bc);
-
-	asASSERT( ctx->deferredParams.GetLength() == 0 );
-	ctx->deferredParams = before.deferredParams;
-	ProcessDeferredParams(ctx);
-
-	return 0;
-}
-
-void asCCompiler::ProcessPropertyGetAccessor(asCExprContext *ctx, asCScriptNode *node)
-{
-	// If no property accessor has been prepared then don't do anything
-	if( !ctx->property_get && !ctx->property_set )
-		return;
-
-	if( !ctx->property_get )
-	{
-		// Raise error on missing accessor
-		Error(TXT_PROPERTY_HAS_NO_GET_ACCESSOR, node);
-		ctx->type.SetDummy();
-		return;
-	}
-
-	asCExprValue objType = ctx->type;
-	asCScriptFunction *func = builder->GetFunctionDescription(ctx->property_get);
-
-	// Make sure the arg match the property
-	asCArray<int> funcs;
-	funcs.PushLast(ctx->property_get);
-	asCArray<asCExprContext *> args;
-	if( ctx->property_arg )
-		args.PushLast(ctx->property_arg);
-	MatchFunctions(funcs, args, node, func->GetName(), 0, func->objectType, ctx->property_const);
-	if( funcs.GetLength() == 0 )
-	{
-		// MatchFunctions already reported the error
-		if( ctx->property_arg )
-		{
-			asDELETE(ctx->property_arg, asCExprContext);
-			ctx->property_arg = 0;
-		}
-		ctx->type.SetDummy();
-		return;
-	}
-
-	if( func->objectType )
-	{
-		// Setup the context with the original type so the method call gets built correctly
-		ctx->type.dataType = asCDataType::CreateType(func->objectType, ctx->property_const);
-		if( ctx->property_handle ) ctx->type.dataType.MakeHandle(true);
-		if( ctx->property_ref )	ctx->type.dataType.MakeReference(true);
-
-		// Don't allow the call if the object is read-only and the property accessor is not const
-		if( ctx->property_const && !func->isReadOnly )
-		{
-			Error(TXT_NON_CONST_METHOD_ON_CONST_OBJ, node);
-			asCArray<int> funcCandidates;
-			funcCandidates.PushLast(ctx->property_get);
-			PrintMatchingFuncs(funcCandidates, node);
-		}
-	}
-
-	// The explicit handle flag must be remembered
-	bool isExplicitHandle = ctx->type.isExplicitHandle;
-
-	// Call the accessor
-	MakeFunctionCall(ctx, ctx->property_get, func->objectType, args, node);
-	if( isExplicitHandle )
-		ctx->type.isExplicitHandle = true;
-
-	// Clear the property get/set ids 
-	ctx->property_get = 0;
-	ctx->property_set = 0;
-	if( ctx->property_arg )
-	{
-		asDELETE(ctx->property_arg, asCExprContext);
-		ctx->property_arg = 0;
-	}
-}
-
-int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asCExprContext *ctx)
-{
-	// Don't allow any postfix operators on expressions that take address of class method
-	if( ctx->IsClassMethod() )
-	{
-		Error(TXT_INVALID_OP_ON_METHOD, node);
-		return -1;
-	}
-
-	// Don't allow any operators on void expressions
-	if( ctx->IsVoidExpression() )
-	{
-		Error(TXT_VOID_CANT_BE_OPERAND, node);
-		return -1;
-	}
-
-	// Check if the variable is initialized (if it indeed is a variable)
-	IsVariableInitialized(&ctx->type, node);
-
-	int op = node->tokenType;
-	if( (op == ttInc || op == ttDec) && ctx->type.dataType.IsObject() )
-	{
-		const char *opName = 0;
-		switch( op )
-		{
-		case ttInc:    opName = "opPostInc"; break;
-		case ttDec:    opName = "opPostDec"; break;
-		}
-
-		if( opName )
-		{
-			// TODO: Should convert this to something similar to CompileOverloadedDualOperator2
-			ProcessPropertyGetAccessor(ctx, node);
-
-			// TODO: If the value isn't const, then first try to find the non const method, and if not found try to find the const method
-
-			// Find the correct method
-			bool isConst = ctx->type.dataType.IsObjectConst();
-			asCArray<int> funcs;
-			asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
-			{
-				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-				if( func->name == opName &&
-					func->parameterTypes.GetLength() == 0 &&
-					(!isConst || func->isReadOnly) )
-				{
-					funcs.PushLast(func->id);
-				}
-			}
-
-			// Did we find the method?
-			if( funcs.GetLength() == 1 )
-			{
-				asCArray<asCExprContext *> args;
-				MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-				return 0;
-			}
-			else if( funcs.GetLength() == 0 )
-			{
-				asCString str;
-				str = asCString(opName) + "()";
-				if( isConst )
-					str += " const";
-				str.Format(TXT_FUNCTION_s_NOT_FOUND, str.AddressOf());
-				Error(str, node);
-				ctx->type.SetDummy();
-				return -1;
-			}
-			else if( funcs.GetLength() > 1 )
-			{
-				Error(TXT_MORE_THAN_ONE_MATCHING_OP, node);
-				PrintMatchingFuncs(funcs, node);
-
-				ctx->type.SetDummy();
-				return -1;
-			}
-		}
-	}
-	else if( op == ttInc || op == ttDec )
-	{
-		// Make sure the reference isn't a temporary variable
-		if( ctx->type.isTemporary )
-		{
-			Error(TXT_REF_IS_TEMP, node);
-			return -1;
-		}
-		if( ctx->type.dataType.IsReadOnly() )
-		{
-			Error(TXT_REF_IS_READ_ONLY, node);
-			return -1;
-		}
-		if( ctx->property_get || ctx->property_set )
-		{
-			Error(TXT_INVALID_REF_PROP_ACCESS, node);
-			return -1;
-		}
-		if( !ctx->type.isLValue )
-		{
-			Error(TXT_NOT_LVALUE, node);
-			return -1;
-		}
-
-		if( ctx->type.isVariable && !ctx->type.dataType.IsReference() )
-			ConvertToReference(ctx);
-		else if( !ctx->type.dataType.IsReference() )
-		{
-			Error(TXT_NOT_VALID_REFERENCE, node);
-			return -1;
-		}
-
-		// Copy the value to a temp before changing it
-		ConvertToTempVariable(ctx);
-		asASSERT(!ctx->type.isLValue);
-
-		// Increment the value pointed to by the reference still in the register
-		asEBCInstr iInc = asBC_INCi, iDec = asBC_DECi;
-		if( ctx->type.dataType.IsDoubleType() )
-		{
-			iInc = asBC_INCd;
-			iDec = asBC_DECd;
-		}
-		else if( ctx->type.dataType.IsFloatType() )
-		{
-			iInc = asBC_INCf;
-			iDec = asBC_DECf;
-		}
-		else if( ctx->type.dataType.IsIntegerType() || ctx->type.dataType.IsUnsignedType() )
-		{
-			if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt16, false)) ||
-			    ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt16, false)) )
-			{
-				iInc = asBC_INCi16;
-				iDec = asBC_DECi16;
-			}
-			else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt8, false)) ||
-			         ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt8, false)) )
-			{
-				iInc = asBC_INCi8;
-				iDec = asBC_DECi8;
-			}
-			else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt64, false)) ||
-			         ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt64, false)) )
-			{
-				iInc = asBC_INCi64;
-				iDec = asBC_DECi64;
-			}
-		}
-		else
-		{
-			Error(TXT_ILLEGAL_OPERATION, node);
-			return -1;
-		}
-
-		if( op == ttInc ) ctx->bc.Instr(iInc); else ctx->bc.Instr(iDec);
-	}
-	else if( op == ttDot )
-	{
-		if( node->firstChild->nodeType == snIdentifier )
-		{
-			ProcessPropertyGetAccessor(ctx, node);
-
-			// Get the property name
-			asCString name(&script->code[node->firstChild->tokenPos], node->firstChild->tokenLength);
-
-			if( ctx->type.dataType.IsObject() )
-			{
-				// We need to look for get/set property accessors.
-				// If found, the context stores information on the get/set accessors
-				// until it is known which is to be used.
-				int r = 0;
-				if( node->next && node->next->tokenType == ttOpenBracket )
-				{
-					// The property accessor should take an index arg
-					asCExprContext dummyArg(engine);
-					r = FindPropertyAccessor(name, ctx, &dummyArg, node, 0);
-				}
-				if( r == 0 )
-					r = FindPropertyAccessor(name, ctx, node, 0);
-				if( r != 0 )
-					return r;
-
-				if( !ctx->type.dataType.IsPrimitive() )
-					Dereference(ctx, true);
-
-				if( ctx->type.dataType.IsObjectHandle() )
-				{
-					// Convert the handle to a normal object
-					asCDataType dt = ctx->type.dataType;
-					dt.MakeHandle(false);
-
-					ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV);
-
-					// The handle may not have been an lvalue, but the dereferenced object is
-					ctx->type.isLValue = true;
-				}
-
-				bool isConst = ctx->type.dataType.IsObjectConst();
-
-				asCObjectProperty *prop = builder->GetObjectProperty(ctx->type.dataType, name.AddressOf());
-				if( prop )
-				{
-					// Is the property access allowed?
-					if( (prop->isPrivate || prop->isProtected) && (!outFunc || outFunc->objectType != ctx->type.dataType.GetTypeInfo()) )
-					{
-						asCString msg;
-						if( prop->isPrivate )
-							msg.Format(TXT_PRIVATE_PROP_ACCESS_s, name.AddressOf());
-						else
-							msg.Format(TXT_PROTECTED_PROP_ACCESS_s, name.AddressOf());
-						Error(msg, node);
-					}
-
-					// Put the offset on the stack
-					ctx->bc.InstrSHORT_DW(asBC_ADDSi, (short)prop->byteOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(ctx->type.dataType.GetTypeInfo(), false)));
-
-					if( prop->type.IsReference() )
-						ctx->bc.Instr(asBC_RDSPtr);
-
-					// Reference to primitive must be stored in the temp register
-					if( prop->type.IsPrimitive() )
-					{
-						ctx->bc.Instr(asBC_PopRPtr);
-					}
-
-					// Keep information about temporary variables as deferred expression
-					if( ctx->type.isTemporary )
-					{
-						// Add the release of this reference, as a deferred expression
-						asSDeferredParam deferred;
-						deferred.origExpr = 0;
-						deferred.argInOutFlags = asTM_INREF;
-						deferred.argNode = 0;
-						deferred.argType.SetVariable(ctx->type.dataType, ctx->type.stackOffset, true);
-
-						ctx->deferredParams.PushLast(deferred);
-					}
-
-					// Set the new type and make sure it is not treated as a variable anymore
-					ctx->type.dataType = prop->type;
-					ctx->type.dataType.MakeReference(true);
-					ctx->type.isVariable = false;
-					ctx->type.isTemporary = false;
-
-					if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && !ctx->type.dataType.IsObjectHandle() )
-					{
-						// Objects that are members are not references
-						ctx->type.dataType.MakeReference(false);
-					}
-
-					ctx->type.dataType.MakeReadOnly(isConst ? true : prop->type.IsReadOnly());
-				}
-				else
-				{
-					// If the name is not a property, the compiler must check if the name matches
-					// a method, which can be used for constructing delegates
-					asIScriptFunction *func = 0;
-					asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-					for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
-					{
-						if( engine->scriptFunctions[ot->methods[n]]->name == name )
-						{
-							func = engine->scriptFunctions[ot->methods[n]];
-							break;
-						}
-					}
-
-					if( func )
-					{
-						// An object method was found. Keep the name of the method in the expression, but
-						// don't actually modify the bytecode at this point since it is not yet known what
-						// the method will be used for, or even what overloaded method should be used.
-						ctx->methodName = name;
-					}
-					else
-					{
-						asCString str;
-						str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-						Error(str, node);
-						return -1;
-					}
-				}
-			}
-			else
-			{
-				asCString str;
-				str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-				Error(str, node);
-				return -1;
-			}
-		}
-		else
-		{
-			// Make sure it is an object we are accessing
-			if( !ctx->type.dataType.IsObject() )
-			{
-				asCString str;
-				str.Format(TXT_ILLEGAL_OPERATION_ON_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-				Error(str, node);
-				return -1;
-			}
-
-			// Process the get property accessor
-			ProcessPropertyGetAccessor(ctx, node);
-
-			// Compile function call
-			int r = CompileFunctionCall(node->firstChild, ctx, ctx->type.dataType.GetTypeInfo()->CastToObjectType(), ctx->type.dataType.IsObjectConst());
-			if( r < 0 ) return r;
-		}
-	}
-	else if( op == ttOpenBracket )
-	{
-		// If the property access takes an index arg and the argument hasn't been evaluated yet,
-		// then we should use that instead of processing it now. If the argument has already been
-		// evaluated, then we should process the property accessor as a get access now as the new
-		// index operator is on the result of that accessor.
-		asCString propertyName;
-		asSNameSpace *ns = 0;
-		if( ((ctx->property_get && builder->GetFunctionDescription(ctx->property_get)->GetParamCount() == 1) ||
-			 (ctx->property_set && builder->GetFunctionDescription(ctx->property_set)->GetParamCount() == 2)) &&
-			(ctx->property_arg && ctx->property_arg->type.dataType.GetTokenType() == ttUnrecognizedToken) )
-		{
-			// Determine the name of the property accessor
-			asCScriptFunction *func = 0;
-			if( ctx->property_get )
-				func = builder->GetFunctionDescription(ctx->property_get);
-			else
-				func = builder->GetFunctionDescription(ctx->property_set);
-			propertyName = func->GetName();
-			propertyName = propertyName.SubString(4);
-
-			// Set the original type of the expression so we can re-evaluate the property accessor
-			if( func->objectType )
-			{
-				ctx->type.dataType = asCDataType::CreateType(func->objectType, ctx->property_const);
-				if( ctx->property_handle ) ctx->type.dataType.MakeHandle(true);
-				if( ctx->property_ref )	ctx->type.dataType.MakeReference(true);
-			}
-			else
-			{
-				// Store the namespace where the function is declared
-				// so the same function can be found later
-				ctx->type.SetDummy();
-				ns = func->nameSpace;
-			}
-
-			ctx->property_get = ctx->property_set = 0;
-			if( ctx->property_arg )
-			{
-				asDELETE(ctx->property_arg, asCExprContext);
-				ctx->property_arg = 0;
-			}
-		}
-		else
-		{
-			if( !ctx->type.dataType.IsObject() )
-			{
-				asCString str;
-				str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-				Error(str, node);
-				return -1;
-			}
-
-			ProcessPropertyGetAccessor(ctx, node);
-		}
-
-		// Compile the expression
-		bool isOK = true;
-		asCArray<asCExprContext *> args;
-		asCArray<asSNamedArgument> namedArgs;
-		asASSERT( node->firstChild->nodeType == snArgList );
-		if( CompileArgumentList(node->firstChild, args, namedArgs) >= 0 )
-		{
-			// Check for the existence of the opIndex method
-			bool lookForProperty = true;
-			if( propertyName == "" )
-			{
-				bool isConst = ctx->type.dataType.IsObjectConst();
-				asCObjectType *objectType = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-
-				asCArray<int> funcs;
-				builder->GetObjectMethodDescriptions("opIndex", objectType, funcs, isConst);
-				if( funcs.GetLength() > 0 )
-				{
-					// Since there are opIndex methods, the compiler should not look for get/set_opIndex accessors
-					lookForProperty = false;
-
-					// Determine which of opIndex methods that match
-					MatchFunctions(funcs, args, node, "opIndex", 0, objectType, isConst);
-					if( funcs.GetLength() != 1 )
-					{
-						// The error has already been reported by MatchFunctions
-						isOK = false;
-					}
-					else
-					{
-						// Add the default values for arguments not explicitly supplied
-						int r = CompileDefaultAndNamedArgs(node, args, funcs[0], objectType);
-
-						if( r == 0 )
-							MakeFunctionCall(ctx, funcs[0], objectType, args, node, false, 0, ctx->type.stackOffset);
-						else
-							isOK = false;
-					}
-				}
-			}
-			if( lookForProperty && isOK )
-			{
-				if( args.GetLength() != 1 )
-				{
-					// TODO: opIndex: Implement this
-					Error("Property accessor with index only support 1 index argument for now", node);
-					isOK = false;
-				}
-
-				Dereference(ctx, true);
-				asCExprContext lctx(engine);
-				MergeExprBytecodeAndType(&lctx, ctx);
-
-				// Check for accessors methods for the opIndex, either as get/set_opIndex or as get/set with the property name
-				int r = FindPropertyAccessor(propertyName == "" ? "opIndex" : propertyName.AddressOf(), &lctx, args[0], node, ns);
-				if( r == 0 )
-				{
-					asCString str;
-					str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-					Error(str, node);
-					isOK = false;
-				}
-				else if( r < 0 )
-					isOK = false;
-
-				if( isOK )
-					MergeExprBytecodeAndType(ctx, &lctx);
-			}
-		}
-		else
-			isOK = false;
-
-		// Cleanup
-		for( asUINT n = 0; n < args.GetLength(); n++ )
-			if( args[n] )
-			{
-				asDELETE(args[n], asCExprContext);
-			}
-
-		if( !isOK )
-			return -1;
-	}
-	else if( op == ttOpenParanthesis )
-	{
-		// TODO: Most of this is already done by CompileFunctionCall(). Can we share the code?
-
-		// Make sure the expression is a funcdef or an object that may have opCall methods
-		if( !ctx->type.dataType.GetTypeInfo() || (!ctx->type.dataType.IsFuncdef() && !ctx->type.dataType.IsObject()) )
-		{
-			Error(TXT_EXPR_DOESNT_EVAL_TO_FUNC, node);
-			return -1;
-		}
-
-		// Compile arguments
-		asCArray<asCExprContext *> args;
-		asCArray<asSNamedArgument> namedArgs;
-		if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
-		{
-			// Match arguments with the funcdef
-			asCArray<int> funcs;
-			if( ctx->type.dataType.IsFuncdef() )
-			{
-				funcs.PushLast(ctx->type.dataType.GetTypeInfo()->CastToFuncdefType()->funcdef->id);
-				MatchFunctions(funcs, args, node, ctx->type.dataType.GetTypeInfo()->name.AddressOf(), &namedArgs);
-			}
-			else
-			{
-				bool isConst = ctx->type.dataType.IsObjectConst();
-
-				builder->GetObjectMethodDescriptions("opCall", ctx->type.dataType.GetTypeInfo()->CastToObjectType(), funcs, isConst);
-				MatchFunctions(funcs, args, node, "opCall", &namedArgs, ctx->type.dataType.GetTypeInfo()->CastToObjectType(), isConst);
-			}
-
-			if( funcs.GetLength() != 1 )
-			{
-				// The error was reported by MatchFunctions()
-
-				// Dummy value
-				ctx->type.SetDummy();
-			}
-			else
-			{
-				// Add the default values for arguments not explicitly supplied
-				int r = CompileDefaultAndNamedArgs(node, args, funcs[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), &namedArgs);
-
-				// TODO: funcdef: Do we have to make sure the handle is stored in a temporary variable, or
-				//                is it enough to make sure it is in a local variable?
-
-				// For function pointer we must guarantee that the function is safe, i.e.
-				// by first storing the function pointer in a local variable (if it isn't already in one)
-				if( r == asSUCCESS )
-				{
-					Dereference(ctx, true);
-					if( ctx->type.dataType.IsFuncdef() )
-					{
-						if( !ctx->type.isVariable )
-							ConvertToVariable(ctx);
-
-						// Remove the reference from the stack as the asBC_CALLPTR instruction takes the variable as argument
-						ctx->bc.Instr(asBC_PopPtr);
-					}
-
-					MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.IsFuncdef() ? 0 : ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node, false, 0, ctx->type.stackOffset);
-				}
-			}
-		}
-		else
-			ctx->type.SetDummy();
-
-		// Cleanup
-		for( asUINT n = 0; n < args.GetLength(); n++ )
-			if( args[n] )
-			{
-				asDELETE(args[n], asCExprContext);
-			}
-		for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
-			if( namedArgs[n].ctx )
-			{
-				asDELETE(namedArgs[n].ctx, asCExprContext);
-			}
-	}
-
-	return 0;
-}
-
-int asCCompiler::GetPrecedence(asCScriptNode *op)
-{
-	// x ** y
-	// x * y, x / y, x % y
-	// x + y, x - y
-	// x <= y, x < y, x >= y, x > y
-	// x = =y, x != y, x xor y, x is y, x !is y
-	// x and y
-	// x or y
-
-	// The following are not used in this function,
-	// but should have lower precedence than the above
-	// x ? y : z
-	// x = y
-
-	// The expression term have the highest precedence
-	if( op->nodeType == snExprTerm )
-		return 1;
-
-	// Evaluate operators by token
-	int tokenType = op->tokenType;
-	if( tokenType == ttStarStar )
-		return 0;
-
-	if( tokenType == ttStar || tokenType == ttSlash || tokenType == ttPercent )
-		return -1;
-
-	if( tokenType == ttPlus || tokenType == ttMinus )
-		return -2;
-
-	if( tokenType == ttBitShiftLeft ||
-		tokenType == ttBitShiftRight ||
-		tokenType == ttBitShiftRightArith )
-		return -3;
-
-	if( tokenType == ttAmp )
-		return -4;
-
-	if( tokenType == ttBitXor )
-		return -5;
-
-	if( tokenType == ttBitOr )
-		return -6;
-
-	if( tokenType == ttLessThanOrEqual ||
-		tokenType == ttLessThan ||
-		tokenType == ttGreaterThanOrEqual ||
-		tokenType == ttGreaterThan )
-		return -7;
-
-	if( tokenType == ttEqual || tokenType == ttNotEqual || tokenType == ttXor || tokenType == ttIs || tokenType == ttNotIs )
-		return -8;
-
-	if( tokenType == ttAnd )
-		return -9;
-
-	if( tokenType == ttOr )
-		return -10;
-
-	// Unknown operator
-	asASSERT(false);
-
-	return 0;
-}
-
-asUINT asCCompiler::MatchArgument(asCArray<int> &funcs, asCArray<asSOverloadCandidate> &matches, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct)
-{
-	matches.SetLength(0);
-
-	for( asUINT n = 0; n < funcs.GetLength(); n++ )
-	{
-		asCScriptFunction *desc = builder->GetFunctionDescription(funcs[n]);
-
-		// Does the function have arguments enough?
-		if( (int)desc->parameterTypes.GetLength() <= paramNum )
-			continue;
-
-		int cost = MatchArgument(desc, argExpr, paramNum, allowObjectConstruct);
-		if( cost != -1 )
-			matches.PushLast(asSOverloadCandidate(funcs[n], asUINT(cost)));
-	}
-
-	return (asUINT)matches.GetLength();
-}
-
-int asCCompiler::MatchArgument(asCScriptFunction *desc, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct)
-{
-	// void expressions can match any out parameter, but nothing else
-	if( argExpr->IsVoidExpression() )
-	{
-		if( desc->inOutFlags[paramNum] == asTM_OUTREF )
-			return 0;
-		return -1;
-	}
-
-	// Can we make the match by implicit conversion?
-	asCExprContext ti(engine);
-	ti.type = argExpr->type;
-	ti.methodName = argExpr->methodName;
-	ti.enumValue = argExpr->enumValue;
-	ti.exprNode = argExpr->exprNode;
-	if( argExpr->type.dataType.IsPrimitive() )
-		ti.type.dataType.MakeReference(false);
-
-	// Don't allow the implicit conversion to make a copy in case the argument is expecting a reference to the true value
-	if (desc->parameterTypes[paramNum].IsReference() && desc->inOutFlags[paramNum] == asTM_INOUTREF)
-		allowObjectConstruct = false;
-
-	int cost = ImplicitConversion(&ti, desc->parameterTypes[paramNum], 0, asIC_IMPLICIT_CONV, false, allowObjectConstruct);
-
-	// If the function parameter is an inout-reference then it must not be possible to call the
-	// function with an incorrect argument type, even though the type can normally be converted.
-	if( desc->parameterTypes[paramNum].IsReference() &&
-		desc->inOutFlags[paramNum] == asTM_INOUTREF &&
-		desc->parameterTypes[paramNum].GetTokenType() != ttQuestion )
-	{
-		// Observe, that the below checks are only necessary for when unsafe references have been
-		// enabled by the application. Without this the &inout reference form wouldn't be allowed
-		// for these value types.
-
-		// Don't allow a primitive to be converted to a reference of another primitive type
-		if( desc->parameterTypes[paramNum].IsPrimitive() &&
-			desc->parameterTypes[paramNum].GetTokenType() != argExpr->type.dataType.GetTokenType() )
-		{
-			asASSERT( engine->ep.allowUnsafeReferences );
-			return -1;
-		}
-
-		// Don't allow an enum to be converted to a reference of another enum type
-		if( desc->parameterTypes[paramNum].IsEnumType() &&
-			desc->parameterTypes[paramNum].GetTypeInfo() != argExpr->type.dataType.GetTypeInfo() )
-		{
-			asASSERT( engine->ep.allowUnsafeReferences );
-			return -1;
-		}
-
-		// Don't allow a non-handle expression to be converted to a reference to a handle
-		if( desc->parameterTypes[paramNum].IsObjectHandle() &&
-			!argExpr->type.dataType.IsObjectHandle() )
-		{
-			asASSERT( engine->ep.allowUnsafeReferences );
-			return -1;
-		}
-
-		// Don't allow a value type to be converted
-		if( (desc->parameterTypes[paramNum].GetTypeInfo() && (desc->parameterTypes[paramNum].GetTypeInfo()->GetFlags() & asOBJ_VALUE)) &&
-			(desc->parameterTypes[paramNum].GetTypeInfo() != argExpr->type.dataType.GetTypeInfo()) )
-		{
-			asASSERT( engine->ep.allowUnsafeReferences );
-			return -1;
-		}
-	}
-
-	// How well does the argument match the function parameter?
-	if( desc->parameterTypes[paramNum].IsEqualExceptRef(ti.type.dataType) )
-		return cost;
-
-	// No match is available
-	return -1;
-}
-
-void asCCompiler::PrepareArgument2(asCExprContext *ctx, asCExprContext *arg, asCDataType *paramType, bool isFunction, int refType, bool isMakingCopy)
-{
-	// Reference parameters whose value won't be used don't evaluate the expression
-	// Clean arguments (i.e. default value) will be passed in directly as there is nothing to protect
-	if( paramType->IsReference() && !(refType & asTM_INREF) && !arg->isCleanArg )
-	{
-		// Store the original bytecode so that it can be reused when processing the deferred output parameter
-		asCExprContext *orig = asNEW(asCExprContext)(engine);
-		if( orig == 0 )
-		{
-			// Out of memory
-			return;
-		}
-		MergeExprBytecodeAndType(orig, arg);
-		arg->origExpr = orig;
-	}
-
-	PrepareArgument(paramType, arg, arg->exprNode, isFunction, refType, isMakingCopy);
-
-	// arg still holds the original expression for output parameters
-	ctx->bc.AddCode(&arg->bc);
-}
-
-bool asCCompiler::CompileOverloadedDualOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, bool isHandle, eTokenType token)
-{
-	DetermineSingleFunc(lctx, node);
-	DetermineSingleFunc(rctx, node);
-
-	ctx->exprNode = node;
-
-	// What type of operator is it?
-	if( token == ttUnrecognizedToken )
-		token = node->tokenType;
-	if( token == ttUnrecognizedToken )
-	{
-		// This happens when the compiler is inferring an assignment
-		// operation from another action, for example in preparing a value
-		// as a function argument
-		token = ttAssignment;
-	}
-
-	// boolean operators are not overloadable
-	if( token == ttAnd ||
-		token == ttOr ||
-		token == ttXor )
-		return false;
-
-	// Dual operators can also be implemented as class methods
-	if( token == ttEqual ||
-		token == ttNotEqual )
-	{
-		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
-		// Find the matching opEquals method
-		int r = CompileOverloadedDualOperator2(node, "opEquals", lctx, rctx, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
-		if( r == 0 )
-		{
-			// Try again by switching the order of the operands
-			r = CompileOverloadedDualOperator2(node, "opEquals", rctx, lctx, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
-		}
-
-		if( r == 1 )
-		{
-			if( token == ttNotEqual )
-				ctx->bc.InstrSHORT(asBC_NOT, ctx->type.stackOffset);
-
-			// Success, don't continue
-			return true;
-		}
-		else if( r < 0 )
-		{
-			// Compiler error, don't continue
-			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
-			return true;
-		}
-	}
-
-	if( token == ttEqual ||
-		token == ttNotEqual ||
-		token == ttLessThan ||
-		token == ttLessThanOrEqual ||
-		token == ttGreaterThan ||
-		token == ttGreaterThanOrEqual )
-	{
-		bool swappedOrder = false;
-
-		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
-		// Find the matching opCmp method
-		int r = CompileOverloadedDualOperator2(node, "opCmp", lctx, rctx, ctx, true, asCDataType::CreatePrimitive(ttInt, false));
-		if( r == 0 )
-		{
-			// Try again by switching the order of the operands
-			swappedOrder = true;
-			r = CompileOverloadedDualOperator2(node, "opCmp", rctx, lctx, ctx, true, asCDataType::CreatePrimitive(ttInt, false));
-		}
-
-		if( r == 1 )
-		{
-			ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-
-			int a = AllocateVariable(asCDataType::CreatePrimitive(ttBool, false), true);
-
-			ctx->bc.InstrW_DW(asBC_CMPIi, ctx->type.stackOffset, 0);
-
-			if( token == ttEqual )
-				ctx->bc.Instr(asBC_TZ);
-			else if( token == ttNotEqual )
-				ctx->bc.Instr(asBC_TNZ);
-			else if( (token == ttLessThan && !swappedOrder) ||
-				     (token == ttGreaterThan && swappedOrder) )
-				ctx->bc.Instr(asBC_TS);
-			else if( (token == ttLessThanOrEqual && !swappedOrder) ||
-				     (token == ttGreaterThanOrEqual && swappedOrder) )
-				ctx->bc.Instr(asBC_TNP);
-			else if( (token == ttGreaterThan && !swappedOrder) ||
-				     (token == ttLessThan && swappedOrder) )
-				ctx->bc.Instr(asBC_TP);
-			else if( (token == ttGreaterThanOrEqual && !swappedOrder) ||
-				     (token == ttLessThanOrEqual && swappedOrder) )
-				ctx->bc.Instr(asBC_TNS);
-
-			ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
-
-			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, false), a, true);
-
-			// Success, don't continue
-			return true;
-		}
-		else if( r < 0 )
-		{
-			// Compiler error, don't continue
-			#if AS_SIZEOF_BOOL == 1
-				ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
-			#else
-				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
-			#endif
-			return true;
-		}
-	}
-
-	// The rest of the operators are not commutative, and doesn't require specific return type
-	const char *op = 0, *op_r = 0;
-	switch( int(token) ) // convert to int to avoid warning in gnuc that not all values are tested
-	{
-	case ttPlus:               op = "opAdd";  op_r = "opAdd_r";  break;
-	case ttMinus:              op = "opSub";  op_r = "opSub_r";  break;
-	case ttStar:               op = "opMul";  op_r = "opMul_r";  break;
-	case ttSlash:              op = "opDiv";  op_r = "opDiv_r";  break;
-	case ttPercent:            op = "opMod";  op_r = "opMod_r";  break;
-	case ttStarStar:           op = "opPow";  op_r = "opPow_r";  break;
-	case ttBitOr:              op = "opOr";   op_r = "opOr_r";   break;
-	case ttAmp:                op = "opAnd";  op_r = "opAnd_r";  break;
-	case ttBitXor:             op = "opXor";  op_r = "opXor_r";  break;
-	case ttBitShiftLeft:       op = "opShl";  op_r = "opShl_r";  break;
-	case ttBitShiftRight:      op = "opShr";  op_r = "opShr_r";  break;
-	case ttBitShiftRightArith: op = "opUShr"; op_r = "opUShr_r"; break;
-	}
-
-	// TODO: Might be interesting to support a concatenation operator, e.g. ~
-
-	if( op && op_r )
-	{
-		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
-		// Find the matching operator method
-		int r = CompileOverloadedDualOperator2(node, op, lctx, rctx, ctx);
-		if( r == 0 )
-		{
-			// Try again by switching the order of the operands, and using the reversed operator
-			r = CompileOverloadedDualOperator2(node, op_r, rctx, lctx, ctx);
-		}
-
-		if( r == 1 )
-		{
-			// Success, don't continue
-			return true;
-		}
-		else if( r < 0 )
-		{
-			// Compiler error, don't continue
-			ctx->type.SetDummy();
-			return true;
-		}
-	}
-
-	// Assignment operators
-	op = 0;
-	if( isHandle )
-	{
-		// Only asOBJ_ASHANDLE types can get here
-		asASSERT( lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) );
-		asASSERT( token == ttAssignment );
-
-		if( token == ttAssignment )
-			op = "opHndlAssign";
-	}
-	else
-	{
-		switch( int(token) ) // convert to int to avoid warning in gnuc that not all values are tested
-		{
-		case ttAssignment:        op = "opAssign";     break;
-		case ttAddAssign:         op = "opAddAssign";  break;
-		case ttSubAssign:         op = "opSubAssign";  break;
-		case ttMulAssign:         op = "opMulAssign";  break;
-		case ttDivAssign:         op = "opDivAssign";  break;
-		case ttModAssign:         op = "opModAssign";  break;
-		case ttPowAssign:         op = "opPowAssign";  break;
-		case ttOrAssign:          op = "opOrAssign";   break;
-		case ttAndAssign:         op = "opAndAssign";  break;
-		case ttXorAssign:         op = "opXorAssign";  break;
-		case ttShiftLeftAssign:   op = "opShlAssign";  break;
-		case ttShiftRightLAssign: op = "opShrAssign";  break;
-		case ttShiftRightAAssign: op = "opUShrAssign"; break;
-		}
-	}
-
-	if( op )
-	{
-		if( builder->engine->ep.disallowValueAssignForRefType &&
-			lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !(lctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCOPED) )
-		{
-			if( token == ttAssignment )
-				Error(TXT_DISALLOW_ASSIGN_ON_REF_TYPE, node);
-			else
-				Error(TXT_DISALLOW_COMPOUND_ASSIGN_ON_REF_TYPE, node);
-
-			// Set a dummy output
-			ctx->type.Set(lctx->type.dataType);
-			return true;
-		}
-
-		// TODO: Shouldn't accept const lvalue with the assignment operators
-
-		// Find the matching operator method
-		int r = CompileOverloadedDualOperator2(node, op, lctx, rctx, ctx);
-		if( r == 1 )
-		{
-			// Success, don't continue
-			return true;
-		}
-		else if( r < 0 )
-		{
-			// Compiler error, don't continue
-			ctx->type.SetDummy();
-			return true;
-		}
-	}
-
-	// No suitable operator was found
-	return false;
-}
-
-// Returns negative on compile error
-//         zero on no matching operator
-//         one on matching operator
-int asCCompiler::CompileOverloadedDualOperator2(asCScriptNode *node, const char *methodName, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, bool specificReturn, const asCDataType &returnType)
-{
-	// Find the matching method
-	if( lctx->type.dataType.IsObject() &&
-		(!lctx->type.isExplicitHandle ||
-		 lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
-	{
-		asUINT n;
-
-		// Is the left value a const?
-		bool isConst = lctx->type.dataType.IsObjectConst();
-
-		asCArray<int> funcs;
-		asCObjectType *ot = lctx->type.dataType.GetTypeInfo()->CastToObjectType();
-		for( n = 0; n < ot->methods.GetLength(); n++ )
-		{
-			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-			asASSERT( func );
-			if( func && func->name == methodName &&
-				(!specificReturn || func->returnType == returnType) &&
-				func->parameterTypes.GetLength() == 1 &&
-				(!isConst || func->isReadOnly) )
-			{
-				// Make sure the method is accessible by the module
-				if( builder->module->accessMask & func->accessMask )
-				{
-					funcs.PushLast(func->id);
-				}
-			}
-		}
-
-		// Which is the best matching function?
-		asCArray<asSOverloadCandidate> tempFuncs;
-		MatchArgument(funcs, tempFuncs, rctx, 0);
-
-		// Find the lowest cost operator(s)
-		asCArray<int> ops;
-		asUINT bestCost = asUINT(-1);
-		for( n = 0; n < tempFuncs.GetLength(); ++n )
-		{
-			asUINT cost = tempFuncs[n].cost;
-			if( cost < bestCost )
-			{
-				ops.SetLength(0);
-				bestCost = cost;
-			}
-			if( cost == bestCost )
-				ops.PushLast(tempFuncs[n].funcId);
-		}
-
-		// If the object is not const, then we need to prioritize non-const methods
-		if( !isConst )
-			FilterConst(ops);
-
-		// Did we find an operator?
-		if( ops.GetLength() == 1 )
-		{
-			// Process the lctx expression as get accessor
-			ProcessPropertyGetAccessor(lctx, node);
-
-			// Make sure the rvalue doesn't have deferred temporary variables that are also used in the lvalue,
-			// since that would cause the VM to overwrite the variable while executing the bytecode for the lvalue.
-			asCArray<int> usedVars;
-			lctx->bc.GetVarsUsed(usedVars);
-			asUINT oldReservedVars = reservedVariables.GetLength();
-			for( n = 0; n < rctx->deferredParams.GetLength(); n++ )
-			{
-				if( rctx->deferredParams[n].argType.isTemporary && 
-					usedVars.Exists(rctx->deferredParams[n].argType.stackOffset) )
-				{
-					if( reservedVariables.GetLength() == oldReservedVars )
-						reservedVariables.Concatenate(usedVars);
-
-					// Allocate a new variable for the deferred argument
-					int offset = AllocateVariableNotIn(rctx->deferredParams[n].argType.dataType, true, false, rctx);
-					int oldVar = rctx->deferredParams[n].argType.stackOffset;
-					rctx->deferredParams[n].argType.stackOffset = short(offset);
-					rctx->bc.ExchangeVar(oldVar, offset);
-					ReleaseTemporaryVariable(oldVar, 0);
-				}
-			}
-			reservedVariables.SetLength(oldReservedVars);
-
-			// Merge the bytecode so that it forms lvalue.methodName(rvalue)
-			asCArray<asCExprContext *> args;
-			args.PushLast(rctx);
-			MergeExprBytecode(ctx, lctx);
-			ctx->type = lctx->type;
-			MakeFunctionCall(ctx, ops[0], ctx->type.dataType.GetTypeInfo()->CastToObjectType(), args, node);
-
-			// Found matching operator
-			return 1;
-		}
-		else if( ops.GetLength() > 1 )
-		{
-			Error(TXT_MORE_THAN_ONE_MATCHING_OP, node);
-			PrintMatchingFuncs(ops, node);
-
-			ctx->type.SetDummy();
-
-			// Compiler error
-			return -1;
-		}
-	}
-
-	// No matching operator
-	return 0;
-}
-
-void asCCompiler::MakeFunctionCall(asCExprContext *ctx, int funcId, asCObjectType *objectType, asCArray<asCExprContext*> &args, asCScriptNode *node, bool useVariable, int stackOffset, int funcPtrVar)
-{
-	if( objectType )
-		Dereference(ctx, true);
-
-	// Store the expression node for error reporting
-	if( ctx->exprNode == 0 )
-		ctx->exprNode = node;
-
-	asCByteCode objBC(engine);
-	objBC.AddCode(&ctx->bc);
-
-	PrepareFunctionCall(funcId, &ctx->bc, args);
-
-	// Verify if any of the args variable offsets are used in the other code.
-	// If they are exchange the offset for a new one
-	asUINT n;
-	for( n = 0; n < args.GetLength(); n++ )
-	{
-		if( args[n]->type.isTemporary && objBC.IsVarUsed(args[n]->type.stackOffset) )
-		{
-			// Release the current temporary variable
-			ReleaseTemporaryVariable(args[n]->type, 0);
-
-			asCDataType dt = args[n]->type.dataType;
-			dt.MakeReference(false);
-
-			int l = int(reservedVariables.GetLength());
-			objBC.GetVarsUsed(reservedVariables);
-			ctx->bc.GetVarsUsed(reservedVariables);
-			int newOffset = AllocateVariable(dt, true, IsVariableOnHeap(args[n]->type.stackOffset));
-			reservedVariables.SetLength(l);
-
-			asASSERT( IsVariableOnHeap(args[n]->type.stackOffset) == IsVariableOnHeap(newOffset) );
-
-			ctx->bc.ExchangeVar(args[n]->type.stackOffset, newOffset);
-			args[n]->type.stackOffset = (short)newOffset;
-			args[n]->type.isTemporary = true;
-			args[n]->type.isVariable  = true;
-		}
-	}
-
-	// If the function will return a value type on the stack, then we must allocate space
-	// for that here and push the address on the stack as a hidden argument to the function
-	asCScriptFunction *func = builder->GetFunctionDescription(funcId);
-	if( func->DoesReturnOnStack() )
-	{
-		asASSERT(!useVariable);
-
-		useVariable = true;
-		stackOffset = AllocateVariable(func->returnType, true);
-		ctx->bc.InstrSHORT(asBC_PSF, short(stackOffset));
-	}
-
-	ctx->bc.AddCode(&objBC);
-
-	MoveArgsToStack(funcId, &ctx->bc, args, objectType ? true : false);
-
-	PerformFunctionCall(funcId, ctx, false, &args, 0, useVariable, stackOffset, funcPtrVar);
-}
-
-int asCCompiler::CompileOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op)
-{
-	// Don't allow any operators on expressions that take address of class method, but allow it on global functions
-	if( (lctx->IsClassMethod()) || (rctx->IsClassMethod()) )
-	{
-		Error(TXT_INVALID_OP_ON_METHOD, node);
-		return -1;
-	}
-
-	// Don't allow any operators on void expressions
-	if( lctx->IsVoidExpression() || rctx->IsVoidExpression() )
-	{
-		Error(TXT_VOID_CANT_BE_OPERAND, node);
-		return -1;
-	}
-
-	if( op == ttUnrecognizedToken )
-		op = node->tokenType;
-
-	IsVariableInitialized(&lctx->type, node);
-	IsVariableInitialized(&rctx->type, node);
-
-	if( lctx->type.isExplicitHandle || rctx->type.isExplicitHandle ||
-		lctx->type.IsNullConstant() || rctx->type.IsNullConstant() ||
-		op == ttIs || op == ttNotIs )
-	{
-		CompileOperatorOnHandles(node, lctx, rctx, ctx, op);
-		return 0;
-	}
-	else
-	{
-		// Compile an overloaded operator for the two operands
-		if( CompileOverloadedDualOperator(node, lctx, rctx, ctx, false, op) )
-			return 0;
-
-		// If both operands are objects, then we shouldn't continue
-		if( lctx->type.dataType.IsObject() && rctx->type.dataType.IsObject() )
-		{
-			asCString str;
-			str.Format(TXT_NO_MATCHING_OP_FOUND_FOR_TYPES_s_AND_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), rctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-			ctx->type.SetDummy();
-			return -1;
-		}
-
-		// Process the property get accessors (if any)
-		ProcessPropertyGetAccessor(lctx, node);
-		ProcessPropertyGetAccessor(rctx, node);
-
-		// Make sure we have two variables or constants
-		if( lctx->type.dataType.IsReference() ) ConvertToVariableNotIn(lctx, rctx);
-		if( rctx->type.dataType.IsReference() ) ConvertToVariableNotIn(rctx, lctx);
-
-		// Make sure lctx doesn't end up with a variable used in rctx
-		if( lctx->type.isTemporary && rctx->bc.IsVarUsed(lctx->type.stackOffset) )
-		{
-			int offset = AllocateVariableNotIn(lctx->type.dataType, true, false, rctx);
-			rctx->bc.ExchangeVar(lctx->type.stackOffset, offset);
-			ReleaseTemporaryVariable(offset, 0);
-		}
-
-		// Math operators
-		// + - * / % ** += -= *= /= %= **=
-		if( op == ttPlus     || op == ttAddAssign ||
-			op == ttMinus    || op == ttSubAssign ||
-			op == ttStar     || op == ttMulAssign ||
-			op == ttSlash    || op == ttDivAssign ||
-			op == ttPercent  || op == ttModAssign ||
-			op == ttStarStar || op == ttPowAssign )
-		{
-			CompileMathOperator(node, lctx, rctx, ctx, op);
-			return 0;
-		}
-
-		// Bitwise operators
-		// << >> >>> & | ^ <<= >>= >>>= &= |= ^=
-		if( op == ttAmp                || op == ttAndAssign         ||
-			op == ttBitOr              || op == ttOrAssign          ||
-			op == ttBitXor             || op == ttXorAssign         ||
-			op == ttBitShiftLeft       || op == ttShiftLeftAssign   ||
-			op == ttBitShiftRight      || op == ttShiftRightLAssign ||
-			op == ttBitShiftRightArith || op == ttShiftRightAAssign )
-		{
-			CompileBitwiseOperator(node, lctx, rctx, ctx, op);
-			return 0;
-		}
-
-		// Comparison operators
-		// == != < > <= >=
-		if( op == ttEqual       || op == ttNotEqual           ||
-			op == ttLessThan    || op == ttLessThanOrEqual    ||
-			op == ttGreaterThan || op == ttGreaterThanOrEqual )
-		{
-			CompileComparisonOperator(node, lctx, rctx, ctx, op);
-			return 0;
-		}
-
-		// Boolean operators
-		// && || ^^
-		if( op == ttAnd || op == ttOr || op == ttXor )
-		{
-			CompileBooleanOperator(node, lctx, rctx, ctx, op);
-			return 0;
-		}
-	}
-
-	asASSERT(false);
-	return -1;
-}
-
-void asCCompiler::ConvertToTempVariableNotIn(asCExprContext *ctx, asCExprContext *exclude)
-{
-	int l = int(reservedVariables.GetLength());
-	if( exclude ) exclude->bc.GetVarsUsed(reservedVariables);
-	ConvertToTempVariable(ctx);
-	reservedVariables.SetLength(l);
-}
-
-void asCCompiler::ConvertToTempVariable(asCExprContext *ctx)
-{
-	// This is only used for primitive types and null handles
-	asASSERT( ctx->type.dataType.IsPrimitive() || ctx->type.dataType.IsNullHandle() );
-
-	ConvertToVariable(ctx);
-	if( !ctx->type.isTemporary )
-	{
-		if( ctx->type.dataType.IsPrimitive() )
-		{
-			// Copy the variable to a temporary variable
-			int offset = AllocateVariable(ctx->type.dataType, true);
-			if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-				ctx->bc.InstrW_W(asBC_CpyVtoV4, offset, ctx->type.stackOffset);
-			else
-				ctx->bc.InstrW_W(asBC_CpyVtoV8, offset, ctx->type.stackOffset);
-			ctx->type.SetVariable(ctx->type.dataType, offset, true);
-		}
-		else
-		{
-			// We should never get here
-			asASSERT(false);
-		}
-	}
-}
-
-void asCCompiler::ConvertToVariable(asCExprContext *ctx)
-{
-	// We should never get here while the context is still an unprocessed property accessor
-	asASSERT(ctx->property_get == 0 && ctx->property_set == 0);
-
-	int offset;
-	if( !ctx->type.isVariable &&
-		(ctx->type.dataType.IsObjectHandle() ||
-		 (ctx->type.dataType.IsObject() && ctx->type.dataType.SupportHandles())) )
-	{
-		offset = AllocateVariable(ctx->type.dataType, true);
-		if( ctx->type.IsNullConstant() )
-		{
-			if( ctx->bc.GetLastInstr() == asBC_PshNull )
-				ctx->bc.Instr(asBC_PopPtr); // Pop the null constant pushed onto the stack
-			ctx->bc.InstrSHORT(asBC_ClrVPtr, (short)offset);
-		}
-		else
-		{
-			Dereference(ctx, true);
-
-			// Copy the object handle to a variable
-			ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-			if( ctx->type.dataType.IsFuncdef() )
-				ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
-			else
-				ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
-			ctx->bc.Instr(asBC_PopPtr);
-		}
-
-		// As this is an object the reference must be placed on the stack
-		ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
-
-		ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-		ctx->type.SetVariable(ctx->type.dataType, offset, true);
-		ctx->type.dataType.MakeHandle(true);
-		ctx->type.dataType.MakeReference(true);
-	}
-	else if( (!ctx->type.isVariable || ctx->type.dataType.IsReference()) &&
-		     ctx->type.dataType.IsPrimitive() )
-	{
-		if( ctx->type.isConstant )
-		{
-			offset = AllocateVariable(ctx->type.dataType, true);
-			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
-				ctx->bc.InstrSHORT_B(asBC_SetV1, (short)offset, ctx->type.GetConstantB());
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
-				ctx->bc.InstrSHORT_W(asBC_SetV2, (short)offset, ctx->type.GetConstantW());
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 4 )
-				ctx->bc.InstrSHORT_DW(asBC_SetV4, (short)offset, ctx->type.GetConstantDW());
-			else
-				ctx->bc.InstrSHORT_QW(asBC_SetV8, (short)offset, ctx->type.GetConstantQW());
-
-			ctx->type.SetVariable(ctx->type.dataType, offset, true);
-			return;
-		}
-		else
-		{
-			asASSERT(ctx->type.dataType.IsPrimitive());
-			asASSERT(ctx->type.dataType.IsReference());
-
-			ctx->type.dataType.MakeReference(false);
-			offset = AllocateVariable(ctx->type.dataType, true);
-
-			// Read the value from the address in the register directly into the variable
-			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
-				ctx->bc.InstrSHORT(asBC_RDR1, (short)offset);
-			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
-				ctx->bc.InstrSHORT(asBC_RDR2, (short)offset);
-			else if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-				ctx->bc.InstrSHORT(asBC_RDR4, (short)offset);
-			else
-				ctx->bc.InstrSHORT(asBC_RDR8, (short)offset);
-		}
-
-		ReleaseTemporaryVariable(ctx->type, &ctx->bc);
-		ctx->type.SetVariable(ctx->type.dataType, offset, true);
-	}
-}
-
-void asCCompiler::ConvertToVariableNotIn(asCExprContext *ctx, asCExprContext *exclude)
-{
-	int l = int(reservedVariables.GetLength());
-	if( exclude ) exclude->bc.GetVarsUsed(reservedVariables);
-	ConvertToVariable(ctx);
-	reservedVariables.SetLength(l);
-}
-
-void asCCompiler::ImplicitConvObjectToBestMathType(asCExprContext *ctx, asCScriptNode *node)
-{
-	asCArray<int> funcs;
-	asCObjectType *ot = ctx->type.dataType.GetTypeInfo()->CastToObjectType();
-	if( ot )
-	{
-		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
-		{
-			// Consider only implicit casts
-			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
-			if( func->name == "opImplConv" &&
-				func->returnType.IsPrimitive() &&
-				func->parameterTypes.GetLength() == 0 )
-				funcs.PushLast(ot->methods[n]);
-		}
-
-		// Use the one with the highest precision
-		const eTokenType match[10] = {ttDouble, ttFloat, ttInt64, ttUInt64, ttInt, ttUInt, ttInt16, ttUInt16, ttInt8, ttUInt8};
-		while( funcs.GetLength() > 1 )
-		{
-			eTokenType returnType = builder->GetFunctionDescription(funcs[0])->returnType.GetTokenType();
-			int value1 = 11, value2 = 11;
-			for( asUINT i = 0; i < 10; i++ )
-			{
-				if( returnType == match[i] )
-				{
-					value1 = i;
-					break;
-				}
-			}
-
-			for( asUINT n = 1; n < funcs.GetLength(); n++ )
-			{
-				returnType = builder->GetFunctionDescription(funcs[n])->returnType.GetTokenType();
-				for( asUINT i = 0; i < 10; i++ )
-				{
-					if( returnType == match[i] )
-					{
-						value2 = i;
-						break;
-					}
-				}
-
-				if( value2 >= value1 )
-				{
-					// Remove this and continue searching
-					funcs.RemoveIndexUnordered(n--);
-				}
-				else
-				{
-					// Remove the first, and start over
-					funcs.RemoveIndexUnordered(0);
-					break;
-				}
-			}
-		}
-
-		// Do the conversion
-		if( funcs.GetLength() )
-			ImplicitConvObjectToPrimitive(ctx, builder->GetFunctionDescription(funcs[0])->returnType, node, asIC_IMPLICIT_CONV);
-	}
-}
-
-void asCCompiler::CompileMathOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext  *rctx, asCExprContext *ctx, eTokenType op)
-{
-	// TODO: If a constant is only using 32bits, then a 32bit operation is preferred
-
-	// TODO: clean up: This initial part is identical to CompileComparisonOperator. Make a common function out of it
-
-	// If either operand is a non-primitive then use the primitive type
-	if( !lctx->type.dataType.IsPrimitive() )
-	{
-		int l = int(reservedVariables.GetLength());
-		rctx->bc.GetVarsUsed(reservedVariables);
-		ImplicitConvObjectToBestMathType(lctx, node);
-		reservedVariables.SetLength(l);
-	}
-	if( !rctx->type.dataType.IsPrimitive() )
-	{
-		int l = int(reservedVariables.GetLength());
-		lctx->bc.GetVarsUsed(reservedVariables);
-		ImplicitConvObjectToBestMathType(rctx, node);
-		reservedVariables.SetLength(l);
-	}
-
-	// Both types must now be primitives. Implicitly convert them so they match
-	asCDataType to;
-	if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
-		to.SetTokenType(ttDouble);
-	else if( lctx->type.dataType.IsFloatType() || rctx->type.dataType.IsFloatType() )
-		to.SetTokenType(ttFloat);
-	else if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 || rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-	{
-		// Convert to int64 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
-			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
-			to.SetTokenType(ttInt64);
-		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
-			to.SetTokenType(ttUInt64);
-		else
-			to.SetTokenType(ttInt64);
-	}
-	else
-	{
-		// Convert to int32 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
-			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
-			to.SetTokenType(ttInt);
-		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
-			to.SetTokenType(ttUInt);
-		else
-			to.SetTokenType(ttInt);
-	}
-
-	// If doing an operation with double constant and float variable, the constant should be converted to float
-	if( (lctx->type.isConstant && lctx->type.dataType.IsDoubleType() && !rctx->type.isConstant && rctx->type.dataType.IsFloatType()) ||
-		(rctx->type.isConstant && rctx->type.dataType.IsDoubleType() && !lctx->type.isConstant && lctx->type.dataType.IsFloatType()) )
-		to.SetTokenType(ttFloat);
-
-	if( op == ttUnrecognizedToken )
-		op = node->tokenType;
-
-	// If integer division is disabled, convert to floating-point
-	if( engine->ep.disableIntegerDivision &&
-		(op == ttSlash || op == ttDivAssign) &&
-		(to.IsIntegerType() || to.IsUnsignedType()) )
-	{
-		// Use double to avoid losing precision when dividing with 32bit ints
-		// For 64bit ints there is unfortunately no greater type so with those
-		// there is still a risk of loosing precision
-		to.SetTokenType(ttDouble);
-	}
-
-	// Do the actual conversion
-	int l = int(reservedVariables.GetLength());
-	rctx->bc.GetVarsUsed(reservedVariables);
-	lctx->bc.GetVarsUsed(reservedVariables);
-
-	if( lctx->type.dataType.IsReference() )
-		ConvertToVariable(lctx);
-	if( rctx->type.dataType.IsReference() )
-		ConvertToVariable(rctx);
-
-	if( to.IsPrimitive() )
-	{
-		// ttStarStar allows an integer, right-hand operand and a double
-		// left-hand operand.
-		if( (op == ttStarStar || op == ttPowAssign) &&
-			lctx->type.dataType.IsDoubleType() &&
-			(rctx->type.dataType.IsIntegerType() ||
-			    rctx->type.dataType.IsUnsignedType()) )
-		{
-			to.SetTokenType(ttInt);
-			ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true);
-			to.SetTokenType(ttDouble);
-		}
-		else
-		{
-			ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV, true);
-			ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true);
-		}
-	}
-	reservedVariables.SetLength(l);
-
-	// Verify that the conversion was successful
-	if( !lctx->type.dataType.IsIntegerType() &&
-		!lctx->type.dataType.IsUnsignedType() &&
-		!lctx->type.dataType.IsFloatType() &&
-		!lctx->type.dataType.IsDoubleType() )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-
-		ctx->type.SetDummy();
-		return;
-	}
-
-	if( !rctx->type.dataType.IsIntegerType() &&
-		!rctx->type.dataType.IsUnsignedType() &&
-		!rctx->type.dataType.IsFloatType() &&
-		!rctx->type.dataType.IsDoubleType() )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-
-		ctx->type.SetDummy();
-		return;
-	}
-
-	bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
-
-	// Verify if we are dividing with a constant zero
-	if( rctx->type.isConstant && 
-		(op == ttSlash   || op == ttDivAssign ||
-		 op == ttPercent || op == ttModAssign) &&
-		((rctx->type.dataType.GetSizeInMemoryBytes() == 4 && rctx->type.GetConstantDW() == 0) || 
-		 (rctx->type.dataType.GetSizeInMemoryBytes() == 8 && rctx->type.GetConstantQW() == 0) ||
-		 (rctx->type.dataType.GetSizeInMemoryBytes() == 1 && rctx->type.GetConstantB() == 0) ||
-		 (rctx->type.dataType.GetSizeInMemoryBytes() == 2 && rctx->type.GetConstantW() == 0)) )
-	{
-		Error(TXT_DIVIDE_BY_ZERO, node);
-	}
-
-	if( !isConstant )
-	{
-		ConvertToVariableNotIn(lctx, rctx);
-		ConvertToVariableNotIn(rctx, lctx);
-		ReleaseTemporaryVariable(lctx->type, &lctx->bc);
-		ReleaseTemporaryVariable(rctx->type, &rctx->bc);
-
-		if( op == ttAddAssign || op == ttSubAssign ||
-			op == ttMulAssign || op == ttDivAssign ||
-			op == ttModAssign || op == ttPowAssign )
-		{
-			// Merge the operands in the different order so that they are evaluated correctly
-			MergeExprBytecode(ctx, rctx);
-			MergeExprBytecode(ctx, lctx);
-
-			// We must not process the deferred parameters yet, as
-			// it may overwrite the lvalue kept in the register
-		}
-		else
-		{
-			MergeExprBytecode(ctx, lctx);
-			MergeExprBytecode(ctx, rctx);
-
-			ProcessDeferredParams(ctx);
-		}
-
-		asEBCInstr instruction = asBC_ADDi;
-		if( lctx->type.dataType.IsIntegerType() ||
-			lctx->type.dataType.IsUnsignedType() )
-		{
-			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				if( op == ttPlus || op == ttAddAssign )
-					instruction = asBC_ADDi;
-				else if( op == ttMinus || op == ttSubAssign )
-					instruction = asBC_SUBi;
-				else if( op == ttStar || op == ttMulAssign )
-					instruction = asBC_MULi;
-				else if( op == ttSlash || op == ttDivAssign )
-				{
-					if( lctx->type.dataType.IsIntegerType() )
-						instruction = asBC_DIVi;
-					else
-						instruction = asBC_DIVu;
-				}
-				else if( op == ttPercent || op == ttModAssign )
-				{
-					if( lctx->type.dataType.IsIntegerType() )
-						instruction = asBC_MODi;
-					else
-						instruction = asBC_MODu;
-				}
-				else if( op == ttStarStar || op == ttPowAssign )
-				{
-					if( lctx->type.dataType.IsIntegerType() )
-						instruction = asBC_POWi;
-					else
-						instruction = asBC_POWu;
-				}
-			}
-			else
-			{
-				if( op == ttPlus || op == ttAddAssign )
-					instruction = asBC_ADDi64;
-				else if( op == ttMinus || op == ttSubAssign )
-					instruction = asBC_SUBi64;
-				else if( op == ttStar || op == ttMulAssign )
-					instruction = asBC_MULi64;
-				else if( op == ttSlash || op == ttDivAssign )
-				{
-					if( lctx->type.dataType.IsIntegerType() )
-						instruction = asBC_DIVi64;
-					else
-						instruction = asBC_DIVu64;
-				}
-				else if( op == ttPercent || op == ttModAssign )
-				{
-					if( lctx->type.dataType.IsIntegerType() )
-						instruction = asBC_MODi64;
-					else
-						instruction = asBC_MODu64;
-				}
-				else if( op == ttStarStar || op == ttPowAssign )
-				{
-					if( lctx->type.dataType.IsIntegerType() )
-						instruction = asBC_POWi64;
-					else
-						instruction = asBC_POWu64;
-				}
-			}
-		}
-		else if( lctx->type.dataType.IsFloatType() )
-		{
-			if( op == ttPlus || op == ttAddAssign )
-				instruction = asBC_ADDf;
-			else if( op == ttMinus || op == ttSubAssign )
-				instruction = asBC_SUBf;
-			else if( op == ttStar || op == ttMulAssign )
-				instruction = asBC_MULf;
-			else if( op == ttSlash || op == ttDivAssign )
-				instruction = asBC_DIVf;
-			else if( op == ttPercent || op == ttModAssign )
-				instruction = asBC_MODf;
-			else if( op == ttStarStar || op == ttPowAssign )
-				instruction = asBC_POWf;
-		}
-		else if( lctx->type.dataType.IsDoubleType() )
-		{
-			if( rctx->type.dataType.IsIntegerType() )
-			{
-				asASSERT(rctx->type.dataType.GetSizeInMemoryDWords() == 1);
-
-				if( op == ttStarStar || op == ttPowAssign )
-					instruction = asBC_POWdi;
-				else
-					asASSERT(false);  // Should not be possible
-			}
-			else
-			{
-				if( op == ttPlus || op == ttAddAssign )
-					instruction = asBC_ADDd;
-				else if( op == ttMinus || op == ttSubAssign )
-					instruction = asBC_SUBd;
-				else if( op == ttStar || op == ttMulAssign )
-					instruction = asBC_MULd;
-				else if( op == ttSlash || op == ttDivAssign )
-					instruction = asBC_DIVd;
-				else if( op == ttPercent || op == ttModAssign )
-					instruction = asBC_MODd;
-				else if( op == ttStarStar || op == ttPowAssign )
-					instruction = asBC_POWd;
-			}
-		}
-		else
-		{
-			// Shouldn't be possible
-			asASSERT(false);
-		}
-
-		// Do the operation
-		int a = AllocateVariable(lctx->type.dataType, true);
-		int b = lctx->type.stackOffset;
-		int c = rctx->type.stackOffset;
-
-		ctx->bc.InstrW_W_W(instruction, a, b, c);
-
-		ctx->type.SetVariable(lctx->type.dataType, a, true);
-	}
-	else
-	{
-		// Both values are constants
-		if( lctx->type.dataType.IsIntegerType() ||
-			lctx->type.dataType.IsUnsignedType() )
-		{
-			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				int v = 0;
-				if( op == ttPlus )
-					v = int(lctx->type.GetConstantDW()) + int(rctx->type.GetConstantDW());
-				else if( op == ttMinus )
-					v = int(lctx->type.GetConstantDW()) - int(rctx->type.GetConstantDW());
-				else if( op == ttStar )
-					v = int(lctx->type.GetConstantDW()) * int(rctx->type.GetConstantDW());
-				else if( op == ttSlash )
-				{
-					// TODO: Should probably report an error, rather than silently convert the value to 0
-					if( rctx->type.GetConstantDW() == 0 || (int(rctx->type.GetConstantDW()) == -1 && lctx->type.GetConstantDW() == 0x80000000) )
-						v = 0;
-					else
-						if( lctx->type.dataType.IsIntegerType() )
-							v = int(lctx->type.GetConstantDW()) / int(rctx->type.GetConstantDW());
-						else
-							v = lctx->type.GetConstantDW() / rctx->type.GetConstantDW();
-				}
-				else if( op == ttPercent )
-				{
-					// TODO: Should probably report an error, rather than silently convert the value to 0
-					if( rctx->type.GetConstantDW() == 0 || (int(rctx->type.GetConstantDW()) == -1 && lctx->type.GetConstantDW() == 0x80000000) )
-						v = 0;
-					else
-						if( lctx->type.dataType.IsIntegerType() )
-							v = int(lctx->type.GetConstantDW()) % int(rctx->type.GetConstantDW());
-						else
-							v = lctx->type.GetConstantDW() % rctx->type.GetConstantDW();
-				}
-				else if( op == ttStarStar )
-				{
-					bool isOverflow;
-					if( lctx->type.dataType.IsIntegerType() )
-						v = as_powi(int(lctx->type.GetConstantDW()), int(rctx->type.GetConstantDW()), isOverflow);
-					else
-						v = as_powu(lctx->type.GetConstantDW(), rctx->type.GetConstantDW(), isOverflow);
-
-					if( isOverflow )
-						Error(TXT_POW_OVERFLOW, node);
-				}
-
-				ctx->type.SetConstantDW(lctx->type.dataType, v);
-
-				// If the right value is greater than the left value in a minus operation, then we need to convert the type to int
-				if( lctx->type.dataType.GetTokenType() == ttUInt && op == ttMinus && lctx->type.GetConstantDW() < rctx->type.GetConstantDW())
-					ctx->type.dataType.SetTokenType(ttInt);
-			}
-			else
-			{
-				asQWORD v = 0;
-				if( op == ttPlus )
-					v = asINT64(lctx->type.GetConstantQW()) + asINT64(rctx->type.GetConstantQW());
-				else if( op == ttMinus )
-					v = asINT64(lctx->type.GetConstantQW()) - asINT64(rctx->type.GetConstantQW());
-				else if( op == ttStar )
-					v = asINT64(lctx->type.GetConstantQW()) * asINT64(rctx->type.GetConstantQW());
-				else if( op == ttSlash )
-				{
-					// TODO: Should probably report an error, rather than silently convert the value to 0
-					if( rctx->type.GetConstantQW() == 0 || (rctx->type.GetConstantQW() == asQWORD(-1) && lctx->type.GetConstantQW() == (asQWORD(1)<<63)) )
-						v = 0;
-					else
-						if( lctx->type.dataType.IsIntegerType() )
-							v = asINT64(lctx->type.GetConstantQW()) / asINT64(rctx->type.GetConstantQW());
-						else
-							v = lctx->type.GetConstantQW() / rctx->type.GetConstantQW();
-				}
-				else if( op == ttPercent )
-				{
-				    // TODO: Should probably report an error, rather than silently convert the value to 0
-					if( rctx->type.GetConstantQW() == 0 || (rctx->type.GetConstantQW() == asQWORD(-1) && lctx->type.GetConstantQW() == (asQWORD(1)<<63)) )
-						v = 0;
-					else
-						if( lctx->type.dataType.IsIntegerType() )
-							v = asINT64(lctx->type.GetConstantQW()) % asINT64(rctx->type.GetConstantQW());
-						else
-							v = lctx->type.GetConstantQW() % rctx->type.GetConstantQW();
-				}
-				else if( op == ttStarStar )
-				{
-					bool isOverflow;
-					if( lctx->type.dataType.IsIntegerType() )
-						v = as_powi64(asINT64(lctx->type.GetConstantQW()), asINT64(rctx->type.GetConstantQW()), isOverflow);
-					else
-						v = as_powu64(lctx->type.GetConstantQW(), rctx->type.GetConstantQW(), isOverflow);
-
-					if( isOverflow )
-						Error(TXT_POW_OVERFLOW, node);
-				}
-
-				ctx->type.SetConstantQW(lctx->type.dataType, v);
-
-				// If the right value is greater than the left value in a minus operation, then we need to convert the type to int
-				if( lctx->type.dataType.GetTokenType() == ttUInt64 && op == ttMinus && lctx->type.GetConstantQW() < rctx->type.GetConstantQW())
-					ctx->type.dataType.SetTokenType(ttInt64);
-			}
-		}
-		else if( lctx->type.dataType.IsFloatType() )
-		{
-			float v = 0.0f;
-			if( op == ttPlus )
-				v = lctx->type.GetConstantF() + rctx->type.GetConstantF();
-			else if( op == ttMinus )
-				v = lctx->type.GetConstantF() - rctx->type.GetConstantF();
-			else if( op == ttStar )
-				v = lctx->type.GetConstantF() * rctx->type.GetConstantF();
-			else if( op == ttSlash )
-			{
-				if( rctx->type.GetConstantF() == 0 )
-					v = 0;
-				else
-					v = lctx->type.GetConstantF() / rctx->type.GetConstantF();
-			}
-			else if( op == ttPercent )
-			{
-				if( rctx->type.GetConstantF() == 0 )
-					v = 0;
-				else
-					v = fmodf(lctx->type.GetConstantF(), rctx->type.GetConstantF());
-			}
-			else if( op == ttStarStar )
-			{
-				v = powf(lctx->type.GetConstantF(), rctx->type.GetConstantF());
-
-				if( v == HUGE_VAL )
-					Error(TXT_POW_OVERFLOW, node);
-			}
-
-			ctx->type.SetConstantF(lctx->type.dataType, v);
-		}
-		else if( lctx->type.dataType.IsDoubleType() )
-		{
-			double v = 0.0;
-			if( rctx->type.dataType.IsIntegerType() )
-			{
-				asASSERT(rctx->type.dataType.GetSizeInMemoryDWords() == 1);
-
-				if( op == ttStarStar || op == ttPowAssign )
-				{
-					v = pow(lctx->type.GetConstantD(), int(rctx->type.GetConstantDW()));
-					if( v == HUGE_VAL )
-						Error(TXT_POW_OVERFLOW, node);
-				}
-				else
-					asASSERT(false);  // Should not be possible
-			}
-			else
-			{
-				if( op == ttPlus )
-					v = lctx->type.GetConstantD() + rctx->type.GetConstantD();
-				else if( op == ttMinus )
-					v = lctx->type.GetConstantD() - rctx->type.GetConstantD();
-				else if( op == ttStar )
-					v = lctx->type.GetConstantD() * rctx->type.GetConstantD();
-				else if( op == ttSlash )
-				{
-					if( rctx->type.GetConstantD() == 0 )
-						v = 0;
-					else
-						v = lctx->type.GetConstantD() / rctx->type.GetConstantD();
-				}
-				else if( op == ttPercent )
-				{
-					if( rctx->type.GetConstantD() == 0 )
-						v = 0;
-					else
-						v = fmod(lctx->type.GetConstantD(), rctx->type.GetConstantD());
-				}
-				else if( op == ttStarStar )
-				{
-					v = pow(lctx->type.GetConstantD(), rctx->type.GetConstantD());
-					if( v == HUGE_VAL )
-						Error(TXT_POW_OVERFLOW, node);
-				}
-			}
-
-			ctx->type.SetConstantD(lctx->type.dataType, v);
-		}
-		else
-		{
-			// Shouldn't be possible
-			asASSERT(false);
-		}
-	}
-}
-
-void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op)
-{
-	// TODO: If a constant is only using 32bits, then a 32bit operation is preferred
-
-	if( op == ttUnrecognizedToken )
-		op = node->tokenType;
-	if( op == ttAmp    || op == ttAndAssign ||
-		op == ttBitOr  || op == ttOrAssign  ||
-		op == ttBitXor || op == ttXorAssign )
-	{
-		// Convert left hand operand to integer if it's not already one
-		asCDataType to;
-		if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 ||
-			rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			to.SetTokenType(ttInt64);
-		else
-			to.SetTokenType(ttInt);
-
-		// Do the actual conversion (keep sign/unsigned if possible)
-		int l = int(reservedVariables.GetLength());
-		rctx->bc.GetVarsUsed(reservedVariables);
-		if( lctx->type.dataType.IsUnsignedType() )
-			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttUInt : ttUInt64 );
-		else
-			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttInt : ttInt64 );
-		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV, true);
-		reservedVariables.SetLength(l);
-
-		// Verify that the conversion was successful
-		if( lctx->type.dataType != to )
-		{
-			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-		}
-
-		// Convert right hand operand to same size as left hand
-		l = int(reservedVariables.GetLength());
-		lctx->bc.GetVarsUsed(reservedVariables);
-		if( rctx->type.dataType.IsUnsignedType() )
-			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttUInt : ttUInt64 );
-		else
-			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttInt : ttInt64 );
-		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true);
-		reservedVariables.SetLength(l);
-		if( rctx->type.dataType != to )
-		{
-			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-		}
-
-		bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
-
-		if( !isConstant )
-		{
-			ConvertToVariableNotIn(lctx, rctx);
-			ConvertToVariableNotIn(rctx, lctx);
-			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
-			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
-
-			if( op == ttAndAssign || op == ttOrAssign || op == ttXorAssign )
-			{
-				// Compound assignments execute the right hand value first
-				MergeExprBytecode(ctx, rctx);
-				MergeExprBytecode(ctx, lctx);
-			}
-			else
-			{
-				MergeExprBytecode(ctx, lctx);
-				MergeExprBytecode(ctx, rctx);
-			}
-			ProcessDeferredParams(ctx);
-
-			asEBCInstr instruction = asBC_BAND;
-			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				if( op == ttAmp || op == ttAndAssign )
-					instruction = asBC_BAND;
-				else if( op == ttBitOr || op == ttOrAssign )
-					instruction = asBC_BOR;
-				else if( op == ttBitXor || op == ttXorAssign )
-					instruction = asBC_BXOR;
-			}
-			else
-			{
-				if( op == ttAmp || op == ttAndAssign )
-					instruction = asBC_BAND64;
-				else if( op == ttBitOr || op == ttOrAssign )
-					instruction = asBC_BOR64;
-				else if( op == ttBitXor || op == ttXorAssign )
-					instruction = asBC_BXOR64;
-			}
-
-			// Do the operation
-			int a = AllocateVariable(lctx->type.dataType, true);
-			int b = lctx->type.stackOffset;
-			int c = rctx->type.stackOffset;
-
-			ctx->bc.InstrW_W_W(instruction, a, b, c);
-
-			ctx->type.SetVariable(lctx->type.dataType, a, true);
-		}
-		else
-		{
-			if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				asQWORD v = 0;
-				if( op == ttAmp )
-					v = lctx->type.GetConstantQW() & rctx->type.GetConstantQW();
-				else if( op == ttBitOr )
-					v = lctx->type.GetConstantQW() | rctx->type.GetConstantQW();
-				else if( op == ttBitXor )
-					v = lctx->type.GetConstantQW() ^ rctx->type.GetConstantQW();
-
-				// Remember the result
-				ctx->type.SetConstantQW(lctx->type.dataType, v);
-			}
-			else
-			{
-				asDWORD v = 0;
-				if( op == ttAmp )
-					v = lctx->type.GetConstantDW() & rctx->type.GetConstantDW();
-				else if( op == ttBitOr )
-					v = lctx->type.GetConstantDW() | rctx->type.GetConstantDW();
-				else if( op == ttBitXor )
-					v = lctx->type.GetConstantDW() ^ rctx->type.GetConstantDW();
-
-				// Remember the result
-				ctx->type.SetConstantDW(lctx->type.dataType, v);
-			}
-		}
-	}
-	else if( op == ttBitShiftLeft       || op == ttShiftLeftAssign   ||
-		     op == ttBitShiftRight      || op == ttShiftRightLAssign ||
-			 op == ttBitShiftRightArith || op == ttShiftRightAAssign )
-	{
-		// Don't permit object to primitive conversion, since we don't know which integer type is the correct one
-		if( lctx->type.dataType.IsObject() )
-		{
-			asCString str;
-			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-
-			// Set an integer value and allow the compiler to continue
-			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), 0);
-			return;
-		}
-
-		// Convert left hand operand to integer if it's not already one
-		asCDataType to = lctx->type.dataType;
-		if( lctx->type.dataType.IsUnsignedType() &&
-			lctx->type.dataType.GetSizeInMemoryBytes() < 4 )
-		{
-			// Upgrade to 32bit
-			to = asCDataType::CreatePrimitive(ttUInt, false);
-		}
-		else if( !lctx->type.dataType.IsUnsignedType() )
-		{
-			if (lctx->type.dataType.GetSizeInMemoryDWords() == 2)
-				to = asCDataType::CreatePrimitive(ttInt64, false);
-			else
-				to = asCDataType::CreatePrimitive(ttInt, false);
-		}
-
-		// Do the actual conversion
-		int l = int(reservedVariables.GetLength());
-		rctx->bc.GetVarsUsed(reservedVariables);
-		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV, true);
-		reservedVariables.SetLength(l);
-
-		// Verify that the conversion was successful
-		if( lctx->type.dataType != to )
-		{
-			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-			Error(str, node);
-		}
-
-		// Right operand must be 32bit uint
-		l = int(reservedVariables.GetLength());
-		lctx->bc.GetVarsUsed(reservedVariables);
-		ImplicitConversion(rctx, asCDataType::CreatePrimitive(ttUInt, true), node, asIC_IMPLICIT_CONV, true);
-		reservedVariables.SetLength(l);
-		if( !rctx->type.dataType.IsUnsignedType() )
-		{
-			asCString str;
-			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "uint");
-			Error(str, node);
-		}
-
-		bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
-
-		if( !isConstant )
-		{
-			ConvertToVariableNotIn(lctx, rctx);
-			ConvertToVariableNotIn(rctx, lctx);
-			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
-			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
-
-			if( op == ttShiftLeftAssign || op == ttShiftRightLAssign || op == ttShiftRightAAssign )
-			{
-				// Compound assignments execute the right hand value first
-				MergeExprBytecode(ctx, rctx);
-				MergeExprBytecode(ctx, lctx);
-			}
-			else
-			{
-				MergeExprBytecode(ctx, lctx);
-				MergeExprBytecode(ctx, rctx);
-			}
-			ProcessDeferredParams(ctx);
-
-			asEBCInstr instruction = asBC_BSLL;
-			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				if( op == ttBitShiftLeft || op == ttShiftLeftAssign )
-					instruction = asBC_BSLL;
-				else if( op == ttBitShiftRight || op == ttShiftRightLAssign )
-					instruction = asBC_BSRL;
-				else if( op == ttBitShiftRightArith || op == ttShiftRightAAssign )
-					instruction = asBC_BSRA;
-			}
-			else
-			{
-				if( op == ttBitShiftLeft || op == ttShiftLeftAssign )
-					instruction = asBC_BSLL64;
-				else if( op == ttBitShiftRight || op == ttShiftRightLAssign )
-					instruction = asBC_BSRL64;
-				else if( op == ttBitShiftRightArith || op == ttShiftRightAAssign )
-					instruction = asBC_BSRA64;
-			}
-
-			// Do the operation
-			int a = AllocateVariable(lctx->type.dataType, true);
-			int b = lctx->type.stackOffset;
-			int c = rctx->type.stackOffset;
-
-			ctx->bc.InstrW_W_W(instruction, a, b, c);
-
-			ctx->type.SetVariable(lctx->type.dataType, a, true);
-		}
-		else
-		{
-			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				asDWORD v = 0;
-				if( op == ttBitShiftLeft )
-					v = lctx->type.GetConstantDW() << rctx->type.GetConstantDW();
-				else if( op == ttBitShiftRight )
-					v = lctx->type.GetConstantDW() >> rctx->type.GetConstantDW();
-				else if( op == ttBitShiftRightArith )
-					v = int(lctx->type.GetConstantDW()) >> rctx->type.GetConstantDW();
-
-				ctx->type.SetConstantDW(lctx->type.dataType, v);
-			}
-			else
-			{
-				asQWORD v = 0;
-				if( op == ttBitShiftLeft )
-					v = lctx->type.GetConstantQW() << rctx->type.GetConstantDW();
-				else if( op == ttBitShiftRight )
-					v = lctx->type.GetConstantQW() >> rctx->type.GetConstantDW();
-				else if( op == ttBitShiftRightArith )
-					v = asINT64(lctx->type.GetConstantQW()) >> rctx->type.GetConstantDW();
-
-				ctx->type.SetConstantQW(lctx->type.dataType, v);
-			}
-		}
-	}
-}
-
-void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op)
-{
-	// Both operands must be of the same type
-
-	// If either operand is a non-primitive then first convert them to the best number type
-	if( !lctx->type.dataType.IsPrimitive() )
-	{
-		int l = int(reservedVariables.GetLength());
-		rctx->bc.GetVarsUsed(reservedVariables);
-		ImplicitConvObjectToBestMathType(lctx, node);
-		reservedVariables.SetLength(l);
-	}
-	if( !rctx->type.dataType.IsPrimitive() )
-	{
-		int l = int(reservedVariables.GetLength());
-		lctx->bc.GetVarsUsed(reservedVariables);
-		ImplicitConvObjectToBestMathType(rctx, node);
-		reservedVariables.SetLength(l);
-	}
-
-	// Implicitly convert the operands to matching types
-	asCDataType to;
-	if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
-		to.SetTokenType(ttDouble);
-	else if( lctx->type.dataType.IsFloatType() || rctx->type.dataType.IsFloatType() )
-		to.SetTokenType(ttFloat);
-	else if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 || rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-	{
-		// Convert to int64 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
-			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
-			to.SetTokenType(ttInt64);
-		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
-			to.SetTokenType(ttUInt64);
-		else
-			to.SetTokenType(ttInt64);
-	}
-	else
-	{
-		// Convert to int32 if both are signed or if one is non-constant and signed
-		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
-			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
-			to.SetTokenType(ttInt);
-		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
-			to.SetTokenType(ttUInt);
-		else if( lctx->type.dataType.IsBooleanType() || rctx->type.dataType.IsBooleanType() )
-			to.SetTokenType(ttBool);
-		else
-			to.SetTokenType(ttInt);
-	}
-
-	// If doing an operation with double constant and float variable, the constant should be converted to float
-	if( (lctx->type.isConstant && lctx->type.dataType.IsDoubleType() && !rctx->type.isConstant && rctx->type.dataType.IsFloatType()) ||
-		(rctx->type.isConstant && rctx->type.dataType.IsDoubleType() && !lctx->type.isConstant && lctx->type.dataType.IsFloatType()) )
-		to.SetTokenType(ttFloat);
-
-	asASSERT( to.GetTokenType() != ttUnrecognizedToken );
-
-	// Do we have a mismatch between the sign of the operand?
-	bool signMismatch = false;
-	for( int n = 0; !signMismatch && n < 2; n++ )
-	{
-		asCExprContext *opCtx = n ? rctx : lctx;
-
-		if( opCtx->type.dataType.IsUnsignedType() != to.IsUnsignedType() )
-		{
-			// We have a mismatch, unless the value is a literal constant and the conversion won't affect its value
-			signMismatch = true;
-			if( opCtx->type.isConstant )
-			{
-				if( opCtx->type.dataType.GetTokenType() == ttUInt64 || opCtx->type.dataType.GetTokenType() == ttInt64 )
-				{
-					if( !(opCtx->type.GetConstantQW() & (asQWORD(1)<<63)) )
-						signMismatch = false;
-				}
-				else
-				{
-					if( !(opCtx->type.GetConstantDW() & (1<<31)) )
-						signMismatch = false;
-				}
-
-				// It's not necessary to check for floats or double, because if
-				// it was then the types for the conversion will never be unsigned
-			}
-		}
-	}
-
-	// Check for signed/unsigned mismatch
-	if( signMismatch )
-		Warning(TXT_SIGNED_UNSIGNED_MISMATCH, node);
-
-	// Attempt to resolve ambiguous enumerations
-	if( lctx->type.dataType.IsEnumType() && rctx->enumValue != "" )
-		ImplicitConversion(rctx, lctx->type.dataType, node, asIC_IMPLICIT_CONV);
-	else if( rctx->type.dataType.IsEnumType() && lctx->enumValue != "" )
-		ImplicitConversion(lctx, rctx->type.dataType, node, asIC_IMPLICIT_CONV);
-
-	// Do the actual conversion
-	int l = int(reservedVariables.GetLength());
-	rctx->bc.GetVarsUsed(reservedVariables);
-
-	if( lctx->type.dataType.IsReference() )
-		ConvertToVariable(lctx);
-	if( rctx->type.dataType.IsReference() )
-		ConvertToVariable(rctx);
-
-	ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
-	ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
-	reservedVariables.SetLength(l);
-
-	// Verify that the conversion was successful
-	bool ok = true;
-	if( !lctx->type.dataType.IsEqualExceptConst(to) )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-		ok = false;
-	}
-
-	if( !rctx->type.dataType.IsEqualExceptConst(to) )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-		ok = false;
-	}
-
-	if( !ok )
-	{
-		// It wasn't possible to get two valid operands, so we just return
-		// a boolean result and let the compiler continue.
-#if AS_SIZEOF_BOOL == 1
-		ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
-#else
-		ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
-#endif
-		return;
-	}
-
-	bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
-	
-	if( op == ttUnrecognizedToken )
-		op = node->tokenType;
-
-	if( !isConstant )
-	{
-		if( to.IsBooleanType() )
-		{
-			if( op == ttEqual || op == ttNotEqual )
-			{
-				// Must convert to temporary variable, because we are changing the value before comparison
-				ConvertToTempVariableNotIn(lctx, rctx);
-				ConvertToTempVariableNotIn(rctx, lctx);
-				ReleaseTemporaryVariable(lctx->type, &lctx->bc);
-				ReleaseTemporaryVariable(rctx->type, &rctx->bc);
-
-				// Make sure they are equal if not false
-				lctx->bc.InstrWORD(asBC_NOT, lctx->type.stackOffset);
-				rctx->bc.InstrWORD(asBC_NOT, rctx->type.stackOffset);
-
-				MergeExprBytecode(ctx, lctx);
-				MergeExprBytecode(ctx, rctx);
-				ProcessDeferredParams(ctx);
-
-				int a = AllocateVariable(asCDataType::CreatePrimitive(ttBool, true), true);
-				int b = lctx->type.stackOffset;
-				int c = rctx->type.stackOffset;
-
-				if( op == ttEqual )
-				{
-					ctx->bc.InstrW_W(asBC_CMPi,b,c);
-					ctx->bc.Instr(asBC_TZ);
-					ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
-				}
-				else if( op == ttNotEqual )
-				{
-					ctx->bc.InstrW_W(asBC_CMPi,b,c);
-					ctx->bc.Instr(asBC_TNZ);
-					ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
-				}
-
-				ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
-			}
-			else
-			{
-				// TODO: Use TXT_ILLEGAL_OPERATION_ON
-				Error(TXT_ILLEGAL_OPERATION, node);
-#if AS_SIZEOF_BOOL == 1
-				ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), 0);
-#else
-				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), 0);
-#endif
-			}
-		}
-		else
-		{
-			ConvertToVariableNotIn(lctx, rctx);
-			ConvertToVariableNotIn(rctx, lctx);
-			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
-			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
-
-			MergeExprBytecode(ctx, lctx);
-			MergeExprBytecode(ctx, rctx);
-			ProcessDeferredParams(ctx);
-
-			asEBCInstr iCmp = asBC_CMPi, iT = asBC_TZ;
-
-			if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-				iCmp = asBC_CMPi;
-			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-				iCmp = asBC_CMPu;
-			else if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-				iCmp = asBC_CMPi64;
-			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-				iCmp = asBC_CMPu64;
-			else if( lctx->type.dataType.IsFloatType() )
-				iCmp = asBC_CMPf;
-			else if( lctx->type.dataType.IsDoubleType() )
-				iCmp = asBC_CMPd;
-			else
-				asASSERT(false);
-
-			if( op == ttEqual )
-				iT = asBC_TZ;
-			else if( op == ttNotEqual )
-				iT = asBC_TNZ;
-			else if( op == ttLessThan )
-				iT = asBC_TS;
-			else if( op == ttLessThanOrEqual )
-				iT = asBC_TNP;
-			else if( op == ttGreaterThan )
-				iT = asBC_TP;
-			else if( op == ttGreaterThanOrEqual )
-				iT = asBC_TNS;
-
-			int a = AllocateVariable(asCDataType::CreatePrimitive(ttBool, true), true);
-			int b = lctx->type.stackOffset;
-			int c = rctx->type.stackOffset;
-
-			ctx->bc.InstrW_W(iCmp, b, c);
-			ctx->bc.Instr(iT);
-			ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
-
-			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
-		}
-	}
-	else
-	{
-		if( to.IsBooleanType() )
-		{
-			if( op == ttEqual || op == ttNotEqual )
-			{
-				// Make sure they are equal if not false
-				if( lctx->type.GetConstantDW() != 0 ) lctx->type.SetConstantDW(VALUE_OF_BOOLEAN_TRUE);
-				if( rctx->type.GetConstantDW() != 0 ) rctx->type.SetConstantDW(VALUE_OF_BOOLEAN_TRUE);
-
-				asDWORD v = 0;
-				if( op == ttEqual )
-				{
-					v = int(lctx->type.GetConstantDW()) - int(rctx->type.GetConstantDW());
-					if( v == 0 ) v = VALUE_OF_BOOLEAN_TRUE; else v = 0;
-				}
-				else if( op == ttNotEqual )
-				{
-					v = int(lctx->type.GetConstantDW()) - int(rctx->type.GetConstantDW());
-					if( v != 0 ) v = VALUE_OF_BOOLEAN_TRUE; else v = 0;
-				}
-
-				#if AS_SIZEOF_BOOL == 1
-					ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), (asBYTE)v);
-				#else
-					ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), v);
-				#endif
-			}
-			else
-			{
-				// TODO: Use TXT_ILLEGAL_OPERATION_ON
-				Error(TXT_ILLEGAL_OPERATION, node);
-			}
-		}
-		else
-		{
-			int i = 0;
-			if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				int v = int(lctx->type.GetConstantDW()) - int(rctx->type.GetConstantDW());
-				if( v < 0 ) i = -1;
-				if( v > 0 ) i = 1;
-			}
-			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			{
-				asDWORD v1 = lctx->type.GetConstantDW();
-				asDWORD v2 = rctx->type.GetConstantDW();
-				if( v1 < v2 ) i = -1;
-				if( v1 > v2 ) i = 1;
-			}
-			else if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				asINT64 v = asINT64(lctx->type.GetConstantQW()) - asINT64(rctx->type.GetConstantQW());
-				if( v < 0 ) i = -1;
-				if( v > 0 ) i = 1;
-			}
-			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
-			{
-				asQWORD v1 = lctx->type.GetConstantQW();
-				asQWORD v2 = rctx->type.GetConstantQW();
-				if( v1 < v2 ) i = -1;
-				if( v1 > v2 ) i = 1;
-			}
-			else if( lctx->type.dataType.IsFloatType() )
-			{
-				float v = lctx->type.GetConstantF() - rctx->type.GetConstantF();
-				if( v < 0 ) i = -1;
-				if( v > 0 ) i = 1;
-			}
-			else if( lctx->type.dataType.IsDoubleType() )
-			{
-				double v = lctx->type.GetConstantD() - rctx->type.GetConstantD();
-				if( v < 0 ) i = -1;
-				if( v > 0 ) i = 1;
-			}
-
-
-			if( op == ttEqual )
-				i = (i == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-			else if( op == ttNotEqual )
-				i = (i != 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-			else if( op == ttLessThan )
-				i = (i < 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-			else if( op == ttLessThanOrEqual )
-				i = (i <= 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-			else if( op == ttGreaterThan )
-				i = (i > 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-			else if( op == ttGreaterThanOrEqual )
-				i = (i >= 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-
-			#if AS_SIZEOF_BOOL == 1
-				ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), (asBYTE)i);
-			#else
-				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), i);
-			#endif
-		}
-	}
-}
-
-void asCCompiler::PushVariableOnStack(asCExprContext *ctx, bool asReference)
-{
-	// Put the result on the stack
-	if( asReference )
-	{
-		ctx->bc.InstrSHORT(asBC_PSF, ctx->type.stackOffset);
-		ctx->type.dataType.MakeReference(true);
-	}
-	else
-	{
-		if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
-			ctx->bc.InstrSHORT(asBC_PshV4, ctx->type.stackOffset);
-		else
-			ctx->bc.InstrSHORT(asBC_PshV8, ctx->type.stackOffset);
-	}
-}
-
-void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op)
-{
-	// Both operands must be booleans
-	asCDataType to;
-	to.SetTokenType(ttBool);
-
-	// Do the actual conversion
-	int l = int(reservedVariables.GetLength());
-	rctx->bc.GetVarsUsed(reservedVariables);
-	lctx->bc.GetVarsUsed(reservedVariables);
-
-	// Allow value types to be converted to bool using 'bool opImplConv()'
-	if( lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
-	if( rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
-		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
-	reservedVariables.SetLength(l);
-
-	// Verify that the conversion was successful
-	if( !lctx->type.dataType.IsBooleanType() )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "bool");
-		Error(str, node);
-		// Force the conversion to allow compilation to proceed
-		lctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
-	}
-
-	if( !rctx->type.dataType.IsBooleanType() )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "bool");
-		Error(str, node);
-		// Force the conversion to allow compilation to proceed
-		rctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
-	}
-
-	bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
-
-	ctx->type.Set(asCDataType::CreatePrimitive(ttBool, true));
-
-	// What kind of operator is it?
-	if( op == ttUnrecognizedToken )
-		op = node->tokenType;
-	if( op == ttXor )
-	{
-		if( !isConstant )
-		{
-			// Must convert to temporary variable, because we are changing the value before comparison
-			ConvertToTempVariableNotIn(lctx, rctx);
-			ConvertToTempVariableNotIn(rctx, lctx);
-			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
-			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
-
-			// Make sure they are equal if not false
-			lctx->bc.InstrWORD(asBC_NOT, lctx->type.stackOffset);
-			rctx->bc.InstrWORD(asBC_NOT, rctx->type.stackOffset);
-
-			MergeExprBytecode(ctx, lctx);
-			MergeExprBytecode(ctx, rctx);
-			ProcessDeferredParams(ctx);
-
-			int a = AllocateVariable(ctx->type.dataType, true);
-			int b = lctx->type.stackOffset;
-			int c = rctx->type.stackOffset;
-
-			ctx->bc.InstrW_W_W(asBC_BXOR,a,b,c);
-
-			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
-		}
-		else
-		{
-			// Make sure they are equal if not false
-#if AS_SIZEOF_BOOL == 1
-			if( lctx->type.GetConstantB() != 0 ) lctx->type.SetConstantB(VALUE_OF_BOOLEAN_TRUE);
-			if( rctx->type.GetConstantB() != 0 ) rctx->type.SetConstantB(VALUE_OF_BOOLEAN_TRUE);
-
-			asBYTE v = 0;
-			v = lctx->type.GetConstantB() - rctx->type.GetConstantB();
-			if( v != 0 ) v = VALUE_OF_BOOLEAN_TRUE; else v = 0;
-
-			ctx->type.isConstant = true;
-			ctx->type.SetConstantB(v);
-#else
-			if( lctx->type.GetConstantDW() != 0 ) lctx->type.SetConstantDW(VALUE_OF_BOOLEAN_TRUE);
-			if( rctx->type.GetConstantDW() != 0 ) rctx->type.GetConstantDW(VALUE_OF_BOOLEAN_TRUE);
-
-			asDWORD v = 0;
-			v = lctx->type.GetConstantDW() - rctx->type.GetConstantDW();
-			if( v != 0 ) v = VALUE_OF_BOOLEAN_TRUE; else v = 0;
-
-			ctx->type.isConstant = true;
-			ctx->type.SetConstantDW(v);
-#endif
-		}
-	}
-	else if( op == ttAnd ||
-			 op == ttOr )
-	{
-		if( !isConstant )
-		{
-			// If or-operator and first value is 1 the second value shouldn't be calculated
-			// if and-operator and first value is 0 the second value shouldn't be calculated
-			ConvertToVariable(lctx);
-			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
-			MergeExprBytecode(ctx, lctx);
-
-			int offset = AllocateVariable(asCDataType::CreatePrimitive(ttBool, false), true);
-
-			int label1 = nextLabel++;
-			int label2 = nextLabel++;
-
-			ctx->bc.InstrSHORT(asBC_CpyVtoR4, lctx->type.stackOffset);
-			ctx->bc.Instr(asBC_ClrHi);
-			if( op == ttAnd )
-			{
-				ctx->bc.InstrDWORD(asBC_JNZ, label1);
-				ctx->bc.InstrW_DW(asBC_SetV4, (asWORD)offset, 0);
-				ctx->bc.InstrINT(asBC_JMP, label2);
-			}
-			else if( op == ttOr )
-			{
-				ctx->bc.InstrDWORD(asBC_JZ, label1);
-#if AS_SIZEOF_BOOL == 1
-				ctx->bc.InstrSHORT_B(asBC_SetV1, (short)offset, VALUE_OF_BOOLEAN_TRUE);
-#else
-				ctx->bc.InstrSHORT_DW(asBC_SetV4, (short)offset, VALUE_OF_BOOLEAN_TRUE);
-#endif
-				ctx->bc.InstrINT(asBC_JMP, label2);
-			}
-
-			ctx->bc.Label((short)label1);
-			ConvertToVariable(rctx);
-			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
-			rctx->bc.InstrW_W(asBC_CpyVtoV4, offset, rctx->type.stackOffset);
-			MergeExprBytecode(ctx, rctx);
-			ctx->bc.Label((short)label2);
-
-			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, false), offset, true);
-		}
-		else
-		{
-#if AS_SIZEOF_BOOL == 1
-			asBYTE v = 0;
-			if( op == ttAnd )
-				v = lctx->type.GetConstantB() && rctx->type.GetConstantB();
-			else if( op == ttOr )
-				v = lctx->type.GetConstantB() || rctx->type.GetConstantB();
-
-			// Remember the result
-			ctx->type.isConstant = true;
-			ctx->type.SetConstantB(v);
-#else
-			asDWORD v = 0;
-			if( op == ttAnd )
-				v = lctx->type.GetConstantDW() && rctx->type.GetConstantDW();
-			else if( op == ttOr )
-				v = lctx->type.GetConstantDW() || rctx->type.GetConstantDW();
-
-			// Remember the result
-			ctx->type.isConstant = true;
-			ctx->type.SetConstantDW(v);
-#endif
-		}
-	}
-}
-
-void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType opToken)
-{
-	// Process the property accessor as get
-	ProcessPropertyGetAccessor(lctx, node);
-	ProcessPropertyGetAccessor(rctx, node);
-
-	DetermineSingleFunc(lctx, node);
-	DetermineSingleFunc(rctx, node);
-
-	// Make sure lctx doesn't end up with a variable used in rctx
-	if( lctx->type.isTemporary && rctx->bc.IsVarUsed(lctx->type.stackOffset) )
-	{
-		asCArray<int> vars;
-		rctx->bc.GetVarsUsed(vars);
-		int offset = AllocateVariable(lctx->type.dataType, true);
-		rctx->bc.ExchangeVar(lctx->type.stackOffset, offset);
-		ReleaseTemporaryVariable(offset, 0);
-	}
-
-	if( opToken == ttUnrecognizedToken )
-		opToken = node->tokenType;
-
-	// Warn if not both operands are explicit handles or null handles
-	if( (opToken == ttEqual || opToken == ttNotEqual) &&
-		((!(lctx->type.isExplicitHandle || lctx->type.IsNullConstant()) && !(lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE))) ||
-		 (!(rctx->type.isExplicitHandle || rctx->type.IsNullConstant()) && !(rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE)))) )
-	{
-		Warning(TXT_HANDLE_COMPARISON, node);
-	}
-
-	// If one of the operands is a value type used as handle, we should look for the opEquals method
-	if( ((lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE)) ||
-		 (rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE))) &&
-		(opToken == ttEqual || opToken == ttIs ||
-		 opToken == ttNotEqual || opToken == ttNotIs) )
-	{
-		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
-		// Find the matching opEquals method
-		int r = CompileOverloadedDualOperator2(node, "opEquals", lctx, rctx, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
-		if( r == 0 )
-		{
-			// Try again by switching the order of the operands
-			r = CompileOverloadedDualOperator2(node, "opEquals", rctx, lctx, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
-		}
-
-		if( r == 1 )
-		{
-			if( opToken == ttNotEqual || opToken == ttNotIs )
-				ctx->bc.InstrSHORT(asBC_NOT, ctx->type.stackOffset);
-
-			// Success, don't continue
-			return;
-		}
-		else if( r == 0 )
-		{
-			// Couldn't find opEquals method
-			Error(TXT_NO_APPROPRIATE_OPEQUALS, node);
-		}
-
-		// Compiler error, don't continue
-		ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
-		return;
-	}
-
-
-	// Implicitly convert null to the other type
-	asCDataType to;
-	if( lctx->type.IsNullConstant() )
-		to = rctx->type.dataType;
-	else if( rctx->type.IsNullConstant() )
-		to = lctx->type.dataType;
-	else
-	{
-		// Find a common base type
-		asCExprContext tmp(engine);
-		tmp.type = rctx->type;
-		ImplicitConversion(&tmp, lctx->type.dataType, 0, asIC_IMPLICIT_CONV, false);
-		if( tmp.type.dataType.GetTypeInfo() == lctx->type.dataType.GetTypeInfo() )
-			to = lctx->type.dataType;
-		else
-			to = rctx->type.dataType;
-
-		// Assume handle-to-const as it is not possible to convert handle-to-const to handle-to-non-const
-		to.MakeHandleToConst(true);
-	}
-
-	// Need to pop the value if it is a null constant
-	if( lctx->type.IsNullConstant() )
-		lctx->bc.Instr(asBC_PopPtr);
-	if( rctx->type.IsNullConstant() )
-		rctx->bc.Instr(asBC_PopPtr);
-
-	// Convert both sides to explicit handles
-	to.MakeHandle(true);
-	to.MakeReference(false);
-
-	if( !to.IsObjectHandle() )
-	{
-		// Compiler error, don't continue
-		Error(TXT_OPERANDS_MUST_BE_HANDLES, node);
-#if AS_SIZEOF_BOOL == 1
-		ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
-#else
-		ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
-#endif
-		return;
-	}
-
-	// Do the conversion
-	ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
-	ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
-
-	// Both operands must be of the same type
-
-	// Verify that the conversion was successful
-	if( !lctx->type.dataType.IsEqualExceptConst(to) )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-	}
-
-	if( !rctx->type.dataType.IsEqualExceptConst(to) )
-	{
-		asCString str;
-		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
-		Error(str, node);
-	}
-
-	// Make sure it really is handles that are being compared
-	if( !lctx->type.dataType.IsObjectHandle() )
-	{
-		Error(TXT_OPERANDS_MUST_BE_HANDLES, node);
-	}
-
-	ctx->type.Set(asCDataType::CreatePrimitive(ttBool, true));
-
-	if( opToken == ttEqual || opToken == ttNotEqual || opToken == ttIs || opToken == ttNotIs )
-	{
-		// Make sure handles received as parameters by reference are copied to a local variable before the 
-		// asBC_CmpPtr, so we don't end up comparing the reference to the handle instead of the handle itself
-		if( lctx->type.isVariable && !lctx->type.isTemporary && lctx->type.stackOffset <= 0 )
-			lctx->type.isVariable = false;
-		if( rctx->type.isVariable && !rctx->type.isTemporary && rctx->type.stackOffset <= 0 )
-			rctx->type.isVariable = false;
-
-		// TODO: runtime optimize: don't do REFCPY if not necessary
-		ConvertToVariableNotIn(lctx, rctx);
-		ConvertToVariable(rctx);
-
-		// Pop the pointers from the stack as they will not be used
-		lctx->bc.Instr(asBC_PopPtr);
-		rctx->bc.Instr(asBC_PopPtr);
-
-		MergeExprBytecode(ctx, lctx);
-		MergeExprBytecode(ctx, rctx);
-
-		int a = AllocateVariable(ctx->type.dataType, true);
-		int b = lctx->type.stackOffset;
-		int c = rctx->type.stackOffset;
-
-		ctx->bc.InstrW_W(asBC_CmpPtr, b, c);
-
-		if( opToken == ttEqual || opToken == ttIs )
-			ctx->bc.Instr(asBC_TZ);
-		else if( opToken == ttNotEqual || opToken == ttNotIs )
-			ctx->bc.Instr(asBC_TNZ);
-
-		ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
-
-		ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
-
-		ReleaseTemporaryVariable(lctx->type, &ctx->bc);
-		ReleaseTemporaryVariable(rctx->type, &ctx->bc);
-		ProcessDeferredParams(ctx);
-	}
-	else
-	{
-		// TODO: Use TXT_ILLEGAL_OPERATION_ON
-		Error(TXT_ILLEGAL_OPERATION, node);
-	}
-}
-
-
-void asCCompiler::PerformFunctionCall(int funcId, asCExprContext *ctx, bool isConstructor, asCArray<asCExprContext*> *args, asCObjectType *objType, bool useVariable, int varOffset, int funcPtrVar)
-{
-	asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
-
-	// A shared object may not call non-shared functions
-	if( outFunc->IsShared() && !descr->IsShared() )
-	{
-		asCString msg;
-		msg.Format(TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s, descr->GetDeclarationStr().AddressOf());
-		Error(msg, ctx->exprNode);
-	}
-
-	// Check if the function is private or protected
-	if( descr->isPrivate && descr->GetObjectType() != outFunc->GetObjectType() )
-	{
-		asCString msg;
-		msg.Format(TXT_PRIVATE_METHOD_CALL_s, descr->GetDeclarationStr().AddressOf());
-		Error(msg, ctx->exprNode);
-	}
-	else if( descr->isProtected && 
-		     !(descr->GetObjectType() == outFunc->GetObjectType() || 
-		       (outFunc->GetObjectType() && outFunc->GetObjectType()->DerivesFrom(descr->GetObjectType()))) )
-	{
-		asCString msg;
-		msg.Format(TXT_PROTECTED_METHOD_CALL_s, descr->GetDeclarationStr().AddressOf());
-		Error(msg, ctx->exprNode);
-	}
-
-	int argSize = descr->GetSpaceNeededForArguments();
-
-	// If we're calling a class method we must make sure the object is guaranteed to stay
-	// alive throughout the call by holding on to a reference in a local variable. This must
-	// be done for any methods that return references, and any calls on script objects.
-	// Application registered objects are assumed to know to keep themselves alive even
-	// if the method doesn't return a refernce.
-	if( descr->objectType &&
-		(ctx->type.dataType.IsObjectHandle() || ctx->type.dataType.SupportHandles()) &&
-		(descr->returnType.IsReference() || (ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_SCRIPT_OBJECT)) &&
-		!(ctx->type.isVariable || ctx->type.isTemporary) &&
-		!(ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_SCOPED) &&
-		!(ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_ASHANDLE) )
-	{
-		// TODO: runtime optimize: Avoid this for global variables, by storing a reference to the global variable once in a 
-		//                         local variable and then refer to the same for each call. An alias for the global variable
-		//                         should be stored in the variable scope so that the compiler can find it. For loops and 
-		//                         scopes that will always be executed, i.e. non-if scopes the alias should be stored in the 
-		//                         higher scope to increase the probability of re-use.
-
-		// TODO: runtime optimize: This can be avoided for local variables (non-handles) as they have a well defined life time
-
-		int tempRef = AllocateVariable(ctx->type.dataType, true);
-		ctx->bc.InstrSHORT(asBC_PSF, (short)tempRef);
-		ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
-
-		// Add the release of this reference as a deferred expression
-		asSDeferredParam deferred;
-		deferred.origExpr = 0;
-		deferred.argInOutFlags = asTM_INREF;
-		deferred.argNode = 0;
-		deferred.argType.SetVariable(ctx->type.dataType, tempRef, true);
-		ctx->deferredParams.PushLast(deferred);
-
-		// Forget the current type
-		ctx->type.SetDummy();
-	}
-
-	// Check if there is a need to add a hidden pointer for when the function returns an object by value
-	if( descr->DoesReturnOnStack() && !useVariable )
-	{
-		useVariable = true;
-		varOffset = AllocateVariable(descr->returnType, true);
-
-		// Push the pointer to the pre-allocated space for the return value
-		ctx->bc.InstrSHORT(asBC_PSF, short(varOffset));
-
-		if( descr->objectType )
-		{
-			// The object pointer is already on the stack, but should be the top
-			// one, so we need to swap the pointers in order to get the correct
-			ctx->bc.Instr(asBC_SwapPtr);
-		}
-	}
-
-	if( isConstructor )
-	{
-		// Sometimes the value types are allocated on the heap,
-		// which is when this way of constructing them is used.
-
-		asASSERT(useVariable == false);
-
-		if( (objType->flags & asOBJ_TEMPLATE) )
-		{
-			asASSERT( descr->funcType == asFUNC_SCRIPT );
-
-			// Find the id of the real constructor and not the generated stub
-			asUINT id = 0;
-			asDWORD *bc = descr->scriptData->byteCode.AddressOf();
-			while( bc )
-			{
-				if( (*(asBYTE*)bc) == asBC_CALLSYS )
-				{
-					id = asBC_INTARG(bc);
-					break;
-				}
-				bc += asBCTypeSize[asBCInfo[*(asBYTE*)bc].type];
-			}
-
-			asASSERT( id );
-
-			ctx->bc.InstrPTR(asBC_OBJTYPE, objType);
-			ctx->bc.Alloc(asBC_ALLOC, objType, id, argSize + AS_PTR_SIZE + AS_PTR_SIZE);
-		}
-		else
-			ctx->bc.Alloc(asBC_ALLOC, objType, descr->id, argSize+AS_PTR_SIZE);
-
-		// The instruction has already moved the returned object to the variable
-		ctx->type.Set(asCDataType::CreatePrimitive(ttVoid, false));
-		ctx->type.isLValue = false;
-
-		// Clean up arguments
-		if( args )
-			AfterFunctionCall(funcId, *args, ctx, false);
-
-		ProcessDeferredParams(ctx);
-
-		return;
-	}
-	else
-	{
-		if( descr->objectType )
-			argSize += AS_PTR_SIZE;
-
-		// If the function returns an object by value the address of the location
-		// where the value should be stored is passed as an argument too
-		if( descr->DoesReturnOnStack() )
-			argSize += AS_PTR_SIZE;
-
-		// TODO: runtime optimize: If it is known that a class method cannot be overridden the call
-		//                         should be made with asBC_CALL as it is faster. Examples where this
-		//                         is known is for example finalled methods where the class doesn't derive
-		//                         from any other, or even non-finalled methods but where it is known
-		//                         at compile time the true type of the object. The first should be
-		//                         quite easy to determine, but the latter will be quite complex and possibly
-		//                         not worth it.
-		if( descr->funcType == asFUNC_IMPORTED )
-			ctx->bc.Call(asBC_CALLBND , descr->id, argSize);
-		// TODO: Maybe we need two different byte codes
-		else if( descr->funcType == asFUNC_INTERFACE || descr->funcType == asFUNC_VIRTUAL )
-			ctx->bc.Call(asBC_CALLINTF, descr->id, argSize);
-		else if( descr->funcType == asFUNC_SCRIPT )
-			ctx->bc.Call(asBC_CALL    , descr->id, argSize);
-		else if( descr->funcType == asFUNC_SYSTEM )
-		{
-			// Check if we can use the faster asBC_Thiscall1 instruction, i.e. one of
-			//    type &obj::func(int) 
-			//    type &obj::func(uint)
-			if( descr->GetObjectType() && descr->returnType.IsReference() && 
-				descr->parameterTypes.GetLength() == 1 && 
-				(descr->parameterTypes[0].IsIntegerType() || descr->parameterTypes[0].IsUnsignedType()) && 
-				descr->parameterTypes[0].GetSizeInMemoryBytes() == 4 &&
-				!descr->parameterTypes[0].IsReference() )
-				ctx->bc.Call(asBC_Thiscall1, descr->id, argSize);
-			else
-				ctx->bc.Call(asBC_CALLSYS , descr->id, argSize);
-		}
-		else if( descr->funcType == asFUNC_FUNCDEF )
-			ctx->bc.CallPtr(asBC_CallPtr, funcPtrVar, argSize);
-	}
-
-	if( (descr->returnType.IsObject() || descr->returnType.IsFuncdef()) && !descr->returnType.IsReference() )
-	{
-		int returnOffset = 0;
-
-		asCExprValue tmpExpr = ctx->type;
-
-		if( descr->DoesReturnOnStack() )
-		{
-			asASSERT( useVariable );
-
-			// The variable was allocated before the function was called
-			returnOffset = varOffset;
-			ctx->type.SetVariable(descr->returnType, returnOffset, true);
-
-			// The variable was initialized by the function, so we need to mark it as initialized here
-			ctx->bc.ObjInfo(varOffset, asOBJ_INIT);
-		}
-		else
-		{
-			if( useVariable )
-			{
-				// Use the given variable
-				returnOffset = varOffset;
-				ctx->type.SetVariable(descr->returnType, returnOffset, false);
-			}
-			else
-			{
-				// Allocate a temporary variable for the returned object
-				// The returned object will actually be allocated on the heap, so
-				// we must force the allocation of the variable to do the same
-				returnOffset = AllocateVariable(descr->returnType, true, !descr->returnType.IsObjectHandle());
-				ctx->type.SetVariable(descr->returnType, returnOffset, true);
-			}
-
-			// Move the pointer from the object register to the temporary variable
-			ctx->bc.InstrSHORT(asBC_STOREOBJ, (short)returnOffset);
-		}
-
-		ReleaseTemporaryVariable(tmpExpr, &ctx->bc);
-
-		ctx->type.dataType.MakeReference(IsVariableOnHeap(returnOffset));
-		ctx->type.isLValue = false; // It is a reference, but not an lvalue
-
-		// Clean up arguments
-		if( args )
-			AfterFunctionCall(funcId, *args, ctx, false);
-
-		ProcessDeferredParams(ctx);
-
-		ctx->bc.InstrSHORT(asBC_PSF, (short)returnOffset);
-	}
-	else if( descr->returnType.IsReference() )
-	{
-		asASSERT(useVariable == false);
-
-		// We cannot clean up the arguments yet, because the
-		// reference might be pointing to one of them.
-		if( args )
-			AfterFunctionCall(funcId, *args, ctx, true);
-
-		// Do not process the output parameters yet, because it
-		// might invalidate the returned reference
-
-		// If the context holds a variable that needs cleanup
-		// store it as a deferred parameter so it will be cleaned up
-		// afterwards.
-		if( ctx->type.isTemporary )
-		{
-			asSDeferredParam defer;
-			defer.argNode = 0;
-			defer.argType = ctx->type;
-			defer.argInOutFlags = asTM_INOUTREF;
-			defer.origExpr = 0;
-			ctx->deferredParams.PushLast(defer);
-		}
-
-		ctx->type.Set(descr->returnType);
-		if( !descr->returnType.IsPrimitive() )
-		{
-			ctx->bc.Instr(asBC_PshRPtr);
-			if( descr->returnType.IsObject() &&
-				!descr->returnType.IsObjectHandle() )
-			{
-				// We are getting the pointer to the object
-				// not a pointer to a object variable
-				ctx->type.dataType.MakeReference(false);
-			}
-		}
-
-		// A returned reference can be used as lvalue
-		ctx->type.isLValue = true;
-	}
-	else
-	{
-		asASSERT(useVariable == false);
-
-		asCExprValue tmpExpr = ctx->type;
-
-		if( descr->returnType.GetSizeInMemoryBytes() )
-		{
-			// Allocate a temporary variable to hold the value, but make sure
-			// the temporary variable isn't used in any of the deferred arguments
-			int l = int(reservedVariables.GetLength());
-			for( asUINT n = 0; args && n < args->GetLength(); n++ )
-			{
-				asCExprContext *expr = (*args)[n]->origExpr;
-				if( expr )
-					expr->bc.GetVarsUsed(reservedVariables);
-			}
-			int offset = AllocateVariable(descr->returnType, true);
-			reservedVariables.SetLength(l);
-
-			ctx->type.SetVariable(descr->returnType, offset, true);
-
-			// Move the value from the return register to the variable
-			if( descr->returnType.GetSizeOnStackDWords() == 1 )
-				ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)offset);
-			else if( descr->returnType.GetSizeOnStackDWords() == 2 )
-				ctx->bc.InstrSHORT(asBC_CpyRtoV8, (short)offset);
-		}
-		else
-			ctx->type.Set(descr->returnType);
-
-		ReleaseTemporaryVariable(tmpExpr, &ctx->bc);
-
-		ctx->type.isLValue = false;
-
-		// Clean up arguments
-		if( args )
-			AfterFunctionCall(funcId, *args, ctx, false);
-
-		ProcessDeferredParams(ctx);
-	}
-}
-
-// This only merges the bytecode, but doesn't modify the type of the final context
-void asCCompiler::MergeExprBytecode(asCExprContext *before, asCExprContext *after)
-{
-	before->bc.AddCode(&after->bc);
-
-	for( asUINT n = 0; n < after->deferredParams.GetLength(); n++ )
-	{
-		before->deferredParams.PushLast(after->deferredParams[n]);
-		after->deferredParams[n].origExpr = 0;
-	}
-
-	after->deferredParams.SetLength(0);
-}
-
-// This merges both bytecode and the type of the final context
-void asCCompiler::MergeExprBytecodeAndType(asCExprContext *before, asCExprContext *after)
-{
-	MergeExprBytecode(before, after);
-
-	before->Merge(after);
-}
-
-void asCCompiler::FilterConst(asCArray<int> &funcs, bool removeConst)
-{
-	if( funcs.GetLength() == 0 ) return;
-
-	// This is only done for object methods
-	asCScriptFunction *desc = builder->GetFunctionDescription(funcs[0]);
-	if( desc->objectType == 0 ) return;
-
-	// Check if there are any non-const matches
-	asUINT n;
-	bool foundNonConst = false;
-	for( n = 0; n < funcs.GetLength(); n++ )
-	{
-		desc = builder->GetFunctionDescription(funcs[n]);
-		if( desc->isReadOnly != removeConst )
-		{
-			foundNonConst = true;
-			break;
-		}
-	}
-
-	if( foundNonConst )
-	{
-		// Remove all const methods
-		for( n = 0; n < funcs.GetLength(); n++ )
-		{
-			desc = builder->GetFunctionDescription(funcs[n]);
-			if( desc->isReadOnly == removeConst )
-			{
-				if( n == funcs.GetLength() - 1 )
-					funcs.PopLast();
-				else
-					funcs[n] = funcs.PopLast();
-
-				n--;
-			}
-		}
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-asCExprValue::asCExprValue()
-{
-	isTemporary = false;
-	stackOffset = 0;
-	isConstant = false;
-	isVariable = false;
-	isExplicitHandle = false;
-	qwordValue = 0;
-	isLValue = false;
-	isRefToLocal = false;
-}
-
-void asCExprValue::Set(const asCDataType &dt)
-{
-	dataType = dt;
-
-	isTemporary = false;
-	stackOffset = 0;
-	isConstant = false;
-	isVariable = false;
-	isExplicitHandle = false;
-	qwordValue = 0;
-	isLValue = false;
-	isRefToLocal = false;
-}
-
-void asCExprValue::SetVariable(const asCDataType &in_dt, int in_stackOffset, bool in_isTemporary)
-{
-	Set(in_dt);
-
-	this->isVariable = true;
-	this->isTemporary = in_isTemporary;
-	this->stackOffset = (short)in_stackOffset;
-}
-
-void asCExprValue::SetConstantQW(const asCDataType &dt, asQWORD value)
-{
-	Set(dt);
-
-	isConstant = true;
-	SetConstantQW(value);
-}
-
-void asCExprValue::SetConstantDW(const asCDataType &dt, asDWORD value)
-{
-	Set(dt);
-
-	isConstant = true;
-	SetConstantDW(value);
-}
-
-void asCExprValue::SetConstantB(const asCDataType &dt, asBYTE value)
-{
-	Set(dt);
-
-	isConstant = true;
-	SetConstantB(value);
-}
-
-void asCExprValue::SetConstantW(const asCDataType &dt, asWORD value)
-{
-	Set(dt);
-
-	isConstant = true;
-	SetConstantW(value);
-}
-
-void asCExprValue::SetConstantF(const asCDataType &dt, float value)
-{
-	Set(dt);
-
-	isConstant = true;
-	SetConstantF(value);
-}
-
-void asCExprValue::SetConstantD(const asCDataType &dt, double value)
-{
-	Set(dt);
-
-	isConstant = true;
-	SetConstantD(value);
-}
-
-void asCExprValue::SetConstantQW(asQWORD value)
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
-	qwordValue = value;
-}
-
-void asCExprValue::SetConstantDW(asDWORD value)
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
-	dwordValue = value;
-}
-
-void asCExprValue::SetConstantW(asWORD value)
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 2);
-	wordValue = value;
-}
-
-void asCExprValue::SetConstantB(asBYTE value)
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 1);
-	byteValue = value;
-}
-
-void asCExprValue::SetConstantF(float value)
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
-	floatValue = value;
-}
-
-void asCExprValue::SetConstantD(double value)
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
-	doubleValue = value;
-}
-
-asQWORD asCExprValue::GetConstantQW()
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
-	return qwordValue;
-}
-
-asDWORD asCExprValue::GetConstantDW()
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
-	return dwordValue;
-}
-
-asWORD asCExprValue::GetConstantW()
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 2);
-	return wordValue;
-}
-
-asBYTE asCExprValue::GetConstantB()
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 1);
-	return byteValue;
-}
-
-float asCExprValue::GetConstantF()
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
-	return floatValue;
-}
-
-double asCExprValue::GetConstantD()
-{
-	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
-	return doubleValue;
-}
-
-void asCExprValue::SetConstantData(const asCDataType &dt, asQWORD qw)
-{
-	Set(dt);
-
-	isConstant = true;
-	
-	// This code is necessary to guarantee that the code 
-	// works on both big endian and little endian CPUs.
-	if (dataType.GetSizeInMemoryBytes() == 1)
-		byteValue = (asBYTE)qw;
-	if (dataType.GetSizeInMemoryBytes() == 2)
-		wordValue = (asWORD)qw;
-	if (dataType.GetSizeInMemoryBytes() == 4)
-		dwordValue = (asDWORD)qw;
-	else
-		qwordValue = qw;
-}
-
-asQWORD asCExprValue::GetConstantData()
-{
-	asQWORD qw = 0;
-	// This code is necessary to guarantee that the code 
-	// works on both big endian and little endian CPUs.
-	if (dataType.GetSizeInMemoryBytes() == 1)
-		qw = byteValue;
-	if (dataType.GetSizeInMemoryBytes() == 2)
-		qw = wordValue;
-	if (dataType.GetSizeInMemoryBytes() == 4)
-		qw = dwordValue;
-	else
-		qw = qwordValue;
-	return qw;
-}
-
-void asCExprValue::SetUndefinedFuncHandle(asCScriptEngine *engine)
-{
-	// This is used for when the expression evaluates to a 
-	// function, but it is not yet known exactly which. The
-	// owner expression will hold the name of the function
-	// to determine the exact function when the signature is
-	// known.
-	Set(asCDataType::CreateObjectHandle(&engine->functionBehaviours, true));
-	isConstant = true;
-	isExplicitHandle = false;
-	qwordValue = 1; // Set to a different value than 0 to differentiate from null constant
-	isLValue = false;
-}
-
-bool asCExprValue::IsUndefinedFuncHandle() const
-{
-	if (isConstant == false) return false;
-	if (qwordValue == 0) return false;
-	if (isLValue) return false;
-	if (dataType.GetTypeInfo() == 0) return false;
-	if (dataType.GetTypeInfo()->name != "$func") return false;
-	if (dataType.IsFuncdef()) return false;
-
-	return true;
-}
-
-void asCExprValue::SetNullConstant()
-{
-	Set(asCDataType::CreateNullHandle());
-	isConstant = true;
-	isExplicitHandle = false;
-	qwordValue = 0;
-	isLValue = false;
-}
-
-bool asCExprValue::IsNullConstant() const
-{
-	// We can't check the actual object type, because the null constant may have been cast to another type
-	if (isConstant && dataType.IsObjectHandle() && qwordValue == 0)
-		return true;
-
-	return false;
-}
-
-void asCExprValue::SetVoid()
-{
-	Set(asCDataType::CreatePrimitive(ttVoid, false));
-	isLValue = false;
-	isConstant = true;
-}
-
-bool asCExprValue::IsVoid() const
-{
-	if (dataType.GetTokenType() == ttVoid)
-		return true;
-
-	return false;
-}
-
-void asCExprValue::SetDummy()
-{
-	SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), 0);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-asCExprContext::asCExprContext(asCScriptEngine *engine) : bc(engine)
-{
-	property_arg = 0;
-
-	Clear();
-}
-
-asCExprContext::~asCExprContext()
-{
-	if (property_arg)
-		asDELETE(property_arg, asCExprContext);
-}
-
-void asCExprContext::Clear()
-{
-	bc.ClearAll();
-	type.Set(asCDataType());
-	deferredParams.SetLength(0);
-	if (property_arg)
-		asDELETE(property_arg, asCExprContext);
-	property_arg = 0;
-	exprNode = 0;
-	origExpr = 0;
-	property_get = 0;
-	property_set = 0;
-	property_const = false;
-	property_handle = false;
-	property_ref = false;
-	methodName = "";
-	enumValue = "";
-	isVoidExpression = false;
-	isCleanArg = false;
-}
-
-bool asCExprContext::IsClassMethod() const
-{
-	if (type.dataType.GetTypeInfo() == 0) return false;
-	if (methodName == "") return false;
-	if (type.dataType.GetTypeInfo() == &type.dataType.GetTypeInfo()->engine->functionBehaviours) return false;
-	return true;
-}
-
-bool asCExprContext::IsGlobalFunc() const
-{
-	if (type.dataType.GetTypeInfo() == 0) return false;
-	if (methodName == "") return false;
-	if (type.dataType.GetTypeInfo() != &type.dataType.GetTypeInfo()->engine->functionBehaviours) return false;
-	return true;
-}
-
-void asCExprContext::SetLambda(asCScriptNode *funcDecl)
-{
-	asASSERT(funcDecl && funcDecl->nodeType == snFunction);
-	asASSERT(bc.GetLastInstr() == -1);
-
-	Clear();
-	type.SetUndefinedFuncHandle(bc.GetEngine());
-	exprNode = funcDecl;
-}
-
-bool asCExprContext::IsLambda() const
-{
-	if (type.IsUndefinedFuncHandle() && exprNode && exprNode->nodeType == snFunction)
-		return true;
-
-	return false;
-}
-
-void asCExprContext::SetVoidExpression()
-{
-	Clear();
-	type.SetVoid();
-	isVoidExpression = true;
-}
-
-bool asCExprContext::IsVoidExpression() const
-{
-	if (isVoidExpression && type.IsVoid() && exprNode == 0)
-		return true;
-
-	return false;
-}
-
-void asCExprContext::Merge(asCExprContext *after)
-{
-	type = after->type;
-	property_get = after->property_get;
-	property_set = after->property_set;
-	property_const = after->property_const;
-	property_handle = after->property_handle;
-	property_ref = after->property_ref;
-	property_arg = after->property_arg;
-	exprNode = after->exprNode;
-	methodName = after->methodName;
-	enumValue = after->enumValue;
-	isVoidExpression = after->isVoidExpression;
-	isCleanArg = after->isCleanArg;
-
-	after->property_arg = 0;
-
-	// Do not copy the origExpr member
-}
-
-
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_compiler.cpp
+//
+// The class that does the actual compilation of the functions
+//
+
+#include <math.h> // fmodf() pow()
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_compiler.h"
+#include "as_tokendef.h"
+#include "as_tokenizer.h"
+#include "as_string_util.h"
+#include "as_texts.h"
+#include "as_parser.h"
+#include "as_debug.h"
+#include "as_context.h"  // as_powi()
+
+BEGIN_AS_NAMESPACE
+
+//
+// The calling convention rules for script functions:
+// - If a class method returns a reference, the caller must guarantee the object pointer stays alive until the function returns, and the reference is no longer going to be used
+// - If a class method doesn't return a reference, it must guarantee by itself that the this pointer stays alive during the function call. If no outside access is made, then the function is guaranteed to stay alive and nothing needs to be done
+// - The object pointer is always passed as the first argument, position 0
+// - If the function returns a value type the caller must reserve the memory for this and pass the pointer as the first argument after the object pointer
+//
+
+
+
+
+
+// TODO: I must correct the interpretation of a reference to objects in the compiler.
+//       A reference should mean that a pointer to the object is on the stack.
+//       No expression should end up as non-references to objects, as the actual object is
+//       never put on the stack.
+//       Local variables are declared as non-references, but the expression should be a reference to the variable.
+//       Function parameters of called functions can also be non-references, but in that case it means the
+//       object will be passed by value (currently on the heap, which will be moved to the application stack).
+//
+//       The compiler shouldn't use the asCDataType::IsReference. The datatype should always be stored as non-references.
+//       Instead the compiler should keep track of references in TypeInfo, where it should also state how the reference
+//       is currently stored, i.e. in variable, in register, on stack, etc.
+
+asCCompiler::asCCompiler(asCScriptEngine *engine) : byteCode(engine)
+{
+	builder = 0;
+	script = 0;
+
+	variables = 0;
+	isProcessingDeferredParams = false;
+	isCompilingDefaultArg = false;
+	noCodeOutput = 0;
+}
+
+asCCompiler::~asCCompiler()
+{
+	while( variables )
+	{
+		asCVariableScope *var = variables;
+		variables = variables->parent;
+
+		asDELETE(var,asCVariableScope);
+	}
+
+	// Clean up all the string constants that were allocated. By now the script
+	// functions that were compiled successfully already holds their own references
+	for (asUINT n = 0; n < usedStringConstants.GetLength(); n++)
+		engine->stringFactory->ReleaseStringConstant(usedStringConstants[n]);
+	usedStringConstants.SetLength(0);
+
+	// Clean up the temporary script nodes that were allocated during compilation
+	for (asUINT n = 0; n < nodesToFreeUponComplete.GetLength(); n++)
+		nodesToFreeUponComplete[n]->Destroy(engine);
+}
+
+void asCCompiler::Reset(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptFunction *in_outFunc)
+{
+	this->builder = in_builder;
+	this->engine = in_builder->engine;
+	this->script = in_script;
+	this->outFunc = in_outFunc;
+
+	hasCompileErrors = false;
+
+	m_isConstructor       = false;
+	m_isConstructorCalled = false;
+	m_classDecl           = 0;
+	m_globalVar           = 0;
+
+	nextLabel = 0;
+	breakLabels.SetLength(0);
+	continueLabels.SetLength(0);
+
+	numLambdas = 0;
+
+	byteCode.ClearAll();
+}
+
+int asCCompiler::CompileDefaultConstructor(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptNode *in_node, asCScriptFunction *in_outFunc, sClassDeclaration *in_classDecl)
+{
+	Reset(in_builder, in_script, in_outFunc);
+
+	m_classDecl = in_classDecl;
+
+	// Insert a JitEntry at the start of the function for JIT compilers
+	byteCode.InstrPTR(asBC_JitEntry, 0);
+
+	// Add a variable scope that might be needed to declare dummy variables
+	// in case the member initialization refers to undefined symbols.
+	AddVariableScope();
+
+	// Initialize the class members that have no explicit expression first. This will allow the
+	// base class' constructor to access these members without worry they will be uninitialized.
+	// This can happen if the base class' constructor calls a method that is overridden by the derived class
+	CompileMemberInitialization(&byteCode, true);
+
+	// If the class is derived from another, then the base class' default constructor must be called
+	if( outFunc->objectType->derivedFrom )
+	{
+		// Make sure the base class really has a default constructor
+		if( outFunc->objectType->derivedFrom->beh.construct == 0 )
+			Error(TEXT_BASE_DOESNT_HAVE_DEF_CONSTR, in_node);
+
+		// Call the base class' default constructor
+		byteCode.InstrSHORT(asBC_PSF, 0);
+		byteCode.Instr(asBC_RDSPtr);
+		byteCode.Call(asBC_CALL, outFunc->objectType->derivedFrom->beh.construct, AS_PTR_SIZE);
+	}
+
+	// Initialize the class members that explicit expressions afterwards. This allow the expressions
+	// to access the base class members without worry they will be uninitialized
+	CompileMemberInitialization(&byteCode, false);
+	byteCode.OptimizeLocally(tempVariableOffsets);
+
+	// If there are compile errors, there is no reason to build the final code
+	if( hasCompileErrors )
+		return -1;
+
+	// Pop the object pointer from the stack
+	byteCode.Ret(AS_PTR_SIZE);
+
+	// Count total variable size
+	int varSize = GetVariableOffset((int)variableAllocations.GetLength()) - 1;
+	outFunc->scriptData->variableSpace = varSize;
+
+	FinalizeFunction();
+
+#ifdef AS_DEBUG
+	// DEBUG: output byte code
+	byteCode.DebugOutput(("__" + outFunc->objectType->name + "_" + outFunc->name + "__defconstr.txt").AddressOf(), in_outFunc);
+#endif
+
+	return 0;
+}
+
+int asCCompiler::CompileFactory(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptFunction *in_outFunc)
+{
+	Reset(in_builder, in_script, in_outFunc);
+
+	// Insert a JitEntry at the start of the function for JIT compilers
+	byteCode.InstrPTR(asBC_JitEntry, 0);
+
+	// Find the corresponding constructor
+	asCDataType dt = asCDataType::CreateType(outFunc->returnType.GetTypeInfo(), false);
+	int constructor = 0;
+	for( unsigned int n = 0; n < dt.GetBehaviour()->factories.GetLength(); n++ )
+	{
+		if( dt.GetBehaviour()->factories[n] == outFunc->id )
+		{
+			constructor = dt.GetBehaviour()->constructors[n];
+			break;
+		}
+	}
+
+	// Allocate the class and instantiate it with the constructor
+	int varOffset = AllocateVariable(dt, true);
+
+	outFunc->scriptData->variableSpace = AS_PTR_SIZE;
+	byteCode.InstrSHORT(asBC_PSF, (short)varOffset);
+
+	// Copy all arguments to the top of the stack
+	// TODO: runtime optimize: Might be interesting to have a specific instruction for copying all arguments
+	int offset = (int)outFunc->GetSpaceNeededForArguments();
+	for( int a = int(outFunc->parameterTypes.GetLength()) - 1; a >= 0; a-- )
+	{
+		if( !outFunc->parameterTypes[a].IsPrimitive() ||
+			outFunc->parameterTypes[a].IsReference() )
+		{
+			offset -= AS_PTR_SIZE;
+			byteCode.InstrSHORT(asBC_PshVPtr, short(-offset));
+		}
+		else
+		{
+			if( outFunc->parameterTypes[a].GetSizeOnStackDWords() == 2 )
+			{
+				offset -= 2;
+				byteCode.InstrSHORT(asBC_PshV8, short(-offset));
+			}
+			else
+			{
+				offset -= 1;
+				byteCode.InstrSHORT(asBC_PshV4, short(-offset));
+			}
+		}
+	}
+
+	int argDwords = (int)outFunc->GetSpaceNeededForArguments();
+	byteCode.Alloc(asBC_ALLOC, dt.GetTypeInfo(), constructor, argDwords + AS_PTR_SIZE);
+
+	// Return a handle to the newly created object
+	byteCode.InstrSHORT(asBC_LOADOBJ, (short)varOffset);
+
+	byteCode.Ret(argDwords);
+
+	FinalizeFunction();
+
+	// Tell the virtual machine not to clean up parameters on exception
+	outFunc->dontCleanUpOnException = true;
+
+/*
+#ifdef AS_DEBUG
+	// DEBUG: output byte code
+	asCString args;
+	args.Format("%d", outFunc->parameterTypes.GetLength());
+	byteCode.DebugOutput(("__" + outFunc->name + "__factory" + args + ".txt").AddressOf(), engine);
+#endif
+*/
+	return 0;
+}
+
+void asCCompiler::FinalizeFunction()
+{
+	TimeIt("asCCompiler::FinalizeFunction");
+
+	asASSERT( outFunc->scriptData );
+	asUINT n;
+
+	// Add the type of all temporary variables to the function so this is known to debugger and serializer
+	for (n = 0; n < tempVariableOffsets.GetLength(); n++)
+	{
+		int slot = GetVariableSlot(tempVariableOffsets[n]);
+		outFunc->AddVariable("", variableAllocations[slot], tempVariableOffsets[n], variableIsOnHeap[slot]);
+	}
+	// Add the type of unnamed parameters
+	int stackPos = outFunc->objectType ? -AS_PTR_SIZE : 0;
+	// If the return type is a value type returned by value the address of the
+	// location where the value will be stored is pushed on the stack before
+	// the arguments
+	bool isDestructor = (outFunc->name.GetLength() > 0 && outFunc->name[0] == '~') ? true : false;
+	if (!(isDestructor || m_isConstructor) && outFunc->DoesReturnOnStack())
+		stackPos -= AS_PTR_SIZE;
+	for (n = 0; n < outFunc->parameterNames.GetLength(); n++)
+	{
+		// Get the parameter type
+		asCDataType& type = outFunc->parameterTypes[n];
+
+		// If the parameter has a name then it was already added to the list in SetupParametersAndReturnVariable
+		if (outFunc->parameterNames[n] == "")
+		{
+			// Object types passed by value are considered to be on heap
+			bool onHeap = !type.IsReference() && type.IsObject() && !type.IsObjectHandle();
+			outFunc->AddVariable("", type, stackPos, onHeap);
+		}
+
+		// Move to next parameter
+		stackPos -= type.GetSizeOnStackDWords();
+	}
+	// Add the return type too at the end if it returns on the stack, which is when it uses a hidden parameter
+	if (outFunc->DoesReturnOnStack())
+	{
+		// Though declared as return by value, locally the return value is seen as a reference
+		asCDataType returnType = outFunc->returnType;
+		returnType.MakeReference(true);
+		outFunc->AddVariable("", returnType, outFunc->objectType ? -AS_PTR_SIZE : 0, false);
+	}
+
+	// Finalize the bytecode
+	byteCode.Finalize(tempVariableOffsets);
+
+	// extract the try/catch info before object variable info, as 
+	// some variable info is not needed if there are no try/catch blocks
+	byteCode.ExtractTryCatchInfo(outFunc);
+
+	byteCode.ExtractObjectVariableInfo(outFunc);
+
+	// Copy byte code to the function
+	asASSERT( outFunc->scriptData->byteCode.GetLength() == 0 );
+	outFunc->scriptData->byteCode.SetLength(byteCode.GetSize());
+	byteCode.Output(outFunc->scriptData->byteCode.AddressOf());
+	outFunc->AddReferences();
+	outFunc->scriptData->stackNeeded = byteCode.largestStackUsed + outFunc->scriptData->variableSpace;
+	outFunc->scriptData->lineNumbers = byteCode.lineNumbers;
+
+	// Extract the script section indexes too if there are any entries that are different from the function's script section
+	int lastIdx = outFunc->scriptData->scriptSectionIdx;
+	for( n = 0; n < byteCode.sectionIdxs.GetLength(); n++ )
+	{
+		if( byteCode.sectionIdxs[n] != lastIdx )
+		{
+			lastIdx = byteCode.sectionIdxs[n];
+			outFunc->scriptData->sectionIdxs.PushLast(byteCode.lineNumbers[n*2]);
+			outFunc->scriptData->sectionIdxs.PushLast(lastIdx);
+		}
+	}
+}
+
+// internal
+int asCCompiler::SetupParametersAndReturnVariable(asCArray<asCString> &parameterNames, asCScriptNode *func)
+{
+	int stackPos = 0;
+
+	if( outFunc->objectType )
+		stackPos = -AS_PTR_SIZE; // The first parameter is the pointer to the object
+
+	// Add the first variable scope, which the parameters and
+	// variables declared in the outermost statement block is
+	// part of.
+	AddVariableScope();
+
+	bool isDestructor = false;
+	asCDataType returnType;
+
+	// Examine return type
+	returnType = outFunc->returnType;
+
+	// Check if this is a constructor or destructor
+	if( returnType.GetTokenType() == ttVoid && outFunc->objectType )
+	{
+		if( outFunc->name[0] == '~' )
+			isDestructor = true;
+		else if( outFunc->objectType->name == outFunc->name )
+			m_isConstructor = true;
+	}
+
+	// Is the return type allowed?
+	if( returnType != asCDataType::CreatePrimitive(ttVoid, false) &&
+		!returnType.CanBeInstantiated() &&
+		!returnType.IsReference() &&
+		!returnType.IsObjectHandle() )
+	{
+		// TODO: Hasn't this been validated by the builder already?
+		asCString str;
+		str.Format(TXT_RETURN_CANT_BE_s, returnType.Format(outFunc->nameSpace).AddressOf());
+		Error(str, func);
+	}
+
+	// If the return type is a value type returned by value the address of the
+	// location where the value will be stored is pushed on the stack before
+	// the arguments
+	if( !(isDestructor || m_isConstructor) && outFunc->DoesReturnOnStack() )
+		stackPos -= AS_PTR_SIZE;
+
+	asCVariableScope vs(0);
+
+	// Declare parameters
+	asUINT n;
+	for( n = 0; n < parameterNames.GetLength(); n++ )
+	{
+		// Get the parameter type
+		asCDataType &type = outFunc->parameterTypes[n];
+		asETypeModifiers inoutFlag = n < outFunc->inOutFlags.GetLength() ? outFunc->inOutFlags[n] : asTM_NONE;
+
+		// Is the data type allowed?
+		// TODO: Hasn't this been validated by the builder already?
+		if( (type.IsReference() && inoutFlag != asTM_INOUTREF && !type.CanBeInstantiated()) ||
+			(!type.IsReference() && !type.CanBeInstantiated()) )
+		{
+			asCString parm = type.Format(outFunc->nameSpace);
+			if( inoutFlag == asTM_INREF )
+				parm += "in";
+			else if( inoutFlag == asTM_OUTREF )
+				parm += "out";
+
+			asCString str;
+			str.Format(TXT_PARAMETER_CANT_BE_s, parm.AddressOf());
+			Error(str, func);
+		}
+
+		// If the parameter has a name then declare it as variable
+		// Object types passed by value are considered to be on heap
+		bool onHeap = !type.IsReference() && type.IsObject() && !type.IsObjectHandle();
+		if( parameterNames[n] != "" )
+		{
+			asCString &name = parameterNames[n];
+			if( vs.DeclareVariable(name.AddressOf(), type, stackPos, onHeap) < 0 )
+			{
+				// TODO: It might be an out-of-memory too
+				Error(TXT_PARAMETER_ALREADY_DECLARED, func);
+			}
+
+			// Add marker for variable declaration
+			byteCode.VarDecl((int)outFunc->scriptData->variables.GetLength());
+			outFunc->AddVariable(name, type, stackPos, onHeap);
+		}
+		else
+			vs.DeclareVariable("", type, stackPos, onHeap);
+
+		// Move to next parameter
+		stackPos -= type.GetSizeOnStackDWords();
+	}
+
+	for( n = asUINT(vs.variables.GetLength()); n-- > 0; )
+		variables->DeclareVariable(vs.variables[n]->name.AddressOf(), vs.variables[n]->type, vs.variables[n]->stackOffset, vs.variables[n]->onHeap);
+
+	variables->DeclareVariable("return", returnType, stackPos, false);
+
+	return stackPos;
+}
+
+void asCCompiler::CompileMemberInitialization(asCByteCode *bc, bool onlyDefaults)
+{
+	asASSERT( m_classDecl );
+
+	// Initialize each member in the order they were declared
+	for( asUINT n = 0; n < outFunc->objectType->properties.GetLength(); n++ )
+	{
+		asCObjectProperty *prop = outFunc->objectType->properties[n];
+
+		// Check if the property has an initialization expression
+		asCParser parser(builder);
+		asCScriptNode *declNode = 0;
+		asCScriptNode *initNode = 0;
+		asCScriptCode *initScript = 0;
+		for( asUINT m = 0; m < m_classDecl->propInits.GetLength(); m++ )
+		{
+			if( m_classDecl->propInits[m].name == prop->name )
+			{
+				declNode   = m_classDecl->propInits[m].declNode;
+				initNode   = m_classDecl->propInits[m].initNode;
+				initScript = m_classDecl->propInits[m].file;
+				break;
+			}
+		}
+
+		// If declNode is null, the property was inherited in which case
+		// it was already initialized by the base class' constructor
+		if( declNode )
+		{
+			if( initNode )
+			{
+				if( onlyDefaults )
+					continue;
+
+#ifdef AS_NO_MEMBER_INIT
+				// Give an error as the initialization in the declaration has been disabled
+				asCScriptCode *origScript = script;
+				script = initScript;
+				Error("Initialization of members in declaration is not supported", initNode);
+				script = origScript;
+
+				// Clear the initialization node
+				initNode = 0;
+				initScript = script;
+#else
+				// Re-parse the initialization expression as the parser now knows the types, which it didn't earlier
+				int r = parser.ParseVarInit(initScript, initNode);
+				if( r < 0 )
+					continue;
+
+				initNode = parser.GetScriptNode();
+#endif
+			}
+			else
+			{
+				if( !onlyDefaults )
+					continue;
+			}
+
+#ifdef AS_NO_MEMBER_INIT
+			// The initialization will be done in the asCScriptObject constructor, so
+			// here we should just validate that the member has a default constructor
+			if( prop->type.IsObject() &&
+				!prop->type.IsObjectHandle() &&
+				(((prop->type.GetTypeInfo()->flags & asOBJ_REF) &&
+				  prop->type.GetBehaviour()->factory == 0) ||
+				 ((prop->type.GetTypeInfo()->flags & asOBJ_VALUE) &&
+				  prop->type.GetBehaviour()->construct == 0 &&
+				  !(prop->type.GetTypeInfo()->flags & asOBJ_POD))) )
+			{
+				// Class has no default factory/constructor.
+				asCString str;
+				// TODO: funcdef: asCDataType should have a GetTypeName()
+				if( prop->type.GetFuncDef() )
+					str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, prop->type.GetFuncDef()->GetName());
+				else
+					str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, prop->type.GetTypeInfo()->GetName());
+				Error(str, declNode);
+			}
+#else
+			// Temporarily set the script that is being compiled to where the member initialization is declared.
+			// The script can be different when including mixin classes from a different script section
+			asCScriptCode *origScript = script;
+			script = initScript;
+
+			// Add a line instruction with the position of the declaration
+			LineInstr(bc, declNode->tokenPos);
+
+			// Compile the initialization
+			asQWORD constantValue;
+			asCByteCode bcInit(engine);
+			CompileInitialization(initNode, &bcInit, prop->type, declNode, prop->byteOffset, &constantValue, 2);
+			bcInit.OptimizeLocally(tempVariableOffsets);
+			bc->AddCode(&bcInit);
+
+			script = origScript;
+#endif
+		}
+	}
+}
+
+// Entry
+int asCCompiler::CompileFunction(asCBuilder *in_builder, asCScriptCode *in_script, asCArray<asCString> &in_parameterNames, asCScriptNode *in_func, asCScriptFunction *in_outFunc, sClassDeclaration *in_classDecl)
+{
+	TimeIt("asCCompiler::CompileFunction");
+
+	Reset(in_builder, in_script, in_outFunc);
+	int buildErrors = builder->numErrors;
+
+	int stackPos = SetupParametersAndReturnVariable(in_parameterNames, in_func);
+
+	//--------------------------------------------
+	// Compile the statement block
+
+	if( m_isConstructor )
+		m_classDecl = in_classDecl;
+
+	// We need to parse the statement block now
+	asCScriptNode *blockBegin;
+
+	// If the function signature was implicit, e.g. virtual property accessor or
+	// lambda function, then the received node already is the statement block
+	if( in_func->nodeType != snStatementBlock )
+		blockBegin = in_func->lastChild;
+	else
+		blockBegin = in_func;
+
+	// TODO: memory: We can parse the statement block one statement at a time, thus save even more memory
+	// TODO: optimize: For large functions, the parsing of the statement block can take a long time. Presumably because a lot of memory needs to be allocated
+	asCParser parser(builder);
+	int r = parser.ParseStatementBlock(script, blockBegin);
+	if( r < 0 ) return -1;
+	asCScriptNode *block = parser.GetScriptNode();
+
+	// Reserve a label for the cleanup code
+	nextLabel++;
+
+	bool hasReturn;
+	asCByteCode bc(engine);
+	LineInstr(&bc, blockBegin->tokenPos);
+	CompileStatementBlock(block, false, &hasReturn, &bc);
+	LineInstr(&bc, blockBegin->tokenPos + blockBegin->tokenLength);
+
+	// Make sure there is a return in all paths (if not return type is void)
+	// Don't bother with this check if there are compiler errors, e.g. Unreachable code
+	if( !hasCompileErrors && outFunc->returnType != asCDataType::CreatePrimitive(ttVoid, false) )
+	{
+		if( hasReturn == false )
+			Error(TXT_NOT_ALL_PATHS_RETURN, blockBegin);
+	}
+
+	//------------------------------------------------
+	// Concatenate the bytecode
+
+	// Insert a JitEntry at the start of the function for JIT compilers
+	byteCode.InstrPTR(asBC_JitEntry, 0);
+
+	if( outFunc->objectType )
+	{
+		if( m_isConstructor )
+		{
+			if( outFunc->objectType->derivedFrom )
+			{
+				// Call the base class' default constructor unless called manually in the code
+				if( !m_isConstructorCalled )
+				{
+					if( outFunc->objectType->derivedFrom->beh.construct )
+					{
+						// Initialize members without explicit expression first
+						CompileMemberInitialization(&byteCode, true);
+
+						// Call base class' constructor
+						asCByteCode tmpBC(engine);
+						tmpBC.InstrSHORT(asBC_PSF, 0);
+						tmpBC.Instr(asBC_RDSPtr);
+						tmpBC.Call(asBC_CALL, outFunc->objectType->derivedFrom->beh.construct, AS_PTR_SIZE);
+						tmpBC.OptimizeLocally(tempVariableOffsets);
+						byteCode.AddCode(&tmpBC);
+
+						// Add the initialization of the members with explicit expressions
+						CompileMemberInitialization(&byteCode, false);
+					}
+					else
+						Error(TEXT_BASE_DOESNT_HAVE_DEF_CONSTR, blockBegin);
+				}
+				else
+				{
+					// Only initialize members that don't have an explicit expression
+					// The members that are explicitly initialized will be initialized after the call to base class' constructor
+					CompileMemberInitialization(&byteCode, true);
+				}
+			}
+			else
+			{
+				// Add the initialization of the members
+				CompileMemberInitialization(&byteCode, true);
+				CompileMemberInitialization(&byteCode, false);
+			}
+		}
+	}
+
+	// Add the code for the statement block
+	byteCode.AddCode(&bc);
+
+	// Count total variable size
+	int varSize = GetVariableOffset((int)variableAllocations.GetLength()) - 1;
+	outFunc->scriptData->variableSpace = varSize;
+
+	// Deallocate all local variables
+	int n;
+	for( n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
+	{
+		sVariable *v = variables->variables[n];
+		if( v->stackOffset > 0 )
+		{
+			// Call variables destructors
+			if( v->name != "return" )
+				CallDestructor(v->type, v->stackOffset, v->onHeap, &byteCode);
+
+			DeallocateVariable(v->stackOffset);
+		}
+	}
+
+	// This is the label that return statements jump to
+	// in order to exit the function
+	byteCode.Label(0);
+
+	// Call destructors for function parameters
+	for( n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
+	{
+		sVariable *v = variables->variables[n];
+		if( v->stackOffset <= 0 )
+		{
+			// Call variable destructors here, for variables not yet destroyed
+			if( v->name != "return" )
+				CallDestructor(v->type, v->stackOffset, v->onHeap, &byteCode);
+		}
+
+		// Do not deallocate parameters
+	}
+
+	// Check if the number of labels in the functions isn't too many to be handled
+	if( nextLabel >= (1<<15) )
+		Error(TXT_TOO_MANY_JUMP_LABELS, in_func);
+
+	// If there are compile errors, there is no reason to build the final code
+	if( hasCompileErrors || builder->numErrors != buildErrors )
+		return -1;
+
+	// At this point there should be no variables allocated
+	asASSERT(variableAllocations.GetLength() == freeVariables.GetLength());
+
+	// Remove the variable scope
+	RemoveVariableScope();
+
+	byteCode.Ret(-stackPos);
+
+	FinalizeFunction();
+
+#ifdef AS_DEBUG
+	// DEBUG: output byte code
+	if( outFunc->objectType )
+		byteCode.DebugOutput(("__" + outFunc->objectType->name + "_" + outFunc->name + ".txt").AddressOf(), in_outFunc);
+	else
+		byteCode.DebugOutput(("__" + outFunc->name + ".txt").AddressOf(), in_outFunc);
+#endif
+
+	return 0;
+}
+
+int asCCompiler::CallCopyConstructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool isGlobalVar, bool derefDest)
+{
+	if( !type.IsObject() )
+		return 0;
+
+	// CallCopyConstructor should not be called for object handles.
+	asASSERT( !type.IsObjectHandle() );
+
+	asCArray<asCExprContext*> args;
+	args.PushLast(arg);
+
+	// The reference parameter must be pushed on the stack
+	asASSERT( arg->type.dataType.GetTypeInfo() == type.GetTypeInfo() );
+
+	// Since we're calling the copy constructor, we have to trust the function to not do
+	// anything stupid otherwise we will just enter a loop, as we try to make temporary
+	// copies of the argument in order to guarantee safety.
+
+
+	if( type.GetTypeInfo()->flags & asOBJ_REF )
+	{
+		asCExprContext ctx(engine);
+
+		int func = 0;
+		asSTypeBehaviour *beh = type.GetBehaviour();
+		if( beh ) func = beh->copyfactory;
+
+		if( func > 0 )
+		{
+			if( !isGlobalVar )
+			{
+				// Call factory and store the handle in the given variable
+				PerformFunctionCall(func, &ctx, false, &args, CastToObjectType(type.GetTypeInfo()), true, offset);
+
+				// Pop the reference left by the function call
+				ctx.bc.Instr(asBC_PopPtr);
+			}
+			else
+			{
+				// Call factory
+				PerformFunctionCall(func, &ctx, false, &args, CastToObjectType(type.GetTypeInfo()));
+
+				// Store the returned handle in the global variable
+				ctx.bc.Instr(asBC_RDSPtr);
+				ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+				ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
+				ctx.bc.Instr(asBC_PopPtr);
+				ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
+			}
+
+			bc->AddCode(&ctx.bc);
+
+			return 0;
+		}
+	}
+	else
+	{
+		asSTypeBehaviour *beh = type.GetBehaviour();
+		int func = beh ? beh->copyconstruct : 0;
+		if( func > 0 )
+		{
+			// Push the address where the object will be stored on the stack, before the argument
+			// TODO: When the context is serializable this probably has to be changed, since this
+			//       pointer can remain on the stack while the context is suspended. There is no
+			//       risk the pointer becomes invalid though, there is just no easy way to serialize it.
+			asCByteCode tmp(engine);
+			if( isGlobalVar )
+				tmp.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+			else if( isObjectOnHeap )
+				tmp.InstrSHORT(asBC_PSF, (short)offset);
+			tmp.AddCode(bc);
+			bc->AddCode(&tmp);
+
+			// When the object is allocated on the stack the object pointer
+			// must be pushed on the stack after the arguments
+			if( !isObjectOnHeap )
+			{
+				asASSERT( !isGlobalVar );
+				bc->InstrSHORT(asBC_PSF, (short)offset);
+				if( derefDest )
+				{
+					// The variable is a reference to the real location, so we need to dereference it
+					bc->Instr(asBC_RDSPtr);
+				}
+			}
+
+			asCExprContext ctx(engine);
+			PerformFunctionCall(func, &ctx, isObjectOnHeap, &args, CastToObjectType(type.GetTypeInfo()));
+
+			bc->AddCode(&ctx.bc);
+
+			// TODO: value on stack: This probably needs to be done in PerformFunctionCall
+			// Mark the object as initialized
+			if( !isObjectOnHeap )
+				bc->ObjInfo(offset, asOBJ_INIT);
+
+
+			return 0;
+		}
+	}
+
+	// Class has no copy constructor/factory.
+	asCString str;
+	str.Format(TXT_NO_COPY_CONSTRUCTOR_FOR_s, type.GetTypeInfo()->GetName());
+	Error(str, node);
+
+	return -1;
+}
+
+int asCCompiler::CallDefaultConstructor(const asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem, bool derefDest)
+{
+	if( !type.IsObject() || type.IsObjectHandle() )
+		return 0;
+
+	if( type.GetTypeInfo()->flags & asOBJ_REF )
+	{
+		asCExprContext ctx(engine);
+		ctx.exprNode = node;
+
+		int func = 0;
+		asSTypeBehaviour *beh = type.GetBehaviour();
+		if( beh )
+		{
+			func = beh->factory;
+
+			// If no trivial default factory is found, look for a factory where all params have default args
+			if( func == 0 )
+			{
+				for( asUINT n = 0; n < beh->factories.GetLength(); n++ )
+				{
+					asCScriptFunction *f = engine->scriptFunctions[beh->factories[n]];
+					if( f->defaultArgs.GetLength() == f->parameterTypes.GetLength() &&
+						f->defaultArgs[0] != 0 )
+					{
+						func = beh->factories[n];
+						break;
+					}
+				}
+			}
+		}
+
+		if( func > 0 )
+		{
+			asCArray<asCExprContext *> args;
+			asCScriptFunction *f = engine->scriptFunctions[func];
+			if( f->parameterTypes.GetLength() )
+			{
+				// Add the default values for arguments not explicitly supplied
+				CompileDefaultAndNamedArgs(node, args, func, CastToObjectType(type.GetTypeInfo()));
+
+				PrepareFunctionCall(func, &ctx.bc, args);
+
+				MoveArgsToStack(func, &ctx.bc, args, false);
+			}
+
+			if( isVarGlobOrMem == 0 )
+			{
+				// Call factory and store the handle in the given variable
+				PerformFunctionCall(func, &ctx, false, &args, CastToObjectType(type.GetTypeInfo()), true, offset);
+
+				// Pop the reference left by the function call
+				ctx.bc.Instr(asBC_PopPtr);
+			}
+			else
+			{
+				// Call factory
+				PerformFunctionCall(func, &ctx, false, &args, CastToObjectType(type.GetTypeInfo()));
+
+				// TODO: runtime optimize: Should have a way of storing the object pointer directly to the destination
+				//                         instead of first storing it in a local variable and then copying it to the
+				//                         destination.
+
+				if( !(type.GetTypeInfo()->flags & asOBJ_SCOPED) )
+				{
+					// Only dereference the variable if not a scoped type
+					ctx.bc.Instr(asBC_RDSPtr);
+				}
+
+				if( isVarGlobOrMem == 1 )
+				{
+					// Store the returned handle in the global variable
+					ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+				}
+				else
+				{
+					// Store the returned handle in the class member
+					ctx.bc.InstrSHORT(asBC_PSF, 0);
+					ctx.bc.Instr(asBC_RDSPtr);
+					ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+				}
+
+				if( type.GetTypeInfo()->flags & asOBJ_SCOPED )
+				{
+					// For scoped typed we must move the reference from the local
+					// variable rather than copy it as there is no AddRef behaviour
+					ctx.bc.InstrSHORT_DW(asBC_COPY, AS_PTR_SIZE, asTYPEID_OBJHANDLE | engine->GetTypeIdFromDataType(type));
+
+					// Clear the local variable so the reference isn't released
+					ctx.bc.InstrSHORT(asBC_ClrVPtr, (short)ctx.type.stackOffset);
+				}
+				else
+				{
+					if( type.IsFuncdef() )
+						ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+					else
+						ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
+				}
+				ctx.bc.Instr(asBC_PopPtr);
+				ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
+			}
+
+			bc->AddCode(&ctx.bc);
+
+			// Cleanup
+			for( asUINT n = 0; n < args.GetLength(); n++ )
+				if( args[n] )
+				{
+					asDELETE(args[n], asCExprContext);
+				}
+
+			return 0;
+		}
+	}
+	else
+	{
+		asCExprContext ctx(engine);
+		ctx.exprNode = node;
+
+		asSTypeBehaviour *beh = type.GetBehaviour();
+
+		int func = 0;
+		if( beh )
+		{
+			func = beh->construct;
+
+			// If no trivial default constructor is found, look for a constructor where all params have default args
+			if( func == 0 )
+			{
+				for( asUINT n = 0; n < beh->constructors.GetLength(); n++ )
+				{
+					asCScriptFunction *f = engine->scriptFunctions[beh->constructors[n]];
+					if( f->defaultArgs.GetLength() == f->parameterTypes.GetLength() &&
+						f->defaultArgs[0] != 0 )
+					{
+						func = beh->constructors[n];
+						break;
+					}
+				}
+			}
+		}
+
+		// Allocate and initialize with the default constructor
+		if( func != 0 || (type.GetTypeInfo()->flags & asOBJ_POD) )
+		{
+			asCArray<asCExprContext *> args;
+			asCScriptFunction *f = engine->scriptFunctions[func];
+			if( f && f->parameterTypes.GetLength() )
+			{
+				// Add the default values for arguments not explicitly supplied
+				CompileDefaultAndNamedArgs(node, args, func, CastToObjectType(type.GetTypeInfo()));
+
+				PrepareFunctionCall(func, &ctx.bc, args);
+
+				MoveArgsToStack(func, &ctx.bc, args, false);
+			}
+
+			if( !isObjectOnHeap )
+			{
+				if( isVarGlobOrMem == 0 )
+				{
+					// There is nothing to do if there is no function,
+					// as the memory is already allocated on the stack
+					if( func )
+					{
+						// Call the constructor as a normal function
+						bc->InstrSHORT(asBC_PSF, (short)offset);
+						if( derefDest )
+							bc->Instr(asBC_RDSPtr);
+
+						asCExprContext ctxCall(engine);
+						PerformFunctionCall(func, &ctxCall, false, 0, CastToObjectType(type.GetTypeInfo()));
+						bc->AddCode(&ctxCall.bc);
+					}
+
+					// TODO: value on stack: This probably needs to be done in PerformFunctionCall
+					// Mark the object as initialized
+					bc->ObjInfo(offset, asOBJ_INIT);
+				}
+				else if( isVarGlobOrMem == 2 )
+				{
+					// Only POD types can be allocated inline in script classes
+					asASSERT( type.GetTypeInfo()->flags & asOBJ_POD );
+
+					if( func )
+					{
+						// Call the constructor as a normal function
+						bc->InstrSHORT(asBC_PSF, 0);
+						bc->Instr(asBC_RDSPtr);
+						bc->InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+
+						asCExprContext ctxCall(engine);
+						PerformFunctionCall(func, &ctxCall, false, 0, CastToObjectType(type.GetTypeInfo()));
+						bc->AddCode(&ctxCall.bc);
+					}
+				}
+				else
+				{
+					asASSERT( false );
+				}
+			}
+			else
+			{
+				if( isVarGlobOrMem == 0 )
+					bc->InstrSHORT(asBC_PSF, (short)offset);
+				else if( isVarGlobOrMem == 1 )
+					bc->InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+				else
+				{
+					bc->InstrSHORT(asBC_PSF, 0);
+					bc->Instr(asBC_RDSPtr);
+					bc->InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+				}
+
+				if( (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) )
+				{
+					asCScriptFunction *descr = engine->scriptFunctions[func];
+					asASSERT( descr->funcType == asFUNC_SCRIPT );
+
+					// Find the id of the real constructor and not the generated stub
+					asUINT id = 0;
+					asDWORD *funcBc = descr->scriptData->byteCode.AddressOf();
+					while( funcBc )
+					{
+						if( (*(asBYTE*)funcBc) == asBC_CALLSYS )
+						{
+							id = asBC_INTARG(funcBc);
+							break;
+						}
+						funcBc += asBCTypeSize[asBCInfo[*(asBYTE*)funcBc].type];
+					}
+
+					asASSERT( id );
+
+					bc->InstrPTR(asBC_OBJTYPE, type.GetTypeInfo());
+					bc->Alloc(asBC_ALLOC, type.GetTypeInfo(), id, AS_PTR_SIZE + AS_PTR_SIZE);
+				}
+				else
+					bc->Alloc(asBC_ALLOC, type.GetTypeInfo(), func, AS_PTR_SIZE);
+			}
+
+			// Cleanup
+			for( asUINT n = 0; n < args.GetLength(); n++ )
+				if( args[n] )
+				{
+					asDELETE(args[n], asCExprContext);
+				}
+
+			return 0;
+		}
+	}
+
+	// Class has no default factory/constructor.
+	asCString str;
+	str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, type.GetTypeInfo()->GetName());
+	Error(str, node);
+
+	return -1;
+}
+
+void asCCompiler::CallDestructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc)
+{
+	if( !type.IsReference() )
+	{
+		// Call destructor for the data type
+		if( type.IsObject() || type.IsFuncdef() )
+		{
+			// The null pointer doesn't need to be destroyed
+			if( type.IsNullHandle() )
+				return;
+
+			// Nothing is done for list pattern types, as this is taken care of by the CompileInitList method
+			if( type.GetTypeInfo()->flags & asOBJ_LIST_PATTERN )
+				return;
+
+			if( isObjectOnHeap || type.IsObjectHandle() )
+			{
+				// Free the memory
+				if (type.IsFuncdef())
+					bc->InstrW_PTR(asBC_FREE, (short)offset, &engine->functionBehaviours);
+				else
+					bc->InstrW_PTR(asBC_FREE, (short)offset, type.GetTypeInfo());
+			}
+			else
+			{
+				asASSERT( type.GetTypeInfo()->GetFlags() & asOBJ_VALUE );
+
+				if( type.GetBehaviour()->destruct )
+				{
+					// Call the destructor as a regular function
+					asCExprContext ctx(engine);
+					ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
+					PerformFunctionCall(type.GetBehaviour()->destruct, &ctx);
+					ctx.bc.OptimizeLocally(tempVariableOffsets);
+					bc->AddCode(&ctx.bc);
+				}
+
+				// TODO: Value on stack: This probably needs to be done in PerformFunctionCall
+				// Mark the object as destroyed
+				bc->ObjInfo(offset, asOBJ_UNINIT);
+			}
+		}
+	}
+}
+
+void asCCompiler::LineInstr(asCByteCode *bc, size_t pos)
+{
+	int r, c;
+	script->ConvertPosToRowCol(pos, &r, &c);
+	bc->Line(r, c, script->idx);
+}
+
+void asCCompiler::CompileStatementBlock(asCScriptNode *block, bool ownVariableScope, bool *hasReturn, asCByteCode *bc)
+{
+	*hasReturn = false;
+	bool isFinished = false;
+	bool hasUnreachableCode = false;
+	bool hasReturnBefore = false;
+
+	if( ownVariableScope )
+	{
+		bc->Block(true);
+		AddVariableScope();
+	}
+
+	asCScriptNode *node = block->firstChild;
+	while( node )
+	{
+#ifdef AS_DEBUG
+		// Keep the current line in a variable so it will be easier
+		// to determine where in a script an assert is occurring.
+		int currentLine = 0;
+		script->ConvertPosToRowCol(node->tokenPos, &currentLine, 0);
+#endif
+
+		if( !hasUnreachableCode && (*hasReturn || isFinished) )
+		{
+			// Empty statements don't count
+			if( node->nodeType != snExpressionStatement || node->firstChild )
+			{
+				hasUnreachableCode = true;
+				Warning(TXT_UNREACHABLE_CODE, node);
+			}
+
+			if( *hasReturn )
+				hasReturnBefore = true;
+		}
+
+		if( node->nodeType == snBreak || node->nodeType == snContinue )
+			isFinished = true;
+
+		asCByteCode statement(engine);
+		if( node->nodeType == snDeclaration )
+			CompileDeclaration(node, &statement);
+		else
+			CompileStatement(node, hasReturn, &statement);
+
+		// Ignore missing returns in unreachable code paths
+		if( !(*hasReturn) && hasReturnBefore )
+			*hasReturn = true;
+
+		LineInstr(bc, node->tokenPos);
+		bc->AddCode(&statement);
+
+		if( !hasCompileErrors )
+		{
+			asASSERT( tempVariables.GetLength() == 0 );
+			asASSERT( reservedVariables.GetLength() == 0 );
+		}
+
+		node = node->next;
+	}
+
+	if( ownVariableScope )
+	{
+		// Deallocate variables in this block, in reverse order
+		for( int n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
+		{
+			sVariable *v = variables->variables[n];
+
+			// Call variable destructors here, for variables not yet destroyed
+			// If the block is terminated with a break, continue, or
+			// return the variables are already destroyed
+			if( !isFinished && !*hasReturn )
+				CallDestructor(v->type, v->stackOffset, v->onHeap, bc);
+
+			// Don't deallocate function parameters
+			if( v->stackOffset > 0 )
+				DeallocateVariable(v->stackOffset);
+		}
+
+		RemoveVariableScope();
+		bc->Block(false);
+	}
+}
+
+// Entry
+int asCCompiler::CompileGlobalVariable(asCBuilder *in_builder, asCScriptCode *in_script, asCScriptNode *in_node, sGlobalVariableDescription *in_gvar, asCScriptFunction *in_outFunc)
+{
+	Reset(in_builder, in_script, in_outFunc);
+	m_globalVar = in_gvar;
+
+	// Add a variable scope (even though variables can't be declared)
+	AddVariableScope();
+
+	in_gvar->isPureConstant = false;
+
+	// Parse the initialization nodes
+	asCParser parser(builder);
+	if (in_node)
+	{
+		int r = parser.ParseVarInit(in_script, in_node);
+		if (r < 0)
+			return r;
+
+		in_node = parser.GetScriptNode();
+	}
+
+	asCExprContext compiledCtx(engine);
+	bool preCompiled = false;
+	if (in_gvar->datatype.IsAuto())
+	{
+		preCompiled = CompileAutoType(in_gvar->datatype, compiledCtx, in_node, in_gvar->declaredAtNode);
+		if (!preCompiled)
+		{
+			// If it wasn't possible to determine the type from the expression then there
+			// is no need to continue with the initialization. The error was already reported
+			// in CompileAutoType.
+			return -1;
+		}
+	}
+	if( in_gvar->property == 0 )
+	{
+		in_gvar->property = builder->module->AllocateGlobalProperty(in_gvar->name.AddressOf(), in_gvar->datatype, in_gvar->ns);
+		in_gvar->index = in_gvar->property->id;
+	}
+
+	// Compile the expression
+	asCExprContext ctx(engine);
+	asQWORD constantValue = 0;
+	if( CompileInitialization(in_node, &ctx.bc, in_gvar->datatype, in_gvar->declaredAtNode, in_gvar->index, &constantValue, 1, preCompiled ? &compiledCtx : 0) )
+	{
+		// Should the variable be marked as pure constant?
+		if( in_gvar->datatype.IsPrimitive() && in_gvar->datatype.IsReadOnly() )
+		{
+			in_gvar->isPureConstant = true;
+			in_gvar->constantValue = constantValue;
+		}
+	}
+
+	// Concatenate the bytecode
+	int varSize = GetVariableOffset((int)variableAllocations.GetLength()) - 1;
+
+	// Add information on the line number for the global variable
+	size_t pos = 0;
+	if( in_gvar->declaredAtNode )
+		pos = in_gvar->declaredAtNode->tokenPos;
+	else if( in_gvar->initializationNode )
+		pos = in_gvar->initializationNode->tokenPos;
+	LineInstr(&byteCode, pos);
+
+	// Reserve space for all local variables
+	outFunc->scriptData->variableSpace = varSize;
+
+	ctx.bc.OptimizeLocally(tempVariableOffsets);
+
+	byteCode.AddCode(&ctx.bc);
+
+	// Deallocate variables in this block, in reverse order
+	for( int n = (int)variables->variables.GetLength() - 1; n >= 0; --n )
+	{
+		sVariable *v = variables->variables[n];
+
+		// Call variable destructors here, for variables not yet destroyed
+		CallDestructor(v->type, v->stackOffset, v->onHeap, &byteCode);
+
+		DeallocateVariable(v->stackOffset);
+	}
+
+	if( hasCompileErrors ) return -1;
+
+	// At this point there should be no variables allocated
+	asASSERT(variableAllocations.GetLength() == freeVariables.GetLength());
+
+	// Remove the variable scope again
+	RemoveVariableScope();
+
+	byteCode.Ret(0);
+
+	FinalizeFunction();
+
+#ifdef AS_DEBUG
+	// DEBUG: output byte code
+	byteCode.DebugOutput(("___init_" + in_gvar->name + ".txt").AddressOf(), outFunc);
+#endif
+
+	return 0;
+}
+
+void asCCompiler::DetermineSingleFunc(asCExprContext *ctx, asCScriptNode *node)
+{
+	// Don't do anything if this is not a deferred global function
+	if( !ctx->IsGlobalFunc() )
+		return;
+
+	// Determine the namespace
+	asSNameSpace *ns = 0;
+	asCString name = "";
+	int pos = ctx->methodName.FindLast("::");
+	if( pos >= 0 )
+	{
+		asCString nsName = ctx->methodName.SubString(0, pos+2);
+
+		// Cut off the ::
+		if( nsName.GetLength() > 2 )
+			nsName.SetLength(nsName.GetLength()-2);
+
+		ns = DetermineNameSpace(nsName);
+		name = ctx->methodName.SubString(pos+2);
+	}
+	else
+	{
+		DetermineNameSpace("");
+		name = ctx->methodName;
+	}
+
+	asCArray<int> funcs;
+	if( ns )
+		builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
+
+	// CompileVariableAccess should guarantee that at least one function is exists
+	asASSERT( funcs.GetLength() > 0 );
+
+	if( funcs.GetLength() > 1 )
+	{
+		asCString str;
+		str.Format(TXT_MULTIPLE_MATCHING_SIGNATURES_TO_s, ctx->methodName.AddressOf());
+		Error(str, node);
+
+		// Fall through so the compiler can continue as if only one function was matching
+	}
+
+	// A shared object may not access global functions unless they too are shared (e.g. registered functions)
+	if( !builder->GetFunctionDescription(funcs[0])->IsShared() &&
+		outFunc->IsShared() )
+	{
+		asCString msg;
+		msg.Format(TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s, builder->GetFunctionDescription(funcs[0])->GetDeclaration());
+		Error(msg, node);
+
+		// Fall through so the compiler can continue anyway
+	}
+
+	// Push the function pointer on the stack
+	ctx->bc.InstrPTR(asBC_FuncPtr, builder->GetFunctionDescription(funcs[0]));
+	ctx->type.Set(asCDataType::CreateType(engine->FindMatchingFuncdef(builder->GetFunctionDescription(funcs[0]), builder->module), false));
+	ctx->type.dataType.MakeHandle(true);
+	ctx->type.isExplicitHandle = true;
+	ctx->methodName = "";
+}
+
+void asCCompiler::CompileInitAsCopy(asCDataType &dt, int offset, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool derefDestination)
+{
+	bool isObjectOnHeap = derefDestination ? false : IsVariableOnHeap(offset);
+
+	// Use copy constructor if available.
+	asCObjectType *ot = CastToObjectType(dt.GetTypeInfo());
+	if(!dt.IsObjectHandle() && ot && (ot->beh.copyconstruct || ot->beh.copyfactory))
+	{
+		PrepareForAssignment(&dt, arg, node, true);
+		int r = CallCopyConstructor(dt, offset, isObjectOnHeap, bc, arg, node, 0, derefDestination);
+		if( r < 0 && tempVariables.Exists(offset) )
+			Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
+	}
+	else
+	{
+		// TODO: Need to reserve variables, as the default constructor may need
+		//       to allocate temporary variables to compute default args
+
+		// Allocate and construct the temporary object before whatever is already in the bytecode
+		asCByteCode tmpBC(engine);
+		int r = CallDefaultConstructor(dt, offset, isObjectOnHeap, &tmpBC, node, 0, derefDestination);
+		if( r < 0 )
+		{
+			if( tempVariables.Exists(offset) )
+				Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
+			return;
+		}
+
+		tmpBC.AddCode(bc);
+		bc->AddCode(&tmpBC);
+
+		// Assign the evaluated expression to the temporary variable
+		PrepareForAssignment(&dt, arg, node, true);
+		bc->AddCode(&arg->bc);
+
+		// Call the opAssign method to assign the value to the temporary object
+		dt.MakeReference(isObjectOnHeap);
+		asCExprValue type;
+		type.Set(dt);
+		type.isTemporary = true;
+		type.stackOffset = (short)offset;
+
+		if( dt.IsObjectHandle() )
+			type.isExplicitHandle = true;
+
+		bc->InstrSHORT(asBC_PSF, (short)offset);
+		if( derefDestination )
+			bc->Instr(asBC_RDSPtr);
+
+		r = PerformAssignment(&type, &arg->type, bc, node);
+		if( r < 0 )
+		{
+			if( tempVariables.Exists(offset) )
+				Error(TXT_FAILED_TO_CREATE_TEMP_OBJ, node);
+			return;
+		}
+
+		// Pop the reference that was pushed on the stack if the result is an object
+		if( type.dataType.IsObject() || type.dataType.IsFuncdef() )
+			bc->Instr(asBC_PopPtr);
+
+		// If the assignment operator returned an object by value it will
+		// be in a temporary variable which we need to destroy now
+		if( type.isTemporary && type.stackOffset != (short)offset )
+			ReleaseTemporaryVariable(type.stackOffset, bc);
+
+		// Release the original value too in case it is a temporary
+		ReleaseTemporaryVariable(arg->type, bc);
+	}
+}
+
+int asCCompiler::PrepareArgument(asCDataType *paramType, asCExprContext *ctx, asCScriptNode *node, bool isFunction, int refType, bool isMakingCopy)
+{
+	asCDataType param = *paramType;
+	if( paramType->GetTokenType() == ttQuestion )
+	{
+		// The function is expecting a var type. If the argument is a function name, we must now decide which function it is
+		DetermineSingleFunc(ctx, node);
+
+		// Since the function is expecting a var type ?, then we don't want to convert the argument to anything else
+		param = ctx->type.dataType;
+		param.MakeHandle(ctx->type.isExplicitHandle || ctx->type.IsNullConstant());
+
+		// Treat the void expression like a null handle when working with var types
+		if( ctx->IsVoidExpression() )
+			param = asCDataType::CreateNullHandle();
+
+		// If value assign is disabled for reference types, then make
+		// sure to always pass the handle to ? parameters
+		if( builder->engine->ep.disallowValueAssignForRefType &&
+			ctx->type.dataType.GetTypeInfo() && (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCOPED) )
+		{
+			param.MakeHandle(true);
+		}
+
+		param.MakeReference(paramType->IsReference());
+		param.MakeReadOnly(paramType->IsReadOnly());
+	}
+	else
+		param = *paramType;
+
+	asCDataType dt = param;
+
+	// Need to protect arguments by reference
+	if( isFunction && dt.IsReference() )
+	{
+		// Allocate a temporary variable of the same type as the argument
+		dt.MakeReference(false);
+
+		int offset;
+		if( refType == asTM_INREF )
+		{
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+
+			// Add the type id as hidden arg if the parameter is a ? type
+			if( paramType->GetTokenType() == ttQuestion )
+			{
+				asCByteCode tmpBC(engine);
+
+				// Place the type id on the stack as a hidden parameter
+				tmpBC.InstrDWORD(asBC_TYPEID, engine->GetTypeIdFromDataType(param));
+
+				// Insert the code before the expression code
+				tmpBC.AddCode(&ctx->bc);
+				ctx->bc.AddCode(&tmpBC);
+			}
+
+			if( dt.IsPrimitive() )
+			{
+				// If the reference is const, then it is not necessary to make a copy if the value already is a variable
+				// Even if the same variable is passed in another argument as non-const then there is no problem
+				IsVariableInitialized(&ctx->type, node);
+
+				if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
+				ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true);
+
+				if( !(param.IsReadOnly() && ctx->type.isVariable) )
+					ConvertToTempVariable(ctx);
+
+				PushVariableOnStack(ctx, true);
+				ctx->type.dataType.MakeReadOnly(param.IsReadOnly());
+			}
+			else if( ctx->type.dataType.IsNullHandle() )
+			{
+				// Make sure the argument type can support handles (or is itself a handle)
+				// Don't allow null handle to be converted to an object type of ASHANDLE here, that would require more logic to call the constructor (which should be handled in ImplicitConversion)
+				if( (!dt.SupportHandles() && !dt.IsObjectHandle()) || (dt.GetTypeInfo() && (dt.GetTypeInfo()->GetFlags() & asOBJ_ASHANDLE)) )
+				{
+					asCString str;
+					str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), param.Format(outFunc->nameSpace).AddressOf());
+					Error(str, node);
+
+					ctx->type.Set(param);
+					return -1;
+				}
+
+				// Need to initialize a local temporary variable to
+				// represent the null handle when passed as reference
+				asASSERT( ctx->bc.GetLastInstr() == asBC_PshNull );
+				ctx->bc.Instr(asBC_PopPtr);
+
+				dt.MakeHandle(true);
+				dt.MakeReadOnly(false);
+				offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+				// Push the reference to the variable on the stack
+				ctx->bc.InstrWORD(asBC_PSF, (short)offset);
+
+				ctx->type.SetVariable(dt, offset, true);
+				ctx->type.isExplicitHandle = true;
+			}
+			else
+			{
+				IsVariableInitialized(&ctx->type, node);
+
+				if( !isMakingCopy )
+				{
+					// For parameters expecting a reference to a handle we need to make sure the argument
+					// is really a handle, and not just a reference to the object. Do this check before the
+					// implicit conversion so it can be treated correctly.
+					if (dt.IsObjectHandle() && !ctx->type.dataType.IsObjectHandle())
+					{
+						// Make a refCopy into a local handle variable
+						// Allocate a handle variable
+						dt.MakeHandle(true);
+						dt.MakeReadOnly(false);
+						offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+						// Copy the handle
+						Dereference(ctx, true);
+						ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+						if (ctx->type.dataType.IsFuncdef())
+							ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+						else
+							ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
+						ctx->bc.Instr(asBC_PopPtr);
+						ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+
+						// Release the original temporary variable
+						if( ctx->type.isTemporary )
+							ReleaseTemporaryVariable(ctx->type.stackOffset, &ctx->bc);
+
+						ctx->type.SetVariable(dt, offset, true);
+					}
+
+					// Even though the parameter expects a reference, it is only meant to be
+					// used as input value and doesn't have to refer to the actual object, so it
+					// is OK to do an implicit conversion.
+					ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true);
+					if( !ctx->type.dataType.IsEqualExceptRefAndConst(param) )
+					{
+						asCString str;
+						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), param.Format(outFunc->nameSpace).AddressOf());
+						Error(str, node);
+
+						ctx->type.Set(param);
+						return -1;
+					}
+
+					// The compiler must guarantee that the object stays alive during the execution
+					// of the function, and it must also guarantee that the value isn't modified by
+					// the function.
+
+					// If the argument is a temporary local variable then it is safe to be passed to
+					// the function as it is, since the local variable will stay alive, and since it
+					// is temporary there is no side effect if the function modifies it.
+
+					// If the parameter is read-only and therefore guaranteed not to be modified by the
+					// function, then it is enough that the variable is local to guarantee the lifetime.
+					if( !ctx->type.isTemporary && !(param.IsReadOnly() && (ctx->type.isVariable || ctx->type.isRefSafe)) )
+					{
+						if( ctx->type.dataType.IsFuncdef() || ((ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && param.IsReadOnly() && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCOPED)) )
+						{
+							// Funcdefs only need an extra handle to guarantee the lifetime.
+
+							// If the object is a reference type (except scoped reference types), and the
+							// parameter is a const reference, then it is not necessary to make a copy of the
+							// object. The compiler just needs to hold a handle to guarantee the lifetime.
+
+							// Allocate a handle variable
+							dt.MakeHandle(true);
+							dt.MakeReadOnly(false);
+							offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+							// Copy the handle
+							Dereference(ctx, true);
+							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+							if (ctx->type.dataType.IsFuncdef())
+								ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+							else
+								ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
+							ctx->bc.Instr(asBC_PopPtr);
+							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+
+							// The type should be set to the param type instead of dt to guarantee
+							// that the expression keeps the correct type for variable ? args. Otherwise
+							// MoveArgsToStack will use the wrong bytecode to move the arg to the stack
+							bool isExplicitHandle = ctx->type.isExplicitHandle;
+							ctx->type.SetVariable(param, offset, true);
+							ctx->type.dataType.MakeHandle(true);
+							ctx->type.isExplicitHandle = isExplicitHandle;
+						}
+						else
+						{
+							// Make a copy of the object to guarantee that the original isn't modified
+							asASSERT(!dt.IsFuncdef());
+
+							// Allocate and initialize a temporary local object
+							dt.MakeReadOnly(false);
+							offset = AllocateVariableNotIn(dt, true, false, ctx);
+							CompileInitAsCopy(dt, offset, &ctx->bc, ctx, node, false);
+
+							// Push the object pointer on the stack
+							ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+							if( dt.IsObject() && !dt.IsObjectHandle() )
+								ctx->bc.Instr(asBC_RDSPtr);
+
+							// Set the resulting type
+							ctx->type.Set(dt);
+							ctx->type.isTemporary = true;
+							ctx->type.stackOffset = short(offset);
+							if( dt.IsObjectHandle() )
+								ctx->type.isExplicitHandle = true;
+							ctx->type.dataType.MakeReference(false);
+							if( paramType->IsReadOnly() )
+								ctx->type.dataType.MakeReadOnly(true);
+						}
+					}
+
+					// When calling a function expecting a var arg with a parameter received as reference to handle
+					// then it is necessary to copy the handle to a local variable, otherwise MoveArgsToStack will
+					// not be able to do the correct double dereference to put the reference to the object on the stack.
+					if (paramType->GetTokenType() == ttQuestion && !param.IsObjectHandle() && ctx->type.isVariable)
+					{
+						sVariable *var = variables->GetVariableByOffset(ctx->type.stackOffset);
+						if (var && var->type.IsReference() && var->type.IsObjectHandle())
+						{
+							// Copy the handle to local variable
+
+							// Allocate a handle variable
+							dt.MakeHandle(true);
+							dt.MakeReadOnly(false);
+							offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+							// Copy the handle
+							Dereference(ctx, true);
+							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+							if (ctx->type.dataType.IsFuncdef())
+								ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+							else
+								ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
+							ctx->bc.Instr(asBC_PopPtr);
+							ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+
+							// The type should be set to the param type instead of dt to guarantee
+							// that the expression keeps the correct type for variable ? args. Otherwise
+							// MoveArgsToStack will use the wrong bytecode to move the arg to the stack
+							ctx->type.SetVariable(param, offset, true);
+						}
+					}
+				}
+				else
+				{
+					// We must guarantee that the address to the value is on the stack
+					if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) &&
+						!ctx->type.dataType.IsObjectHandle() &&
+						ctx->type.dataType.IsReference() )
+						Dereference(ctx, true);
+				}
+			}
+		}
+		else if( refType == asTM_OUTREF )
+		{
+			// Add the type id as hidden arg if the parameter is a ? type
+			if( paramType->GetTokenType() == ttQuestion )
+			{
+				asCByteCode tmpBC(engine);
+
+				// Place the type id on the stack as a hidden parameter
+				tmpBC.InstrDWORD(asBC_TYPEID, engine->GetTypeIdFromDataType(param));
+
+				// Insert the code before the expression code
+				tmpBC.AddCode(&ctx->bc);
+				ctx->bc.AddCode(&tmpBC);
+			}
+
+			// If the expression is marked as clean, then it can be used directly
+			// without the need to allocate another temporary value as it is known
+			// that the argument has no other value than the default
+			if( ctx->isCleanArg )
+			{
+				// Must be a local variable
+				asASSERT( ctx->type.isVariable );
+			}
+			else
+			{
+				// Null handles and void expressions must be marked as explicit
+				// handles for correct treatement in MoveArgsToStack
+				if (dt.IsNullHandle())
+					ctx->type.isExplicitHandle = true;
+
+				// Make sure the variable is not used in the expression
+				dt.MakeReadOnly(false);
+				offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+				if( dt.IsPrimitive() )
+				{
+					ctx->type.SetVariable(dt, offset, true);
+					PushVariableOnStack(ctx, true);
+				}
+				else
+				{
+					// Allocate and construct the temporary object
+					asCByteCode tmpBC(engine);
+					CallDefaultConstructor(dt, offset, IsVariableOnHeap(offset), &tmpBC, node);
+
+					// Insert the code before the expression code
+					tmpBC.AddCode(&ctx->bc);
+					ctx->bc.AddCode(&tmpBC);
+
+					dt.MakeReference(!(dt.IsObject() || dt.IsFuncdef()) || dt.IsObjectHandle());
+					asCExprValue type;
+					type.Set(dt);
+					type.isTemporary = true;
+					type.stackOffset = (short)offset;
+
+					type.isExplicitHandle = ctx->type.isExplicitHandle;
+					ctx->type = type;
+
+					ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+					if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsObjectHandle() )
+						ctx->bc.Instr(asBC_RDSPtr);
+				}
+
+				// After the function returns the temporary variable will
+				// be assigned to the expression, if it is a valid lvalue
+			}
+		}
+		else if( refType == asTM_INOUTREF )
+		{
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+
+			// Add the type id as hidden arg if the parameter is a ? type
+			if( paramType->GetTokenType() == ttQuestion )
+			{
+				asCByteCode tmpBC(engine);
+
+				// Place the type id on the stack as a hidden parameter
+				tmpBC.InstrDWORD(asBC_TYPEID, engine->GetTypeIdFromDataType(param));
+
+				// Insert the code before the expression code
+				tmpBC.AddCode(&ctx->bc);
+				ctx->bc.AddCode(&tmpBC);
+			}
+
+			// Literal constants cannot be passed to inout ref arguments
+			if( !ctx->type.isVariable &&
+				ctx->type.isConstant &&
+				!ctx->type.dataType.IsEqualExceptRefAndConst(engine->stringType) )
+			{
+				// Unless unsafe references are turned on and the reference is const
+				if( param.IsReadOnly() && engine->ep.allowUnsafeReferences )
+				{
+					// Since the parameter is a const & make a copy.
+					ConvertToTempVariable(ctx);
+					ctx->type.dataType.MakeReadOnly(true);
+				}
+				else
+				{
+					Error(TXT_NOT_VALID_REFERENCE, node);
+					return -1;
+				}
+			}
+
+			// Allow anonymous init lists to be converted to the arg type
+			if( ctx->IsAnonymousInitList() )
+				ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true, true);
+			
+			if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && ctx->type.dataType.GetTypeInfo() != dt.GetTypeInfo() )
+				ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV, true, false);
+
+			// Only objects that support object handles
+			// can be guaranteed to be safe. Local variables are
+			// already safe, so there is no need to add an extra
+			// references
+			if( !engine->ep.allowUnsafeReferences &&
+				!ctx->type.isVariable &&
+				(ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) &&
+				!ctx->type.dataType.IsObjectHandle() &&
+				((ctx->type.dataType.GetBehaviour()->addref &&
+				  ctx->type.dataType.GetBehaviour()->release) ||
+				 (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_NOCOUNT) ||
+				 ctx->type.dataType.IsFuncdef()) )
+			{
+				// Store a handle to the object as local variable
+				asCExprContext tmp(engine);
+				dt = ctx->type.dataType;
+				dt.MakeHandle(true);
+				dt.MakeReference(false);
+				dt.MakeReadOnly(false);
+
+				offset = AllocateVariableNotIn(dt, true, false, ctx);
+
+				// Copy the handle
+				if( !ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsReference() )
+					ctx->bc.Instr(asBC_RDSPtr);
+				ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+				if( ctx->type.dataType.IsFuncdef() )
+					ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+				else
+					ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
+				ctx->bc.Instr(asBC_PopPtr);
+				ctx->bc.InstrWORD(asBC_PSF, (asWORD)offset);
+
+				dt.MakeHandle(false);
+				dt.MakeReference(true);
+
+				// Release previous temporary variable stored in the context (if any)
+				if( ctx->type.isTemporary )
+					ReleaseTemporaryVariable(ctx->type.stackOffset, &ctx->bc);
+
+				ctx->type.SetVariable(dt, offset, true);
+			}
+
+			// Make sure the reference to the value is on the stack
+			// For objects, the reference needs to be dereferenced so the pointer on the stack is to the actual object
+			// For handles, the reference shouldn't be changed because the pointer on the stack should be to the handle
+			if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && ctx->type.dataType.IsReference() && !param.IsObjectHandle() )
+				Dereference(ctx, true);
+			else if( ctx->type.isVariable && !(ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) )
+				ctx->bc.InstrSHORT(asBC_PSF, (short)ctx->type.stackOffset);
+			else if( ctx->type.dataType.IsPrimitive() )
+				ctx->bc.Instr(asBC_PshRPtr);
+			else if( ctx->type.dataType.IsObjectHandle() && !ctx->type.dataType.IsReference() )
+				ImplicitConversion(ctx, param, node, asIC_IMPLICIT_CONV, true, false);
+		}
+	}
+	else
+	{
+		if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+			return -1;
+
+		if( dt.IsPrimitive() )
+		{
+			IsVariableInitialized(&ctx->type, node);
+
+			if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
+
+			// Implicitly convert primitives to the parameter type
+			ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV);
+
+			if( ctx->type.isVariable )
+			{
+				PushVariableOnStack(ctx, dt.IsReference());
+			}
+			else if( ctx->type.isConstant )
+			{
+				ConvertToVariable(ctx);
+				PushVariableOnStack(ctx, dt.IsReference());
+			}
+		}
+		else
+		{
+			IsVariableInitialized(&ctx->type, node);
+
+			// Implicitly convert primitives to the parameter type
+			ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV);
+
+			// Was the conversion successful?
+			if( !ctx->type.dataType.IsEqualExceptRef(dt) )
+			{
+				asCString str;
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), dt.Format(outFunc->nameSpace).AddressOf());
+				Error(str, node);
+
+				ctx->type.Set(dt);
+				return -1;
+			}
+
+			if( dt.IsObjectHandle() )
+				ctx->type.isExplicitHandle = true;
+
+			if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsNullHandle() && !dt.IsReference() )
+			{
+				// Objects passed by value must be placed in temporary variables
+				// so that they are guaranteed to not be referenced anywhere else.
+				// The object must also be allocated on the heap, as the memory will
+				// be deleted by the called function.
+
+				// Handles passed by value must also be placed in a temporary variable
+				// to guarantee that the object referred to isn't freed too early.
+
+				// TODO: value on stack: How can we avoid this unnecessary allocation?
+
+				// Don't make temporary copies of handles if it is going to be used
+				// for handle assignment anyway, i.e. REFCPY.
+				if( !(!isFunction && isMakingCopy && ctx->type.dataType.IsObjectHandle() && ctx->type.isVariable) )
+					PrepareTemporaryVariable(node, ctx, true);
+			}
+		}
+	}
+
+	// Don't put any pointer on the stack yet
+	if( param.IsReference() || ((param.IsObject() || param.IsFuncdef()) && !param.IsNullHandle()) )
+	{
+		// &inout parameter may leave the reference on the stack already
+		// references considered safe too, i.e. when the life time is known
+		if( refType != asTM_INOUTREF && !ctx->type.isRefSafe )
+		{
+			asASSERT( ctx->type.isVariable || ctx->type.isRefSafe || ctx->type.isTemporary || isMakingCopy );
+
+			if( ctx->type.isVariable || ctx->type.isTemporary )
+			{
+				ctx->bc.Instr(asBC_PopPtr);
+				ctx->bc.InstrSHORT(asBC_VAR, (short)ctx->type.stackOffset);
+
+				ProcessDeferredParams(ctx);
+			}
+		}
+	}
+
+	return 0;
+}
+
+int asCCompiler::PrepareFunctionCall(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args)
+{
+	// When a match has been found, compile the final byte code using correct parameter types
+	asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
+
+	asASSERT( descr->parameterTypes.GetLength() == args.GetLength() );
+
+	// If the function being called is the opAssign or copy constructor for the same type
+	// as the argument, then we should avoid making temporary copy of the argument
+	bool makingCopy = false;
+	if( descr->parameterTypes.GetLength() == 1 &&
+		descr->parameterTypes[0].IsEqualExceptRefAndConst(args[0]->type.dataType) &&
+		(((descr->name == "opAssign" || descr->name == "$beh0") && descr->objectType && descr->objectType == args[0]->type.dataType.GetTypeInfo()) ||
+		 (descr->objectType == 0 && args[0]->type.dataType.GetTypeInfo() && descr->name == args[0]->type.dataType.GetTypeInfo()->name)) )
+		makingCopy = true;
+
+	// Add code for arguments
+	asCExprContext e(engine);
+	for( int n = (int)args.GetLength()-1; n >= 0; n-- )
+	{
+		// Make sure PrepareArgument doesn't use any variable that is already
+		// being used by the argument or any of the following argument expressions
+		int l = int(reservedVariables.GetLength());
+		for( int m = n; m >= 0; m-- )
+			args[m]->bc.GetVarsUsed(reservedVariables);
+
+		int r = PrepareArgument2(&e, args[n], &descr->parameterTypes[n], true, descr->inOutFlags[n], makingCopy);
+		reservedVariables.SetLength(l);
+
+		if (r < 0)
+			return r;
+	}
+
+	bc->AddCode(&e.bc);
+
+	return 0;
+}
+
+void asCCompiler::MoveArgsToStack(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args, bool addOneToOffset)
+{
+	asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
+
+	int offset = 0;
+	if( addOneToOffset )
+		offset += AS_PTR_SIZE;
+
+	// The address of where the return value should be stored is push on top of the arguments
+	if( descr->DoesReturnOnStack() )
+		offset += AS_PTR_SIZE;
+
+#ifdef AS_DEBUG
+	// If the function being called is the opAssign or copy constructor for the same type
+	// as the argument, then we should avoid making temporary copy of the argument
+	bool makingCopy = false;
+	if( descr->parameterTypes.GetLength() == 1 &&
+		descr->parameterTypes[0].IsEqualExceptRefAndConst(args[0]->type.dataType) &&
+		(((descr->name == "opAssign" || descr->name == "$beh0") && descr->objectType && descr->objectType == args[0]->type.dataType.GetTypeInfo()) ||
+		 (descr->objectType == 0 && args[0]->type.dataType.GetTypeInfo() && descr->name == args[0]->type.dataType.GetTypeInfo()->name)) )
+		makingCopy = true;
+#endif
+
+	// Move the objects that are sent by value to the stack just before the call
+	for( asUINT n = 0; n < descr->parameterTypes.GetLength(); n++ )
+	{
+		if( descr->parameterTypes[n].IsReference() )
+		{
+			if( (descr->parameterTypes[n].IsObject() || descr->parameterTypes[n].IsFuncdef()) && !descr->parameterTypes[n].IsObjectHandle() )
+			{
+				if( descr->inOutFlags[n] != asTM_INOUTREF && !args[n]->type.isRefSafe )
+				{
+#ifdef AS_DEBUG
+					// This assert is inside AS_DEBUG because of the variable makingCopy which is only defined in debug mode
+					asASSERT( args[n]->type.isVariable || args[n]->type.isTemporary || makingCopy );
+#endif
+
+					if( (args[n]->type.isVariable || args[n]->type.isTemporary) )
+					{
+						if( !IsVariableOnHeap(args[n]->type.stackOffset) )
+							// TODO: runtime optimize: Actually the reference can be pushed on the stack directly
+							//                         as the value allocated on the stack is guaranteed to be safe
+							bc->InstrWORD(asBC_GETREF, (asWORD)offset);
+						else
+							bc->InstrWORD(asBC_GETOBJREF, (asWORD)offset);
+					}
+				}
+				if( args[n]->type.dataType.IsObjectHandle() )
+					bc->InstrWORD(asBC_ChkNullS, (asWORD)offset);
+			}
+			else if( descr->inOutFlags[n] != asTM_INOUTREF )
+			{
+				// If the argument is already known to be safe, i.e. has a guaranteed lifetime,
+				// then the address on the stack is already pointing to the correct object so no
+				// need to do anything else
+				if (!args[n]->type.isRefSafe)
+				{
+					if (descr->parameterTypes[n].GetTokenType() == ttQuestion &&
+						(args[n]->type.dataType.IsObject() || args[n]->type.dataType.IsFuncdef()) &&
+						!args[n]->type.dataType.IsObjectHandle())
+					{
+						// Send the object as a reference to the object,
+						// and not to the variable holding the object
+						if (!IsVariableOnHeap(args[n]->type.stackOffset))
+							// TODO: runtime optimize: Actually the reference can be pushed on the stack directly
+							//                         as the value allocated on the stack is guaranteed to be safe
+							bc->InstrWORD(asBC_GETREF, (asWORD)offset);
+						else
+							bc->InstrWORD(asBC_GETOBJREF, (asWORD)offset);
+					}
+					else if (descr->parameterTypes[n].GetTokenType() == ttQuestion &&
+						args[n]->type.dataType.IsObjectHandle() && !args[n]->type.isExplicitHandle)
+					{
+						// The object handle is being passed as an object, so dereference it before
+						// the call so the reference will be to the object rather than to the handle
+						if (engine->ep.disallowValueAssignForRefType)
+						{
+							// With disallow value assign all ref type objects are always passed by handle
+							bc->InstrWORD(asBC_GETREF, (asWORD)offset);
+						}
+						else
+							bc->InstrWORD(asBC_GETOBJREF, (asWORD)offset);
+					}
+					else
+					{
+						// If the variable is really an argument of @& type, then it is necessary
+						// to use asBC_GETOBJREF so the pointer is correctly dereferenced.
+						sVariable *var = variables->GetVariableByOffset(args[n]->type.stackOffset);
+						if (var == 0 || !var->type.IsReference() || !var->type.IsObjectHandle())
+							bc->InstrWORD(asBC_GETREF, (asWORD)offset);
+						else
+							bc->InstrWORD(asBC_GETOBJREF, (asWORD)offset);
+					}
+				}
+			}
+		}
+		else if( descr->parameterTypes[n].IsObject() || descr->parameterTypes[n].IsFuncdef() )
+		{
+			asASSERT(!args[n]->type.isRefSafe);
+
+			// TODO: value on stack: What can we do to avoid this unnecessary allocation?
+			// The object must be allocated on the heap, because this memory will be deleted in as_callfunc_xxx
+			asASSERT(IsVariableOnHeap(args[n]->type.stackOffset));
+
+			// The pointer in the variable will be moved to the stack
+			bc->InstrWORD(asBC_GETOBJ, (asWORD)offset);
+
+			// Deallocate the variable slot so it can be reused, but do not attempt to
+			// free the content of the variable since it was moved to the stack for the call
+			DeallocateVariable(args[n]->type.stackOffset);
+			args[n]->type.isTemporary = false;
+		}
+
+		offset += descr->parameterTypes[n].GetSizeOnStackDWords();
+	}
+}
+
+int asCCompiler::CompileArgumentList(asCScriptNode *node, asCArray<asCExprContext*> &args, asCArray<asSNamedArgument> &namedArgs)
+{
+	asASSERT(node->nodeType == snArgList);
+
+	// Count arguments
+	asCScriptNode *arg = node->firstChild;
+	int argCount = 0;
+	while( arg )
+	{
+		if( arg->nodeType != snNamedArgument )
+			argCount++;
+		arg = arg->next;
+	}
+
+	// Prepare the arrays
+	args.SetLength(argCount);
+	int n;
+	for( n = 0; n < argCount; n++ )
+		args[n] = 0;
+
+	n = argCount-1;
+
+	// Compile the arguments in reverse order (as they will be pushed on the stack)
+	bool anyErrors = false, inPositionalArguments = false;
+	arg = node->lastChild;
+	while( arg )
+	{
+		asCScriptNode *asgNode = arg, *namedNode = 0;
+		if( asgNode->nodeType == snNamedArgument )
+		{
+			if( inPositionalArguments )
+			{
+				Error(TXT_POS_ARG_AFTER_NAMED_ARG, node);
+				return -1;
+			}
+
+			asgNode = arg->firstChild->next;
+			namedNode = arg->firstChild;
+
+			asASSERT( namedNode->nodeType == snIdentifier );
+		}
+		else
+			inPositionalArguments = true;
+
+		asCExprContext expr(engine);
+		int r = CompileAssignment(asgNode, &expr);
+		if( r < 0 ) anyErrors = true;
+
+		asCExprContext *ctx = asNEW(asCExprContext)(engine);
+		if( ctx == 0 )
+		{
+			// Out of memory
+			return -1;
+		}
+		MergeExprBytecodeAndType(ctx, &expr);
+
+		if( inPositionalArguments )
+		{
+			args[n] = ctx;
+			n--;
+		}
+		else
+		{
+			asSNamedArgument namedArg;
+			namedArg.name = asCString(&script->code[namedNode->tokenPos], namedNode->tokenLength);
+			namedArg.ctx = ctx;
+
+			// Error out when multiple arguments with the same name are passed
+			for( asUINT a = 0; a < namedArgs.GetLength(); ++a )
+			{
+				if( namedArgs[a].name == namedArg.name )
+				{
+					Error(TXT_DUPLICATE_NAMED_ARG, asgNode);
+					anyErrors = true;
+					break;
+				}
+			}
+
+			namedArgs.PushLast(namedArg);
+		}
+
+		arg = arg->prev;
+	}
+
+	return anyErrors ? -1 : 0;
+}
+
+int asCCompiler::CompileDefaultAndNamedArgs(asCScriptNode *node, asCArray<asCExprContext*> &args, int funcId, asCObjectType *objectType, asCArray<asSNamedArgument> *namedArgs)
+{
+	asCScriptFunction *func = builder->GetFunctionDescription(funcId);
+	if( func == 0 || args.GetLength() >= (asUINT)func->GetParamCount() )
+		return 0;
+
+	// Make sure to use the real function for virtual functions
+	if( func->funcType == asFUNC_VIRTUAL )
+	{
+		asASSERT( objectType );
+		func = objectType->virtualFunctionTable[func->vfTableIdx];
+	}
+
+	// Make sure none of the variables used in the previous arguments are reused in the default arguments
+	bool anyErrors = false;
+	int prevReservedVars = reservedVariables.GetLength();
+
+	int explicitArgs = (int)args.GetLength();
+
+	for( int p = 0; p < explicitArgs; p++ )
+		args[p]->bc.GetVarsUsed(reservedVariables);
+
+	// Make space for all the new arguments
+	args.SetLength(func->parameterTypes.GetLength());
+	for( asUINT c = explicitArgs; c < args.GetLength(); c++ )
+		args[c] = 0;
+
+	// Add the named arguments to the argument list in the right position
+	if( namedArgs )
+	{
+		for( asUINT n = 0; n < namedArgs->GetLength(); ++n )
+		{
+			asSNamedArgument &named = (*namedArgs)[n];
+			named.ctx->bc.GetVarsUsed(reservedVariables);
+
+			// Find the right spot to put it in
+			asUINT index = asUINT(-1);
+			for( asUINT j = 0; j < func->parameterTypes.GetLength(); ++j )
+			{
+				if( func->parameterNames[j] == (*namedArgs)[n].name )
+				{
+					index = j;
+					break;
+				}
+			}
+
+			asASSERT( index < args.GetLength() );
+			args[index] = named.ctx;
+			named.ctx = 0;
+		}
+	}
+
+	// Compile the arguments in reverse order (as they will be pushed on the stack)
+	for( int n = (int)func->parameterTypes.GetLength() - 1; n >= explicitArgs; n-- )
+	{
+		if( args[n] != 0 ) continue;
+		if( func->defaultArgs[n] == 0 ) { anyErrors = true; continue; }
+
+		// Parse the default arg string
+		asCParser parser(builder);
+		asCScriptCode *code = builder->FindOrAddCode("default arg", func->defaultArgs[n]->AddressOf(), func->defaultArgs[n]->GetLength());
+		int r = parser.ParseExpression(code);
+		if( r < 0 )
+		{
+			asCString msg;
+			msg.Format(TXT_FAILED_TO_COMPILE_DEF_ARG_d_IN_FUNC_s, n, func->GetDeclaration());
+			Error(msg, node);
+			anyErrors = true;
+			continue;
+		}
+
+		asCScriptNode *arg = parser.GetScriptNode();
+
+		// Temporarily set the script code to the default arg expression
+		asCScriptCode *origScript = script;
+		script = code;
+
+		// Don't allow the expression to access local variables
+		isCompilingDefaultArg = true;
+
+		// Temporarily set the namespace in the output function to the namespace of the called
+		// function so that the default arguments are evaluated in the correct namespace
+		asSNameSpace *origNameSpace = outFunc->nameSpace;
+		outFunc->nameSpace = func->nameSpace;
+
+		asCExprContext expr(engine);
+		r = CompileExpression(arg, &expr);
+
+		// Restore the namespace
+		outFunc->nameSpace = origNameSpace;
+
+		// Don't allow address of class method
+		if( expr.IsClassMethod() )
+		{
+			// TODO: Improve error message
+			Error(TXT_DEF_ARG_TYPE_DOESNT_MATCH, arg);
+			r = -1;
+		}
+
+		// Make sure the expression can be implicitly converted to the parameter type
+		if( r >= 0 )
+		{
+			asCArray<int> funcs;
+			funcs.PushLast(func->id);
+			asCArray<asSOverloadCandidate> matches;
+			if( MatchArgument(funcs, matches, &expr, n) == 0 )
+			{
+				Error(TXT_DEF_ARG_TYPE_DOESNT_MATCH, arg);
+				r = -1;
+			}
+		}
+
+		isCompilingDefaultArg = false;
+
+		script = origScript;
+
+		if( r < 0 )
+		{
+			asCString msg;
+			msg.Format(TXT_FAILED_TO_COMPILE_DEF_ARG_d_IN_FUNC_s, n, func->GetDeclaration());
+			Error(msg, node);
+			anyErrors = true;
+			continue;
+		}
+
+		args[n] = asNEW(asCExprContext)(engine);
+		if( args[n] == 0 )
+		{
+			// Out of memory
+			reservedVariables.SetLength(prevReservedVars);
+			return -1;
+		}
+
+		MergeExprBytecodeAndType(args[n], &expr);
+		if (args[n]->exprNode)
+		{
+			// Disconnect the node from the parser, and tell the compiler to free it when complete
+			args[n]->exprNode->DisconnectParent();
+			nodesToFreeUponComplete.PushLast(args[n]->exprNode);
+		}
+	}
+
+	reservedVariables.SetLength(prevReservedVars);
+	return anyErrors ? -1 : 0;
+}
+
+asUINT asCCompiler::MatchFunctions(asCArray<int> &funcs, asCArray<asCExprContext*> &args, asCScriptNode *node, const char *name, asCArray<asSNamedArgument> *namedArgs, asCObjectType *objectType, bool isConstMethod, bool silent, bool allowObjectConstruct, const asCString &scope)
+{
+	asCArray<int> origFuncs = funcs; // Keep the original list for error message
+	asUINT cost = 0;
+	asUINT n;
+
+	if( funcs.GetLength() > 0 )
+	{
+		// Check the number of parameters in the found functions
+		asUINT totalArgs = (asUINT)args.GetLength();
+		if( namedArgs != 0 )
+			totalArgs += (asUINT)namedArgs->GetLength();
+
+		for( n = 0; n < funcs.GetLength(); ++n )
+		{
+			asCScriptFunction *desc = builder->GetFunctionDescription(funcs[n]);
+
+			if( desc->parameterTypes.GetLength() != totalArgs )
+			{
+				bool noMatch = true;
+				if( totalArgs < desc->parameterTypes.GetLength() )
+				{
+					// For virtual functions, the default args are defined in the real function of the object
+					if( desc->funcType == asFUNC_VIRTUAL )
+						desc = objectType->virtualFunctionTable[desc->vfTableIdx];
+
+					// Count the number of default args
+					asUINT defaultArgs = 0;
+					for( asUINT d = 0; d < desc->defaultArgs.GetLength(); d++ )
+						if( desc->defaultArgs[d] )
+							defaultArgs++;
+
+					if( totalArgs >= desc->parameterTypes.GetLength() - defaultArgs )
+						noMatch = false;
+				}
+
+				if( noMatch )
+				{
+					// remove it from the list
+					if( n == funcs.GetLength()-1 )
+						funcs.PopLast();
+					else
+						funcs[n] = funcs.PopLast();
+					n--;
+				}
+			}
+		}
+
+		// Match functions with the parameters, and discard those that do not match
+		asCArray<asSOverloadCandidate> matchingFuncs;
+		matchingFuncs.SetLengthNoConstruct( funcs.GetLength() );
+		for ( n = 0; n < funcs.GetLength(); ++n )
+		{
+			matchingFuncs[n].funcId = funcs[n];
+			matchingFuncs[n].cost = 0;
+		}
+
+		// Match positionally passed arguments
+		for( n = 0; n < args.GetLength(); ++n )
+		{
+			asCArray<asSOverloadCandidate> tempFuncs;
+			MatchArgument(funcs, tempFuncs, args[n], n, allowObjectConstruct);
+
+			// Intersect the found functions with the list of matching functions
+			for( asUINT f = 0; f < matchingFuncs.GetLength(); f++ )
+			{
+				asUINT c;
+				for( c = 0; c < tempFuncs.GetLength(); c++ )
+				{
+					if( matchingFuncs[f].funcId == tempFuncs[c].funcId )
+					{
+						// Sum argument cost
+						matchingFuncs[f].cost += tempFuncs[c].cost;
+						break;
+
+					} // End if match
+				}
+
+				// Was the function a match?
+				if( c == tempFuncs.GetLength() )
+				{
+					// No, remove it from the list
+					if( f == matchingFuncs.GetLength()-1 )
+						matchingFuncs.PopLast();
+					else
+						matchingFuncs[f] = matchingFuncs.PopLast();
+					f--;
+				}
+			}
+		}
+
+		// Match named arguments
+		if( namedArgs != 0 )
+		{
+			for( asUINT i = 0; i < matchingFuncs.GetLength(); ++i )
+			{
+				asCScriptFunction *desc = builder->GetFunctionDescription(matchingFuncs[i].funcId);
+				if( desc->funcType == asFUNC_VIRTUAL )
+					desc = objectType->virtualFunctionTable[desc->vfTableIdx];
+
+				// Match every named argument to an argument in the function
+				for( n = 0; n < namedArgs->GetLength(); ++n )
+					(*namedArgs)[n].match = asUINT(-1);
+
+				bool matchedAll = true;
+				for( asUINT j = 0; j < desc->parameterTypes.GetLength(); ++j )
+				{
+					asUINT match = asUINT(-1);
+					for( n = 0; n < namedArgs->GetLength(); ++n )
+					{
+						asSNamedArgument &namedArg = (*namedArgs)[n];
+						if( desc->parameterNames[j] == namedArg.name )
+						{
+							namedArg.match = j;
+							match = n;
+							break;
+						}
+					}
+
+					// Check that every position is filled somehow
+					if( j >= args.GetLength() )
+					{
+						if( match == asUINT(-1) && !desc->defaultArgs[j] )
+						{
+							// No argument was found for this, and there is no
+							// default, so it doesn't work.
+							matchedAll = false;
+							break;
+						}
+					}
+					else
+					{
+						if( match != asUINT(-1) )
+						{
+							// Can't name an argument that was already passed
+							matchedAll = false;
+							break;
+						}
+					}
+				}
+
+				// Check that every named argument was matched
+				if( matchedAll )
+				{
+					for( n = 0; n < namedArgs->GetLength(); ++n )
+					{
+						asSNamedArgument &named = (*namedArgs)[n];
+
+						if( named.match == asUINT(-1) )
+						{
+							matchedAll = false;
+							break;
+						}
+
+						// Add to the cost
+						cost = MatchArgument(desc, named.ctx, named.match, allowObjectConstruct);
+						if( cost == asUINT(-1) )
+						{
+							matchedAll = false;
+							break;
+						}
+
+						matchingFuncs[i].cost += cost;
+					}
+				}
+
+				if( !matchedAll )
+				{
+					// Remove the function, we didn't match all the arguments.
+					if( i == matchingFuncs.GetLength()-1 )
+						matchingFuncs.PopLast();
+					else
+						matchingFuncs[i] = matchingFuncs.PopLast();
+					i--;
+				}
+			}
+		}
+
+		// Select the overload(s) with the lowest overall cost
+		funcs.SetLength(0);
+		asUINT bestCost = asUINT(-1);
+		for( n = 0; n < matchingFuncs.GetLength(); ++n )
+		{
+			cost = matchingFuncs[n].cost;
+			if( cost < bestCost )
+			{
+				funcs.SetLength(0);
+				bestCost = cost;
+			}
+			if( cost == bestCost )
+				funcs.PushLast( matchingFuncs[n].funcId );
+		}
+
+		// Cost returned is equivalent to the best cost discovered
+		cost = bestCost;
+	}
+
+	if( !isConstMethod )
+		FilterConst(funcs);
+
+	if( funcs.GetLength() != 1 && !silent )
+	{
+		// Build a readable string of the function with parameter types
+		bool attemptsPassingClassMethod = false;
+		asCString str;
+		if( scope != "" && scope != "::" )
+			str = scope + "::";
+		str += name;
+		str += "(";
+		for( n = 0; n < args.GetLength(); n++ )
+		{
+			if( n > 0 )
+				str += ", ";
+			if( args[n]->methodName != "" )
+			{
+				if( args[n]->IsClassMethod() )
+				{
+					attemptsPassingClassMethod = true;
+					str += args[n]->type.dataType.GetTypeInfo()->GetName();
+					str += "::";
+				}
+				str += args[n]->methodName;
+			}
+			else if (args[n]->IsAnonymousInitList())
+			{
+				str += "{...}";
+			}
+			else
+				str += args[n]->type.dataType.Format(outFunc->nameSpace);
+		}
+		if( namedArgs != 0 )
+		{
+			for( n = 0; n < namedArgs->GetLength(); n++ )
+			{
+				if( n > 0 || args.GetLength() )
+					str += ", ";
+
+				asSNamedArgument &named = (*namedArgs)[n];
+				str += named.name;
+				str += ": ";
+				if( named.ctx->methodName != "" )
+					str += named.ctx->methodName;
+				else
+					str += named.ctx->type.dataType.Format(outFunc->nameSpace);
+			}
+		}
+		str += ")";
+
+		if( isConstMethod )
+			str += " const";
+
+		if( objectType && scope == "" )
+			str = objectType->name + "::" + str;
+
+		if( funcs.GetLength() == 0 )
+		{
+			str.Format(TXT_NO_MATCHING_SIGNATURES_TO_s, str.AddressOf());
+			Error(str, node);
+
+			if( attemptsPassingClassMethod )
+			{
+				// Class methods must use delegate objects
+				Error(TXT_CANNOT_PASS_CLASS_METHOD_AS_ARG, node);
+			}
+			else
+			{
+				// Print the list of candidates
+				if( origFuncs.GetLength() > 0 )
+				{
+					int r = 0, c = 0;
+					asASSERT( node );
+					if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+					builder->WriteInfo(script->name.AddressOf(), TXT_CANDIDATES_ARE, r, c, false);
+					PrintMatchingFuncs(origFuncs, node, objectType);
+				}
+			}
+		}
+		else
+		{
+			asASSERT( attemptsPassingClassMethod == false );
+
+			str.Format(TXT_MULTIPLE_MATCHING_SIGNATURES_TO_s, str.AddressOf());
+			Error(str, node);
+
+			PrintMatchingFuncs(funcs, node, objectType);
+		}
+	}
+
+	return cost;
+}
+
+bool asCCompiler::CompileAutoType(asCDataType &type, asCExprContext &compiledCtx, asCScriptNode *node, asCScriptNode *errNode)
+{
+	if( node && node->nodeType == snAssignment )
+	{
+		int r = CompileAssignment(node, &compiledCtx);
+		if( r >= 0 )
+		{
+			// Must not have unused ambiguous names
+			if (compiledCtx.IsClassMethod() || compiledCtx.IsGlobalFunc())
+			{
+				// TODO: Should mention that the problem is the ambiguous name
+				Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
+				return false;
+			}
+
+			// Must not have unused anonymous functions
+			if (compiledCtx.IsLambda())
+			{
+				// TODO: Should mention that the problem is the anonymous function
+				Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
+				return false;
+			}
+
+			// Must not be a null handle
+			if (compiledCtx.type.dataType.IsNullHandle())
+			{
+				// TODO: Should mention that the problem is the null pointer
+				Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
+				return false;
+			}
+
+			asCDataType newType = compiledCtx.type.dataType;
+
+			// Handle const qualifier on auto
+			if (type.IsReadOnly())
+				newType.MakeReadOnly(true);
+			else if (type.IsHandleToConst())
+				newType.MakeHandleToConst(true);
+			else if (newType.IsPrimitive())
+				newType.MakeReadOnly(false);
+
+			// Handle reference/value stuff
+			newType.MakeReference(false);
+			if (!newType.IsObjectHandle())
+			{
+				// We got a value object or an object reference.
+				// Turn the variable into a handle if specified
+				// as auto@, otherwise make it a 'value'.
+				if (type.IsHandleToAuto())
+				{
+					if (newType.MakeHandle(true) < 0)
+					{
+						Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, errNode);
+						return false;
+					}
+				}
+			}
+
+			// Implicit handle types should always be handles
+			if (newType.GetTypeInfo() &&
+				(newType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE))
+				newType.MakeHandle(true);
+				
+			// For types that support handles auto should prefer handle 
+			// as it is more efficient than making a copy
+			if( newType.SupportHandles() )
+				newType.MakeHandle(true);
+
+			type = newType;
+			return true;
+		}
+
+		return false;
+	}
+	else
+	{
+		Error(TXT_CANNOT_RESOLVE_AUTO, errNode);
+		type = asCDataType::CreatePrimitive(ttInt, false);
+		return false;
+	}
+}
+
+void asCCompiler::CompileDeclaration(asCScriptNode *decl, asCByteCode *bc)
+{
+	// Get the data type
+	asCDataType type = builder->CreateDataTypeFromNode(decl->firstChild, script, outFunc->nameSpace, false, outFunc->objectType);
+
+	// Declare all variables in this declaration
+	asCScriptNode *node = decl->firstChild->next;
+	while( node )
+	{
+		// If this is an auto type, we have to compile the assignment now to figure out the type
+		asCExprContext compiledCtx(engine);
+		bool preCompiled = false;
+		if (type.IsAuto())
+		{
+			preCompiled = CompileAutoType(type, compiledCtx, node->next, node);
+			if (!preCompiled)
+			{
+				// If it wasn't possible to determine the type from the expression then there
+				// is no need to continue with the initialization. The error was already reported
+				// in CompileAutoType.
+				return;
+			}
+		}
+
+		// Is the type allowed?
+		if( !type.CanBeInstantiated() )
+		{
+			asCString str;
+			if( type.IsAbstractClass() )
+				str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, type.Format(outFunc->nameSpace).AddressOf());
+			else if( type.IsInterface() )
+				str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, type.Format(outFunc->nameSpace).AddressOf());
+			else
+				// TODO: Improve error message to explain why
+				str.Format(TXT_DATA_TYPE_CANT_BE_s, type.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+
+			// Don't continue, as it will most likely lead to further
+			// errors that may just mislead the script writer
+			return;
+		}
+
+		// A shared object may not declare variables of non-shared types
+		if( outFunc->IsShared() )
+		{
+			asCTypeInfo *ot = type.GetTypeInfo();
+			if( ot && !ot->IsShared() )
+			{
+				asCString msg;
+				msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, ot->name.AddressOf());
+				Error(msg, decl);
+			}
+		}
+
+		// Get the name of the identifier
+		asCString name(&script->code[node->tokenPos], node->tokenLength);
+
+		// Verify that the name isn't used by a dynamic data type
+		// TODO: Must check against registered funcdefs too
+		if( engine->GetRegisteredType(name.AddressOf(), outFunc->nameSpace) != 0 )
+		{
+			asCString str;
+			str.Format(TXT_ILLEGAL_VARIABLE_NAME_s, name.AddressOf());
+			Error(str, node);
+		}
+
+		int offset = AllocateVariable(type, false);
+		if( variables->DeclareVariable(name.AddressOf(), type, offset, IsVariableOnHeap(offset)) < 0 )
+		{
+			// TODO: It might be an out-of-memory too
+
+			asCString str;
+			str.Format(TXT_s_ALREADY_DECLARED, name.AddressOf());
+			Error(str, node);
+
+			// Don't continue after this error, as it will just
+			// lead to more errors that are likely false
+			return;
+		}
+		else
+		{
+			// Warn if this variable hides another variable in a higher scope
+			if( variables->parent && variables->parent->GetVariable(name.AddressOf()) )
+			{
+				asCString str;
+				str.Format(TXT_s_HIDES_VAR_IN_OUTER_SCOPE, name.AddressOf());
+				Warning(str, node);
+			}
+		}
+
+		// Add marker that the variable has been declared
+		bc->VarDecl((int)outFunc->scriptData->variables.GetLength());
+		outFunc->AddVariable(name, type, offset, IsVariableOnHeap(offset));
+
+		// Keep the node for the variable decl
+		asCScriptNode *varNode = node;
+
+		node = node->next;
+
+		if( node == 0 || node->nodeType == snIdentifier )
+		{
+			// Initialize with default constructor
+			CompileInitialization(0, bc, type, varNode, offset, 0, 0);
+		}
+		else
+		{
+			// Compile the initialization expression
+			asQWORD constantValue = 0;
+			if( CompileInitialization(node, bc, type, varNode, offset, &constantValue, 0, preCompiled ? &compiledCtx : 0) )
+			{
+				// Check if the variable should be marked as pure constant
+				if( type.IsPrimitive() && type.IsReadOnly() )
+				{
+					sVariable *v = variables->GetVariable(name.AddressOf());
+					v->isPureConstant = true;
+					v->constantValue = constantValue;
+				}
+			}
+			node = node->next;
+		}
+	}
+
+	bc->OptimizeLocally(tempVariableOffsets);
+}
+
+// Returns true if the initialization expression is a constant expression
+bool asCCompiler::CompileInitialization(asCScriptNode *node, asCByteCode *bc, const asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem, asCExprContext *preCompiled)
+{
+	bool isConstantExpression = false;
+	if( node && node->nodeType == snArgList )
+	{
+		// Make sure it is an object and not a handle
+		if( type.GetTypeInfo() == 0 || type.IsObjectHandle() )
+		{
+			Error(TXT_MUST_BE_OBJECT, node);
+		}
+		else
+		{
+			// Compile the arguments
+			asCArray<asCExprContext *> args;
+			asCArray<asSNamedArgument> namedArgs;
+			if( CompileArgumentList(node, args, namedArgs) >= 0 )
+			{
+				// Find all constructors
+				asCArray<int> funcs;
+				asSTypeBehaviour *beh = type.GetBehaviour();
+				if( beh )
+				{
+					if( type.GetTypeInfo()->flags & asOBJ_REF )
+						funcs = beh->factories;
+					else
+						funcs = beh->constructors;
+				}
+
+				asCString str = type.Format(outFunc->nameSpace);
+				MatchFunctions(funcs, args, node, str.AddressOf(), &namedArgs);
+
+				if( funcs.GetLength() == 1 )
+				{
+					// Add the default values for arguments not explicitly supplied
+					int r = CompileDefaultAndNamedArgs(node, args, funcs[0], CastToObjectType(type.GetTypeInfo()), &namedArgs);
+
+					if( r == asSUCCESS )
+					{
+						asCExprContext ctx(engine);
+						if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_REF) )
+						{
+							if( isVarGlobOrMem == 0 )
+								MakeFunctionCall(&ctx, funcs[0], 0, args, node, true, offset);
+							else
+							{
+								MakeFunctionCall(&ctx, funcs[0], 0, args, node);
+								ctx.bc.Instr(asBC_RDSPtr);
+								if( isVarGlobOrMem == 1 )
+								{
+									// Store the returned handle in the global variable
+									ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+								}
+								else
+								{
+									// Store the returned handle in the member
+									ctx.bc.InstrSHORT(asBC_PSF, 0);
+									ctx.bc.Instr(asBC_RDSPtr);
+									ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+								}
+								if( type.IsFuncdef())
+									ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+								else
+									ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
+								ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
+							}
+
+							// Pop the reference left by the function call
+							ctx.bc.Instr(asBC_PopPtr);
+						}
+						else
+						{
+							bool onHeap = false;
+
+							if( isVarGlobOrMem == 0 )
+							{
+								// When the object is allocated on the heap, the address where the
+								// reference will be stored must be pushed on the stack before the
+								// arguments. This reference on the stack is safe, even if the script
+								// is suspended during the evaluation of the arguments.
+								onHeap = IsVariableOnHeap(offset);
+								if( onHeap )
+									ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
+							}
+							else if( isVarGlobOrMem == 1 )
+							{
+								// Push the address of the location where the variable will be stored on the stack.
+								// This reference is safe, because the addresses of the global variables cannot change.
+								onHeap = true;
+								ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+							}
+							else
+							{
+								// Value types may be allocated inline if they are POD types
+								onHeap = !(type.IsObject() || type.IsFuncdef()) || type.IsReference() || (type.GetTypeInfo()->flags & asOBJ_REF);
+								if( onHeap )
+								{
+									ctx.bc.InstrSHORT(asBC_PSF, 0);
+									ctx.bc.Instr(asBC_RDSPtr);
+									ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+								}
+							}
+
+							PrepareFunctionCall(funcs[0], &ctx.bc, args);
+							MoveArgsToStack(funcs[0], &ctx.bc, args, false);
+
+							// When the object is allocated on the stack, the address to the
+							// object is pushed on the stack after the arguments as the object pointer
+							if( !onHeap )
+							{
+								if( isVarGlobOrMem == 2 )
+								{
+									ctx.bc.InstrSHORT(asBC_PSF, 0);
+									ctx.bc.Instr(asBC_RDSPtr);
+									ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+								}
+								else
+								{
+									ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
+								}
+							}
+
+							PerformFunctionCall(funcs[0], &ctx, onHeap, &args, CastToObjectType(type.GetTypeInfo()));
+
+							if( isVarGlobOrMem == 0 )
+							{
+								// Mark the object in the local variable as initialized
+								ctx.bc.ObjInfo(offset, asOBJ_INIT);
+							}
+						}
+						ProcessDeferredParams(&ctx);
+						bc->AddCode(&ctx.bc);
+					}
+				}
+			}
+
+			// Cleanup
+			for( asUINT n = 0; n < args.GetLength(); n++ )
+				if( args[n] )
+				{
+					asDELETE(args[n], asCExprContext);
+				}
+			for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+				if( namedArgs[n].ctx )
+				{
+					asDELETE(namedArgs[n].ctx, asCExprContext);
+				}
+		}
+	}
+	else if( node && node->nodeType == snInitList )
+	{
+		asCExprValue ti;
+		ti.Set(type);
+		ti.isVariable = (isVarGlobOrMem == 0);
+		ti.isTemporary = false;
+		ti.stackOffset = offset;
+		ti.isLValue = true;
+
+		CompileInitList(&ti, node, bc, isVarGlobOrMem);
+	}
+	else if( node && node->nodeType == snAssignment )
+	{
+		// Compile the expression
+		asCExprContext newExpr(engine);
+		asCExprContext* expr;
+		int r = 0;
+
+		if( preCompiled )
+		{
+			expr = preCompiled;
+		}
+		else
+		{
+			expr = &newExpr;
+			r = CompileAssignment(node, expr);
+		}
+
+		// handles initialized with null doesn't need any bytecode
+		// since handles will be initialized to null by default anyway
+		if (type.IsObjectHandle() && expr->type.IsNullConstant() && expr->bc.IsSimpleExpression() )
+			return false;
+
+		// Look for appropriate constructor
+		asCArray<int> funcs;
+		asCArray<asCExprContext *> args;
+
+		// Handles must use the handle assignment operation.
+		// Types that are ASHANDLE must not allow the use of the constructor in this case,
+		// because it is ambiguous whether a value assignment or handle assignment will be done.
+		// Only do this if the expression is of the same type, as the expression is an assignment
+		// and an initialization constructor may not have the same meaning.
+		// TODO: Should allow initialization constructor if it is declared as allowed for implicit conversions.
+		if( !type.IsObjectHandle() && !expr->type.isExplicitHandle &&
+			!(type.GetTypeInfo() && (type.GetTypeInfo()->GetFlags() & asOBJ_ASHANDLE)) &&
+			type.IsEqualExceptRefAndConst(expr->type.dataType) )
+		{
+			asSTypeBehaviour *beh = type.GetBehaviour();
+			if( beh )
+			{
+				if( type.GetTypeInfo()->flags & asOBJ_REF )
+					funcs = beh->factories;
+				else
+					funcs = beh->constructors;
+			}
+
+			asCString str = type.Format(outFunc->nameSpace);
+			args.PushLast(expr);
+			MatchFunctions(funcs, args, node, str.AddressOf(), 0, 0, 0, true);
+
+			// Make sure the argument is of the right type (and not just compatible with the expression)
+			if (funcs.GetLength() == 1)
+			{
+				asCScriptFunction *f = engine->scriptFunctions[funcs[0]];
+				if (!f->parameterTypes[0].IsEqualExceptRefAndConst(expr->type.dataType))
+					funcs.PopLast();
+			}
+		}
+
+		if( funcs.GetLength() == 1 )
+		{
+			// Use the constructor
+
+			// TODO: clean-up: A large part of this is identical to the initalization with argList above
+
+			// Add the default values for arguments not explicitly supplied
+			r = CompileDefaultAndNamedArgs(node, args, funcs[0], CastToObjectType(type.GetTypeInfo()));
+
+			if( r == asSUCCESS )
+			{
+				asCExprContext ctx(engine);
+				if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_REF) )
+				{
+					if( isVarGlobOrMem == 0 )
+						MakeFunctionCall(&ctx, funcs[0], 0, args, node, true, offset);
+					else
+					{
+						MakeFunctionCall(&ctx, funcs[0], 0, args, node);
+						ctx.bc.Instr(asBC_RDSPtr);
+						if( isVarGlobOrMem == 1 )
+						{
+							// Store the returned handle in the global variable
+							ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+						}
+						else
+						{
+							// Store the returned handle in the member
+							ctx.bc.InstrSHORT(asBC_PSF, 0);
+							ctx.bc.Instr(asBC_RDSPtr);
+							ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+						}
+						if( type.IsFuncdef() )
+							ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+						else
+							ctx.bc.InstrPTR(asBC_REFCPY, type.GetTypeInfo());
+						ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
+					}
+
+					// Pop the reference left by the function call
+					ctx.bc.Instr(asBC_PopPtr);
+				}
+				else
+				{
+					bool onHeap = false;
+
+					if( isVarGlobOrMem == 0 )
+					{
+						// When the object is allocated on the heap, the address where the
+						// reference will be stored must be pushed on the stack before the
+						// arguments. This reference on the stack is safe, even if the script
+						// is suspended during the evaluation of the arguments.
+						onHeap = IsVariableOnHeap(offset);
+						if( onHeap )
+							ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
+					}
+					else if( isVarGlobOrMem == 1 )
+					{
+						// Push the address of the location where the variable will be stored on the stack.
+						// This reference is safe, because the addresses of the global variables cannot change.
+						onHeap = true;
+						ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+					}
+					else
+					{
+						// Value types may be allocated inline if they are POD types
+						onHeap = !(type.IsObject() || type.IsFuncdef()) || type.IsReference() || (type.GetTypeInfo()->flags & asOBJ_REF);
+						if( onHeap )
+						{
+							ctx.bc.InstrSHORT(asBC_PSF, 0);
+							ctx.bc.Instr(asBC_RDSPtr);
+							ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+						}
+					}
+
+					PrepareFunctionCall(funcs[0], &ctx.bc, args);
+					MoveArgsToStack(funcs[0], &ctx.bc, args, false);
+
+					// When the object is allocated on the stack, the address to the
+					// object is pushed on the stack after the arguments as the object pointer
+					if( !onHeap )
+					{
+						if( isVarGlobOrMem == 2 )
+						{
+							ctx.bc.InstrSHORT(asBC_PSF, 0);
+							ctx.bc.Instr(asBC_RDSPtr);
+							ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+						}
+						else
+						{
+							ctx.bc.InstrSHORT(asBC_PSF, (short)offset);
+						}
+					}
+
+					PerformFunctionCall(funcs[0], &ctx, onHeap, &args, CastToObjectType(type.GetTypeInfo()));
+
+					if( isVarGlobOrMem == 0 )
+					{
+						// Mark the object in the local variable as initialized
+						ctx.bc.ObjInfo(offset, asOBJ_INIT);
+					}
+				}
+				ProcessDeferredParams(&ctx);
+				bc->AddCode(&ctx.bc);
+			}
+		}
+		else
+		{
+			// Call the default constructor, then call the assignment operator
+			asCExprContext ctx(engine);
+
+			// Call the default constructor here
+			if( isVarGlobOrMem == 0 )
+				CallDefaultConstructor(type, offset, IsVariableOnHeap(offset), &ctx.bc, errNode);
+			else if( isVarGlobOrMem == 1 )
+				CallDefaultConstructor(type, offset, true, &ctx.bc, errNode, isVarGlobOrMem);
+			else if( isVarGlobOrMem == 2 )
+				CallDefaultConstructor(type, offset, type.IsReference(), &ctx.bc, errNode, isVarGlobOrMem);
+
+			if( r >= 0 )
+			{
+				if( type.IsPrimitive() )
+				{
+					if( type.IsReadOnly() && expr->type.isConstant )
+					{
+						ImplicitConversion(expr, type, node, asIC_IMPLICIT_CONV);
+
+						// Tell caller that the expression is a constant so it can mark the variable as pure constant
+						isConstantExpression = true;
+						*constantValue = expr->type.GetConstantData();
+					}
+
+					asCExprContext lctx(engine);
+					if( isVarGlobOrMem == 0 )
+						lctx.type.SetVariable(type, offset, false);
+					else if( isVarGlobOrMem == 1 )
+					{
+						lctx.type.Set(type);
+						lctx.type.dataType.MakeReference(true);
+
+						// If it is an enum value, i.e. offset is negative, that is being compiled then
+						// we skip this as the bytecode won't be used anyway, only the constant value
+						if( offset >= 0 )
+							lctx.bc.InstrPTR(asBC_LDG, engine->globalProperties[offset]->GetAddressOfValue());
+					}
+					else
+					{
+						asASSERT( isVarGlobOrMem == 2 );
+						lctx.type.Set(type);
+						lctx.type.dataType.MakeReference(true);
+
+						// Load the reference of the primitive member into the register
+						lctx.bc.InstrSHORT(asBC_PSF, 0);
+						lctx.bc.Instr(asBC_RDSPtr);
+						lctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+						lctx.bc.Instr(asBC_PopRPtr);
+					}
+					lctx.type.dataType.MakeReadOnly(false);
+					lctx.type.isLValue = true;
+
+					DoAssignment(&ctx, &lctx, expr, node, node, ttAssignment, node);
+					ProcessDeferredParams(&ctx);
+				}
+				else
+				{
+					// TODO: runtime optimize: Here we should look for the best matching constructor, instead of
+					//                         just the copy constructor. Only if no appropriate constructor is
+					//                         available should the assignment operator be used.
+
+					asCExprContext lexpr(engine);
+					lexpr.type.Set(type);
+					if( isVarGlobOrMem == 0 )
+						lexpr.type.dataType.MakeReference(IsVariableOnHeap(offset));
+					else if( isVarGlobOrMem == 1 )
+						lexpr.type.dataType.MakeReference(true);
+					else if( isVarGlobOrMem == 2 )
+					{
+						if( !lexpr.type.dataType.IsObject() || lexpr.type.dataType.IsFuncdef() || (lexpr.type.dataType.GetTypeInfo()->flags & asOBJ_REF) )
+							lexpr.type.dataType.MakeReference(true);
+					}
+
+					// Allow initialization of constant variables
+					lexpr.type.dataType.MakeReadOnly(false);
+
+					if( type.IsObjectHandle() )
+						lexpr.type.isExplicitHandle = true;
+
+					if( isVarGlobOrMem == 0 )
+					{
+						lexpr.bc.InstrSHORT(asBC_PSF, (short)offset);
+						lexpr.type.stackOffset = (short)offset;
+						lexpr.type.isVariable = true;
+					}
+					else if( isVarGlobOrMem == 1 )
+					{
+						lexpr.bc.InstrPTR(asBC_PGA, engine->globalProperties[offset]->GetAddressOfValue());
+					}
+					else
+					{
+						lexpr.bc.InstrSHORT(asBC_PSF, 0);
+						lexpr.bc.Instr(asBC_RDSPtr);
+						lexpr.bc.InstrSHORT_DW(asBC_ADDSi, (short)offset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+						lexpr.type.stackOffset = -1;
+					}
+					lexpr.type.isLValue = true;
+
+
+					// If left expression resolves into a registered type
+					// check if the assignment operator is overloaded, and check
+					// the type of the right hand expression. If none is found
+					// the default action is a direct copy if it is the same type
+					// and a simple assignment.
+					bool assigned = false;
+					// Even though an ASHANDLE can be an explicit handle the overloaded operator needs to be called
+					if( (lexpr.type.dataType.IsObject() || lexpr.type.dataType.IsFuncdef()) && (!lexpr.type.isExplicitHandle || (lexpr.type.dataType.GetTypeInfo() && (lexpr.type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE))) )
+					{
+						bool useHndlAssign = false;
+						if (lexpr.type.dataType.IsHandleToAsHandleType())
+						{
+							useHndlAssign = true;
+
+							// Make sure the right hand expression is treated as a handle
+							if (!expr->type.isExplicitHandle && !expr->type.IsNullConstant() )
+							{
+								// TODO: Clean-up: This code is from CompileExpressionPreOp. Create a reusable function
+								// Convert the expression to a handle
+								if (!expr->type.dataType.IsObjectHandle() && expr->type.dataType.GetTypeInfo() && !(expr->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE))
+								{
+									asCDataType to = expr->type.dataType;
+									to.MakeHandle(true);
+									to.MakeReference(true);
+									to.MakeHandleToConst(expr->type.dataType.IsReadOnly());
+									ImplicitConversion(expr, to, node, asIC_IMPLICIT_CONV, true, false);
+
+									asASSERT(expr->type.dataType.IsObjectHandle());
+								}
+								else if (expr->type.dataType.GetTypeInfo() && expr->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE)
+								{
+									// For the ASHANDLE type we'll simply set the expression as a handle
+									expr->type.dataType.MakeHandle(true);
+								}
+
+								if( !expr->type.dataType.IsObjectHandle() && !expr->type.dataType.SupportHandles())
+								{
+									Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, node);
+								}
+								expr->type.isExplicitHandle = true;
+							}
+						}
+						assigned = CompileOverloadedDualOperator(node, &lexpr, expr, false, &ctx, useHndlAssign);
+						if( assigned )
+						{
+							// Pop the resulting value
+							if( !ctx.type.dataType.IsPrimitive() )
+								ctx.bc.Instr(asBC_PopPtr);
+
+							// Release the argument
+							ProcessDeferredParams(&ctx);
+
+							// Release temporary variable that may be allocated by the overloaded operator
+							ReleaseTemporaryVariable(ctx.type, &ctx.bc);
+						}
+					}
+
+					if( !assigned )
+					{
+						PrepareForAssignment(&lexpr.type.dataType, expr, node, false);
+
+						// If the expression is constant and the variable also is constant
+						// then mark the variable as pure constant. This will allow the compiler
+						// to optimize expressions with this variable.
+						if( type.IsReadOnly() && expr->type.isConstant )
+						{
+							isConstantExpression = true;
+							*constantValue = expr->type.GetConstantQW();
+						}
+
+						// Add expression code to bytecode
+						MergeExprBytecode(&ctx, expr);
+
+						// Add byte code for storing value of expression in variable
+						ctx.bc.AddCode(&lexpr.bc);
+
+						PerformAssignment(&lexpr.type, &expr->type, &ctx.bc, errNode);
+
+						// Release temporary variables used by expression
+						ReleaseTemporaryVariable(expr->type, &ctx.bc);
+
+						ctx.bc.Instr(asBC_PopPtr);
+
+						ProcessDeferredParams(&ctx);
+					}
+				}
+			}
+
+			bc->AddCode(&ctx.bc);
+		}
+	}
+	else
+	{
+		asASSERT( node == 0 );
+
+		// Call the default constructor here, as no explicit initialization is done
+		if( isVarGlobOrMem == 0 )
+			CallDefaultConstructor(type, offset, IsVariableOnHeap(offset), bc, errNode);
+		else if( isVarGlobOrMem == 1 )
+			CallDefaultConstructor(type, offset, true, bc, errNode, isVarGlobOrMem);
+		else if( isVarGlobOrMem == 2 )
+		{
+			if( !(type.IsObject() || type.IsFuncdef()) || type.IsReference() || (type.GetTypeInfo()->flags & asOBJ_REF) )
+				CallDefaultConstructor(type, offset, true, bc, errNode, isVarGlobOrMem);
+			else
+				CallDefaultConstructor(type, offset, false, bc, errNode, isVarGlobOrMem);
+		}
+	}
+
+	return isConstantExpression;
+}
+
+void asCCompiler::CompileInitList(asCExprValue *var, asCScriptNode *node, asCByteCode *bc, int isVarGlobOrMem)
+{
+	// Check if the type supports initialization lists
+	if( var->dataType.GetTypeInfo() == 0 ||
+		var->dataType.GetBehaviour()->listFactory == 0 )
+	{
+		asCString str;
+		str.Format(TXT_INIT_LIST_CANNOT_BE_USED_WITH_s, var->dataType.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+		return;
+	}
+
+	// Construct the buffer with the elements
+
+	// Find the list factory
+	int funcId = var->dataType.GetBehaviour()->listFactory;
+	asASSERT( engine->scriptFunctions[funcId]->listPattern );
+
+	// TODO: runtime optimize: A future optimization should be to use the stack space directly
+	//                         for small buffers so that the dynamic allocation is skipped
+
+	// Create a new special object type for the lists. Both asCRestore and the
+	// context exception handler will need this to know how to parse the buffer.
+	asCObjectType *listPatternType = engine->GetListPatternType(funcId);
+
+	// Allocate a temporary variable to hold the pointer to the buffer
+	int bufferVar = AllocateVariable(asCDataType::CreateType(listPatternType, false), true);
+	asUINT bufferSize = 0;
+
+	// Evaluate all elements of the list
+	asCExprContext valueExpr(engine);
+	asCScriptNode *el = node;
+	asSListPatternNode *patternNode = engine->scriptFunctions[listPatternType->templateSubTypes[0].GetBehaviour()->listFactory]->listPattern;
+	int elementsInSubList = -1;
+	int r = CompileInitListElement(patternNode, el, engine->GetTypeIdFromDataType(asCDataType::CreateType(listPatternType, false)), short(bufferVar), bufferSize, valueExpr.bc, elementsInSubList);
+	asASSERT( r || patternNode == 0 );
+	if (r < 0)
+	{
+		asCString msg;
+		msg.Format(TXT_PREV_ERROR_WHILE_COMP_LIST_FOR_TYPE_s, var->dataType.Format(outFunc->nameSpace).AddressOf());
+		Error(msg, node);
+	}
+
+	// After all values have been evaluated we know the final size of the buffer
+	asCExprContext allocExpr(engine);
+	allocExpr.bc.InstrSHORT_DW(asBC_AllocMem, short(bufferVar), bufferSize);
+
+	// Merge the bytecode into the final sequence
+	bc->AddCode(&allocExpr.bc);
+	bc->AddCode(&valueExpr.bc);
+
+	// The object itself is the last to be created and will receive the pointer to the buffer
+	asCArray<asCExprContext *> args;
+	asCExprContext arg1(engine);
+	arg1.type.Set(asCDataType::CreatePrimitive(ttUInt, false));
+	arg1.type.dataType.MakeReference(true);
+	arg1.bc.InstrSHORT(asBC_PshVPtr, short(bufferVar));
+	args.PushLast(&arg1);
+
+	asCExprContext ctx(engine);
+
+	if( var->isVariable )
+	{
+		asASSERT( isVarGlobOrMem == 0 );
+
+		if( var->dataType.GetTypeInfo()->GetFlags() & asOBJ_REF )
+		{
+			ctx.bc.AddCode(&arg1.bc);
+
+			// Call factory and store the handle in the given variable
+			PerformFunctionCall(funcId, &ctx, false, &args, 0, true, var->stackOffset);
+			ctx.bc.Instr(asBC_PopPtr);
+		}
+		else
+		{
+			// Call the constructor
+
+			// When the object is allocated on the heap, the address where the
+			// reference will be stored must be pushed on the stack before the
+			// arguments. This reference on the stack is safe, even if the script
+			// is suspended during the evaluation of the arguments.
+			bool onHeap = IsVariableOnHeap(var->stackOffset);
+			if( onHeap )
+				ctx.bc.InstrSHORT(asBC_PSF, (short)var->stackOffset);
+
+			ctx.bc.AddCode(&arg1.bc);
+
+			// When the object is allocated on the stack, the address to the
+			// object is pushed on the stack after the arguments as the object pointer
+			if( !onHeap )
+				ctx.bc.InstrSHORT(asBC_PSF, (short)var->stackOffset);
+
+			PerformFunctionCall(funcId, &ctx, onHeap, &args, CastToObjectType(var->dataType.GetTypeInfo()));
+
+			// Mark the object in the local variable as initialized
+			ctx.bc.ObjInfo(var->stackOffset, asOBJ_INIT);
+		}
+	}
+	else
+	{
+		if( var->dataType.GetTypeInfo()->GetFlags() & asOBJ_REF )
+		{
+			ctx.bc.AddCode(&arg1.bc);
+
+			PerformFunctionCall(funcId, &ctx, false, &args);
+
+			ctx.bc.Instr(asBC_RDSPtr);
+			if( isVarGlobOrMem == 1 )
+			{
+				// Store the returned handle in the global variable
+				ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[var->stackOffset]->GetAddressOfValue());
+			}
+			else
+			{
+				// Store the returned handle in the member
+				ctx.bc.InstrSHORT(asBC_PSF, 0);
+				ctx.bc.Instr(asBC_RDSPtr);
+				ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)var->stackOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+			}
+			if (var->dataType.IsFuncdef())
+				ctx.bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+			else
+				ctx.bc.InstrPTR(asBC_REFCPY, var->dataType.GetTypeInfo());
+			ctx.bc.Instr(asBC_PopPtr);
+			ReleaseTemporaryVariable(ctx.type.stackOffset, &ctx.bc);
+		}
+		else
+		{
+			bool onHeap = true;
+
+			// Put the address where the object pointer will be placed on the stack
+			if( isVarGlobOrMem == 1 )
+				ctx.bc.InstrPTR(asBC_PGA, engine->globalProperties[var->stackOffset]->GetAddressOfValue());
+			else
+			{
+				onHeap = !(var->dataType.IsObject() || var->dataType.IsFuncdef()) || var->dataType.IsReference() || (var->dataType.GetTypeInfo()->flags & asOBJ_REF);
+				if( onHeap )
+				{
+					ctx.bc.InstrSHORT(asBC_PSF, 0);
+					ctx.bc.Instr(asBC_RDSPtr);
+					ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)var->stackOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+				}
+			}
+
+			// Add the address of the list buffer as the argument
+			ctx.bc.AddCode(&arg1.bc);
+
+			if( !onHeap )
+			{
+				ctx.bc.InstrSHORT(asBC_PSF, 0);
+				ctx.bc.Instr(asBC_RDSPtr);
+				ctx.bc.InstrSHORT_DW(asBC_ADDSi, (short)var->stackOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(outFunc->objectType, false)));
+			}
+
+			// Call the ALLOC instruction to allocate memory and invoke constructor
+			PerformFunctionCall(funcId, &ctx, onHeap, &args, CastToObjectType(var->dataType.GetTypeInfo()));
+		}
+	}
+
+	bc->AddCode(&ctx.bc);
+
+	// Free the temporary buffer. The FREE instruction will make sure to destroy
+	// each element in the buffer so there is no need to do this manually
+	bc->InstrW_PTR(asBC_FREE, short(bufferVar), listPatternType);
+	ReleaseTemporaryVariable(bufferVar, bc);
+}
+
+int asCCompiler::CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &bcInit, int &elementsInSubList)
+{
+	if( patternNode->type == asLPT_START )
+	{
+		if( valueNode == 0 || valueNode->nodeType != snInitList )
+		{
+			Error(TXT_EXPECTED_LIST, valueNode);
+			return -1;
+		}
+
+		// Compile all values until asLPT_END
+		patternNode = patternNode->next;
+		asCScriptNode *node = valueNode->firstChild;
+		while( patternNode->type != asLPT_END )
+		{
+			// Check for missing value here, else the error reporting will not have a source position to report the error for
+			if( node == 0 && patternNode->type == asLPT_TYPE )
+			{
+				Error(TXT_NOT_ENOUGH_VALUES_FOR_LIST, valueNode);
+				return -1;
+			}
+
+			asCScriptNode *errNode = node;
+			int r = CompileInitListElement(patternNode, node, bufferTypeId, bufferVar, bufferSize, bcInit, elementsInSubList);
+			if( r < 0 ) return r;
+
+			if( r == 1 )
+			{
+				asASSERT( engine->ep.disallowEmptyListElements );
+				// Empty elements in the middle are not allowed
+				Error(TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED, errNode);
+			}
+
+			asASSERT( patternNode );
+		}
+
+		if( node )
+		{
+			Error(TXT_TOO_MANY_VALUES_FOR_LIST, valueNode);
+			return -1;
+		}
+
+		// Move to the next node
+		valueNode = valueNode->next;
+		patternNode = patternNode->next;
+	}
+	else if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
+	{
+		// TODO: list: repeat_inner should make sure the list has the same size as the inner list, i.e. square area
+		// TODO: list: repeat_prev should make sure the list is the same size as the previous
+
+		asEListPatternNodeType repeatType = patternNode->type;
+		asCScriptNode *firstValue = valueNode;
+
+		// The following values will be repeated N times
+		patternNode = patternNode->next;
+
+		// Keep track of the patternNode so it can be reset
+		asSListPatternNode *nextNode = patternNode;
+
+		// Align the buffer size to 4 bytes in case previous value was smaller than 4 bytes
+		if( bufferSize & 0x3 )
+			bufferSize += 4 - (bufferSize & 0x3);
+
+		// The first dword will hold the number of elements in the list
+		asDWORD currSize = bufferSize;
+		bufferSize += 4;
+		asUINT countElements = 0;
+
+		int elementsInSubSubList = -1;
+
+		asCExprContext ctx(engine);
+		while( valueNode )
+		{
+			patternNode = nextNode;
+			asCScriptNode *errNode = valueNode;
+			int r = CompileInitListElement(patternNode, valueNode, bufferTypeId, bufferVar, bufferSize, ctx.bc, elementsInSubSubList);
+			if( r < 0 ) return r;
+
+			if( r == 0 )
+				countElements++;
+			else
+			{
+				asASSERT( r == 1 && engine->ep.disallowEmptyListElements );
+				if( valueNode )
+				{
+					// Empty elements in the middle are not allowed
+					Error(TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED, errNode);
+				}
+			}
+		}
+
+		if( countElements == 0 )
+		{
+			// Skip the sub pattern that was expected to be repeated, otherwise the caller will try to match these when we return
+			patternNode = nextNode;
+			if( patternNode->type == asLPT_TYPE )
+				patternNode = patternNode->next;
+			else if( patternNode->type == asLPT_START )
+			{
+				int subCount = 1;
+				do
+				{
+					patternNode = patternNode->next;
+					if( patternNode->type == asLPT_START )
+						subCount++;
+					else if( patternNode->type == asLPT_END )
+						subCount--;
+				} while( subCount > 0 );
+				patternNode = patternNode->next;
+			}
+		}
+
+		// For repeat_same each repeated sublist must have the same size to form a rectangular array
+		if( repeatType == asLPT_REPEAT_SAME && elementsInSubList != -1 && asUINT(elementsInSubList) != countElements )
+		{
+			if( countElements < asUINT(elementsInSubList) )
+				Error(TXT_NOT_ENOUGH_VALUES_FOR_LIST, firstValue);
+			else
+				Error(TXT_TOO_MANY_VALUES_FOR_LIST, firstValue);
+
+			return -1;
+		}
+		else
+		{
+			// Return to caller the amount of elments in this sublist
+			elementsInSubList = countElements;
+		}
+
+		// The first dword in the buffer will hold the number of elements
+		bcInit.InstrSHORT_DW_DW(asBC_SetListSize, bufferVar, currSize, countElements);
+
+		// Add the values
+		bcInit.AddCode(&ctx.bc);
+	}
+	else if( patternNode->type == asLPT_TYPE )
+	{
+		bool isEmpty = false;
+
+		// Determine the size of the element
+		asUINT size = 0;
+
+		asCDataType dt = reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType;
+
+		if( valueNode->nodeType == snAssignment || valueNode->nodeType == snInitList )
+		{
+			asCExprContext lctx(engine);
+			asCExprContext rctx(engine);
+
+			if( valueNode->nodeType == snAssignment )
+			{
+				// Compile the assignment expression
+				CompileAssignment(valueNode, &rctx);
+
+				if( dt.GetTokenType() == ttQuestion )
+				{
+					// Make sure the type is not ambiguous
+					DetermineSingleFunc(&rctx, valueNode);
+
+					// We now know the type
+					dt = rctx.type.dataType;
+					dt.MakeReadOnly(false);
+					dt.MakeReference(false);
+
+					// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
+					if( bufferSize & 0x3 )
+						bufferSize += 4 - (bufferSize & 0x3);
+
+					// When value assignment for reference types us disabled, make sure all ref types are passed in as handles
+					if (engine->ep.disallowValueAssignForRefType && dt.SupportHandles())
+						dt.MakeHandle(true);
+
+					// Place the type id in the buffer
+					bcInit.InstrSHORT_DW_DW(asBC_SetListType, bufferVar, bufferSize, engine->GetTypeIdFromDataType(dt));
+					bufferSize += 4;
+				}
+			}
+			else if( valueNode->nodeType == snInitList )
+			{
+				if( dt.GetTokenType() == ttQuestion )
+				{
+					// Can't use init lists with var type as it is not possible to determine what type should be allocated
+					asCString str;
+					str.Format(TXT_INIT_LIST_CANNOT_BE_USED_WITH_s, "?");
+					Error(str.AddressOf(), valueNode);
+					rctx.type.SetDummy();
+					dt = rctx.type.dataType;
+				}
+				else
+				{
+					// Allocate a temporary variable that will be initialized with the list
+					int offset = AllocateVariable(dt, true);
+
+					rctx.type.Set(dt);
+					rctx.type.isVariable = true;
+					rctx.type.isTemporary = true;
+					rctx.type.stackOffset = offset;
+
+					CompileInitList(&rctx.type, valueNode, &rctx.bc, 0);
+
+					// Put the object on the stack
+					rctx.bc.InstrSHORT(asBC_PSF, (short)rctx.type.stackOffset);
+
+					// It is a reference that we place on the stack
+					rctx.type.dataType.MakeReference(true);
+				}
+			}
+
+			// Determine size of the element
+			if( dt.IsPrimitive() || (!dt.IsNullHandle() && (dt.GetTypeInfo()->flags & asOBJ_VALUE)) )
+				size = dt.GetSizeInMemoryBytes();
+			else
+				size = AS_PTR_SIZE*4;
+
+			// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
+			if( size >= 4 && (bufferSize & 0x3) )
+				bufferSize += 4 - (bufferSize & 0x3);
+
+			// Compile the lvalue
+			lctx.bc.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
+			lctx.type.Set(dt);
+			lctx.type.isLValue = true;
+			if( dt.IsPrimitive() )
+			{
+				lctx.bc.Instr(asBC_PopRPtr);
+				lctx.type.dataType.MakeReference(true);
+			}
+			else if( dt.IsObjectHandle() ||
+					 dt.GetTypeInfo()->flags & asOBJ_REF )
+			{
+				lctx.type.isExplicitHandle = true;
+				lctx.type.dataType.MakeReference(true);
+			}
+			else
+			{
+				asASSERT( dt.GetTypeInfo()->flags & asOBJ_VALUE );
+
+				// Make sure the object has been constructed before the assignment
+				// TODO: runtime optimize: Use copy constructor instead of assignment to initialize the objects
+				asSTypeBehaviour *beh = dt.GetBehaviour();
+				int func = 0;
+				if( beh ) func = beh->construct;
+				if( func == 0 && (dt.GetTypeInfo()->flags & asOBJ_POD) == 0 )
+				{
+					asCString str;
+					str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetTypeInfo()->GetName());
+					Error(str, valueNode);
+				}
+				else if( func )
+				{
+					// Call the constructor as a normal function
+					bcInit.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
+
+					asCExprContext ctx(engine);
+					PerformFunctionCall(func, &ctx, false, 0, CastToObjectType(dt.GetTypeInfo()));
+					bcInit.AddCode(&ctx.bc);
+				}
+			}
+
+			if( lctx.type.dataType.IsNullHandle() )
+			{
+				// Don't add any code to assign a null handle. RefCpy doesn't work without a known type.
+				// The buffer is already initialized to zero in asBC_AllocMem anyway.
+				asASSERT( rctx.bc.GetLastInstr() == asBC_PshNull );
+				asASSERT( reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType.GetTokenType() == ttQuestion );
+			}
+			else
+			{
+				asCExprContext ctx(engine);
+				DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
+
+				if( !ctx.type.dataType.IsPrimitive() )
+					ctx.bc.Instr(asBC_PopPtr);
+
+				// Release temporary variables used by expression
+				ReleaseTemporaryVariable(ctx.type, &ctx.bc);
+
+				ProcessDeferredParams(&ctx);
+
+				bcInit.AddCode(&ctx.bc);
+			}
+		}
+		else
+		{
+			if( builder->engine->ep.disallowEmptyListElements )
+			{
+				// Empty elements are not allowed, except if it is the last in the list
+				isEmpty = true;
+			}
+			else
+			{
+				// There is no specific value so we need to fill it with a default value
+				if( dt.GetTokenType() == ttQuestion )
+				{
+					// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
+					if( bufferSize & 0x3 )
+						bufferSize += 4 - (bufferSize & 0x3);
+
+					// Place the type id for a null handle in the buffer
+					bcInit.InstrSHORT_DW_DW(asBC_SetListType, bufferVar, bufferSize, 0);
+					bufferSize += 4;
+
+					dt = asCDataType::CreateNullHandle();
+
+					// No need to initialize the handle as the buffer is already initialized with zeroes
+				}
+				else if( dt.GetTypeInfo() && dt.GetTypeInfo()->flags & asOBJ_VALUE )
+				{
+					// For value types with default constructor we need to call the constructor
+					asSTypeBehaviour *beh = dt.GetBehaviour();
+					int func = 0;
+					if( beh ) func = beh->construct;
+					if( func == 0 && (dt.GetTypeInfo()->flags & asOBJ_POD) == 0 )
+					{
+						asCString str;
+						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetTypeInfo()->GetName());
+						Error(str, valueNode);
+					}
+					else if( func )
+					{
+						// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
+						if( bufferSize & 0x3 )
+							bufferSize += 4 - (bufferSize & 0x3);
+
+						// Call the constructor as a normal function
+						bcInit.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
+
+						asCExprContext ctx(engine);
+						PerformFunctionCall(func, &ctx, false, 0, CastToObjectType(dt.GetTypeInfo()));
+						bcInit.AddCode(&ctx.bc);
+					}
+				}
+				else if( !dt.IsObjectHandle() && dt.GetTypeInfo() && dt.GetTypeInfo()->flags & asOBJ_REF )
+				{
+					// For ref types (not handles) we need to call the default factory
+					asSTypeBehaviour *beh = dt.GetBehaviour();
+					int func = 0;
+					if( beh ) func = beh->factory;
+					if( func == 0 )
+					{
+						asCString str;
+						str.Format(TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s, dt.GetTypeInfo()->GetName());
+						Error(str, valueNode);
+					}
+					else if( func )
+					{
+						asCExprContext rctx(engine);
+						PerformFunctionCall(func, &rctx, false, 0, CastToObjectType(dt.GetTypeInfo()));
+
+						// Values on the list must be aligned to 32bit boundaries, except if the type is smaller than 32bit.
+						if( bufferSize & 0x3 )
+							bufferSize += 4 - (bufferSize & 0x3);
+
+						asCExprContext lctx(engine);
+						lctx.bc.InstrSHORT_DW(asBC_PshListElmnt, bufferVar, bufferSize);
+						lctx.type.Set(dt);
+						lctx.type.isLValue = true;
+						lctx.type.isExplicitHandle = true;
+						lctx.type.dataType.MakeReference(true);
+
+						asCExprContext ctx(engine);
+						DoAssignment(&ctx, &lctx, &rctx, valueNode, valueNode, ttAssignment, valueNode);
+
+						if( !ctx.type.dataType.IsPrimitive() )
+							ctx.bc.Instr(asBC_PopPtr);
+
+						// Release temporary variables used by expression
+						ReleaseTemporaryVariable(ctx.type, &ctx.bc);
+
+						ProcessDeferredParams(&ctx);
+
+						bcInit.AddCode(&ctx.bc);
+					}
+				}
+			}
+		}
+
+		if( !isEmpty )
+		{
+			// Determine size of the element
+			if( dt.IsPrimitive() || (!dt.IsNullHandle() && (dt.GetTypeInfo()->flags & asOBJ_VALUE)) )
+				size = dt.GetSizeInMemoryBytes();
+			else
+				size = AS_PTR_SIZE*4;
+			asASSERT( size <= 4 || (size & 0x3) == 0 );
+
+			bufferSize += size;
+		}
+
+		// Move to the next element
+		patternNode = patternNode->next;
+		valueNode = valueNode->next;
+
+		if( isEmpty )
+		{
+			// The caller will determine if the empty element should be ignored or not
+			return 1;
+		}
+	}
+	else
+		asASSERT( false );
+
+	return 0;
+}
+
+void asCCompiler::CompileStatement(asCScriptNode *statement, bool *hasReturn, asCByteCode *bc)
+{
+	// Don't clear the hasReturn flag if this is an empty statement
+	// to avoid false errors of 'not all paths return'
+	if( statement->nodeType != snExpressionStatement || statement->firstChild )
+		*hasReturn = false;
+
+	if (statement->nodeType == snStatementBlock)
+		CompileStatementBlock(statement, true, hasReturn, bc);
+	else if (statement->nodeType == snIf)
+		CompileIfStatement(statement, hasReturn, bc);
+	else if (statement->nodeType == snFor)
+		CompileForStatement(statement, bc);
+	else if (statement->nodeType == snWhile)
+		CompileWhileStatement(statement, bc);
+	else if (statement->nodeType == snDoWhile)
+		CompileDoWhileStatement(statement, bc);
+	else if (statement->nodeType == snExpressionStatement)
+		CompileExpressionStatement(statement, bc);
+	else if (statement->nodeType == snBreak)
+		CompileBreakStatement(statement, bc);
+	else if (statement->nodeType == snContinue)
+		CompileContinueStatement(statement, bc);
+	else if (statement->nodeType == snSwitch)
+		CompileSwitchStatement(statement, hasReturn, bc);
+	else if (statement->nodeType == snTryCatch)
+		CompileTryCatch(statement, hasReturn, bc);
+	else if (statement->nodeType == snReturn)
+	{
+		CompileReturnStatement(statement, bc);
+		*hasReturn = true;
+	}
+	else
+		asASSERT(false);
+}
+
+void asCCompiler::CompileSwitchStatement(asCScriptNode *snode, bool *, asCByteCode *bc)
+{
+	// TODO: inheritance: Must guarantee that all options in the switch case call a constructor, or that none call it.
+
+	// Reserve label for break statements
+	int breakLabel = nextLabel++;
+	breakLabels.PushLast(breakLabel);
+
+	// Add a variable scope that will be used by CompileBreak
+	// to know where to stop deallocating variables
+	AddVariableScope(true, false);
+
+	//---------------------------
+	// Compile the switch expression
+	//-------------------------------
+
+	// Compile the switch expression
+	asCExprContext expr(engine);
+	CompileAssignment(snode->firstChild, &expr);
+
+	// Verify that the expression is a primitive type
+	if( !expr.type.dataType.IsIntegerType() && !expr.type.dataType.IsUnsignedType() )
+	{
+		Error(TXT_SWITCH_MUST_BE_INTEGRAL, snode->firstChild);
+		return;
+	}
+
+	if( ProcessPropertyGetAccessor(&expr, snode) < 0 )
+		return;
+
+	// TODO: Need to support 64bit integers
+	// Convert the expression to a 32bit variable
+	asCDataType to;
+	if( expr.type.dataType.IsIntegerType() )
+		to.SetTokenType(ttInt);
+	else if( expr.type.dataType.IsUnsignedType() )
+		to.SetTokenType(ttUInt);
+
+	// Make sure the value is in a variable
+	if( expr.type.dataType.IsReference() )
+		ConvertToVariable(&expr);
+
+	ImplicitConversion(&expr, to, snode->firstChild, asIC_IMPLICIT_CONV, true);
+
+	ConvertToVariable(&expr);
+	int offset = expr.type.stackOffset;
+
+	ProcessDeferredParams(&expr);
+
+	//-------------------------------
+	// Determine case values and labels
+	//--------------------------------
+
+	// Remember the first label so that we can later pass the
+	// correct label to each CompileCase()
+	int firstCaseLabel = nextLabel;
+	int defaultLabel = 0;
+
+	asCArray<int> caseValues;
+	asCArray<int> caseLabels;
+
+	// Compile all case comparisons and make them jump to the right label
+	asCScriptNode *cnode = snode->firstChild->next;
+	while( cnode )
+	{
+		// Each case should have a constant expression
+		if( cnode->firstChild && cnode->firstChild->nodeType == snExpression )
+		{
+			// Compile expression
+			asCExprContext c(engine);
+			CompileExpression(cnode->firstChild, &c);
+
+			// Verify that the result is a constant
+			if( !c.type.isConstant )
+				Error(TXT_SWITCH_CASE_MUST_BE_CONSTANT, cnode->firstChild);
+
+			// Verify that the result is an integral number
+			if (!c.type.dataType.IsIntegerType() && !c.type.dataType.IsUnsignedType())
+				Error(TXT_SWITCH_MUST_BE_INTEGRAL, cnode->firstChild);
+			else
+			{
+				ImplicitConversion(&c, to, cnode->firstChild, asIC_IMPLICIT_CONV, true);
+
+				// Has this case been declared already?
+				if (caseValues.IndexOf(c.type.GetConstantDW()) >= 0)
+					Error(TXT_DUPLICATE_SWITCH_CASE, cnode->firstChild);
+
+				// TODO: Optimize: We can insert the numbers sorted already
+
+				// Store constant for later use
+				caseValues.PushLast(c.type.GetConstantDW());
+
+				// Reserve label for this case
+				caseLabels.PushLast(nextLabel++);
+			}
+		}
+		else
+		{
+			// TODO: It shouldn't be necessary for the default case to be the last one.
+			// Is default the last case?
+			if( cnode->next )
+			{
+				Error(TXT_DEFAULT_MUST_BE_LAST, cnode);
+				break;
+			}
+
+			// Reserve label for this case
+			defaultLabel = nextLabel++;
+		}
+
+		cnode = cnode->next;
+	}
+
+	// check for empty switch
+	if (caseValues.GetLength() == 0)
+	{
+		Error(TXT_EMPTY_SWITCH, snode);
+		return;
+	}
+
+	if( defaultLabel == 0 )
+		defaultLabel = breakLabel;
+
+	//---------------------------------
+	// Output the optimized case comparisons
+	// with jumps to the case code
+	//------------------------------------
+
+	// Sort the case values by increasing value. Do the sort together with the labels
+	// A simple bubble sort is sufficient since we don't expect a huge number of values
+	for( asUINT fwd = 1; fwd < caseValues.GetLength(); fwd++ )
+	{
+		for( int bck = fwd - 1; bck >= 0; bck-- )
+		{
+			int bckp = bck + 1;
+			if( caseValues[bck] > caseValues[bckp] )
+			{
+				// Swap the values in both arrays
+				int swap = caseValues[bckp];
+				caseValues[bckp] = caseValues[bck];
+				caseValues[bck] = swap;
+
+				swap = caseLabels[bckp];
+				caseLabels[bckp] = caseLabels[bck];
+				caseLabels[bck] = swap;
+			}
+			else
+				break;
+		}
+	}
+
+	// Find ranges of consecutive numbers
+	asCArray<int> ranges;
+	ranges.PushLast(0);
+	asUINT n;
+	for( n = 1; n < caseValues.GetLength(); ++n )
+	{
+		// We can join numbers that are less than 5 numbers
+		// apart since the output code will still be smaller
+		if( caseValues[n] > caseValues[n-1] + 5 )
+			ranges.PushLast(n);
+	}
+
+	// If the value is larger than the largest case value, jump to default
+	int tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
+	expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[caseValues.GetLength()-1]);
+	expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
+	expr.bc.InstrDWORD(asBC_JP, defaultLabel);
+	ReleaseTemporaryVariable(tmpOffset, &expr.bc);
+
+	// TODO: runtime optimize: We could possibly optimize this even more by doing a
+	//                         binary search instead of a linear search through the ranges
+
+	// For each range
+	int range;
+	for( range = 0; range < (int)ranges.GetLength(); range++ )
+	{
+		// Find the largest value in this range
+		int maxRange = caseValues[ranges[range]];
+		int index = ranges[range];
+		for( ; (index < (int)caseValues.GetLength()) && (caseValues[index] <= maxRange + 5); index++ )
+			maxRange = caseValues[index];
+
+		// If there are only 2 numbers then it is better to compare them directly
+		if( index - ranges[range] > 2 )
+		{
+			// If the value is smaller than the smallest case value in the range, jump to default
+			tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
+			expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[ranges[range]]);
+			expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
+			expr.bc.InstrDWORD(asBC_JS, defaultLabel);
+			ReleaseTemporaryVariable(tmpOffset, &expr.bc);
+
+			int nextRangeLabel = nextLabel++;
+			// If this is the last range we don't have to make this test
+			if( range < (int)ranges.GetLength() - 1 )
+			{
+				// If the value is larger than the largest case value in the range, jump to the next range
+				tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
+				expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, maxRange);
+				expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
+				expr.bc.InstrDWORD(asBC_JP, nextRangeLabel);
+				ReleaseTemporaryVariable(tmpOffset, &expr.bc);
+			}
+
+			// Jump forward according to the value
+			tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
+			expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[ranges[range]]);
+			expr.bc.InstrW_W_W(asBC_SUBi, tmpOffset, offset, tmpOffset);
+			ReleaseTemporaryVariable(tmpOffset, &expr.bc);
+			expr.bc.JmpP(tmpOffset, maxRange - caseValues[ranges[range]]);
+
+			// Add the list of jumps to the correct labels (any holes, jump to default)
+			index = ranges[range];
+			for( int i = caseValues[index]; i <= maxRange; i++ )
+			{
+				if( caseValues[index] == i )
+					expr.bc.InstrINT(asBC_JMP, caseLabels[index++]);
+				else
+					expr.bc.InstrINT(asBC_JMP, defaultLabel);
+			}
+
+			expr.bc.Label((short)nextRangeLabel);
+		}
+		else
+		{
+			// Simply make a comparison with each value
+			for( int i = ranges[range]; i < index; ++i )
+			{
+				tmpOffset = AllocateVariable(asCDataType::CreatePrimitive(ttInt, false), true);
+				expr.bc.InstrSHORT_DW(asBC_SetV4, (short)tmpOffset, caseValues[i]);
+				expr.bc.InstrW_W(asBC_CMPi, offset, tmpOffset);
+				expr.bc.InstrDWORD(asBC_JZ, caseLabels[i]);
+				ReleaseTemporaryVariable(tmpOffset, &expr.bc);
+			}
+		}
+	}
+
+	// Catch any value that falls trough
+	expr.bc.InstrINT(asBC_JMP, defaultLabel);
+
+	// Release the temporary variable previously stored
+	ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+	// TODO: optimize: Should optimize each piece individually
+	expr.bc.OptimizeLocally(tempVariableOffsets);
+
+	//----------------------------------
+    // Output case implementations
+	//----------------------------------
+
+	// Compile case implementations, each one with the label before it
+	cnode = snode->firstChild->next;
+	while( cnode )
+	{
+		// Each case should have a constant expression
+		if( cnode->firstChild && cnode->firstChild->nodeType == snExpression )
+		{
+			expr.bc.Label((short)firstCaseLabel++);
+
+			CompileCase(cnode->firstChild->next, &expr.bc);
+		}
+		else
+		{
+			expr.bc.Label((short)defaultLabel);
+
+			// Is default the last case?
+			if( cnode->next )
+			{
+				// We've already reported this error
+				break;
+			}
+
+			CompileCase(cnode->firstChild, &expr.bc);
+		}
+
+		cnode = cnode->next;
+	}
+
+	//--------------------------------
+
+	bc->AddCode(&expr.bc);
+
+	// Add break label
+	bc->Label((short)breakLabel);
+
+	breakLabels.PopLast();
+	RemoveVariableScope();
+}
+
+void asCCompiler::CompileCase(asCScriptNode *node, asCByteCode *bc)
+{
+	bool isFinished = false;
+	bool hasReturn = false;
+	bool hasUnreachableCode = false;
+	while( node )
+	{
+		if( !hasUnreachableCode && (hasReturn || isFinished) )
+		{
+			hasUnreachableCode = true;
+			Warning(TXT_UNREACHABLE_CODE, node);
+			break;
+		}
+
+		if( node->nodeType == snBreak || node->nodeType == snContinue )
+			isFinished = true;
+
+		asCByteCode statement(engine);
+		if( node->nodeType == snDeclaration )
+		{
+			Error(TXT_DECL_IN_SWITCH, node);
+
+			// Compile it anyway to avoid further compiler errors
+			CompileDeclaration(node, &statement);
+		}
+		else
+			CompileStatement(node, &hasReturn, &statement);
+
+		LineInstr(bc, node->tokenPos);
+		bc->AddCode(&statement);
+
+		if( !hasCompileErrors )
+			asASSERT( tempVariables.GetLength() == 0 );
+
+		node = node->next;
+	}
+}
+
+void asCCompiler::CompileTryCatch(asCScriptNode *node, bool *hasReturn, asCByteCode *bc)
+{
+	// We will use one label before and another after the catch statement
+	int beforeCatchLabel = nextLabel++;
+	int afterCatchLabel = nextLabel++;
+
+	// Compile the try block
+	bool hasReturnTry;
+	asCByteCode tryBC(engine);
+	CompileStatement(node->firstChild, &hasReturnTry, &tryBC);
+
+	// Add marker to unwind exception until here, then jump to catch block
+	bc->TryBlock((short)beforeCatchLabel);
+
+	// Add the byte code
+	LineInstr(bc, node->firstChild->tokenPos);
+	bc->AddCode(&tryBC);
+
+	// Add jump to after catch
+	bc->InstrINT(asBC_JMP, afterCatchLabel);
+
+	// Compile the catch block
+	bool hasReturnCatch;
+	asCByteCode catchBC(engine);
+	CompileStatement(node->firstChild->next, &hasReturnCatch, &catchBC);
+
+	// Add marker to tell bytecode optimizer that this is a catch
+	// block so the code is not removed as unreachable code
+	bc->Label((short)beforeCatchLabel);
+
+	// Add the byte code
+	LineInstr(bc, node->firstChild->next->tokenPos);
+	bc->AddCode(&catchBC);
+
+	// Add the label after catch
+	bc->Label((short)afterCatchLabel);
+
+	// The try/catch statement only has return (i.e. no code after
+	// the try/catch block will be executed) if both blocks have
+	*hasReturn = hasReturnTry && hasReturnCatch;
+}
+
+void asCCompiler::CompileIfStatement(asCScriptNode *inode, bool *hasReturn, asCByteCode *bc)
+{
+	// We will use one label for the if statement
+	// and possibly another for the else statement
+	int afterLabel = nextLabel++;
+
+	// Compile the expression
+	asCExprContext expr(engine);
+	int r = CompileAssignment(inode->firstChild, &expr);
+	if( r == 0 )
+	{
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), inode, asIC_IMPLICIT_CONV);
+
+		if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+			Error(TXT_EXPR_MUST_BE_BOOL, inode->firstChild);
+		else
+		{
+			if( !expr.type.isConstant )
+			{
+				if( ProcessPropertyGetAccessor(&expr, inode) < 0 )
+					return;
+				ConvertToVariable(&expr);
+				ProcessDeferredParams(&expr);
+
+				// Add a test
+				expr.bc.InstrSHORT(asBC_CpyVtoR4, (short)expr.type.stackOffset);
+				expr.bc.Instr(asBC_ClrHi);
+				expr.bc.InstrDWORD(asBC_JZ, afterLabel);
+				ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+				expr.bc.OptimizeLocally(tempVariableOffsets);
+				bc->AddCode(&expr.bc);
+			}
+#if AS_SIZEOF_BOOL == 1
+			else if( expr.type.GetConstantB() == 0 )
+#else
+			else if (expr.type.GetConstantDW() == 0)
+#endif
+			{
+				// Jump to the else case
+				bc->InstrINT(asBC_JMP, afterLabel);
+
+				// TODO: Should we warn that the expression will always go to the else?
+			}
+		}
+	}
+
+	// Compile the if statement
+	bool origIsConstructorCalled = m_isConstructorCalled;
+
+	bool hasReturn1;
+	asCByteCode ifBC(engine);
+	CompileStatement(inode->firstChild->next, &hasReturn1, &ifBC);
+
+	// Add the byte code
+	LineInstr(bc, inode->firstChild->next->tokenPos);
+	bc->AddCode(&ifBC);
+
+	if( inode->firstChild->next->nodeType == snExpressionStatement && inode->firstChild->next->firstChild == 0 )
+	{
+		// Don't allow  if( expr );
+		Error(TXT_IF_WITH_EMPTY_STATEMENT, inode->firstChild->next);
+	}
+
+	// If one of the statements call the constructor, the other must as well
+	// otherwise it is possible the constructor is never called
+	bool constructorCall1 = false;
+	bool constructorCall2 = false;
+	if( !origIsConstructorCalled && m_isConstructorCalled )
+		constructorCall1 = true;
+
+	// Do we have an else statement?
+	if( inode->firstChild->next != inode->lastChild )
+	{
+		// Reset the constructor called flag so the else statement can call the constructor too
+		m_isConstructorCalled = origIsConstructorCalled;
+
+		int afterElse = 0;
+		if( !hasReturn1 )
+		{
+			afterElse = nextLabel++;
+
+			// Add jump to after the else statement
+			bc->InstrINT(asBC_JMP, afterElse);
+		}
+
+		// Add label for the else statement
+		bc->Label((short)afterLabel);
+
+		bool hasReturn2;
+		asCByteCode elseBC(engine);
+		CompileStatement(inode->lastChild, &hasReturn2, &elseBC);
+
+		// Add byte code for the else statement
+		LineInstr(bc, inode->lastChild->tokenPos);
+		bc->AddCode(&elseBC);
+
+		if( inode->lastChild->nodeType == snExpressionStatement && inode->lastChild->firstChild == 0 )
+		{
+			// Don't allow  if( expr ) {} else;
+			Error(TXT_ELSE_WITH_EMPTY_STATEMENT, inode->lastChild);
+		}
+
+		if( !hasReturn1 )
+		{
+			// Add label for the end of else statement
+			bc->Label((short)afterElse);
+		}
+
+		// The if statement only has return if both alternatives have
+		*hasReturn = hasReturn1 && hasReturn2;
+
+		if( !origIsConstructorCalled && m_isConstructorCalled )
+			constructorCall2 = true;
+	}
+	else
+	{
+		// Add label for the end of if statement
+		bc->Label((short)afterLabel);
+		*hasReturn = false;
+	}
+
+	// Make sure both or neither conditions call a constructor
+	if( (constructorCall1 && !constructorCall2) ||
+		(constructorCall2 && !constructorCall1) )
+	{
+		Error(TXT_BOTH_CONDITIONS_MUST_CALL_CONSTRUCTOR, inode);
+	}
+
+	m_isConstructorCalled = origIsConstructorCalled || constructorCall1 || constructorCall2;
+}
+
+void asCCompiler::CompileForStatement(asCScriptNode *fnode, asCByteCode *bc)
+{
+	// Add a variable scope that will be used by CompileBreak/Continue to know where to stop deallocating variables
+	AddVariableScope(true, true);
+
+	// We will use three labels for the for loop
+	int conditionLabel = nextLabel++;
+	int afterLabel = nextLabel++;
+	int continueLabel = nextLabel++;
+	int insideLabel = nextLabel++;
+
+	continueLabels.PushLast(continueLabel);
+	breakLabels.PushLast(afterLabel);
+
+	//---------------------------------------
+	// Compile the initialization statement
+	asCByteCode initBC(engine);
+	LineInstr(&initBC, fnode->firstChild->tokenPos);
+	if( fnode->firstChild->nodeType == snDeclaration )
+		CompileDeclaration(fnode->firstChild, &initBC);
+	else
+		CompileExpressionStatement(fnode->firstChild, &initBC);
+
+	//-----------------------------------
+	// Compile the condition statement
+	asCExprContext expr(engine);
+	asCScriptNode *second = fnode->firstChild->next;
+	if( second->firstChild )
+	{
+		int r = CompileAssignment(second->firstChild, &expr);
+		if( r >= 0 )
+		{
+			// Allow value types to be converted to bool using 'bool opImplConv()'
+			if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+				ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), second->firstChild, asIC_IMPLICIT_CONV);
+
+			if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+				Error(TXT_EXPR_MUST_BE_BOOL, second);
+			else
+			{
+				if( ProcessPropertyGetAccessor(&expr, second) < 0 )
+					return;
+				ConvertToVariable(&expr);
+				ProcessDeferredParams(&expr);
+
+				// If expression is false exit the loop
+				expr.bc.InstrSHORT(asBC_CpyVtoR4, (short)expr.type.stackOffset);
+				expr.bc.Instr(asBC_ClrHi);
+				expr.bc.InstrDWORD(asBC_JNZ, insideLabel);
+				ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+				expr.bc.OptimizeLocally(tempVariableOffsets);
+
+				// Prepend the line instruction for the condition
+				asCByteCode tmp(engine);
+				LineInstr(&tmp, second->firstChild->tokenPos);
+				tmp.AddCode(&expr.bc);
+				expr.bc.AddCode(&tmp);
+			}
+		}
+	}
+
+	//---------------------------
+	// Compile the increment statement(s)
+	asCByteCode nextBC(engine);
+	asCScriptNode *cnode = second->next;
+	while( cnode && cnode->nodeType == snExpressionStatement && cnode != fnode->lastChild )
+	{
+		LineInstr(&nextBC, cnode->tokenPos);
+		CompileExpressionStatement(cnode, &nextBC);
+		cnode = cnode->next;
+	}
+
+	//------------------------------
+	// Compile loop statement
+	bool hasReturn;
+	asCByteCode forBC(engine);
+	CompileStatement(fnode->lastChild, &hasReturn, &forBC);
+
+	//-------------------------------
+	// Join the code pieces
+	bc->AddCode(&initBC);
+	bc->InstrDWORD(asBC_JMP, conditionLabel);
+
+	bc->Label((short)insideLabel);
+
+	// Add a suspend bytecode inside the loop to guarantee
+	// that the application can suspend the execution
+	bc->Instr(asBC_SUSPEND);
+	bc->InstrPTR(asBC_JitEntry, 0);
+
+	LineInstr(bc, fnode->lastChild->tokenPos);
+	bc->AddCode(&forBC);
+
+	bc->Label((short)continueLabel);
+	bc->AddCode(&nextBC);
+
+	bc->Label((short)conditionLabel);
+	if( expr.bc.GetLastInstr() == -1 )
+		// There is no condition, so we just always jump
+		bc->InstrDWORD(asBC_JMP, insideLabel);
+	else
+		bc->AddCode(&expr.bc);
+
+	bc->Label((short)afterLabel);
+
+	continueLabels.PopLast();
+	breakLabels.PopLast();
+
+	// Deallocate variables in this block, in reverse order
+	for( int n = (int)variables->variables.GetLength() - 1; n >= 0; n-- )
+	{
+		sVariable *v = variables->variables[n];
+
+		// Call variable destructors here, for variables not yet destroyed
+		CallDestructor(v->type, v->stackOffset, v->onHeap, bc);
+
+		// Don't deallocate function parameters
+		if( v->stackOffset > 0 )
+			DeallocateVariable(v->stackOffset);
+	}
+
+	RemoveVariableScope();
+}
+
+void asCCompiler::CompileWhileStatement(asCScriptNode *wnode, asCByteCode *bc)
+{
+	// Add a variable scope that will be used by CompileBreak/Continue to know where to stop deallocating variables
+	AddVariableScope(true, true);
+
+	// We will use two labels for the while loop
+	int beforeLabel = nextLabel++;
+	int afterLabel = nextLabel++;
+
+	continueLabels.PushLast(beforeLabel);
+	breakLabels.PushLast(afterLabel);
+
+	// Add label before the expression
+	bc->Label((short)beforeLabel);
+
+	// Compile expression
+	asCExprContext expr(engine);
+	int r = CompileAssignment(wnode->firstChild, &expr);
+	if( r == 0 )
+	{
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), wnode->firstChild, asIC_IMPLICIT_CONV);
+
+		if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+			Error(TXT_EXPR_MUST_BE_BOOL, wnode->firstChild);
+		else
+		{
+			if( ProcessPropertyGetAccessor(&expr, wnode) < 0 )
+				return;
+			ConvertToVariable(&expr);
+			ProcessDeferredParams(&expr);
+
+			// Jump to end of statement if expression is false
+			expr.bc.InstrSHORT(asBC_CpyVtoR4, (short)expr.type.stackOffset);
+			expr.bc.Instr(asBC_ClrHi);
+			expr.bc.InstrDWORD(asBC_JZ, afterLabel);
+			ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+			expr.bc.OptimizeLocally(tempVariableOffsets);
+			bc->AddCode(&expr.bc);
+		}
+	}
+
+	// Add a suspend bytecode inside the loop to guarantee
+	// that the application can suspend the execution
+	bc->Instr(asBC_SUSPEND);
+	bc->InstrPTR(asBC_JitEntry, 0);
+
+	// Compile statement
+	bool hasReturn;
+	asCByteCode whileBC(engine);
+	CompileStatement(wnode->lastChild, &hasReturn, &whileBC);
+
+	// Add byte code for the statement
+	LineInstr(bc, wnode->lastChild->tokenPos);
+	bc->AddCode(&whileBC);
+
+	// Jump to the expression
+	bc->InstrINT(asBC_JMP, beforeLabel);
+
+	// Add label after the statement
+	bc->Label((short)afterLabel);
+
+	continueLabels.PopLast();
+	breakLabels.PopLast();
+
+	RemoveVariableScope();
+}
+
+void asCCompiler::CompileDoWhileStatement(asCScriptNode *wnode, asCByteCode *bc)
+{
+	// Add a variable scope that will be used by CompileBreak/Continue to know where to stop deallocating variables
+	AddVariableScope(true, true);
+
+	// We will use two labels for the while loop
+	int beforeLabel = nextLabel++;
+	int beforeTest = nextLabel++;
+	int afterLabel = nextLabel++;
+
+	continueLabels.PushLast(beforeTest);
+	breakLabels.PushLast(afterLabel);
+
+	// Add label before the statement
+	bc->Label((short)beforeLabel);
+
+	// Compile statement
+	bool hasReturn;
+	asCByteCode whileBC(engine);
+	CompileStatement(wnode->firstChild, &hasReturn, &whileBC);
+
+	// Add byte code for the statement
+	LineInstr(bc, wnode->firstChild->tokenPos);
+	bc->AddCode(&whileBC);
+
+	// Add label before the expression
+	bc->Label((short)beforeTest);
+
+	// Add a suspend bytecode inside the loop to guarantee
+	// that the application can suspend the execution
+	bc->Instr(asBC_SUSPEND);
+	bc->InstrPTR(asBC_JitEntry, 0);
+
+	// Add a line instruction
+	LineInstr(bc, wnode->lastChild->tokenPos);
+
+	// Compile expression
+	asCExprContext expr(engine);
+	CompileAssignment(wnode->lastChild, &expr);
+
+	// Allow value types to be converted to bool using 'bool opImplConv()'
+	if( expr.type.dataType.GetTypeInfo() && (expr.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+		ImplicitConversion(&expr, asCDataType::CreatePrimitive(ttBool, false), wnode->lastChild, asIC_IMPLICIT_CONV);
+
+	if( !expr.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+		Error(TXT_EXPR_MUST_BE_BOOL, wnode->firstChild);
+	else
+	{
+		if( ProcessPropertyGetAccessor(&expr, wnode) < 0 )
+			return;
+		ConvertToVariable(&expr);
+		ProcessDeferredParams(&expr);
+		
+		// Jump to next iteration if expression is true
+		expr.bc.InstrSHORT(asBC_CpyVtoR4, (short)expr.type.stackOffset);
+		expr.bc.Instr(asBC_ClrHi);
+		expr.bc.InstrDWORD(asBC_JNZ, beforeLabel);
+		ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+		expr.bc.OptimizeLocally(tempVariableOffsets);
+		bc->AddCode(&expr.bc);
+	}
+
+	// Add label after the statement
+	bc->Label((short)afterLabel);
+
+	continueLabels.PopLast();
+	breakLabels.PopLast();
+
+	RemoveVariableScope();
+}
+
+void asCCompiler::CompileBreakStatement(asCScriptNode *node, asCByteCode *bc)
+{
+	if( breakLabels.GetLength() == 0 )
+	{
+		Error(TXT_INVALID_BREAK, node);
+		return;
+	}
+
+	// Add destructor calls for all variables that will go out of scope
+	// Put this clean up in a block to allow exception handler to understand them
+	bc->Block(true);
+	asCVariableScope *vs = variables;
+	while( !vs->isBreakScope )
+	{
+		for( int n = (int)vs->variables.GetLength() - 1; n >= 0; n-- )
+			CallDestructor(vs->variables[n]->type, vs->variables[n]->stackOffset, vs->variables[n]->onHeap, bc);
+
+		vs = vs->parent;
+	}
+	bc->Block(false);
+
+	bc->InstrINT(asBC_JMP, breakLabels[breakLabels.GetLength()-1]);
+}
+
+void asCCompiler::CompileContinueStatement(asCScriptNode *node, asCByteCode *bc)
+{
+	if( continueLabels.GetLength() == 0 )
+	{
+		Error(TXT_INVALID_CONTINUE, node);
+		return;
+	}
+
+	// Add destructor calls for all variables that will go out of scope
+	// Put this clean up in a block to allow exception handler to understand them
+	bc->Block(true);
+	asCVariableScope *vs = variables;
+	while( !vs->isContinueScope )
+	{
+		for( int n = (int)vs->variables.GetLength() - 1; n >= 0; n-- )
+			CallDestructor(vs->variables[n]->type, vs->variables[n]->stackOffset, vs->variables[n]->onHeap, bc);
+
+		vs = vs->parent;
+	}
+	bc->Block(false);
+
+	bc->InstrINT(asBC_JMP, continueLabels[continueLabels.GetLength()-1]);
+}
+
+void asCCompiler::CompileExpressionStatement(asCScriptNode *enode, asCByteCode *bc)
+{
+	if( enode->firstChild )
+	{
+		// Compile the expression
+		asCExprContext expr(engine);
+		CompileAssignment(enode->firstChild, &expr);
+
+		// Must not have unused ambiguous names
+		if( expr.IsClassMethod() || expr.IsGlobalFunc() )
+			Error(TXT_INVALID_EXPRESSION_AMBIGUOUS_NAME, enode);
+
+		// Must not have unused anonymous functions
+		if( expr.IsLambda() )
+			Error(TXT_INVALID_EXPRESSION_LAMBDA, enode);
+
+		// If we get here and there is still an unprocessed property
+		// accessor, then process it as a get access. Don't call if there is
+		// already a compile error, or we might report an error that is not valid
+		if( !hasCompileErrors )
+			if( ProcessPropertyGetAccessor(&expr, enode) < 0 )
+				return;
+
+		// Pop the value from the stack
+		if( !expr.type.dataType.IsPrimitive() )
+			expr.bc.Instr(asBC_PopPtr);
+
+		// Release temporary variables used by expression
+		ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+		ProcessDeferredParams(&expr);
+
+		expr.bc.OptimizeLocally(tempVariableOffsets);
+		bc->AddCode(&expr.bc);
+	}
+}
+
+void asCCompiler::PrepareTemporaryVariable(asCScriptNode *node, asCExprContext *ctx, bool forceOnHeap)
+{
+	// The input can be either an object or funcdef, either as handle or reference
+	asASSERT(ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef());
+
+	// If the object already is stored in temporary variable then nothing needs to be done
+	// Note, a type can be temporary without being a variable, in which case it is holding off
+	// on releasing a previously used object.
+	if( ctx->type.isTemporary && ctx->type.isVariable &&
+		!(forceOnHeap && !IsVariableOnHeap(ctx->type.stackOffset)) )
+	{
+		// If the temporary object is currently not a reference
+		// the expression needs to be reevaluated to a reference
+		if( !ctx->type.dataType.IsReference() )
+		{
+			ctx->bc.Instr(asBC_PopPtr);
+			ctx->bc.InstrSHORT(asBC_PSF, (short)ctx->type.stackOffset);
+			ctx->type.dataType.MakeReference(IsVariableOnHeap(ctx->type.stackOffset));
+		}
+
+		return;
+	}
+
+	// Allocate temporary variable
+	asCDataType dt = ctx->type.dataType;
+	dt.MakeReference(false);
+	dt.MakeReadOnly(false);
+
+	int offset = AllocateVariable(dt, true, forceOnHeap);
+
+	// Objects stored on the stack are not considered references
+	dt.MakeReference(IsVariableOnHeap(offset));
+
+	asCExprValue lvalue;
+	lvalue.Set(dt);
+	lvalue.isExplicitHandle = ctx->type.isExplicitHandle;
+	bool isExplicitHandle = ctx->type.isExplicitHandle;
+
+	bool prevIsTemp = ctx->type.isTemporary;
+	int prevStackOffset = ctx->type.stackOffset;
+
+	CompileInitAsCopy(dt, offset, &ctx->bc, ctx, node, false);
+
+	// Release the previous temporary variable if it hasn't already been released
+	if( prevIsTemp && tempVariables.Exists(prevStackOffset) )
+		ReleaseTemporaryVariable(prevStackOffset, &ctx->bc);
+
+	// Push the reference to the temporary variable on the stack
+	ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+
+	ctx->type.Set(dt);
+	ctx->type.isTemporary = true;
+	ctx->type.stackOffset = (short)offset;
+	ctx->type.isVariable = true;
+	ctx->type.isExplicitHandle = isExplicitHandle;
+	ctx->type.dataType.MakeReference(IsVariableOnHeap(offset));
+}
+
+void asCCompiler::CompileReturnStatement(asCScriptNode *rnode, asCByteCode *bc)
+{
+	// Get return type and location
+	sVariable *v = variables->GetVariable("return");
+
+	// Basic validations
+	if( v->type.GetSizeOnStackDWords() > 0 && !rnode->firstChild )
+	{
+		Error(TXT_MUST_RETURN_VALUE, rnode);
+		return;
+	}
+	else if( v->type.GetSizeOnStackDWords() == 0 && rnode->firstChild )
+	{
+		Error(TXT_CANT_RETURN_VALUE, rnode);
+		return;
+	}
+
+	// Compile the expression
+	if( rnode->firstChild )
+	{
+		// Compile the expression
+		asCExprContext expr(engine);
+		int r = CompileAssignment(rnode->firstChild, &expr);
+		if( r < 0 ) return;
+
+		if( v->type.IsReference() )
+		{
+			// The expression that gives the reference must not use any of the
+			// variables that must be destroyed upon exit, because then it means
+			// reference will stay alive while the clean-up is done, which could
+			// potentially mean that the reference is invalidated by the clean-up.
+			//
+			// When the function is returning a reference, the clean-up of the
+			// variables must be done before the evaluation of the expression.
+			//
+			// A reference to a global variable, or a class member for class methods
+			// should be allowed to be returned.
+
+			if( !(expr.type.dataType.IsReference() ||
+				  (expr.type.dataType.IsObject() && !expr.type.dataType.IsObjectHandle())) )
+			{
+				// Clean up the potential deferred parameters
+				ProcessDeferredParams(&expr);
+				Error(TXT_NOT_VALID_REFERENCE, rnode);
+				return;
+			}
+
+			// No references to local variables, temporary variables, or parameters
+			// are allowed to be returned, since they go out of scope when the function
+			// returns. Even reference parameters are disallowed, since it is not possible
+			// to know the scope of them. The exception is the 'this' pointer, which
+			// is treated by the compiler as a local variable, but isn't really so.
+			if( (expr.type.isVariable && !(expr.type.stackOffset == 0 && outFunc->objectType)) || expr.type.isTemporary )
+			{
+				// Clean up the potential deferred parameters
+				ProcessDeferredParams(&expr);
+				Error(TXT_CANNOT_RETURN_REF_TO_LOCAL, rnode);
+				return;
+			}
+
+			// The type must match exactly as we cannot convert
+			// the reference without loosing the original value
+			if( !(v->type.IsEqualExceptConst(expr.type.dataType) ||
+				  ((expr.type.dataType.IsObject() || expr.type.dataType.IsFuncdef()) &&
+				   !expr.type.dataType.IsObjectHandle() &&
+				   v->type.IsEqualExceptRefAndConst(expr.type.dataType))) ||
+				(!v->type.IsReadOnly() && expr.type.dataType.IsReadOnly()) )
+			{
+				// Clean up the potential deferred parameters
+				ProcessDeferredParams(&expr);
+				asCString str;
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
+				Error(str, rnode);
+				return;
+			}
+
+			// The expression must not have any deferred expressions, because the evaluation
+			// of these cannot be done without keeping the reference which is not safe
+			if( expr.deferredParams.GetLength() )
+			{
+				// Clean up the potential deferred parameters
+				ProcessDeferredParams(&expr);
+				Error(TXT_REF_CANT_BE_RETURNED_DEFERRED_PARAM, rnode);
+				return;
+			}
+
+			// Make sure the expression isn't using any local variables that
+			// will need to be cleaned up before the function completes
+			asCArray<int> usedVars;
+			expr.bc.GetVarsUsed(usedVars);
+			for( asUINT n = 0; n < usedVars.GetLength(); n++ )
+			{
+				int var = GetVariableSlot(usedVars[n]);
+				if( var != -1 )
+				{
+					asCDataType dt = variableAllocations[var];
+					if( dt.IsObject() )
+					{
+						ProcessDeferredParams(&expr);
+						Error(TXT_REF_CANT_BE_RETURNED_LOCAL_VARS, rnode);
+						return;
+					}
+				}
+			}
+
+			// Can't return the reference if could point to a local variable
+			if( expr.type.isRefToLocal )
+			{
+				ProcessDeferredParams(&expr);
+				Error(TXT_REF_CANT_BE_TO_LOCAL_VAR, rnode);
+				return;
+			}
+
+			// All objects in the function must be cleaned up before the expression
+			// is evaluated, otherwise there is a possibility that the cleanup will
+			// invalidate the reference.
+
+			// Destroy the local variables before loading
+			// the reference into the register. This will
+			// be done before the expression is evaluated.
+			DestroyVariables(bc);
+
+			// For primitives the reference is already in the register,
+			// but for non-primitives the reference is on the stack so we
+			// need to load it into the register
+			if( !expr.type.dataType.IsPrimitive() )
+			{
+				if( !expr.type.dataType.IsObjectHandle() &&
+					expr.type.dataType.IsReference() )
+					expr.bc.Instr(asBC_RDSPtr);
+
+				expr.bc.Instr(asBC_PopRPtr);
+			}
+
+			// There are no temporaries to release so we're done
+		}
+		else // if( !v->type.IsReference() )
+		{
+			if( ProcessPropertyGetAccessor(&expr, rnode) < 0 )
+				return;
+
+			// Prepare the value for assignment
+			IsVariableInitialized(&expr.type, rnode->firstChild);
+
+			if( v->type.IsPrimitive() )
+			{
+				if( expr.type.dataType.IsReference() ) ConvertToVariable(&expr);
+
+				// Implicitly convert the value to the return type
+				ImplicitConversion(&expr, v->type, rnode->firstChild, asIC_IMPLICIT_CONV);
+
+				// Verify that the conversion was successful
+				if( expr.type.dataType != v->type )
+				{
+					asCString str;
+					str.Format(TXT_NO_CONVERSION_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
+					Error(str, rnode);
+					return;
+				}
+				else
+				{
+					ConvertToVariable(&expr);
+
+					// Clean up the local variables and process deferred parameters
+					DestroyVariables(&expr.bc);
+					ProcessDeferredParams(&expr);
+
+					ReleaseTemporaryVariable(expr.type, &expr.bc);
+
+					// Load the variable in the register
+					if( v->type.GetSizeOnStackDWords() == 1 )
+						expr.bc.InstrSHORT(asBC_CpyVtoR4, (short)expr.type.stackOffset);
+					else
+						expr.bc.InstrSHORT(asBC_CpyVtoR8, (short)expr.type.stackOffset);
+				}
+			}
+			else if( v->type.IsObject() || v->type.IsFuncdef() )
+			{
+				// Value types are returned on the stack, in a location
+				// that has been reserved by the calling function.
+				if( outFunc->DoesReturnOnStack() )
+				{
+					// TODO: runtime optimize: If the return type has a constructor that takes the type of the expression,
+					//                         it should be called directly instead of first converting the expression and
+					//                         then copy the value.
+					if( !v->type.IsEqualExceptRefAndConst(expr.type.dataType) )
+					{
+						ImplicitConversion(&expr, v->type, rnode->firstChild, asIC_IMPLICIT_CONV);
+						if( !v->type.IsEqualExceptRefAndConst(expr.type.dataType) )
+						{
+							asCString str;
+							str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, expr.type.dataType.Format(outFunc->nameSpace).AddressOf(), v->type.Format(outFunc->nameSpace).AddressOf());
+							Error(str, rnode->firstChild);
+							return;
+						}
+					}
+
+					int offset = outFunc->objectType ? -AS_PTR_SIZE : 0;
+					CompileInitAsCopy(v->type, offset, &expr.bc, &expr, rnode->firstChild, true);
+
+					// Clean up the local variables and process deferred parameters
+					DestroyVariables(&expr.bc);
+					ProcessDeferredParams(&expr);
+
+					// If this return statement is within a branch, there might be more statements after this. To avoid having the exception 
+					// handler think the object is live in the statements between the return and the end of the function we need to add a marker
+					expr.bc.ObjInfo(offset, asOBJ_UNINIT);
+				}
+				else
+				{
+					asASSERT( (v->type.GetTypeInfo()->flags & asOBJ_REF) || v->type.IsFuncdef() );
+
+					// Prepare the expression to be loaded into the object
+					// register. This will place the reference in local variable
+					PrepareArgument(&v->type, &expr, rnode->firstChild, false, 0);
+
+					// Pop the reference to the temporary variable
+					expr.bc.Instr(asBC_PopPtr);
+
+					// Clean up the local variables and process deferred parameters
+					DestroyVariables(&expr.bc);
+					ProcessDeferredParams(&expr);
+
+					// Load the object pointer into the object register
+					// LOADOBJ also clears the address in the variable
+					expr.bc.InstrSHORT(asBC_LOADOBJ, (short)expr.type.stackOffset);
+
+					// LOADOBJ cleared the address in the variable so the object will not be freed
+					// here, but the temporary variable must still be freed so the slot can be reused
+					// By releasing without the bytecode we do just that.
+					ReleaseTemporaryVariable(expr.type, 0);
+				}
+			}
+		}
+
+		expr.bc.OptimizeLocally(tempVariableOffsets);
+		bc->AddCode(&expr.bc);
+	}
+	else
+	{
+		// For functions that don't return anything
+		// we just detroy the local variables
+		DestroyVariables(bc);
+	}
+
+	// Jump to the end of the function
+	bc->InstrINT(asBC_JMP, 0);
+}
+
+void asCCompiler::DestroyVariables(asCByteCode *bc)
+{
+	// Call destructor on all variables except for the function parameters
+	// Put the clean-up in a block to allow exception handler to understand this
+	bc->Block(true);
+	asCVariableScope *vs = variables;
+	while( vs )
+	{
+		for( int n = (int)vs->variables.GetLength() - 1; n >= 0; n-- )
+			if( vs->variables[n]->stackOffset > 0 )
+				CallDestructor(vs->variables[n]->type, vs->variables[n]->stackOffset, vs->variables[n]->onHeap, bc);
+
+		vs = vs->parent;
+	}
+	bc->Block(false);
+}
+
+void asCCompiler::AddVariableScope(bool isBreakScope, bool isContinueScope)
+{
+	variables = asNEW(asCVariableScope)(variables);
+	if( variables == 0 )
+	{
+		// Out of memory
+		return;
+	}
+	variables->isBreakScope    = isBreakScope;
+	variables->isContinueScope = isContinueScope;
+}
+
+void asCCompiler::RemoveVariableScope()
+{
+	if( variables )
+	{
+		asCVariableScope *var = variables;
+		variables = variables->parent;
+		asDELETE(var,asCVariableScope);
+	}
+}
+
+void asCCompiler::Error(const asCString &msg, asCScriptNode *node)
+{
+	asCString str;
+
+	int r = 0, c = 0;
+	asASSERT( node );
+	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	builder->WriteError(script->name, msg, r, c);
+
+	hasCompileErrors = true;
+}
+
+void asCCompiler::Warning(const asCString &msg, asCScriptNode *node)
+{
+	asCString str;
+
+	int r = 0, c = 0;
+	asASSERT( node );
+	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	builder->WriteWarning(script->name, msg, r, c);
+}
+
+void asCCompiler::Information(const asCString &msg, asCScriptNode *node)
+{
+	asCString str;
+
+	int r = 0, c = 0;
+	asASSERT( node );
+	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	builder->WriteInfo(script->name, msg, r, c, false);
+}
+
+void asCCompiler::PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node, asCObjectType *inType)
+{
+	int r = 0, c = 0;
+	asASSERT( node );
+	if( node ) script->ConvertPosToRowCol(node->tokenPos, &r, &c);
+
+	for( unsigned int n = 0; n < funcs.GetLength(); n++ )
+	{
+		asCScriptFunction *func = builder->GetFunctionDescription(funcs[n]);
+		if( inType && func->funcType == asFUNC_VIRTUAL )
+			func = inType->virtualFunctionTable[func->vfTableIdx];
+
+		builder->WriteInfo(script->name, func->GetDeclaration(true, false, true), r, c, false);
+
+		if (func->objectType && (func->objectType->flags & asOBJ_TEMPLATE))
+		{
+			// Check for funcdefs in the arguments that may have been generated by the template instance, so these can be shown to user
+			for (unsigned int p = 0; p < func->GetParamCount(); p++)
+			{
+				int typeId = 0;
+				func->GetParam(p, &typeId);
+				asITypeInfo *ti = engine->GetTypeInfoById(typeId);
+				if (ti && (ti->GetFlags() & asOBJ_FUNCDEF))
+				{
+					asCString msg;
+					msg.Format(TXT_WHERE_s_IS_s, ti->GetName(), ti->GetFuncdefSignature()->GetDeclaration());
+					builder->WriteInfo(script->name, msg.AddressOf(), r, c, false);
+				}
+			}
+		}
+	}
+}
+
+int asCCompiler::AllocateVariableNotIn(const asCDataType &type, bool isTemporary, bool forceOnHeap, asCExprContext *ctx)
+{
+	int l = int(reservedVariables.GetLength());
+	ctx->bc.GetVarsUsed(reservedVariables);
+	int var = AllocateVariable(type, isTemporary, forceOnHeap);
+	reservedVariables.SetLength(l);
+	return var;
+}
+
+int asCCompiler::AllocateVariable(const asCDataType &type, bool isTemporary, bool forceOnHeap, bool asReference)
+{
+	asCDataType t(type);
+	t.MakeReference(asReference);
+
+	if( t.IsPrimitive() && t.GetSizeOnStackDWords() == 1 )
+		t.SetTokenType(ttInt);
+
+	if( t.IsPrimitive() && t.GetSizeOnStackDWords() == 2 )
+		t.SetTokenType(ttDouble);
+
+	// Only null handles have the token type unrecognized token
+	asASSERT( t.IsObjectHandle() || t.GetTokenType() != ttUnrecognizedToken );
+
+	bool isOnHeap = true;
+	if( t.IsPrimitive() ||
+		(t.GetTypeInfo() && (t.GetTypeInfo()->GetFlags() & asOBJ_VALUE) && !forceOnHeap && !asReference) )
+	{
+		// Primitives and value types (unless overridden) are allocated on the stack
+		isOnHeap = false;
+	}
+
+	// Find a free location with the same type
+	for( asUINT n = 0; n < freeVariables.GetLength(); n++ )
+	{
+		int slot = freeVariables[n];
+
+		if( variableAllocations[slot].IsEqualExceptConst(t) &&
+			variableIsTemporary[slot] == isTemporary &&
+			variableIsOnHeap[slot] == isOnHeap )
+		{
+			// We can't return by slot, must count variable sizes
+			int offset = GetVariableOffset(slot);
+
+			// Verify that it is not in the list of reserved variables
+			bool isUsed = false;
+			if( reservedVariables.GetLength() )
+				isUsed = reservedVariables.Exists(offset);
+
+			if( !isUsed )
+			{
+				if( n != freeVariables.GetLength() - 1 )
+					freeVariables[n] = freeVariables.PopLast();
+				else
+					freeVariables.PopLast();
+
+				if( isTemporary )
+					tempVariables.PushLast(offset);
+
+				return offset;
+			}
+		}
+	}
+
+	variableAllocations.PushLast(t);
+	variableIsTemporary.PushLast(isTemporary);
+	variableIsOnHeap.PushLast(isOnHeap);
+
+	int offset = GetVariableOffset((int)variableAllocations.GetLength()-1);
+
+	if( isTemporary )
+	{
+		// Add offset to the currently allocated temporary variables
+		tempVariables.PushLast(offset);
+
+		// Add offset to all known offsets to temporary variables, whether allocated or not
+		tempVariableOffsets.PushLast(offset);
+	}
+
+	return offset;
+}
+
+int asCCompiler::GetVariableOffset(int varIndex)
+{
+	// Return offset to the last dword on the stack
+
+	// Start at 1 as offset 0 is reserved for the this pointer (or first argument for global functions)
+	int varOffset = 1;
+
+	// Skip lower variables
+	for( int n = 0; n < varIndex; n++ )
+	{
+		if( !variableIsOnHeap[n] && variableAllocations[n].IsObject() )
+			varOffset += variableAllocations[n].GetSizeInMemoryDWords();
+		else
+			varOffset += variableAllocations[n].GetSizeOnStackDWords();
+	}
+
+	if( varIndex < (int)variableAllocations.GetLength() )
+	{
+		// For variables larger than 1 dword the returned offset should be to the last dword
+		int size;
+		if( !variableIsOnHeap[varIndex] && variableAllocations[varIndex].IsObject() )
+			size = variableAllocations[varIndex].GetSizeInMemoryDWords();
+		else
+			size = variableAllocations[varIndex].GetSizeOnStackDWords();
+		if( size > 1 )
+			varOffset += size-1;
+	}
+
+	return varOffset;
+}
+
+
+int asCCompiler::GetVariableSlot(int offset)
+{
+	int varOffset = 1;
+	for( asUINT n = 0; n < variableAllocations.GetLength(); n++ )
+	{
+		if( !variableIsOnHeap[n] && variableAllocations[n].IsObject() )
+			varOffset += -1 + variableAllocations[n].GetSizeInMemoryDWords();
+		else
+			varOffset += -1 + variableAllocations[n].GetSizeOnStackDWords();
+
+		if( varOffset == offset )
+			return n;
+
+		varOffset++;
+	}
+
+	return -1;
+}
+
+bool asCCompiler::IsVariableOnHeap(int offset)
+{
+	int varSlot = GetVariableSlot(offset);
+	if( varSlot < 0 )
+	{
+		// This happens for function arguments that are considered as on the heap
+		return true;
+	}
+
+	return variableIsOnHeap[varSlot];
+}
+
+void asCCompiler::DeallocateVariable(int offset)
+{
+	// Remove temporary variable
+	int n;
+	for( n = 0; n < (int)tempVariables.GetLength(); n++ )
+	{
+		if( offset == tempVariables[n] )
+		{
+			if( n == (int)tempVariables.GetLength()-1 )
+				tempVariables.PopLast();
+			else
+				tempVariables[n] = tempVariables.PopLast();
+			break;
+		}
+	}
+
+	// Mark the variable slot available for new allocations
+	n = GetVariableSlot(offset);
+	if( n != -1 )
+	{
+		freeVariables.PushLast(n);
+		return;
+	}
+
+	// We might get here if the variable was implicitly declared
+	// because it was used before a formal declaration, in this case
+	// the offset is 0x7FFF
+
+	asASSERT(offset == 0x7FFF);
+}
+
+void asCCompiler::ReleaseTemporaryVariable(asCExprValue &t, asCByteCode *bc)
+{
+	if( t.isTemporary )
+	{
+		ReleaseTemporaryVariable(t.stackOffset, bc);
+		t.isTemporary = false;
+	}
+}
+
+void asCCompiler::ReleaseTemporaryVariable(int offset, asCByteCode *bc)
+{
+	asASSERT( tempVariables.Exists(offset) );
+
+	if( bc )
+	{
+		// We need to call the destructor on the true variable type
+		int n = GetVariableSlot(offset);
+		asASSERT( n >= 0 );
+		if( n >= 0 )
+		{
+			asCDataType dt = variableAllocations[n];
+			bool isOnHeap = variableIsOnHeap[n];
+
+			// Call destructor
+			CallDestructor(dt, offset, isOnHeap, bc);
+		}
+	}
+
+	DeallocateVariable(offset);
+}
+
+void asCCompiler::Dereference(asCExprContext *ctx, bool generateCode)
+{
+	if( ctx->type.dataType.IsReference() )
+	{
+		if( ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef() )
+		{
+			ctx->type.dataType.MakeReference(false);
+			if( generateCode )
+				ctx->bc.Instr(asBC_RDSPtr);
+		}
+		else
+		{
+			// This should never happen as primitives are treated differently
+			asASSERT(false);
+		}
+	}
+}
+
+bool asCCompiler::IsVariableInitialized(asCExprValue *type, asCScriptNode *node)
+{
+	// No need to check if there is no variable scope
+	if( variables == 0 ) return true;
+
+	// Temporary variables are assumed to be initialized
+	if( type->isTemporary ) return true;
+
+	// Verify that it is a variable
+	if( !type->isVariable ) return true;
+
+	// Find the variable
+	sVariable *v = variables->GetVariableByOffset(type->stackOffset);
+
+	// The variable isn't found if it is a constant, in which case it is guaranteed to be initialized
+	if( v == 0 ) return true;
+
+	if( v->isInitialized ) return true;
+
+	// Complex types don't need this test
+	if( v->type.IsObject() || v->type.IsFuncdef() ) return true;
+
+	// Mark as initialized so that the user will not be bothered again
+	v->isInitialized = true;
+
+	// Write warning
+	asCString str;
+	str.Format(TXT_s_NOT_INITIALIZED, (const char *)v->name.AddressOf());
+	Warning(str, node);
+
+	return false;
+}
+
+void asCCompiler::PrepareOperand(asCExprContext *ctx, asCScriptNode *node)
+{
+	// Check if the variable is initialized (if it indeed is a variable)
+	IsVariableInitialized(&ctx->type, node);
+
+	asCDataType to = ctx->type.dataType;
+	to.MakeReference(false);
+
+	ImplicitConversion(ctx, to, node, asIC_IMPLICIT_CONV);
+
+	ProcessDeferredParams(ctx);
+}
+
+void asCCompiler::PrepareForAssignment(asCDataType *lvalue, asCExprContext *rctx, asCScriptNode *node, bool toTemporary, asCExprContext *lvalueExpr)
+{
+	// Reserve the temporary variables used in the lvalue expression so they won't end up being used by the rvalue too
+	int l = int(reservedVariables.GetLength());
+	if( lvalueExpr ) lvalueExpr->bc.GetVarsUsed(reservedVariables);
+
+	if( ProcessPropertyGetAccessor(rctx, node) < 0 )
+		return;
+
+	// Make sure the rvalue is initialized if it is a variable
+	IsVariableInitialized(&rctx->type, node);
+
+	if( lvalue->IsPrimitive() )
+	{
+		if( rctx->type.dataType.IsPrimitive() )
+		{
+			if( rctx->type.dataType.IsReference() )
+			{
+				// Cannot do implicit conversion of references so we first convert the reference to a variable
+				ConvertToVariableNotIn(rctx, lvalueExpr);
+			}
+		}
+
+		// Implicitly convert the value to the right type
+		ImplicitConversion(rctx, *lvalue, node, asIC_IMPLICIT_CONV);
+
+		// Check data type
+		if( !lvalue->IsEqualExceptRefAndConst(rctx->type.dataType) )
+		{
+			asCString str;
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lvalue->Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+
+			rctx->type.SetDummy();
+		}
+
+		// Make sure the rvalue is a variable
+		if( !rctx->type.isVariable )
+			ConvertToVariableNotIn(rctx, lvalueExpr);
+	}
+	else
+	{
+		asCDataType to = *lvalue;
+		to.MakeReference(false);
+
+		// TODO: ImplicitConversion should know to do this by itself
+		// First convert to a handle which will do a reference cast
+		if( !lvalue->IsObjectHandle() &&
+			(lvalue->GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) )
+			to.MakeHandle(true);
+
+		// Don't allow the implicit conversion to create an object
+		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true, !toTemporary);
+
+		if( !lvalue->IsObjectHandle() &&
+			(lvalue->GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) )
+		{
+			// Then convert to a reference, which will validate the handle
+			to.MakeHandle(false);
+			ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true, !toTemporary);
+		}
+
+		// Check data type
+		if( !lvalue->IsEqualExceptRefAndConst(rctx->type.dataType) )
+		{
+			asCString str;
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lvalue->Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+		}
+		else
+		{
+			// If the assignment will be made with the copy behaviour then the rvalue must not be a reference
+			asASSERT(!lvalue->IsObject() || !rctx->type.dataType.IsReference());
+		}
+	}
+
+	// Unreserve variables
+	reservedVariables.SetLength(l);
+}
+
+bool asCCompiler::IsLValue(asCExprValue &type)
+{
+	if( !type.isLValue ) return false;
+	if( type.dataType.IsReadOnly() ) return false;
+	if( !type.dataType.IsObject() && !type.isVariable && !type.dataType.IsReference() ) return false;
+	return true;
+}
+
+int asCCompiler::PerformAssignment(asCExprValue *lvalue, asCExprValue *rvalue, asCByteCode *bc, asCScriptNode *node)
+{
+	if( lvalue->dataType.IsReadOnly() )
+	{
+		Error(TXT_REF_IS_READ_ONLY, node);
+		return -1;
+	}
+
+	if( lvalue->dataType.IsPrimitive() )
+	{
+		if( lvalue->isVariable )
+		{
+			// Copy the value between the variables directly
+			if( lvalue->dataType.GetSizeInMemoryDWords() == 1 )
+				bc->InstrW_W(asBC_CpyVtoV4, lvalue->stackOffset, rvalue->stackOffset);
+			else
+				bc->InstrW_W(asBC_CpyVtoV8, lvalue->stackOffset, rvalue->stackOffset);
+
+			// Mark variable as initialized
+			sVariable *v = variables->GetVariableByOffset(lvalue->stackOffset);
+			if( v ) v->isInitialized = true;
+		}
+		else if( lvalue->dataType.IsReference() )
+		{
+			// Copy the value of the variable to the reference in the register
+			int s = lvalue->dataType.GetSizeInMemoryBytes();
+			if( s == 1 )
+				bc->InstrSHORT(asBC_WRTV1, (short)rvalue->stackOffset);
+			else if( s == 2 )
+				bc->InstrSHORT(asBC_WRTV2, (short)rvalue->stackOffset);
+			else if( s == 4 )
+				bc->InstrSHORT(asBC_WRTV4, (short)rvalue->stackOffset);
+			else if( s == 8 )
+				bc->InstrSHORT(asBC_WRTV8, (short)rvalue->stackOffset);
+		}
+		else
+		{
+			Error(TXT_NOT_VALID_LVALUE, node);
+			return -1;
+		}
+	}
+	else if( !lvalue->isExplicitHandle )
+	{
+		asCExprContext ctx(engine);
+		ctx.type = *lvalue;
+		Dereference(&ctx, true);
+		*lvalue = ctx.type;
+		bc->AddCode(&ctx.bc);
+
+		asSTypeBehaviour *beh = lvalue->dataType.GetBehaviour();
+		if( beh && beh->copy && beh->copy != engine->scriptTypeBehaviours.beh.copy )
+		{
+			asCExprContext res(engine);
+			PerformFunctionCall(beh->copy, &res, false, 0, CastToObjectType(lvalue->dataType.GetTypeInfo()));
+
+			bc->AddCode(&res.bc);
+			*lvalue = res.type;
+		}
+		else if( beh && beh->copy == engine->scriptTypeBehaviours.beh.copy )
+		{
+			// Call the default copy operator for script classes
+			// This is done differently because the default copy operator
+			// is registered as returning int&, but in reality it returns
+			// a reference to the object.
+			// TODO: Avoid this special case by implementing a copystub for
+			//       script classes that uses the default copy operator
+			bc->Call(asBC_CALLSYS, beh->copy, 2*AS_PTR_SIZE);
+			bc->Instr(asBC_PshRPtr);
+		}
+		else
+		{
+			// Default copy operator
+			if( lvalue->dataType.GetSizeInMemoryDWords() == 0 ||
+				!(lvalue->dataType.GetTypeInfo()->flags & asOBJ_POD) )
+			{
+				asCString msg;
+				msg.Format(TXT_NO_DEFAULT_COPY_OP_FOR_s, lvalue->dataType.GetTypeInfo()->name.AddressOf());
+				Error(msg, node);
+				return -1;
+			}
+
+			// Copy larger data types from a reference
+			// TODO: runtime optimize: COPY should pop both arguments and store the reference in the register.
+			bc->InstrSHORT_DW(asBC_COPY, (short)lvalue->dataType.GetSizeInMemoryDWords(), engine->GetTypeIdFromDataType(lvalue->dataType));
+		}
+	}
+	else
+	{
+		// TODO: The object handle can be stored in a variable as well
+		if( !lvalue->dataType.IsReference() )
+		{
+			Error(TXT_NOT_VALID_REFERENCE, node);
+			return -1;
+		}
+
+		if( lvalue->dataType.IsFuncdef() )
+			bc->InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+		else
+			bc->InstrPTR(asBC_REFCPY, lvalue->dataType.GetTypeInfo());
+
+		// Mark variable as initialized
+		if( variables )
+		{
+			sVariable *v = variables->GetVariableByOffset(lvalue->stackOffset);
+			if( v ) v->isInitialized = true;
+		}
+	}
+
+	return 0;
+}
+
+bool asCCompiler::CompileRefCast(asCExprContext *ctx, const asCDataType &to, bool isExplicit, asCScriptNode *node, bool generateCode)
+{
+	bool conversionDone = false;
+
+	asCArray<int> ops;
+
+	// A ref cast must not remove the constness
+	bool isConst = ctx->type.dataType.IsObjectConst();
+
+	// Find a suitable opCast or opImplCast method
+	asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+	for( asUINT n = 0; ot && n < ot->methods.GetLength(); n++ )
+	{
+		asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+		if( (isExplicit && func->name == "opCast") ||
+			func->name == "opImplCast" )
+		{
+			// Is the operator for the output type?
+			if( func->returnType.GetTypeInfo() != to.GetTypeInfo() )
+				continue;
+
+			// Can't call a non-const function on a const object
+			if( isConst && !func->IsReadOnly() )
+				continue;
+
+			ops.PushLast(func->id);
+		}
+	}
+
+	// Filter the list by constness to remove const methods if there are matching non-const methods
+	FilterConst(ops, !isConst);
+
+	// If there is multiple matches, then pick the most appropriate one
+	if (ops.GetLength() > 1)
+	{
+		// This should only happen if an explicit cast is compiled
+		// and the type has both the opCast and opImplCast
+		asASSERT(isExplicit);
+		asASSERT(ops.GetLength() == 2);
+
+		for (asUINT n = 0; n < ops.GetLength(); n++)
+		{
+			asCScriptFunction *func = engine->scriptFunctions[ops[n]];
+			if (func->name == "opImplCast")
+			{
+				ops.RemoveIndex(n);
+				n--;
+			}
+		}
+	}
+
+	// Should only have one behaviour for each output type
+	if( ops.GetLength() == 1 )
+	{
+		conversionDone = true;
+		if( generateCode )
+		{
+			// TODO: runtime optimize: Instead of producing bytecode for checking if the handle is
+			//                         null, we can create a special CALLSYS instruction that checks
+			//                         if the object pointer is null and if so sets the object register
+			//                         to null directly without executing the function.
+			//
+			//                         Alternatively I could force the ref cast behaviours be global
+			//                         functions with 1 parameter, even though they should still be
+			//                         registered with RegisterObjectBehaviour()
+
+			if( (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_NOHANDLE))
+			{
+				// Add code to avoid calling the cast behaviour if the handle is already null,
+				// because that will raise a null pointer exception due to the cast behaviour
+				// being a class method, and the this pointer cannot be null.
+
+				if (!ctx->type.isVariable)
+				{
+					Dereference(ctx, true);
+					ConvertToVariable(ctx);
+				}
+
+				// The reference on the stack will not be used
+				ctx->bc.Instr(asBC_PopPtr);
+
+				// TODO: runtime optimize: should have immediate comparison for null pointer
+				int offset = AllocateVariable(asCDataType::CreateNullHandle(), true);
+				// TODO: runtime optimize: ClrVPtr is not necessary, because the VM should initialize the variable to null anyway (it is currently not done for null pointers though)
+				ctx->bc.InstrSHORT(asBC_ClrVPtr, (asWORD)offset);
+				ctx->bc.InstrW_W(asBC_CmpPtr, ctx->type.stackOffset, offset);
+				DeallocateVariable(offset);
+
+				int afterLabel = nextLabel++;
+				ctx->bc.InstrDWORD(asBC_JZ, afterLabel);
+
+				// Call the cast operator
+				ctx->bc.InstrSHORT(asBC_PSF, (short)ctx->type.stackOffset);
+				ctx->bc.Instr(asBC_RDSPtr);
+				ctx->type.dataType.MakeReference(false);
+
+				asCArray<asCExprContext *> args;
+				MakeFunctionCall(ctx, ops[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node);
+				ctx->bc.Instr(asBC_PopPtr);
+
+				int endLabel = nextLabel++;
+
+				ctx->bc.InstrINT(asBC_JMP, endLabel);
+				ctx->bc.Label((short)afterLabel);
+
+				// Make a NULL pointer
+				ctx->bc.InstrSHORT(asBC_ClrVPtr, (short)ctx->type.stackOffset);
+				ctx->bc.Label((short)endLabel);
+
+				// Push the reference to the handle on the stack
+				ctx->bc.InstrSHORT(asBC_PSF, (short)ctx->type.stackOffset);
+			}
+			else
+			{
+				// Value types cannot be null, so there is no need to check for this.
+
+				// Likewise for reference types that are registered with asOBJ_NOHANDLE
+				// as those are only expected as registered global properties that cannot
+				// be modified anyway.
+
+				// Call the cast operator
+				asCArray<asCExprContext *> args;
+				MakeFunctionCall(ctx, ops[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node);
+			}
+		}
+		else
+		{
+			asCScriptFunction *func = engine->scriptFunctions[ops[0]];
+			ctx->type.Set(func->returnType);
+		}
+	}
+	else if( ops.GetLength() == 0 && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) && to.IsObjectHandle() )
+	{
+		// Check for the generic ref cast method: void opCast(?&out)
+		// This option only works if the expected type is a handle
+		for( asUINT n = 0; ot && n < ot->methods.GetLength(); n++ )
+		{
+			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+			if( (isExplicit && func->name == "opCast") ||
+				func->name == "opImplCast" )
+			{
+				// Does the operator take the ?&out parameter?
+				if( func->returnType.GetTokenType() != ttVoid ||
+					func->parameterTypes.GetLength() != 1 ||
+					func->parameterTypes[0].GetTokenType() != ttQuestion ||
+					func->inOutFlags[0] != asTM_OUTREF )
+					continue;
+
+				ops.PushLast(func->id);
+			}
+		}
+
+		// Filter the list by constness to remove const methods if there are matching non-const methods
+		FilterConst(ops, !isConst);
+
+		// If there is multiple matches, then pick the most appropriate one
+		if (ops.GetLength() > 1)
+		{
+			// This should only happen if an explicit cast is compiled
+			// and the type has both the opCast and opImplCast
+			asASSERT(isExplicit);
+			asASSERT(ops.GetLength() == 2);
+
+			for (asUINT n = 0; n < ops.GetLength(); n++)
+			{
+				asCScriptFunction *func = engine->scriptFunctions[ops[n]];
+				if (func->name == "opImplCast")
+				{
+					ops.RemoveIndex(n);
+					n--;
+				}
+			}
+		}
+
+		if( ops.GetLength() == 1 )
+		{
+			conversionDone = true;
+			if( generateCode )
+			{
+				int afterLabel = 0;
+				bool doNullCheck = false;
+				bool releaseTempVariable = false;
+				asCExprContext tmp(engine);
+				if ((ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_NOHANDLE))
+				{
+					tmp.bc.AddCode(&ctx->bc);
+					tmp.Merge(ctx);
+
+					// Add code to avoid calling the cast behaviour if the handle is already null,
+					// because that will raise a null pointer exception due to the cast behaviour
+					// being a class method, and the this pointer cannot be null.
+					doNullCheck = true;
+					if (!ctx->type.isVariable)
+					{
+						Dereference(&tmp, true);
+						ConvertToVariable(&tmp);
+						releaseTempVariable = true;
+					}
+
+					// The reference on the stack will not be used
+					tmp.bc.Instr(asBC_PopPtr);
+
+					// TODO: runtime optimize: should have immediate comparison for null pointer
+					int offset = AllocateVariable(asCDataType::CreateNullHandle(), true);
+					// TODO: runtime optimize: ClrVPtr is not necessary, because the VM should initialize the variable to null anyway (it is currently not done for null pointers though)
+					tmp.bc.InstrSHORT(asBC_ClrVPtr, (asWORD)offset);
+					tmp.bc.InstrW_W(asBC_CmpPtr, tmp.type.stackOffset, offset);
+					DeallocateVariable(offset);
+
+					afterLabel = nextLabel++;
+					tmp.bc.InstrDWORD(asBC_JZ, afterLabel);
+
+					// Place the object pointer on the stack
+					ctx->bc.InstrSHORT(asBC_PSF, (short)tmp.type.stackOffset);
+				}
+
+				// Allocate a temporary variable of the requested handle type
+				int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
+
+				// Pass the reference of that variable to the function as output parameter
+				asCDataType toRef(to);
+				toRef.MakeReference(true);
+				asCArray<asCExprContext *> args;
+				asCExprContext arg(engine);
+				arg.bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+				// Don't mark the variable as temporary, so it won't be freed too early
+				arg.type.SetVariable(toRef, stackOffset, false);
+				arg.type.isLValue = true;
+				arg.type.isExplicitHandle = true;
+				args.PushLast(&arg);
+
+				// Call the behaviour method
+				MakeFunctionCall(ctx, ops[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node);
+
+				if (doNullCheck)
+				{
+					// Add the call after the null check
+					tmp.bc.AddCode(&ctx->bc);
+					ctx->bc.AddCode(&tmp.bc);
+
+					int endLabel = nextLabel++;
+
+					ctx->bc.InstrINT(asBC_JMP, endLabel);
+					ctx->bc.Label((short)afterLabel);
+
+					// Make a NULL pointer
+					ctx->bc.InstrSHORT(asBC_ClrVPtr, (short)stackOffset);
+					ctx->bc.Label((short)endLabel);
+				}
+
+				// If a temporary variable was allocated in the tmp to convert
+				// the input expression to a variable, it must be released here
+				if (releaseTempVariable && tmp.type.isTemporary)
+					ReleaseTemporaryVariable(tmp.type.stackOffset, &ctx->bc);
+
+				// Use the reference to the variable as the result of the expression
+				// Now we can mark the variable as temporary
+				ctx->type.SetVariable(toRef, stackOffset, true);
+				ctx->bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+			}
+			else
+			{
+				// All casts are legal
+				ctx->type.Set(to);
+			}
+		}
+	}
+
+	// If the script object didn't implement a matching opCast or opImplCast
+	// then check if the desired type is part of the hierarchy
+	if( !conversionDone && (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) )
+	{
+		// We need it to be a reference
+		if( !ctx->type.dataType.IsReference() )
+		{
+			asCDataType toRef = ctx->type.dataType;
+			toRef.MakeReference(true);
+			ImplicitConversion(ctx, toRef, 0, isExplicit ? asIC_EXPLICIT_REF_CAST : asIC_IMPLICIT_CONV, generateCode);
+		}
+
+		if( isExplicit )
+		{
+			// Allow dynamic cast between object handles (only for script objects).
+			// At run time this may result in a null handle,
+			// which when used will throw an exception
+			conversionDone = true;
+			if( generateCode )
+			{
+				ctx->bc.InstrDWORD(asBC_Cast, engine->GetTypeIdFromDataType(to));
+
+				// Allocate a temporary variable for the returned object
+				int returnOffset = AllocateVariable(to, true);
+
+				// Move the pointer from the object register to the temporary variable
+				ctx->bc.InstrSHORT(asBC_STOREOBJ, (short)returnOffset);
+
+				ctx->bc.InstrSHORT(asBC_PSF, (short)returnOffset);
+
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+				ctx->type.SetVariable(to, returnOffset, true);
+				ctx->type.dataType.MakeReference(true);
+			}
+			else
+			{
+				ctx->type.dataType = to;
+				ctx->type.dataType.MakeReference(true);
+			}
+		}
+		else
+		{
+			if( CastToObjectType(ctx->type.dataType.GetTypeInfo())->DerivesFrom(to.GetTypeInfo()) )
+			{
+				conversionDone = true;
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+			}
+		}
+
+		// A ref cast must not remove the constness
+		if( isConst )
+			ctx->type.dataType.MakeHandleToConst(true);
+	}
+
+	return conversionDone;
+}
+
+asUINT asCCompiler::ImplicitConvPrimitiveToPrimitive(asCExprContext *ctx, const asCDataType &toOrig, asCScriptNode *node, EImplicitConv convType, bool generateCode)
+{
+	asCDataType to = toOrig;
+	to.MakeReference(false);
+	asASSERT( !ctx->type.dataType.IsReference() );
+
+	// Maybe no conversion is needed
+	if( to.IsEqualExceptConst(ctx->type.dataType) )
+	{
+		// A primitive is const or not
+		ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
+		return asCC_NO_CONV;
+	}
+
+	// Is the conversion an ambiguous enum value?
+	if( ctx->enumValue != "" )
+	{
+		if( to.IsEnumType() )
+		{
+			// Attempt to resolve an ambiguous enum value
+			asCDataType out;
+			asDWORD value;
+			if( builder->GetEnumValueFromType(CastToEnumType(to.GetTypeInfo()), ctx->enumValue.AddressOf(), out, value) )
+			{
+				ctx->type.SetConstantDW(out, value);
+				ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
+
+				// Reset the enum value since we no longer need it
+				ctx->enumValue = "";
+
+				// It wasn't really a conversion. The compiler just resolved the ambiguity (or not)
+				return asCC_NO_CONV;
+			}
+		}
+
+		// The enum value is ambiguous
+		if( node && generateCode )
+			Error(TXT_FOUND_MULTIPLE_ENUM_VALUES, node);
+
+		// Set a dummy to allow the compiler to try to continue the conversion
+		ctx->type.SetDummy();
+	}
+
+	// Determine the cost of this conversion
+	asUINT cost = asCC_NO_CONV;
+	if( (to.IsIntegerType() || to.IsUnsignedType()) && (ctx->type.dataType.IsFloatType() || ctx->type.dataType.IsDoubleType()) )
+		cost = asCC_FLOAT_TO_INT_CONV;
+	else if ((to.IsFloatType() || to.IsDoubleType()) && (ctx->type.dataType.IsIntegerType() || ctx->type.dataType.IsUnsignedType()))
+		cost = asCC_INT_TO_FLOAT_CONV;
+	else if (ctx->type.dataType.IsEnumType() && to.IsIntegerType() && to.GetSizeInMemoryBytes() == ctx->type.dataType.GetSizeInMemoryBytes() )
+		cost = asCC_ENUM_SAME_SIZE_CONV;
+	else if (ctx->type.dataType.IsEnumType() && to.IsIntegerType() && to.GetSizeInMemoryBytes() != ctx->type.dataType.GetSizeInMemoryBytes())
+		cost = asCC_ENUM_DIFF_SIZE_CONV;
+	else if( to.IsUnsignedType() && ctx->type.dataType.IsIntegerType() )
+		cost = asCC_SIGNED_TO_UNSIGNED_CONV;
+	else if( to.IsIntegerType() && ctx->type.dataType.IsUnsignedType() )
+		cost = asCC_UNSIGNED_TO_SIGNED_CONV;
+	else if( to.GetSizeInMemoryBytes() > ctx->type.dataType.GetSizeInMemoryBytes() )
+		cost = asCC_PRIMITIVE_SIZE_UP_CONV;
+	else if (to.GetSizeInMemoryBytes() < ctx->type.dataType.GetSizeInMemoryBytes())
+		cost = asCC_PRIMITIVE_SIZE_DOWN_CONV;
+
+	// Start by implicitly converting constant values
+	if( ctx->type.isConstant )
+	{
+		ImplicitConversionConstant(ctx, to, generateCode ? node : 0, convType);
+		ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
+		return cost;
+	}
+
+	// Allow implicit conversion between numbers
+	if( generateCode )
+	{
+		// When generating the code the decision has already been made, so we don't bother determining the cost
+
+		// Convert smaller types to 32bit first
+		int s = ctx->type.dataType.GetSizeInMemoryBytes();
+		if( s < 4 )
+		{
+			ConvertToTempVariable(ctx);
+			if( ctx->type.dataType.IsIntegerType() )
+			{
+				if( s == 1 )
+					ctx->bc.InstrSHORT(asBC_sbTOi, (short)ctx->type.stackOffset);
+				else if( s == 2 )
+					ctx->bc.InstrSHORT(asBC_swTOi, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(ttInt);
+			}
+			else if( ctx->type.dataType.IsUnsignedType() )
+			{
+				if( s == 1 )
+					ctx->bc.InstrSHORT(asBC_ubTOi, (short)ctx->type.stackOffset);
+				else if( s == 2 )
+					ctx->bc.InstrSHORT(asBC_uwTOi, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(ttUInt);
+			}
+		}
+
+		if( (to.IsIntegerType() && to.GetSizeInMemoryDWords() == 1 && !to.IsEnumType()) ||
+			(to.IsEnumType() && convType == asIC_EXPLICIT_VAL_CAST) )
+		{
+			if( ctx->type.dataType.IsIntegerType() ||
+				ctx->type.dataType.IsUnsignedType() )
+			{
+				if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+				{
+					ctx->type.dataType.SetTokenType(to.GetTokenType());
+					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+				}
+				else
+				{
+					ConvertToTempVariable(ctx);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+					int offset = AllocateVariable(to, true);
+					ctx->bc.InstrW_W(asBC_i64TOi, offset, ctx->type.stackOffset);
+					ctx->type.SetVariable(to, offset, true);
+				}
+			}
+			else if( ctx->type.dataType.IsFloatType() )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_fTOi, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+			else if( ctx->type.dataType.IsDoubleType() )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_dTOi, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+
+			// Convert to smaller integer if necessary
+			s = to.GetSizeInMemoryBytes();
+			if( s < 4 )
+			{
+				ConvertToTempVariable(ctx);
+				if( s == 1 )
+					ctx->bc.InstrSHORT(asBC_iTOb, (short)ctx->type.stackOffset);
+				else if( s == 2 )
+					ctx->bc.InstrSHORT(asBC_iTOw, (short)ctx->type.stackOffset);
+			}
+		}
+		else if( to.IsIntegerType() && to.GetSizeInMemoryDWords() == 2 )
+		{
+			if( ctx->type.dataType.IsIntegerType() ||
+				ctx->type.dataType.IsUnsignedType() )
+			{
+				if( ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+				{
+					ctx->type.dataType.SetTokenType(to.GetTokenType());
+					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+				}
+				else
+				{
+					ConvertToTempVariable(ctx);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+					int offset = AllocateVariable(to, true);
+					if( ctx->type.dataType.IsUnsignedType() )
+						ctx->bc.InstrW_W(asBC_uTOi64, offset, ctx->type.stackOffset);
+					else
+						ctx->bc.InstrW_W(asBC_iTOi64, offset, ctx->type.stackOffset);
+					ctx->type.SetVariable(to, offset, true);
+				}
+			}
+			else if( ctx->type.dataType.IsFloatType() )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_fTOi64, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+			else if( ctx->type.dataType.IsDoubleType() )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_dTOi64, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+		}
+		else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 1  )
+		{
+			if( ctx->type.dataType.IsIntegerType() ||
+				ctx->type.dataType.IsUnsignedType() )
+			{
+				if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+				{
+					ctx->type.dataType.SetTokenType(to.GetTokenType());
+					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+				}
+				else
+				{
+					ConvertToTempVariable(ctx);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+					int offset = AllocateVariable(to, true);
+					ctx->bc.InstrW_W(asBC_i64TOi, offset, ctx->type.stackOffset);
+					ctx->type.SetVariable(to, offset, true);
+				}
+			}
+			else if( ctx->type.dataType.IsFloatType() )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_fTOu, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+			else if( ctx->type.dataType.IsDoubleType() )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_dTOu, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+
+			// Convert to smaller integer if necessary
+			s = to.GetSizeInMemoryBytes();
+			if( s < 4 )
+			{
+				ConvertToTempVariable(ctx);
+				if( s == 1 )
+					ctx->bc.InstrSHORT(asBC_iTOb, (short)ctx->type.stackOffset);
+				else if( s == 2 )
+					ctx->bc.InstrSHORT(asBC_iTOw, (short)ctx->type.stackOffset);
+			}
+		}
+		else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 2 )
+		{
+			if( ctx->type.dataType.IsIntegerType() ||
+				ctx->type.dataType.IsUnsignedType() )
+			{
+				if( ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+				{
+					ctx->type.dataType.SetTokenType(to.GetTokenType());
+					ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+				}
+				else
+				{
+					ConvertToTempVariable(ctx);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+					int offset = AllocateVariable(to, true);
+					if( ctx->type.dataType.IsUnsignedType() )
+						ctx->bc.InstrW_W(asBC_uTOi64, offset, ctx->type.stackOffset);
+					else
+						ctx->bc.InstrW_W(asBC_iTOi64, offset, ctx->type.stackOffset);
+					ctx->type.SetVariable(to, offset, true);
+				}
+			}
+			else if( ctx->type.dataType.IsFloatType() )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_fTOu64, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+			else if( ctx->type.dataType.IsDoubleType() )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_dTOu64, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+
+				if( convType != asIC_EXPLICIT_VAL_CAST )
+					Warning(TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC, node);
+			}
+		}
+		else if( to.IsFloatType() )
+		{
+			if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_iTOf, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+			}
+			else if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_i64TOf, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+			}
+			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_uTOf, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+			}
+			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_u64TOf, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+			}
+			else if( ctx->type.dataType.IsDoubleType() )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_dTOf, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+			}
+		}
+		else if( to.IsDoubleType() )
+		{
+			if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_iTOd, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+			}
+			else if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_i64TOd, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+			}
+			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_uTOd, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+			}
+			else if( ctx->type.dataType.IsUnsignedType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				ConvertToTempVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_u64TOd, (short)ctx->type.stackOffset);
+				ctx->type.dataType.SetTokenType(to.GetTokenType());
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+			}
+			else if( ctx->type.dataType.IsFloatType() )
+			{
+				ConvertToTempVariable(ctx);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+				int offset = AllocateVariable(to, true);
+				ctx->bc.InstrW_W(asBC_fTOd, offset, ctx->type.stackOffset);
+				ctx->type.SetVariable(to, offset, true);
+			}
+		}
+	}
+	else
+	{
+		if( ((to.IsIntegerType() && !to.IsEnumType()) || to.IsUnsignedType() ||
+			 to.IsFloatType()   || to.IsDoubleType() ||
+			 (to.IsEnumType() && convType == asIC_EXPLICIT_VAL_CAST)) &&
+			(ctx->type.dataType.IsIntegerType() || ctx->type.dataType.IsUnsignedType() ||
+			 ctx->type.dataType.IsFloatType()   || ctx->type.dataType.IsDoubleType()) )
+		{
+			ctx->type.dataType.SetTokenType(to.GetTokenType());
+			ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+		}
+	}
+
+	// Primitive types on the stack, can be const or non-const
+	ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
+	return cost;
+}
+
+asUINT asCCompiler::ImplicitConvLambdaToFunc(asCExprContext *ctx, const asCDataType &to, asCScriptNode * /*node*/, EImplicitConv /*convType*/, bool generateCode)
+{
+	asASSERT( to.IsFuncdef() && ctx->IsLambda() );
+
+	asCScriptFunction *funcDef = CastToFuncdefType(to.GetTypeInfo())->funcdef;
+
+	// Check that the lambda has the correct amount of arguments
+	asUINT count = 0;
+	asCScriptNode *argNode = ctx->exprNode->firstChild;
+	while( argNode->nodeType != snStatementBlock )
+	{
+		// Check if the specified parameter types match the funcdef
+		if (argNode->nodeType == snDataType)
+		{
+			asCDataType dt = builder->CreateDataTypeFromNode(argNode, script, outFunc->nameSpace, false, outFunc->objectType);
+			asETypeModifiers inOutFlag;
+			dt = builder->ModifyDataTypeFromNode(dt, argNode->next, script, &inOutFlag, 0);
+
+			if (count >= funcDef->parameterTypes.GetLength() ||
+				funcDef->parameterTypes[count] != dt ||
+				funcDef->inOutFlags[count] != inOutFlag)
+				return asCC_NO_CONV;
+
+			argNode = argNode->next;
+		}
+
+		if( argNode->nodeType == snIdentifier )
+			count++;
+		argNode = argNode->next;
+	}
+
+	if (funcDef->parameterTypes.GetLength() != count)
+		return asCC_NO_CONV;
+
+	asASSERT(argNode->nodeType == snStatementBlock);
+
+	// The Lambda can be used as this funcdef
+	ctx->type.dataType = to;
+
+	if( generateCode )
+	{
+		// Build a unique name for the anonymous function
+		asCString name;
+		if( m_globalVar )
+			name.Format("$%s$%d", m_globalVar->name.AddressOf(), numLambdas++);
+		else
+			name.Format("$%s$%d", outFunc->GetDeclaration(), numLambdas++);
+
+		// Register the lambda with the builder for later compilation
+		asCScriptFunction *func = builder->RegisterLambda(ctx->exprNode, script, funcDef, name, outFunc->nameSpace, outFunc->IsShared());
+		asASSERT( func == 0 || funcDef->IsSignatureExceptNameEqual(func) );
+		ctx->bc.InstrPTR(asBC_FuncPtr, func);
+
+		// Clear the expression node as it is no longer valid
+		ctx->exprNode = 0;
+	}
+
+	return asCC_CONST_CONV;
+}
+
+asUINT asCCompiler::ImplicitConversion(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode, bool allowObjectConstruct)
+{
+	asASSERT( ctx->type.dataType.GetTokenType() != ttUnrecognizedToken ||
+		      ctx->type.dataType.IsNullHandle() ||
+		      ctx->IsAnonymousInitList() );
+
+	if( to.IsFuncdef() && ctx->IsLambda() )
+		return ImplicitConvLambdaToFunc(ctx, to, node, convType, generateCode);
+
+	if (ctx->IsAnonymousInitList())
+	{
+		if (to.GetBehaviour() && to.GetBehaviour()->listFactory)
+		{
+			if (generateCode)
+				CompileAnonymousInitList(ctx->exprNode, ctx, to);
+			else
+				ctx->type.dataType = to;
+		}
+		return asCC_NO_CONV;
+	}
+
+	// No conversion from void to any other type
+	if( ctx->type.dataType.GetTokenType() == ttVoid )
+		return asCC_NO_CONV;
+
+	// No conversion from class method to any type (it requires delegate)
+	if( ctx->IsClassMethod() )
+		return asCC_NO_CONV;
+
+	// Do we want a var type?
+	if( to.GetTokenType() == ttQuestion )
+	{
+		// Any type can be converted to a var type, but only when not generating code
+		asASSERT( !generateCode );
+
+		ctx->type.dataType = to;
+
+		return asCC_VARIABLE_CONV;
+	}
+	// Do we want a primitive?
+	else if( to.IsPrimitive() )
+	{
+		if( !ctx->type.dataType.IsPrimitive() )
+			return ImplicitConvObjectToPrimitive(ctx, to, node, convType, generateCode);
+		else
+			return ImplicitConvPrimitiveToPrimitive(ctx, to, node, convType, generateCode);
+	}
+	else // The target is a complex type
+	{
+		if( ctx->type.dataType.IsPrimitive() )
+			return ImplicitConvPrimitiveToObject(ctx, to, node, convType, generateCode, allowObjectConstruct);
+		else if( ctx->type.IsNullConstant() || ctx->type.dataType.GetTypeInfo() )
+			return ImplicitConvObjectToObject(ctx, to, node, convType, generateCode, allowObjectConstruct);
+	}
+
+	return asCC_NO_CONV;
+}
+
+asUINT asCCompiler::ImplicitConvObjectToPrimitive(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode)
+{
+	if( ctx->type.isExplicitHandle )
+	{
+		// An explicit handle cannot be converted to a primitive
+		if( convType != asIC_IMPLICIT_CONV && node )
+		{
+			asCString str;
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+		}
+		return asCC_NO_CONV;
+	}
+
+	// Find matching value cast behaviours
+	// Here we're only interested in those that convert the type to a primitive type
+	asCArray<int> funcs;
+	asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+	if( ot == 0 )
+	{
+		if( convType != asIC_IMPLICIT_CONV && node )
+		{
+			asCString str;
+			str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+		}
+		return asCC_NO_CONV;
+	}
+
+
+	if( convType == asIC_EXPLICIT_VAL_CAST )
+	{
+		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
+		{
+			// accept both implicit and explicit cast
+			asCScriptFunction *mthd = engine->scriptFunctions[ot->methods[n]];
+			if( (mthd->name == "opConv" || mthd->name == "opImplConv") &&
+				mthd->parameterTypes.GetLength() == 0 &&
+				mthd->returnType.IsPrimitive() )
+				funcs.PushLast(ot->methods[n]);
+		}
+	}
+	else
+	{
+		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
+		{
+			// accept only implicit cast
+			asCScriptFunction *mthd = engine->scriptFunctions[ot->methods[n]];
+			if( mthd->name == "opImplConv" &&
+				mthd->parameterTypes.GetLength() == 0 &&
+				mthd->returnType.IsPrimitive() )
+				funcs.PushLast(ot->methods[n]);
+		}
+	}
+
+	FilterConst(funcs, !ctx->type.dataType.IsReadOnly());
+
+	int funcId = 0;
+	if( to.IsMathType() )
+	{
+		// This matrix describes the priorities of the types to search for, for each target type
+		// The first column is the target type, the priorities goes from left to right
+		eTokenType matchMtx[10][10] =
+		{
+			{ttDouble, ttFloat,  ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
+			{ttFloat,  ttDouble, ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8},
+			{ttInt64,  ttUInt64, ttInt,    ttUInt,   ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
+			{ttUInt64, ttInt64,  ttUInt,   ttInt,    ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
+			{ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt16,  ttUInt16, ttInt8,   ttUInt8,  ttDouble, ttFloat},
+			{ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt16, ttInt16,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
+			{ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttInt8,   ttUInt8,  ttDouble, ttFloat},
+			{ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttUInt8,  ttInt8,   ttDouble, ttFloat},
+			{ttInt8,   ttUInt8,  ttInt16,  ttUInt16, ttInt,    ttUInt,   ttInt64,  ttUInt64, ttDouble, ttFloat},
+			{ttUInt8,  ttInt8,   ttUInt16, ttInt16,  ttUInt,   ttInt,    ttUInt64, ttInt64,  ttDouble, ttFloat},
+		};
+
+		// Which row to use?
+		eTokenType *row = 0;
+		for( unsigned int type = 0; type < 10; type++ )
+		{
+			if( to.GetTokenType() == matchMtx[type][0] )
+			{
+				row = &matchMtx[type][0];
+				break;
+			}
+		}
+
+		// Find the best matching cast operator
+		if( row )
+		{
+			asCDataType target(to);
+
+			// Priority goes from left to right in the matrix
+			for( unsigned int attempt = 0; attempt < 10 && funcId == 0; attempt++ )
+			{
+				target.SetTokenType(row[attempt]);
+				for( unsigned int n = 0; n < funcs.GetLength(); n++ )
+				{
+					asCScriptFunction *descr = builder->GetFunctionDescription(funcs[n]);
+					if( descr->returnType.IsEqualExceptRefAndConst(target) )
+					{
+						funcId = funcs[n];
+						break;
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		// Only accept the exact conversion for non-math types
+
+		// Find the matching cast operator
+		for( unsigned int n = 0; n < funcs.GetLength(); n++ )
+		{
+			asCScriptFunction *descr = builder->GetFunctionDescription(funcs[n]);
+			if( descr->returnType.IsEqualExceptRefAndConst(to) )
+			{
+				funcId = funcs[n];
+				break;
+			}
+		}
+	}
+
+	// Did we find a suitable function?
+	if( funcId != 0 )
+	{
+		asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
+		if( generateCode )
+		{
+			Dereference(ctx, true);
+			PerformFunctionCall(funcId, ctx);
+		}
+		else
+			ctx->type.Set(descr->returnType);
+
+		// Allow one more implicit conversion to another primitive type
+		return asCC_OBJ_TO_PRIMITIVE_CONV + ImplicitConversion(ctx, to, node, convType, generateCode, false);
+	}
+
+	// TODO: clean-up: This part is similar to what is in ImplicitConvObjectValue
+	// If no direct conversion is found we should look for the generic form 'void opConv(?&out)'
+	funcs.SetLength(0);
+	for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
+	{
+		asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+		if( ((convType == asIC_EXPLICIT_VAL_CAST) && func->name == "opConv") ||
+			func->name == "opImplConv" )
+		{
+			// Does the operator take the ?&out parameter?
+			if( func->returnType != asCDataType::CreatePrimitive(ttVoid, false) ||
+				func->parameterTypes.GetLength() != 1 ||
+				func->parameterTypes[0].GetTokenType() != ttQuestion ||
+				func->inOutFlags[0] != asTM_OUTREF )
+				continue;
+
+			funcs.PushLast(ot->methods[n]);
+		}
+	}
+
+	FilterConst(funcs, !ctx->type.dataType.IsReadOnly());
+
+	// If there are multiple valid value casts, then we must choose the most appropriate one
+	if (funcs.GetLength() > 1)
+	{
+		// This should only happen in case of explicit value cast and
+		// the application has registered both opImplConv and opConv
+		asASSERT(convType == asIC_EXPLICIT_VAL_CAST);
+		asASSERT(funcs.GetLength() == 2);
+
+		for (asUINT n = 0; n < funcs.GetLength(); n++)
+		{
+			asCScriptFunction *func = engine->scriptFunctions[funcs[n]];
+			if (func->name == "opImplConv")
+			{
+				funcs.RemoveIndex(n);
+				n--;
+			}
+		}
+	}
+
+	if( funcs.GetLength() == 1 )
+	{
+		if( generateCode )
+		{
+			// Allocate a temporary variable of the requested type
+			int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
+			CallDefaultConstructor(to, stackOffset, IsVariableOnHeap(stackOffset), &ctx->bc, node);
+
+			// Pass the reference of that variable to the function as output parameter
+			asCDataType toRef(to);
+			toRef.MakeReference(true);
+			toRef.MakeReadOnly(false);
+			asCArray<asCExprContext *> args;
+			asCExprContext arg(engine);
+			// Don't mark the variable as temporary, so it won't be freed too early
+			arg.type.SetVariable(toRef, stackOffset, false);
+			arg.type.isLValue = true;
+			arg.exprNode = node;
+			args.PushLast(&arg);
+
+			// Call the behaviour method
+			MakeFunctionCall(ctx, funcs[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node);
+
+			// Use the reference to the variable as the result of the expression
+			// Now we can mark the variable as temporary
+			toRef.MakeReference(false);
+			ctx->type.SetVariable(toRef, stackOffset, true);
+		}
+		else
+			ctx->type.Set(to);
+
+		return asCC_OBJ_TO_PRIMITIVE_CONV;
+	}
+
+	if( convType != asIC_IMPLICIT_CONV && node )
+	{
+		asCString str;
+		str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+	}
+
+	return asCC_NO_CONV;
+}
+
+
+asUINT asCCompiler::ImplicitConvObjectRef(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode)
+{
+	// Convert null to any object type handle, but not to a non-handle type
+	if( ctx->type.IsNullConstant() && ctx->methodName == "" )
+	{
+		if( to.IsObjectHandle() )
+		{
+			ctx->type.dataType = to;
+			return asCC_REF_CONV;
+		}
+		return asCC_NO_CONV;
+	}
+
+	asASSERT(ctx->type.dataType.GetTypeInfo() || ctx->methodName != "");
+
+	// First attempt to convert the base type without instantiating another instance
+	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() && ctx->methodName == "" )
+	{
+		// If the to type is an interface and the from type implements it, then we can convert it immediately
+		if( ctx->type.dataType.GetTypeInfo()->Implements(to.GetTypeInfo()) )
+		{
+			ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+			return asCC_REF_CONV;
+		}
+		// If the to type is a class and the from type derives from it, then we can convert it immediately
+		else if( ctx->type.dataType.GetTypeInfo()->DerivesFrom(to.GetTypeInfo()) )
+		{
+			ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+			return asCC_REF_CONV;
+		}
+		// If the types are not equal yet, then we may still be able to find a reference cast
+		else if( ctx->type.dataType.GetTypeInfo() != to.GetTypeInfo() )
+		{
+			// We may still be able to find an implicit ref cast behaviour
+			CompileRefCast(ctx, to, convType == asIC_EXPLICIT_REF_CAST, node, generateCode);
+
+			// Was the conversion done?
+			if( ctx->type.dataType.GetTypeInfo() == to.GetTypeInfo() )
+				return asCC_REF_CONV;
+		}
+	}
+
+	// Convert matching function types
+	if( to.IsFuncdef() )
+	{
+		// If the input expression is already a funcdef, check if it can be converted
+		if( ctx->type.dataType.IsFuncdef() &&
+			to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() )
+		{
+			asCScriptFunction *toFunc = CastToFuncdefType(to.GetTypeInfo())->funcdef;
+			asCScriptFunction *fromFunc = CastToFuncdefType(ctx->type.dataType.GetTypeInfo())->funcdef;
+			if( toFunc->IsSignatureExceptNameEqual(fromFunc) )
+			{
+				ctx->type.dataType.SetTypeInfo(to.GetTypeInfo());
+				return asCC_REF_CONV;
+			}
+		}
+
+		// If the input expression is a deferred function ref, check if there is a matching func
+		if( ctx->methodName != "" )
+		{
+			// Determine the namespace
+			asSNameSpace *ns = 0;
+			asCString name = "";
+			int pos = ctx->methodName.FindLast("::");
+			if( pos >= 0 )
+			{
+				asCString nsName = ctx->methodName.SubString(0, pos+2);
+				// Trim off the last ::
+				if( nsName.GetLength() > 2 )
+					nsName.SetLength(nsName.GetLength()-2);
+				ns = DetermineNameSpace(nsName);
+				name = ctx->methodName.SubString(pos+2);
+			}
+			else
+			{
+				DetermineNameSpace("");
+				name = ctx->methodName;
+			}
+
+			asCArray<int> funcs;
+			if( ns )
+				builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
+
+			// Check if any of the functions have perfect match
+			asCScriptFunction *toFunc = CastToFuncdefType(to.GetTypeInfo())->funcdef;
+			for( asUINT n = 0; n < funcs.GetLength(); n++ )
+			{
+				asCScriptFunction *func = builder->GetFunctionDescription(funcs[n]);
+				if( toFunc->IsSignatureExceptNameEqual(func) )
+				{
+					if( generateCode )
+					{
+						ctx->bc.InstrPTR(asBC_FuncPtr, func);
+
+						// Make sure the identified function is shared if we're compiling a shared function
+						if( !func->IsShared() && outFunc->IsShared() )
+						{
+							asCString msg;
+							msg.Format(TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s, func->GetDeclaration());
+							Error(msg, node);
+						}
+					}
+
+					ctx->type.dataType = asCDataType::CreateType(to.GetTypeInfo(), false);
+					return asCC_REF_CONV;
+				}
+			}
+		}
+	}
+
+	return asCC_NO_CONV;
+}
+
+asUINT asCCompiler::ImplicitConvObjectValue(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode)
+{
+	asUINT cost = asCC_NO_CONV;
+
+	// If the base type is still different, and we are allowed to instance
+	// another object then we can try an implicit value cast
+	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() )
+	{
+		// TODO: Implement support for implicit constructor/factory
+		asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+		if( ot == 0 )
+			return cost;
+
+		asCArray<int> funcs;
+		if( convType == asIC_EXPLICIT_VAL_CAST )
+		{
+			for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+
+				// accept both implicit and explicit cast
+				if( (func->name == "opConv" ||
+					 func->name == "opImplConv") &&
+					func->returnType.GetTypeInfo() == to.GetTypeInfo() &&
+					func->parameterTypes.GetLength() == 0 )
+					funcs.PushLast(ot->methods[n]);
+			}
+		}
+		else
+		{
+			for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+
+				// accept only implicit cast
+				if( func->name == "opImplConv" &&
+					func->returnType.GetTypeInfo() == to.GetTypeInfo() &&
+					func->parameterTypes.GetLength() == 0 )
+					funcs.PushLast(ot->methods[n]);
+			}
+		}
+
+		FilterConst(funcs, !ctx->type.dataType.IsReadOnly());
+
+		// If there are multiple valid value casts, then we must choose the most appropriate one
+		if (funcs.GetLength() > 1)
+		{
+			// This should only happen in case of explicit value cast and
+			// the application has registered both opImplConv and opConv
+			asASSERT(convType == asIC_EXPLICIT_VAL_CAST);
+			asASSERT(funcs.GetLength() == 2);
+
+			for (asUINT n = 0; n < funcs.GetLength(); n++)
+			{
+				asCScriptFunction *func = engine->scriptFunctions[funcs[n]];
+				if (func->name == "opImplConv")
+				{
+					funcs.RemoveIndex(n);
+					n--;
+				}
+			}
+		}
+
+		if( funcs.GetLength() == 1 )
+		{
+			asCScriptFunction *f = builder->GetFunctionDescription(funcs[0]);
+			if( generateCode )
+			{
+				Dereference(ctx, true);
+
+				bool useVariable = false;
+				int  stackOffset = 0;
+
+				if( f->DoesReturnOnStack() )
+				{
+					useVariable = true;
+					stackOffset = AllocateVariable(f->returnType, true);
+
+					// Push the pointer to the pre-allocated space for the return value
+					ctx->bc.InstrSHORT(asBC_PSF, short(stackOffset));
+
+					// The object pointer is already on the stack, but should be the top
+					// one, so we need to swap the pointers in order to get the correct
+					ctx->bc.Instr(asBC_SwapPtr);
+				}
+
+				PerformFunctionCall(funcs[0], ctx, false, 0, 0, useVariable, stackOffset);
+			}
+			else
+				ctx->type.Set(f->returnType);
+
+			cost = asCC_TO_OBJECT_CONV;
+		}
+		else
+		{
+			// TODO: cleanup: This part is similar to the second half of ImplicitConvObjectToPrimitive
+			// Look for a value cast with variable type
+			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+				if( ((convType == asIC_EXPLICIT_VAL_CAST) && func->name == "opConv") ||
+					func->name == "opImplConv" )
+				{
+					// Does the operator take the ?&out parameter?
+					if( func->returnType != asCDataType::CreatePrimitive(ttVoid, false) ||
+						func->parameterTypes.GetLength() != 1 ||
+						func->parameterTypes[0].GetTokenType() != ttQuestion ||
+						func->inOutFlags[0] != asTM_OUTREF )
+						continue;
+
+					funcs.PushLast(ot->methods[n]);
+				}
+			}
+
+			FilterConst(funcs, !ctx->type.dataType.IsReadOnly());
+
+			// If there are multiple valid value casts, then we must choose the most appropriate one
+			if (funcs.GetLength() > 1)
+			{
+				// This should only happen in case of explicit value cast and
+				// the application has registered both opImplConv and opConv
+				asASSERT(convType == asIC_EXPLICIT_VAL_CAST);
+				asASSERT(funcs.GetLength() == 2);
+
+				for (asUINT n = 0; n < funcs.GetLength(); n++)
+				{
+					asCScriptFunction *func = engine->scriptFunctions[funcs[n]];
+					if (func->name == "opImplConv")
+					{
+						funcs.RemoveIndex(n);
+						n--;
+					}
+				}
+			}
+
+			if( funcs.GetLength() == 1 )
+			{
+				cost = asCC_TO_OBJECT_CONV;
+				if( generateCode )
+				{
+					// Allocate a temporary variable of the requested type
+					int stackOffset = AllocateVariableNotIn(to, true, false, ctx);
+					CallDefaultConstructor(to, stackOffset, IsVariableOnHeap(stackOffset), &ctx->bc, node);
+
+					// Pass the reference of that variable to the function as output parameter
+					asCDataType toRef(to);
+					toRef.MakeReference(false);
+					asCExprContext arg(engine);
+					arg.bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+
+					// If this an object on the heap, the pointer must be dereferenced
+					if( IsVariableOnHeap(stackOffset) )
+						arg.bc.Instr(asBC_RDSPtr);
+
+					// Don't mark the variable as temporary, so it won't be freed too early
+					arg.type.SetVariable(toRef, stackOffset, false);
+					arg.type.isLValue = true;
+					arg.exprNode = node;
+
+					// Mark the argument as clean, so that MakeFunctionCall knows it
+					// doesn't have to make a copy of it in order to protect the value
+					arg.isCleanArg = true;
+
+					// Call the behaviour method
+					asCArray<asCExprContext *> args;
+					args.PushLast(&arg);
+					MakeFunctionCall(ctx, funcs[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node);
+
+					// Use the reference to the variable as the result of the expression
+					// Now we can mark the variable as temporary
+					ctx->type.SetVariable(toRef, stackOffset, true);
+					ctx->bc.InstrSHORT(asBC_PSF, (short)stackOffset);
+				}
+				else
+				{
+					// All casts are legal
+					ctx->type.Set(to);
+				}
+			}
+			else if( CastToObjectType(to.GetTypeInfo()) )
+			{
+				// If no opConv/opImplConv methods were found on the object, then try to find a conversion constructor on the target type
+				if( to.GetTypeInfo()->flags & asOBJ_REF )
+					funcs = CastToObjectType(to.GetTypeInfo())->beh.factories;
+				else
+					funcs = CastToObjectType(to.GetTypeInfo())->beh.constructors;
+
+				// If not explicit cast, remove any explicit conversion constructors
+				for (asUINT n = 0; n < funcs.GetLength(); n++)
+				{
+					asCScriptFunction *f = engine->scriptFunctions[funcs[n]];
+					if( f == 0 || f->parameterTypes.GetLength() != 1 || (convType != asIC_EXPLICIT_VAL_CAST && f->IsExplicit()) )
+						funcs.RemoveIndex(n--);
+				}
+
+				asCArray<asCExprContext *> args;
+				args.PushLast(ctx);
+
+				cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, node, 0, 0, 0, false, true, false);
+
+				// Did we find a matching constructor?
+				if (funcs.GetLength() == 1)
+				{
+					if (generateCode)
+					{
+						// TODO: This should really reuse the code from CompileConstructCall
+
+						// Allocate the new object
+						asCExprValue tempObj;
+						asCExprContext e(engine);
+						bool onHeap = false;
+						if (to.GetTypeInfo()->flags & asOBJ_VALUE)
+						{
+							tempObj.dataType = to;
+							tempObj.dataType.MakeReference(false);
+							tempObj.stackOffset = (short)AllocateVariable(tempObj.dataType, true);
+							tempObj.dataType.MakeReference(true);
+							tempObj.isTemporary = true;
+							tempObj.isVariable = true;
+
+							onHeap = IsVariableOnHeap(tempObj.stackOffset);
+
+							// Push the address of the object on the stack
+							if (onHeap)
+								e.bc.InstrSHORT(asBC_VAR, (short)tempObj.stackOffset);
+						}
+
+						PrepareFunctionCall(funcs[0], &e.bc, args);
+						MoveArgsToStack(funcs[0], &e.bc, args, false);
+
+						if (to.GetTypeInfo()->flags & asOBJ_VALUE)
+						{
+							// If the object is allocated on the stack, then call the constructor as a normal function
+							if (onHeap)
+							{
+								int offset = 0;
+								asCScriptFunction *descr = builder->GetFunctionDescription(funcs[0]);
+								offset = descr->parameterTypes[0].GetSizeOnStackDWords();
+
+								e.bc.InstrWORD(asBC_GETREF, (asWORD)offset);
+							}
+							else
+								e.bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+						}
+
+						PerformFunctionCall(funcs[0], &e, onHeap, &args, CastToObjectType(tempObj.dataType.GetTypeInfo()));
+
+						if (to.GetTypeInfo()->flags & asOBJ_VALUE)
+						{
+							// Add tag that the object has been initialized
+							e.bc.ObjInfo(tempObj.stackOffset, asOBJ_INIT);
+
+							// The constructor doesn't return anything,
+							// so we have to manually inform the type of
+							// the return value
+							e.type = tempObj;
+							if (!onHeap)
+								e.type.dataType.MakeReference(false);
+
+							// Push the address of the object on the stack again
+							e.bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+						}
+
+						MergeExprBytecodeAndType(ctx, &e);
+					}
+					else
+					{
+						ctx->type.Set(asCDataType::CreateType(to.GetTypeInfo(), false));
+					}
+				}
+			}
+		}
+	}
+
+	return cost;
+}
+
+asUINT asCCompiler::ImplicitConvObjectToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode, bool allowObjectConstruct)
+{
+	// First try a ref cast
+	asUINT cost = ImplicitConvObjectRef(ctx, to, node, convType, generateCode);
+
+	// If the desired type is an asOBJ_ASHANDLE then we'll assume it is allowed to implicitly
+	// construct the object through any of the available constructors (except those marked as explicit)
+	if( to.GetTypeInfo() && (to.GetTypeInfo()->flags & asOBJ_ASHANDLE) && to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() && allowObjectConstruct )
+	{
+		asCArray<int> funcs;
+		funcs = CastToObjectType(to.GetTypeInfo())->beh.constructors;
+
+		// Don't allow use of explicit constructors/factories in implicit conversions
+		if (convType == asIC_IMPLICIT_CONV)
+		{
+			for (asUINT n = 0; n < funcs.GetLength(); n++)
+			{
+				asCScriptFunction* desc = builder->GetFunctionDescription(funcs[n]);
+				if (desc->IsExplicit())
+					funcs.RemoveIndex(n--);
+			}
+		}
+
+		asCArray<asCExprContext *> args;
+		args.PushLast(ctx);
+
+		cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, node, 0, 0, 0, false, true, false);
+
+		// Did we find a matching constructor?
+		if( funcs.GetLength() == 1 )
+		{
+			if( generateCode )
+			{
+				// If the ASHANDLE receives a variable type parameter, then we need to
+				// make sure the expression is treated as a handle and not as a value
+				asCScriptFunction *func = engine->scriptFunctions[funcs[0]];
+				if( func->parameterTypes[0].GetTokenType() == ttQuestion )
+				{
+					if( !ctx->type.isExplicitHandle )
+					{
+						asCDataType toHandle = ctx->type.dataType;
+						toHandle.MakeHandle(true);
+						toHandle.MakeReference(true);
+						toHandle.MakeHandleToConst(ctx->type.dataType.IsReadOnly());
+						ImplicitConversion(ctx, toHandle, node, asIC_IMPLICIT_CONV, true, false);
+
+						asASSERT( ctx->type.dataType.IsObjectHandle() );
+					}
+					ctx->type.isExplicitHandle = true;
+				}
+
+				// TODO: This should really reuse the code from CompileConstructCall
+
+				// Allocate the new object
+				asCExprValue tempObj;
+				tempObj.dataType = to;
+				tempObj.dataType.MakeReference(false);
+				tempObj.stackOffset = (short)AllocateVariable(tempObj.dataType, true);
+				tempObj.dataType.MakeReference(true);
+				tempObj.isTemporary = true;
+				tempObj.isVariable = true;
+
+				bool onHeap = IsVariableOnHeap(tempObj.stackOffset);
+
+				// Push the address of the object on the stack
+				asCExprContext e(engine);
+				if( onHeap )
+					e.bc.InstrSHORT(asBC_VAR, (short)tempObj.stackOffset);
+
+				PrepareFunctionCall(funcs[0], &e.bc, args);
+				MoveArgsToStack(funcs[0], &e.bc, args, false);
+
+				// If the object is allocated on the stack, then call the constructor as a normal function
+				if( onHeap )
+				{
+					int offset = 0;
+					asCScriptFunction *descr = builder->GetFunctionDescription(funcs[0]);
+					offset = descr->parameterTypes[0].GetSizeOnStackDWords();
+
+					e.bc.InstrWORD(asBC_GETREF, (asWORD)offset);
+				}
+				else
+					e.bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+
+				PerformFunctionCall(funcs[0], &e, onHeap, &args, CastToObjectType(tempObj.dataType.GetTypeInfo()));
+
+				// Add tag that the object has been initialized
+				e.bc.ObjInfo(tempObj.stackOffset, asOBJ_INIT);
+
+				// The constructor doesn't return anything,
+				// so we have to manually inform the type of
+				// the return value
+				e.type = tempObj;
+				if( !onHeap )
+					e.type.dataType.MakeReference(false);
+
+				// Push the address of the object on the stack again
+				e.bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+
+				MergeExprBytecodeAndType(ctx, &e);
+			}
+			else
+			{
+				ctx->type.Set(asCDataType::CreateType(to.GetTypeInfo(), false));
+			}
+		}
+	}
+
+	// If the base type is still different, and we are allowed to instance
+	// another object then we can try an implicit value cast
+	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() && allowObjectConstruct )
+	{
+		// Attempt implicit value cast
+		cost = ImplicitConvObjectValue(ctx, to, node, convType, generateCode);
+	}
+
+	// If we still haven't converted the base type to the correct type, then there is
+	//  no need to continue as it is not possible to do the conversion
+	if( to.GetTypeInfo() != ctx->type.dataType.GetTypeInfo() )
+		return asCC_NO_CONV;
+
+
+	if( to.IsObjectHandle() )
+	{
+		// There is no extra cost in converting to a handle
+
+		// reference to handle -> handle
+		// reference           -> handle
+		// object              -> handle
+		// handle              -> reference to handle
+		// reference           -> reference to handle
+		// object              -> reference to handle
+
+		if( (!ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsReadOnly() && !to.IsHandleToConst()) ||
+			(ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsHandleToConst() && !to.IsHandleToConst()) )
+		{
+			// String literals can be implicitly converted to temporary local variables in order to pass them to functions expecting non-const
+			// TODO: NEWSTRING: Should have an engine property to warn or error on this
+			if (ctx->type.isConstant && ctx->type.dataType.IsEqualExceptRefAndConst(engine->stringType))
+			{
+				if (generateCode)
+					PrepareTemporaryVariable(node, ctx);
+				else
+				{
+					ctx->type.dataType.MakeReadOnly(false);
+					ctx->type.isConstant = false;
+				}
+
+				// Add the cost for the copy
+				cost += asCC_TO_OBJECT_CONV;
+			}
+			else if( convType != asIC_IMPLICIT_CONV )
+			{
+				asASSERT(node);
+				asCString str;
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+				Error(str, node);
+			}
+		}
+
+		if( !ctx->type.dataType.IsObjectHandle() )
+		{
+			// An object type can be directly converted to a handle of the
+			// same type by doing a ref copy to a new variable
+			if( ctx->type.dataType.SupportHandles() )
+			{
+				asCDataType dt = ctx->type.dataType;
+				dt.MakeHandle(true);
+				dt.MakeReference(false);
+
+				if( generateCode )
+				{
+					// If the expression is already a local variable, then it is not
+					// necessary to do a ref copy, as the ref objects on the stack are
+					// really handles, only the handles cannot be modified.
+					if( ctx->type.isVariable )
+					{
+						bool isHandleToConst = ctx->type.dataType.IsReadOnly();
+						ctx->type.dataType.MakeReadOnly(false);
+						ctx->type.dataType.MakeHandle(true);
+						ctx->type.dataType.MakeReadOnly(true);
+						ctx->type.dataType.MakeHandleToConst(isHandleToConst);
+
+						if( to.IsReference() && !ctx->type.dataType.IsReference() )
+						{
+							ctx->bc.Instr(asBC_PopPtr);
+							ctx->bc.InstrSHORT(asBC_PSF, (short)ctx->type.stackOffset);
+							ctx->type.dataType.MakeReference(true);
+						}
+						else if( ctx->type.dataType.IsReference() )
+						{
+							ctx->bc.Instr(asBC_RDSPtr);
+							ctx->type.dataType.MakeReference(false);
+						}
+					}
+					else
+					{
+						int offset = AllocateVariable(dt, true);
+
+						if( ctx->type.dataType.IsReference() )
+							ctx->bc.Instr(asBC_RDSPtr);
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						if (dt.IsFuncdef())
+							ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+						else
+							ctx->bc.InstrPTR(asBC_REFCPY, dt.GetTypeInfo());
+						ctx->bc.Instr(asBC_PopPtr);
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+
+						ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+						if( to.IsReference() )
+							dt.MakeReference(true);
+						else
+							ctx->bc.Instr(asBC_RDSPtr);
+
+						ctx->type.SetVariable(dt, offset, true);
+					}
+				}
+				else
+					ctx->type.dataType = dt;
+
+				// When this conversion is done the expression is no longer an lvalue
+				ctx->type.isLValue = false;
+			}
+		}
+
+		if( ctx->type.dataType.IsObjectHandle() )
+		{
+			// A handle to non-const can be converted to a
+			// handle to const, but not the other way
+			if( to.IsHandleToConst() )
+				ctx->type.dataType.MakeHandleToConst(true);
+
+			// A const handle can be converted to a non-const
+			// handle and vice versa as the handle is just a value
+			ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
+		}
+
+		if( to.IsReference() && !ctx->type.dataType.IsReference() )
+		{
+			if( generateCode )
+			{
+				asASSERT( ctx->type.dataType.IsObjectHandle() );
+
+				// If the input type is a handle, then a simple ref copy is enough
+				bool isExplicitHandle = ctx->type.isExplicitHandle;
+				ctx->type.isExplicitHandle = ctx->type.dataType.IsObjectHandle();
+
+				// If the input type is read-only we'll need to temporarily
+				// remove this constness, otherwise the assignment will fail
+				bool typeIsReadOnly = ctx->type.dataType.IsReadOnly();
+				ctx->type.dataType.MakeReadOnly(false);
+
+				// If the object already is a temporary variable, then the copy
+				// doesn't have to be made as it is already a unique object
+				PrepareTemporaryVariable(node, ctx);
+
+				ctx->type.dataType.MakeReadOnly(typeIsReadOnly);
+				ctx->type.isExplicitHandle = isExplicitHandle;
+			}
+
+			// A non-reference can be converted to a reference,
+			// by putting the value in a temporary variable
+			ctx->type.dataType.MakeReference(true);
+
+			// Since it is a new temporary variable it doesn't have to be const
+			ctx->type.dataType.MakeReadOnly(to.IsReadOnly());
+		}
+		else if( !to.IsReference() && ctx->type.dataType.IsReference() )
+		{
+			Dereference(ctx, generateCode);
+		}
+	}
+	else // if( !to.IsObjectHandle() )
+	{
+		if( !to.IsReference() )
+		{
+			// reference to handle -> object
+			// handle              -> object
+			// reference           -> object
+
+			// An implicit handle can be converted to an object by adding a check for null pointer
+			if( ctx->type.dataType.IsObjectHandle() && !ctx->type.isExplicitHandle )
+			{
+				if( generateCode )
+				{
+					if( ctx->type.dataType.IsReference() )
+					{
+						// The pointer on the stack refers to the handle
+						ctx->bc.Instr(asBC_ChkRefS);
+					}
+					else
+					{
+						// The pointer on the stack refers to the object
+						ctx->bc.Instr(asBC_CHKREF);
+					}
+				}
+
+				ctx->type.dataType.MakeHandle(false);
+			}
+
+			// A const object can be converted to a non-const object through a copy
+			if( ctx->type.dataType.IsReadOnly() && !to.IsReadOnly() &&
+				allowObjectConstruct )
+			{
+				// Does the object type allow a copy to be made?
+				if( ctx->type.dataType.CanBeCopied() )
+				{
+					if( generateCode )
+					{
+						// Make a temporary object with the copy
+						PrepareTemporaryVariable(node, ctx);
+					}
+
+					// In case the object was already in a temporary variable, then the function
+					// didn't really do anything so we need to remove the constness here
+					ctx->type.dataType.MakeReadOnly(false);
+
+					// Add the cost for the copy
+					cost += asCC_TO_OBJECT_CONV;
+				}
+			}
+
+			if( ctx->type.dataType.IsReference() )
+			{
+				// This may look strange, but a value type allocated on the stack is already
+				// correct, so nothing should be done other than remove the mark as reference.
+				// For types allocated on the heap, it is necessary to dereference the pointer
+				// that is currently on the stack
+				if( IsVariableOnHeap(ctx->type.stackOffset) )
+					Dereference(ctx, generateCode);
+				else
+					ctx->type.dataType.MakeReference(false);
+			}
+
+			// A non-const object can be converted to a const object directly
+			if( !ctx->type.dataType.IsReadOnly() && to.IsReadOnly() )
+			{
+				ctx->type.dataType.MakeReadOnly(true);
+			}
+		}
+		else // if( to.IsReference() )
+		{
+			// reference to handle -> reference
+			// handle              -> reference
+			// object              -> reference
+
+			if( ctx->type.dataType.IsReference() )
+			{
+				if( ctx->type.isExplicitHandle && ctx->type.dataType.GetTypeInfo() && (ctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
+				{
+					// ASHANDLE objects are really value types, so explicit handle can be removed
+					ctx->type.isExplicitHandle = false;
+					ctx->type.dataType.MakeHandle(false);
+				}
+
+				// A reference to a handle can be converted to a reference to an object
+				// by first reading the address, then verifying that it is not null
+				if( !to.IsObjectHandle() && ctx->type.dataType.IsObjectHandle() && !ctx->type.isExplicitHandle )
+				{
+					ctx->type.dataType.MakeHandle(false);
+					if( generateCode )
+						ctx->bc.Instr(asBC_ChkRefS);
+				}
+
+				// A reference to a non-const can be converted to a reference to a const
+				if( to.IsReadOnly() )
+					ctx->type.dataType.MakeReadOnly(true);
+				else if( ctx->type.dataType.IsReadOnly() && allowObjectConstruct )
+				{
+					// A reference to a const can be converted to a reference to a
+					// non-const by copying the object to a temporary variable
+					ctx->type.dataType.MakeReadOnly(false);
+
+					if( generateCode )
+					{
+						// If the object already is a temporary variable, then the copy
+						// doesn't have to be made as it is already a unique object
+						PrepareTemporaryVariable(node, ctx);
+					}
+
+					// Add the cost for the copy
+					cost += asCC_TO_OBJECT_CONV;
+				}
+			}
+			else // if( !ctx->type.dataType.IsReference() )
+			{
+				// A non-reference handle can be converted to a non-handle reference by checking against null handle
+				if( ctx->type.dataType.IsObjectHandle() )
+				{
+					bool readOnly = false;
+					if( ctx->type.dataType.IsHandleToConst() )
+						readOnly = true;
+
+					if( generateCode )
+					{
+						if( ctx->type.isVariable )
+							ctx->bc.InstrSHORT(asBC_ChkNullV, (short)ctx->type.stackOffset);
+						else
+							ctx->bc.Instr(asBC_CHKREF);
+					}
+					ctx->type.dataType.MakeHandle(false);
+					ctx->type.dataType.MakeReference(true);
+
+					// Make sure a handle to const isn't converted to non-const reference
+					if( readOnly )
+						ctx->type.dataType.MakeReadOnly(true);
+				}
+				else
+				{
+					// A value type allocated on the stack is differentiated
+					// by it not being a reference. But it can be handled as
+					// reference by pushing the pointer on the stack
+					if( (ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) &&
+						(ctx->type.isVariable || ctx->type.isTemporary) &&
+						!IsVariableOnHeap(ctx->type.stackOffset) )
+					{
+						// Actually the pointer is already pushed on the stack in
+						// CompileVariableAccess, so we don't need to do anything else
+					}
+					else if( generateCode )
+					{
+						// A non-reference can be converted to a reference,
+						// by putting the value in a temporary variable
+
+						// If the input type is read-only we'll need to temporarily
+						// remove this constness, otherwise the assignment will fail
+						bool typeIsReadOnly = ctx->type.dataType.IsReadOnly();
+						ctx->type.dataType.MakeReadOnly(false);
+
+						// If the object already is a temporary variable, then the copy
+						// doesn't have to be made as it is already a unique object
+						PrepareTemporaryVariable(node, ctx);
+
+						ctx->type.dataType.MakeReadOnly(typeIsReadOnly);
+
+						// Add the cost for the copy
+						cost += asCC_TO_OBJECT_CONV;
+					}
+
+					// This may look strange as the conversion was to make the expression a reference
+					// but a value type allocated on the stack is a reference even without the type
+					// being marked as such.
+					ctx->type.dataType.MakeReference(IsVariableOnHeap(ctx->type.stackOffset));
+				}
+
+				if (to.IsReadOnly())
+				{
+					// This doesn't cost anything
+					ctx->type.dataType.MakeReadOnly(true);
+				}
+
+				if (!to.IsReadOnly() && ctx->type.dataType.IsReadOnly())
+				{
+					// A const object can be converted to a non-const object through a copy
+					if (allowObjectConstruct || convType == asIC_EXPLICIT_VAL_CAST)
+					{
+						ctx->type.dataType.MakeReadOnly(false);
+
+						if (generateCode)
+						{
+							// Make a temporary copy of the object in order to make it non-const
+							PrepareTemporaryVariable(node, ctx);
+						}
+
+						// Add the cost for the copy
+						cost += asCC_TO_OBJECT_CONV;
+					}
+
+					// String literals can be implicitly converted to temporary local variables in order to pass them to functions expecting non-const
+					// TODO: NEWSTRING: Should have an engine property to warn or error on this
+					if (ctx->type.isConstant && ctx->type.dataType.IsEqualExceptRefAndConst(engine->stringType))
+					{
+						if (generateCode)
+							PrepareTemporaryVariable(node, ctx);
+						else
+						{
+							ctx->type.dataType.MakeReadOnly(false);
+							ctx->type.isConstant = false;
+						}
+
+						// Add the cost for the copy
+						cost += asCC_TO_OBJECT_CONV;
+					}
+				}
+			}
+		}
+	}
+
+	return cost;
+}
+
+asUINT asCCompiler::ImplicitConvPrimitiveToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv isExplicit, bool generateCode, bool allowObjectConstruct)
+{
+	asCObjectType *objType = CastToObjectType(to.GetTypeInfo());
+	asASSERT( objType || CastToFuncdefType(to.GetTypeInfo()) );
+	if( !objType )
+		return asCC_NO_CONV;
+
+	asCArray<int> funcs;
+	if (objType->flags & asOBJ_VALUE)
+	{
+		// For value types the object must have a constructor that takes a single primitive argument either by value or as input reference
+		for (asUINT n = 0; n < objType->beh.constructors.GetLength(); n++)
+		{
+			asCScriptFunction *func = engine->scriptFunctions[objType->beh.constructors[n]];
+			if (func->parameterTypes.GetLength() == 1 &&
+				func->parameterTypes[0].IsPrimitive() &&
+				!(func->inOutFlags[0] & asTM_OUTREF) &&
+				(isExplicit == asIC_EXPLICIT_VAL_CAST || !func->IsExplicit()) )
+			{
+				funcs.PushLast(func->id);
+			}
+		}
+	}
+	else if (objType->flags & asOBJ_REF)
+	{
+		// For ref types the object must have a factory that takes a single primitive argument either by value or as input reference
+		for (asUINT n = 0; n < objType->beh.factories.GetLength(); n++)
+		{
+			asCScriptFunction *func = engine->scriptFunctions[objType->beh.factories[n]];
+			if (func->parameterTypes.GetLength() == 1 &&
+				func->parameterTypes[0].IsPrimitive() &&
+				!(func->inOutFlags[0] & asTM_OUTREF) &&
+				(isExplicit == asIC_EXPLICIT_VAL_CAST || !func->IsExplicit()))
+			{
+				funcs.PushLast(func->id);
+			}
+		}
+	}
+
+	if( funcs.GetLength() == 0 )
+		return asCC_NO_CONV;
+
+	// Check if it is possible to choose a best match
+	asCExprContext arg(engine);
+	arg.type = ctx->type;
+	arg.exprNode = ctx->exprNode; // Use the same node for compiler messages
+	asCArray<asCExprContext*> args;
+	args.PushLast(&arg);
+	asUINT cost = asCC_TO_OBJECT_CONV + MatchFunctions(funcs, args, 0, 0, 0, objType, false, true, false);
+	if( funcs.GetLength() != 1 )
+		return asCC_NO_CONV;
+
+	if( !generateCode )
+	{
+		ctx->type.Set(to);
+		return cost;
+	}
+
+	// TODO: clean up: This part is similar to CompileConstructCall(). It should be put in a common function
+
+	// Clear the type of ctx, as the type is moved to the arg
+	ctx->type.SetDummy();
+
+	// Value types and script types are allocated through the constructor
+	asCExprValue tempObj;
+	bool onHeap = false;
+
+	if (!(objType->flags & asOBJ_REF))
+	{
+		tempObj.dataType = to;
+		tempObj.stackOffset = (short)AllocateVariable(to, true);
+		tempObj.dataType.MakeReference(true);
+		tempObj.isTemporary = true;
+		tempObj.isVariable = true;
+
+		onHeap = IsVariableOnHeap(tempObj.stackOffset);
+
+		// Push the address of the object on the stack
+		if (onHeap)
+			ctx->bc.InstrSHORT(asBC_VAR, (short)tempObj.stackOffset);
+	}
+
+	PrepareFunctionCall(funcs[0], &ctx->bc, args);
+	MoveArgsToStack(funcs[0], &ctx->bc, args, false);
+
+	if( !(objType->flags & asOBJ_REF) )
+	{
+		// If the object is allocated on the stack, then call the constructor as a normal function
+		if( onHeap )
+		{
+			int offset = 0;
+			asCScriptFunction *descr = builder->GetFunctionDescription(funcs[0]);
+			for( asUINT n = 0; n < args.GetLength(); n++ )
+				offset += descr->parameterTypes[n].GetSizeOnStackDWords();
+
+			ctx->bc.InstrWORD(asBC_GETREF, (asWORD)offset);
+		}
+		else
+			ctx->bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+
+		PerformFunctionCall(funcs[0], ctx, onHeap, &args, CastToObjectType(tempObj.dataType.GetTypeInfo()));
+
+		// Add tag that the object has been initialized
+		ctx->bc.ObjInfo(tempObj.stackOffset, asOBJ_INIT);
+
+		// The constructor doesn't return anything,
+		// so we have to manually inform the type of
+		// the return value
+		ctx->type = tempObj;
+		if( !onHeap )
+			ctx->type.dataType.MakeReference(false);
+
+		// Push the address of the object on the stack again
+		ctx->bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+	}
+	else
+	{
+		// Call the factory to create the reference type
+		PerformFunctionCall(funcs[0], ctx, false, &args);
+
+		// Make another pass to make sure the result has the correct handle and reference settings
+		ImplicitConversion(ctx, to, node, isExplicit, generateCode, allowObjectConstruct);
+	}
+
+	return cost;
+}
+
+void asCCompiler::ImplicitConversionConstant(asCExprContext *from, const asCDataType &to, asCScriptNode *node, EImplicitConv convType)
+{
+	asASSERT(from->type.isConstant);
+
+	// TODO: node should be the node of the value that is
+	//       converted (not the operator that provokes the implicit
+	//       conversion)
+
+	// If the base type is correct there is no more to do
+	if( to.IsEqualExceptRefAndConst(from->type.dataType) ) return;
+
+	// References cannot be constants
+	if( from->type.dataType.IsReference() ) return;
+
+	if( (to.IsIntegerType() && to.GetSizeInMemoryDWords() == 1 && !to.IsEnumType()) ||
+		(to.IsEnumType() && convType == asIC_EXPLICIT_VAL_CAST) )
+	{
+		if( from->type.dataType.IsFloatType() ||
+			from->type.dataType.IsDoubleType() ||
+			from->type.dataType.IsUnsignedType() ||
+			from->type.dataType.IsIntegerType() )
+		{
+			asCDataType targetDt;
+			if (to.IsEnumType())
+				targetDt = to;
+			else
+				targetDt = asCDataType::CreatePrimitive(ttInt, true);
+
+			// Transform the value
+			// Float constants can be implicitly converted to int
+			if( from->type.dataType.IsFloatType() )
+			{
+				float fc = from->type.GetConstantF();
+				int ic = int(fc);
+
+				if( float(ic) != fc )
+				{
+					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+				}
+
+				from->type.SetConstantDW(targetDt, ic);
+			}
+			// Double constants can be implicitly converted to int
+			else if( from->type.dataType.IsDoubleType() )
+			{
+				double fc = from->type.GetConstantD();
+				int ic = int(fc);
+
+				if( double(ic) != fc )
+				{
+					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+				}
+
+				from->type.SetConstantDW(targetDt, ic);
+			}
+			else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				// Verify that it is possible to convert to signed without getting negative
+				if( from->type.dataType.GetSizeInMemoryBytes() == 4 &&
+					int(from->type.GetConstantDW()) < 0 &&
+					convType != asIC_EXPLICIT_VAL_CAST &&
+					node != 0 )
+					Warning(TXT_CHANGE_SIGN, node);
+
+				// Convert to 32bit
+				if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+					from->type.SetConstantDW(targetDt, from->type.GetConstantB());
+				else if (from->type.dataType.GetSizeInMemoryBytes() == 2)
+					from->type.SetConstantDW(targetDt, from->type.GetConstantW());
+				else
+					from->type.dataType = targetDt;
+			}
+			else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				if (asQWORD(from->type.GetConstantQW()) >> 31)
+					if (convType != asIC_EXPLICIT_VAL_CAST && node) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+
+				// Convert to 32bit
+				from->type.SetConstantDW(targetDt, int(from->type.GetConstantQW()));
+			}
+			else if (from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 2)
+			{
+				if (int(from->type.GetConstantQW()) != asINT64(from->type.GetConstantQW()))
+					if (convType != asIC_EXPLICIT_VAL_CAST && node) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+
+				// Convert to 32bit
+				from->type.SetConstantDW(targetDt, int(from->type.GetConstantQW()));
+			}
+			else if (from->type.dataType.IsIntegerType() &&
+				from->type.dataType.GetSizeInMemoryBytes() < 4)
+			{
+				// Convert to 32bit
+				if (from->type.dataType.GetSizeInMemoryBytes() == 1)
+					from->type.SetConstantDW(targetDt, (asINT8)from->type.GetConstantB());
+				else if (from->type.dataType.GetSizeInMemoryBytes() == 2)
+					from->type.SetConstantDW(targetDt, (asINT16)from->type.GetConstantW());
+			}
+			else
+			{
+				// Only int32 and enums should come here and as these are 32bit
+				// already nothing needs to be done except set the target type
+				asASSERT((from->type.dataType.GetTokenType() == ttInt ||
+					      from->type.dataType.IsEnumType()) &&
+					     from->type.dataType.GetSizeInMemoryBytes() == 4);
+
+				from->type.dataType = targetDt;
+			}
+		}
+
+		// Check if a downsize is necessary
+		if( to.IsIntegerType() &&
+			from->type.dataType.IsIntegerType() &&
+		    from->type.dataType.GetSizeInMemoryBytes() > to.GetSizeInMemoryBytes() )
+		{
+			// Verify if it is possible
+			if( to.GetSizeInMemoryBytes() == 1 )
+			{
+				if( asINT8(from->type.GetConstantDW()) != int(from->type.GetConstantDW()) )
+					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+
+				from->type.SetConstantB(asCDataType::CreatePrimitive(to.GetTokenType(), true), asINT8(from->type.GetConstantDW()));
+			}
+			else if( to.GetSizeInMemoryBytes() == 2 )
+			{
+				if( asINT16(from->type.GetConstantDW()) != int(from->type.GetConstantDW()) )
+					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+
+				from->type.SetConstantW(asCDataType::CreatePrimitive(to.GetTokenType(), true), asINT16(from->type.GetConstantDW()));
+			}
+		}
+	}
+	else if( to.IsIntegerType() && to.GetSizeInMemoryDWords() == 2 )
+	{
+		// Float constants can be implicitly converted to int
+		if( from->type.dataType.IsFloatType() )
+		{
+			float fc = from->type.GetConstantF();
+			asINT64 ic = asINT64(fc);
+
+			if( float(ic) != fc )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), ic);
+		}
+		// Double constants can be implicitly converted to int
+		else if( from->type.dataType.IsDoubleType() )
+		{
+			double fc = from->type.GetConstantD();
+			asINT64 ic = asINT64(fc);
+
+			if( double(ic) != fc )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), ic);
+		}
+		else if( from->type.dataType.IsUnsignedType() )
+		{
+			// Convert to 64bit
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), from->type.GetConstantB());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), from->type.GetConstantW());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), from->type.GetConstantDW());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 8 )
+			{
+				if( asINT64(from->type.GetConstantQW()) < 0 )
+				{
+					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
+				}
+				from->type.dataType = asCDataType::CreatePrimitive(ttInt64, true);
+			}
+		}
+		else if( from->type.dataType.IsIntegerType() )
+		{
+			// Convert to 64bit
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), (asINT8)from->type.GetConstantB());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), (asINT16)from->type.GetConstantW());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), (int)from->type.GetConstantDW());
+		}
+	}
+	else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 1 )
+	{
+		if( from->type.dataType.IsFloatType() )
+		{
+			float fc = from->type.GetConstantF();
+			// Some compilers set the value to 0 when converting a negative float to unsigned int.
+			// To maintain a consistent behaviour across compilers we convert to int first.
+			asUINT uic = asUINT(int(fc));
+
+			if( float(uic) != fc )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), uic);
+
+			// Try once more, in case of a smaller type
+			ImplicitConversionConstant(from, to, node, convType);
+		}
+		else if( from->type.dataType.IsDoubleType() )
+		{
+			double fc = from->type.GetConstantD();
+			// Some compilers set the value to 0 when converting a negative double to unsigned int.
+			// To maintain a consistent behaviour across compilers we convert to int first.
+			asUINT uic = asUINT(int(fc));
+
+			if( double(uic) != fc )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), uic);
+
+			// Try once more, in case of a smaller type
+			ImplicitConversionConstant(from, to, node, convType);
+		}
+		else if( from->type.dataType.IsIntegerType() )
+		{
+			// Verify that it is possible to convert to unsigned without loosing negative
+			if( (from->type.dataType.GetSizeInMemoryBytes() > 4 && asINT64(from->type.GetConstantQW()) < 0) ||
+				(from->type.dataType.GetSizeInMemoryBytes() == 4 && int(from->type.GetConstantDW()) < 0) ||
+				(from->type.dataType.GetSizeInMemoryBytes() == 2 && asINT16(from->type.GetConstantW()) < 0) ||
+				(from->type.dataType.GetSizeInMemoryBytes() == 1 && asINT8(from->type.GetConstantB()) < 0))
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
+			}
+
+			// Check if any data is lost
+			if( from->type.dataType.GetSizeInMemoryBytes() > 4 && (from->type.GetConstantQW() >> 32) != 0 && (from->type.GetConstantQW() >> 32) != 0xFFFFFFFF )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+			}
+
+			// Convert to 32bit
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (asINT8)from->type.GetConstantB());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (asINT16)from->type.GetConstantW());
+			else if (from->type.dataType.GetSizeInMemoryBytes() == 4 )
+				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (int)from->type.GetConstantDW());
+			else
+				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), (int)(asINT64)from->type.GetConstantQW());
+
+			// Try once more, in case of a smaller type
+			ImplicitConversionConstant(from, to, node, convType);
+		}
+		else if( from->type.dataType.IsUnsignedType() &&
+		         from->type.dataType.GetSizeInMemoryBytes() < 4 )
+		{
+			// Convert to 32bit
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), from->type.GetConstantB());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				from->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), from->type.GetConstantW());
+
+			// Try once more, in case of a smaller type
+			ImplicitConversionConstant(from, to, node, convType);
+		}
+		else if( from->type.dataType.IsUnsignedType() &&
+		         from->type.dataType.GetSizeInMemoryBytes() > to.GetSizeInMemoryBytes() )
+		{
+			// Verify if it is possible
+			if( to.GetSizeInMemoryBytes() == 1 )
+			{
+				if( (from->type.dataType.GetSizeInMemoryBytes() == 2 && asBYTE(from->type.GetConstantW()) != from->type.GetConstantW()) ||
+					(from->type.dataType.GetSizeInMemoryBytes() == 4 && asBYTE(from->type.GetConstantDW()) != from->type.GetConstantDW()) ||
+					(from->type.dataType.GetSizeInMemoryBytes() == 8 && asBYTE(from->type.GetConstantQW()) != from->type.GetConstantQW()) )
+					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+
+				if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+					from->type.SetConstantB(asCDataType::CreatePrimitive(to.GetTokenType(), true), asBYTE(from->type.GetConstantW()));
+				else if (from->type.dataType.GetSizeInMemoryBytes() == 4)
+					from->type.SetConstantB(asCDataType::CreatePrimitive(to.GetTokenType(), true), asBYTE(from->type.GetConstantDW()));
+				else if (from->type.dataType.GetSizeInMemoryBytes() == 8)
+					from->type.SetConstantB(asCDataType::CreatePrimitive(to.GetTokenType(), true), asBYTE(from->type.GetConstantQW()));
+			}
+			else if( to.GetSizeInMemoryBytes() == 2 )
+			{
+				if( (from->type.dataType.GetSizeInMemoryBytes() == 4 && asWORD(from->type.GetConstantDW()) != from->type.GetConstantDW()) ||
+					(from->type.dataType.GetSizeInMemoryBytes() == 8 && asWORD(from->type.GetConstantQW()) != from->type.GetConstantQW()) )
+					if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+
+				if (from->type.dataType.GetSizeInMemoryBytes() == 4)
+					from->type.SetConstantW(asCDataType::CreatePrimitive(to.GetTokenType(), true), asWORD(from->type.GetConstantDW()));
+				else if (from->type.dataType.GetSizeInMemoryBytes() == 8)
+					from->type.SetConstantW(asCDataType::CreatePrimitive(to.GetTokenType(), true), asWORD(from->type.GetConstantQW()));
+			}
+			else if (to.GetSizeInMemoryBytes() == 4)
+			{
+				if( asDWORD(from->type.GetConstantQW()) != from->type.GetConstantQW())
+					if (convType != asIC_EXPLICIT_VAL_CAST && node) Warning(TXT_VALUE_TOO_LARGE_FOR_TYPE, node);
+
+				from->type.SetConstantDW(asCDataType::CreatePrimitive(to.GetTokenType(), true), asDWORD(from->type.GetConstantQW()));
+			}
+		}
+	}
+	else if( to.IsUnsignedType() && to.GetSizeInMemoryDWords() == 2 )
+	{
+		if( from->type.dataType.IsFloatType() )
+		{
+			float fc = from->type.GetConstantF();
+			// Convert first to int64 then to uint64 to avoid negative float becoming 0 on gnuc base compilers
+			asQWORD uic = asQWORD(asINT64(fc));
+
+#if !defined(_MSC_VER) || _MSC_VER > 1200 // MSVC++ 6
+			// MSVC6 doesn't support this conversion
+			if( float(uic) != fc )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+#endif
+
+			from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), uic);
+		}
+		else if( from->type.dataType.IsDoubleType() )
+		{
+			double fc = from->type.GetConstantD();
+			// Convert first to int64 then to uint64 to avoid negative float becoming 0 on gnuc base compilers
+			asQWORD uic = asQWORD(asINT64(fc));
+
+#if !defined(_MSC_VER) || _MSC_VER > 1200 // MSVC++ 6
+			// MSVC6 doesn't support this conversion
+			if( double(uic) != fc )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+#endif
+
+			from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), uic);
+		}
+		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
+		{
+			// Convert to 64bit
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), (asINT64)(asINT8)from->type.GetConstantB());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), (asINT64)(asINT16)from->type.GetConstantW());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), (asINT64)(int)from->type.GetConstantDW());
+
+			// Verify that it is possible to convert to unsigned without loosing negative
+			if( asINT64(from->type.GetConstantQW()) < 0 )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
+			}
+
+			from->type.dataType = asCDataType::CreatePrimitive(ttUInt64, true);
+		}
+		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
+		{
+			// Verify that it is possible to convert to unsigned without loosing negative
+			if( asINT64(from->type.GetConstantQW()) < 0 )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_CHANGE_SIGN, node);
+			}
+
+			from->type.dataType = asCDataType::CreatePrimitive(ttUInt64, true);
+		}
+		else if( from->type.dataType.IsUnsignedType() )
+		{
+			// Convert to 64bit
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), from->type.GetConstantB());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), from->type.GetConstantW());
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 4 )
+				from->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), from->type.GetConstantDW());
+		}
+	}
+	else if( to.IsFloatType() )
+	{
+		if( from->type.dataType.IsDoubleType() )
+		{
+			double ic = from->type.GetConstantD();
+			float fc = float(ic);
+
+			from->type.SetConstantF(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
+		{
+			// Must properly convert value in case the from value is smaller
+			int ic;
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				ic = (asINT8)from->type.GetConstantB();
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				ic = (asINT16)from->type.GetConstantW();
+			else
+				ic = (int)from->type.GetConstantDW();
+			float fc = float(ic);
+
+			if( int(fc) != ic )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantF(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
+		{
+			float fc = float(asINT64(from->type.GetConstantQW()));
+			if( asINT64(fc) != asINT64(from->type.GetConstantQW()) )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantF(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
+		{
+			// Must properly convert value in case the from value is smaller
+			unsigned int uic;
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				uic = from->type.GetConstantB();
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				uic = from->type.GetConstantW();
+			else
+				uic = from->type.GetConstantDW();
+			float fc = float(uic);
+
+			if( (unsigned int)(fc) != uic )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantF(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
+		{
+			float fc = float((asINT64)from->type.GetConstantQW());
+
+			if( asQWORD(fc) != from->type.GetConstantQW())
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantF(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+	}
+	else if( to.IsDoubleType() )
+	{
+		if( from->type.dataType.IsFloatType() )
+		{
+			float ic = from->type.GetConstantF();
+			double fc = double(ic);
+
+			from->type.SetConstantD(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
+		{
+			// Must properly convert value in case the from value is smaller
+			int ic;
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				ic = (asINT8)from->type.GetConstantB();
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				ic = (asINT16)from->type.GetConstantW();
+			else
+				ic = (int)from->type.GetConstantDW();
+			double fc = double(ic);
+
+			if( int(fc) != ic )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantD(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsIntegerType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
+		{
+			double fc = double(asINT64(from->type.GetConstantQW()));
+
+			if( asINT64(fc) != asINT64(from->type.GetConstantQW()) )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantD(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 1 )
+		{
+			// Must properly convert value in case the from value is smaller
+			unsigned int uic;
+			if( from->type.dataType.GetSizeInMemoryBytes() == 1 )
+				uic = from->type.GetConstantB();
+			else if( from->type.dataType.GetSizeInMemoryBytes() == 2 )
+				uic = from->type.GetConstantW();
+			else
+				uic = from->type.GetConstantDW();
+			double fc = double(uic);
+
+			if( (unsigned int)(fc) != uic )
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantD(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+		else if( from->type.dataType.IsUnsignedType() && from->type.dataType.GetSizeInMemoryDWords() == 2 )
+		{
+			double fc = double((asINT64)from->type.GetConstantQW());
+
+			if( asQWORD(fc) != from->type.GetConstantQW())
+			{
+				if( convType != asIC_EXPLICIT_VAL_CAST && node ) Warning(TXT_NOT_EXACT, node);
+			}
+
+			from->type.SetConstantD(asCDataType::CreatePrimitive(to.GetTokenType(), true), fc);
+		}
+	}
+}
+
+int asCCompiler::DoAssignment(asCExprContext *ctx, asCExprContext *lctx, asCExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, eTokenType op, asCScriptNode *opNode)
+{
+	// Don't allow any operators on expressions that take address of class method
+	// If methodName is set but the type is not an object, then it is a global function
+	if( lctx->methodName != "" || rctx->IsClassMethod() )
+	{
+		Error(TXT_INVALID_OP_ON_METHOD, opNode);
+		return -1;
+	}
+
+	// Implicit handle types should always be treated as handles in assignments
+	if (lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE) )
+	{
+		lctx->type.dataType.MakeHandle(true);
+		lctx->type.isExplicitHandle = true;
+	}
+
+	// If the left hand expression is a property accessor, then that should be used
+	// to do the assignment instead of the ordinary operator. The exception is when
+	// the property accessor is for a handle property, and the operation is a value
+	// assignment.
+	if( (lctx->property_get || lctx->property_set) &&
+		!(lctx->type.dataType.IsObjectHandle() && !lctx->type.isExplicitHandle) )
+	{
+		if( op != ttAssignment )
+		{
+			// Generate the code for the compound assignment, i.e. get the value, apply operator, then set the value
+			return ProcessPropertyGetSetAccessor(ctx, lctx, rctx, op, opNode);
+		}
+
+		// It is not allowed to do a handle assignment on a property
+		// accessor that doesn't take a handle in the set accessor.
+		if( lctx->property_set && lctx->type.isExplicitHandle )
+		{
+			// set_opIndex has 2 arguments, where as normal setters have only 1
+			asCArray<asCDataType>& parameterTypes =
+				builder->GetFunctionDescription(lctx->property_set)->parameterTypes;
+			if( !parameterTypes[parameterTypes.GetLength() - 1].IsObjectHandle() )
+			{
+				// Process the property to free the memory
+				ProcessPropertySetAccessor(lctx, rctx, opNode);
+
+				Error(TXT_HANDLE_ASSIGN_ON_NON_HANDLE_PROP, opNode);
+				return -1;
+			}
+		}
+
+		MergeExprBytecodeAndType(ctx, lctx);
+
+		return ProcessPropertySetAccessor(ctx, rctx, opNode);
+	}
+	else if( lctx->property_get && lctx->type.dataType.IsObjectHandle() && !lctx->type.isExplicitHandle )
+	{
+		// Get the handle to the object that will be used for the value assignment
+		if( ProcessPropertyGetAccessor(lctx, opNode) < 0 )
+			return -1;
+	}
+
+	if( lctx->type.dataType.IsPrimitive() )
+	{
+		if( !lctx->type.isLValue )
+		{
+			Error(TXT_NOT_LVALUE, lexpr);
+			return -1;
+		}
+
+		if( op != ttAssignment )
+		{
+			// Compute the operator before the assignment
+			asCExprValue lvalue = lctx->type;
+
+			if( lctx->type.isTemporary && !lctx->type.isVariable )
+			{
+				// The temporary variable must not be freed until the
+				// assignment has been performed. lvalue still holds
+				// the information about the temporary variable
+				lctx->type.isTemporary = false;
+			}
+
+			asCExprContext o(engine);
+			CompileOperator(opNode, lctx, rctx, &o);
+			MergeExprBytecode(rctx, &o);
+			rctx->type = o.type;
+
+			// Convert the rvalue to the right type and validate it
+			PrepareForAssignment(&lvalue.dataType, rctx, rexpr, false);
+
+			MergeExprBytecode(ctx, rctx);
+			lctx->type = lvalue;
+
+			// The lvalue continues the same, either it was a variable, or a reference in the register
+		}
+		else
+		{
+			// Convert the rvalue to the right type and validate it
+			PrepareForAssignment(&lctx->type.dataType, rctx, rexpr, false, lctx);
+
+			MergeExprBytecode(ctx, rctx);
+			MergeExprBytecode(ctx, lctx);
+		}
+
+		ReleaseTemporaryVariable(rctx->type, &ctx->bc);
+
+		PerformAssignment(&lctx->type, &rctx->type, &ctx->bc, opNode);
+
+		ctx->type = lctx->type;
+	}
+	else if( lctx->type.isExplicitHandle )
+	{
+		if( !lctx->type.isLValue )
+		{
+			Error(TXT_NOT_LVALUE, lexpr);
+			return -1;
+		}
+
+		// Object handles don't have any compound assignment operators
+		if( op != ttAssignment )
+		{
+			asCString str;
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(str, lexpr);
+			return -1;
+		}
+
+		if( lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
+		{
+			// The object is a value type but that should be treated as a handle
+
+			// Make sure the right hand value is a handle
+			if( !rctx->type.isExplicitHandle &&
+				!(rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE)) )
+			{
+				// Function names can be considered handles already
+				if( rctx->methodName == "" )
+				{
+					asCDataType dt = rctx->type.dataType;
+					dt.MakeHandle(true);
+					dt.MakeReference(false);
+
+					PrepareArgument(&dt, rctx, rexpr, true, asTM_INREF);
+					if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
+					{
+						asCString str;
+						str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+						Error(str, rexpr);
+						return -1;
+					}
+				}
+
+				if (!rctx->type.dataType.IsObjectHandle() && !rctx->type.dataType.SupportHandles())
+				{
+					Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, rexpr);
+					return -1;
+				}
+
+				// Mark the right hand expression as explicit handle even if the user didn't do it, otherwise
+				// the code for moving the argument to the stack may not know to correctly handle the argument type
+				// in case of variable parameter type.
+				rctx->type.isExplicitHandle = true;
+			}
+
+			if( CompileOverloadedDualOperator(opNode, lctx, rctx, false, ctx, true) )
+			{
+				// An overloaded assignment operator was found (or a compilation error occured)
+				return 0;
+			}
+
+			// The object must implement the opAssign method
+			asCString msg;
+			msg.Format(TXT_NO_APPROPRIATE_OPHNDLASSIGN_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(msg.AddressOf(), opNode);
+			return -1;
+		}
+		else
+		{
+			asCDataType dt = lctx->type.dataType;
+			dt.MakeReference(false);
+
+			PrepareArgument(&dt, rctx, rexpr, false, asTM_INREF , true);
+			if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
+			{
+				asCString str;
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+				Error(str, rexpr);
+				return -1;
+			}
+
+			MergeExprBytecode(ctx, rctx);
+			MergeExprBytecode(ctx, lctx);
+
+			if(!rctx->type.isRefSafe)
+				ctx->bc.InstrWORD(asBC_GETOBJREF, AS_PTR_SIZE);
+
+			PerformAssignment(&lctx->type, &rctx->type, &ctx->bc, opNode);
+
+			ReleaseTemporaryVariable(rctx->type, &ctx->bc);
+
+			ctx->type = lctx->type;
+
+			// After the handle assignment the original handle is left on the stack
+			ctx->type.dataType.MakeReference(false);
+		}
+	}
+	else // if( lctx->type.dataType.IsObject() )
+	{
+		// The lvalue reference may be marked as a temporary, if for example
+		// it was originated as a handle returned from a function. In such
+		// cases it must be possible to assign values to it anyway.
+		if( lctx->type.dataType.IsObjectHandle() && !lctx->type.isExplicitHandle )
+		{
+			// Convert the handle to a object reference
+			asCDataType to;
+			to = lctx->type.dataType;
+			to.MakeHandle(false);
+			ImplicitConversion(lctx, to, lexpr, asIC_IMPLICIT_CONV);
+			lctx->type.isLValue = true; // Handle may not have been an lvalue, but the dereferenced object is
+		}
+
+		// Check for overloaded assignment operator
+		if( CompileOverloadedDualOperator(opNode, lctx, rctx, false, ctx) )
+		{
+			// An overloaded assignment operator was found (or a compilation error occured)
+			return 0;
+		}
+
+		// No registered operator was found. In case the operation is a direct
+		// assignment and the rvalue is the same type as the lvalue, then we can
+		// still use the byte-for-byte copy to do the assignment
+
+		if( op != ttAssignment )
+		{
+			asCString str;
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(str, lexpr);
+			return -1;
+		}
+
+		// If the left hand expression is simple, i.e. without any
+		// function calls or allocations of memory, then we can avoid
+		// doing a copy of the right hand expression (done by PrepareArgument).
+		// Instead the reference to the value can be placed directly on the
+		// stack.
+		//
+		// This optimization should only be done for value types, where
+		// the application developer is responsible for making the
+		// implementation safe against unwanted destruction of the input
+		// reference before the time.
+		bool simpleExpr = (lctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) && lctx->bc.IsSimpleExpression();
+
+		// Implicitly convert the rvalue to the type of the lvalue
+		bool needConversion = false;
+		if( !lctx->type.dataType.IsEqualExceptRefAndConst(rctx->type.dataType) )
+			needConversion = true;
+		
+		if( !simpleExpr || needConversion )
+		{
+			if( rctx->type.dataType.IsObjectHandle() && !rctx->type.isExplicitHandle && 
+			    !lctx->type.dataType.IsObjectHandle() && rctx->type.dataType.GetTypeInfo() == lctx->type.dataType.GetTypeInfo() )
+			{
+				// Make the conversion from handle to non-handle without creating 
+				// a copy of the object (otherwise done by PrepareArgument)
+				asCDataType dt = rctx->type.dataType;
+				dt.MakeHandle(false);
+				ImplicitConversion(rctx, dt, rexpr, asIC_IMPLICIT_CONV);
+				needConversion = false;
+			}
+			
+			asCDataType dt = lctx->type.dataType;
+			dt.MakeReference(true);
+			// A funcdef can be accessed by ref, but only as read-only
+			if( dt.IsFuncdef() && !dt.IsObjectHandle() )
+				dt.MakeReadOnly(true);
+			int r = PrepareArgument(&dt, rctx, rexpr, true, 1, !needConversion);
+			if( r < 0 )
+				return -1;
+			if( !dt.IsEqualExceptRefAndConst(rctx->type.dataType) )
+			{
+				asCString str;
+				str.Format(TXT_CANT_IMPLICITLY_CONVERT_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+				Error(str, rexpr);
+				return -1;
+			}
+		}
+		else
+		{
+			// Process any property accessor first, before placing the final reference on the stack
+			if( ProcessPropertyGetAccessor(rctx, rexpr) < 0 )
+				return -1;
+
+			if( rctx->type.dataType.IsReference() && (!(rctx->type.isVariable || rctx->type.isTemporary) || IsVariableOnHeap(rctx->type.stackOffset)) )
+				rctx->bc.Instr(asBC_RDSPtr);
+		}
+
+		MergeExprBytecode(ctx, rctx);
+		MergeExprBytecode(ctx, lctx);
+
+		if( !simpleExpr || needConversion )
+		{
+			if( !rctx->type.isRefSafe && (rctx->type.isVariable || rctx->type.isTemporary) )
+			{
+				if( !IsVariableOnHeap(rctx->type.stackOffset) )
+					// TODO: runtime optimize: Actually the reference can be pushed on the stack directly
+					//                         as the value allocated on the stack is guaranteed to be safe.
+					//                         The bytecode optimizer should be able to determine this and optimize away the VAR + GETREF
+					ctx->bc.InstrWORD(asBC_GETREF, AS_PTR_SIZE);
+				else
+					ctx->bc.InstrWORD(asBC_GETOBJREF, AS_PTR_SIZE);
+			}
+		}
+
+		PerformAssignment(&lctx->type, &rctx->type, &ctx->bc, opNode);
+
+		ReleaseTemporaryVariable(rctx->type, &ctx->bc);
+
+		ctx->type = lctx->type;
+	}
+
+	return 0;
+}
+
+int asCCompiler::CompileAssignment(asCScriptNode *expr, asCExprContext *ctx)
+{
+	asASSERT(expr->nodeType == snAssignment);
+
+	asCScriptNode *lexpr = expr->firstChild;
+	if( lexpr->next )
+	{
+		// Compile the two expression terms
+		asCExprContext lctx(engine), rctx(engine);
+		int rr = CompileAssignment(lexpr->next->next, &rctx);
+		int lr = CompileCondition(lexpr, &lctx);
+
+		if( lr >= 0 && rr >= 0 )
+			return DoAssignment(ctx, &lctx, &rctx, lexpr, lexpr->next->next, lexpr->next->tokenType, lexpr->next);
+
+		// Since the operands failed, the assignment was not computed
+		ctx->type.SetDummy();
+		return -1;
+	}
+
+	return CompileCondition(lexpr, ctx);
+}
+
+int asCCompiler::CompileCondition(asCScriptNode *expr, asCExprContext *ctx)
+{
+	asCExprValue ctype;
+
+	// Compile the conditional expression
+	asCScriptNode *cexpr = expr->firstChild;
+	if( cexpr->next )
+	{
+		//-------------------------------
+		// Compile the condition
+		asCExprContext e(engine);
+		int r = CompileExpression(cexpr, &e);
+		if( r < 0 )
+			e.type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( e.type.dataType.GetTypeInfo() && (e.type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(&e, asCDataType::CreatePrimitive(ttBool, false), cexpr, asIC_IMPLICIT_CONV);
+
+		if( r >= 0 && !e.type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+		{
+			Error(TXT_EXPR_MUST_BE_BOOL, cexpr);
+			e.type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+		}
+		ctype = e.type;
+
+		if( ProcessPropertyGetAccessor(&e, cexpr) < 0)
+			return -1;
+
+		if( e.type.dataType.IsReference() ) ConvertToVariable(&e);
+		ProcessDeferredParams(&e);
+
+		//-------------------------------
+		// Compile the left expression
+		asCExprContext le(engine);
+		int lr = CompileAssignment(cexpr->next, &le);
+
+		// Resolve any function names already
+		DetermineSingleFunc(&le, cexpr->next);
+
+		//-------------------------------
+		// Compile the right expression
+		asCExprContext re(engine);
+		int rr = CompileAssignment(cexpr->next->next, &re);
+		DetermineSingleFunc(&re, cexpr->next->next);
+
+		if (lr >= 0 && rr >= 0)
+		{
+			// Don't allow any operators on expressions that take address of class method
+			if (le.IsClassMethod() || re.IsClassMethod())
+			{
+				Error(TXT_INVALID_OP_ON_METHOD, expr);
+				return -1;
+			}
+
+			if (ProcessPropertyGetAccessor(&le, cexpr->next) < 0)
+				return -1;
+			if (ProcessPropertyGetAccessor(&re, cexpr->next->next) < 0)
+				return -1;
+
+			bool isExplicitHandle = le.type.isExplicitHandle || re.type.isExplicitHandle;
+
+			// Allow an anonymous initialization list to be converted to the type in the other condition
+			if (le.IsAnonymousInitList() && re.type.dataType.GetBehaviour() && re.type.dataType.GetBehaviour()->listFactory)
+			{
+				asCDataType to = re.type.dataType;
+				to.MakeReference(false);
+				to.MakeReadOnly(false);
+				ImplicitConversion(&le, to, cexpr->next, asIC_IMPLICIT_CONV);
+			}
+			else if (re.IsAnonymousInitList() && le.type.dataType.GetBehaviour() && le.type.dataType.GetBehaviour()->listFactory)
+			{
+				asCDataType to = le.type.dataType;
+				to.MakeReference(false);
+				to.MakeReadOnly(false);
+				ImplicitConversion(&re, to, cexpr->next->next, asIC_IMPLICIT_CONV);
+			}
+
+			if (le.IsAnonymousInitList())
+			{
+				Error(TXT_CANNOT_RESOLVE_AUTO, cexpr->next);
+				return -1;
+			}
+			else if (re.IsAnonymousInitList())
+			{
+				Error(TXT_CANNOT_RESOLVE_AUTO, cexpr->next->next);
+				return -1;
+			}
+
+			// Try to perform an implicit cast to make the two operands of the same type
+			// Choose the conversion that is the least costly
+			if (le.type.dataType != re.type.dataType)
+			{
+				asCExprContext tmp(engine);
+				tmp.type = le.type;
+				tmp.type.dataType.MakeReference(false);
+				asUINT costAtoB = ImplicitConversion(&tmp, re.type.dataType, cexpr->next, asIC_IMPLICIT_CONV, false);
+				if (!tmp.type.dataType.IsEqualExceptRef(re.type.dataType))
+					costAtoB = 0xFFFFFFFF;
+				tmp.type = re.type;
+				tmp.type.dataType.MakeReference(false);
+				asUINT costBtoA = ImplicitConversion(&tmp, le.type.dataType, cexpr->next->next, asIC_IMPLICIT_CONV, false);
+				if (!tmp.type.dataType.IsEqualExceptRef(le.type.dataType))
+					costBtoA = 0xFFFFFFFF;
+
+				if (costAtoB < costBtoA && costAtoB != 0xFFFFFFFF)
+				{
+					if (le.type.dataType.IsObject())
+						Dereference(&le, true);
+					else
+						ConvertToVariable(&le);
+					ImplicitConversion(&le, re.type.dataType, cexpr->next, asIC_IMPLICIT_CONV, true);
+				}
+				else if (costAtoB > costBtoA && costBtoA != 0xFFFFFFFF)
+				{
+					if( re.type.dataType.IsObject() )
+						Dereference(&re, true);
+					else
+						ConvertToVariable(&re);
+					ImplicitConversion(&re, le.type.dataType, cexpr->next->next, asIC_IMPLICIT_CONV, true);
+				}
+
+				// If the cost for conversion is the same in both directions we have an ambigious situation, 
+				// which we do not resolve. In that case the script need to perform an explicit conversion
+			}
+
+			// Allow a 0 to be implicitly converted to the other type
+			if (le.type.isConstant && le.type.GetConstantData() == 0 && le.type.dataType.IsIntegerType())
+			{
+				asCDataType to = re.type.dataType;
+				to.MakeReference(false);
+				to.MakeReadOnly(true);
+				ImplicitConversionConstant(&le, to, cexpr->next, asIC_IMPLICIT_CONV);
+			}
+			else if( re.type.isConstant && re.type.GetConstantData() == 0 && re.type.dataType.IsIntegerType())
+			{
+				asCDataType to = le.type.dataType;
+				to.MakeReference(false);
+				to.MakeReadOnly(true);
+				ImplicitConversionConstant(&re, to, cexpr->next->next, asIC_IMPLICIT_CONV);
+			}
+
+			// Allow expression to be converted to handle if the other is handle
+			if (!le.type.dataType.IsObjectHandle() && re.type.dataType.IsObjectHandle() && le.type.dataType.GetTypeInfo() == re.type.dataType.GetTypeInfo() )
+			{
+				asCDataType dt = le.type.dataType;
+				dt.MakeHandle(true);
+				ImplicitConversion(&le, dt, cexpr->next, asIC_IMPLICIT_CONV);
+			}
+			if (!re.type.dataType.IsObjectHandle() && le.type.dataType.IsObjectHandle() && le.type.dataType.GetTypeInfo() == re.type.dataType.GetTypeInfo())
+			{
+				asCDataType dt = re.type.dataType;
+				dt.MakeHandle(true);
+				ImplicitConversion(&re, dt, cexpr->next->next, asIC_IMPLICIT_CONV);
+			}
+
+			// If the type of the expressions can be handle, then make them so for efficiency
+			if (le.type.dataType.SupportHandles() && re.type.dataType.SupportHandles())
+			{
+				asCDataType dt = le.type.dataType;
+				dt.MakeHandle(true);
+				ImplicitConversion(&le, dt, cexpr->next, asIC_IMPLICIT_CONV);
+				dt = re.type.dataType;
+				dt.MakeHandle(true);
+				ImplicitConversion(&re, dt, cexpr->next->next, asIC_IMPLICIT_CONV);
+			}
+
+			// Allow either case to be converted to const @ if the other is const @
+			if( (le.type.dataType.IsHandleToConst() && !le.type.IsNullConstant()) || (re.type.dataType.IsHandleToConst() && !re.type.dataType.IsNullHandle()) )
+			{
+				le.type.dataType.MakeHandleToConst(true);
+				re.type.dataType.MakeHandleToConst(true);
+			}
+
+			// Make sure both expressions have the same type
+			if (!le.type.dataType.IsEqualExceptRefAndConst(re.type.dataType))
+			{
+				Error(TXT_BOTH_MUST_BE_SAME, expr);
+				return -1;
+			}
+
+			//---------------------------------
+			// Output the byte code
+			int afterLabel = nextLabel++;
+			int elseLabel = nextLabel++;
+
+			// If left expression is void, then we don't need to store the result
+			if( le.type.dataType.IsEqualExceptConst(asCDataType::CreatePrimitive(ttVoid, false)) )
+			{
+				// Put the code for the condition expression on the output
+				MergeExprBytecode(ctx, &e);
+
+				// Added the branch decision
+				ctx->type = e.type;
+				ConvertToVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_CpyVtoR4, (short)ctx->type.stackOffset);
+				ctx->bc.Instr(asBC_ClrHi);
+				ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+				// Add the left expression
+				MergeExprBytecode(ctx, &le);
+				ctx->bc.InstrINT(asBC_JMP, afterLabel);
+
+				// Add the right expression
+				ctx->bc.Label((short)elseLabel);
+				MergeExprBytecode(ctx, &re);
+				ctx->bc.Label((short)afterLabel);
+
+				// Set the type of the result
+				ctx->type = le.type;
+			}
+			else if (le.type.IsNullConstant() && re.type.IsNullConstant())
+			{
+				// Special case for when both results are 'null'
+				// TODO: Other expressions where both results are identical literal constants can probably also be handled this way
+
+				// Put the code for the condition expression on the output
+				MergeExprBytecode(ctx, &e);
+
+				// Load the result into the register, but ignore the value since both paths give the same response
+				ctx->type = e.type;
+				ConvertToVariable(ctx);
+				ctx->bc.InstrSHORT(asBC_CpyVtoR4, (short)ctx->type.stackOffset);
+				ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+				// Return a null constant
+				ctx->bc.Instr(asBC_PshNull);
+				ctx->type.SetNullConstant();
+			}
+			else
+			{
+				// Allow "(a ? b : c) = d;" and "return (a ? b : c);" (where the latter returns the reference)
+				//
+				// Restrictions for the condition to be used as lvalue:
+				//  1. both b and c must be of the same type and be lvalue references
+				//  2. neither of the expressions can have any deferred arguments
+				//     that would have to be cleaned up after the reference
+				//  3. neither expression can be temporary
+				//
+				// If either expression is local, the resulting lvalue is not valid
+				// for return since it is not allowed to return references to local
+				// variables.
+				//
+				// The reference to the local variable must be loaded into the register,
+				// the resulting expression must not be considered as a local variable
+				// with a stack offset (i.e. it will not be allowed to use asBC_VAR)
+
+				if( le.type.isLValue && re.type.isLValue &&
+					le.deferredParams.GetLength() == 0 && re.deferredParams.GetLength() == 0 &&
+					!le.type.isTemporary && !re.type.isTemporary &&
+					le.type.dataType == re.type.dataType )
+				{
+					// Put the code for the condition expression on the output
+					MergeExprBytecode(ctx, &e);
+
+					// Add the branch decision
+					ctx->type = e.type;
+					ConvertToVariable(ctx);
+					ctx->bc.InstrSHORT(asBC_CpyVtoR4, (short)ctx->type.stackOffset);
+					ctx->bc.Instr(asBC_ClrHi);
+					ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+					// Start of the left expression
+					MergeExprBytecode(ctx, &le);
+					if( !le.type.dataType.IsReference() && le.type.isVariable )
+					{
+						// Load the address of the variable into the register
+						ctx->bc.InstrSHORT(asBC_LDV, (short)le.type.stackOffset);
+					}
+
+					ctx->bc.InstrINT(asBC_JMP, afterLabel);
+
+					// Start of the right expression
+					ctx->bc.Label((short)elseLabel);
+
+					MergeExprBytecode(ctx, &re);
+					if( !re.type.dataType.IsReference() && re.type.isVariable )
+					{
+						// Load the address of the variable into the register
+						ctx->bc.InstrSHORT(asBC_LDV, (short)re.type.stackOffset);
+					}
+
+					ctx->bc.Label((short)afterLabel);
+
+					// In case the options were to objects, it is necessary to dereference the pointer on
+					// the stack so it will point to the actual object, instead of the variable
+					if( le.type.dataType.IsReference() && le.type.dataType.IsObject() && !le.type.dataType.IsObjectHandle() )
+					{
+						asASSERT( re.type.dataType.IsReference() && re.type.dataType.IsObject() && !re.type.dataType.IsObjectHandle() );
+
+						ctx->bc.Instr(asBC_RDSPtr);
+					}
+
+					// The result is an lvalue
+					ctx->type.isLValue = true;
+					ctx->type.dataType = le.type.dataType;
+					if( ctx->type.dataType.IsPrimitive() || ctx->type.dataType.IsObjectHandle() )
+						ctx->type.dataType.MakeReference(true);
+					else
+						ctx->type.dataType.MakeReference(false);
+
+					// It can't be a treated as a variable, since we don't know which one was used
+					ctx->type.isVariable = false;
+					ctx->type.isTemporary = false;
+
+					// Must remember if the reference was to a local variable, since it must not be allowed to be returned
+					ctx->type.isRefToLocal = le.type.isVariable || le.type.isRefToLocal || re.type.isVariable || re.type.isRefToLocal;
+				}
+				else
+				{
+					// Allocate temporary variable and copy the result to that one
+					asCExprValue temp;
+					temp = le.type;
+					temp.dataType.MakeReference(false);
+					temp.dataType.MakeReadOnly(false);
+
+					// Make sure the variable isn't used in any of the expressions,
+					// as it would be overwritten which may cause crashes or less visible bugs
+					int l = int(reservedVariables.GetLength());
+					e.bc.GetVarsUsed(reservedVariables);
+					le.bc.GetVarsUsed(reservedVariables);
+					re.bc.GetVarsUsed(reservedVariables);
+					int offset = AllocateVariable(temp.dataType, true, false);
+					reservedVariables.SetLength(l);
+
+					temp.SetVariable(temp.dataType, offset, true);
+
+					// TODO: copy: Use copy constructor if available. See PrepareTemporaryVariable()
+
+					CallDefaultConstructor(temp.dataType, offset, IsVariableOnHeap(offset), &ctx->bc, expr);
+
+					// Put the code for the condition expression on the output
+					MergeExprBytecode(ctx, &e);
+
+					// Add the branch decision
+					ctx->type = e.type;
+					ConvertToVariable(ctx);
+					ctx->bc.InstrSHORT(asBC_CpyVtoR4, (short)ctx->type.stackOffset);
+					ctx->bc.Instr(asBC_ClrHi);
+					ctx->bc.InstrDWORD(asBC_JZ, elseLabel);
+					ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+					// Assign the result of the left expression to the temporary variable
+					asCExprValue rtemp;
+					rtemp = temp;
+					if( rtemp.dataType.IsObjectHandle() )
+						rtemp.isExplicitHandle = true;
+
+					PrepareForAssignment(&rtemp.dataType, &le, cexpr->next, true);
+					MergeExprBytecode(ctx, &le);
+
+					if( !rtemp.dataType.IsPrimitive() )
+					{
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
+					}
+					asCExprValue result;
+					result = rtemp;
+					PerformAssignment(&result, &le.type, &ctx->bc, cexpr->next);
+					if( !result.dataType.IsPrimitive() )
+						ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
+
+					// Release the old temporary variable
+					ReleaseTemporaryVariable(le.type, &ctx->bc);
+
+					// Process any deferred arguments in the expressions as these must not survive until after the condition returns
+					ProcessDeferredParams(ctx);
+
+					ctx->bc.InstrINT(asBC_JMP, afterLabel);
+
+					// Start of the right expression
+					ctx->bc.Label((short)elseLabel);
+
+					// Copy the result to the same temporary variable
+					PrepareForAssignment(&rtemp.dataType, &re, cexpr->next, true);
+					MergeExprBytecode(ctx, &re);
+
+					if( !rtemp.dataType.IsPrimitive() )
+					{
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						rtemp.dataType.MakeReference(IsVariableOnHeap(offset));
+					}
+					result = rtemp;
+					PerformAssignment(&result, &re.type, &ctx->bc, cexpr->next);
+					if( !result.dataType.IsPrimitive() )
+						ctx->bc.Instr(asBC_PopPtr); // Pop the original value (always a pointer)
+
+					// Release the old temporary variable
+					ReleaseTemporaryVariable(re.type, &ctx->bc);
+
+					// Process any deferred arguments in the expressions as these must not survive until after the condition returns
+					ProcessDeferredParams(ctx);
+
+					ctx->bc.Label((short)afterLabel);
+
+					// Set the temporary variable as output
+					ctx->type = rtemp;
+					ctx->type.isExplicitHandle = isExplicitHandle;
+
+					if( !ctx->type.dataType.IsPrimitive() )
+					{
+						ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						ctx->type.dataType.MakeReference(IsVariableOnHeap(offset));
+					}
+
+					// Make sure the output isn't marked as being a literal constant
+					ctx->type.isConstant = false;
+				}
+			}
+		}
+		else
+		{
+			ctx->type.SetDummy();
+			return -1;
+		}
+	}
+	else
+		return CompileExpression(cexpr, ctx);
+
+	return 0;
+}
+
+int asCCompiler::CompileExpression(asCScriptNode *expr, asCExprContext *ctx)
+{
+	asASSERT(expr->nodeType == snExpression);
+
+	// Convert to polish post fix, i.e: a+b => ab+
+	asCArray<asCScriptNode *> postfix;
+	ConvertToPostFix(expr, postfix);
+
+	// Compile the postfix formatted expression
+	return CompilePostFixExpression(&postfix, ctx);
+}
+
+void asCCompiler::ConvertToPostFix(asCScriptNode *expr, asCArray<asCScriptNode *> &postfix)
+{
+	// The algorithm that I've implemented here is similar to
+	// Djikstra's Shunting Yard algorithm, though I didn't know it at the time.
+	// ref: http://en.wikipedia.org/wiki/Shunting-yard_algorithm
+
+	// Count the nodes in order to preallocate the buffers
+	int count = 0;
+	asCScriptNode *node = expr->firstChild;
+	while( node )
+	{
+		count++;
+		node = node->next;
+	}
+
+	asCArray<asCScriptNode *>  stackA(count);
+	asCArray<asCScriptNode *> &stackB = postfix;
+	stackB.Allocate(count, false);
+
+	node = expr->firstChild;
+	while( node )
+	{
+		int precedence = GetPrecedence(node);
+
+		while( stackA.GetLength() > 0 &&
+			   precedence <= GetPrecedence(stackA[stackA.GetLength()-1]) )
+			stackB.PushLast(stackA.PopLast());
+
+		stackA.PushLast(node);
+
+		node = node->next;
+	}
+
+	while( stackA.GetLength() > 0 )
+		stackB.PushLast(stackA.PopLast());
+}
+
+int asCCompiler::CompilePostFixExpression(asCArray<asCScriptNode *> *postfix, asCExprContext *ctx)
+{
+	// Shouldn't send any byte code
+	asASSERT(ctx->bc.GetLastInstr() == -1);
+
+	// Set the context to a dummy type to avoid further
+	// errors in case the expression fails to compile
+	ctx->type.SetDummy();
+
+	// Evaluate the operands and operators
+	asCArray<asCExprContext*> free;
+	asCArray<asCExprContext*> expr;
+	int ret = 0;
+	for( asUINT n = 0; ret == 0 && n < postfix->GetLength(); n++ )
+	{
+		asCScriptNode *node = (*postfix)[n];
+		if( node->nodeType == snExprTerm )
+		{
+			asCExprContext *e = free.GetLength() ? free.PopLast() : asNEW(asCExprContext)(engine);
+			expr.PushLast(e);
+			e->exprNode = node;
+			ret = CompileExpressionTerm(node, e);
+		}
+		else
+		{
+			asCExprContext *r = expr.PopLast();
+			asCExprContext *l = expr.PopLast();
+
+			// Now compile the operator
+			asCExprContext *e = free.GetLength() ? free.PopLast() : asNEW(asCExprContext)(engine);
+			ret = CompileOperator(node, l, r, e);
+
+			expr.PushLast(e);
+
+			// Free the operands
+			l->Clear();
+			free.PushLast(l);
+			r->Clear();
+			free.PushLast(r);
+		}
+	}
+
+	if( ret == 0 )
+	{
+		asASSERT(expr.GetLength() == 1);
+
+		// The final result should be moved to the output context
+		MergeExprBytecodeAndType(ctx, expr[0]);
+	}
+
+	// Clean up
+	for( asUINT e = 0; e < expr.GetLength(); e++ )
+		asDELETE(expr[e], asCExprContext);
+	for( asUINT f = 0; f < free.GetLength(); f++ )
+		asDELETE(free[f], asCExprContext);
+
+	return ret;
+}
+
+int asCCompiler::CompileAnonymousInitList(asCScriptNode *node, asCExprContext *ctx, const asCDataType &dt)
+{
+	asASSERT(node->nodeType == snInitList);
+
+	// Do not allow constructing non-shared types in shared functions
+	if (outFunc->IsShared() &&
+		dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared())
+	{
+		asCString msg;
+		msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
+		Error(msg, node);
+	}
+
+	// If this is compiled from a default arg, then use the script code for the default arg
+	asCScriptCode *origCode = script;
+	if (ctx->origCode)
+		script = ctx->origCode;
+
+	// Allocate and initialize the temporary object
+	int offset = AllocateVariable(dt, true);
+	CompileInitialization(node, &ctx->bc, dt, node, offset, 0, 0);
+
+	// Push the reference to the object on the stack
+	ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+	ctx->type.SetVariable(dt, offset, true);
+	ctx->type.isLValue = false;
+
+	// If the variable is allocated on the heap we have a reference,
+	// otherwise the actual object pointer is pushed on the stack.
+	if (IsVariableOnHeap(offset))
+		ctx->type.dataType.MakeReference(true);
+
+	// Clear the flag for anonymous initalization list as it is no
+	// longer true now that the object has been initialized.
+	ctx->isAnonymousInitList = false;
+	ctx->origCode = 0;
+
+	script = origCode;
+
+	return 0;
+}
+
+int asCCompiler::CompileExpressionTerm(asCScriptNode *node, asCExprContext *ctx)
+{
+	// Shouldn't send any byte code
+	asASSERT(ctx->bc.GetLastInstr() == -1);
+
+	// Check if this is an initialization of a temp object with an initialization list
+	if (node->firstChild )
+	{
+		if (node->firstChild->nodeType == snDataType)
+		{
+			// Determine the type of the temporary object
+			asCDataType dt = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
+
+			return CompileAnonymousInitList(node->lastChild, ctx, dt);
+		}
+		else if (node->firstChild->nodeType == snInitList)
+		{
+			// As the type is not yet known, the init list will be compiled at a
+			// later time when the type can be determined from the destination
+			ctx->SetAnonymousInitList(node->firstChild, script);
+			return 0;
+		}
+	}
+
+	// Set the type as a dummy by default, in case of any compiler errors
+	ctx->type.SetDummy();
+
+	// Compile the value node
+	asCScriptNode *vnode = node->firstChild;
+	while( vnode->nodeType != snExprValue )
+		vnode = vnode->next;
+
+	asCExprContext v(engine);
+	int r = CompileExpressionValue(vnode, &v); 
+	if( r < 0 ) 
+		return r;
+
+	// Compile post fix operators
+	asCScriptNode *pnode = vnode->next;
+	while( pnode )
+	{
+		r = CompileExpressionPostOp(pnode, &v); 
+		if( r < 0 ) 
+			return r;
+		pnode = pnode->next;
+	}
+
+	// Compile pre fix operators
+	pnode = vnode->prev;
+	while( pnode )
+	{
+		r = CompileExpressionPreOp(pnode, &v); 
+		if( r < 0 ) 
+			return r;
+		pnode = pnode->prev;
+	}
+
+	// Return the byte code and final type description
+	MergeExprBytecodeAndType(ctx, &v);
+
+	return 0;
+}
+
+// returns:
+//  SL_LOCALCONST = local constant
+//  SL_LOCALVAR   = local variable
+//  SL_NOMATCH    = no match
+asCCompiler::SYMBOLTYPE asCCompiler::SymbolLookupLocalVar(const asCString &name, asCExprContext *outResult)
+{
+	sVariable *v = 0;
+	if (variables)
+		v = variables->GetVariable(name.AddressOf());
+	if (v)
+	{
+		if (v->isPureConstant)
+		{
+			outResult->type.SetConstantData(v->type, v->constantValue);
+			return SL_LOCALCONST;
+		}
+
+		outResult->type.SetVariable(v->type, v->stackOffset, false);
+		return SL_LOCALVAR;
+	}
+
+	return SL_NOMATCH;
+}
+
+// returns:
+//  SL_CLASSPROPACCESS = class property accessor
+//  SL_CLASSPROP       = class property
+//  SL_CLASSMETHOD     = class method
+//  SL_CLASSTYPE       = class child type
+//  SL_NOMATCH         = no match
+//  SL_ERROR           = error
+asCCompiler::SYMBOLTYPE asCCompiler::SymbolLookupMember(const asCString &name, asCObjectType *objType, asCExprContext *outResult)
+{
+	// See if there are any matching property accessors
+	asCExprContext access(engine);
+	access.type.Set(asCDataType::CreateType(objType, false));
+	access.type.dataType.MakeReference(true);
+	int r = 0;
+	// Indexed property access
+	asCExprContext dummyArg(engine);
+	r = FindPropertyAccessor(name, &access, &dummyArg, 0, 0, true);
+	if (r == 0)
+	{
+		// Normal property access
+		r = FindPropertyAccessor(name, &access, 0, 0, true);
+	}
+	if (r <= -3) return SL_ERROR;
+	if (r != 0)
+	{
+		// The symbol matches getters/setters (though not necessarily a compilable match)
+		MergeExprBytecodeAndType(outResult, &access);
+		outResult->type.dataType.SetTypeInfo(objType);
+		return SL_CLASSPROPACCESS;
+	}
+
+	// Look for matching properties
+	asCDataType dt;
+	dt = asCDataType::CreateType(objType, false);
+	asCObjectProperty *prop = builder->GetObjectProperty(dt, name.AddressOf());
+	if (prop)
+	{
+		outResult->type.dataType.SetTypeInfo(objType);
+		return SL_CLASSPROP;
+	}
+
+	// If it is not a property, it may still be the name of a method
+	asCObjectType *ot = objType;
+	for (asUINT n = 0; n < ot->methods.GetLength(); n++)
+	{
+		asCScriptFunction *f = engine->scriptFunctions[ot->methods[n]];
+		if (f->name == name &&
+			(builder->module->m_accessMask & f->accessMask))
+		{
+			outResult->type.dataType.SetTypeInfo(objType);
+			return SL_CLASSMETHOD;
+		}
+	}
+
+	// If it is not a method, then it can still be a child type
+	for (asUINT n = 0; n < ot->childFuncDefs.GetLength(); n++)
+	{
+		if (ot->childFuncDefs[n]->name == name)
+		{
+			outResult->type.dataType.SetTypeInfo(objType);
+			return SL_CLASSTYPE;
+		}
+	}
+
+	return SL_NOMATCH;
+}
+
+// The purpose of this function is to find the entity that matches the symbol name respecting the scope and visibility hierarchy
+// The 'outResult' will be used to return info on what was identified, but no code will be produced by this function
+// input:
+//  name         = the name of the symbol to look for
+//  scope        = explicit scope informed
+//  objType      = used to look for symbols within object type (e.g. when compiling post op), in this case no local or global symbols will be looked up
+// returns:
+//  SL_NOMATCH          = no matching symbol
+//  SL_LOCALCONST       = local constant
+//  SL_LOCALVAR         = local variable
+//  SL_THISPTR          = this pointer
+//  SL_CLASSPROPACCESS  = class property accessor, lookupResult->dataType holds the object type in which the member was found
+//  SL_CLASSPROP        = class property, lookupResult->dataType holds the object type in which the member was found
+//  SL_CLASSMETHOD      = class method, lookupResult->dataType holds the object type in which the member was found
+//  SL_CLASSTYPE        = class child type, lookupResult->dataType holds the object type in which the member was found
+//  SL_GLOBALPROPACCESS = global property accessor, lookupResult->symbolNamespace holds the namespace where the symbol was identified
+//  SL_GLOBALCONST      = global constant, lookupResult->symbolNamespace holds the namespace where the symbol was identified
+//  SL_GLOBALVAR        = global variable, lookupResult->symbolNamespace holds the namespace where the symbol was identified
+//  SL_GLOBALFUNC       = global function, lookupResult->symbolNamespace holds the namespace where the symbol was identified
+//  SL_GLOBALTYPE       = type, lookupResult->dataType holds the type
+//  SL_ENUMVAL          = enum value, lookupResult->dataType holds the enum type, unless ambigious. lookupResult->symbolNamespace holds the namespace where the symbol was identified
+//  SL_ERROR            = error
+asCCompiler::SYMBOLTYPE asCCompiler::SymbolLookup(const asCString &name, const asCString &scope, asCObjectType *objType, asCExprContext *outResult)
+{
+	asASSERT(outResult);
+
+	// It is a local variable or parameter?
+	// This is not accessible by default arg expressions
+	if (!isCompilingDefaultArg && scope == "" && !objType )
+	{
+		SYMBOLTYPE r = SymbolLookupLocalVar(name, outResult);
+		if (r != 0)
+			return r;
+	}
+
+	// Is it a class member?
+	if (scope == "" && ((objType) || (outFunc && outFunc->objectType)))
+	{
+		// 'this' is not accessible by default arg expressions
+		if (name == THIS_TOKEN && !objType && !isCompilingDefaultArg)
+		{
+			asCDataType dt = asCDataType::CreateType(outFunc->objectType, outFunc->IsReadOnly());
+
+			// The object pointer is located at stack position 0
+			outResult->type.SetVariable(dt, 0, false);
+			return SL_THISPTR;
+		}
+
+		// 'super' is not accessible by default arg expressions
+		if (m_isConstructor && name == SUPER_TOKEN && !objType && !isCompilingDefaultArg)
+		{
+			// If the class is derived from another class, then super can be used to call the base' class constructor
+			if (outFunc && outFunc->objectType->derivedFrom)
+			{
+				outResult->type.dataType.SetTypeInfo(outFunc->objectType->derivedFrom);
+				return SL_CLASSMETHOD;
+			}
+		}
+
+		// Look for members in the type
+		// class members are only accessible in default arg expressions as post op '.' 
+		if( !isCompilingDefaultArg || (isCompilingDefaultArg && objType) )
+		{
+			SYMBOLTYPE r = SymbolLookupMember(name, objType ? objType : outFunc->objectType, outResult);
+			if (r != 0)
+				return r;
+		}
+	}
+
+	// Recursively search parent namespaces for global entities
+	asSNameSpace *currNamespace = DetermineNameSpace("");
+	while( !objType && currNamespace )
+	{
+		asCString currScope = scope;
+
+		// If the scope contains ::identifier, then use the last identifier as the class name and the rest of it as the namespace
+		// TODO: child funcdef: A scope can include a template type, e.g. array<ns::type>
+		int n = currScope.FindLast("::");
+		asCString typeName = n >= 0 ? currScope.SubString(n + 2) : currScope;
+		asCString nsName = n >= 0 ? currScope.SubString(0, n) : asCString("");
+
+		// If the scope represents a type that the current class inherits
+		// from then that should be used instead of going through the namespaces
+		if (nsName == "" && (outFunc && outFunc->objectType))
+		{
+			asCObjectType *ot = outFunc->objectType;
+			while (ot)
+			{
+				if (ot->name == typeName)
+				{
+					SYMBOLTYPE r = SymbolLookupMember(name, ot, outResult);
+					if (r != 0)
+						return r;
+				}
+
+				ot = ot->derivedFrom;
+			}
+		}
+
+		// If the scope starts with :: then search from the global scope
+		if (currScope.GetLength() < 2 || currScope[0] != ':')
+		{
+			if (nsName != "")
+			{
+				if (currNamespace->name != "")
+					nsName = currNamespace->name + "::" + nsName;
+			}
+			else
+				nsName = currNamespace->name;
+		}
+		else
+			nsName = nsName.SubString(2);
+
+		// Get the namespace for this scope
+		asSNameSpace *ns = engine->FindNameSpace(nsName.AddressOf());
+		if (ns)
+		{
+			// Is there a type with typeName in the namespace?
+			asCTypeInfo *scopeType = builder->GetType(typeName.AddressOf(), ns, 0);
+
+			// Check if the symbol is a member of that type
+			if (scopeType)
+			{
+				// Is it an object type?
+				if (CastToObjectType(scopeType))
+				{
+					SYMBOLTYPE r = SymbolLookupMember(name, CastToObjectType(scopeType), outResult);
+					if (r != 0)
+						return r;
+				}
+
+				// Is it an enum type?
+				if (CastToEnumType(scopeType))
+				{
+					asDWORD value = 0;
+					asCDataType dt;
+					if (builder->GetEnumValueFromType(CastToEnumType(scopeType), name.AddressOf(), dt, value))
+					{
+						// an enum value was resolved
+						outResult->type.SetConstantDW(dt, value);
+						outResult->symbolNamespace = ns;
+						return SL_ENUMVAL;
+					}
+				}
+			}
+		}
+
+		// Get the namespace for this scope. This may return null if the scope is an enum
+		nsName = currScope;
+
+		// If the scope starts with :: then search from the global scope
+		if (currScope.GetLength() < 2 || currScope[0] != ':')
+		{
+			if (nsName != "")
+			{
+				if (currNamespace->name != "")
+					nsName = currNamespace->name + "::" + nsName;
+			}
+			else
+				nsName = currNamespace->name;
+		}
+		else
+			nsName = nsName.SubString(2);
+
+		ns = engine->FindNameSpace(nsName.AddressOf());
+
+		// Is it a global property?
+		if (ns)
+		{
+			// See if there are any matching global property accessors
+			asCExprContext access(engine);
+			int r = 0;
+			// Indexed property access
+			asCExprContext dummyArg(engine);
+			r = FindPropertyAccessor(name, &access, &dummyArg, 0, ns);
+			if (r == 0)
+			{
+				// Normal property access
+				r = FindPropertyAccessor(name, &access, 0, ns);
+			}
+			if (r <= -3) return SL_ERROR;
+			if (r != 0)
+			{
+				// The symbol matches getters/setters (though not necessarily a compilable match)
+				MergeExprBytecodeAndType(outResult, &access);
+				outResult->symbolNamespace = ns;
+				return SL_GLOBALPROPACCESS;
+			}
+
+			// See if there is any matching global property
+			bool isCompiled = true;
+			bool isPureConstant = false;
+			bool isAppProp = false;
+			asQWORD constantValue = 0;
+			asCGlobalProperty *prop = builder->GetGlobalProperty(name.AddressOf(), ns, &isCompiled, &isPureConstant, &constantValue, &isAppProp);
+			if (prop)
+			{
+				// If the global property is a pure constant
+				// we can allow the compiler to optimize it. Pure
+				// constants are global constant variables that were
+				// initialized by literal constants.
+				if (isPureConstant)
+				{
+					outResult->type.SetConstantData(prop->type, constantValue);
+					outResult->symbolNamespace = ns;
+					return SL_GLOBALCONST;
+				}
+				else
+				{
+					outResult->type.Set(prop->type);
+					outResult->symbolNamespace = ns;
+					return SL_GLOBALVAR;
+				}
+			}
+		}
+
+		// Is it the name of a global function?
+		if (ns)
+		{
+			asCArray<int> funcs;
+
+			builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
+
+			if (funcs.GetLength() > 0)
+			{
+				// Defer the evaluation of which function until it is actually used
+				// Store the namespace and name of the function for later
+				outResult->type.SetUndefinedFuncHandle(engine);
+				outResult->methodName = ns ? ns->name + "::" + name : name;
+				outResult->symbolNamespace = ns;
+				return SL_GLOBALFUNC;
+			}
+		}
+
+		// Check for type names
+		if (ns)
+		{
+			asCTypeInfo *type = builder->GetType(name.AddressOf(), ns, 0);
+			if (type)
+			{
+				outResult->type.dataType = asCDataType::CreateType(type, false);
+				return SL_GLOBALTYPE;
+			}
+		}
+
+		// Is it an enum value?
+		if (ns && !engine->ep.requireEnumScope)
+		{
+			// Look for the enum value without explicitly informing the enum type
+			asDWORD value = 0;
+			asCDataType dt;
+			int e = builder->GetEnumValue(name.AddressOf(), dt, value, ns);
+			if (e)
+			{
+				if (e == 2)
+				{
+					// Ambiguous enum value: Save the name for resolution later.
+					// The ambiguity could be resolved now, but I hesitate
+					// to store too much information in the context.
+					outResult->enumValue = name.AddressOf();
+
+					// We cannot set a dummy value because it will pass through
+					// cleanly as an integer.
+					outResult->type.SetConstantDW(asCDataType::CreatePrimitive(ttIdentifier, true), 0);
+					outResult->symbolNamespace = ns;
+					return SL_ENUMVAL;
+				}
+				else
+				{
+					// an enum value was resolved
+					outResult->type.SetConstantDW(dt, value);
+					outResult->symbolNamespace = ns;
+					return SL_ENUMVAL;
+				}
+			}
+		}
+
+		// If the given scope starts with '::' then the search starts from global scope
+		if (scope.GetLength() >= 2 && scope[0] == ':')
+			break;
+
+		// Move up to parent namespace
+		currNamespace = engine->GetParentNameSpace(currNamespace);
+	}
+
+	// The name doesn't match any symbol
+	return SL_NOMATCH;
+}
+
+int asCCompiler::CompileVariableAccess(const asCString &name, const asCString &scope, asCExprContext *ctx, asCScriptNode *errNode, bool isOptional, asCObjectType *objType)
+{
+	asCExprContext lookupResult(engine);
+	SYMBOLTYPE symbolType = SymbolLookup(name, scope, objType, &lookupResult);
+	if (symbolType < 0)
+	{
+		// Give dummy value
+		ctx->type.SetDummy();
+
+		return -1;
+	}
+	if (symbolType == SL_NOMATCH)
+	{
+		// Give dummy value
+		ctx->type.SetDummy();
+
+		if (!isOptional)
+		{
+			// No matching symbol
+			asCString msg;
+			asCString smbl;
+			if (scope == "::")
+				smbl = scope;
+			else if (scope != "")
+				smbl = scope + "::";
+			smbl += name;
+			msg.Format(TXT_NO_MATCHING_SYMBOL_s, smbl.AddressOf());
+			Error(msg, errNode);
+		}
+		return -1;
+	}
+
+	// It is a local variable or parameter?
+	if( symbolType == SL_LOCALCONST || symbolType == SL_LOCALVAR )
+	{
+		// This is not accessible by default arg expressions
+		asASSERT(!isCompilingDefaultArg && scope == "" && !objType && variables);
+
+		sVariable *v = variables->GetVariable(name.AddressOf());
+		asASSERT(v);
+
+		if( v->isPureConstant )
+			ctx->type.SetConstantData(v->type, v->constantValue);
+		else if( v->type.IsPrimitive() )
+		{
+			if( v->type.IsReference() )
+			{
+				// Copy the reference into the register
+				ctx->bc.InstrSHORT(asBC_PshVPtr, (short)v->stackOffset);
+				ctx->bc.Instr(asBC_PopRPtr);
+				ctx->type.Set(v->type);
+			}
+			else
+				ctx->type.SetVariable(v->type, v->stackOffset, false);
+
+			// Set as lvalue unless it is a const variable
+			if( !v->type.IsReadOnly() )
+				ctx->type.isLValue = true;
+		}
+		else
+		{
+			ctx->bc.InstrSHORT(asBC_PSF, (short)v->stackOffset);
+			ctx->type.SetVariable(v->type, v->stackOffset, false);
+
+			// If the variable is allocated on the heap we have a reference,
+			// otherwise the actual object pointer is pushed on the stack.
+			if( v->onHeap || v->type.IsObjectHandle() ) ctx->type.dataType.MakeReference(true);
+
+			// Implicitly dereference handle parameters sent by reference
+			if( v->type.IsReference() && (!v->type.IsObject() || v->type.IsObjectHandle()) )
+				ctx->bc.Instr(asBC_RDSPtr);
+
+			// Mark the object as safe for access unless it is a handle, as the
+			// life time of the object is guaranteed throughout the scope.
+			if( !v->type.IsObjectHandle() )
+				ctx->type.isRefSafe = true;
+
+			// Set as lvalue unless it is a const variable
+			if (!v->type.IsReadOnly())
+				ctx->type.isLValue = true;
+		}
+
+		return 0;
+	}
+
+	// Is it a class member?
+	if (symbolType == SL_CLASSPROPACCESS || symbolType == SL_CLASSPROP || symbolType == SL_CLASSMETHOD || symbolType == SL_THISPTR)
+	{
+		// This is not accessible by default arg expressions
+		asASSERT(!isCompilingDefaultArg);
+
+		if (symbolType == SL_THISPTR)
+		{
+			asASSERT(name == THIS_TOKEN && !objType && scope == "");
+			asCDataType dt = asCDataType::CreateType(outFunc->objectType, outFunc->IsReadOnly());
+
+			// The object pointer is located at stack position 0
+			ctx->bc.InstrSHORT(asBC_PSF, 0);
+			ctx->type.SetVariable(dt, 0, false);
+			ctx->type.dataType.MakeReference(true);
+			ctx->type.isLValue = true;
+
+			// The 'this' handle is always considered safe (i.e. life time guaranteed)
+			ctx->type.isRefSafe = true;
+
+			return 0;
+		}
+
+		if (symbolType == SL_CLASSPROPACCESS)
+		{
+			if (scope != "")
+			{
+				// Cannot access non-static members like this
+				asCString msg;
+				msg.Format(TXT_CANNOT_ACCESS_NON_STATIC_MEMBER_s, name.AddressOf());
+				Error(msg, errNode);
+				return -1;
+			}
+
+			// See if there are any matching property accessors
+			asCExprContext access(engine);
+			if (objType)
+				access.type.Set(asCDataType::CreateType(objType, false));
+			else
+				access.type.Set(asCDataType::CreateType(outFunc->objectType, outFunc->IsReadOnly()));
+			access.type.dataType.MakeReference(true);
+			int r = 0;
+			if (errNode->next && errNode->next->tokenType == ttOpenBracket)
+			{
+				// This is an index access, check if there is a property accessor that takes an index arg
+				asCExprContext dummyArg(engine);
+				r = FindPropertyAccessor(name, &access, &dummyArg, errNode, 0, true);
+			}
+			if (r == 0)
+			{
+				// Normal property access
+				r = FindPropertyAccessor(name, &access, errNode, 0, true);
+			}
+			if (r < 0) return -1;
+
+			if (access.property_get == 0 && access.property_set == 0)
+			{
+				// Even though the symbol was identified in SymbolLookup, it doesn't match the arguments
+				asCString msg;
+				if (errNode->next && errNode->next->tokenType == ttOpenBracket)
+					msg.Format(TXT_PROP_ACCESS_s_DOES_NOT_EXPECT_INDEX, name.AddressOf());
+				else
+					msg.Format(TXT_PROP_ACCESS_s_EXPECTS_INDEX, name.AddressOf());
+				Error(msg, errNode);
+				return -1;
+			}
+
+			if (!objType)
+			{
+				// Prepare the bytecode for the member access
+				// This is only done when accessing through the implicit this pointer
+				ctx->bc.InstrSHORT(asBC_PSF, 0);
+			}
+			MergeExprBytecodeAndType(ctx, &access);
+
+			return 0;
+		}
+
+		if (symbolType == SL_CLASSPROP)
+		{
+			if (scope != "")
+			{
+				// Cannot access non-static members like this
+				asCString msg;
+				msg.Format(TXT_CANNOT_ACCESS_NON_STATIC_MEMBER_s, name.AddressOf());
+				Error(msg, errNode);
+				return -1;
+			}
+
+			asCDataType dt;
+			if (objType)
+				dt = asCDataType::CreateType(objType, false);
+			else
+				dt = asCDataType::CreateType(outFunc->objectType, false);
+			asCObjectProperty *prop = builder->GetObjectProperty(dt, name.AddressOf());
+			asASSERT(prop);
+
+			// Is the property access allowed?
+			if (prop->isPrivate && prop->isInherited)
+			{
+				if (engine->ep.privatePropAsProtected)
+				{
+					// The application is allowing inherited classes to access private properties of the parent
+					// class. This option is allowed to provide backwards compatibility with pre-2.30.0 versions
+					// as it was how the compiler behaved earlier.
+					asCString msg;
+					msg.Format(TXT_ACCESSING_PRIVATE_PROP_s, name.AddressOf());
+					Warning(msg, errNode);
+				}
+				else
+				{
+					asCString msg;
+					msg.Format(TXT_INHERITED_PRIVATE_PROP_ACCESS_s, name.AddressOf());
+					Error(msg, errNode);
+				}
+			}
+
+			if (!objType)
+			{
+				// The object pointer is located at stack position 0
+				// This is only done when accessing through the implicit this pointer
+				ctx->bc.InstrSHORT(asBC_PSF, 0);
+				ctx->type.SetVariable(dt, 0, false);
+				ctx->type.dataType.MakeReference(true);
+				Dereference(ctx, true);
+			}
+
+			// TODO: This is the same as what is in CompileExpressionPostOp
+			// Put the offset on the stack
+			ctx->bc.InstrSHORT_DW(asBC_ADDSi, (short)prop->byteOffset, engine->GetTypeIdFromDataType(dt));
+
+			if (prop->type.IsReference())
+				ctx->bc.Instr(asBC_RDSPtr);
+
+			// Reference to primitive must be stored in the temp register
+			if (prop->type.IsPrimitive())
+			{
+				// TODO: runtime optimize: The ADD offset command should store the reference in the register directly
+				ctx->bc.Instr(asBC_PopRPtr);
+			}
+
+			// Set the new type (keeping info about temp variable)
+			ctx->type.dataType = prop->type;
+			ctx->type.dataType.MakeReference(true);
+			ctx->type.isVariable = false;
+			ctx->type.isLValue = true;
+
+			if (ctx->type.dataType.IsObject() && !ctx->type.dataType.IsObjectHandle())
+			{
+				// Objects that are members are not references
+				ctx->type.dataType.MakeReference(false);
+
+				// Objects that are members but not handles are safe as long as the parent object is safe
+				if (!objType || ctx->type.isRefSafe)
+					ctx->type.isRefSafe = true;
+			}
+			else if (ctx->type.dataType.IsObjectHandle())
+			{
+				// Objects accessed through handles cannot be considered safe
+				// as the handle can be cleared at any time
+				ctx->type.isRefSafe = false;
+			}
+
+			// If the object reference is const, the property will also be const
+			ctx->type.dataType.MakeReadOnly(outFunc->IsReadOnly());
+
+			return 0;
+		}
+
+		if (symbolType == SL_CLASSMETHOD)
+		{
+			if (scope != "")
+			{
+				// Cannot access non-static members like this
+				asCString msg;
+				msg.Format(TXT_CANNOT_ACCESS_NON_STATIC_MEMBER_s, name.AddressOf());
+				Error(msg, errNode);
+				return -1;
+			}
+
+#if AS_DEBUG
+			// If it is not a property, it may still be the name of a method which can be used to create delegates
+			asCObjectType *ot = outFunc->objectType;
+			asCScriptFunction *func = 0;
+			for (asUINT n = 0; n < ot->methods.GetLength(); n++)
+			{
+				asCScriptFunction *f = engine->scriptFunctions[ot->methods[n]];
+				if (f->name == name &&
+					(builder->module->m_accessMask & f->accessMask))
+				{
+					func = f;
+					break;
+				}
+			}
+
+			asASSERT(func);
+#endif
+			// An object method was found. Keep the name of the method in the expression, but
+			// don't actually modify the bytecode at this point since it is not yet known what
+			// the method will be used for, or even what overloaded method should be used.
+			ctx->methodName = name;
+
+			// Place the object pointer on the stack, as if the expression was this.func
+			if (!objType)
+			{
+				// The object pointer is located at stack position 0
+				// This is only done when accessing through the implicit this pointer
+				ctx->bc.InstrSHORT(asBC_PSF, 0);
+				ctx->type.SetVariable(asCDataType::CreateType(outFunc->objectType, false), 0, false);
+				ctx->type.dataType.MakeReference(true);
+				Dereference(ctx, true);
+			}
+
+			return 0;
+		}
+	}
+
+	if (symbolType == SL_GLOBALCONST || symbolType == SL_GLOBALPROPACCESS || symbolType == SL_GLOBALVAR || symbolType == SL_GLOBALFUNC || symbolType == SL_ENUMVAL)
+	{
+		// Get the namespace from SymbolLookup
+		asSNameSpace *ns = lookupResult.symbolNamespace;
+
+		if (symbolType == SL_GLOBALPROPACCESS)
+		{
+			// See if there are any matching global property accessors
+			asCExprContext access(engine);
+			int r = 0;
+			if (errNode->next && errNode->next->tokenType == ttOpenBracket)
+			{
+				// This is an index access, check if there is a property accessor that takes an index arg
+				asCExprContext dummyArg(engine);
+				r = FindPropertyAccessor(name, &access, &dummyArg, errNode, ns);
+			}
+			if (r == 0)
+			{
+				// Normal property access
+				r = FindPropertyAccessor(name, &access, errNode, ns);
+			}
+			if (r < 0) return -1;
+
+			if (access.property_get == 0 && access.property_set == 0)
+			{
+				// Even though the symbol was identified in SymbolLookup, it doesn't match the arguments
+				asCString msg;
+				if (errNode->next && errNode->next->tokenType == ttOpenBracket)
+					msg.Format(TXT_PROP_ACCESS_s_DOES_NOT_EXPECT_INDEX, name.AddressOf());
+				else
+					msg.Format(TXT_PROP_ACCESS_s_EXPECTS_INDEX, name.AddressOf());
+				Error(msg, errNode);
+				return -1;
+			}
+
+			// Prepare the bytecode for the function call
+			MergeExprBytecodeAndType(ctx, &access);
+
+			return 0;
+		}
+
+		if (symbolType == SL_GLOBALCONST || symbolType == SL_GLOBALVAR)
+		{
+			bool isCompiled = true;
+			bool isPureConstant = false;
+			bool isAppProp = false;
+			asQWORD constantValue = 0;
+			asCGlobalProperty *prop = builder->GetGlobalProperty(name.AddressOf(), ns, &isCompiled, &isPureConstant, &constantValue, &isAppProp);
+			asASSERT(prop);
+
+			// Verify that the global property has been compiled already
+			if (!isCompiled)
+			{
+				asCString str;
+				str.Format(TXT_UNINITIALIZED_GLOBAL_VAR_s, prop->name.AddressOf());
+				Error(str, errNode);
+				return -1;
+			}
+
+			// If the global property is a pure constant
+			// we can allow the compiler to optimize it. Pure
+			// constants are global constant variables that were
+			// initialized by literal constants.
+			if (isPureConstant)
+				ctx->type.SetConstantData(prop->type, constantValue);
+			else
+			{
+				// A shared type must not access global vars, unless they
+				// too are shared, e.g. application registered vars
+				if (outFunc->IsShared())
+				{
+					if (!isAppProp)
+					{
+						asCString str;
+						str.Format(TXT_SHARED_CANNOT_ACCESS_NON_SHARED_VAR_s, prop->name.AddressOf());
+						Error(str, errNode);
+
+						// Allow the compilation to continue to catch other problems
+					}
+				}
+
+				ctx->type.Set(prop->type);
+				ctx->type.isLValue = true;
+
+				if (ctx->type.dataType.IsPrimitive())
+				{
+					// Load the address of the variable into the register
+					ctx->bc.InstrPTR(asBC_LDG, prop->GetAddressOfValue());
+
+					ctx->type.dataType.MakeReference(true);
+				}
+				else
+				{
+					// Push the address of the variable on the stack
+					ctx->bc.InstrPTR(asBC_PGA, prop->GetAddressOfValue());
+
+					// If the object is a value type or a non-handle variable to a reference type,
+					// then we must validate the existance as it could potentially be accessed
+					// before it is initialized.
+					// This check is not needed for application registered properties, since they
+					// are guaranteed to be valid by the application itself.
+					if (!isAppProp &&
+						((ctx->type.dataType.GetTypeInfo()->flags & asOBJ_VALUE) ||
+							!ctx->type.dataType.IsObjectHandle()))
+					{
+						ctx->bc.Instr(asBC_ChkRefS);
+					}
+
+					// If the address pushed on the stack is to a value type or an object
+					// handle, then mark the expression as a reference. Addresses to a reference
+					// type aren't marked as references to get correct behaviour
+					if ((ctx->type.dataType.GetTypeInfo()->flags & asOBJ_VALUE) ||
+						ctx->type.dataType.IsObjectHandle())
+					{
+						ctx->type.dataType.MakeReference(true);
+					}
+					else
+					{
+						asASSERT((ctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !ctx->type.dataType.IsObjectHandle());
+
+						// It's necessary to dereference the pointer so the pointer on the stack will point to the actual object
+						ctx->bc.Instr(asBC_RDSPtr);
+					}
+				}
+			}
+
+			return 0;
+		}
+
+		if (symbolType == SL_GLOBALFUNC)
+		{
+			asCArray<int> funcs;
+
+			builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
+			asASSERT(funcs.GetLength() > 0);
+
+			if (funcs.GetLength() > 0)
+			{
+				// Defer the evaluation of which function until it is actually used
+				// Store the namespace and name of the function for later
+				ctx->type.SetUndefinedFuncHandle(engine);
+				ctx->methodName = ns ? ns->name + "::" + name : name;
+			}
+
+			return 0;
+		}
+
+		if (symbolType == SL_ENUMVAL)
+		{
+			// The enum type and namespace must be returned from SymbolLookup
+			asCDataType dt = lookupResult.type.dataType;
+			if (!dt.IsEnumType())
+			{
+				asASSERT(!engine->ep.requireEnumScope);
+
+				// It is an ambigious enum value. The evaluation needs to be deferred for when the type is known
+				ctx->enumValue = name.AddressOf();
+				ctx->symbolNamespace = lookupResult.symbolNamespace;
+
+				// We cannot set a dummy value because it will pass through
+				// cleanly as an integer.
+				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttIdentifier, true), 0);
+				return 0;
+			}
+
+			asDWORD value = 0;
+			builder->GetEnumValueFromType(CastToEnumType(lookupResult.type.dataType.GetTypeInfo()), name.AddressOf(), dt, value);
+
+			// Even if the enum type is not shared, and we're compiling a shared object,
+			// the use of the values are still allowed, since they are treated as constants.
+
+			// an enum value was resolved
+			ctx->type.SetConstantDW(dt, value);
+			return 0;
+		}
+	}
+
+	// The result must have been identified above
+	if (symbolType == SL_GLOBALTYPE || symbolType == SL_CLASSTYPE)
+	{
+		// Give dummy value
+		ctx->type.SetDummy();
+
+		// The symbol matches a type
+		asCString msg;
+		asCString smbl;
+		if (scope == "::")
+			smbl = scope;
+		else if (scope != "")
+			smbl = scope + "::";
+		smbl += name;
+		msg.Format(TXT_EXPR_s_IS_DATA_TYPE, smbl.AddressOf());
+		Error(msg, errNode);
+		return -1;
+	}
+
+	// Should not come here
+	asASSERT(false);
+	return 0;
+}
+
+int asCCompiler::CompileExpressionValue(asCScriptNode *node, asCExprContext *ctx)
+{
+	// Shouldn't receive any byte code
+	asASSERT(ctx->bc.GetLastInstr() == -1);
+
+	asCScriptNode *vnode = node->firstChild;
+	ctx->exprNode = vnode;
+	if( vnode->nodeType == snVariableAccess )
+	{
+		// Determine the scope resolution of the variable
+		asCString scope = builder->GetScopeFromNode(vnode->firstChild, script, &vnode);
+
+		// Determine the name of the variable
+		asASSERT(vnode->nodeType == snIdentifier );
+		asCString name(&script->code[vnode->tokenPos], vnode->tokenLength);
+
+		return CompileVariableAccess(name, scope, ctx, node);
+	}
+	else if( vnode->nodeType == snConstant )
+	{
+		if( vnode->tokenType == ttIntConstant )
+		{
+			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
+
+			bool overflow = false;
+			asQWORD val = asStringScanUInt64(value.AddressOf(), 10, 0, &overflow);
+
+			// Is the number bigger than a 64bit word?
+			if (overflow)
+			{
+				Error(TXT_VALUE_TOO_LARGE_FOR_TYPE, vnode);
+
+				// Set the value to zero to avoid further warnings
+				val = 0;
+			}
+
+			// Do we need 64 bits?
+			// If the 31st bit is set we'll treat the value as a signed 64bit number to avoid
+			// incorrect warnings about changing signs if the value is assigned to a 64bit variable
+			if( val>>31 )
+			{
+				// Only if the value uses the last bit of a 64bit word do we consider the number unsigned
+				if( val>>63 )
+					ctx->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), val);
+				else
+					ctx->type.SetConstantQW(asCDataType::CreatePrimitive(ttInt64, true), val);
+			}
+			else
+				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), asDWORD(val));
+		}
+		else if( vnode->tokenType == ttBitsConstant )
+		{
+			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
+
+			// Let the function determine the radix from the prefix 0x = 16, 0d = 10, 0o = 8, or 0b = 2
+			bool overflow = false;
+			asQWORD val = asStringScanUInt64(value.AddressOf(), 0, 0, &overflow);
+
+			// Is the number bigger than a 64bit word?
+			if (overflow)
+			{
+				Error(TXT_VALUE_TOO_LARGE_FOR_TYPE, vnode);
+
+				// Set the value to zero to avoid further warnings
+				val = 0;
+			}
+
+			// Do we need 64 bits?
+			if( val>>32 )
+				ctx->type.SetConstantQW(asCDataType::CreatePrimitive(ttUInt64, true), val);
+			else
+				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), asDWORD(val));
+		}
+		else if( vnode->tokenType == ttFloatConstant )
+		{
+			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
+
+			// TODO: Check for overflow
+
+			size_t numScanned;
+			float v = float(asStringScanDouble(value.AddressOf(), &numScanned));
+			ctx->type.SetConstantF(asCDataType::CreatePrimitive(ttFloat, true), v);
+#ifndef AS_USE_DOUBLE_AS_FLOAT
+			// Don't check this if we have double as float, because then the whole token would be scanned (i.e. no f suffix)
+			asASSERT(numScanned == vnode->tokenLength - 1);
+#endif
+		}
+		else if( vnode->tokenType == ttDoubleConstant )
+		{
+			asCString value(&script->code[vnode->tokenPos], vnode->tokenLength);
+
+			// TODO: Check for overflow
+
+			size_t numScanned;
+			double v = asStringScanDouble(value.AddressOf(), &numScanned);
+			ctx->type.SetConstantD(asCDataType::CreatePrimitive(ttDouble, true), v);
+			asASSERT(numScanned == vnode->tokenLength);
+		}
+		else if( vnode->tokenType == ttTrue ||
+			     vnode->tokenType == ttFalse )
+		{
+#if AS_SIZEOF_BOOL == 1
+			ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), vnode->tokenType == ttTrue ? VALUE_OF_BOOLEAN_TRUE : 0);
+#else
+			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), vnode->tokenType == ttTrue ? VALUE_OF_BOOLEAN_TRUE : 0);
+#endif
+		}
+		else if( vnode->tokenType == ttStringConstant ||
+			     vnode->tokenType == ttMultilineStringConstant ||
+				 vnode->tokenType == ttHeredocStringConstant )
+		{
+			asCString str;
+			asCScriptNode *snode = vnode->firstChild;
+			if( script->code[snode->tokenPos] == '\'' && engine->ep.useCharacterLiterals )
+			{
+				// Treat the single quoted string as a single character literal
+				str.Assign(&script->code[snode->tokenPos+1], snode->tokenLength-2);
+
+				asDWORD val = 0;
+				if( str.GetLength() && (asBYTE)str[0] > 127 && engine->ep.scanner == 1 )
+				{
+					// This is the start of a UTF8 encoded character. We need to decode it
+					val = asStringDecodeUTF8(str.AddressOf(), 0);
+					if( val == (asDWORD)-1 )
+						Error(TXT_INVALID_CHAR_LITERAL, vnode);
+				}
+				else
+				{
+					val = ProcessStringConstant(str, snode);
+					if( val == (asDWORD)-1 )
+						Error(TXT_INVALID_CHAR_LITERAL, vnode);
+				}
+
+				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttUInt, true), val);
+			}
+			else
+			{
+				// Process the string constants
+				while( snode )
+				{
+					asCString cat;
+					if( snode->tokenType == ttStringConstant )
+					{
+						cat.Assign(&script->code[snode->tokenPos+1], snode->tokenLength-2);
+						ProcessStringConstant(cat, snode);
+					}
+					else if( snode->tokenType == ttMultilineStringConstant )
+					{
+						if( !engine->ep.allowMultilineStrings )
+							Error(TXT_MULTILINE_STRINGS_NOT_ALLOWED, snode);
+
+						cat.Assign(&script->code[snode->tokenPos+1], snode->tokenLength-2);
+						ProcessStringConstant(cat, snode);
+					}
+					else if( snode->tokenType == ttHeredocStringConstant )
+					{
+						cat.Assign(&script->code[snode->tokenPos+3], snode->tokenLength-6);
+						ProcessHeredocStringConstant(cat, snode);
+					}
+
+					str += cat;
+
+					snode = snode->next;
+				}
+
+				// Call the string factory function to create a string object
+				if(engine->stringFactory == 0 )
+				{
+					// Error
+					Error(TXT_STRINGS_NOT_RECOGNIZED, vnode);
+
+					// Give dummy value
+					ctx->type.SetDummy();
+					return -1;
+				}
+				else
+				{
+					void *strPtr = const_cast<void*>(engine->stringFactory->GetStringConstant(str.AddressOf(), (asUINT)str.GetLength()));
+					if (strPtr == 0)
+					{
+						// TODO: A better message is needed
+						Error(TXT_NULL_POINTER_ACCESS, vnode);
+						ctx->type.SetDummy();
+						return -1;
+					}
+
+					// Keep the pointer in the list for clean up at exit
+					usedStringConstants.PushLast(strPtr);
+
+					// Push the pointer on the stack. The string factory already guarantees that the
+					// string object is valid throughout the lifetime of the script so no need to add
+					// reference count or make local copy.
+					ctx->bc.InstrPTR(asBC_PGA, strPtr);
+					ctx->type.Set(engine->stringType);
+
+					// Mark the string as literal constant so the compiler knows it is allowed
+					// to treat it differently than an ordinary constant string variable
+					ctx->type.isConstant = true;
+
+					// Mark the reference to the string constant as safe, so the compiler can
+					// avoid making unnecessary temporary copies when passing the reference to
+					// functions.
+					ctx->type.isRefSafe = true;
+				}
+			}
+		}
+		else if( vnode->tokenType == ttNull )
+		{
+			ctx->bc.Instr(asBC_PshNull);
+			ctx->type.SetNullConstant();
+		}
+		else
+			asASSERT(false);
+	}
+	else if( vnode->nodeType == snFunctionCall )
+	{
+		// Determine the scope resolution
+		asCString scope = builder->GetScopeFromNode(vnode->firstChild, script);
+
+		return CompileFunctionCall(vnode, ctx, 0, false, scope);
+	}
+	else if( vnode->nodeType == snConstructCall )
+	{
+		return CompileConstructCall(vnode, ctx);
+	}
+	else if( vnode->nodeType == snAssignment )
+	{
+		asCExprContext e(engine);
+		int r = CompileAssignment(vnode, &e);
+		if( r < 0 )
+		{
+			ctx->type.SetDummy();
+			return r;
+		}
+		MergeExprBytecodeAndType(ctx, &e);
+	}
+	else if( vnode->nodeType == snCast )
+	{
+		// Implement the cast operator
+		return CompileConversion(vnode, ctx);
+	}
+	else if( vnode->nodeType == snUndefined && vnode->tokenType == ttVoid )
+	{
+		// This is a void expression
+		ctx->SetVoidExpression();
+	}
+	else if( vnode->nodeType == snFunction )
+	{
+		// This is an anonymous function
+		// Defer the evaluation of the function until it is known where it
+		// will be used, which is where the signature will be defined
+		ctx->SetLambda(vnode);
+	}
+	else
+		asASSERT(false);
+
+	return 0;
+}
+
+asUINT asCCompiler::ProcessStringConstant(asCString &cstr, asCScriptNode *node, bool processEscapeSequences)
+{
+	int charLiteral = -1;
+
+	// Process escape sequences
+	asCArray<char> str((int)cstr.GetLength());
+
+	for( asUINT n = 0; n < cstr.GetLength(); n++ )
+	{
+#ifdef AS_DOUBLEBYTE_CHARSET
+		// Double-byte charset is only allowed for ASCII and not UTF16 encoded strings
+		if( (cstr[n] & 0x80) && engine->ep.scanner == 0 && engine->ep.stringEncoding != 1 )
+		{
+			// This is the lead character of a double byte character
+			// include the trail character without checking it's value.
+			str.PushLast(cstr[n]);
+			n++;
+			str.PushLast(cstr[n]);
+			continue;
+		}
+#endif
+
+		asUINT val;
+
+		if( processEscapeSequences && cstr[n] == '\\' )
+		{
+			++n;
+			if( n == cstr.GetLength() )
+			{
+				if( charLiteral == -1 ) charLiteral = 0;
+				return charLiteral;
+			}
+
+			// Hexadecimal escape sequences will allow the construction of
+			// invalid unicode sequences, but the string should also work as
+			// a bytearray so we must support this. The code for working with
+			// unicode text must be prepared to handle invalid unicode sequences
+			if( cstr[n] == 'x' || cstr[n] == 'X' )
+			{
+				++n;
+				if( n == cstr.GetLength() ) break;
+
+				val = 0;
+				int c = engine->ep.stringEncoding == 1 ? 4 : 2;
+				for( ; c > 0 && n < cstr.GetLength(); c--, n++ )
+				{
+					if( cstr[n] >= '0' && cstr[n] <= '9' )
+						val = val*16 +  cstr[n] - '0';
+					else if( cstr[n] >= 'a' && cstr[n] <= 'f' )
+						val = val*16 + cstr[n] - 'a' + 10;
+					else if( cstr[n] >= 'A' && cstr[n] <= 'F' )
+						val = val*16 + cstr[n] - 'A' + 10;
+					else
+						break;
+				}
+
+				// Rewind one, since the loop will increment it again
+				n--;
+
+				// Hexadecimal escape sequences produce exact value, even if it is not proper unicode chars
+				if( engine->ep.stringEncoding == 0 )
+				{
+					str.PushLast((asBYTE)val);
+				}
+				else
+				{
+#ifndef AS_BIG_ENDIAN
+					str.PushLast((asBYTE)val);
+					str.PushLast((asBYTE)(val>>8));
+#else
+					str.PushLast((asBYTE)(val>>8));
+					str.PushLast((asBYTE)val);
+#endif
+				}
+				if( charLiteral == -1 ) charLiteral = val;
+				continue;
+			}
+			else if( cstr[n] == 'u' || cstr[n] == 'U' )
+			{
+				// \u expects 4 hex digits
+				// \U expects 8 hex digits
+				bool expect2 = cstr[n] == 'u';
+				int c = expect2 ? 4 : 8;
+
+				val = 0;
+
+				for( ; c > 0; c-- )
+				{
+					++n;
+					if( n == cstr.GetLength() ) break;
+
+					if( cstr[n] >= '0' && cstr[n] <= '9' )
+						val = val*16 + cstr[n] - '0';
+					else if( cstr[n] >= 'a' && cstr[n] <= 'f' )
+						val = val*16 + cstr[n] - 'a' + 10;
+					else if( cstr[n] >= 'A' && cstr[n] <= 'F' )
+						val = val*16 + cstr[n] - 'A' + 10;
+					else
+						break;
+				}
+
+				if( c != 0 )
+				{
+					// Give warning about invalid code point
+					// TODO: Need code position for warning
+					asCString msg;
+					msg.Format(TXT_INVALID_UNICODE_FORMAT_EXPECTED_d, expect2 ? 4 : 8);
+					Warning(msg, node);
+					continue;
+				}
+			}
+			else
+			{
+				if( cstr[n] == '"' )
+					val = '"';
+				else if( cstr[n] == '\'' )
+					val = '\'';
+				else if( cstr[n] == 'n' )
+					val = '\n';
+				else if( cstr[n] == 'r' )
+					val = '\r';
+				else if( cstr[n] == 't' )
+					val = '\t';
+				else if( cstr[n] == '0' )
+					val = '\0';
+				else if( cstr[n] == '\\' )
+					val = '\\';
+				else
+				{
+					// Invalid escape sequence
+					Warning(TXT_INVALID_ESCAPE_SEQUENCE, node);
+					continue;
+				}
+			}
+		}
+		else
+		{
+			if( engine->ep.scanner == 1 && (cstr[n] & 0x80) )
+			{
+				unsigned int len;
+				val = asStringDecodeUTF8(&cstr[n], &len);
+				if( val == 0xFFFFFFFF )
+				{
+					// Incorrect UTF8 encoding. Use only the first byte
+					// TODO: Need code position for warning
+					Warning(TXT_INVALID_UNICODE_SEQUENCE_IN_SRC, node);
+					val = (unsigned char)cstr[n];
+				}
+				else
+					n += len-1;
+			}
+			else
+				val = (unsigned char)cstr[n];
+		}
+
+		// Add the character to the final string
+		char encodedValue[5];
+		int len;
+		if( engine->ep.scanner == 1 && engine->ep.stringEncoding == 0 )
+		{
+			// Convert to UTF8 encoded
+			len = asStringEncodeUTF8(val, encodedValue);
+		}
+		else if( engine->ep.stringEncoding == 1 )
+		{
+			// Convert to 16bit wide character string (even if the script is scanned as ASCII)
+			len = asStringEncodeUTF16(val, encodedValue);
+		}
+		else
+		{
+			// Do not convert ASCII characters
+			encodedValue[0] = (asBYTE)val;
+			len = 1;
+		}
+
+		if( len < 0 )
+		{
+			// Give warning about invalid code point
+			// TODO: Need code position for warning
+			Warning(TXT_INVALID_UNICODE_VALUE, node);
+		}
+		else
+		{
+			// Add the encoded value to the final string
+			str.Concatenate(encodedValue, len);
+			if( charLiteral == -1 ) charLiteral = val;
+		}
+	}
+
+	cstr.Assign(str.AddressOf(), str.GetLength());
+	return charLiteral;
+}
+
+void asCCompiler::ProcessHeredocStringConstant(asCString &str, asCScriptNode *node)
+{
+	// Remove first line if it only contains whitespace
+	bool isMultiline = false;
+	int start;
+	for( start = 0; start < (int)str.GetLength(); start++ )
+	{
+		if( str[start] == '\n' )
+		{
+			isMultiline = true;
+
+			// Remove the linebreak as well
+			start++;
+			break;
+		}
+
+		if( str[start] != ' '  &&
+			str[start] != '\t' &&
+			str[start] != '\r' )
+		{
+			// Don't remove anything
+			start = 0;
+			break;
+		}
+	}
+
+	// Remove the line after the last line break if it only contains whitespaces
+	int end;
+	for( end = (int)str.GetLength() - 1; end >= 0; end-- )
+	{
+		if( str[end] == '\n' )
+		{
+			// Don't remove the last line break
+			end++;
+			break;
+		}
+
+		if( str[end] != ' '  &&
+			str[end] != '\t' &&
+			str[end] != '\r' )
+		{
+			// Don't remove anything
+			end = (int)str.GetLength();
+			break;
+		}
+	}
+
+	if( end < 0 ) end = 0;
+
+	asCString tmp;
+	if (end > start || engine->ep.heredocTrimMode != 2 )
+	{
+		// if heredocTrimMode == 0 the string shouldn't be trimmed
+		// if heredocTrimMode == 1 the string should only be trimmed if it is multiline
+		// if heredocTrimMode == 2 the string should always be trimmed
+		if (engine->ep.heredocTrimMode == 2 || (isMultiline && engine->ep.heredocTrimMode == 1))
+			tmp.Assign(&str[start], end - start);
+		else
+			tmp = str;
+	}
+
+	ProcessStringConstant(tmp, node, false);
+
+	str = tmp;
+}
+
+int asCCompiler::CompileConversion(asCScriptNode *node, asCExprContext *ctx)
+{
+	asCExprContext expr(engine);
+	asCDataType to;
+	bool anyErrors = false;
+	EImplicitConv convType;
+	if( node->nodeType == snConstructCall || node->nodeType == snFunctionCall )
+	{
+		convType = asIC_EXPLICIT_VAL_CAST;
+
+		// Verify that there is only one argument
+		if( node->lastChild->firstChild == 0 ||
+			node->lastChild->firstChild != node->lastChild->lastChild )
+		{
+			Error(TXT_ONLY_ONE_ARGUMENT_IN_CAST, node->lastChild);
+			expr.type.SetDummy();
+			anyErrors = true;
+		}
+		else if (node->lastChild->firstChild &&
+			node->lastChild->firstChild->nodeType == snNamedArgument)
+		{
+			Error(TXT_INVALID_USE_OF_NAMED_ARGS, node->lastChild);
+			expr.type.SetDummy();
+			anyErrors = true;
+		}
+		else
+		{
+			// Compile the expression
+			int r = CompileAssignment(node->lastChild->firstChild, &expr);
+			if( r < 0 )
+				anyErrors = true;
+		}
+
+		// Determine the requested type
+		to = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
+		to.MakeReadOnly(true); // Default to const
+		asASSERT(to.IsPrimitive());
+	}
+	else
+	{
+		convType = asIC_EXPLICIT_REF_CAST;
+
+		// Compile the expression
+		int r = CompileAssignment(node->lastChild, &expr);
+		if( r < 0 )
+			anyErrors = true;
+
+		// Determine the requested type
+		to = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace);
+
+		// If the type support object handles, then use it
+		if( to.SupportHandles() )
+		{
+			to.MakeHandle(true);
+			if( expr.type.dataType.IsObjectConst() )
+				to.MakeHandleToConst(true);
+		}
+		else if( !to.IsObjectHandle() )
+		{
+			// The cast<type> operator can only be used for reference casts
+			Error(TXT_ILLEGAL_TARGET_TYPE_FOR_REF_CAST, node->firstChild);
+			anyErrors = true;
+		}
+	}
+
+	// Do not allow casting to non shared type if we're compiling a shared method
+	if( outFunc->IsShared() &&
+		to.GetTypeInfo() && !to.GetTypeInfo()->IsShared() )
+	{
+		asCString msg;
+		msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, to.GetTypeInfo()->name.AddressOf());
+		Error(msg, node);
+		anyErrors = true;
+	}
+
+	if( anyErrors )
+	{
+		// Assume that the error can be fixed and allow the compilation to continue
+		ctx->type.Set(to);
+		return -1;
+	}
+
+	if( ProcessPropertyGetAccessor(&expr, node) < 0 )
+		return -1;
+
+	// Don't allow any operators on expressions that take address of class method
+	if( expr.IsClassMethod() )
+	{
+		Error(TXT_INVALID_OP_ON_METHOD, node);
+		return -1;
+	}
+
+	// We don't want a reference for conversion casts
+	if( convType == asIC_EXPLICIT_VAL_CAST && expr.type.dataType.IsReference() )
+	{
+		if( expr.type.dataType.IsObject() )
+			Dereference(&expr, true);
+		else
+			ConvertToVariable(&expr);
+	}
+
+	ImplicitConversion(&expr, to, node, convType);
+
+	IsVariableInitialized(&expr.type, node);
+
+	// If no type conversion is really tried ignore it
+	if( to == expr.type.dataType )
+	{
+		// This will keep information about constant type
+		MergeExprBytecode(ctx, &expr);
+		ctx->type = expr.type;
+		return 0;
+	}
+
+	if( to.IsEqualExceptRefAndConst(expr.type.dataType) && to.IsPrimitive() )
+	{
+		MergeExprBytecode(ctx, &expr);
+		ctx->type = expr.type;
+		ctx->type.dataType.MakeReadOnly(true);
+		return 0;
+	}
+
+	// The implicit conversion already does most of the conversions permitted,
+	// here we'll only treat those conversions that require an explicit cast.
+
+	bool conversionOK = false;
+	if( !expr.type.isConstant && expr.type.dataType != asCDataType::CreatePrimitive(ttVoid, false) )
+	{
+		if( !expr.type.dataType.IsObject() )
+			ConvertToTempVariable(&expr);
+
+		if( to.IsObjectHandle() &&
+			expr.type.dataType.IsObjectHandle() &&
+			!(!to.IsHandleToConst() && expr.type.dataType.IsHandleToConst()) )
+		{
+			conversionOK = CompileRefCast(&expr, to, true, node);
+
+			MergeExprBytecode(ctx, &expr);
+			ctx->type = expr.type;
+		}
+	}
+
+	if( conversionOK )
+		return 0;
+
+	// Conversion not available
+	ctx->type.SetDummy();
+
+	asCString strTo, strFrom;
+
+	strTo = to.Format(outFunc->nameSpace);
+	strFrom = expr.type.dataType.Format(outFunc->nameSpace);
+
+	asCString msg;
+	msg.Format(TXT_NO_CONVERSION_s_TO_s, strFrom.AddressOf(), strTo.AddressOf());
+
+	Error(msg, node);
+	return -1;
+}
+
+void asCCompiler::AfterFunctionCall(int funcID, asCArray<asCExprContext*> &args, asCExprContext *ctx, bool deferAll)
+{
+	// deferAll is set to true if for example the function returns a reference, since in
+	// this case the function might be returning a reference to one of the arguments.
+
+	asCScriptFunction *descr = builder->GetFunctionDescription(funcID);
+
+	// Parameters that are sent by reference should be assigned
+	// to the evaluated expression if it is an lvalue
+
+	// Evaluate the arguments from last to first
+	int n = (int)descr->parameterTypes.GetLength() - 1;
+	for( ; n >= 0; n-- )
+	{
+		// All &out arguments must be deferred, except if the argument is clean, in which case the actual reference was passed in to the function
+		// If deferAll is set all objects passed by reference or handle must be deferred
+		if( (descr->parameterTypes[n].IsReference() && (descr->inOutFlags[n] & asTM_OUTREF) && !args[n]->isCleanArg) ||
+			(descr->parameterTypes[n].IsObject() && deferAll && (descr->parameterTypes[n].IsReference() || descr->parameterTypes[n].IsObjectHandle())) )
+		{
+			asASSERT( !(descr->parameterTypes[n].IsReference() && (descr->inOutFlags[n] == asTM_OUTREF) && !args[n]->isCleanArg) || args[n]->origExpr );
+
+			// For &inout, only store the argument if it is for a temporary variable
+			if( engine->ep.allowUnsafeReferences ||
+				descr->inOutFlags[n] != asTM_INOUTREF || args[n]->type.isTemporary )
+			{
+				// Store the argument for later processing
+				asSDeferredParam outParam;
+				outParam.argNode = args[n]->exprNode;
+				outParam.argType = args[n]->type;
+				outParam.argInOutFlags = descr->inOutFlags[n];
+				outParam.origExpr = args[n]->origExpr;
+
+				ctx->deferredParams.PushLast(outParam);
+			}
+		}
+		else
+		{
+			// Release the temporary variable now
+			ReleaseTemporaryVariable(args[n]->type, &ctx->bc);
+		}
+
+		// Move the argument's deferred expressions over to the final expression
+		for( asUINT m = 0; m < args[n]->deferredParams.GetLength(); m++ )
+		{
+			ctx->deferredParams.PushLast(args[n]->deferredParams[m]);
+			args[n]->deferredParams[m].origExpr = 0;
+		}
+		args[n]->deferredParams.SetLength(0);
+	}
+}
+
+void asCCompiler::ProcessDeferredParams(asCExprContext *ctx)
+{
+	if( isProcessingDeferredParams ) return;
+
+	isProcessingDeferredParams = true;
+
+	for( asUINT n = 0; n < ctx->deferredParams.GetLength(); n++ )
+	{
+		asSDeferredParam outParam = ctx->deferredParams[n];
+		if( outParam.argInOutFlags < asTM_OUTREF ) // &in, or not reference
+		{
+			// Just release the variable
+			ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
+		}
+		else if( outParam.argInOutFlags == asTM_OUTREF )
+		{
+			asCExprContext *expr = outParam.origExpr;
+			outParam.origExpr = 0;
+
+			if( outParam.argType.dataType.IsObjectHandle() )
+			{
+				// Implicitly convert the value to a handle
+				if( expr->type.dataType.IsObjectHandle() )
+					expr->type.isExplicitHandle = true;
+			}
+
+			// Verify that the expression result in a lvalue, or a property accessor
+			if( IsLValue(expr->type) || expr->property_get || expr->property_set )
+			{
+				asCExprContext rctx(engine);
+				rctx.type = outParam.argType;
+				if( rctx.type.dataType.IsPrimitive() )
+					rctx.type.dataType.MakeReference(false);
+				else
+				{
+					rctx.bc.InstrSHORT(asBC_PSF, (short)outParam.argType.stackOffset);
+					rctx.type.dataType.MakeReference(IsVariableOnHeap(outParam.argType.stackOffset));
+					if( expr->type.isExplicitHandle )
+						rctx.type.isExplicitHandle = true;
+				}
+
+				asCExprContext o(engine);
+				DoAssignment(&o, expr, &rctx, outParam.argNode, outParam.argNode, ttAssignment, outParam.argNode);
+
+				if( !o.type.dataType.IsPrimitive() ) o.bc.Instr(asBC_PopPtr);
+
+				// The assignment may itself have resulted in a new temporary variable, e.g. if
+				// the opAssign returns a non-reference. We must release this temporary variable
+				// since it won't be used
+				ReleaseTemporaryVariable(o.type, &o.bc);
+
+				MergeExprBytecode(ctx, &o);
+			}
+			else
+			{
+				// We must still evaluate the expression
+				MergeExprBytecode(ctx, expr);
+				if( !expr->IsVoidExpression() && (!expr->type.isConstant || expr->type.IsNullConstant()) )
+					ctx->bc.Instr(asBC_PopPtr);
+
+				// Give an error, except if the argument is void, null or 0 which indicate the argument is explicitly to be ignored
+				if( !expr->IsVoidExpression() && !expr->type.IsNullConstant() &&
+					!(expr->type.isConstant && expr->type.dataType.IsPrimitive() && expr->type.GetConstantData() == 0) )
+					Error(TXT_ARG_NOT_LVALUE, outParam.argNode);
+
+				ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
+			}
+
+			ReleaseTemporaryVariable(expr->type, &ctx->bc);
+
+			// Delete the original expression context
+			asDELETE(expr, asCExprContext);
+		}
+		else // &inout
+		{
+			if( outParam.argType.isTemporary )
+				ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
+			else if( !outParam.argType.isVariable )
+			{
+				if( outParam.argType.dataType.IsObject() &&
+					((outParam.argType.dataType.GetBehaviour()->addref &&
+					  outParam.argType.dataType.GetBehaviour()->release) ||
+					 (outParam.argType.dataType.GetTypeInfo()->flags & asOBJ_NOCOUNT)) )
+				{
+					// Release the object handle that was taken to guarantee the reference
+					ReleaseTemporaryVariable(outParam.argType, &ctx->bc);
+				}
+			}
+		}
+	}
+
+	ctx->deferredParams.SetLength(0);
+	isProcessingDeferredParams = false;
+}
+
+
+int asCCompiler::CompileConstructCall(asCScriptNode *node, asCExprContext *ctx)
+{
+	// The first node is a datatype node
+	asCString name;
+	asCExprValue tempObj;
+	bool onHeap = true;
+	asCArray<int> funcs;
+	bool error = false;
+
+	// It is possible that the name is really a constructor
+	asCDataType dt;
+	dt = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace, false, outFunc->objectType);
+	if( dt.IsPrimitive() )
+	{
+		// This is a cast to a primitive type
+		return CompileConversion(node, ctx);
+	}
+
+	if( dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE) )
+	{
+		// Types declared as implicit handle must not attempt to construct a handle
+		dt.MakeHandle(false);
+	}
+
+	// Don't accept syntax like object@(expr)
+	if( dt.IsObjectHandle() )
+	{
+		asCString str;
+		str.Format(TXT_CANT_CONSTRUCT_s_USE_REF_CAST, dt.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+		ctx->type.SetDummy();
+		return -1;
+	}
+
+	// Make sure the desired type can actually be instantiated
+	// Delegates are allowed to be created through construct calls,
+	// even though they cannot be instantiated as variables
+	if( !dt.CanBeInstantiated() && !dt.IsFuncdef() )
+	{
+		asCString str;
+		if( dt.IsAbstractClass() )
+			str.Format(TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED, dt.Format(outFunc->nameSpace).AddressOf());
+		else if( dt.IsInterface() )
+			str.Format(TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED, dt.Format(outFunc->nameSpace).AddressOf());
+		else
+			// TODO: Improve error message to explain why
+			str.Format(TXT_DATA_TYPE_CANT_BE_s, dt.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+		ctx->type.SetDummy();
+		return -1;
+	}
+
+	// Do not allow constructing non-shared types in shared functions
+	if( outFunc->IsShared() &&
+		dt.GetTypeInfo() && !dt.GetTypeInfo()->IsShared() )
+	{
+		asCString msg;
+		msg.Format(TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s, dt.GetTypeInfo()->name.AddressOf());
+		Error(msg, node);
+		return -1;
+	}
+
+	// Compile the arguments
+	asCArray<asCExprContext *> args;
+	asCArray<asSNamedArgument> namedArgs;
+	asCArray<asCExprValue> temporaryVariables;
+	if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
+	{
+		// Check for a value cast behaviour
+		if( args.GetLength() == 1 )
+		{
+			asCExprContext conv(engine);
+			conv.Copy(args[0]);
+			asUINT cost = ImplicitConversion(&conv, dt, node->lastChild, asIC_EXPLICIT_VAL_CAST, false);
+
+			// Clean the property_arg in the temporary copy so 
+			// it isn't deleted when conv goes out of scope
+			conv.property_arg = 0;
+
+			// Don't use this if the cost is 0 because it would mean that nothing
+			// is done and the script wants a new value to be constructed
+			if( conv.type.dataType.IsEqualExceptRef(dt) && cost > 0 )
+			{
+				// Make sure the result is a reference, just as if to a local variable
+				if( !dt.IsFuncdef() )
+					dt.MakeReference(true);
+
+				// Make sure any property accessor is already evaluated
+				if( ProcessPropertyGetAccessor(args[0], args[0]->exprNode) < 0 )
+					return -1;
+
+				ImplicitConversion(args[0], dt, node->lastChild, asIC_EXPLICIT_VAL_CAST);
+
+				MergeExprBytecode(ctx, args[0]);
+				ctx->type = args[0]->type;
+
+				asDELETE(args[0], asCExprContext);
+
+				return 0;
+			}
+		}
+
+		// Check for possible constructor/factory
+		name = dt.Format(outFunc->nameSpace);
+
+		asSTypeBehaviour *beh = dt.GetBehaviour();
+
+		if( !(dt.GetTypeInfo()->flags & asOBJ_REF) && !dt.IsFuncdef() )
+		{
+			funcs = beh->constructors;
+
+			// Value types and script types are allocated through the constructor
+			tempObj.dataType = dt;
+			tempObj.stackOffset = (short)AllocateVariable(dt, true);
+			tempObj.dataType.MakeReference(true);
+			tempObj.isTemporary = true;
+			tempObj.isVariable = true;
+
+			onHeap = IsVariableOnHeap(tempObj.stackOffset);
+
+			// Push the address of the object on the stack
+			if( onHeap )
+				ctx->bc.InstrSHORT(asBC_VAR, (short)tempObj.stackOffset);
+		}
+		else if( beh )
+			funcs = beh->factories;
+
+		// Special case: Allow calling func(void) with a void expression.
+		if( args.GetLength() == 1 && args[0]->type.dataType == asCDataType::CreatePrimitive(ttVoid, false) )
+		{
+			// Evaluate the expression before the function call
+			MergeExprBytecode(ctx, args[0]);
+			asDELETE(args[0], asCExprContext);
+			args.SetLength(0);
+		}
+
+		// Special case: If this is an object constructor and there are no arguments use the default constructor.
+		// If none has been registered, just allocate the variable and push it on the stack.
+		if( args.GetLength() == 0 )
+		{
+			beh = tempObj.dataType.GetBehaviour();
+			if( beh && beh->construct == 0 && !(dt.GetTypeInfo()->flags & asOBJ_REF) )
+			{
+				// Call the default constructor
+				ctx->type = tempObj;
+
+				if( onHeap )
+				{
+					asASSERT(ctx->bc.GetLastInstr() == asBC_VAR);
+					ctx->bc.RemoveLastInstr();
+				}
+
+				CallDefaultConstructor(tempObj.dataType, tempObj.stackOffset, IsVariableOnHeap(tempObj.stackOffset), &ctx->bc, node);
+
+				// Push the reference on the stack
+				ctx->bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+				return 0;
+			}
+		}
+
+		// Special case: If this is a construction of a delegate and the expression names an object method
+		if( dt.IsFuncdef() && args.GetLength() == 1 && args[0]->methodName != "" )
+		{
+			// TODO: delegate: It is possible that the argument returns a function pointer already, in which
+			//                 case no object delegate will be created, but instead a delegate for a function pointer
+			//                 In theory a simple cast would be good in this case, but this is a construct call so it
+			//                 is expected that a new object is created.
+
+			dt.MakeHandle(true);
+			ctx->type.Set(dt);
+
+			// The delegate must be able to hold on to a reference to the object
+			if( !args[0]->type.dataType.SupportHandles() )
+			{
+				Error(TXT_CANNOT_CREATE_DELEGATE_FOR_NOREF_TYPES, node);
+				error = true;
+			}
+			else
+			{
+				// Filter the available object methods to find the one that matches the func def
+				asCObjectType *type = CastToObjectType(args[0]->type.dataType.GetTypeInfo());
+				asCScriptFunction *bestMethod = 0;
+				for( asUINT n = 0; n < type->methods.GetLength(); n++ )
+				{
+					asCScriptFunction *func = engine->scriptFunctions[type->methods[n]];
+
+					if( func->name != args[0]->methodName )
+						continue;
+
+					// If the expression is for a const object, then only const methods should be accepted
+					if( args[0]->type.dataType.IsReadOnly() && !func->IsReadOnly() )
+						continue;
+
+					if( func->IsSignatureExceptNameAndObjectTypeEqual(CastToFuncdefType(dt.GetTypeInfo())->funcdef) )
+					{
+						bestMethod = func;
+
+						// If the expression is non-const the non-const overloaded method has priority
+						if( args[0]->type.dataType.IsReadOnly() == func->IsReadOnly() )
+							break;
+					}
+				}
+
+				if( bestMethod )
+				{
+					// The object pointer is already on the stack
+					MergeExprBytecode(ctx, args[0]);
+
+					// Push the function pointer as an additional argument
+					ctx->bc.InstrPTR(asBC_FuncPtr, bestMethod);
+
+					// Call the factory function for the delegate
+					asCArray<int> delegateFuncs;
+					builder->GetFunctionDescriptions(DELEGATE_FACTORY, delegateFuncs, engine->nameSpaces[0]);
+					asASSERT(delegateFuncs.GetLength() == 1 );
+					ctx->bc.Call(asBC_CALLSYS , delegateFuncs[0], 2*AS_PTR_SIZE);
+
+					// Store the returned delegate in a temporary variable
+					int returnOffset = AllocateVariable(dt, true, false);
+					dt.MakeReference(true);
+					ctx->type.SetVariable(dt, returnOffset, true);
+					ctx->bc.InstrSHORT(asBC_STOREOBJ, (short)returnOffset);
+
+					// Push a reference to the temporary variable on the stack
+					ctx->bc.InstrSHORT(asBC_PSF, (short)returnOffset);
+
+					// Clean up arguments
+					ReleaseTemporaryVariable(args[0]->type, &ctx->bc);
+				}
+				else
+				{
+					asCString msg;
+					msg.Format(TXT_NO_MATCHING_SIGNATURES_TO_s, CastToFuncdefType(dt.GetTypeInfo())->funcdef->GetDeclaration());
+					Error(msg.AddressOf(), node);
+					error = true;
+				}
+			}
+
+			// Clean-up arg
+			asDELETE(args[0], asCExprContext);
+			return error ? -1 : 0;
+		}
+
+		MatchFunctions(funcs, args, node, name.AddressOf(), &namedArgs, 0, false);
+
+		if( funcs.GetLength() != 1 )
+		{
+			// The error was reported by MatchFunctions()
+			error = true;
+
+			// Dummy value
+			ctx->type.SetDummy();
+		}
+		else
+		{
+			// TODO: Clean up: Merge this with MakeFunctionCall
+
+			// Add the default values for arguments not explicitly supplied
+			int r = CompileDefaultAndNamedArgs(node, args, funcs[0], CastToObjectType(dt.GetTypeInfo()), &namedArgs);
+
+			if( r == asSUCCESS )
+			{
+				asCByteCode objBC(engine);
+
+				PrepareFunctionCall(funcs[0], &ctx->bc, args);
+
+				MoveArgsToStack(funcs[0], &ctx->bc, args, false);
+
+				if( !(dt.GetTypeInfo()->flags & asOBJ_REF) )
+				{
+					// If the object is allocated on the stack, then call the constructor as a normal function
+					if( onHeap )
+					{
+						int offset = 0;
+						asCScriptFunction *descr = builder->GetFunctionDescription(funcs[0]);
+						for( asUINT n = 0; n < args.GetLength(); n++ )
+							offset += descr->parameterTypes[n].GetSizeOnStackDWords();
+
+						ctx->bc.InstrWORD(asBC_GETREF, (asWORD)offset);
+					}
+					else
+						ctx->bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+
+					PerformFunctionCall(funcs[0], ctx, onHeap, &args, CastToObjectType(tempObj.dataType.GetTypeInfo()));
+
+					// Add tag that the object has been initialized
+					ctx->bc.ObjInfo(tempObj.stackOffset, asOBJ_INIT);
+
+					// The constructor doesn't return anything,
+					// so we have to manually inform the type of
+					// the return value
+					ctx->type = tempObj;
+					if( !onHeap )
+						ctx->type.dataType.MakeReference(false);
+
+					// Push the address of the object on the stack again
+					ctx->bc.InstrSHORT(asBC_PSF, (short)tempObj.stackOffset);
+				}
+				else
+				{
+					// Call the factory to create the reference type
+					PerformFunctionCall(funcs[0], ctx, false, &args);
+				}
+			}
+			else
+				error = true;
+		}
+	}
+	else
+	{
+		// Failed to compile the argument list, set the result to the dummy type
+		ctx->type.SetDummy();
+		error = true;
+	}
+
+	// Cleanup
+	for( asUINT n = 0; n < args.GetLength(); n++ )
+		if( args[n] )
+		{
+			asDELETE(args[n], asCExprContext);
+		}
+	for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+		if( namedArgs[n].ctx )
+		{
+			asDELETE(namedArgs[n].ctx, asCExprContext);
+		}
+
+	return error ? -1 : 0;
+}
+
+
+int asCCompiler::CompileFunctionCall(asCScriptNode *node, asCExprContext *ctx, asCObjectType *objectType, bool objIsConst, const asCString &scope)
+{
+	asCExprValue tempObj;
+	asCArray<int> funcs;
+	int localVar = -1;
+	bool initializeMembers = false;
+	asCExprContext funcExpr(engine);
+
+	asCScriptNode *nm = node->lastChild->prev;
+	asCString name(&script->code[nm->tokenPos], nm->tokenLength);
+
+	// Find the matching entities
+	// If objectType is set then this is a post op expression and we shouldn't look for local variables
+	asCExprContext lookupResult(engine);
+	SYMBOLTYPE symbolType = SymbolLookup(name, scope, objectType, &lookupResult);
+	if (symbolType < 0)
+		return -1;
+	if (symbolType == SL_NOMATCH)
+	{
+		// No matching symbol
+		asCString msg;
+		asCString smbl;
+		if (scope == "::")
+			smbl = scope;
+		else if (scope != "")
+			smbl = scope + "::";
+		smbl += name;
+		msg.Format(TXT_NO_MATCHING_SYMBOL_s, smbl.AddressOf());
+		Error(msg, node);
+		return -1;
+	}
+
+	// Is the symbol matching a variable/property?
+	if (symbolType == SL_LOCALCONST || symbolType == SL_LOCALVAR ||
+		symbolType == SL_THISPTR || symbolType == SL_CLASSPROPACCESS || symbolType == SL_CLASSPROP ||
+		symbolType == SL_GLOBALPROPACCESS || symbolType == SL_GLOBALCONST || symbolType == SL_GLOBALVAR || symbolType == SL_ENUMVAL)
+	{
+		// Variables/properties can be used as functions if they have the opCall
+	
+		// Compile the variable
+		// TODO: Take advantage of the known symbol, so it doesn't have to be looked up again
+		localVar = CompileVariableAccess(name, scope, &funcExpr, node, false, objectType);
+		if( localVar < 0 )
+			return -1;
+
+		if (funcExpr.type.dataType.IsFuncdef())
+		{
+			funcs.PushLast(CastToFuncdefType(funcExpr.type.dataType.GetTypeInfo())->funcdef->id);
+		}
+		else if (funcExpr.type.dataType.IsObject())
+		{
+			// Keep information about temporary variables as deferred expression so it can be properly cleaned up after the call
+			if (ctx->type.isTemporary)
+			{
+				asASSERT(objectType);
+
+				asSDeferredParam deferred;
+				deferred.origExpr = 0;
+				deferred.argInOutFlags = asTM_INREF;
+				deferred.argNode = 0;
+				deferred.argType.SetVariable(ctx->type.dataType, ctx->type.stackOffset, true);
+
+				ctx->deferredParams.PushLast(deferred);
+			}
+			if (funcExpr.property_get == 0)
+				Dereference(ctx, true);
+
+			// Add the bytecode for accessing the object on which opCall will be called
+			if (ctx->type.dataType.IsObject())
+			{
+				// Make sure the ProcessPropertyGetAccess knows whether or not to
+				// dereference the original object before calling the get accessor
+				funcExpr.property_ref = ctx->type.dataType.IsReference();
+			}
+			MergeExprBytecodeAndType(ctx, &funcExpr);
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+			Dereference(ctx, true);
+
+			objectType = CastToObjectType(funcExpr.type.dataType.GetTypeInfo());
+
+			// Get the opCall methods from the object type
+			if (funcExpr.type.dataType.IsObjectHandle())
+				objIsConst = funcExpr.type.dataType.IsHandleToConst();
+			else
+				objIsConst = funcExpr.type.dataType.IsReadOnly();
+
+			builder->GetObjectMethodDescriptions("opCall", CastToObjectType(funcExpr.type.dataType.GetTypeInfo()), funcs, objIsConst);
+		}
+		else
+		{
+			// The variable is not a function or object with opCall
+			asCString msg;
+			msg.Format(TXT_NOT_A_FUNC_s_IS_TYPE_s, name.AddressOf(), lookupResult.type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(msg, node);
+			return -1;
+		}
+	}
+
+	// Is the symbol matching a class method?
+	if (symbolType == SL_CLASSMETHOD)
+	{
+		// If we're compiling a constructor and the name of the function is super then
+		// the constructor of the base class is being called.
+		// super cannot be prefixed with a scope operator
+		if (scope == "" && m_isConstructor && name == SUPER_TOKEN)
+		{
+			// If the class is not derived from anyone else, calling super should give an error
+			if (outFunc && outFunc->objectType->derivedFrom)
+				funcs = outFunc->objectType->derivedFrom->beh.constructors;
+
+			// Must not allow calling base class' constructor multiple times
+			if (continueLabels.GetLength() > 0)
+			{
+				// If a continue label is set we are in a loop
+				Error(TXT_CANNOT_CALL_CONSTRUCTOR_IN_LOOPS, node);
+			}
+			else if (breakLabels.GetLength() > 0)
+			{
+				// TODO: inheritance: Should eventually allow constructors in switch statements
+				// If a break label is set we are either in a loop or a switch statements
+				Error(TXT_CANNOT_CALL_CONSTRUCTOR_IN_SWITCH, node);
+			}
+			else if (m_isConstructorCalled)
+			{
+				Error(TXT_CANNOT_CALL_CONSTRUCTOR_TWICE, node);
+			}
+			m_isConstructorCalled = true;
+
+			// We need to initialize the class members, but only after all the deferred arguments have been completed
+			initializeMembers = true;
+		}
+		else
+		{
+			// The scope can be used to specify the base class
+			builder->GetObjectMethodDescriptions(name.AddressOf(), CastToObjectType(lookupResult.type.dataType.GetTypeInfo()), funcs, objIsConst, scope, node, script);
+		}
+
+		// If a class method is being called implicitly, then add the this pointer for the call
+		if (funcs.GetLength() && !objectType && outFunc->objectType)
+		{
+			// Verify that the identified function is actually part of the class hierarchy
+			if (!outFunc->objectType->DerivesFrom(lookupResult.type.dataType.GetTypeInfo()))
+			{
+				asCString msg;
+				asCString mthd;
+				if (scope == "")
+					mthd = name;
+				else if (scope == "::")
+					mthd = scope + name;
+				else
+					mthd = scope + "::" + name;
+
+				msg.Format(TXT_METHOD_s_NOT_PART_OF_OBJECT_s, mthd.AddressOf(), outFunc->objectType->name.AddressOf());
+				Error(msg, node);
+				return -1;
+			}
+
+			objectType = outFunc->objectType;
+
+			asCDataType dt = asCDataType::CreateType(objectType, false);
+
+			// The object pointer is located at stack position 0
+			ctx->bc.InstrSHORT(asBC_PSF, 0);
+			ctx->type.SetVariable(dt, 0, false);
+			ctx->type.dataType.MakeReference(true);
+
+			Dereference(ctx, true);
+		}
+		else if (funcs.GetLength() && !objectType && !outFunc->objectType)
+		{
+			// Cannot call class methods directly without the object
+			asCString msg;
+			msg.Format(TXT_CANNOT_ACCESS_NON_STATIC_MEMBER_s, name.AddressOf());
+			Error(msg, node);
+			return -1;
+		}
+	}
+
+	// Is it a global function?
+	if (symbolType == SL_GLOBALFUNC)
+	{
+		// The symbol lookup identified the namespace to use
+		int n = lookupResult.methodName.FindLast("::");
+		asSNameSpace *ns = engine->FindNameSpace(lookupResult.methodName.SubString(0, n).AddressOf());
+
+		builder->GetFunctionDescriptions(name.AddressOf(), funcs, ns);
+	}
+
+	// Is it a type?
+	if (symbolType == SL_CLASSTYPE || symbolType == SL_GLOBALTYPE)
+	{
+		bool isValid = false;
+		asCDataType dt = builder->CreateDataTypeFromNode(node->firstChild, script, outFunc->nameSpace, false, outFunc->objectType, false, &isValid);
+		if (isValid)
+			return CompileConstructCall(node, ctx);
+	}
+
+	// Compile the arguments
+	asCArray<asCExprContext *> args;
+	asCArray<asSNamedArgument> namedArgs;
+
+	bool isOK = true;
+	if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
+	{
+		// Special case: Allow calling func(void) with an expression that evaluates to no datatype, but isn't exactly 'void'
+		if( args.GetLength() == 1 && args[0]->type.IsVoid() && !args[0]->IsVoidExpression() )
+		{
+			// Evaluate the expression before the function call
+			MergeExprBytecode(ctx, args[0]);
+			asDELETE(args[0], asCExprContext);
+			args.SetLength(0);
+		}
+
+		MatchFunctions(funcs, args, node, name.AddressOf(), &namedArgs, objectType, objIsConst, false, true, scope);
+
+		if( funcs.GetLength() != 1 )
+		{
+			// The error was reported by MatchFunctions()
+
+			// Dummy value
+			ctx->type.SetDummy();
+			isOK = false;
+		}
+		else
+		{
+			// Add the default values for arguments not explicitly supplied
+			int r = CompileDefaultAndNamedArgs(node, args, funcs[0], objectType, &namedArgs);
+
+			// TODO: funcdef: Do we have to make sure the handle is stored in a temporary variable, or
+			//                is it enough to make sure it is in a local variable?
+
+			// For function pointer we must guarantee that the function is safe, i.e.
+			// by first storing the function pointer in a local variable (if it isn't already in one)
+			if( r == asSUCCESS )
+			{
+				asCScriptFunction *func = builder->GetFunctionDescription(funcs[0]);
+				if( func->funcType == asFUNC_FUNCDEF )
+				{
+					if( objectType && funcExpr.property_get <= 0 )
+					{
+						// Dereference the object pointer to access the member
+						Dereference(ctx, true);
+					}
+
+					if( funcExpr.property_get > 0 )
+					{
+						if( ProcessPropertyGetAccessor(&funcExpr, node) < 0 )
+							return -1;
+						Dereference(&funcExpr, true);
+					}
+					else
+					{
+						Dereference(&funcExpr, true);
+						ConvertToVariable(&funcExpr);
+					}
+
+					// The actual function should be called as if a global function
+					objectType = 0;
+
+					// The function call will be made directly from the local variable so the function pointer shouldn't be on the stack
+					funcExpr.bc.Instr(asBC_PopPtr);
+
+					asCExprValue tmp = ctx->type;
+					MergeExprBytecodeAndType(ctx, &funcExpr);
+					ReleaseTemporaryVariable(tmp, &ctx->bc);
+				}
+
+				r = MakeFunctionCall(ctx, funcs[0], objectType, args, node, false, 0, funcExpr.type.stackOffset);
+				if( r < 0 )
+				{
+					ctx->type.SetDummy();
+					isOK = false;
+				}
+			}
+			else
+				isOK = false;
+		}
+	}
+	else
+	{
+		// Failed to compile the argument list, set the dummy type and continue compilation
+		ctx->type.SetDummy();
+		isOK = false;
+	}
+
+	// Cleanup
+	for( asUINT n = 0; n < args.GetLength(); n++ )
+		if( args[n] )
+		{
+			asDELETE(args[n], asCExprContext);
+		}
+	for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+		if( namedArgs[n].ctx )
+		{
+			asDELETE(namedArgs[n].ctx, asCExprContext);
+		}
+
+	if( initializeMembers )
+	{
+		asASSERT( m_isConstructor );
+
+		// Need to initialize members here, as they may use the properties of the base class
+		// If there are multiple paths that call super(), then there will also be multiple
+		// locations with initializations of the members. It is not possible to consolidate
+		// these in one place, as the expressions for the initialization are evaluated where
+		// they are compiled, which means that they may access different variables depending
+		// on the scope where super() is called.
+		// Members that don't have an explicit initialization expression will be initialized
+		// beginning of the constructor as they are guaranteed not to use at the any
+		// members of the base class.
+		CompileMemberInitialization(&ctx->bc, false);
+	}
+
+	return isOK ? 0 : -1;
+}
+
+asSNameSpace *asCCompiler::DetermineNameSpace(const asCString &scope)
+{
+	asSNameSpace *ns;
+
+	if( scope == "" )
+	{
+		// When compiling default argument expression the correct namespace is stored in the outFunc even for objects
+		if( outFunc->nameSpace->name != "" || isCompilingDefaultArg )
+			ns = outFunc->nameSpace;
+		else if( outFunc->objectType && outFunc->objectType->nameSpace->name != "" )
+			ns = outFunc->objectType->nameSpace;
+		else
+			ns = engine->nameSpaces[0];
+	}
+	else if( scope == "::" )
+		ns = engine->nameSpaces[0];
+	else
+		ns = engine->FindNameSpace(scope.AddressOf());
+
+	return ns;
+}
+
+int asCCompiler::CompileExpressionPreOp(asCScriptNode *node, asCExprContext *ctx)
+{
+	int op = node->tokenType;
+
+	// Don't allow any prefix operators except handle on expressions that take address of class method
+	if( ctx->IsClassMethod() && op != ttHandle )
+	{
+		Error(TXT_INVALID_OP_ON_METHOD, node);
+		return -1;
+	}
+
+	// Don't allow any operators on void expressions
+	if( ctx->IsVoidExpression() )
+	{
+		Error(TXT_VOID_CANT_BE_OPERAND, node);
+		return -1;
+	}
+
+	IsVariableInitialized(&ctx->type, node);
+
+	if( op == ttHandle )
+	{
+		if( ctx->methodName != "" )
+		{
+			// Don't allow taking the handle of a handle
+			if( ctx->type.isExplicitHandle )
+			{
+				Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, node);
+				return -1;
+			}
+		}
+		else
+		{
+			// Don't allow taking handle of a handle, i.e. @@
+			if( ctx->type.isExplicitHandle )
+			{
+				Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, node);
+				return -1;
+			}
+
+			// @null is allowed even though it is implicit
+			if( !ctx->type.IsNullConstant() )
+			{
+				// Verify that the type allow its handle to be taken
+				if( !ctx->type.dataType.SupportHandles() && !ctx->type.dataType.IsObjectHandle() )
+				{
+					Error(TXT_OBJECT_HANDLE_NOT_SUPPORTED, node);
+					return -1;
+				}
+
+				// Objects that are not local variables are not references
+				// Objects allocated on the stack are also not marked as references
+				if( !ctx->type.dataType.IsReference() &&
+					!((ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && !ctx->type.isVariable) &&
+					!(ctx->type.isVariable && !IsVariableOnHeap(ctx->type.stackOffset)) )
+				{
+					Error(TXT_NOT_VALID_REFERENCE, node);
+					return -1;
+				}
+
+				// Convert the expression to a handle
+				if( !ctx->type.dataType.IsObjectHandle() && !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
+				{
+					asCDataType to = ctx->type.dataType;
+					to.MakeHandle(true);
+					to.MakeReference(true);
+					to.MakeHandleToConst(ctx->type.dataType.IsReadOnly());
+					ImplicitConversion(ctx, to, node, asIC_IMPLICIT_CONV, true, false);
+
+					asASSERT( ctx->type.dataType.IsObjectHandle() );
+				}
+				else if( ctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE )
+				{
+					// For the ASHANDLE type we'll simply set the expression as a handle
+					ctx->type.dataType.MakeHandle(true);
+				}
+			}
+		}
+
+		// Mark the expression as an explicit handle to avoid implicit conversions to non-handle expressions
+		ctx->type.isExplicitHandle = true;
+	}
+	else if( (op == ttMinus || op == ttPlus || op == ttBitNot || op == ttInc || op == ttDec) && ctx->type.dataType.IsObject() )
+	{
+		// Look for the appropriate method
+		// There is no overloadable operator for unary plus
+		const char *opName = 0;
+		switch( op )
+		{
+		case ttMinus:  opName = "opNeg";    break;
+		case ttBitNot: opName = "opCom";    break;
+		case ttInc:    opName = "opPreInc"; break;
+		case ttDec:    opName = "opPreDec"; break;
+		}
+
+		if( opName )
+		{
+			// TODO: Should convert this to something similar to CompileOverloadedDualOperator2
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+
+			// TODO: If the value isn't const, then first try to find the non const method, and if not found try to find the const method
+
+			// Find the correct method
+			bool isConst = ctx->type.dataType.IsObjectConst();
+			asCArray<int> funcs;
+			asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+				if( func->name == opName &&
+					func->parameterTypes.GetLength() == 0 &&
+					(!isConst || func->IsReadOnly()) )
+				{
+					funcs.PushLast(func->id);
+				}
+			}
+
+			// Did we find the method?
+			if( funcs.GetLength() == 1 )
+			{
+				asCArray<asCExprContext *> args;
+				return MakeFunctionCall(ctx, funcs[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node);
+			}
+			else if( funcs.GetLength() == 0 )
+			{
+				asCString str;
+				str = asCString(opName) + "()";
+				if( isConst )
+					str += " const";
+				str.Format(TXT_FUNCTION_s_NOT_FOUND, str.AddressOf());
+				Error(str, node);
+				ctx->type.SetDummy();
+				return -1;
+			}
+			else if( funcs.GetLength() > 1 )
+			{
+				Error(TXT_MORE_THAN_ONE_MATCHING_OP, node);
+				PrintMatchingFuncs(funcs, node);
+
+				ctx->type.SetDummy();
+				return -1;
+			}
+		}
+		else if( op == ttPlus )
+		{
+			Error(TXT_ILLEGAL_OPERATION, node);
+			ctx->type.SetDummy();
+			return -1;
+		}
+	}
+	else if( op == ttPlus || op == ttMinus )
+	{
+		// This is only for primitives. Objects are treated in the above block
+
+		// Make sure the type is a math type
+		if( !(ctx->type.dataType.IsIntegerType()  ||
+			  ctx->type.dataType.IsUnsignedType() ||
+			  ctx->type.dataType.IsFloatType()    ||
+			  ctx->type.dataType.IsDoubleType()     ) )
+		{
+			Error(TXT_ILLEGAL_OPERATION, node);
+			return -1;
+		}
+
+
+		if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+			return -1;
+
+		asCDataType to = ctx->type.dataType;
+
+		if( ctx->type.dataType.IsUnsignedType() )
+		{
+			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
+				to = asCDataType::CreatePrimitive(ttInt8, false);
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
+				to = asCDataType::CreatePrimitive(ttInt16, false);
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 4 )
+				to = asCDataType::CreatePrimitive(ttInt, false);
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 8 )
+				to = asCDataType::CreatePrimitive(ttInt64, false);
+			else
+			{
+				Error(TXT_INVALID_TYPE, node);
+				return -1;
+			}
+		}
+
+		if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
+
+		// Use an explicit conversion in case of constants to avoid unnecessary warning about change of sign
+		ImplicitConversion(ctx, to, node, ctx->type.isConstant ? asIC_EXPLICIT_VAL_CAST : asIC_IMPLICIT_CONV);
+
+		if( !ctx->type.isConstant )
+		{
+			ConvertToTempVariable(ctx);
+			asASSERT(!ctx->type.isLValue);
+
+			if( op == ttMinus )
+			{
+				if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+					ctx->bc.InstrSHORT(asBC_NEGi, (short)ctx->type.stackOffset);
+				else if( ctx->type.dataType.IsIntegerType() && ctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+					ctx->bc.InstrSHORT(asBC_NEGi64, (short)ctx->type.stackOffset);
+				else if( ctx->type.dataType.IsFloatType() )
+					ctx->bc.InstrSHORT(asBC_NEGf, (short)ctx->type.stackOffset);
+				else if( ctx->type.dataType.IsDoubleType() )
+					ctx->bc.InstrSHORT(asBC_NEGd, (short)ctx->type.stackOffset);
+				else
+				{
+					Error(TXT_ILLEGAL_OPERATION, node);
+					return -1;
+				}
+
+				return 0;
+			}
+		}
+		else
+		{
+			if( op == ttMinus )
+			{
+				if (ctx->type.dataType.IsIntegerType())
+				{
+					if (ctx->type.dataType.GetSizeInMemoryBytes() == 4)
+						ctx->type.SetConstantDW(-(int)ctx->type.GetConstantDW());
+					else if (ctx->type.dataType.GetSizeInMemoryBytes() == 2)
+						ctx->type.SetConstantW(-(asINT16)ctx->type.GetConstantW());
+					else if (ctx->type.dataType.GetSizeInMemoryBytes() == 1)
+						ctx->type.SetConstantB(-(asINT8)ctx->type.GetConstantB());
+					else if (ctx->type.dataType.GetSizeInMemoryBytes() == 8)
+						ctx->type.SetConstantQW(-(asINT64)ctx->type.GetConstantQW());
+				}
+				else if( ctx->type.dataType.IsFloatType() )
+					ctx->type.SetConstantF(-ctx->type.GetConstantF());
+				else if( ctx->type.dataType.IsDoubleType() )
+					ctx->type.SetConstantD(-ctx->type.GetConstantD());
+				else
+				{
+					Error(TXT_ILLEGAL_OPERATION, node);
+					return -1;
+				}
+
+				return 0;
+			}
+		}
+	}
+	else if( op == ttNot )
+	{
+		// Allow value types to be converted to bool using 'bool opImplConv()'
+		if( ctx->type.dataType.GetTypeInfo() && (ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+			ImplicitConversion(ctx, asCDataType::CreatePrimitive(ttBool, false), node, asIC_IMPLICIT_CONV);
+
+		if( ctx->type.dataType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, true)) )
+		{
+			if( ctx->type.isConstant )
+			{
+				#if AS_SIZEOF_BOOL == 1
+					ctx->type.SetConstantB(ctx->type.GetConstantB() == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+				#else
+					ctx->type.SetConstantDW(ctx->type.GetConstantDW() == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+				#endif
+				return 0;
+			}
+
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+
+			ConvertToTempVariable(ctx);
+			asASSERT(!ctx->type.isLValue);
+
+			ctx->bc.InstrSHORT(asBC_NOT, (short)ctx->type.stackOffset);
+		}
+		else
+		{
+			Error(TXT_ILLEGAL_OPERATION, node);
+			return -1;
+		}
+	}
+	else if( op == ttBitNot )
+	{
+		if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+			return -1;
+
+		asCDataType to = ctx->type.dataType;
+
+		if( ctx->type.dataType.IsIntegerType() )
+		{
+			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
+				to = asCDataType::CreatePrimitive(ttUInt8, false);
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
+				to = asCDataType::CreatePrimitive(ttUInt16, false);
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 4 )
+				to = asCDataType::CreatePrimitive(ttUInt, false);
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 8 )
+				to = asCDataType::CreatePrimitive(ttUInt64, false);
+			else
+			{
+				Error(TXT_INVALID_TYPE, node);
+				return -1;
+			}
+		}
+
+		if( ctx->type.dataType.IsReference() ) ConvertToVariable(ctx);
+		ImplicitConversion(ctx, to, node, asIC_IMPLICIT_CONV);
+
+		if( ctx->type.dataType.IsUnsignedType() )
+		{
+			if( ctx->type.isConstant )
+			{
+				if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
+					ctx->type.SetConstantB(~ctx->type.GetConstantB());
+				else if (ctx->type.dataType.GetSizeInMemoryBytes() == 2)
+					ctx->type.SetConstantW(~ctx->type.GetConstantW());
+				else if (ctx->type.dataType.GetSizeInMemoryBytes() == 4)
+					ctx->type.SetConstantDW(~ctx->type.GetConstantDW());
+				else
+					ctx->type.SetConstantQW(~ctx->type.GetConstantQW());
+				return 0;
+			}
+
+			ConvertToTempVariable(ctx);
+			asASSERT(!ctx->type.isLValue);
+
+			if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+				ctx->bc.InstrSHORT(asBC_BNOT, (short)ctx->type.stackOffset);
+			else
+				ctx->bc.InstrSHORT(asBC_BNOT64, (short)ctx->type.stackOffset);
+		}
+		else
+		{
+			Error(TXT_ILLEGAL_OPERATION, node);
+			return -1;
+		}
+	}
+	else if( op == ttInc || op == ttDec )
+	{
+		// Need a reference to the primitive that will be updated
+		// The result of this expression is the same reference as before
+
+		// Make sure the reference isn't a temporary variable
+		if( ctx->type.isTemporary )
+		{
+			Error(TXT_REF_IS_TEMP, node);
+			return -1;
+		}
+		if( ctx->type.dataType.IsReadOnly() )
+		{
+			Error(TXT_REF_IS_READ_ONLY, node);
+			return -1;
+		}
+		if( ctx->property_get || ctx->property_set )
+		{
+			Error(TXT_INVALID_REF_PROP_ACCESS, node);
+			return -1;
+		}
+		if( !ctx->type.isLValue )
+		{
+			Error(TXT_NOT_LVALUE, node);
+			return -1;
+		}
+
+		if( ctx->type.isVariable && !ctx->type.dataType.IsReference() )
+			ConvertToReference(ctx);
+		else if( !ctx->type.dataType.IsReference() )
+		{
+			Error(TXT_NOT_VALID_REFERENCE, node);
+			return -1;
+		}
+
+		if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt64, false)) ||
+			ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt64, false)) )
+		{
+			if( op == ttInc )
+				ctx->bc.Instr(asBC_INCi64);
+			else
+				ctx->bc.Instr(asBC_DECi64);
+		}
+		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt, false)) ||
+			ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt, false)) )
+		{
+			if( op == ttInc )
+				ctx->bc.Instr(asBC_INCi);
+			else
+				ctx->bc.Instr(asBC_DECi);
+		}
+		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt16, false)) ||
+			     ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt16, false)) )
+		{
+			if( op == ttInc )
+				ctx->bc.Instr(asBC_INCi16);
+			else
+				ctx->bc.Instr(asBC_DECi16);
+		}
+		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt8, false)) ||
+			     ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt8, false)) )
+		{
+			if( op == ttInc )
+				ctx->bc.Instr(asBC_INCi8);
+			else
+				ctx->bc.Instr(asBC_DECi8);
+		}
+		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttFloat, false)) )
+		{
+			if( op == ttInc )
+				ctx->bc.Instr(asBC_INCf);
+			else
+				ctx->bc.Instr(asBC_DECf);
+		}
+		else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttDouble, false)) )
+		{
+			if( op == ttInc )
+				ctx->bc.Instr(asBC_INCd);
+			else
+				ctx->bc.Instr(asBC_DECd);
+		}
+		else
+		{
+			Error(TXT_ILLEGAL_OPERATION, node);
+			return -1;
+		}
+	}
+	else
+	{
+		// Unknown operator
+		asASSERT(false);
+		return -1;
+	}
+
+	return 0;
+}
+
+void asCCompiler::ConvertToReference(asCExprContext *ctx)
+{
+	if( ctx->type.isVariable && !ctx->type.dataType.IsReference() )
+	{
+		ctx->bc.InstrSHORT(asBC_LDV, (short)ctx->type.stackOffset);
+		ctx->type.dataType.MakeReference(true);
+		ctx->type.SetVariable(ctx->type.dataType, ctx->type.stackOffset, ctx->type.isTemporary);
+	}
+}
+
+int asCCompiler::FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess)
+{
+	return FindPropertyAccessor(name, ctx, 0, node, ns, isThisAccess);
+}
+
+// Returns:
+//   1 = a valid match was found
+//   0 = no matching symbols (or feature disabled)
+//  -1 = ambiguous getters or setters, i.e. multiple methods match symbol name and signature
+//  -2 = mismatching type for getter and setter
+//  -3 = processing error, e.g. out of memory
+int asCCompiler::FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess)
+{
+	// TODO: With asEP_PROPERTY_ACCESSOR_MODE == 3 this method doesn't need to validate the
+	//       getter/setter as it is done at the time of declaration. Should deprecate the other options
+	
+	if( engine->ep.propertyAccessorMode == 0 )
+	{
+		// Property accessors have been disabled by the application
+		return 0;
+	}
+
+	int getId = 0, setId = 0;
+	asCString getName = "get_" + name;
+	asCString setName = "set_" + name;
+	asCArray<int> multipleGetFuncs, multipleSetFuncs;
+
+	if( ctx->type.dataType.IsObject() )
+	{
+		asASSERT( ns == 0 );
+
+		// Don't look for property accessors in script classes if the script
+		// property accessors have been disabled by the application
+		if( !(ctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT) ||
+			engine->ep.propertyAccessorMode >= 2 )
+		{
+			// Check if the object has any methods with the corresponding accessor name(s)
+			asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *f = engine->scriptFunctions[ot->methods[n]];
+				
+				if( engine->ep.propertyAccessorMode == 3 && !f->IsProperty() )
+					continue;
+				
+				// TODO: The type of the parameter should match the argument (unless the arg is a dummy)
+				if( f->name == getName && (int)f->parameterTypes.GetLength() == (arg?1:0) )
+				{
+					if( getId == 0 )
+						getId = ot->methods[n];
+					else
+					{
+						if( multipleGetFuncs.GetLength() == 0 )
+							multipleGetFuncs.PushLast(getId);
+
+						multipleGetFuncs.PushLast(ot->methods[n]);
+					}
+				}
+				// TODO: getset: If the parameter is a reference, it must not be an out reference. Should we allow inout ref?
+				if( f->name == setName && (int)f->parameterTypes.GetLength() == (arg?2:1) )
+				{
+					if( setId == 0 )
+						setId = ot->methods[n];
+					else
+					{
+						if( multipleSetFuncs.GetLength() == 0 )
+							multipleSetFuncs.PushLast(setId);
+
+						multipleSetFuncs.PushLast(ot->methods[n]);
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		asASSERT( ns != 0 );
+
+		// Look for appropriate global functions.
+		asCArray<int> funcs;
+		asUINT n;
+		builder->GetFunctionDescriptions(getName.AddressOf(), funcs, ns);
+		for( n = 0; n < funcs.GetLength(); n++ )
+		{
+			asCScriptFunction *f = builder->GetFunctionDescription(funcs[n]);
+
+			if( engine->ep.propertyAccessorMode == 3 && !f->IsProperty() )
+				continue;
+			
+			// Ignore script functions, if the application has disabled script defined property accessors
+			if( engine->ep.propertyAccessorMode == 1 && f->funcType == asFUNC_SCRIPT )
+				continue;
+			
+			// TODO: The type of the parameter should match the argument (unless the arg is a dummy)
+			if( (int)f->parameterTypes.GetLength() == (arg?1:0) )
+			{
+				if( getId == 0 )
+					getId = funcs[n];
+				else
+				{
+					if( multipleGetFuncs.GetLength() == 0 )
+						multipleGetFuncs.PushLast(getId);
+
+					multipleGetFuncs.PushLast(funcs[n]);
+				}
+			}
+		}
+
+		funcs.SetLength(0);
+		builder->GetFunctionDescriptions(setName.AddressOf(), funcs, ns);
+		for( n = 0; n < funcs.GetLength(); n++ )
+		{
+			asCScriptFunction *f = builder->GetFunctionDescription(funcs[n]);
+
+			if( engine->ep.propertyAccessorMode == 3 && !f->IsProperty() )
+				continue;
+			
+			// Ignore script functions, if the application has disabled script defined property accessors
+			if( engine->ep.propertyAccessorMode == 1 && f->funcType == asFUNC_SCRIPT )
+				continue;
+			
+			// TODO: getset: If the parameter is a reference, it must not be an out reference. Should we allow inout ref?
+			if( (int)f->parameterTypes.GetLength() == (arg?2:1) )
+			{
+				if( setId == 0 )
+					setId = funcs[n];
+				else
+				{
+					if( multipleSetFuncs.GetLength() == 0 )
+						multipleSetFuncs.PushLast(setId);
+
+					multipleSetFuncs.PushLast(funcs[n]);
+				}
+			}
+		}
+	}
+
+	bool isConst = ctx->type.dataType.IsObjectConst();
+
+	// Check for multiple matches
+	if( multipleGetFuncs.GetLength() > 0 )
+	{
+		// Filter the list by constness
+		FilterConst(multipleGetFuncs, !isConst);
+
+		if( multipleGetFuncs.GetLength() > 1 )
+		{
+			if (node)
+			{
+				asCString str;
+				str.Format(TXT_MULTIPLE_PROP_GET_ACCESSOR_FOR_s, name.AddressOf());
+				Error(str, node);
+
+				PrintMatchingFuncs(multipleGetFuncs, node);
+			}
+
+			return -1;
+		}
+		else
+		{
+			// The id may have changed
+			getId = multipleGetFuncs[0];
+		}
+	}
+
+	if( multipleSetFuncs.GetLength() > 0 )
+	{
+		// Filter the list by constness
+		FilterConst(multipleSetFuncs, !isConst);
+
+		if( multipleSetFuncs.GetLength() > 1 )
+		{
+			if (node)
+			{
+				asCString str;
+				str.Format(TXT_MULTIPLE_PROP_SET_ACCESSOR_FOR_s, name.AddressOf());
+				Error(str, node);
+
+				PrintMatchingFuncs(multipleSetFuncs, node);
+			}
+
+			return -1;
+		}
+		else
+		{
+			// The id may have changed
+			setId = multipleSetFuncs[0];
+		}
+	}
+
+	// Check for type compatibility between get and set accessor
+	if( getId && setId )
+	{
+		asCScriptFunction *getFunc = builder->GetFunctionDescription(getId);
+		asCScriptFunction *setFunc = builder->GetFunctionDescription(setId);
+
+		// It is permitted for a getter to return a handle and the setter to take a reference
+		int idx = (arg?1:0);
+		if( !getFunc->returnType.IsEqualExceptRefAndConst(setFunc->parameterTypes[idx]) &&
+			!((getFunc->returnType.IsObjectHandle() && !setFunc->parameterTypes[idx].IsObjectHandle()) &&
+			  (getFunc->returnType.GetTypeInfo() == setFunc->parameterTypes[idx].GetTypeInfo())) )
+		{
+			if (node)
+			{
+				asCString str;
+				str.Format(TXT_GET_SET_ACCESSOR_TYPE_MISMATCH_FOR_s, name.AddressOf());
+				Error(str, node);
+
+				asCArray<int> funcs;
+				funcs.PushLast(getId);
+				funcs.PushLast(setId);
+
+				PrintMatchingFuncs(funcs, node);
+			}
+
+			return -2;
+		}
+	}
+
+	// Check if we are within one of the accessors
+	int realGetId = getId;
+	int realSetId = setId;
+	if( outFunc->objectType && isThisAccess )
+	{
+		// The property accessors would be virtual functions, so we need to find the real implementation
+		asCScriptFunction *getFunc = getId ? builder->GetFunctionDescription(getId) : 0;
+		if( getFunc &&
+			getFunc->funcType == asFUNC_VIRTUAL &&
+			outFunc->objectType->DerivesFrom(getFunc->objectType) )
+			realGetId = outFunc->objectType->virtualFunctionTable[getFunc->vfTableIdx]->id;
+		asCScriptFunction *setFunc = setId ? builder->GetFunctionDescription(setId) : 0;
+		if( setFunc &&
+			setFunc->funcType == asFUNC_VIRTUAL &&
+			outFunc->objectType->DerivesFrom(setFunc->objectType) )
+			realSetId = outFunc->objectType->virtualFunctionTable[setFunc->vfTableIdx]->id;
+	}
+
+	// Avoid recursive call by not treating this as a property accessor call.
+	// This will also allow having the real property with the same name as the accessors.
+	if( (isThisAccess || outFunc->objectType == 0) &&
+		((realGetId && realGetId == outFunc->id) ||
+		 (realSetId && realSetId == outFunc->id)) )
+	{
+		getId = 0;
+		setId = 0;
+	}
+
+	if( getId || setId )
+	{
+		// Property accessors were found, but we don't know which is to be used yet, so
+		// we just prepare the bytecode for the method call, and then store the function ids
+		// so that the right one can be used when we get there.
+		ctx->property_get = getId;
+		ctx->property_set = setId;
+
+		bool isRefSafe = ctx->type.isRefSafe;
+
+		if( ctx->type.dataType.IsObject() )
+		{
+			// If the object is read-only then we need to remember that
+			if( (!ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsReadOnly()) ||
+				(ctx->type.dataType.IsObjectHandle() && ctx->type.dataType.IsHandleToConst()) )
+				ctx->property_const = true;
+			else
+				ctx->property_const = false;
+
+			// If the object is a handle then we need to remember that
+			ctx->property_handle = ctx->type.dataType.IsObjectHandle();
+			ctx->property_ref    = ctx->type.dataType.IsReference();
+		}
+
+		// The setter's parameter type is used as the property type,
+		// unless only the getter is available
+		asCDataType dt;
+		if( setId )
+			dt = builder->GetFunctionDescription(setId)->parameterTypes[(arg?1:0)];
+		else
+			dt = builder->GetFunctionDescription(getId)->returnType;
+
+		// Just change the type, the context must still maintain information
+		// about previous variable offset and the indicator of temporary variable.
+		int offset = ctx->type.stackOffset;
+		bool isTemp = ctx->type.isTemporary;
+		ctx->type.Set(dt);
+		ctx->type.stackOffset = (short)offset;
+		ctx->type.isTemporary = isTemp;
+		ctx->exprNode = node;
+
+		// Remember if the object is safe, so the invocation of the property
+		// accessor doesn't needlessly make a safe copy of the handle
+		ctx->type.isRefSafe = isRefSafe;
+
+		// Store the argument for later use
+		if( arg )
+		{
+			ctx->property_arg = asNEW(asCExprContext)(engine);
+			if( ctx->property_arg == 0 )
+			{
+				// Out of memory
+				return -3;
+			}
+
+			MergeExprBytecodeAndType(ctx->property_arg, arg);
+		}
+
+		return 1;
+	}
+
+	// No accessor was found
+	return 0;
+}
+
+int asCCompiler::ProcessPropertySetAccessor(asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node)
+{
+	// TODO: A lot of this code is similar to ProcessPropertyGetAccessor. Can we unify them?
+
+	if( !ctx->property_set )
+	{
+		Error(TXT_PROPERTY_HAS_NO_SET_ACCESSOR, node);
+		return -1;
+	}
+
+	asCScriptFunction *func = builder->GetFunctionDescription(ctx->property_set);
+
+	// Make sure the arg match the property
+	asCArray<int> funcs;
+	funcs.PushLast(ctx->property_set);
+	asCArray<asCExprContext *> args;
+	if( ctx->property_arg )
+		args.PushLast(ctx->property_arg);
+	args.PushLast(arg);
+	MatchFunctions(funcs, args, node, func->GetName(), 0, func->objectType, ctx->property_const);
+	if( funcs.GetLength() == 0 )
+	{
+		// MatchFunctions already reported the error
+		if( ctx->property_arg )
+		{
+			asDELETE(ctx->property_arg, asCExprContext);
+			ctx->property_arg = 0;
+		}
+		return -1;
+	}
+
+	if( func->objectType )
+	{
+		// Setup the context with the original type so the method call gets built correctly
+		ctx->type.dataType = asCDataType::CreateType(func->objectType, ctx->property_const);
+		if( ctx->property_handle ) ctx->type.dataType.MakeHandle(true);
+		if( ctx->property_ref )	ctx->type.dataType.MakeReference(true);
+
+		// Don't allow the call if the object is read-only and the property accessor is not const
+		if( ctx->property_const && !func->IsReadOnly() )
+		{
+			Error(TXT_NON_CONST_METHOD_ON_CONST_OBJ, node);
+			asCArray<int> funcCandidates;
+			funcCandidates.PushLast(ctx->property_set);
+			PrintMatchingFuncs(funcCandidates, node);
+		}
+	}
+
+	// Call the accessor
+	int r = MakeFunctionCall(ctx, ctx->property_set, func->objectType, args, node);
+
+	ctx->property_get = 0;
+	ctx->property_set = 0;
+	if( ctx->property_arg )
+	{
+		asDELETE(ctx->property_arg, asCExprContext);
+		ctx->property_arg = 0;
+	}
+
+	return r;
+}
+
+int asCCompiler::ProcessPropertyGetSetAccessor(asCExprContext *ctx, asCExprContext *lctx, asCExprContext *rctx, eTokenType op, asCScriptNode *errNode)
+{
+	// TODO: Perhaps it might be interesting to allow the definition of compound setters for better
+	//       performance, e.g. set_add_prop, set_mul_prop, etc. With these it would also be possible
+	//       to support value types, since it would be a single call
+
+	// Compound assignment for indexed property accessors is not supported yet
+	if( lctx->property_arg != 0 )
+	{
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		Error(TXT_COMPOUND_ASGN_WITH_IDX_PROP, errNode);
+		return -1;
+	}
+
+	// Compound assignments require both get and set accessors
+	if( lctx->property_set == 0 || lctx->property_get == 0 )
+	{
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		Error(TXT_COMPOUND_ASGN_REQUIRE_GET_SET, errNode);
+		return -1;
+	}
+
+	// Property accessors on value types (or scoped references types) are not supported since
+	// it is not possible to guarantee that the object will stay alive between the two calls
+	asCScriptFunction *func = engine->scriptFunctions[lctx->property_set];
+	if( func->objectType && (func->objectType->flags & (asOBJ_VALUE | asOBJ_SCOPED)) )
+	{
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		Error(TXT_COMPOUND_ASGN_ON_VALUE_TYPE, errNode);
+		return -1;
+	}
+
+	// Translate the compound assignment to the corresponding dual operator
+	switch( op )
+	{
+	case ttAddAssign: op = ttPlus; break;
+	case ttSubAssign: op = ttMinus; break;
+	case ttMulAssign: op = ttStar; break;
+	case ttDivAssign: op = ttSlash; break;
+	case ttModAssign: op = ttPercent; break;
+	case ttPowAssign: op = ttStarStar; break;
+
+	case ttAndAssign: op = ttAmp; break;
+	case ttOrAssign:  op = ttBitOr; break;
+	case ttXorAssign: op = ttBitXor; break;
+
+	case ttShiftLeftAssign:   op = ttBitShiftLeft; break;
+	case ttShiftRightAAssign: op = ttBitShiftRightArith; break;
+	case ttShiftRightLAssign: op = ttBitShiftRight; break;
+
+	default: op = ttUnrecognizedToken; break;
+	}
+
+	if( op == ttUnrecognizedToken )
+	{
+		// Shouldn't happen
+		asASSERT(false);
+
+		// Process the property to free the memory
+		ProcessPropertySetAccessor(lctx, rctx, errNode);
+		return -1;
+	}
+
+	asCExprContext before(engine);
+	if( func->objectType && (func->objectType->flags & (asOBJ_REF|asOBJ_SCOPED)) == asOBJ_REF )
+	{
+		// Keep a reference to the object in a local variable
+		before.bc.AddCode(&lctx->bc);
+
+		asUINT len = reservedVariables.GetLength();
+		rctx->bc.GetVarsUsed(reservedVariables);
+		before.bc.GetVarsUsed(reservedVariables);
+
+		asCDataType dt = asCDataType::CreateObjectHandle(func->objectType, false);
+		int offset = AllocateVariable(dt, true);
+
+		reservedVariables.SetLength(len);
+
+		before.type.SetVariable(dt, offset, true);
+
+		if( lctx->property_ref )
+			before.bc.Instr(asBC_RDSPtr);
+		before.bc.InstrSHORT(asBC_PSF, (short)offset);
+		before.bc.InstrPTR(asBC_REFCPY, func->objectType);
+		before.bc.Instr(asBC_PopPtr);
+
+		if( lctx->type.isTemporary )
+		{
+			// Add the release of the temporary variable as a deferred expression
+			asSDeferredParam deferred;
+			deferred.origExpr = 0;
+			deferred.argInOutFlags = asTM_INREF;
+			deferred.argNode = 0;
+			deferred.argType.SetVariable(ctx->type.dataType, lctx->type.stackOffset, true);
+			before.deferredParams.PushLast(deferred);
+		}
+
+		// Update the left expression to use the local variable
+		lctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+		lctx->type.stackOffset = (short)offset;
+		lctx->property_ref = true;
+
+		// Don't release the temporary variable too early
+		lctx->type.isTemporary = false;
+
+		ctx->bc.AddCode(&before.bc);
+	}
+
+	// Keep the original information on the property
+	asCExprContext llctx(engine);
+	llctx.type = lctx->type;
+	llctx.property_arg    = lctx->property_arg;
+	llctx.property_const  = lctx->property_const;
+	llctx.property_get    = lctx->property_get;
+	llctx.property_handle = lctx->property_handle;
+	llctx.property_ref    = lctx->property_ref;
+	llctx.property_set    = lctx->property_set;
+
+	// Compile the dual operator using the get accessor
+	CompileOperator(errNode, lctx, rctx, ctx, op, false);
+
+	// If we made a local variable to hold the reference it must be reused
+	if( before.type.stackOffset )
+		llctx.bc.InstrSHORT(asBC_PSF, (short)before.type.stackOffset);
+
+	// Compile the assignment using the set accessor
+	ProcessPropertySetAccessor(&llctx, ctx, errNode);
+
+	MergeExprBytecodeAndType(ctx, &llctx);
+
+	if( before.type.stackOffset )
+		ReleaseTemporaryVariable(before.type.stackOffset, &ctx->bc);
+
+	asASSERT( ctx->deferredParams.GetLength() == 0 );
+	ctx->deferredParams = before.deferredParams;
+	ProcessDeferredParams(ctx);
+
+	return 0;
+}
+
+int asCCompiler::ProcessPropertyGetAccessor(asCExprContext *ctx, asCScriptNode *node)
+{
+	// If no property accessor has been prepared then don't do anything
+	if( !ctx->property_get && !ctx->property_set )
+		return 0;
+
+	if( !ctx->property_get )
+	{
+		// Raise error on missing accessor
+		Error(TXT_PROPERTY_HAS_NO_GET_ACCESSOR, node);
+		return -1;
+	}
+
+	asCExprValue objType = ctx->type;
+	asCScriptFunction *func = builder->GetFunctionDescription(ctx->property_get);
+
+	// Make sure the arg match the property
+	asCArray<int> funcs;
+	funcs.PushLast(ctx->property_get);
+	asCArray<asCExprContext *> args;
+	if( ctx->property_arg )
+		args.PushLast(ctx->property_arg);
+	MatchFunctions(funcs, args, node, func->GetName(), 0, func->objectType, ctx->property_const);
+	if( funcs.GetLength() == 0 )
+	{
+		// MatchFunctions already reported the error
+		if( ctx->property_arg )
+		{
+			asDELETE(ctx->property_arg, asCExprContext);
+			ctx->property_arg = 0;
+		}
+		return -1;
+	}
+
+	if( func->objectType )
+	{
+		// Setup the context with the original type so the method call gets built correctly
+		ctx->type.dataType = asCDataType::CreateType(func->objectType, ctx->property_const);
+		if( ctx->property_handle ) ctx->type.dataType.MakeHandle(true);
+		if( ctx->property_ref ) ctx->type.dataType.MakeReference(true);
+
+		// Don't allow the call if the object is read-only and the property accessor is not const
+		if( ctx->property_const && !func->IsReadOnly() )
+		{
+			Error(TXT_NON_CONST_METHOD_ON_CONST_OBJ, node);
+			asCArray<int> funcCandidates;
+			funcCandidates.PushLast(ctx->property_get);
+			PrintMatchingFuncs(funcCandidates, node);
+			return -1;
+		}
+	}
+
+	// The explicit handle flag must be remembered
+	bool isExplicitHandle = ctx->type.isExplicitHandle;
+
+	// Call the accessor
+	int r = MakeFunctionCall(ctx, ctx->property_get, func->objectType, args, node);
+	if( isExplicitHandle )
+		ctx->type.isExplicitHandle = true;
+
+	// Clear the property get/set ids
+	ctx->property_get = 0;
+	ctx->property_set = 0;
+	if( ctx->property_arg )
+	{
+		asDELETE(ctx->property_arg, asCExprContext);
+		ctx->property_arg = 0;
+	}
+	
+	return r;
+}
+
+int asCCompiler::CompileExpressionPostOp(asCScriptNode *node, asCExprContext *ctx)
+{
+	// Don't allow any postfix operators on expressions that take address of class method
+	if( ctx->IsClassMethod() )
+	{
+		Error(TXT_INVALID_OP_ON_METHOD, node);
+		return -1;
+	}
+
+	// Don't allow any operators on void expressions
+	if( ctx->IsVoidExpression() )
+	{
+		Error(TXT_VOID_CANT_BE_OPERAND, node);
+		return -1;
+	}
+
+	// Check if the variable is initialized (if it indeed is a variable)
+	IsVariableInitialized(&ctx->type, node);
+
+	int op = node->tokenType;
+	if( (op == ttInc || op == ttDec) && ctx->type.dataType.IsObject() )
+	{
+		const char *opName = 0;
+		switch( op )
+		{
+		case ttInc:    opName = "opPostInc"; break;
+		case ttDec:    opName = "opPostDec"; break;
+		}
+
+		if( opName )
+		{
+			// TODO: Should convert this to something similar to CompileOverloadedDualOperator2
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+
+			// TODO: If the value isn't const, then first try to find the non const method, and if not found try to find the const method
+
+			// Find the correct method
+			bool isConst = ctx->type.dataType.IsObjectConst();
+			asCArray<int> funcs;
+			asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+			for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
+			{
+				asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+				if( func->name == opName &&
+					func->parameterTypes.GetLength() == 0 &&
+					(!isConst || func->IsReadOnly()) )
+				{
+					funcs.PushLast(func->id);
+				}
+			}
+
+			// Did we find the method?
+			if( funcs.GetLength() == 1 )
+			{
+				asCArray<asCExprContext *> args;
+				return MakeFunctionCall(ctx, funcs[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node);
+			}
+			else if( funcs.GetLength() == 0 )
+			{
+				asCString str;
+				str = asCString(opName) + "()";
+				if( isConst )
+					str += " const";
+				str.Format(TXT_FUNCTION_s_NOT_FOUND, str.AddressOf());
+				Error(str, node);
+				ctx->type.SetDummy();
+				return -1;
+			}
+			else if( funcs.GetLength() > 1 )
+			{
+				Error(TXT_MORE_THAN_ONE_MATCHING_OP, node);
+				PrintMatchingFuncs(funcs, node);
+
+				ctx->type.SetDummy();
+				return -1;
+			}
+		}
+	}
+	else if( op == ttInc || op == ttDec )
+	{
+		// Make sure the reference isn't a temporary variable
+		if( ctx->type.isTemporary )
+		{
+			Error(TXT_REF_IS_TEMP, node);
+			return -1;
+		}
+		if( ctx->type.dataType.IsReadOnly() )
+		{
+			Error(TXT_REF_IS_READ_ONLY, node);
+			return -1;
+		}
+		if( ctx->property_get || ctx->property_set )
+		{
+			Error(TXT_INVALID_REF_PROP_ACCESS, node);
+			return -1;
+		}
+		if( !ctx->type.isLValue )
+		{
+			Error(TXT_NOT_LVALUE, node);
+			return -1;
+		}
+
+		if( ctx->type.isVariable && !ctx->type.dataType.IsReference() )
+			ConvertToReference(ctx);
+		else if( !ctx->type.dataType.IsReference() )
+		{
+			Error(TXT_NOT_VALID_REFERENCE, node);
+			return -1;
+		}
+
+		// Copy the value to a temp before changing it
+		ConvertToTempVariable(ctx);
+		asASSERT(!ctx->type.isLValue);
+
+		// Increment the value pointed to by the reference still in the register
+		asEBCInstr iInc = asBC_INCi, iDec = asBC_DECi;
+		if( ctx->type.dataType.IsDoubleType() )
+		{
+			iInc = asBC_INCd;
+			iDec = asBC_DECd;
+		}
+		else if( ctx->type.dataType.IsFloatType() )
+		{
+			iInc = asBC_INCf;
+			iDec = asBC_DECf;
+		}
+		else if( ctx->type.dataType.IsIntegerType() || ctx->type.dataType.IsUnsignedType() )
+		{
+			if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt16, false)) ||
+			    ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt16, false)) )
+			{
+				iInc = asBC_INCi16;
+				iDec = asBC_DECi16;
+			}
+			else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt8, false)) ||
+			         ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt8, false)) )
+			{
+				iInc = asBC_INCi8;
+				iDec = asBC_DECi8;
+			}
+			else if( ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttInt64, false)) ||
+			         ctx->type.dataType.IsEqualExceptRef(asCDataType::CreatePrimitive(ttUInt64, false)) )
+			{
+				iInc = asBC_INCi64;
+				iDec = asBC_DECi64;
+			}
+		}
+		else
+		{
+			Error(TXT_ILLEGAL_OPERATION, node);
+			return -1;
+		}
+
+		if( op == ttInc ) ctx->bc.Instr(iInc); else ctx->bc.Instr(iDec);
+	}
+	else if( op == ttDot )
+	{
+		if( node->firstChild->nodeType == snIdentifier )
+		{
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+
+			// Get the property name
+			asCString name(&script->code[node->firstChild->tokenPos], node->firstChild->tokenLength);
+
+			if( ctx->type.dataType.IsObject() )
+			{
+				// We need to look for get/set property accessors.
+				// If found, the context stores information on the get/set accessors
+				// until it is known which is to be used.
+				int r = 0;
+				if( node->next && node->next->tokenType == ttOpenBracket )
+				{
+					// The property accessor should take an index arg
+					asCExprContext dummyArg(engine);
+					r = FindPropertyAccessor(name, ctx, &dummyArg, node, 0);
+				}
+				if( r == 0 )
+					r = FindPropertyAccessor(name, ctx, node, 0);
+				if( r != 0 )
+					return r;
+
+				if( !ctx->type.dataType.IsPrimitive() )
+					Dereference(ctx, true);
+
+				if( ctx->type.dataType.IsObjectHandle() )
+				{
+					// Convert the handle to a normal object
+					asCDataType dt = ctx->type.dataType;
+					dt.MakeHandle(false);
+
+					ImplicitConversion(ctx, dt, node, asIC_IMPLICIT_CONV);
+
+					// The handle may not have been an lvalue, but the dereferenced object is
+					ctx->type.isLValue = true;
+				}
+
+				bool isConst = ctx->type.dataType.IsObjectConst();
+
+				asCObjectProperty *prop = builder->GetObjectProperty(ctx->type.dataType, name.AddressOf());
+				if( prop )
+				{
+					// Is the property access allowed?
+					if( (prop->isPrivate || prop->isProtected) && (!outFunc || outFunc->objectType != ctx->type.dataType.GetTypeInfo()) )
+					{
+						asCString msg;
+						if( prop->isPrivate )
+							msg.Format(TXT_PRIVATE_PROP_ACCESS_s, name.AddressOf());
+						else
+							msg.Format(TXT_PROTECTED_PROP_ACCESS_s, name.AddressOf());
+						Error(msg, node);
+					}
+
+					// Adjust the pointer for composite member
+					// This must always be done even if the offset is 0 because the asCWriter needs the meta data in ADDSi to identify the composite property
+					if( prop->compositeOffset || prop->isCompositeIndirect )
+						ctx->bc.InstrSHORT_DW(asBC_ADDSi, (short)prop->compositeOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(ctx->type.dataType.GetTypeInfo(), false)));
+					if (prop->isCompositeIndirect)
+						ctx->bc.Instr(asBC_RDSPtr);
+
+					// Put the offset on the stack
+					// This must always be done even if the offset is 0 so the type info is stored
+					ctx->bc.InstrSHORT_DW(asBC_ADDSi, (short)prop->byteOffset, engine->GetTypeIdFromDataType(asCDataType::CreateType(ctx->type.dataType.GetTypeInfo(), false)));
+
+					if( prop->type.IsReference() )
+						ctx->bc.Instr(asBC_RDSPtr);
+
+					// Reference to primitive must be stored in the temp register
+					if( prop->type.IsPrimitive() )
+					{
+						ctx->bc.Instr(asBC_PopRPtr);
+					}
+
+					// Keep information about temporary variables as deferred expression
+					if( ctx->type.isTemporary )
+					{
+						// Add the release of this reference, as a deferred expression
+						asSDeferredParam deferred;
+						deferred.origExpr = 0;
+						deferred.argInOutFlags = asTM_INREF;
+						deferred.argNode = 0;
+						deferred.argType.SetVariable(ctx->type.dataType, ctx->type.stackOffset, true);
+
+						ctx->deferredParams.PushLast(deferred);
+					}
+
+					// Set the new type and make sure it is not treated as a variable anymore
+					ctx->type.dataType = prop->type;
+					ctx->type.dataType.MakeReference(true);
+					ctx->type.isVariable = false;
+					ctx->type.isTemporary = false;
+
+					if( (ctx->type.dataType.IsObject() || ctx->type.dataType.IsFuncdef()) && !ctx->type.dataType.IsObjectHandle() )
+					{
+						// Objects that are members are not references
+						ctx->type.dataType.MakeReference(false);
+
+						// The object is safe (life time guaranteed) if the parent object is also safe
+					}
+					else if (ctx->type.dataType.IsObjectHandle())
+					{
+						// A object accessed through a handle cannot be considered safe,
+						// as it can be cleared at any time
+						ctx->type.isRefSafe = false;
+					}
+
+					ctx->type.dataType.MakeReadOnly(isConst ? true : prop->type.IsReadOnly());
+				}
+				else
+				{
+					// If the name is not a property, the compiler must check if the name matches
+					// a method, which can be used for constructing delegates
+					asIScriptFunction *func = 0;
+					asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+					for( asUINT n = 0; n < ot->methods.GetLength(); n++ )
+					{
+						if( engine->scriptFunctions[ot->methods[n]]->name == name )
+						{
+							func = engine->scriptFunctions[ot->methods[n]];
+							break;
+						}
+					}
+
+					if( func )
+					{
+						// An object method was found. Keep the name of the method in the expression, but
+						// don't actually modify the bytecode at this point since it is not yet known what
+						// the method will be used for, or even what overloaded method should be used.
+						ctx->methodName = name;
+					}
+					else
+					{
+						asCString str;
+						str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+						Error(str, node);
+						return -1;
+					}
+				}
+			}
+			else
+			{
+				asCString str;
+				str.Format(TXT_s_NOT_MEMBER_OF_s, name.AddressOf(), ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+				Error(str, node);
+				return -1;
+			}
+		}
+		else
+		{
+			// Make sure it is an object we are accessing
+			if( !ctx->type.dataType.IsObject() )
+			{
+				asCString str;
+				str.Format(TXT_ILLEGAL_OPERATION_ON_s, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+				Error(str, node);
+				return -1;
+			}
+
+			// Process the get property accessor
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+
+			// Compile function call
+			int r = CompileFunctionCall(node->firstChild, ctx, CastToObjectType(ctx->type.dataType.GetTypeInfo()), ctx->type.dataType.IsObjectConst());
+			if( r < 0 ) return r;
+		}
+	}
+	else if( op == ttOpenBracket )
+	{
+		// If the property access takes an index arg and the argument hasn't been evaluated yet,
+		// then we should use that instead of processing it now. If the argument has already been
+		// evaluated, then we should process the property accessor as a get access now as the new
+		// index operator is on the result of that accessor.
+		asCString propertyName;
+		asSNameSpace *ns = 0;
+		if( ((ctx->property_get && builder->GetFunctionDescription(ctx->property_get)->GetParamCount() == 1) ||
+			 (ctx->property_set && builder->GetFunctionDescription(ctx->property_set)->GetParamCount() == 2)) &&
+			(ctx->property_arg && ctx->property_arg->type.dataType.GetTokenType() == ttUnrecognizedToken) )
+		{
+			// Determine the name of the property accessor
+			asCScriptFunction *func = 0;
+			if( ctx->property_get )
+				func = builder->GetFunctionDescription(ctx->property_get);
+			else
+				func = builder->GetFunctionDescription(ctx->property_set);
+			propertyName = func->GetName();
+			propertyName = propertyName.SubString(4);
+
+			// Set the original type of the expression so we can re-evaluate the property accessor
+			if( func->objectType )
+			{
+				ctx->type.dataType = asCDataType::CreateType(func->objectType, ctx->property_const);
+				if( ctx->property_handle ) ctx->type.dataType.MakeHandle(true);
+				if( ctx->property_ref )	ctx->type.dataType.MakeReference(true);
+			}
+			else
+			{
+				// Store the namespace where the function is declared
+				// so the same function can be found later
+				ctx->type.SetDummy();
+				ns = func->nameSpace;
+			}
+
+			ctx->property_get = ctx->property_set = 0;
+			if( ctx->property_arg )
+			{
+				asDELETE(ctx->property_arg, asCExprContext);
+				ctx->property_arg = 0;
+			}
+		}
+		else
+		{
+			if( !ctx->type.dataType.IsObject() )
+			{
+				asCString str;
+				str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+				Error(str, node);
+				return -1;
+			}
+
+			if( ProcessPropertyGetAccessor(ctx, node) < 0 )
+				return -1;
+		}
+
+		// Compile the expression
+		bool isOK = true;
+		asCArray<asCExprContext *> args;
+		asCArray<asSNamedArgument> namedArgs;
+		asASSERT( node->firstChild->nodeType == snArgList );
+		if( CompileArgumentList(node->firstChild, args, namedArgs) >= 0 )
+		{
+			// Check for the existence of the opIndex method
+			bool lookForProperty = true;
+			if( propertyName == "" )
+			{
+				bool isConst = ctx->type.dataType.IsObjectConst();
+				asCObjectType *objectType = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+
+				asCArray<int> funcs;
+				builder->GetObjectMethodDescriptions("opIndex", objectType, funcs, isConst);
+				if( funcs.GetLength() > 0 )
+				{
+					// Since there are opIndex methods, the compiler should not look for get/set_opIndex accessors
+					lookForProperty = false;
+
+					// Determine which of opIndex methods that match
+					MatchFunctions(funcs, args, node, "opIndex", 0, objectType, isConst);
+					if( funcs.GetLength() != 1 )
+					{
+						// The error has already been reported by MatchFunctions
+						isOK = false;
+					}
+					else
+					{
+						// Add the default values for arguments not explicitly supplied
+						int r = CompileDefaultAndNamedArgs(node, args, funcs[0], objectType);
+
+						if( r < 0 )
+							isOK = false;
+						else if( MakeFunctionCall(ctx, funcs[0], objectType, args, node, false, 0, ctx->type.stackOffset) < 0 )
+							isOK = false;
+					}
+				}
+			}
+			if( lookForProperty && isOK )
+			{
+				if( args.GetLength() != 1 )
+				{
+					// TODO: opIndex: Implement support for multiple index arguments in set_opIndex too
+					Error(TXT_PROP_ACCESS_WITH_INDEX_ONE_ARG, node);
+					isOK = false;
+				}
+				else
+				{
+					Dereference(ctx, true);
+					asCExprContext lctx(engine);
+					MergeExprBytecodeAndType(&lctx, ctx);
+
+					// Check for accessors methods for the opIndex, either as get/set_opIndex or as get/set with the property name
+					int r = FindPropertyAccessor(propertyName == "" ? "opIndex" : propertyName.AddressOf(), &lctx, args[0], node, ns);
+					if (r == 0)
+					{
+						asCString str;
+						str.Format(TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP, ctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+						Error(str, node);
+						isOK = false;
+					}
+					else if (r < 0)
+						isOK = false;
+
+					if (isOK)
+						MergeExprBytecodeAndType(ctx, &lctx);
+				}
+			}
+		}
+		else
+			isOK = false;
+
+		// Cleanup
+		for( asUINT n = 0; n < args.GetLength(); n++ )
+			if( args[n] )
+			{
+				asDELETE(args[n], asCExprContext);
+			}
+
+		if( !isOK )
+			return -1;
+	}
+	else if( op == ttOpenParenthesis )
+	{
+		// TODO: Most of this is already done by CompileFunctionCall(). Can we share the code?
+
+		// Make sure the expression is a funcdef or an object that may have opCall methods
+		if( !ctx->type.dataType.GetTypeInfo() || (!ctx->type.dataType.IsFuncdef() && !ctx->type.dataType.IsObject()) )
+		{
+			Error(TXT_EXPR_DOESNT_EVAL_TO_FUNC, node);
+			return -1;
+		}
+
+		// Compile arguments
+		bool isOK = true;
+		asCArray<asCExprContext *> args;
+		asCArray<asSNamedArgument> namedArgs;
+		if( CompileArgumentList(node->lastChild, args, namedArgs) >= 0 )
+		{
+			// Match arguments with the funcdef
+			asCArray<int> funcs;
+			if( ctx->type.dataType.IsFuncdef() )
+			{
+				funcs.PushLast(CastToFuncdefType(ctx->type.dataType.GetTypeInfo())->funcdef->id);
+				MatchFunctions(funcs, args, node, ctx->type.dataType.GetTypeInfo()->name.AddressOf(), &namedArgs);
+			}
+			else
+			{
+				bool isConst = ctx->type.dataType.IsObjectConst();
+
+				builder->GetObjectMethodDescriptions("opCall", CastToObjectType(ctx->type.dataType.GetTypeInfo()), funcs, isConst);
+				MatchFunctions(funcs, args, node, "opCall", &namedArgs, CastToObjectType(ctx->type.dataType.GetTypeInfo()), isConst);
+			}
+
+			if( funcs.GetLength() != 1 )
+			{
+				// The error was reported by MatchFunctions()
+
+				// Dummy value
+				ctx->type.SetDummy();
+			}
+			else
+			{
+				// Add the default values for arguments not explicitly supplied
+				int r = CompileDefaultAndNamedArgs(node, args, funcs[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), &namedArgs);
+
+				// TODO: funcdef: Do we have to make sure the handle is stored in a temporary variable, or
+				//                is it enough to make sure it is in a local variable?
+
+				// For function pointer we must guarantee that the function is safe, i.e.
+				// by first storing the function pointer in a local variable (if it isn't already in one)
+				if( r == asSUCCESS )
+				{
+					Dereference(ctx, true);
+					if( ctx->type.dataType.IsFuncdef() )
+					{
+						if( !ctx->type.isVariable )
+							ConvertToVariable(ctx);
+
+						// Remove the reference from the stack as the asBC_CALLPTR instruction takes the variable as argument
+						ctx->bc.Instr(asBC_PopPtr);
+					}
+
+					r = MakeFunctionCall(ctx, funcs[0], ctx->type.dataType.IsFuncdef() ? 0 : CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node, false, 0, ctx->type.stackOffset);
+					if( r < 0 )
+						isOK = false;
+				}
+				else
+					isOK = false;
+			}
+		}
+		else
+			ctx->type.SetDummy();
+
+		// Cleanup
+		for( asUINT n = 0; n < args.GetLength(); n++ )
+			if( args[n] )
+			{
+				asDELETE(args[n], asCExprContext);
+			}
+		for( asUINT n = 0; n < namedArgs.GetLength(); n++ )
+			if( namedArgs[n].ctx )
+			{
+				asDELETE(namedArgs[n].ctx, asCExprContext);
+			}
+			
+		if( !isOK )
+			return -1;
+	}
+
+	return 0;
+}
+
+int asCCompiler::GetPrecedence(asCScriptNode *op)
+{
+	// x ** y
+	// x * y, x / y, x % y
+	// x + y, x - y
+	// x <= y, x < y, x >= y, x > y
+	// x = =y, x != y, x xor y, x is y, x !is y
+	// x and y
+	// x or y
+
+	// The following are not used in this function,
+	// but should have lower precedence than the above
+	// x ? y : z
+	// x = y
+
+	// The expression term have the highest precedence
+	if( op->nodeType == snExprTerm )
+		return 1;
+
+	// Evaluate operators by token
+	int tokenType = op->tokenType;
+	if( tokenType == ttStarStar )
+		return 0;
+
+	if( tokenType == ttStar || tokenType == ttSlash || tokenType == ttPercent )
+		return -1;
+
+	if( tokenType == ttPlus || tokenType == ttMinus )
+		return -2;
+
+	if( tokenType == ttBitShiftLeft ||
+		tokenType == ttBitShiftRight ||
+		tokenType == ttBitShiftRightArith )
+		return -3;
+
+	if( tokenType == ttAmp )
+		return -4;
+
+	if( tokenType == ttBitXor )
+		return -5;
+
+	if( tokenType == ttBitOr )
+		return -6;
+
+	if( tokenType == ttLessThanOrEqual ||
+		tokenType == ttLessThan ||
+		tokenType == ttGreaterThanOrEqual ||
+		tokenType == ttGreaterThan )
+		return -7;
+
+	if( tokenType == ttEqual || tokenType == ttNotEqual || tokenType == ttXor || tokenType == ttIs || tokenType == ttNotIs )
+		return -8;
+
+	if( tokenType == ttAnd )
+		return -9;
+
+	if( tokenType == ttOr )
+		return -10;
+
+	// Unknown operator
+	asASSERT(false);
+
+	return 0;
+}
+
+asUINT asCCompiler::MatchArgument(asCArray<int> &funcs, asCArray<asSOverloadCandidate> &matches, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct)
+{
+	matches.SetLength(0);
+
+	for( asUINT n = 0; n < funcs.GetLength(); n++ )
+	{
+		asCScriptFunction *desc = builder->GetFunctionDescription(funcs[n]);
+
+		// Does the function have arguments enough?
+		if( (int)desc->parameterTypes.GetLength() <= paramNum )
+			continue;
+
+		int cost = MatchArgument(desc, argExpr, paramNum, allowObjectConstruct);
+		if( cost != -1 )
+			matches.PushLast(asSOverloadCandidate(funcs[n], asUINT(cost)));
+	}
+
+	return (asUINT)matches.GetLength();
+}
+
+int asCCompiler::MatchArgument(asCScriptFunction *desc, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct)
+{
+	// void expressions can match any out parameter, but nothing else
+	if( argExpr->IsVoidExpression() )
+	{
+		if( desc->inOutFlags[paramNum] == asTM_OUTREF )
+			return 0;
+		return -1;
+	}
+
+	// Anonymous init lists can only match parameters that can be initialized with a list
+	if (argExpr->IsAnonymousInitList())
+	{
+		if( (desc->parameterTypes[paramNum].IsReference() && (desc->inOutFlags[paramNum] & asTM_INREF) == 0) ||
+			desc->parameterTypes[paramNum].GetBehaviour() == 0 ||
+			desc->parameterTypes[paramNum].GetBehaviour()->listFactory == 0 )
+		{
+			return -1;
+		}
+		return 0;
+	}
+
+	// Can we make the match by implicit conversion?
+	asCExprContext ti(engine);
+	ti.type = argExpr->type;
+	ti.methodName = argExpr->methodName;
+	ti.enumValue = argExpr->enumValue;
+	ti.exprNode = argExpr->exprNode;
+	if( argExpr->type.dataType.IsPrimitive() )
+		ti.type.dataType.MakeReference(false);
+
+	// Don't allow the implicit conversion to make a copy in case the argument is expecting a reference to the true value
+	if (desc->parameterTypes[paramNum].IsReference() && desc->inOutFlags[paramNum] == asTM_INOUTREF)
+		allowObjectConstruct = false;
+
+	int cost = ImplicitConversion(&ti, desc->parameterTypes[paramNum], 0, asIC_IMPLICIT_CONV, false, allowObjectConstruct);
+
+	// If the function parameter is an inout-reference then it must not be possible to call the
+	// function with an incorrect argument type, even though the type can normally be converted.
+	if( desc->parameterTypes[paramNum].IsReference() &&
+		desc->inOutFlags[paramNum] == asTM_INOUTREF &&
+		desc->parameterTypes[paramNum].GetTokenType() != ttQuestion )
+	{
+		// Observe, that the below checks are only necessary for when unsafe references have been
+		// enabled by the application. Without this the &inout reference form wouldn't be allowed
+		// for these value types.
+
+		// Don't allow a primitive to be converted to a reference of another primitive type
+		if( desc->parameterTypes[paramNum].IsPrimitive() &&
+			desc->parameterTypes[paramNum].GetTokenType() != argExpr->type.dataType.GetTokenType() )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+
+		// Don't allow an enum to be converted to a reference of another enum type
+		if( desc->parameterTypes[paramNum].IsEnumType() &&
+			desc->parameterTypes[paramNum].GetTypeInfo() != argExpr->type.dataType.GetTypeInfo() )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+
+		// Don't allow a non-handle expression to be converted to a reference to a handle
+		if( desc->parameterTypes[paramNum].IsObjectHandle() &&
+			!argExpr->type.dataType.IsObjectHandle() )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+
+		// Don't allow a value type to be converted
+		if( (desc->parameterTypes[paramNum].GetTypeInfo() && (desc->parameterTypes[paramNum].GetTypeInfo()->GetFlags() & asOBJ_VALUE)) &&
+			(desc->parameterTypes[paramNum].GetTypeInfo() != argExpr->type.dataType.GetTypeInfo()) )
+		{
+			asASSERT( engine->ep.allowUnsafeReferences );
+			return -1;
+		}
+	}
+
+	// How well does the argument match the function parameter?
+	if( desc->parameterTypes[paramNum].IsEqualExceptRef(ti.type.dataType) )
+		return cost;
+
+	// No match is available
+	return -1;
+}
+
+int asCCompiler::PrepareArgument2(asCExprContext *ctx, asCExprContext *arg, asCDataType *paramType, bool isFunction, int refType, bool isMakingCopy)
+{
+	// Reference parameters whose value won't be used don't evaluate the expression
+	// Clean arguments (i.e. default value) will be passed in directly as there is nothing to protect
+	if( paramType->IsReference() && !(refType & asTM_INREF) && !arg->isCleanArg )
+	{
+		// Store the original bytecode so that it can be reused when processing the deferred output parameter
+		asCExprContext *orig = asNEW(asCExprContext)(engine);
+		if( orig == 0 )
+		{
+			// Out of memory
+			return -1;
+		}
+		MergeExprBytecodeAndType(orig, arg);
+		arg->origExpr = orig;
+	}
+
+	int r = PrepareArgument(paramType, arg, arg->exprNode, isFunction, refType, isMakingCopy);
+	if (r < 0)
+		return r;
+
+	// arg still holds the original expression for output parameters
+	ctx->bc.AddCode(&arg->bc);
+
+	return 0;
+}
+
+bool asCCompiler::CompileOverloadedDualOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, bool leftToRight, asCExprContext *ctx, bool isHandle, eTokenType token)
+{
+	DetermineSingleFunc(lctx, node);
+	DetermineSingleFunc(rctx, node);
+
+	ctx->exprNode = node;
+
+	// What type of operator is it?
+	if( token == ttUnrecognizedToken )
+		token = node->tokenType;
+	if( token == ttUnrecognizedToken )
+	{
+		// This happens when the compiler is inferring an assignment
+		// operation from another action, for example in preparing a value
+		// as a function argument
+		token = ttAssignment;
+	}
+
+	// boolean operators are not overloadable
+	if( token == ttAnd ||
+		token == ttOr ||
+		token == ttXor )
+		return false;
+
+	// Dual operators can also be implemented as class methods
+	if( token == ttEqual ||
+		token == ttNotEqual )
+	{
+		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
+		// Find the matching opEquals method
+		int r = CompileOverloadedDualOperator2(node, "opEquals", lctx, rctx, leftToRight, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
+		if( r == 0 )
+		{
+			// Try again by switching the order of the operands
+			r = CompileOverloadedDualOperator2(node, "opEquals", rctx, lctx, !leftToRight, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
+		}
+
+		if( r == 1 )
+		{
+			if( token == ttNotEqual )
+				ctx->bc.InstrSHORT(asBC_NOT, (short)ctx->type.stackOffset);
+
+			// Success, don't continue
+			return true;
+		}
+		else if( r < 0 )
+		{
+			// Compiler error, don't continue
+			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
+			return true;
+		}
+	}
+
+	if( token == ttEqual ||
+		token == ttNotEqual ||
+		token == ttLessThan ||
+		token == ttLessThanOrEqual ||
+		token == ttGreaterThan ||
+		token == ttGreaterThanOrEqual )
+	{
+		bool swappedOrder = false;
+
+		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
+		// Find the matching opCmp method
+		int r = CompileOverloadedDualOperator2(node, "opCmp", lctx, rctx, leftToRight, ctx, true, asCDataType::CreatePrimitive(ttInt, false));
+		if( r == 0 )
+		{
+			// Try again by switching the order of the operands
+			swappedOrder = true;
+			r = CompileOverloadedDualOperator2(node, "opCmp", rctx, lctx, !leftToRight, ctx, true, asCDataType::CreatePrimitive(ttInt, false));
+		}
+
+		if( r == 1 )
+		{
+			ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+
+			int a = AllocateVariable(asCDataType::CreatePrimitive(ttBool, false), true);
+
+			ctx->bc.InstrW_DW(asBC_CMPIi, (short)ctx->type.stackOffset, 0);
+
+			if( token == ttEqual )
+				ctx->bc.Instr(asBC_TZ);
+			else if( token == ttNotEqual )
+				ctx->bc.Instr(asBC_TNZ);
+			else if( (token == ttLessThan && !swappedOrder) ||
+				     (token == ttGreaterThan && swappedOrder) )
+				ctx->bc.Instr(asBC_TS);
+			else if( (token == ttLessThanOrEqual && !swappedOrder) ||
+				     (token == ttGreaterThanOrEqual && swappedOrder) )
+				ctx->bc.Instr(asBC_TNP);
+			else if( (token == ttGreaterThan && !swappedOrder) ||
+				     (token == ttLessThan && swappedOrder) )
+				ctx->bc.Instr(asBC_TP);
+			else if( (token == ttGreaterThanOrEqual && !swappedOrder) ||
+				     (token == ttLessThanOrEqual && swappedOrder) )
+				ctx->bc.Instr(asBC_TNS);
+
+			ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
+
+			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, false), a, true);
+
+			// Success, don't continue
+			return true;
+		}
+		else if( r < 0 )
+		{
+			// Compiler error, don't continue
+			#if AS_SIZEOF_BOOL == 1
+				ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+			#else
+				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
+			#endif
+			return true;
+		}
+	}
+
+	// The rest of the operators are not commutative, and doesn't require specific return type
+	const char *op = 0, *op_r = 0;
+	switch( int(token) ) // convert to int to avoid warning in gnuc that not all values are tested
+	{
+	case ttPlus:               op = "opAdd";  op_r = "opAdd_r";  break;
+	case ttMinus:              op = "opSub";  op_r = "opSub_r";  break;
+	case ttStar:               op = "opMul";  op_r = "opMul_r";  break;
+	case ttSlash:              op = "opDiv";  op_r = "opDiv_r";  break;
+	case ttPercent:            op = "opMod";  op_r = "opMod_r";  break;
+	case ttStarStar:           op = "opPow";  op_r = "opPow_r";  break;
+	case ttBitOr:              op = "opOr";   op_r = "opOr_r";   break;
+	case ttAmp:                op = "opAnd";  op_r = "opAnd_r";  break;
+	case ttBitXor:             op = "opXor";  op_r = "opXor_r";  break;
+	case ttBitShiftLeft:       op = "opShl";  op_r = "opShl_r";  break;
+	case ttBitShiftRight:      op = "opShr";  op_r = "opShr_r";  break;
+	case ttBitShiftRightArith: op = "opUShr"; op_r = "opUShr_r"; break;
+	}
+
+	// TODO: Might be interesting to support a concatenation operator, e.g. ~
+
+	if( op && op_r )
+	{
+		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
+		// Find the matching operator method
+		int r = CompileOverloadedDualOperator2(node, op, lctx, rctx, leftToRight, ctx);
+		if( r == 0 )
+		{
+			// Try again by switching the order of the operands, and using the reversed operator
+			r = CompileOverloadedDualOperator2(node, op_r, rctx, lctx, !leftToRight, ctx);
+		}
+
+		if( r == 1 )
+		{
+			// Success, don't continue
+			return true;
+		}
+		else if( r < 0 )
+		{
+			// Compiler error, don't continue
+			ctx->type.SetDummy();
+			return true;
+		}
+	}
+
+	// Assignment operators
+	op = 0;
+	if( isHandle )
+	{
+		// Only asOBJ_ASHANDLE types can get here
+		asASSERT( lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) );
+		asASSERT( token == ttAssignment );
+
+		if( token == ttAssignment )
+			op = "opHndlAssign";
+	}
+	else
+	{
+		switch( int(token) ) // convert to int to avoid warning in gnuc that not all values are tested
+		{
+		case ttAssignment:        op = "opAssign";     break;
+		case ttAddAssign:         op = "opAddAssign";  break;
+		case ttSubAssign:         op = "opSubAssign";  break;
+		case ttMulAssign:         op = "opMulAssign";  break;
+		case ttDivAssign:         op = "opDivAssign";  break;
+		case ttModAssign:         op = "opModAssign";  break;
+		case ttPowAssign:         op = "opPowAssign";  break;
+		case ttOrAssign:          op = "opOrAssign";   break;
+		case ttAndAssign:         op = "opAndAssign";  break;
+		case ttXorAssign:         op = "opXorAssign";  break;
+		case ttShiftLeftAssign:   op = "opShlAssign";  break;
+		case ttShiftRightLAssign: op = "opShrAssign";  break;
+		case ttShiftRightAAssign: op = "opUShrAssign"; break;
+		}
+	}
+
+	if( op )
+	{
+		if( builder->engine->ep.disallowValueAssignForRefType &&
+			lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_REF) && !(lctx->type.dataType.GetTypeInfo()->flags & asOBJ_SCOPED) )
+		{
+			if( token == ttAssignment )
+				Error(TXT_DISALLOW_ASSIGN_ON_REF_TYPE, node);
+			else
+				Error(TXT_DISALLOW_COMPOUND_ASSIGN_ON_REF_TYPE, node);
+
+			// Set a dummy output
+			ctx->type.Set(lctx->type.dataType);
+			return true;
+		}
+
+		// TODO: Shouldn't accept const lvalue with the assignment operators
+
+		// Find the matching operator method
+		int r = CompileOverloadedDualOperator2(node, op, lctx, rctx, false, ctx);
+		if( r == 1 )
+		{
+			// Success, don't continue
+			return true;
+		}
+		else if( r < 0 )
+		{
+			// Compiler error, don't continue
+			ctx->type.SetDummy();
+			return true;
+		}
+	}
+
+	// No suitable operator was found
+	return false;
+}
+
+// Returns negative on compile error
+//         zero on no matching operator
+//         one on matching operator
+int asCCompiler::CompileOverloadedDualOperator2(asCScriptNode *node, const char *methodName, asCExprContext *lctx, asCExprContext *rctx, bool leftToRight, asCExprContext *ctx, bool specificReturn, const asCDataType &returnType)
+{
+	// Find the matching method
+	if( lctx->type.dataType.IsObject() &&
+		(!lctx->type.isExplicitHandle ||
+		 lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE) &&
+		!lctx->type.IsNullConstant() )
+	{
+		asUINT n;
+
+		// Is the left value a const?
+		bool isConst = lctx->type.dataType.IsObjectConst();
+
+		asCArray<int> funcs;
+		asCObjectType *ot = CastToObjectType(lctx->type.dataType.GetTypeInfo());
+		asASSERT(ot);
+		for( n = 0; ot && n < ot->methods.GetLength(); n++ )
+		{
+			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+			asASSERT( func );
+			if( func && func->name == methodName &&
+				(!specificReturn || func->returnType == returnType) &&
+				func->parameterTypes.GetLength() == 1 &&
+				(!isConst || func->IsReadOnly()) )
+			{
+				// Make sure the method is accessible by the module
+				if( builder->module->m_accessMask & func->accessMask )
+				{
+					funcs.PushLast(func->id);
+				}
+			}
+		}
+
+		// Which is the best matching function?
+		asCArray<asSOverloadCandidate> tempFuncs;
+		MatchArgument(funcs, tempFuncs, rctx, 0);
+
+		// Find the lowest cost operator(s)
+		asCArray<int> ops;
+		asUINT bestCost = asUINT(-1);
+		for( n = 0; n < tempFuncs.GetLength(); ++n )
+		{
+			asUINT cost = tempFuncs[n].cost;
+			if( cost < bestCost )
+			{
+				ops.SetLength(0);
+				bestCost = cost;
+			}
+			if( cost == bestCost )
+				ops.PushLast(tempFuncs[n].funcId);
+		}
+
+		// If the object is not const, then we need to prioritize non-const methods
+		if( !isConst )
+			FilterConst(ops);
+
+		// Did we find an operator?
+		if( ops.GetLength() == 1 )
+		{
+			// Reserve the variables used in the right expression so the new temporary
+			// variable allocated for the left operand isn't accidentally overwritten.
+			int l = int(reservedVariables.GetLength());
+			rctx->bc.GetVarsUsed(reservedVariables);
+
+			// Process the lctx expression as get accessor
+			if( ProcessPropertyGetAccessor(lctx, node) < 0 )
+				return -1;
+
+			reservedVariables.SetLength(l);
+
+			asCExprContext tmpCtx(engine);
+			if (leftToRight)
+			{
+				// Make sure lctx is in fact a variable. If it is a reference there is no
+				// guarantee that the reference will stay alive throughout the evaluation of rctx
+				if (!lctx->type.isVariable)
+				{
+					// Reserve the variables used in the right expression so the new temporary
+					// variable allocated for the left operand isn't accidentally overwritten.
+					l = int(reservedVariables.GetLength());
+					rctx->bc.GetVarsUsed(reservedVariables);
+
+					if (engine->ep.allowUnsafeReferences && lctx->type.dataType.IsObject() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_VALUE))
+					{
+						// If the application allows unsafe references, then it is not necessary to
+						// make a copy of the object, just store the reference as a local variable
+
+						// Allocate a temporary variable as reference to the type
+						asCDataType dt = lctx->type.dataType;
+						dt.MakeReference(true);
+						int offset = AllocateVariable(dt, true, false, true);
+
+						Dereference(lctx, true);
+
+						// Copy the pointer to the temporary variable
+						lctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+						if (lctx->type.dataType.IsFuncdef())
+							lctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+						else
+							lctx->bc.InstrPTR(asBC_REFCPY, lctx->type.dataType.GetTypeInfo());
+
+						lctx->type.SetVariable(dt, offset, true);
+					}
+					else
+					{
+						if (lctx->type.dataType.SupportHandles())
+							lctx->type.dataType.MakeHandle(true);
+						PrepareTemporaryVariable(node, lctx);
+					}
+
+					reservedVariables.SetLength(l);
+				}
+
+				// Move the bytecode for the left operand to a temporary context
+				// so we can later make sure this is computed first
+				tmpCtx.bc.AddCode(&lctx->bc);
+				tmpCtx.bc.Instr(asBC_PopPtr);
+
+				// Add bytecode to push the object pointer computed in the left operand on the stack as the this pointer
+				// This will be placed after rctx by MakeFunctionCall below
+				lctx->bc.InstrWORD(asBC_PSF, (short)lctx->type.stackOffset);
+
+				// Implicitly dereference handle parameters sent by reference
+				sVariable *v = variables->GetVariableByOffset(lctx->type.stackOffset);
+				if (v && v->type.IsReference() && (!v->type.IsObject() || v->type.IsObjectHandle()))
+					lctx->bc.Instr(asBC_RDSPtr);
+			}
+			else
+			{
+				// Make sure the rvalue doesn't have deferred temporary variables that are also used in the lvalue,
+				// since that would cause the VM to overwrite the variable while executing the bytecode for the lvalue.
+				asCArray<int> usedVars;
+				lctx->bc.GetVarsUsed(usedVars);
+				asUINT oldReservedVars = reservedVariables.GetLength();
+				for (n = 0; n < rctx->deferredParams.GetLength(); n++)
+				{
+					if (rctx->deferredParams[n].argType.isTemporary &&
+						usedVars.Exists(rctx->deferredParams[n].argType.stackOffset))
+					{
+						if (reservedVariables.GetLength() == oldReservedVars)
+							reservedVariables.Concatenate(usedVars);
+
+						// Allocate a new variable for the deferred argument
+						int offset = AllocateVariableNotIn(rctx->deferredParams[n].argType.dataType, true, false, rctx);
+						int oldVar = rctx->deferredParams[n].argType.stackOffset;
+						rctx->deferredParams[n].argType.stackOffset = short(offset);
+						rctx->bc.ExchangeVar(oldVar, offset);
+						ReleaseTemporaryVariable(oldVar, 0);
+					}
+				}
+				reservedVariables.SetLength(oldReservedVars);
+			}
+
+			// Merge the bytecode so that it forms lvalue.methodName(rvalue)
+			asCArray<asCExprContext *> args;
+			args.PushLast(rctx);
+			MergeExprBytecode(ctx, lctx);
+			ctx->type = lctx->type;
+			if( MakeFunctionCall(ctx, ops[0], CastToObjectType(ctx->type.dataType.GetTypeInfo()), args, node) < 0 )
+				return -1;
+
+			// Rearrange the bytecode so the left argument is computed first
+			if (leftToRight)
+			{
+				tmpCtx.bc.AddCode(&ctx->bc);
+				ctx->bc.AddCode(&tmpCtx.bc);
+			}
+
+			// Found matching operator
+			return 1;
+		}
+		else if( ops.GetLength() > 1 )
+		{
+			Error(TXT_MORE_THAN_ONE_MATCHING_OP, node);
+			PrintMatchingFuncs(ops, node);
+
+			ctx->type.SetDummy();
+
+			// Compiler error
+			return -1;
+		}
+	}
+
+	// No matching operator
+	return 0;
+}
+
+int asCCompiler::MakeFunctionCall(asCExprContext *ctx, int funcId, asCObjectType *objectType, asCArray<asCExprContext*> &args, asCScriptNode *node, bool useVariable, int stackOffset, int funcPtrVar)
+{
+	if( objectType )
+		Dereference(ctx, true);
+
+	// Store the expression node for error reporting
+	if( ctx->exprNode == 0 )
+		ctx->exprNode = node;
+
+	asCByteCode objBC(engine);
+	objBC.AddCode(&ctx->bc);
+
+	int r = PrepareFunctionCall(funcId, &ctx->bc, args);
+	if (r < 0)
+		return r;
+
+	// Verify if any of the args variable offsets are used in the other code.
+	// If they are exchange the offset for a new one
+	asUINT n;
+	for( n = 0; n < args.GetLength(); n++ )
+	{
+		if( args[n]->type.isTemporary && objBC.IsVarUsed(args[n]->type.stackOffset) )
+		{
+			// Release the current temporary variable
+			ReleaseTemporaryVariable(args[n]->type, 0);
+
+			asCDataType dt = args[n]->type.dataType;
+			dt.MakeReference(false);
+
+			int l = int(reservedVariables.GetLength());
+			objBC.GetVarsUsed(reservedVariables);
+			ctx->bc.GetVarsUsed(reservedVariables);
+			int newOffset = AllocateVariable(dt, true, IsVariableOnHeap(args[n]->type.stackOffset));
+			reservedVariables.SetLength(l);
+
+			asASSERT( IsVariableOnHeap(args[n]->type.stackOffset) == IsVariableOnHeap(newOffset) );
+
+			ctx->bc.ExchangeVar(args[n]->type.stackOffset, newOffset);
+			args[n]->type.stackOffset = (short)newOffset;
+			args[n]->type.isTemporary = true;
+			args[n]->type.isVariable  = true;
+		}
+	}
+
+	// If the function will return a value type on the stack, then we must allocate space
+	// for that here and push the address on the stack as a hidden argument to the function
+	asCScriptFunction *func = builder->GetFunctionDescription(funcId);
+	if( func->DoesReturnOnStack() )
+	{
+		asASSERT(!useVariable);
+
+		useVariable = true;
+		stackOffset = AllocateVariable(func->returnType, true);
+		ctx->bc.InstrSHORT(asBC_PSF, short(stackOffset));
+	}
+
+	ctx->bc.AddCode(&objBC);
+
+	MoveArgsToStack(funcId, &ctx->bc, args, objectType ? true : false);
+
+	PerformFunctionCall(funcId, ctx, false, &args, 0, useVariable, stackOffset, funcPtrVar);
+	
+	return 0;
+}
+
+int asCCompiler::CompileOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op, bool leftToRight)
+{
+	// Don't allow any operators on expressions that take address of class method, but allow it on global functions
+	if( (lctx->IsClassMethod()) || (rctx->IsClassMethod()) )
+	{
+		Error(TXT_INVALID_OP_ON_METHOD, node);
+		return -1;
+	}
+
+	// Don't allow any operators on void expressions
+	if( lctx->IsVoidExpression() || rctx->IsVoidExpression() )
+	{
+		Error(TXT_VOID_CANT_BE_OPERAND, node);
+		return -1;
+	}
+
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
+
+	IsVariableInitialized(&lctx->type, node);
+	IsVariableInitialized(&rctx->type, node);
+
+	if( lctx->type.isExplicitHandle || rctx->type.isExplicitHandle ||
+		lctx->type.IsNullConstant() || rctx->type.IsNullConstant() ||
+		op == ttIs || op == ttNotIs )
+	{
+		CompileOperatorOnHandles(node, lctx, rctx, ctx, op);
+		return 0;
+	}
+	else
+	{
+		// Compile an overloaded operator for the two operands
+		if( CompileOverloadedDualOperator(node, lctx, rctx, leftToRight, ctx, false, op) )
+			return 0;
+
+		// If both operands are objects, then we shouldn't continue
+		if( lctx->type.dataType.IsObject() && rctx->type.dataType.IsObject() )
+		{
+			asCString str;
+			str.Format(TXT_NO_MATCHING_OP_FOUND_FOR_TYPES_s_AND_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), rctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+			ctx->type.SetDummy();
+			return -1;
+		}
+
+		// Process the property get accessors (if any)
+		if( ProcessPropertyGetAccessor(lctx, node) < 0 )
+			return -1;
+		if( ProcessPropertyGetAccessor(rctx, node) < 0 )
+			return -1;
+
+		// Make sure we have two variables or constants
+		if( lctx->type.dataType.IsReference() ) ConvertToVariableNotIn(lctx, rctx);
+		if( rctx->type.dataType.IsReference() ) ConvertToVariableNotIn(rctx, lctx);
+
+		// Make sure lctx doesn't end up with a variable used in rctx
+		if( lctx->type.isTemporary && rctx->bc.IsVarUsed(lctx->type.stackOffset) )
+		{
+			int offset = AllocateVariableNotIn(lctx->type.dataType, true, false, rctx);
+			rctx->bc.ExchangeVar(lctx->type.stackOffset, offset);
+			ReleaseTemporaryVariable(offset, 0);
+		}
+
+		// Math operators
+		// + - * / % ** += -= *= /= %= **=
+		if( op == ttPlus     || op == ttAddAssign ||
+			op == ttMinus    || op == ttSubAssign ||
+			op == ttStar     || op == ttMulAssign ||
+			op == ttSlash    || op == ttDivAssign ||
+			op == ttPercent  || op == ttModAssign ||
+			op == ttStarStar || op == ttPowAssign )
+		{
+			CompileMathOperator(node, lctx, rctx, ctx, op);
+			return 0;
+		}
+
+		// Bitwise operators
+		// << >> >>> & | ^ <<= >>= >>>= &= |= ^=
+		if( op == ttAmp                || op == ttAndAssign         ||
+			op == ttBitOr              || op == ttOrAssign          ||
+			op == ttBitXor             || op == ttXorAssign         ||
+			op == ttBitShiftLeft       || op == ttShiftLeftAssign   ||
+			op == ttBitShiftRight      || op == ttShiftRightLAssign ||
+			op == ttBitShiftRightArith || op == ttShiftRightAAssign )
+		{
+			CompileBitwiseOperator(node, lctx, rctx, ctx, op);
+			return 0;
+		}
+
+		// Comparison operators
+		// == != < > <= >=
+		if( op == ttEqual       || op == ttNotEqual           ||
+			op == ttLessThan    || op == ttLessThanOrEqual    ||
+			op == ttGreaterThan || op == ttGreaterThanOrEqual )
+		{
+			CompileComparisonOperator(node, lctx, rctx, ctx, op);
+			return 0;
+		}
+
+		// Boolean operators
+		// && || ^^
+		if( op == ttAnd || op == ttOr || op == ttXor )
+		{
+			CompileBooleanOperator(node, lctx, rctx, ctx, op);
+			return 0;
+		}
+	}
+
+	asASSERT(false);
+	return -1;
+}
+
+void asCCompiler::ConvertToTempVariableNotIn(asCExprContext *ctx, asCExprContext *exclude)
+{
+	int l = int(reservedVariables.GetLength());
+	if( exclude ) exclude->bc.GetVarsUsed(reservedVariables);
+	ConvertToTempVariable(ctx);
+	reservedVariables.SetLength(l);
+}
+
+void asCCompiler::ConvertToTempVariable(asCExprContext *ctx)
+{
+	// This is only used for primitive types and null handles
+	asASSERT( ctx->type.dataType.IsPrimitive() || ctx->type.dataType.IsNullHandle() );
+
+	ConvertToVariable(ctx);
+	if( !ctx->type.isTemporary )
+	{
+		if( ctx->type.dataType.IsPrimitive() )
+		{
+			// Copy the variable to a temporary variable
+			int offset = AllocateVariable(ctx->type.dataType, true);
+			if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+				ctx->bc.InstrW_W(asBC_CpyVtoV4, offset, ctx->type.stackOffset);
+			else
+				ctx->bc.InstrW_W(asBC_CpyVtoV8, offset, ctx->type.stackOffset);
+			ctx->type.SetVariable(ctx->type.dataType, offset, true);
+		}
+		else
+		{
+			// We should never get here
+			asASSERT(false);
+		}
+	}
+}
+
+void asCCompiler::ConvertToVariable(asCExprContext *ctx)
+{
+	// We should never get here while the context is still an unprocessed property accessor
+	asASSERT(ctx->property_get == 0 && ctx->property_set == 0);
+
+	int offset;
+	if( !ctx->type.isVariable &&
+		(ctx->type.dataType.IsObjectHandle() ||
+		 (ctx->type.dataType.IsObject() && ctx->type.dataType.SupportHandles())) )
+	{
+		offset = AllocateVariable(ctx->type.dataType, true);
+		if( ctx->type.IsNullConstant() )
+		{
+			if( ctx->bc.GetLastInstr() == asBC_PshNull )
+				ctx->bc.Instr(asBC_PopPtr); // Pop the null constant pushed onto the stack
+			ctx->bc.InstrSHORT(asBC_ClrVPtr, (short)offset);
+		}
+		else
+		{
+			Dereference(ctx, true);
+
+			// Copy the object handle to a variable
+			ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+			if( ctx->type.dataType.IsFuncdef() )
+				ctx->bc.InstrPTR(asBC_REFCPY, &engine->functionBehaviours);
+			else
+				ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
+			ctx->bc.Instr(asBC_PopPtr);
+		}
+
+		// As this is an object the reference must be placed on the stack
+		ctx->bc.InstrSHORT(asBC_PSF, (short)offset);
+
+		ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+		ctx->type.SetVariable(ctx->type.dataType, offset, true);
+		ctx->type.dataType.MakeHandle(true);
+		ctx->type.dataType.MakeReference(true);
+	}
+	else if( (!ctx->type.isVariable || ctx->type.dataType.IsReference()) &&
+		     ctx->type.dataType.IsPrimitive() )
+	{
+		if( ctx->type.isConstant )
+		{
+			offset = AllocateVariable(ctx->type.dataType, true);
+			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
+				ctx->bc.InstrSHORT_B(asBC_SetV1, (short)offset, ctx->type.GetConstantB());
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
+				ctx->bc.InstrSHORT_W(asBC_SetV2, (short)offset, ctx->type.GetConstantW());
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 4 )
+				ctx->bc.InstrSHORT_DW(asBC_SetV4, (short)offset, ctx->type.GetConstantDW());
+			else
+				ctx->bc.InstrSHORT_QW(asBC_SetV8, (short)offset, ctx->type.GetConstantQW());
+
+			ctx->type.SetVariable(ctx->type.dataType, offset, true);
+			return;
+		}
+		else
+		{
+			asASSERT(ctx->type.dataType.IsPrimitive());
+			asASSERT(ctx->type.dataType.IsReference());
+
+			ctx->type.dataType.MakeReference(false);
+			offset = AllocateVariable(ctx->type.dataType, true);
+
+			// Read the value from the address in the register directly into the variable
+			if( ctx->type.dataType.GetSizeInMemoryBytes() == 1 )
+				ctx->bc.InstrSHORT(asBC_RDR1, (short)offset);
+			else if( ctx->type.dataType.GetSizeInMemoryBytes() == 2 )
+				ctx->bc.InstrSHORT(asBC_RDR2, (short)offset);
+			else if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+				ctx->bc.InstrSHORT(asBC_RDR4, (short)offset);
+			else
+				ctx->bc.InstrSHORT(asBC_RDR8, (short)offset);
+		}
+
+		ReleaseTemporaryVariable(ctx->type, &ctx->bc);
+		ctx->type.SetVariable(ctx->type.dataType, offset, true);
+	}
+}
+
+void asCCompiler::ConvertToVariableNotIn(asCExprContext *ctx, asCExprContext *exclude)
+{
+	int l = int(reservedVariables.GetLength());
+	if( exclude ) exclude->bc.GetVarsUsed(reservedVariables);
+	ConvertToVariable(ctx);
+	reservedVariables.SetLength(l);
+}
+
+void asCCompiler::ImplicitConvObjectToBestMathType(asCExprContext *ctx, asCScriptNode *node)
+{
+	asCArray<int> funcs;
+	asCObjectType *ot = CastToObjectType(ctx->type.dataType.GetTypeInfo());
+	if( ot )
+	{
+		for( unsigned int n = 0; n < ot->methods.GetLength(); n++ )
+		{
+			// Consider only implicit casts
+			asCScriptFunction *func = engine->scriptFunctions[ot->methods[n]];
+			if( func->name == "opImplConv" &&
+				func->returnType.IsPrimitive() &&
+				func->parameterTypes.GetLength() == 0 )
+				funcs.PushLast(ot->methods[n]);
+		}
+
+		// Use the one with the highest precision
+		const eTokenType match[10] = {ttDouble, ttFloat, ttInt64, ttUInt64, ttInt, ttUInt, ttInt16, ttUInt16, ttInt8, ttUInt8};
+		while( funcs.GetLength() > 1 )
+		{
+			eTokenType returnType = builder->GetFunctionDescription(funcs[0])->returnType.GetTokenType();
+			int value1 = 11, value2 = 11;
+			for( asUINT i = 0; i < 10; i++ )
+			{
+				if( returnType == match[i] )
+				{
+					value1 = i;
+					break;
+				}
+			}
+
+			for( asUINT n = 1; n < funcs.GetLength(); n++ )
+			{
+				returnType = builder->GetFunctionDescription(funcs[n])->returnType.GetTokenType();
+				for( asUINT i = 0; i < 10; i++ )
+				{
+					if( returnType == match[i] )
+					{
+						value2 = i;
+						break;
+					}
+				}
+
+				if( value2 >= value1 )
+				{
+					// Remove this and continue searching
+					funcs.RemoveIndexUnordered(n--);
+				}
+				else
+				{
+					// Remove the first, and start over
+					funcs.RemoveIndexUnordered(0);
+					break;
+				}
+			}
+		}
+
+		// Do the conversion
+		if( funcs.GetLength() )
+			ImplicitConvObjectToPrimitive(ctx, builder->GetFunctionDescription(funcs[0])->returnType, node, asIC_IMPLICIT_CONV);
+	}
+}
+
+void asCCompiler::CompileMathOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext  *rctx, asCExprContext *ctx, eTokenType op)
+{
+	// TODO: If a constant is only using 32bits, then a 32bit operation is preferred
+
+	// TODO: clean up: This initial part is identical to CompileComparisonOperator. Make a common function out of it
+
+	// If either operand is a non-primitive then use the primitive type
+	if( !lctx->type.dataType.IsPrimitive() )
+	{
+		int l = int(reservedVariables.GetLength());
+		rctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(lctx, node);
+		reservedVariables.SetLength(l);
+	}
+	if( !rctx->type.dataType.IsPrimitive() )
+	{
+		int l = int(reservedVariables.GetLength());
+		lctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(rctx, node);
+		reservedVariables.SetLength(l);
+	}
+
+	// Both types must now be primitives. Implicitly convert them so they match
+	asCDataType to;
+	if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
+		to.SetTokenType(ttDouble);
+	else if( lctx->type.dataType.IsFloatType() || rctx->type.dataType.IsFloatType() )
+		to.SetTokenType(ttFloat);
+	else if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 || rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+	{
+		// Convert to int64 if both are signed or if one is non-constant and signed
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
+			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
+			to.SetTokenType(ttInt64);
+		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType(ttUInt64);
+		else
+			to.SetTokenType(ttInt64);
+	}
+	else
+	{
+		// Convert to int32 if both are signed or if one is non-constant and signed
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
+			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
+			to.SetTokenType(ttInt);
+		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType(ttUInt);
+		else
+			to.SetTokenType(ttInt);
+	}
+
+	// If doing an operation with double constant and float variable, the constant should be converted to float
+	if( (lctx->type.isConstant && lctx->type.dataType.IsDoubleType() && !rctx->type.isConstant && rctx->type.dataType.IsFloatType()) ||
+		(rctx->type.isConstant && rctx->type.dataType.IsDoubleType() && !lctx->type.isConstant && lctx->type.dataType.IsFloatType()) )
+		to.SetTokenType(ttFloat);
+
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
+
+	// If integer division is disabled, convert to floating-point
+	if( engine->ep.disableIntegerDivision &&
+		(op == ttSlash || op == ttDivAssign) &&
+		(to.IsIntegerType() || to.IsUnsignedType()) )
+	{
+		// Use double to avoid losing precision when dividing with 32bit ints
+		// For 64bit ints there is unfortunately no greater type so with those
+		// there is still a risk of loosing precision
+		to.SetTokenType(ttDouble);
+	}
+
+	// Do the actual conversion
+	int l = int(reservedVariables.GetLength());
+	rctx->bc.GetVarsUsed(reservedVariables);
+	lctx->bc.GetVarsUsed(reservedVariables);
+
+	if( lctx->type.dataType.IsReference() )
+		ConvertToVariable(lctx);
+	if( rctx->type.dataType.IsReference() )
+		ConvertToVariable(rctx);
+
+	if( to.IsPrimitive() )
+	{
+		// ttStarStar allows an integer, right-hand operand and a double
+		// left-hand operand.
+		if( (op == ttStarStar || op == ttPowAssign) &&
+			lctx->type.dataType.IsDoubleType() &&
+			(rctx->type.dataType.IsIntegerType() ||
+			    rctx->type.dataType.IsUnsignedType()) )
+		{
+			to.SetTokenType(ttInt);
+			ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true);
+			to.SetTokenType(ttDouble);
+		}
+		else
+		{
+			ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV, true);
+			ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true);
+		}
+	}
+	reservedVariables.SetLength(l);
+
+	// Verify that the conversion was successful
+	if( !lctx->type.dataType.IsIntegerType() &&
+		!lctx->type.dataType.IsUnsignedType() &&
+		!lctx->type.dataType.IsFloatType() &&
+		!lctx->type.dataType.IsDoubleType() )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+
+		ctx->type.SetDummy();
+		return;
+	}
+
+	if( !rctx->type.dataType.IsIntegerType() &&
+		!rctx->type.dataType.IsUnsignedType() &&
+		!rctx->type.dataType.IsFloatType() &&
+		!rctx->type.dataType.IsDoubleType() )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_MATH_TYPE, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+
+		ctx->type.SetDummy();
+		return;
+	}
+
+	bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
+
+	// Verify if we are dividing with a constant zero
+	if( rctx->type.isConstant &&
+		(op == ttSlash   || op == ttDivAssign ||
+		 op == ttPercent || op == ttModAssign) &&
+		((rctx->type.dataType.GetSizeInMemoryBytes() == 4 && rctx->type.GetConstantDW() == 0) ||
+		 (rctx->type.dataType.GetSizeInMemoryBytes() == 8 && rctx->type.GetConstantQW() == 0) ||
+		 (rctx->type.dataType.GetSizeInMemoryBytes() == 1 && rctx->type.GetConstantB() == 0) ||
+		 (rctx->type.dataType.GetSizeInMemoryBytes() == 2 && rctx->type.GetConstantW() == 0)) )
+	{
+		Error(TXT_DIVIDE_BY_ZERO, node);
+	}
+
+	if( !isConstant )
+	{
+		ConvertToVariableNotIn(lctx, rctx);
+		ConvertToVariableNotIn(rctx, lctx);
+		ReleaseTemporaryVariable(lctx->type, &lctx->bc);
+		ReleaseTemporaryVariable(rctx->type, &rctx->bc);
+
+		if( op == ttAddAssign || op == ttSubAssign ||
+			op == ttMulAssign || op == ttDivAssign ||
+			op == ttModAssign || op == ttPowAssign )
+		{
+			// Merge the operands in the different order so that they are evaluated correctly
+			MergeExprBytecode(ctx, rctx);
+			MergeExprBytecode(ctx, lctx);
+
+			// We must not process the deferred parameters yet, as
+			// it may overwrite the lvalue kept in the register
+		}
+		else
+		{
+			MergeExprBytecode(ctx, lctx);
+			MergeExprBytecode(ctx, rctx);
+
+			ProcessDeferredParams(ctx);
+		}
+
+		asEBCInstr instruction = asBC_ADDi;
+		if( lctx->type.dataType.IsIntegerType() ||
+			lctx->type.dataType.IsUnsignedType() )
+		{
+			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				if( op == ttPlus || op == ttAddAssign )
+					instruction = asBC_ADDi;
+				else if( op == ttMinus || op == ttSubAssign )
+					instruction = asBC_SUBi;
+				else if( op == ttStar || op == ttMulAssign )
+					instruction = asBC_MULi;
+				else if( op == ttSlash || op == ttDivAssign )
+				{
+					if( lctx->type.dataType.IsIntegerType() )
+						instruction = asBC_DIVi;
+					else
+						instruction = asBC_DIVu;
+				}
+				else if( op == ttPercent || op == ttModAssign )
+				{
+					if( lctx->type.dataType.IsIntegerType() )
+						instruction = asBC_MODi;
+					else
+						instruction = asBC_MODu;
+				}
+				else if( op == ttStarStar || op == ttPowAssign )
+				{
+					if( lctx->type.dataType.IsIntegerType() )
+						instruction = asBC_POWi;
+					else
+						instruction = asBC_POWu;
+				}
+			}
+			else
+			{
+				if( op == ttPlus || op == ttAddAssign )
+					instruction = asBC_ADDi64;
+				else if( op == ttMinus || op == ttSubAssign )
+					instruction = asBC_SUBi64;
+				else if( op == ttStar || op == ttMulAssign )
+					instruction = asBC_MULi64;
+				else if( op == ttSlash || op == ttDivAssign )
+				{
+					if( lctx->type.dataType.IsIntegerType() )
+						instruction = asBC_DIVi64;
+					else
+						instruction = asBC_DIVu64;
+				}
+				else if( op == ttPercent || op == ttModAssign )
+				{
+					if( lctx->type.dataType.IsIntegerType() )
+						instruction = asBC_MODi64;
+					else
+						instruction = asBC_MODu64;
+				}
+				else if( op == ttStarStar || op == ttPowAssign )
+				{
+					if( lctx->type.dataType.IsIntegerType() )
+						instruction = asBC_POWi64;
+					else
+						instruction = asBC_POWu64;
+				}
+			}
+		}
+		else if( lctx->type.dataType.IsFloatType() )
+		{
+			if( op == ttPlus || op == ttAddAssign )
+				instruction = asBC_ADDf;
+			else if( op == ttMinus || op == ttSubAssign )
+				instruction = asBC_SUBf;
+			else if( op == ttStar || op == ttMulAssign )
+				instruction = asBC_MULf;
+			else if( op == ttSlash || op == ttDivAssign )
+				instruction = asBC_DIVf;
+			else if( op == ttPercent || op == ttModAssign )
+				instruction = asBC_MODf;
+			else if( op == ttStarStar || op == ttPowAssign )
+				instruction = asBC_POWf;
+		}
+		else if( lctx->type.dataType.IsDoubleType() )
+		{
+			if( rctx->type.dataType.IsIntegerType() )
+			{
+				asASSERT(rctx->type.dataType.GetSizeInMemoryDWords() == 1);
+
+				if( op == ttStarStar || op == ttPowAssign )
+					instruction = asBC_POWdi;
+				else
+					asASSERT(false);  // Should not be possible
+			}
+			else
+			{
+				if( op == ttPlus || op == ttAddAssign )
+					instruction = asBC_ADDd;
+				else if( op == ttMinus || op == ttSubAssign )
+					instruction = asBC_SUBd;
+				else if( op == ttStar || op == ttMulAssign )
+					instruction = asBC_MULd;
+				else if( op == ttSlash || op == ttDivAssign )
+					instruction = asBC_DIVd;
+				else if( op == ttPercent || op == ttModAssign )
+					instruction = asBC_MODd;
+				else if( op == ttStarStar || op == ttPowAssign )
+					instruction = asBC_POWd;
+			}
+		}
+		else
+		{
+			// Shouldn't be possible
+			asASSERT(false);
+		}
+
+		// Do the operation
+		int a = AllocateVariable(lctx->type.dataType, true);
+		int b = lctx->type.stackOffset;
+		int c = rctx->type.stackOffset;
+
+		ctx->bc.InstrW_W_W(instruction, a, b, c);
+
+		ctx->type.SetVariable(lctx->type.dataType, a, true);
+	}
+	else
+	{
+		// Both values are constants
+		if( lctx->type.dataType.IsIntegerType() ||
+			lctx->type.dataType.IsUnsignedType() )
+		{
+			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				int v = 0;
+				if( op == ttPlus )
+					v = int(lctx->type.GetConstantDW()) + int(rctx->type.GetConstantDW());
+				else if( op == ttMinus )
+					v = int(lctx->type.GetConstantDW()) - int(rctx->type.GetConstantDW());
+				else if( op == ttStar )
+					v = int(lctx->type.GetConstantDW()) * int(rctx->type.GetConstantDW());
+				else if( op == ttSlash )
+				{
+					// TODO: Should probably report an error, rather than silently convert the value to 0
+					if( rctx->type.GetConstantDW() == 0 || (int(rctx->type.GetConstantDW()) == -1 && lctx->type.GetConstantDW() == 0x80000000) )
+						v = 0;
+					else
+						if( lctx->type.dataType.IsIntegerType() )
+							v = int(lctx->type.GetConstantDW()) / int(rctx->type.GetConstantDW());
+						else
+							v = lctx->type.GetConstantDW() / rctx->type.GetConstantDW();
+				}
+				else if( op == ttPercent )
+				{
+					// TODO: Should probably report an error, rather than silently convert the value to 0
+					if( rctx->type.GetConstantDW() == 0 || (int(rctx->type.GetConstantDW()) == -1 && lctx->type.GetConstantDW() == 0x80000000) )
+						v = 0;
+					else
+						if( lctx->type.dataType.IsIntegerType() )
+							v = int(lctx->type.GetConstantDW()) % int(rctx->type.GetConstantDW());
+						else
+							v = lctx->type.GetConstantDW() % rctx->type.GetConstantDW();
+				}
+				else if( op == ttStarStar )
+				{
+					bool isOverflow;
+					if( lctx->type.dataType.IsIntegerType() )
+						v = as_powi(int(lctx->type.GetConstantDW()), int(rctx->type.GetConstantDW()), isOverflow);
+					else
+						v = as_powu(lctx->type.GetConstantDW(), rctx->type.GetConstantDW(), isOverflow);
+
+					if( isOverflow )
+						Error(TXT_POW_OVERFLOW, node);
+				}
+
+				ctx->type.SetConstantDW(lctx->type.dataType, v);
+
+				// If the right value is greater than the left value in a minus operation, then we need to convert the type to int
+				if( lctx->type.dataType.GetTokenType() == ttUInt && op == ttMinus && lctx->type.GetConstantDW() < rctx->type.GetConstantDW())
+					ctx->type.dataType.SetTokenType(ttInt);
+			}
+			else
+			{
+				asQWORD v = 0;
+				if( op == ttPlus )
+					v = asINT64(lctx->type.GetConstantQW()) + asINT64(rctx->type.GetConstantQW());
+				else if( op == ttMinus )
+					v = asINT64(lctx->type.GetConstantQW()) - asINT64(rctx->type.GetConstantQW());
+				else if( op == ttStar )
+					v = asINT64(lctx->type.GetConstantQW()) * asINT64(rctx->type.GetConstantQW());
+				else if( op == ttSlash )
+				{
+					// TODO: Should probably report an error, rather than silently convert the value to 0
+					if( rctx->type.GetConstantQW() == 0 || (rctx->type.GetConstantQW() == asQWORD(-1) && lctx->type.GetConstantQW() == (asQWORD(1)<<63)) )
+						v = 0;
+					else
+						if( lctx->type.dataType.IsIntegerType() )
+							v = asINT64(lctx->type.GetConstantQW()) / asINT64(rctx->type.GetConstantQW());
+						else
+							v = lctx->type.GetConstantQW() / rctx->type.GetConstantQW();
+				}
+				else if( op == ttPercent )
+				{
+				    // TODO: Should probably report an error, rather than silently convert the value to 0
+					if( rctx->type.GetConstantQW() == 0 || (rctx->type.GetConstantQW() == asQWORD(-1) && lctx->type.GetConstantQW() == (asQWORD(1)<<63)) )
+						v = 0;
+					else
+						if( lctx->type.dataType.IsIntegerType() )
+							v = asINT64(lctx->type.GetConstantQW()) % asINT64(rctx->type.GetConstantQW());
+						else
+							v = lctx->type.GetConstantQW() % rctx->type.GetConstantQW();
+				}
+				else if( op == ttStarStar )
+				{
+					bool isOverflow;
+					if( lctx->type.dataType.IsIntegerType() )
+						v = as_powi64(asINT64(lctx->type.GetConstantQW()), asINT64(rctx->type.GetConstantQW()), isOverflow);
+					else
+						v = as_powu64(lctx->type.GetConstantQW(), rctx->type.GetConstantQW(), isOverflow);
+
+					if( isOverflow )
+						Error(TXT_POW_OVERFLOW, node);
+				}
+
+				ctx->type.SetConstantQW(lctx->type.dataType, v);
+
+				// If the right value is greater than the left value in a minus operation, then we need to convert the type to int
+				if( lctx->type.dataType.GetTokenType() == ttUInt64 && op == ttMinus && lctx->type.GetConstantQW() < rctx->type.GetConstantQW())
+					ctx->type.dataType.SetTokenType(ttInt64);
+			}
+		}
+		else if( lctx->type.dataType.IsFloatType() )
+		{
+			float v = 0.0f;
+			if( op == ttPlus )
+				v = lctx->type.GetConstantF() + rctx->type.GetConstantF();
+			else if( op == ttMinus )
+				v = lctx->type.GetConstantF() - rctx->type.GetConstantF();
+			else if( op == ttStar )
+				v = lctx->type.GetConstantF() * rctx->type.GetConstantF();
+			else if( op == ttSlash )
+			{
+				if( rctx->type.GetConstantF() == 0 )
+					v = 0;
+				else
+					v = lctx->type.GetConstantF() / rctx->type.GetConstantF();
+			}
+			else if( op == ttPercent )
+			{
+				if( rctx->type.GetConstantF() == 0 )
+					v = 0;
+				else
+					v = fmodf(lctx->type.GetConstantF(), rctx->type.GetConstantF());
+			}
+			else if( op == ttStarStar )
+			{
+				v = powf(lctx->type.GetConstantF(), rctx->type.GetConstantF());
+
+				if( v == HUGE_VAL )
+					Error(TXT_POW_OVERFLOW, node);
+			}
+
+			ctx->type.SetConstantF(lctx->type.dataType, v);
+		}
+		else if( lctx->type.dataType.IsDoubleType() )
+		{
+			double v = 0.0;
+			if( rctx->type.dataType.IsIntegerType() )
+			{
+				asASSERT(rctx->type.dataType.GetSizeInMemoryDWords() == 1);
+
+				if( op == ttStarStar || op == ttPowAssign )
+				{
+					v = pow(lctx->type.GetConstantD(), int(rctx->type.GetConstantDW()));
+					if( v == HUGE_VAL )
+						Error(TXT_POW_OVERFLOW, node);
+				}
+				else
+					asASSERT(false);  // Should not be possible
+			}
+			else
+			{
+				if( op == ttPlus )
+					v = lctx->type.GetConstantD() + rctx->type.GetConstantD();
+				else if( op == ttMinus )
+					v = lctx->type.GetConstantD() - rctx->type.GetConstantD();
+				else if( op == ttStar )
+					v = lctx->type.GetConstantD() * rctx->type.GetConstantD();
+				else if( op == ttSlash )
+				{
+					if( rctx->type.GetConstantD() == 0 )
+						v = 0;
+					else
+						v = lctx->type.GetConstantD() / rctx->type.GetConstantD();
+				}
+				else if( op == ttPercent )
+				{
+					if( rctx->type.GetConstantD() == 0 )
+						v = 0;
+					else
+						v = fmod(lctx->type.GetConstantD(), rctx->type.GetConstantD());
+				}
+				else if( op == ttStarStar )
+				{
+					v = pow(lctx->type.GetConstantD(), rctx->type.GetConstantD());
+					if( v == HUGE_VAL )
+						Error(TXT_POW_OVERFLOW, node);
+				}
+			}
+
+			ctx->type.SetConstantD(lctx->type.dataType, v);
+		}
+		else
+		{
+			// Shouldn't be possible
+			asASSERT(false);
+		}
+	}
+}
+
+void asCCompiler::CompileBitwiseOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op)
+{
+	// TODO: If a constant is only using 32bits, then a 32bit operation is preferred
+
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
+	if( op == ttAmp    || op == ttAndAssign ||
+		op == ttBitOr  || op == ttOrAssign  ||
+		op == ttBitXor || op == ttXorAssign )
+	{
+		// Also do not permit float/double to be implicitly converted to integer in this case
+		// as the user may think the result is a bitwise operation on the float value but it's not
+		if (lctx->type.dataType.IsFloatType() || lctx->type.dataType.IsDoubleType())
+		{
+			asCString str;
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+
+			// Set an integer value and allow the compiler to continue
+			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), 0);
+			return;
+		}
+		if (rctx->type.dataType.IsFloatType() || rctx->type.dataType.IsDoubleType())
+		{
+			asCString str;
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+
+			// Set an integer value and allow the compiler to continue
+			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), 0);
+			return;
+		}
+
+		// Convert left hand operand to integer if it's not already one
+		asCDataType to;
+		if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 ||
+			rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			to.SetTokenType(ttInt64);
+		else
+			to.SetTokenType(ttInt);
+
+		// Do the actual conversion (keep sign/unsigned if possible)
+		int l = int(reservedVariables.GetLength());
+		rctx->bc.GetVarsUsed(reservedVariables);
+		if( lctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttUInt : ttUInt64 );
+		else
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttInt : ttInt64 );
+		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV, true);
+		reservedVariables.SetLength(l);
+
+		// Verify that the conversion was successful
+		if( lctx->type.dataType != to )
+		{
+			asCString str;
+			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+		}
+
+		// Convert right hand operand to same size as left hand
+		l = int(reservedVariables.GetLength());
+		lctx->bc.GetVarsUsed(reservedVariables);
+		if( rctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttUInt : ttUInt64 );
+		else
+			to.SetTokenType( to.GetSizeOnStackDWords() == 1 ? ttInt : ttInt64 );
+		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV, true);
+		reservedVariables.SetLength(l);
+		if( rctx->type.dataType != to )
+		{
+			asCString str;
+			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+		}
+
+		bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
+
+		if( !isConstant )
+		{
+			ConvertToVariableNotIn(lctx, rctx);
+			ConvertToVariableNotIn(rctx, lctx);
+			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
+			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
+
+			if( op == ttAndAssign || op == ttOrAssign || op == ttXorAssign )
+			{
+				// Compound assignments execute the right hand value first
+				MergeExprBytecode(ctx, rctx);
+				MergeExprBytecode(ctx, lctx);
+			}
+			else
+			{
+				MergeExprBytecode(ctx, lctx);
+				MergeExprBytecode(ctx, rctx);
+			}
+			ProcessDeferredParams(ctx);
+
+			asEBCInstr instruction = asBC_BAND;
+			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				if( op == ttAmp || op == ttAndAssign )
+					instruction = asBC_BAND;
+				else if( op == ttBitOr || op == ttOrAssign )
+					instruction = asBC_BOR;
+				else if( op == ttBitXor || op == ttXorAssign )
+					instruction = asBC_BXOR;
+			}
+			else
+			{
+				if( op == ttAmp || op == ttAndAssign )
+					instruction = asBC_BAND64;
+				else if( op == ttBitOr || op == ttOrAssign )
+					instruction = asBC_BOR64;
+				else if( op == ttBitXor || op == ttXorAssign )
+					instruction = asBC_BXOR64;
+			}
+
+			// Do the operation
+			int a = AllocateVariable(lctx->type.dataType, true);
+			int b = lctx->type.stackOffset;
+			int c = rctx->type.stackOffset;
+
+			ctx->bc.InstrW_W_W(instruction, a, b, c);
+
+			ctx->type.SetVariable(lctx->type.dataType, a, true);
+		}
+		else
+		{
+			if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				asQWORD v = 0;
+				if( op == ttAmp )
+					v = lctx->type.GetConstantQW() & rctx->type.GetConstantQW();
+				else if( op == ttBitOr )
+					v = lctx->type.GetConstantQW() | rctx->type.GetConstantQW();
+				else if( op == ttBitXor )
+					v = lctx->type.GetConstantQW() ^ rctx->type.GetConstantQW();
+
+				// Remember the result
+				ctx->type.SetConstantQW(lctx->type.dataType, v);
+			}
+			else
+			{
+				asDWORD v = 0;
+				if( op == ttAmp )
+					v = lctx->type.GetConstantDW() & rctx->type.GetConstantDW();
+				else if( op == ttBitOr )
+					v = lctx->type.GetConstantDW() | rctx->type.GetConstantDW();
+				else if( op == ttBitXor )
+					v = lctx->type.GetConstantDW() ^ rctx->type.GetConstantDW();
+
+				// Remember the result
+				ctx->type.SetConstantDW(lctx->type.dataType, v);
+			}
+		}
+	}
+	else if( op == ttBitShiftLeft       || op == ttShiftLeftAssign   ||
+		     op == ttBitShiftRight      || op == ttShiftRightLAssign ||
+			 op == ttBitShiftRightArith || op == ttShiftRightAAssign )
+	{
+		// Don't permit object to primitive conversion, since we don't know which integer type is the correct one
+		// Also do not permit float/double to be implicitly converted to integer in this case
+		if( lctx->type.dataType.IsObject() || lctx->type.dataType.IsFloatType() || lctx->type.dataType.IsDoubleType() )
+		{
+			asCString str;
+			str.Format(TXT_ILLEGAL_OPERATION_ON_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+
+			// Set an integer value and allow the compiler to continue
+			ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), 0);
+			return;
+		}
+
+		// Convert left hand operand to integer if it's not already one
+		asCDataType to = lctx->type.dataType;
+		if( lctx->type.dataType.IsUnsignedType() &&
+			lctx->type.dataType.GetSizeInMemoryBytes() < 4 )
+		{
+			// Upgrade to 32bit
+			to = asCDataType::CreatePrimitive(ttUInt, false);
+		}
+		else if( !lctx->type.dataType.IsUnsignedType() )
+		{
+			if (lctx->type.dataType.GetSizeInMemoryDWords() == 2)
+				to = asCDataType::CreatePrimitive(ttInt64, false);
+			else
+				to = asCDataType::CreatePrimitive(ttInt, false);
+		}
+
+		// Do the actual conversion
+		int l = int(reservedVariables.GetLength());
+		rctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV, true);
+		reservedVariables.SetLength(l);
+
+		// Verify that the conversion was successful
+		if( lctx->type.dataType != to )
+		{
+			asCString str;
+			str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+			Error(str, node);
+		}
+
+		// Right operand must be 32bit uint
+		l = int(reservedVariables.GetLength());
+		lctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConversion(rctx, asCDataType::CreatePrimitive(ttUInt, true), node, asIC_IMPLICIT_CONV, true);
+		reservedVariables.SetLength(l);
+		if( !rctx->type.dataType.IsUnsignedType() )
+		{
+			asCString str;
+			str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "uint");
+			Error(str, node);
+		}
+
+		bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
+
+		if( !isConstant )
+		{
+			ConvertToVariableNotIn(lctx, rctx);
+			ConvertToVariableNotIn(rctx, lctx);
+			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
+			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
+
+			if( op == ttShiftLeftAssign || op == ttShiftRightLAssign || op == ttShiftRightAAssign )
+			{
+				// Compound assignments execute the right hand value first
+				MergeExprBytecode(ctx, rctx);
+				MergeExprBytecode(ctx, lctx);
+			}
+			else
+			{
+				MergeExprBytecode(ctx, lctx);
+				MergeExprBytecode(ctx, rctx);
+			}
+			ProcessDeferredParams(ctx);
+
+			asEBCInstr instruction = asBC_BSLL;
+			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				if( op == ttBitShiftLeft || op == ttShiftLeftAssign )
+					instruction = asBC_BSLL;
+				else if( op == ttBitShiftRight || op == ttShiftRightLAssign )
+					instruction = asBC_BSRL;
+				else if( op == ttBitShiftRightArith || op == ttShiftRightAAssign )
+					instruction = asBC_BSRA;
+			}
+			else
+			{
+				if( op == ttBitShiftLeft || op == ttShiftLeftAssign )
+					instruction = asBC_BSLL64;
+				else if( op == ttBitShiftRight || op == ttShiftRightLAssign )
+					instruction = asBC_BSRL64;
+				else if( op == ttBitShiftRightArith || op == ttShiftRightAAssign )
+					instruction = asBC_BSRA64;
+			}
+
+			// Do the operation
+			int a = AllocateVariable(lctx->type.dataType, true);
+			int b = lctx->type.stackOffset;
+			int c = rctx->type.stackOffset;
+
+			ctx->bc.InstrW_W_W(instruction, a, b, c);
+
+			ctx->type.SetVariable(lctx->type.dataType, a, true);
+		}
+		else
+		{
+			if( lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				asDWORD v = 0;
+				if( op == ttBitShiftLeft )
+					v = lctx->type.GetConstantDW() << rctx->type.GetConstantDW();
+				else if( op == ttBitShiftRight )
+					v = lctx->type.GetConstantDW() >> rctx->type.GetConstantDW();
+				else if( op == ttBitShiftRightArith )
+					v = int(lctx->type.GetConstantDW()) >> rctx->type.GetConstantDW();
+
+				ctx->type.SetConstantDW(lctx->type.dataType, v);
+			}
+			else
+			{
+				asQWORD v = 0;
+				if( op == ttBitShiftLeft )
+					v = lctx->type.GetConstantQW() << rctx->type.GetConstantDW();
+				else if( op == ttBitShiftRight )
+					v = lctx->type.GetConstantQW() >> rctx->type.GetConstantDW();
+				else if( op == ttBitShiftRightArith )
+					v = asINT64(lctx->type.GetConstantQW()) >> rctx->type.GetConstantDW();
+
+				ctx->type.SetConstantQW(lctx->type.dataType, v);
+			}
+		}
+	}
+}
+
+void asCCompiler::CompileComparisonOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op)
+{
+	// Both operands must be of the same type
+
+	// If either operand is a non-primitive then first convert them to the best number type
+	if( !lctx->type.dataType.IsPrimitive() )
+	{
+		int l = int(reservedVariables.GetLength());
+		rctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(lctx, node);
+		reservedVariables.SetLength(l);
+	}
+	if( !rctx->type.dataType.IsPrimitive() )
+	{
+		int l = int(reservedVariables.GetLength());
+		lctx->bc.GetVarsUsed(reservedVariables);
+		ImplicitConvObjectToBestMathType(rctx, node);
+		reservedVariables.SetLength(l);
+	}
+
+	// Implicitly convert the operands to matching types
+	asCDataType to;
+	if( lctx->type.dataType.IsDoubleType() || rctx->type.dataType.IsDoubleType() )
+		to.SetTokenType(ttDouble);
+	else if( lctx->type.dataType.IsFloatType() || rctx->type.dataType.IsFloatType() )
+		to.SetTokenType(ttFloat);
+	else if( lctx->type.dataType.GetSizeInMemoryDWords() == 2 || rctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+	{
+		// Convert to int64 if both are signed or if one is non-constant and signed
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
+			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
+			to.SetTokenType(ttInt64);
+		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType(ttUInt64);
+		else
+			to.SetTokenType(ttInt64);
+	}
+	else
+	{
+		// Convert to int32 if both are signed or if one is non-constant and signed
+		if( (lctx->type.dataType.IsIntegerType() && !lctx->type.isConstant) ||
+			(rctx->type.dataType.IsIntegerType() && !rctx->type.isConstant) )
+			to.SetTokenType(ttInt);
+		else if( lctx->type.dataType.IsUnsignedType() || rctx->type.dataType.IsUnsignedType() )
+			to.SetTokenType(ttUInt);
+		else if( lctx->type.dataType.IsBooleanType() || rctx->type.dataType.IsBooleanType() )
+			to.SetTokenType(ttBool);
+		else
+			to.SetTokenType(ttInt);
+	}
+
+	// If doing an operation with double constant and float variable, the constant should be converted to float
+	if( (lctx->type.isConstant && lctx->type.dataType.IsDoubleType() && !rctx->type.isConstant && rctx->type.dataType.IsFloatType()) ||
+		(rctx->type.isConstant && rctx->type.dataType.IsDoubleType() && !lctx->type.isConstant && lctx->type.dataType.IsFloatType()) )
+		to.SetTokenType(ttFloat);
+
+	asASSERT( to.GetTokenType() != ttUnrecognizedToken );
+
+	// Do we have a mismatch between the sign of the operand?
+	bool signMismatch = false;
+	for( int n = 0; !signMismatch && n < 2; n++ )
+	{
+		asCExprContext *opCtx = n ? rctx : lctx;
+
+		if( opCtx->type.dataType.IsUnsignedType() != to.IsUnsignedType() )
+		{
+			// We have a mismatch, unless the value is a literal constant and the conversion won't affect its value
+			signMismatch = true;
+			if( opCtx->type.isConstant )
+			{
+				if( opCtx->type.dataType.GetTokenType() == ttUInt64 || opCtx->type.dataType.GetTokenType() == ttInt64 )
+				{
+					if( !(opCtx->type.GetConstantQW() & (asQWORD(1)<<63)) )
+						signMismatch = false;
+				}
+				else if(opCtx->type.dataType.GetTokenType() == ttUInt || opCtx->type.dataType.GetTokenType() == ttInt || opCtx->type.dataType.IsEnumType() )
+				{
+					if( !(opCtx->type.GetConstantDW() & (1<<31)) )
+						signMismatch = false;
+				}
+				else if (opCtx->type.dataType.GetTokenType() == ttUInt16 || opCtx->type.dataType.GetTokenType() == ttInt16)
+				{
+					if (!(opCtx->type.GetConstantW() & (1 << 15)))
+						signMismatch = false;
+				}
+				else if (opCtx->type.dataType.GetTokenType() == ttUInt8 || opCtx->type.dataType.GetTokenType() == ttInt8)
+				{
+					if (!(opCtx->type.GetConstantB() & (1 << 7)))
+						signMismatch = false;
+				}
+
+				// It's not necessary to check for floats or double, because if
+				// it was then the types for the conversion will never be unsigned
+			}
+		}
+	}
+
+	// Check for signed/unsigned mismatch
+	if( signMismatch )
+		Warning(TXT_SIGNED_UNSIGNED_MISMATCH, node);
+
+	// Attempt to resolve ambiguous enumerations
+	if( lctx->type.dataType.IsEnumType() && rctx->enumValue != "" )
+		ImplicitConversion(rctx, lctx->type.dataType, node, asIC_IMPLICIT_CONV);
+	else if( rctx->type.dataType.IsEnumType() && lctx->enumValue != "" )
+		ImplicitConversion(lctx, rctx->type.dataType, node, asIC_IMPLICIT_CONV);
+
+	// Do the actual conversion
+	int l = int(reservedVariables.GetLength());
+	rctx->bc.GetVarsUsed(reservedVariables);
+
+	if( lctx->type.dataType.IsReference() )
+		ConvertToVariable(lctx);
+	if( rctx->type.dataType.IsReference() )
+		ConvertToVariable(rctx);
+
+	ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
+	ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
+	reservedVariables.SetLength(l);
+
+	// Verify that the conversion was successful
+	bool ok = true;
+	if( !lctx->type.dataType.IsEqualExceptConst(to) )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+		ok = false;
+	}
+
+	if( !rctx->type.dataType.IsEqualExceptConst(to) )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+		ok = false;
+	}
+
+	if( !ok )
+	{
+		// It wasn't possible to get two valid operands, so we just return
+		// a boolean result and let the compiler continue.
+#if AS_SIZEOF_BOOL == 1
+		ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+#else
+		ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
+#endif
+		return;
+	}
+
+	bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
+
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
+
+	if( !isConstant )
+	{
+		if( to.IsBooleanType() )
+		{
+			if( op == ttEqual || op == ttNotEqual )
+			{
+				// Must convert to temporary variable, because we are changing the value before comparison
+				ConvertToTempVariableNotIn(lctx, rctx);
+				ConvertToTempVariableNotIn(rctx, lctx);
+				ReleaseTemporaryVariable(lctx->type, &lctx->bc);
+				ReleaseTemporaryVariable(rctx->type, &rctx->bc);
+
+				// Make sure they are equal if not false
+				lctx->bc.InstrWORD(asBC_NOT, (short)lctx->type.stackOffset);
+				rctx->bc.InstrWORD(asBC_NOT, (short)rctx->type.stackOffset);
+
+				MergeExprBytecode(ctx, lctx);
+				MergeExprBytecode(ctx, rctx);
+				ProcessDeferredParams(ctx);
+
+				int a = AllocateVariable(asCDataType::CreatePrimitive(ttBool, true), true);
+				int b = lctx->type.stackOffset;
+				int c = rctx->type.stackOffset;
+
+				if( op == ttEqual )
+				{
+					ctx->bc.InstrW_W(asBC_CMPi,b,c);
+					ctx->bc.Instr(asBC_TZ);
+					ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
+				}
+				else if( op == ttNotEqual )
+				{
+					ctx->bc.InstrW_W(asBC_CMPi,b,c);
+					ctx->bc.Instr(asBC_TNZ);
+					ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
+				}
+
+				ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
+			}
+			else
+			{
+				// TODO: Use TXT_ILLEGAL_OPERATION_ON
+				Error(TXT_ILLEGAL_OPERATION, node);
+#if AS_SIZEOF_BOOL == 1
+				ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), 0);
+#else
+				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), 0);
+#endif
+			}
+		}
+		else
+		{
+			ConvertToVariableNotIn(lctx, rctx);
+			ConvertToVariableNotIn(rctx, lctx);
+			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
+			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
+
+			MergeExprBytecode(ctx, lctx);
+			MergeExprBytecode(ctx, rctx);
+			ProcessDeferredParams(ctx);
+
+			asEBCInstr iCmp = asBC_CMPi, iT = asBC_TZ;
+
+			if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+				iCmp = asBC_CMPi;
+			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+				iCmp = asBC_CMPu;
+			else if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+				iCmp = asBC_CMPi64;
+			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+				iCmp = asBC_CMPu64;
+			else if( lctx->type.dataType.IsFloatType() )
+				iCmp = asBC_CMPf;
+			else if( lctx->type.dataType.IsDoubleType() )
+				iCmp = asBC_CMPd;
+			else
+				asASSERT(false);
+
+			if( op == ttEqual )
+				iT = asBC_TZ;
+			else if( op == ttNotEqual )
+				iT = asBC_TNZ;
+			else if( op == ttLessThan )
+				iT = asBC_TS;
+			else if( op == ttLessThanOrEqual )
+				iT = asBC_TNP;
+			else if( op == ttGreaterThan )
+				iT = asBC_TP;
+			else if( op == ttGreaterThanOrEqual )
+				iT = asBC_TNS;
+
+			int a = AllocateVariable(asCDataType::CreatePrimitive(ttBool, true), true);
+			int b = lctx->type.stackOffset;
+			int c = rctx->type.stackOffset;
+
+			ctx->bc.InstrW_W(iCmp, b, c);
+			ctx->bc.Instr(iT);
+			ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
+
+			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
+		}
+	}
+	else
+	{
+		if( to.IsBooleanType() )
+		{
+			if( op == ttEqual || op == ttNotEqual )
+			{
+				asDWORD lv, rv;
+				#if AS_SIZEOF_BOOL == 1
+					lv = lctx->type.GetConstantB();
+					rv = rctx->type.GetConstantB();
+				#else
+					lv = lctx->type.GetConstantDW();
+					rv = rctx->type.GetConstantDW();
+				#endif
+
+				// Make sure they are equal if not false
+				if (lv != 0) lv = VALUE_OF_BOOLEAN_TRUE;
+				if (rv != 0) rv = VALUE_OF_BOOLEAN_TRUE;
+
+				asDWORD v = 0;
+				if (op == ttEqual)
+					v = (lv == rv) ? VALUE_OF_BOOLEAN_TRUE : 0;
+				else if (op == ttNotEqual)
+					v = (lv != rv) ? VALUE_OF_BOOLEAN_TRUE : 0;
+
+				#if AS_SIZEOF_BOOL == 1
+					ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), (asBYTE)v);
+				#else
+					ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), v);
+				#endif
+			}
+			else
+			{
+				// TODO: Use TXT_ILLEGAL_OPERATION_ON
+				Error(TXT_ILLEGAL_OPERATION, node);
+			}
+		}
+		else
+		{
+			int i = 0;
+			if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				int v = int(lctx->type.GetConstantDW()) - int(rctx->type.GetConstantDW());
+				if( v < 0 ) i = -1;
+				if( v > 0 ) i = 1;
+			}
+			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			{
+				asDWORD v1 = lctx->type.GetConstantDW();
+				asDWORD v2 = rctx->type.GetConstantDW();
+				if( v1 < v2 ) i = -1;
+				if( v1 > v2 ) i = 1;
+			}
+			else if( lctx->type.dataType.IsIntegerType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				asINT64 v = asINT64(lctx->type.GetConstantQW()) - asINT64(rctx->type.GetConstantQW());
+				if( v < 0 ) i = -1;
+				if( v > 0 ) i = 1;
+			}
+			else if( lctx->type.dataType.IsUnsignedType() && lctx->type.dataType.GetSizeInMemoryDWords() == 2 )
+			{
+				asQWORD v1 = lctx->type.GetConstantQW();
+				asQWORD v2 = rctx->type.GetConstantQW();
+				if( v1 < v2 ) i = -1;
+				if( v1 > v2 ) i = 1;
+			}
+			else if( lctx->type.dataType.IsFloatType() )
+			{
+				float v = lctx->type.GetConstantF() - rctx->type.GetConstantF();
+				if( v < 0 ) i = -1;
+				if( v > 0 ) i = 1;
+			}
+			else if( lctx->type.dataType.IsDoubleType() )
+			{
+				double v = lctx->type.GetConstantD() - rctx->type.GetConstantD();
+				if( v < 0 ) i = -1;
+				if( v > 0 ) i = 1;
+			}
+
+
+			if( op == ttEqual )
+				i = (i == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+			else if( op == ttNotEqual )
+				i = (i != 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+			else if( op == ttLessThan )
+				i = (i < 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+			else if( op == ttLessThanOrEqual )
+				i = (i <= 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+			else if( op == ttGreaterThan )
+				i = (i > 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+			else if( op == ttGreaterThanOrEqual )
+				i = (i >= 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+
+			#if AS_SIZEOF_BOOL == 1
+				ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), (asBYTE)i);
+			#else
+				ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), i);
+			#endif
+		}
+	}
+}
+
+void asCCompiler::PushVariableOnStack(asCExprContext *ctx, bool asReference)
+{
+	// Put the result on the stack
+	if( asReference )
+	{
+		ctx->bc.InstrSHORT(asBC_PSF, (short)ctx->type.stackOffset);
+		ctx->type.dataType.MakeReference(true);
+	}
+	else
+	{
+		if( ctx->type.dataType.GetSizeInMemoryDWords() == 1 )
+			ctx->bc.InstrSHORT(asBC_PshV4, (short)ctx->type.stackOffset);
+		else
+			ctx->bc.InstrSHORT(asBC_PshV8, (short)ctx->type.stackOffset);
+	}
+}
+
+void asCCompiler::CompileBooleanOperator(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType op)
+{
+	// Both operands must be booleans
+	asCDataType to;
+	to.SetTokenType(ttBool);
+
+	// Do the actual conversion
+	int l = int(reservedVariables.GetLength());
+	rctx->bc.GetVarsUsed(reservedVariables);
+	lctx->bc.GetVarsUsed(reservedVariables);
+
+	// Allow value types to be converted to bool using 'bool opImplConv()'
+	if( lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+		ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
+	if( rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_VALUE) )
+		ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
+	reservedVariables.SetLength(l);
+
+	// Verify that the conversion was successful
+	if( !lctx->type.dataType.IsBooleanType() )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "bool");
+		Error(str, node);
+		// Force the conversion to allow compilation to proceed
+		lctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+	}
+
+	if( !rctx->type.dataType.IsBooleanType() )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), "bool");
+		Error(str, node);
+		// Force the conversion to allow compilation to proceed
+		rctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+	}
+
+	bool isConstant = lctx->type.isConstant && rctx->type.isConstant;
+
+	ctx->type.Set(asCDataType::CreatePrimitive(ttBool, true));
+
+	// What kind of operator is it?
+	if( op == ttUnrecognizedToken )
+		op = node->tokenType;
+	if( op == ttXor )
+	{
+		if( !isConstant )
+		{
+			// Must convert to temporary variable, because we are changing the value before comparison
+			ConvertToTempVariableNotIn(lctx, rctx);
+			ConvertToTempVariableNotIn(rctx, lctx);
+			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
+			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
+
+			// Make sure they are equal if not false
+			lctx->bc.InstrWORD(asBC_NOT, (short)lctx->type.stackOffset);
+			rctx->bc.InstrWORD(asBC_NOT, (short)rctx->type.stackOffset);
+
+			MergeExprBytecode(ctx, lctx);
+			MergeExprBytecode(ctx, rctx);
+			ProcessDeferredParams(ctx);
+
+			int a = AllocateVariable(ctx->type.dataType, true);
+			int b = lctx->type.stackOffset;
+			int c = rctx->type.stackOffset;
+
+			ctx->bc.InstrW_W_W(asBC_BXOR,a,b,c);
+
+			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
+		}
+		else
+		{
+			// Make sure they are equal if not false
+#if AS_SIZEOF_BOOL == 1
+			if( lctx->type.GetConstantB() != 0 ) lctx->type.SetConstantB(VALUE_OF_BOOLEAN_TRUE);
+			if( rctx->type.GetConstantB() != 0 ) rctx->type.SetConstantB(VALUE_OF_BOOLEAN_TRUE);
+
+			asBYTE v = 0;
+			v = lctx->type.GetConstantB() - rctx->type.GetConstantB();
+			if( v != 0 ) v = VALUE_OF_BOOLEAN_TRUE; else v = 0;
+
+			ctx->type.isConstant = true;
+			ctx->type.SetConstantB(v);
+#else
+			if( lctx->type.GetConstantDW() != 0 ) lctx->type.SetConstantDW(VALUE_OF_BOOLEAN_TRUE);
+			if( rctx->type.GetConstantDW() != 0 ) rctx->type.SetConstantDW(VALUE_OF_BOOLEAN_TRUE);
+
+			asDWORD v = 0;
+			v = lctx->type.GetConstantDW() - rctx->type.GetConstantDW();
+			if( v != 0 ) v = VALUE_OF_BOOLEAN_TRUE; else v = 0;
+
+			ctx->type.isConstant = true;
+			ctx->type.SetConstantDW(v);
+#endif
+		}
+	}
+	else if( op == ttAnd ||
+			 op == ttOr )
+	{
+		if( !isConstant )
+		{
+			// If or-operator and first value is 1 the second value shouldn't be calculated
+			// if and-operator and first value is 0 the second value shouldn't be calculated
+			ConvertToVariable(lctx);
+			ReleaseTemporaryVariable(lctx->type, &lctx->bc);
+			MergeExprBytecode(ctx, lctx);
+
+			int offset = AllocateVariable(asCDataType::CreatePrimitive(ttBool, false), true);
+
+			int label1 = nextLabel++;
+			int label2 = nextLabel++;
+
+			ctx->bc.InstrSHORT(asBC_CpyVtoR4, (short)lctx->type.stackOffset);
+			ctx->bc.Instr(asBC_ClrHi);
+			if( op == ttAnd )
+			{
+				ctx->bc.InstrDWORD(asBC_JNZ, label1);
+				ctx->bc.InstrW_DW(asBC_SetV4, (asWORD)offset, 0);
+				ctx->bc.InstrINT(asBC_JMP, label2);
+			}
+			else if( op == ttOr )
+			{
+				ctx->bc.InstrDWORD(asBC_JZ, label1);
+#if AS_SIZEOF_BOOL == 1
+				ctx->bc.InstrSHORT_B(asBC_SetV1, (short)offset, VALUE_OF_BOOLEAN_TRUE);
+#else
+				ctx->bc.InstrSHORT_DW(asBC_SetV4, (short)offset, VALUE_OF_BOOLEAN_TRUE);
+#endif
+				ctx->bc.InstrINT(asBC_JMP, label2);
+			}
+
+			ctx->bc.Label((short)label1);
+			ConvertToVariable(rctx);
+			ReleaseTemporaryVariable(rctx->type, &rctx->bc);
+			rctx->bc.InstrW_W(asBC_CpyVtoV4, offset, rctx->type.stackOffset);
+			MergeExprBytecode(ctx, rctx);
+			ctx->bc.Label((short)label2);
+
+			ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, false), offset, true);
+		}
+		else
+		{
+#if AS_SIZEOF_BOOL == 1
+			asBYTE v = 0;
+			if( op == ttAnd )
+				v = lctx->type.GetConstantB() && rctx->type.GetConstantB();
+			else if( op == ttOr )
+				v = lctx->type.GetConstantB() || rctx->type.GetConstantB();
+
+			// Remember the result
+			ctx->type.isConstant = true;
+			ctx->type.SetConstantB(v);
+#else
+			asDWORD v = 0;
+			if( op == ttAnd )
+				v = lctx->type.GetConstantDW() && rctx->type.GetConstantDW();
+			else if( op == ttOr )
+				v = lctx->type.GetConstantDW() || rctx->type.GetConstantDW();
+
+			// Remember the result
+			ctx->type.isConstant = true;
+			ctx->type.SetConstantDW(v);
+#endif
+		}
+	}
+}
+
+void asCCompiler::CompileOperatorOnHandles(asCScriptNode *node, asCExprContext *lctx, asCExprContext *rctx, asCExprContext *ctx, eTokenType opToken)
+{
+	// Process the property accessor as get
+	if( ProcessPropertyGetAccessor(lctx, node) < 0 )
+		return;
+	if( ProcessPropertyGetAccessor(rctx, node) < 0 )
+		return;
+
+	DetermineSingleFunc(lctx, node);
+	DetermineSingleFunc(rctx, node);
+
+	// Make sure lctx doesn't end up with a variable used in rctx
+	if( lctx->type.isTemporary && rctx->bc.IsVarUsed(lctx->type.stackOffset) )
+	{
+		asCArray<int> vars;
+		rctx->bc.GetVarsUsed(vars);
+		int offset = AllocateVariable(lctx->type.dataType, true);
+		rctx->bc.ExchangeVar(lctx->type.stackOffset, offset);
+		ReleaseTemporaryVariable(offset, 0);
+	}
+
+	if( opToken == ttUnrecognizedToken )
+		opToken = node->tokenType;
+
+	// Warn if not both operands are explicit handles or null handles
+	if( (opToken == ttEqual || opToken == ttNotEqual) &&
+		((!(lctx->type.isExplicitHandle || lctx->type.IsNullConstant()) && !(lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE))) ||
+		 (!(rctx->type.isExplicitHandle || rctx->type.IsNullConstant()) && !(rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->flags & asOBJ_IMPLICIT_HANDLE)))) )
+	{
+		Warning(TXT_HANDLE_COMPARISON, node);
+	}
+
+	// If one of the operands is a value type used as handle, we should look for the opEquals method
+	if( ((lctx->type.dataType.GetTypeInfo() && (lctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE)) ||
+		 (rctx->type.dataType.GetTypeInfo() && (rctx->type.dataType.GetTypeInfo()->flags & asOBJ_ASHANDLE))) &&
+		(opToken == ttEqual || opToken == ttIs ||
+		 opToken == ttNotEqual || opToken == ttNotIs) )
+	{
+		// TODO: Should evaluate which of the two have the best match. If both have equal match, the first version should be used
+		// Find the matching opEquals method
+		int r = CompileOverloadedDualOperator2(node, "opEquals", lctx, rctx, true, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
+		if( r == 0 )
+		{
+			// Try again by switching the order of the operands
+			r = CompileOverloadedDualOperator2(node, "opEquals", rctx, lctx, false, ctx, true, asCDataType::CreatePrimitive(ttBool, false));
+		}
+
+		if( r == 1 )
+		{
+			if( opToken == ttNotEqual || opToken == ttNotIs )
+				ctx->bc.InstrSHORT(asBC_NOT, (short)ctx->type.stackOffset);
+
+			// Success, don't continue
+			return;
+		}
+		else if( r == 0 )
+		{
+			// Couldn't find opEquals method
+			Error(TXT_NO_APPROPRIATE_OPEQUALS, node);
+		}
+
+		// Compiler error, don't continue
+#if AS_SIZEOF_BOOL == 1
+		ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+#else
+		ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
+#endif
+		return;
+	}
+
+
+	// Implicitly convert null to the other type
+	asCDataType to;
+	if( lctx->type.IsNullConstant() )
+		to = rctx->type.dataType;
+	else if( rctx->type.IsNullConstant() )
+		to = lctx->type.dataType;
+	else
+	{
+		// Find a common base type
+		asCExprContext tmp(engine);
+		tmp.type = rctx->type;
+		ImplicitConversion(&tmp, lctx->type.dataType, 0, asIC_IMPLICIT_CONV, false);
+		if( tmp.type.dataType.GetTypeInfo() == lctx->type.dataType.GetTypeInfo() )
+			to = lctx->type.dataType;
+		else
+			to = rctx->type.dataType;
+
+		// Assume handle-to-const as it is not possible to convert handle-to-const to handle-to-non-const
+		to.MakeHandleToConst(true);
+	}
+
+	// Need to pop the value if it is a null constant
+	if( lctx->type.IsNullConstant() )
+		lctx->bc.Instr(asBC_PopPtr);
+	if( rctx->type.IsNullConstant() )
+		rctx->bc.Instr(asBC_PopPtr);
+
+	// Convert both sides to explicit handles
+	to.MakeHandle(true);
+	to.MakeReference(false);
+
+	if( !to.IsObjectHandle() )
+	{
+		// Compiler error, don't continue
+		Error(TXT_OPERANDS_MUST_BE_HANDLES, node);
+#if AS_SIZEOF_BOOL == 1
+		ctx->type.SetConstantB(asCDataType::CreatePrimitive(ttBool, true), true);
+#else
+		ctx->type.SetConstantDW(asCDataType::CreatePrimitive(ttBool, true), true);
+#endif
+		return;
+	}
+
+	// Do the conversion
+	ImplicitConversion(lctx, to, node, asIC_IMPLICIT_CONV);
+	ImplicitConversion(rctx, to, node, asIC_IMPLICIT_CONV);
+
+	// Both operands must be of the same type
+
+	// Verify that the conversion was successful
+	if( !lctx->type.dataType.IsEqualExceptConst(to) )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_s, lctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+	}
+
+	if( !rctx->type.dataType.IsEqualExceptConst(to) )
+	{
+		asCString str;
+		str.Format(TXT_NO_CONVERSION_s_TO_s, rctx->type.dataType.Format(outFunc->nameSpace).AddressOf(), to.Format(outFunc->nameSpace).AddressOf());
+		Error(str, node);
+	}
+
+	// Make sure it really is handles that are being compared
+	if( !lctx->type.dataType.IsObjectHandle() )
+	{
+		Error(TXT_OPERANDS_MUST_BE_HANDLES, node);
+	}
+
+	ctx->type.Set(asCDataType::CreatePrimitive(ttBool, true));
+
+	if( opToken == ttEqual || opToken == ttNotEqual || opToken == ttIs || opToken == ttNotIs )
+	{
+		// Make sure handles received as parameters by reference are copied to a local variable before the
+		// asBC_CmpPtr, so we don't end up comparing the reference to the handle instead of the handle itself
+		if( lctx->type.isVariable && !lctx->type.isTemporary && lctx->type.stackOffset <= 0 )
+			lctx->type.isVariable = false;
+		if( rctx->type.isVariable && !rctx->type.isTemporary && rctx->type.stackOffset <= 0 )
+			rctx->type.isVariable = false;
+
+		// TODO: runtime optimize: don't do REFCPY if not necessary
+		ConvertToVariableNotIn(lctx, rctx);
+		ConvertToVariable(rctx);
+
+		// Pop the pointers from the stack as they will not be used
+		lctx->bc.Instr(asBC_PopPtr);
+		rctx->bc.Instr(asBC_PopPtr);
+
+		MergeExprBytecode(ctx, lctx);
+		MergeExprBytecode(ctx, rctx);
+
+		int a = AllocateVariable(ctx->type.dataType, true);
+		int b = lctx->type.stackOffset;
+		int c = rctx->type.stackOffset;
+
+		ctx->bc.InstrW_W(asBC_CmpPtr, b, c);
+
+		if( opToken == ttEqual || opToken == ttIs )
+			ctx->bc.Instr(asBC_TZ);
+		else if( opToken == ttNotEqual || opToken == ttNotIs )
+			ctx->bc.Instr(asBC_TNZ);
+
+		ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)a);
+
+		ctx->type.SetVariable(asCDataType::CreatePrimitive(ttBool, true), a, true);
+
+		ReleaseTemporaryVariable(lctx->type, &ctx->bc);
+		ReleaseTemporaryVariable(rctx->type, &ctx->bc);
+		ProcessDeferredParams(ctx);
+	}
+	else
+	{
+		// TODO: Use TXT_ILLEGAL_OPERATION_ON
+		Error(TXT_ILLEGAL_OPERATION, node);
+	}
+}
+
+
+void asCCompiler::PerformFunctionCall(int funcId, asCExprContext *ctx, bool isConstructor, asCArray<asCExprContext*> *args, asCObjectType *objType, bool useVariable, int varOffset, int funcPtrVar)
+{
+	asCScriptFunction *descr = builder->GetFunctionDescription(funcId);
+
+	// A shared object may not call non-shared functions
+	if( outFunc->IsShared() && !descr->IsShared() )
+	{
+		asCString msg;
+		msg.Format(TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s, descr->GetDeclarationStr().AddressOf());
+		Error(msg, ctx->exprNode);
+	}
+
+	// Check if the function is private or protected
+	if (descr->IsPrivate())
+	{
+		asCObjectType *type = descr->objectType;
+		if (type == 0 && descr->traits.GetTrait(asTRAIT_CONSTRUCTOR))
+			type = CastToObjectType(descr->returnType.GetTypeInfo());
+
+		asASSERT(type);
+
+		if( (type != outFunc->GetObjectType()) )
+		{
+			asCString msg;
+			msg.Format(TXT_PRIVATE_METHOD_CALL_s, descr->GetDeclarationStr().AddressOf());
+			Error(msg, ctx->exprNode);
+		}
+	}
+	else if (descr->IsProtected())
+	{
+		asCObjectType *type = descr->objectType;
+		if (type == 0 && descr->traits.GetTrait(asTRAIT_CONSTRUCTOR))
+			type = CastToObjectType(descr->returnType.GetTypeInfo());
+
+		asASSERT(type);
+
+		if (!(type == outFunc->objectType || (outFunc->objectType && outFunc->objectType->DerivesFrom(type))))
+		{
+			asCString msg;
+			msg.Format(TXT_PROTECTED_METHOD_CALL_s, descr->GetDeclarationStr().AddressOf());
+			Error(msg, ctx->exprNode);
+		}
+	}
+
+	int argSize = descr->GetSpaceNeededForArguments();
+
+	// If we're calling a class method we must make sure the object is guaranteed to stay
+	// alive throughout the call by holding on to a reference in a local variable. This must
+	// be done for any methods that return references, and any calls on script objects.
+	// Application registered objects are assumed to know to keep themselves alive even
+	// if the method doesn't return a reference.
+	if( !ctx->type.isRefSafe &&
+		descr->objectType &&
+		(ctx->type.dataType.IsObjectHandle() || ctx->type.dataType.SupportHandles()) &&
+		(descr->returnType.IsReference() || (ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_SCRIPT_OBJECT)) &&
+		!(ctx->type.isVariable || ctx->type.isTemporary) &&
+		!(ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_SCOPED) &&
+		!(ctx->type.dataType.GetTypeInfo()->GetFlags() & asOBJ_ASHANDLE) )
+	{
+		// TODO: runtime optimize: Avoid this for global variables, by storing a reference to the global variable once in a
+		//                         local variable and then refer to the same for each call. An alias for the global variable
+		//                         should be stored in the variable scope so that the compiler can find it. For loops and
+		//                         scopes that will always be executed, i.e. non-if scopes the alias should be stored in the
+		//                         higher scope to increase the probability of re-use.
+
+		int tempRef = AllocateVariable(ctx->type.dataType, true);
+		ctx->bc.InstrSHORT(asBC_PSF, (short)tempRef);
+		ctx->bc.InstrPTR(asBC_REFCPY, ctx->type.dataType.GetTypeInfo());
+
+		// Add the release of this reference as a deferred expression
+		asSDeferredParam deferred;
+		deferred.origExpr = 0;
+		deferred.argInOutFlags = asTM_INREF;
+		deferred.argNode = 0;
+		deferred.argType.SetVariable(ctx->type.dataType, tempRef, true);
+		ctx->deferredParams.PushLast(deferred);
+
+		// Forget the current type
+		ctx->type.SetDummy();
+	}
+
+	// Check if there is a need to add a hidden pointer for when the function returns an object by value
+	if( descr->DoesReturnOnStack() && !useVariable )
+	{
+		useVariable = true;
+		varOffset = AllocateVariable(descr->returnType, true);
+
+		// Push the pointer to the pre-allocated space for the return value
+		ctx->bc.InstrSHORT(asBC_PSF, short(varOffset));
+
+		if( descr->objectType )
+		{
+			// The object pointer is already on the stack, but should be the top
+			// one, so we need to swap the pointers in order to get the correct
+			ctx->bc.Instr(asBC_SwapPtr);
+		}
+	}
+
+	if( isConstructor )
+	{
+		// Sometimes the value types are allocated on the heap,
+		// which is when this way of constructing them is used.
+
+		asASSERT(useVariable == false);
+
+		if( (objType->flags & asOBJ_TEMPLATE) )
+		{
+			asASSERT( descr->funcType == asFUNC_SCRIPT );
+
+			// Find the id of the real constructor and not the generated stub
+			asUINT id = 0;
+			asDWORD *bc = descr->scriptData->byteCode.AddressOf();
+			while( bc )
+			{
+				if( (*(asBYTE*)bc) == asBC_CALLSYS )
+				{
+					id = asBC_INTARG(bc);
+					break;
+				}
+				bc += asBCTypeSize[asBCInfo[*(asBYTE*)bc].type];
+			}
+
+			asASSERT( id );
+
+			ctx->bc.InstrPTR(asBC_OBJTYPE, objType);
+			ctx->bc.Alloc(asBC_ALLOC, objType, id, argSize + AS_PTR_SIZE + AS_PTR_SIZE);
+		}
+		else
+			ctx->bc.Alloc(asBC_ALLOC, objType, descr->id, argSize+AS_PTR_SIZE);
+
+		// The instruction has already moved the returned object to the variable
+		ctx->type.Set(asCDataType::CreatePrimitive(ttVoid, false));
+		ctx->type.isLValue = false;
+
+		// Clean up arguments
+		if( args )
+			AfterFunctionCall(funcId, *args, ctx, false);
+
+		ProcessDeferredParams(ctx);
+
+		return;
+	}
+	else
+	{
+		if( descr->objectType )
+			argSize += AS_PTR_SIZE;
+
+		// If the function returns an object by value the address of the location
+		// where the value should be stored is passed as an argument too
+		if( descr->DoesReturnOnStack() )
+			argSize += AS_PTR_SIZE;
+
+		// TODO: runtime optimize: If it is known that a class method cannot be overridden the call
+		//                         should be made with asBC_CALL as it is faster. Examples where this
+		//                         is known is for example finalled methods where the class doesn't derive
+		//                         from any other, or even non-finalled methods but where it is known
+		//                         at compile time the true type of the object. The first should be
+		//                         quite easy to determine, but the latter will be quite complex and possibly
+		//                         not worth it.
+		if( descr->funcType == asFUNC_IMPORTED )
+			ctx->bc.Call(asBC_CALLBND , descr->id, argSize);
+		// TODO: Maybe we need two different byte codes
+		else if( descr->funcType == asFUNC_INTERFACE || descr->funcType == asFUNC_VIRTUAL )
+			ctx->bc.Call(asBC_CALLINTF, descr->id, argSize);
+		else if( descr->funcType == asFUNC_SCRIPT )
+			ctx->bc.Call(asBC_CALL    , descr->id, argSize);
+		else if( descr->funcType == asFUNC_SYSTEM )
+		{
+			// Check if we can use the faster asBC_Thiscall1 instruction, i.e. one of
+			//    type &obj::func(int)
+			//    type &obj::func(uint)
+			if( descr->GetObjectType() && descr->returnType.IsReference() &&
+				descr->parameterTypes.GetLength() == 1 &&
+				(descr->parameterTypes[0].IsIntegerType() || descr->parameterTypes[0].IsUnsignedType()) &&
+				descr->parameterTypes[0].GetSizeInMemoryBytes() == 4 &&
+				!descr->parameterTypes[0].IsReference() )
+				ctx->bc.Call(asBC_Thiscall1, descr->id, argSize);
+			else
+				ctx->bc.Call(asBC_CALLSYS , descr->id, argSize);
+		}
+		else if( descr->funcType == asFUNC_FUNCDEF )
+			ctx->bc.CallPtr(asBC_CallPtr, funcPtrVar, argSize);
+	}
+
+	if( (descr->returnType.IsObject() || descr->returnType.IsFuncdef()) && !descr->returnType.IsReference() )
+	{
+		int returnOffset = 0;
+
+		asCExprValue tmpExpr = ctx->type;
+
+		if( descr->DoesReturnOnStack() )
+		{
+			asASSERT( useVariable );
+
+			// The variable was allocated before the function was called
+			returnOffset = varOffset;
+			ctx->type.SetVariable(descr->returnType, returnOffset, true);
+
+			// The variable was initialized by the function, so we need to mark it as initialized here
+			ctx->bc.ObjInfo(varOffset, asOBJ_INIT);
+		}
+		else
+		{
+			if( useVariable )
+			{
+				// Use the given variable
+				returnOffset = varOffset;
+				ctx->type.SetVariable(descr->returnType, returnOffset, false);
+			}
+			else
+			{
+				// Allocate a temporary variable for the returned object
+				// The returned object will actually be allocated on the heap, so
+				// we must force the allocation of the variable to do the same
+				returnOffset = AllocateVariable(descr->returnType, true, !descr->returnType.IsObjectHandle());
+				ctx->type.SetVariable(descr->returnType, returnOffset, true);
+			}
+
+			// Move the pointer from the object register to the temporary variable
+			ctx->bc.InstrSHORT(asBC_STOREOBJ, (short)returnOffset);
+		}
+
+		// If the context holds a variable that needs cleanup and the application uses unsafe
+		// references then store it as a deferred parameter so it will be cleaned up afterwards.
+		if (tmpExpr.isTemporary && engine->ep.allowUnsafeReferences)
+		{
+			asSDeferredParam defer;
+			defer.argNode = 0;
+			defer.argType = tmpExpr;
+			defer.argInOutFlags = asTM_INOUTREF;
+			defer.origExpr = 0;
+			ctx->deferredParams.PushLast(defer);
+		}
+		else
+			ReleaseTemporaryVariable(tmpExpr, &ctx->bc);
+
+		ctx->type.dataType.MakeReference(IsVariableOnHeap(returnOffset));
+		ctx->type.isLValue = false; // It is a reference, but not an lvalue
+
+		// Clean up arguments
+		// If application is using unsafe references, then don't clean up arguments yet because
+		// the returned object might be referencing one of the arguments.
+		if( args )
+			AfterFunctionCall(funcId, *args, ctx, engine->ep.allowUnsafeReferences ? true : false);
+
+		if (!engine->ep.allowUnsafeReferences)
+			ProcessDeferredParams(ctx);
+
+		ctx->bc.InstrSHORT(asBC_PSF, (short)returnOffset);
+	}
+	else if( descr->returnType.IsReference() )
+	{
+		asASSERT(useVariable == false);
+
+		// We cannot clean up the arguments yet, because the
+		// reference might be pointing to one of them.
+		if( args )
+			AfterFunctionCall(funcId, *args, ctx, true);
+
+		// Do not process the output parameters yet, because it
+		// might invalidate the returned reference
+
+		// If the context holds a variable that needs cleanup
+		// store it as a deferred parameter so it will be cleaned up
+		// afterwards.
+		if( ctx->type.isTemporary )
+		{
+			asSDeferredParam defer;
+			defer.argNode = 0;
+			defer.argType = ctx->type;
+			defer.argInOutFlags = asTM_INOUTREF;
+			defer.origExpr = 0;
+			ctx->deferredParams.PushLast(defer);
+		}
+
+		ctx->type.Set(descr->returnType);
+		if( !descr->returnType.IsPrimitive() )
+		{
+			ctx->bc.Instr(asBC_PshRPtr);
+			if( descr->returnType.IsObject() &&
+				!descr->returnType.IsObjectHandle() )
+			{
+				// We are getting the pointer to the object
+				// not a pointer to a object variable
+				ctx->type.dataType.MakeReference(false);
+			}
+		}
+
+		// A returned reference can be used as lvalue
+		ctx->type.isLValue = true;
+	}
+	else
+	{
+		asCExprValue tmpExpr = ctx->type;
+
+		if( descr->returnType.GetSizeInMemoryBytes() )
+		{
+			int offset;
+			if (useVariable)
+				offset = varOffset;
+			else
+			{
+				// Allocate a temporary variable to hold the value, but make sure
+				// the temporary variable isn't used in any of the deferred arguments
+				int l = int(reservedVariables.GetLength());
+				for (asUINT n = 0; args && n < args->GetLength(); n++)
+				{
+					asCExprContext *expr = (*args)[n]->origExpr;
+					if (expr)
+						expr->bc.GetVarsUsed(reservedVariables);
+				}
+				offset = AllocateVariable(descr->returnType, true);
+				reservedVariables.SetLength(l);
+			}
+
+			ctx->type.SetVariable(descr->returnType, offset, true);
+
+			// Move the value from the return register to the variable
+			if( descr->returnType.GetSizeOnStackDWords() == 1 )
+				ctx->bc.InstrSHORT(asBC_CpyRtoV4, (short)offset);
+			else if( descr->returnType.GetSizeOnStackDWords() == 2 )
+				ctx->bc.InstrSHORT(asBC_CpyRtoV8, (short)offset);
+		}
+		else
+			ctx->type.Set(descr->returnType);
+
+		// If the context holds a variable that needs cleanup and the application uses unsafe
+		// references then store it as a deferred parameter so it will be cleaned up afterwards.
+		if (tmpExpr.isTemporary && engine->ep.allowUnsafeReferences )
+		{
+			asSDeferredParam defer;
+			defer.argNode = 0;
+			defer.argType = tmpExpr;
+			defer.argInOutFlags = asTM_INOUTREF;
+			defer.origExpr = 0;
+			ctx->deferredParams.PushLast(defer);
+		}
+		else
+			ReleaseTemporaryVariable(tmpExpr, &ctx->bc);
+
+		ctx->type.isLValue = false;
+
+		// Clean up arguments
+		// If application is using unsafe references, then don't clean up arguments yet because
+		// the returned value might represent a reference to one of the arguments, e.g. an integer might in truth be a pointer
+		if( args )
+			AfterFunctionCall(funcId, *args, ctx, engine->ep.allowUnsafeReferences ? true : false);
+
+		if( !engine->ep.allowUnsafeReferences )
+			ProcessDeferredParams(ctx);
+	}
+}
+
+// This only merges the bytecode, but doesn't modify the type of the final context
+void asCCompiler::MergeExprBytecode(asCExprContext *before, asCExprContext *after)
+{
+	before->bc.AddCode(&after->bc);
+
+	for( asUINT n = 0; n < after->deferredParams.GetLength(); n++ )
+	{
+		before->deferredParams.PushLast(after->deferredParams[n]);
+		after->deferredParams[n].origExpr = 0;
+	}
+
+	after->deferredParams.SetLength(0);
+}
+
+// This merges both bytecode and the type of the final context
+void asCCompiler::MergeExprBytecodeAndType(asCExprContext *before, asCExprContext *after)
+{
+	MergeExprBytecode(before, after);
+
+	before->Merge(after);
+}
+
+void asCCompiler::FilterConst(asCArray<int> &funcs, bool removeConst)
+{
+	if( funcs.GetLength() == 0 ) return;
+
+	// This is only done for object methods
+	asCScriptFunction *desc = builder->GetFunctionDescription(funcs[0]);
+	if( !desc || desc->objectType == 0 ) return;
+
+	// Check if there are any non-const matches
+	asUINT n;
+	bool foundNonConst = false;
+	for( n = 0; n < funcs.GetLength(); n++ )
+	{
+		desc = builder->GetFunctionDescription(funcs[n]);
+		if( desc && desc->IsReadOnly() != removeConst )
+		{
+			foundNonConst = true;
+			break;
+		}
+	}
+
+	if( foundNonConst )
+	{
+		// Remove all const methods
+		for( n = 0; n < funcs.GetLength(); n++ )
+		{
+			desc = builder->GetFunctionDescription(funcs[n]);
+			if( desc && desc->IsReadOnly() == removeConst )
+			{
+				if( n == funcs.GetLength() - 1 )
+					funcs.PopLast();
+				else
+					funcs[n] = funcs.PopLast();
+
+				n--;
+			}
+		}
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+asCExprValue::asCExprValue()
+{
+	isTemporary = false;
+	stackOffset = 0;
+	isConstant = false;
+	isVariable = false;
+	isExplicitHandle = false;
+	qwordValue = 0;
+	isLValue = false;
+	isRefToLocal = false;
+	isRefSafe = false;
+}
+
+void asCExprValue::Set(const asCDataType &dt)
+{
+	dataType = dt;
+
+	isTemporary = false;
+	stackOffset = 0;
+	isConstant = false;
+	isVariable = false;
+	isExplicitHandle = false;
+	qwordValue = 0;
+	isLValue = false;
+	isRefToLocal = false;
+	isRefSafe = false;
+}
+
+void asCExprValue::SetVariable(const asCDataType &in_dt, int in_stackOffset, bool in_isTemporary)
+{
+	Set(in_dt);
+
+	this->isVariable = true;
+	this->isTemporary = in_isTemporary;
+	this->stackOffset = (short)in_stackOffset;
+}
+
+void asCExprValue::SetConstantQW(const asCDataType &dt, asQWORD value)
+{
+	Set(dt);
+
+	isConstant = true;
+	SetConstantQW(value);
+}
+
+void asCExprValue::SetConstantDW(const asCDataType &dt, asDWORD value)
+{
+	Set(dt);
+
+	isConstant = true;
+	SetConstantDW(value);
+}
+
+void asCExprValue::SetConstantB(const asCDataType &dt, asBYTE value)
+{
+	Set(dt);
+
+	isConstant = true;
+	SetConstantB(value);
+}
+
+void asCExprValue::SetConstantW(const asCDataType &dt, asWORD value)
+{
+	Set(dt);
+
+	isConstant = true;
+	SetConstantW(value);
+}
+
+void asCExprValue::SetConstantF(const asCDataType &dt, float value)
+{
+	Set(dt);
+
+	isConstant = true;
+	SetConstantF(value);
+}
+
+void asCExprValue::SetConstantD(const asCDataType &dt, double value)
+{
+	Set(dt);
+
+	isConstant = true;
+	SetConstantD(value);
+}
+
+void asCExprValue::SetConstantQW(asQWORD value)
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
+	qwordValue = value;
+}
+
+void asCExprValue::SetConstantDW(asDWORD value)
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
+	dwordValue = value;
+}
+
+void asCExprValue::SetConstantW(asWORD value)
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 2);
+	wordValue = value;
+}
+
+void asCExprValue::SetConstantB(asBYTE value)
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 1);
+	byteValue = value;
+}
+
+void asCExprValue::SetConstantF(float value)
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
+	floatValue = value;
+}
+
+void asCExprValue::SetConstantD(double value)
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
+	doubleValue = value;
+}
+
+asQWORD asCExprValue::GetConstantQW()
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
+	return qwordValue;
+}
+
+asDWORD asCExprValue::GetConstantDW()
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
+	return dwordValue;
+}
+
+asWORD asCExprValue::GetConstantW()
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 2);
+	return wordValue;
+}
+
+asBYTE asCExprValue::GetConstantB()
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 1);
+	return byteValue;
+}
+
+float asCExprValue::GetConstantF()
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 4);
+	return floatValue;
+}
+
+double asCExprValue::GetConstantD()
+{
+	asASSERT(dataType.GetSizeInMemoryBytes() == 8);
+	return doubleValue;
+}
+
+void asCExprValue::SetConstantData(const asCDataType &dt, asQWORD qw)
+{
+	Set(dt);
+
+	isConstant = true;
+
+	// This code is necessary to guarantee that the code
+	// works on both big endian and little endian CPUs.
+	if (dataType.GetSizeInMemoryBytes() == 1)
+		byteValue = (asBYTE)qw;
+	if (dataType.GetSizeInMemoryBytes() == 2)
+		wordValue = (asWORD)qw;
+	if (dataType.GetSizeInMemoryBytes() == 4)
+		dwordValue = (asDWORD)qw;
+	else
+		qwordValue = qw;
+}
+
+asQWORD asCExprValue::GetConstantData()
+{
+	asQWORD qw = 0;
+	// This code is necessary to guarantee that the code
+	// works on both big endian and little endian CPUs.
+	if (dataType.GetSizeInMemoryBytes() == 1)
+		qw = byteValue;
+	if (dataType.GetSizeInMemoryBytes() == 2)
+		qw = wordValue;
+	if (dataType.GetSizeInMemoryBytes() == 4)
+		qw = dwordValue;
+	else
+		qw = qwordValue;
+	return qw;
+}
+
+void asCExprValue::SetUndefinedFuncHandle(asCScriptEngine *engine)
+{
+	// This is used for when the expression evaluates to a
+	// function, but it is not yet known exactly which. The
+	// owner expression will hold the name of the function
+	// to determine the exact function when the signature is
+	// known.
+	Set(asCDataType::CreateObjectHandle(&engine->functionBehaviours, true));
+	isConstant = true;
+	isExplicitHandle = false;
+	qwordValue = 1; // Set to a different value than 0 to differentiate from null constant
+	isLValue = false;
+}
+
+bool asCExprValue::IsUndefinedFuncHandle() const
+{
+	if (isConstant == false) return false;
+	if (qwordValue == 0) return false;
+	if (isLValue) return false;
+	if (dataType.GetTypeInfo() == 0) return false;
+	if (dataType.GetTypeInfo()->name != "$func") return false;
+	if (dataType.IsFuncdef()) return false;
+
+	return true;
+}
+
+void asCExprValue::SetNullConstant()
+{
+	Set(asCDataType::CreateNullHandle());
+	isConstant = true;
+	isExplicitHandle = false;
+	qwordValue = 0;
+	isLValue = false;
+}
+
+bool asCExprValue::IsNullConstant() const
+{
+	// We can't check the actual object type, because the null constant may have been cast to another type
+	if (isConstant && dataType.IsObjectHandle() && qwordValue == 0)
+		return true;
+
+	return false;
+}
+
+void asCExprValue::SetVoid()
+{
+	Set(asCDataType::CreatePrimitive(ttVoid, false));
+	isLValue = false;
+	isConstant = true;
+}
+
+bool asCExprValue::IsVoid() const
+{
+	if (dataType.GetTokenType() == ttVoid)
+		return true;
+
+	return false;
+}
+
+void asCExprValue::SetDummy()
+{
+	SetConstantDW(asCDataType::CreatePrimitive(ttInt, true), 0);
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+asCExprContext::asCExprContext(asCScriptEngine *engine) : bc(engine)
+{
+	property_arg = 0;
+
+	Clear();
+}
+
+asCExprContext::~asCExprContext()
+{
+	if (property_arg)
+		asDELETE(property_arg, asCExprContext);
+}
+
+void asCExprContext::Clear()
+{
+	bc.ClearAll();
+	type.Set(asCDataType());
+	deferredParams.SetLength(0);
+	if (property_arg)
+		asDELETE(property_arg, asCExprContext);
+	property_arg = 0;
+	exprNode = 0;
+	origExpr = 0;
+	property_get = 0;
+	property_set = 0;
+	property_const = false;
+	property_handle = false;
+	property_ref = false;
+	methodName = "";
+	enumValue = "";
+	symbolNamespace = 0;
+	isVoidExpression = false;
+	isCleanArg = false;
+	isAnonymousInitList = false;
+	origCode = 0;
+}
+
+bool asCExprContext::IsClassMethod() const
+{
+	if (type.dataType.GetTypeInfo() == 0) return false;
+	if (methodName == "") return false;
+	if (type.dataType.GetTypeInfo() == &type.dataType.GetTypeInfo()->engine->functionBehaviours) return false;
+	if (isAnonymousInitList) return false;
+	return true;
+}
+
+bool asCExprContext::IsGlobalFunc() const
+{
+	if (type.dataType.GetTypeInfo() == 0) return false;
+	if (methodName == "") return false;
+	if (type.dataType.GetTypeInfo() != &type.dataType.GetTypeInfo()->engine->functionBehaviours) return false;
+	if (isAnonymousInitList) return false;
+	return true;
+}
+
+void asCExprContext::SetLambda(asCScriptNode *funcDecl)
+{
+	asASSERT(funcDecl && funcDecl->nodeType == snFunction);
+	asASSERT(bc.GetLastInstr() == -1);
+
+	Clear();
+	type.SetUndefinedFuncHandle(bc.GetEngine());
+	exprNode = funcDecl;
+}
+
+bool asCExprContext::IsLambda() const
+{
+	if (type.IsUndefinedFuncHandle() && exprNode && exprNode->nodeType == snFunction)
+		return true;
+
+	return false;
+}
+
+void asCExprContext::SetVoidExpression()
+{
+	Clear();
+	type.SetVoid();
+	isVoidExpression = true;
+}
+
+bool asCExprContext::IsVoidExpression() const
+{
+	if (isVoidExpression && type.IsVoid() && exprNode == 0)
+		return true;
+
+	return false;
+}
+
+void asCExprContext::SetAnonymousInitList(asCScriptNode *initList, asCScriptCode *script)
+{
+	Clear();
+	exprNode = initList;
+	origCode = script;
+	isAnonymousInitList = true;
+}
+
+bool asCExprContext::IsAnonymousInitList() const
+{
+	if (isAnonymousInitList && exprNode && exprNode->nodeType == snInitList)
+		return true;
+
+	return false;
+}
+
+void asCExprContext::Copy(asCExprContext *other)
+{
+	type                = other->type;
+	property_get        = other->property_get;
+	property_set        = other->property_set;
+	property_const      = other->property_const;
+	property_handle     = other->property_handle;
+	property_ref        = other->property_ref;
+	property_arg        = other->property_arg;
+	exprNode            = other->exprNode;
+	methodName          = other->methodName;
+	enumValue           = other->enumValue;
+	isVoidExpression    = other->isVoidExpression;
+	isCleanArg          = other->isCleanArg;
+	isAnonymousInitList = other->isAnonymousInitList;
+	origCode            = other->origCode;
+
+	// Do not copy the origExpr member	
+}
+
+void asCExprContext::Merge(asCExprContext *after)
+{
+	// Overwrite properties with the expression that comes after
+	Copy(after);
+
+	// Clean the properties in 'after' that have now moved into 
+	// this structure so they are not cleaned up accidentally
+	after->property_arg = 0;
+}
+
+
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
+
+
diff --git a/Sources/AngelScript/source/as_compiler.h b/Sources/AngelScript/source/as_compiler.h
old mode 100755
new mode 100644
index 69f55b564..4b7ad5523
--- a/Sources/AngelScript/source/as_compiler.h
+++ b/Sources/AngelScript/source/as_compiler.h
@@ -1,400 +1,442 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_compiler.h
-//
-// The class that does the actual compilation of the functions
-//
-
-
-
-#ifndef AS_COMPILER_H
-#define AS_COMPILER_H
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_builder.h"
-#include "as_scriptfunction.h"
-#include "as_variablescope.h"
-#include "as_bytecode.h"
-#include "as_array.h"
-#include "as_datatype.h"
-
-BEGIN_AS_NAMESPACE
-
-// This class represents the value of an expression as evaluated by the compiler.
-// It holds information such as the type of the value, stack offset for a local 
-// variable, value of constants, whether the value can be modified (i.e. lvalue), etc.
-struct asCExprValue
-{
-	asCExprValue();
-	void Set(const asCDataType &dataType);
-
-	void SetVariable(const asCDataType &dataType, int stackOffset, bool isTemporary);
-	void SetConstantB(const asCDataType &dataType, asBYTE value);
-	void SetConstantQW(const asCDataType &dataType, asQWORD value);
-	void SetConstantDW(const asCDataType &dataType, asDWORD value);
-	void SetConstantW(const asCDataType &dataType, asWORD value);
-	void SetConstantF(const asCDataType &dataType, float value);
-	void SetConstantD(const asCDataType &dataType, double value);
-	void SetConstantB(asBYTE value);
-	void SetConstantW(asWORD value);
-	void SetConstantQW(asQWORD value);
-	void SetConstantDW(asDWORD value);
-	void SetConstantF(float value);
-	void SetConstantD(double value);
-	asBYTE  GetConstantB();
-	asWORD  GetConstantW();
-	asQWORD GetConstantQW();
-	asDWORD GetConstantDW();
-	float   GetConstantF();
-	double  GetConstantD();
-
-	void SetConstantData(const asCDataType &dataType, asQWORD value);
-	asQWORD GetConstantData();
-
-	void SetNullConstant();
-	void SetUndefinedFuncHandle(asCScriptEngine *engine);
-	void SetVoid();
-	void SetDummy();
-
-	bool IsUndefinedFuncHandle() const;
-	bool IsNullConstant() const;
-	bool IsVoid() const;
-
-	asCDataType dataType;
-	bool  isLValue : 1; // Can this value be updated in assignment, or increment operators, etc
-	bool  isTemporary : 1;
-	bool  isConstant : 1;
-	bool  isVariable : 1;
-	bool  isExplicitHandle : 1;
-	bool  isRefToLocal : 1; // The reference may be to a local variable
-	short dummy : 10;
-	short stackOffset;
-
-private:
-	// These values must not be accessed directly, in order to avoid problems with endianess. 
-	// Use the appropriate accessor methods instead
-	union
-	{
-		asQWORD qwordValue;
-		double  doubleValue;
-		asDWORD dwordValue;
-		float   floatValue;
-		asWORD  wordValue;
-		asBYTE  byteValue;
-	};
-};
-
-struct asCExprContext;
-
-// This class holds information for arguments that needs to be 
-// cleaned up after the result of a function has been evaluated.
-struct asSDeferredParam
-{
-	asSDeferredParam() {argNode = 0; origExpr = 0;}
-
-	asCScriptNode  *argNode;
-	asCExprValue    argType;
-	int             argInOutFlags;
-	asCExprContext *origExpr;
-};
-
-// TODO: refactor: asCExprContext should have indicators to inform where the value is, 
-//                 i.e. if the reference to an object is pushed on the stack or not, etc
-
-// This class holds information about an expression that is being evaluated, e.g.
-// the current bytecode, ambiguous symbol names, property accessors, etc.
-struct asCExprContext
-{
-	asCExprContext(asCScriptEngine *engine);
-	~asCExprContext();
-	void Clear();
-	bool IsClassMethod() const;
-	bool IsGlobalFunc() const;
-	void SetLambda(asCScriptNode *funcDecl);
-	bool IsLambda() const;
-	void SetVoidExpression();
-	bool IsVoidExpression() const;
-	void Merge(asCExprContext *after);
-
-	asCByteCode bc;
-	asCExprValue type;
-	int  property_get;
-	int  property_set;
-	bool property_const;   // If the object that is being accessed through property accessor is read-only
-	bool property_handle;  // If the property accessor is called on an object stored in a handle
-	bool property_ref;     // If the property accessor is called on a reference
-	bool isVoidExpression; // Set to true if the expression is an explicit 'void', e.g. used to ignore out parameters in func calls
-	bool isCleanArg;       // Set to true if the expression has only been initialized with default constructor
-	asCExprContext *property_arg;
-	asCArray<asSDeferredParam> deferredParams;
-	asCScriptNode  *exprNode;
-	asCExprContext *origExpr;
-	// TODO: cleanup: use ambiguousName and an enum to say if it is a method, global func, or enum value
-	asCString methodName;
-	asCString enumValue;
-};
-
-struct asSOverloadCandidate
-{
-	asSOverloadCandidate() : funcId(0), cost(0) {}
-	asSOverloadCandidate(int _id, asUINT _cost) : funcId(_id), cost(_cost) {}
-	int funcId;
-	asUINT cost;
-};
-
-struct asSNamedArgument
-{
-	asCString name;
-	asCExprContext *ctx;
-	asUINT match;
-};
-
-enum EImplicitConv
-{
-	asIC_IMPLICIT_CONV,
-	asIC_EXPLICIT_REF_CAST,
-	asIC_EXPLICIT_VAL_CAST
-};
-
-enum EConvCost
-{
-	asCC_NO_CONV               = 0,
-	asCC_CONST_CONV            = 1,
-	asCC_ENUM_SAME_SIZE_CONV   = 2,
-	asCC_ENUM_DIFF_SIZE_CONV   = 3,
-	asCC_PRIMITIVE_SIZE_CONV   = 4,
-	asCC_SIGNED_CONV           = 5,
-	asCC_INT_FLOAT_CONV        = 6,
-	asCC_REF_CONV              = 7,
-	asCC_OBJ_TO_PRIMITIVE_CONV = 8,
-	asCC_TO_OBJECT_CONV        = 9,
-	asCC_VARIABLE_CONV         = 10
-};
-
-class asCCompiler
-{
-public:
-	asCCompiler(asCScriptEngine *engine);
-	~asCCompiler();
-
-	int CompileFunction(asCBuilder *builder, asCScriptCode *script, asCArray<asCString> &parameterNames, asCScriptNode *func, asCScriptFunction *outFunc, sClassDeclaration *classDecl);
-	int CompileDefaultConstructor(asCBuilder *builder, asCScriptCode *script, asCScriptNode *node, asCScriptFunction *outFunc, sClassDeclaration *classDecl);
-	int CompileFactory(asCBuilder *builder, asCScriptCode *script, asCScriptFunction *outFunc);
-	int CompileGlobalVariable(asCBuilder *builder, asCScriptCode *script, asCScriptNode *expr, sGlobalVariableDescription *gvar, asCScriptFunction *outFunc);
-
-protected:
-	friend class asCBuilder;
-
-	void Reset(asCBuilder *builder, asCScriptCode *script, asCScriptFunction *outFunc);
-
-	// Statements
-	void CompileStatementBlock(asCScriptNode *block, bool ownVariableScope, bool *hasReturn, asCByteCode *bc);
-	void CompileDeclaration(asCScriptNode *decl, asCByteCode *bc);
-	void CompileStatement(asCScriptNode *statement, bool *hasReturn, asCByteCode *bc);
-	void CompileIfStatement(asCScriptNode *node, bool *hasReturn, asCByteCode *bc);
-	void CompileSwitchStatement(asCScriptNode *node, bool *hasReturn, asCByteCode *bc);
-	void CompileCase(asCScriptNode *node, asCByteCode *bc);
-	void CompileForStatement(asCScriptNode *node, asCByteCode *bc);
-	void CompileWhileStatement(asCScriptNode *node, asCByteCode *bc);
-	void CompileDoWhileStatement(asCScriptNode *node, asCByteCode *bc);
-	void CompileBreakStatement(asCScriptNode *node, asCByteCode *bc);
-	void CompileContinueStatement(asCScriptNode *node, asCByteCode *bc);
-	void CompileReturnStatement(asCScriptNode *node, asCByteCode *bc);
-	void CompileExpressionStatement(asCScriptNode *node, asCByteCode *bc);
-
-	// Expressions
-	int  CompileAssignment(asCScriptNode *expr, asCExprContext *out);
-	int  CompileCondition(asCScriptNode *expr, asCExprContext *out);
-	int  CompileExpression(asCScriptNode *expr, asCExprContext *out);
-	int  CompilePostFixExpression(asCArray<asCScriptNode *> *postfix, asCExprContext *out);
-	int  CompileExpressionTerm(asCScriptNode *node, asCExprContext *out);
-	int  CompileExpressionPreOp(asCScriptNode *node, asCExprContext *out);
-	int  CompileExpressionPostOp(asCScriptNode *node, asCExprContext *out);
-	int  CompileExpressionValue(asCScriptNode *node, asCExprContext *out);
-	int  CompileFunctionCall(asCScriptNode *node, asCExprContext *out, asCObjectType *objectType, bool objIsConst, const asCString &scope = "");
-	int  CompileConstructCall(asCScriptNode *node, asCExprContext *out);
-	int  CompileConversion(asCScriptNode *node, asCExprContext *out);
-	int  CompileOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
-	void CompileOperatorOnHandles(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
-	void CompileMathOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
-	void CompileBitwiseOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
-	void CompileComparisonOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
-	void CompileBooleanOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
-	bool CompileOverloadedDualOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, bool isHandle = false, eTokenType opToken = ttUnrecognizedToken);
-	int  CompileOverloadedDualOperator2(asCScriptNode *node, const char *methodName, asCExprContext *l, asCExprContext *r, asCExprContext *out, bool specificReturn = false, const asCDataType &returnType = asCDataType::CreatePrimitive(ttVoid, false));
-
-	void CompileInitList(asCExprValue *var, asCScriptNode *node, asCByteCode *bc, int isVarGlobOrMem);
-	int  CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &byteCode, int &elementsInSubList);
-
-	int  CallDefaultConstructor(const asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem = 0, bool derefDest = false);
-	int  CallCopyConstructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool isGlobalVar = false, bool derefDestination = false);
-	void CallDestructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc);
-	int  CompileArgumentList(asCScriptNode *node, asCArray<asCExprContext *> &args, asCArray<asSNamedArgument> &namedArgs);
-	int  CompileDefaultAndNamedArgs(asCScriptNode *node, asCArray<asCExprContext*> &args, int funcId, asCObjectType *type, asCArray<asSNamedArgument> *namedArgs = 0);
-	asUINT MatchFunctions(asCArray<int> &funcs, asCArray<asCExprContext*> &args, asCScriptNode *node, const char *name, asCArray<asSNamedArgument> *namedArgs = NULL, asCObjectType *objectType = NULL, bool isConstMethod = false, bool silent = false, bool allowObjectConstruct = true, const asCString &scope = "");
-	int  CompileVariableAccess(const asCString &name, const asCString &scope, asCExprContext *ctx, asCScriptNode *errNode, bool isOptional = false, bool noFunction = false, bool noGlobal = false, asCObjectType *objType = 0);
-	void CompileMemberInitialization(asCByteCode *bc, bool onlyDefaults);
-	bool CompileAutoType(asCDataType &autoType, asCExprContext &compiledCtx, asCScriptNode *exprNode, asCScriptNode *errNode);
-	bool CompileInitialization(asCScriptNode *node, asCByteCode *bc, asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem, asCExprContext *preCompiled = 0);
-	void CompileInitAsCopy(asCDataType &type, int offset, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool derefDestination);
-
-	// Helper functions
-	void ConvertToPostFix(asCScriptNode *expr, asCArray<asCScriptNode *> &postfix);
-	void ProcessPropertyGetAccessor(asCExprContext *ctx, asCScriptNode *node);
-	int  ProcessPropertySetAccessor(asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node);
-	int  ProcessPropertyGetSetAccessor(asCExprContext *ctx, asCExprContext *lctx, asCExprContext *rctx, eTokenType op, asCScriptNode *errNode);
-	int  FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess = false);
-	int  FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess = false);
-	void PrepareTemporaryVariable(asCScriptNode *node, asCExprContext *ctx, bool forceOnHeap = false);
-	void PrepareOperand(asCExprContext *ctx, asCScriptNode *node);
-	void PrepareForAssignment(asCDataType *lvalue, asCExprContext *rvalue, asCScriptNode *node, bool toTemporary, asCExprContext *lvalueExpr = 0);
-	int  PerformAssignment(asCExprValue *lvalue, asCExprValue *rvalue, asCByteCode *bc, asCScriptNode *node);
-	bool IsVariableInitialized(asCExprValue *type, asCScriptNode *node);
-	void Dereference(asCExprContext *ctx, bool generateCode);
-	bool CompileRefCast(asCExprContext *ctx, const asCDataType &to, bool isExplicit, asCScriptNode *node, bool generateCode = true);
-	asUINT MatchArgument(asCArray<int> &funcs, asCArray<asSOverloadCandidate> &matches, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct = true);
-	int  MatchArgument(asCScriptFunction *desc, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct = true);
-	void PerformFunctionCall(int funcId, asCExprContext *out, bool isConstructor = false, asCArray<asCExprContext*> *args = 0, asCObjectType *objTypeForConstruct = 0, bool useVariable = false, int varOffset = 0, int funcPtrVar = 0);
-	void MoveArgsToStack(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args, bool addOneToOffset);
-	void MakeFunctionCall(asCExprContext *ctx, int funcId, asCObjectType *objectType, asCArray<asCExprContext*> &args, asCScriptNode *node, bool useVariable = false, int stackOffset = 0, int funcPtrVar = 0);
-	void PrepareFunctionCall(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args);
-	void AfterFunctionCall(int funcId, asCArray<asCExprContext*> &args, asCExprContext *ctx, bool deferAll);
-	void ProcessDeferredParams(asCExprContext *ctx);
-	int  PrepareArgument(asCDataType *paramType, asCExprContext *ctx, asCScriptNode *node, bool isFunction = false, int refType = 0, bool isMakingCopy = false);
-	void PrepareArgument2(asCExprContext *ctx, asCExprContext *arg, asCDataType *paramType, bool isFunction = false, int refType = 0, bool isMakingCopy = false);
-	bool IsLValue(asCExprValue &type);
-	int  DoAssignment(asCExprContext *out, asCExprContext *lctx, asCExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, eTokenType op, asCScriptNode *opNode);
-	void MergeExprBytecode(asCExprContext *before, asCExprContext *after);
-	void MergeExprBytecodeAndType(asCExprContext *before, asCExprContext *after);
-	void FilterConst(asCArray<int> &funcs, bool removeConst = true);
-	void ConvertToVariable(asCExprContext *ctx);
-	void ConvertToVariableNotIn(asCExprContext *ctx, asCExprContext *exclude);
-	void ConvertToTempVariable(asCExprContext *ctx);
-	void ConvertToTempVariableNotIn(asCExprContext *ctx, asCExprContext *exclude);
-	void ConvertToReference(asCExprContext *ctx);
-	void PushVariableOnStack(asCExprContext *ctx, bool asReference);
-	void DestroyVariables(asCByteCode *bc);
-	asSNameSpace *DetermineNameSpace(const asCString &scope);
-	int  SetupParametersAndReturnVariable(asCArray<asCString> &parameterNames, asCScriptNode *func);
-
-	void DetermineSingleFunc(asCExprContext *ctx, asCScriptNode *node);
-
-	// Returns the cost of the conversion (the sum of the EConvCost performed)
-	asUINT ImplicitConversion(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true, bool allowObjectConstruct = true);
-	asUINT ImplicitConvPrimitiveToPrimitive(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true);
-	asUINT ImplicitConvObjectToPrimitive(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true);
-	asUINT ImplicitConvPrimitiveToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true, bool allowObjectConstruct = true);
-	asUINT ImplicitConvObjectToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true, bool allowObjectConstruct = true);
-	asUINT ImplicitConvObjectRef(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode);
-	asUINT ImplicitConvObjectValue(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode);
-	void   ImplicitConversionConstant(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType);
-	void   ImplicitConvObjectToBestMathType(asCExprContext *ctx, asCScriptNode *node);
-	asUINT ImplicitConvLambdaToFunc(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true);
-
-	void LineInstr(asCByteCode *bc, size_t pos);
-
-	asUINT ProcessStringConstant(asCString &str, asCScriptNode *node, bool processEscapeSequences = true);
-	void ProcessHeredocStringConstant(asCString &str, asCScriptNode *node);
-	int  GetPrecedence(asCScriptNode *op);
-	void Error(const asCString &msg, asCScriptNode *node);
-	void Warning(const asCString &msg, asCScriptNode *node);
-	void Information(const asCString &msg, asCScriptNode *node);
-	void PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node, asCObjectType *inType = 0);
-	void AddVariableScope(bool isBreakScope = false, bool isContinueScope = false);
-	void RemoveVariableScope();
-	void FinalizeFunction();
-
-	asCByteCode byteCode;
-
-	bool hasCompileErrors;
-
-	int nextLabel;
-	int numLambdas;
-
-	asCVariableScope  *variables;
-	asCBuilder        *builder;
-	asCScriptEngine   *engine;
-	asCScriptCode     *script;
-	asCScriptFunction *outFunc;
-
-	bool                        m_isConstructor;
-	bool                        m_isConstructorCalled;
-	sClassDeclaration          *m_classDecl;
-	sGlobalVariableDescription *m_globalVar;
-
-	asCArray<int> breakLabels;
-	asCArray<int> continueLabels;
-
-	int AllocateVariable(const asCDataType &type, bool isTemporary, bool forceOnHeap = false);
-	int AllocateVariableNotIn(const asCDataType &type, bool isTemporary, bool forceOnHeap, asCExprContext *ctx);
-	int GetVariableOffset(int varIndex);
-	int GetVariableSlot(int varOffset);
-	void DeallocateVariable(int pos);
-	void ReleaseTemporaryVariable(asCExprValue &t, asCByteCode *bc);
-	void ReleaseTemporaryVariable(int offset, asCByteCode *bc);
-	bool IsVariableOnHeap(int offset);
-
-	// This ordered array indicates the type of each variable
-	asCArray<asCDataType> variableAllocations;
-
-	// This ordered array indicates which variables are temporaries or not
-	asCArray<bool>        variableIsTemporary;
-
-	// This unordered array gives the offsets of all temporary variables, whether currently allocated or not
-	asCArray<int>         tempVariableOffsets;
-
-	// This ordered array indicated if the variable is on the heap or not
-	asCArray<bool>        variableIsOnHeap;
-
-	// This unordered array gives the indexes of the currently unused variables
-	asCArray<int>         freeVariables;
-
-	// This array holds the offsets of the currently allocated temporary variables
-	asCArray<int>         tempVariables; 
-
-	// This array holds the indices of variables that must not be used in an allocation
-	asCArray<int>         reservedVariables;
-
-	bool isCompilingDefaultArg;
-	bool isProcessingDeferredParams;
-	int  noCodeOutput;
-};
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_compiler.h
+//
+// The class that does the actual compilation of the functions
+//
+
+
+
+#ifndef AS_COMPILER_H
+#define AS_COMPILER_H
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_builder.h"
+#include "as_scriptfunction.h"
+#include "as_variablescope.h"
+#include "as_bytecode.h"
+#include "as_array.h"
+#include "as_datatype.h"
+
+BEGIN_AS_NAMESPACE
+
+// This class represents the value of an expression as evaluated by the compiler.
+// It holds information such as the type of the value, stack offset for a local 
+// variable, value of constants, whether the value can be modified (i.e. lvalue), etc.
+struct asCExprValue
+{
+	asCExprValue();
+	void Set(const asCDataType &dataType);
+
+	void SetVariable(const asCDataType &dataType, int stackOffset, bool isTemporary);
+	void SetConstantB(const asCDataType &dataType, asBYTE value);
+	void SetConstantQW(const asCDataType &dataType, asQWORD value);
+	void SetConstantDW(const asCDataType &dataType, asDWORD value);
+	void SetConstantW(const asCDataType &dataType, asWORD value);
+	void SetConstantF(const asCDataType &dataType, float value);
+	void SetConstantD(const asCDataType &dataType, double value);
+	void SetConstantB(asBYTE value);
+	void SetConstantW(asWORD value);
+	void SetConstantQW(asQWORD value);
+	void SetConstantDW(asDWORD value);
+	void SetConstantF(float value);
+	void SetConstantD(double value);
+	asBYTE  GetConstantB();
+	asWORD  GetConstantW();
+	asQWORD GetConstantQW();
+	asDWORD GetConstantDW();
+	float   GetConstantF();
+	double  GetConstantD();
+
+	void SetConstantData(const asCDataType &dataType, asQWORD value);
+	asQWORD GetConstantData();
+
+	void SetNullConstant();
+	void SetUndefinedFuncHandle(asCScriptEngine *engine);
+	void SetVoid();
+	void SetDummy();
+
+	bool IsUndefinedFuncHandle() const;
+	bool IsNullConstant() const;
+	bool IsVoid() const;
+
+	asCDataType dataType;
+	bool  isLValue : 1; // Can this value be updated in assignment, or increment operators, etc
+	bool  isTemporary : 1;
+	bool  isConstant : 1;
+	bool  isVariable : 1;
+	bool  isExplicitHandle : 1;
+	bool  isRefToLocal : 1; // The reference may be to a local variable
+	bool  isRefSafe : 1; // the life-time of the ref is guaranteed for the duration of the access
+	short dummy : 9;
+	int   stackOffset; // used both for stack offset and indexing global variables
+
+private:
+	// These values must not be accessed directly in order to avoid problems with endianess. 
+	// Use the appropriate accessor methods instead
+	union
+	{
+		asQWORD qwordValue;
+		double  doubleValue;
+		asDWORD dwordValue;
+		float   floatValue;
+		asWORD  wordValue;
+		asBYTE  byteValue;
+	};
+};
+
+struct asCExprContext;
+
+// This class holds information for arguments that needs to be 
+// cleaned up after the result of a function has been evaluated.
+struct asSDeferredParam
+{
+	asSDeferredParam() {argNode = 0; origExpr = 0;}
+
+	asCScriptNode  *argNode;
+	asCExprValue    argType;
+	int             argInOutFlags;
+	asCExprContext *origExpr;
+};
+
+// TODO: refactor: asCExprContext should have indicators to inform where the value is, 
+//                 i.e. if the reference to an object is pushed on the stack or not, etc
+
+// This class holds information about an expression that is being evaluated, e.g.
+// the current bytecode, ambiguous symbol names, property accessors, etc.
+struct asCExprContext
+{
+	asCExprContext(asCScriptEngine *engine);
+	~asCExprContext();
+	void Clear();
+	bool IsClassMethod() const;
+	bool IsGlobalFunc() const;
+	void SetLambda(asCScriptNode *funcDecl);
+	bool IsLambda() const;
+	void SetVoidExpression();
+	bool IsVoidExpression() const;
+	void Merge(asCExprContext *after);
+	void Copy(asCExprContext *other);
+	void SetAnonymousInitList(asCScriptNode *initList, asCScriptCode *script);
+	bool IsAnonymousInitList() const;
+
+	asCByteCode bc;
+	asCExprValue type;
+	int  property_get;
+	int  property_set;
+	bool property_const;   // If the object that is being accessed through property accessor is read-only
+	bool property_handle;  // If the property accessor is called on an object stored in a handle
+	bool property_ref;     // If the property accessor is called on a reference
+	bool isVoidExpression; // Set to true if the expression is an explicit 'void', e.g. used to ignore out parameters in func calls
+	bool isCleanArg;       // Set to true if the expression has only been initialized with default constructor
+	asCExprContext *property_arg;
+	asCArray<asSDeferredParam> deferredParams;
+	asCScriptNode  *exprNode;
+	asCExprContext *origExpr;
+	asCScriptCode *origCode;
+	// TODO: cleanup: use ambiguousName and an enum to say if it is a method, global func, or enum value
+	asCString methodName;
+	asCString enumValue;
+	asSNameSpace *symbolNamespace; // The namespace in which the ambiguous symbol was found
+	bool isAnonymousInitList; // Set to true if the expression is an init list for which the type has not yet been determined
+};
+
+struct asSOverloadCandidate
+{
+	asSOverloadCandidate() : funcId(0), cost(0) {}
+	asSOverloadCandidate(int _id, asUINT _cost) : funcId(_id), cost(_cost) {}
+	int funcId;
+	asUINT cost;
+};
+
+struct asSNamedArgument
+{
+	asCString name;
+	asCExprContext *ctx;
+	asUINT match;
+};
+
+enum EImplicitConv
+{
+	asIC_IMPLICIT_CONV,
+	asIC_EXPLICIT_REF_CAST,
+	asIC_EXPLICIT_VAL_CAST
+};
+
+enum EConvCost
+{
+	asCC_NO_CONV                  = 0,
+	asCC_CONST_CONV               = 1,
+	asCC_ENUM_SAME_SIZE_CONV      = 2,
+	asCC_ENUM_DIFF_SIZE_CONV      = 3,
+	asCC_PRIMITIVE_SIZE_UP_CONV   = 4,
+	asCC_PRIMITIVE_SIZE_DOWN_CONV = 5,
+	asCC_SIGNED_TO_UNSIGNED_CONV  = 5,
+	asCC_UNSIGNED_TO_SIGNED_CONV  = 6,
+	asCC_INT_TO_FLOAT_CONV        = 7,
+	asCC_FLOAT_TO_INT_CONV        = 8,
+	asCC_REF_CONV                 = 9,
+	asCC_OBJ_TO_PRIMITIVE_CONV    = 10,
+	asCC_TO_OBJECT_CONV           = 11,
+	asCC_VARIABLE_CONV            = 12
+};
+
+class asCCompiler
+{
+public:
+	asCCompiler(asCScriptEngine *engine);
+	~asCCompiler();
+
+	int CompileFunction(asCBuilder *builder, asCScriptCode *script, asCArray<asCString> &parameterNames, asCScriptNode *func, asCScriptFunction *outFunc, sClassDeclaration *classDecl);
+	int CompileDefaultConstructor(asCBuilder *builder, asCScriptCode *script, asCScriptNode *node, asCScriptFunction *outFunc, sClassDeclaration *classDecl);
+	int CompileFactory(asCBuilder *builder, asCScriptCode *script, asCScriptFunction *outFunc);
+	int CompileGlobalVariable(asCBuilder *builder, asCScriptCode *script, asCScriptNode *expr, sGlobalVariableDescription *gvar, asCScriptFunction *outFunc);
+
+protected:
+	friend class asCBuilder;
+
+	void Reset(asCBuilder *builder, asCScriptCode *script, asCScriptFunction *outFunc);
+
+	// Statements
+	void CompileStatementBlock(asCScriptNode *block, bool ownVariableScope, bool *hasReturn, asCByteCode *bc);
+	void CompileDeclaration(asCScriptNode *decl, asCByteCode *bc);
+	void CompileStatement(asCScriptNode *statement, bool *hasReturn, asCByteCode *bc);
+	void CompileIfStatement(asCScriptNode *node, bool *hasReturn, asCByteCode *bc);
+	void CompileSwitchStatement(asCScriptNode *node, bool *hasReturn, asCByteCode *bc);
+	void CompileCase(asCScriptNode *node, asCByteCode *bc);
+	void CompileForStatement(asCScriptNode *node, asCByteCode *bc);
+	void CompileWhileStatement(asCScriptNode *node, asCByteCode *bc);
+	void CompileDoWhileStatement(asCScriptNode *node, asCByteCode *bc);
+	void CompileBreakStatement(asCScriptNode *node, asCByteCode *bc);
+	void CompileContinueStatement(asCScriptNode *node, asCByteCode *bc);
+	void CompileReturnStatement(asCScriptNode *node, asCByteCode *bc);
+	void CompileExpressionStatement(asCScriptNode *node, asCByteCode *bc);
+	void CompileTryCatch(asCScriptNode *node, bool *hasReturn, asCByteCode *bc);
+
+	// Expressions
+	int  CompileAssignment(asCScriptNode *expr, asCExprContext *out);
+	int  CompileCondition(asCScriptNode *expr, asCExprContext *out);
+	int  CompileExpression(asCScriptNode *expr, asCExprContext *out);
+	int  CompilePostFixExpression(asCArray<asCScriptNode *> *postfix, asCExprContext *out);
+	int  CompileExpressionTerm(asCScriptNode *node, asCExprContext *out);
+	int  CompileExpressionPreOp(asCScriptNode *node, asCExprContext *out);
+	int  CompileExpressionPostOp(asCScriptNode *node, asCExprContext *out);
+	int  CompileExpressionValue(asCScriptNode *node, asCExprContext *out);
+	int  CompileFunctionCall(asCScriptNode *node, asCExprContext *out, asCObjectType *objectType, bool objIsConst, const asCString &scope = "");
+	int  CompileConstructCall(asCScriptNode *node, asCExprContext *out);
+	int  CompileConversion(asCScriptNode *node, asCExprContext *out);
+	int  CompileOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken, bool leftToRight = true);
+	void CompileOperatorOnHandles(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileMathOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileBitwiseOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileComparisonOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	void CompileBooleanOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, asCExprContext *out, eTokenType opToken = ttUnrecognizedToken);
+	bool CompileOverloadedDualOperator(asCScriptNode *node, asCExprContext *l, asCExprContext *r, bool leftToRight, asCExprContext *out, bool isHandle = false, eTokenType opToken = ttUnrecognizedToken);
+	int  CompileOverloadedDualOperator2(asCScriptNode *node, const char *methodName, asCExprContext *l, asCExprContext *r, bool leftToRight, asCExprContext *out, bool specificReturn = false, const asCDataType &returnType = asCDataType::CreatePrimitive(ttVoid, false));
+
+	void CompileInitList(asCExprValue *var, asCScriptNode *node, asCByteCode *bc, int isVarGlobOrMem);
+	int  CompileInitListElement(asSListPatternNode *&patternNode, asCScriptNode *&valueNode, int bufferTypeId, short bufferVar, asUINT &bufferSize, asCByteCode &byteCode, int &elementsInSubList);
+	int  CompileAnonymousInitList(asCScriptNode *listNode, asCExprContext *ctx, const asCDataType &dt);
+
+	int  CallDefaultConstructor(const asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCScriptNode *node, int isVarGlobOrMem = 0, bool derefDest = false);
+	int  CallCopyConstructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool isGlobalVar = false, bool derefDestination = false);
+	void CallDestructor(asCDataType &type, int offset, bool isObjectOnHeap, asCByteCode *bc);
+	int  CompileArgumentList(asCScriptNode *node, asCArray<asCExprContext *> &args, asCArray<asSNamedArgument> &namedArgs);
+	int  CompileDefaultAndNamedArgs(asCScriptNode *node, asCArray<asCExprContext*> &args, int funcId, asCObjectType *type, asCArray<asSNamedArgument> *namedArgs = 0);
+	asUINT MatchFunctions(asCArray<int> &funcs, asCArray<asCExprContext*> &args, asCScriptNode *node, const char *name, asCArray<asSNamedArgument> *namedArgs = NULL, asCObjectType *objectType = NULL, bool isConstMethod = false, bool silent = false, bool allowObjectConstruct = true, const asCString &scope = "");
+	int  CompileVariableAccess(const asCString &name, const asCString &scope, asCExprContext *ctx, asCScriptNode *errNode, bool isOptional = false, asCObjectType *objType = 0);
+	void CompileMemberInitialization(asCByteCode *bc, bool onlyDefaults);
+	bool CompileAutoType(asCDataType &autoType, asCExprContext &compiledCtx, asCScriptNode *exprNode, asCScriptNode *errNode);
+	bool CompileInitialization(asCScriptNode *node, asCByteCode *bc, const asCDataType &type, asCScriptNode *errNode, int offset, asQWORD *constantValue, int isVarGlobOrMem, asCExprContext *preCompiled = 0);
+	void CompileInitAsCopy(asCDataType &type, int offset, asCByteCode *bc, asCExprContext *arg, asCScriptNode *node, bool derefDestination);
+
+	// Helper functions
+	void ConvertToPostFix(asCScriptNode *expr, asCArray<asCScriptNode *> &postfix);
+	int  ProcessPropertyGetAccessor(asCExprContext *ctx, asCScriptNode *node);
+	int  ProcessPropertySetAccessor(asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node);
+	int  ProcessPropertyGetSetAccessor(asCExprContext *ctx, asCExprContext *lctx, asCExprContext *rctx, eTokenType op, asCScriptNode *errNode);
+	int  FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess = false);
+	int  FindPropertyAccessor(const asCString &name, asCExprContext *ctx, asCExprContext *arg, asCScriptNode *node, asSNameSpace *ns, bool isThisAccess = false);
+	void PrepareTemporaryVariable(asCScriptNode *node, asCExprContext *ctx, bool forceOnHeap = false);
+	void PrepareOperand(asCExprContext *ctx, asCScriptNode *node);
+	void PrepareForAssignment(asCDataType *lvalue, asCExprContext *rvalue, asCScriptNode *node, bool toTemporary, asCExprContext *lvalueExpr = 0);
+	int  PerformAssignment(asCExprValue *lvalue, asCExprValue *rvalue, asCByteCode *bc, asCScriptNode *node);
+	bool IsVariableInitialized(asCExprValue *type, asCScriptNode *node);
+	void Dereference(asCExprContext *ctx, bool generateCode);
+	bool CompileRefCast(asCExprContext *ctx, const asCDataType &to, bool isExplicit, asCScriptNode *node, bool generateCode = true);
+	asUINT MatchArgument(asCArray<int> &funcs, asCArray<asSOverloadCandidate> &matches, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct = true);
+	int  MatchArgument(asCScriptFunction *desc, const asCExprContext *argExpr, int paramNum, bool allowObjectConstruct = true);
+	void PerformFunctionCall(int funcId, asCExprContext *out, bool isConstructor = false, asCArray<asCExprContext*> *args = 0, asCObjectType *objTypeForConstruct = 0, bool useVariable = false, int varOffset = 0, int funcPtrVar = 0);
+	void MoveArgsToStack(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args, bool addOneToOffset);
+	int  MakeFunctionCall(asCExprContext *ctx, int funcId, asCObjectType *objectType, asCArray<asCExprContext*> &args, asCScriptNode *node, bool useVariable = false, int stackOffset = 0, int funcPtrVar = 0);
+	int  PrepareFunctionCall(int funcId, asCByteCode *bc, asCArray<asCExprContext *> &args);
+	void AfterFunctionCall(int funcId, asCArray<asCExprContext*> &args, asCExprContext *ctx, bool deferAll);
+	void ProcessDeferredParams(asCExprContext *ctx);
+	int  PrepareArgument(asCDataType *paramType, asCExprContext *ctx, asCScriptNode *node, bool isFunction = false, int refType = 0, bool isMakingCopy = false);
+	int  PrepareArgument2(asCExprContext *ctx, asCExprContext *arg, asCDataType *paramType, bool isFunction = false, int refType = 0, bool isMakingCopy = false);
+	bool IsLValue(asCExprValue &type);
+	int  DoAssignment(asCExprContext *out, asCExprContext *lctx, asCExprContext *rctx, asCScriptNode *lexpr, asCScriptNode *rexpr, eTokenType op, asCScriptNode *opNode);
+	void MergeExprBytecode(asCExprContext *before, asCExprContext *after);
+	void MergeExprBytecodeAndType(asCExprContext *before, asCExprContext *after);
+	void FilterConst(asCArray<int> &funcs, bool removeConst = true);
+	void ConvertToVariable(asCExprContext *ctx);
+	void ConvertToVariableNotIn(asCExprContext *ctx, asCExprContext *exclude);
+	void ConvertToTempVariable(asCExprContext *ctx);
+	void ConvertToTempVariableNotIn(asCExprContext *ctx, asCExprContext *exclude);
+	void ConvertToReference(asCExprContext *ctx);
+	void PushVariableOnStack(asCExprContext *ctx, bool asReference);
+	void DestroyVariables(asCByteCode *bc);
+	asSNameSpace *DetermineNameSpace(const asCString &scope);
+	int  SetupParametersAndReturnVariable(asCArray<asCString> &parameterNames, asCScriptNode *func);
+
+	enum SYMBOLTYPE
+	{
+		SL_NOMATCH,
+		SL_LOCALCONST,
+		SL_LOCALVAR,
+		SL_THISPTR,
+		SL_CLASSPROPACCESS,
+		SL_CLASSPROP,
+		SL_CLASSMETHOD,
+		SL_CLASSTYPE,
+		SL_GLOBALPROPACCESS,
+		SL_GLOBALCONST,
+		SL_GLOBALVAR,
+		SL_GLOBALFUNC,
+		SL_GLOBALTYPE,
+		SL_ENUMVAL,
+		SL_ERROR = -1
+	};
+
+	SYMBOLTYPE SymbolLookup(const asCString &name, const asCString &scope, asCObjectType *objType, asCExprContext *outResult);
+	SYMBOLTYPE SymbolLookupLocalVar(const asCString &name, asCExprContext *outResult);
+	SYMBOLTYPE SymbolLookupMember(const asCString &name, asCObjectType *objType, asCExprContext *outResult);
+
+	void DetermineSingleFunc(asCExprContext *ctx, asCScriptNode *node);
+
+	// Returns the cost of the conversion (the sum of the EConvCost performed)
+	asUINT ImplicitConversion(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true, bool allowObjectConstruct = true);
+	asUINT ImplicitConvPrimitiveToPrimitive(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true);
+	asUINT ImplicitConvObjectToPrimitive(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true);
+	asUINT ImplicitConvPrimitiveToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true, bool allowObjectConstruct = true);
+	asUINT ImplicitConvObjectToObject(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true, bool allowObjectConstruct = true);
+	asUINT ImplicitConvObjectRef(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode);
+	asUINT ImplicitConvObjectValue(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode);
+	void   ImplicitConversionConstant(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType);
+	void   ImplicitConvObjectToBestMathType(asCExprContext *ctx, asCScriptNode *node);
+	asUINT ImplicitConvLambdaToFunc(asCExprContext *ctx, const asCDataType &to, asCScriptNode *node, EImplicitConv convType, bool generateCode = true);
+
+	void LineInstr(asCByteCode *bc, size_t pos);
+
+	asUINT ProcessStringConstant(asCString &str, asCScriptNode *node, bool processEscapeSequences = true);
+	void ProcessHeredocStringConstant(asCString &str, asCScriptNode *node);
+	int  GetPrecedence(asCScriptNode *op);
+	void Error(const asCString &msg, asCScriptNode *node);
+	void Warning(const asCString &msg, asCScriptNode *node);
+	void Information(const asCString &msg, asCScriptNode *node);
+	void PrintMatchingFuncs(asCArray<int> &funcs, asCScriptNode *node, asCObjectType *inType = 0);
+	void AddVariableScope(bool isBreakScope = false, bool isContinueScope = false);
+	void RemoveVariableScope();
+	void FinalizeFunction();
+
+	asCByteCode byteCode;
+
+	bool hasCompileErrors;
+
+	int nextLabel;
+	int numLambdas;
+
+	asCVariableScope  *variables;
+	asCBuilder        *builder;
+	asCScriptEngine   *engine;
+	asCScriptCode     *script;
+	asCScriptFunction *outFunc;
+
+	bool                        m_isConstructor;
+	bool                        m_isConstructorCalled;
+	sClassDeclaration          *m_classDecl;
+	sGlobalVariableDescription *m_globalVar;
+
+	asCArray<int> breakLabels;
+	asCArray<int> continueLabels;
+
+	int AllocateVariable(const asCDataType &type, bool isTemporary, bool forceOnHeap = false, bool asReference = false);
+	int AllocateVariableNotIn(const asCDataType &type, bool isTemporary, bool forceOnHeap, asCExprContext *ctx);
+	int GetVariableOffset(int varIndex);
+	int GetVariableSlot(int varOffset);
+	void DeallocateVariable(int pos);
+	void ReleaseTemporaryVariable(asCExprValue &t, asCByteCode *bc);
+	void ReleaseTemporaryVariable(int offset, asCByteCode *bc);
+	bool IsVariableOnHeap(int offset);
+
+	// This ordered array indicates the type of each variable
+	asCArray<asCDataType> variableAllocations;
+
+	// This ordered array indicates which variables are temporaries or not
+	asCArray<bool>        variableIsTemporary;
+
+	// This unordered array gives the offsets of all temporary variables, whether currently allocated or not
+	asCArray<int>         tempVariableOffsets;
+
+	// This ordered array indicated if the variable is on the heap or not
+	asCArray<bool>        variableIsOnHeap;
+
+	// This unordered array gives the indexes of the currently unused variables
+	asCArray<int>         freeVariables;
+
+	// This array holds the offsets of the currently allocated temporary variables
+	asCArray<int>         tempVariables; 
+
+	// This array holds the indices of variables that must not be used in an allocation
+	asCArray<int>         reservedVariables;
+
+	// This array holds the string constants that were allocated during the compilation, 
+	// so they can be released upon completion, whether the compilation was successful or not.
+	asCArray<void*>       usedStringConstants;
+
+	// This array holds the nodes that have been allocated temporarily
+	asCArray<asCScriptNode*> nodesToFreeUponComplete;
+
+	bool isCompilingDefaultArg;
+	bool isProcessingDeferredParams;
+	int  noCodeOutput;
+};
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
+#endif
diff --git a/Sources/AngelScript/source/as_config.h b/Sources/AngelScript/source/as_config.h
old mode 100755
new mode 100644
index 8c0160c77..43f28a0e4
--- a/Sources/AngelScript/source/as_config.h
+++ b/Sources/AngelScript/source/as_config.h
@@ -1,1264 +1,1369 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_config.h
-//
-// this file is used for configuring the compilation of the library
-//
-
-#ifndef AS_CONFIG_H
-#define AS_CONFIG_H
-
-
-
-//
-// Features
-//-----------------------------------------
-
-// AS_NO_THREADS
-// Turns off support for multithreading. By turning off
-// this when it's not needed a bit of performance is gained.
-
-// AS_WINDOWS_THREADS
-// If the library should be compiled using windows threads.
-
-// AS_POSIX_THREADS
-// If the library should be compiled using posix threads.
-
-// AS_NO_ATOMIC
-// If the compiler/platform doesn't support atomic instructions
-// then this should be defined to use critical sections instead.
-
-// AS_DEBUG
-// This flag can be defined to make the library write some extra output when
-// compiling and executing scripts.
-
-// AS_DEPRECATED
-// If this flag is defined then some backwards compatibility is maintained.
-// There is no guarantee for how well deprecated functionality will work though
-// so it is best to exchange it for the new functionality as soon as possible.
-
-// AS_NO_CLASS_METHODS
-// Disables the possibility to add class methods. Can increase the
-// portability of the library.
-
-// AS_MAX_PORTABILITY
-// Disables all platform specific code. Only the asCALL_GENERIC calling
-// convention will be available in with this flag set.
-
-// AS_DOUBLEBYTE_CHARSET
-// When this flag is defined, the parser will treat all characters in strings
-// that are greater than 127 as lead characters and automatically include the
-// next character in the script without checking its value. This should be
-// compatible with common encoding schemes, e.g. Big5. Shift-JIS is not compatible
-// though as it encodes some single byte characters above 127.
-//
-// If support for international text is desired, it is recommended that UTF-8
-// is used as this is supported natively by the compiler without the use for this
-// preprocessor flag.
-
-// AS_NO_COMPILER
-// Compiles the library without support for compiling scripts. This is intended
-// for those applications that will load pre-compiled bytecode and wants to decrease
-// the size of the executable.
-
-// AS_NO_EXCEPTIONS
-// Define this if exception handling is turned off or not available on the target platform.
-
-// AS_NO_MEMBER_INIT
-// Disable the support for initialization of class members directly in the declaration.
-// This was as a form to maintain backwards compatibility with versions before 2.26.0
-// if the new order of the member initialization caused null pointer exceptions in older
-// scripts (e.g. if a base class accessed members of a derived class through a virtual method).
-
-// AS_USE_NAMESPACE
-// Adds the AngelScript namespace on the declarations.
-
-
-
-//
-// Library usage
-//------------------------------------------
-
-// ANGELSCRIPT_EXPORT
-// This flag should be defined when compiling the library as a lib or dll.
-
-// ANGELSCRIPT_DLL_LIBRARY_IMPORT
-// This flag should be defined when using AngelScript as a dll with automatic
-// library import.
-
-// ANGELSCRIPT_DLL_MANUAL_IMPORT
-// This flag should be defined when using AngelScript as a dll with manual
-// loading of the library.
-
-
-
-
-//
-// Compiler differences
-//-----------------------------------------
-
-// asVSNPRINTF(a,b,c,d)
-// Some compilers use different names for this function. You must
-// define this macro to map to the proper function.
-
-// ASM_AT_N_T or ASM_INTEL
-// You should choose what inline assembly syntax to use when compiling.
-
-// VALUE_OF_BOOLEAN_TRUE
-// This flag allows to customize the exact value of boolean true.
-
-// AS_SIZEOF_BOOL
-// On some target platforms the sizeof(bool) is 4, but on most it is 1.
-
-// STDCALL
-// This is used to declare a function to use the stdcall calling convention.
-
-// AS_NO_MEMORY_H
-// Some compilers don't come with the memory.h header file.
-
-// AS_NO_THISCALL_FUNCTOR_METHOD
-// Defined if the support for functor methods hasn't been implemented on the platform.
-
-
-
-//
-// How to identify different compilers
-//-----------------------------------------
-// Ref: http://nadeausoftware.com/articles/2012/10/c_c_tip_how_detect_compiler_name_and_version_using_compiler_predefined_macros
-
-// MS Visual C++
-//  _MSC_VER   is defined
-//  __MWERKS__ is not defined
-
-// Metrowerks
-//  _MSC_VER   is defined
-//  __MWERKS__ is defined
-
-// GNU C based compilers
-//  __GNUC__   is defined
-
-// CLang/LLVM 
-// __clang__ is defined
-
-// Embarcadero C++Builder
-//  __BORLANDC__ is defined
-
-// Oracle Solaris Studio (previously known as Sun CC compiler)
-// __SUNPRO_CC is defined
-
-
-
-//
-// CPU differences
-//---------------------------------------
-
-// AS_USE_DOUBLE_AS_FLOAT
-// If there is no 64 bit floating point type, then this constant can be defined
-// to treat double like normal floats.
-
-// AS_X86
-// Use assembler code for the x86 CPU family
-
-// AS_SH4
-// Use assembler code for the SH4 CPU family
-
-// AS_MIPS
-// Use assembler code for the MIPS CPU family
-
-// AS_PPC
-// Use assembler code for the 32bit PowerPC CPU family
-
-// AS_PPC_64
-// Use assembler code for the 64bit PowerPC CPU family
-
-// AS_XENON
-// Use assembler code for the Xenon (XBOX360) CPU family
-
-// AS_ARM
-// Use assembler code for the ARM CPU family
-
-// AS_SOFTFP
-// Use to tell compiler that ARM soft-float ABI
-// should be used instead of ARM hard-float ABI
-
-// AS_X64_GCC
-// Use GCC assembler code for the X64 AMD/Intel CPU family
-
-// AS_X64_MSVC
-// Use MSVC assembler code for the X64 AMD/Intel CPU family
-
-// AS_64BIT_PTR
-// Define this to make the engine store all pointers in 64bit words.
-
-// AS_BIG_ENDIAN
-// Define this for CPUs that use big endian memory layout, e.g. PPC
-
-// AS_SPARC
-// Define this for SPARC CPU family
-
-
-
-//
-// Target systems
-//--------------------------------
-// This group shows a few of the flags used to identify different target systems.
-// Sometimes there are differences on different target systems, while both CPU and
-// compiler is the same for both, when this is so these flags are used to produce the
-// right code.
-
-// AS_WIN       - Microsoft Windows
-// AS_LINUX     - Linux
-// AS_MAC       - Apple Macintosh
-// AS_BSD       - BSD based OS (FreeBSD, DragonFly, OpenBSD, etc)
-// AS_XBOX      - Microsoft XBox
-// AS_XBOX360   - Microsoft XBox 360
-// AS_PSP       - Sony Playstation Portable
-// AS_PSVITA    - Sony Playstation Vita
-// AS_PS2       - Sony Playstation 2
-// AS_PS3       - Sony Playstation 3
-// AS_DC        - Sega Dreamcast
-// AS_GC        - Nintendo GameCube
-// AS_WII       - Nintendo Wii
-// AS_WIIU      - Nintendo Wii U
-// AS_IPHONE    - Apple IPhone
-// AS_ANDROID   - Android
-// AS_HAIKU     - Haiku
-// AS_ILLUMOS   - Illumos like (OpenSolaris, OpenIndiana, NCP, etc)
-// AS_MARMALADE - Marmalade cross platform SDK (a layer on top of the OS)
-// AS_SUN       - Sun UNIX
-
-
-
-
-//
-// Calling conventions
-//-----------------------------------------
-
-// GNU_STYLE_VIRTUAL_METHOD
-// This constant should be defined if method pointers store index for virtual
-// functions in the same location as the function pointer. In such cases the method
-// is identified as virtual if the least significant bit is set.
-
-// MULTI_BASE_OFFSET(x)
-// This macro is used to retrieve the offset added to the object pointer in order to
-// implicitly cast the object to the base object. x is the method pointer received by
-// the register function.
-
-// HAVE_VIRTUAL_BASE_OFFSET
-// Define this constant if the compiler stores the virtual base offset in the method
-// pointers. If it is not stored in the pointers then AngelScript have no way of
-// identifying a method as coming from a class with virtual inheritance.
-
-// VIRTUAL_BASE_OFFSET(x)
-// This macro is used to retrieve the offset added to the object pointer in order to
-// find the virtual base object. x is the method pointer received by the register
-// function;
-
-// COMPLEX_RETURN_MASK
-// This constant shows what attributes determine if an object is returned in memory
-// or in the registers as normal structures
-
-// COMPLEX_MASK
-// This constant shows what attributes determine if an object is implicitly passed
-// by reference or not, even if the argument is declared by value
-
-// THISCALL_RETURN_SIMPLE_IN_MEMORY
-// CDECL_RETURN_SIMPLE_IN_MEMORY
-// STDCALL_RETURN_SIMPLE_IN_MEMORY
-// When these constants are defined then the corresponding calling convention always
-// return classes/structs in memory regardless of size or complexity.
-
-// THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-// STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-// CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-// Specifies the minimum size in dwords a class/struct needs to be to be passed in memory
-
-// CALLEE_POPS_HIDDEN_RETURN_POINTER
-// This constant should be defined if the callee pops the hidden return pointer,
-// used when returning an object in memory.
-
-// THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
-// This constant should be defined if the callee pops the hidden return pointer
-// for thiscall functions; used when returning an object in memory.
-
-// THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-// With this constant defined AngelScript will pass the object pointer on the stack
-
-// THISCALL_CALLEE_POPS_ARGUMENTS
-// If the callee pops arguments for class methods then define this constant
-
-// COMPLEX_OBJS_PASSED_BY_REF
-// Some compilers always pass certain objects by reference. GNUC for example does
-// this if the the class has a defined destructor.
-
-// AS_LARGE_OBJS_PASSED_BY_REF
-// If this is defined large objects are passed by reference, whether they are complex or not
-
-// AS_LARGE_OBJ_MIN_SIZE
-// This is the size of objects determined as large ones
-
-// AS_CALLEE_DESTROY_OBJ_BY_VAL
-// When an object is passed by value the called function is the one responsible
-// for calling the destructor before returning.
-
-// HAS_128_BIT_PRIMITIVES
-// 64bit processors often support 128bit primitives. These may require special
-// treatment when passed in function arguments or returned by functions.
-
-// SPLIT_OBJS_BY_MEMBER_TYPES
-// On some platforms objects with primitive members are split over different
-// register types when passed by value to functions.
-
-
-
-
-
-//
-// Detect compiler
-//------------------------------------------------
-
-
-#define VALUE_OF_BOOLEAN_TRUE  1
-#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-#define THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
-
-// Not implemented by default. Undefined with tested platforms.
-#define AS_NO_THISCALL_FUNCTOR_METHOD
-
-
-// Embarcadero C++Builder
-#if defined(__BORLANDC__)
- #ifndef _Windows
-  #error "Configuration doesn't yet support BCC for Linux or Mac OS."
- #endif
- #if defined(_M_X64)
-  #error "Configuration doesn't yet support BCC for AMD64."
- #endif
-
-	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
-	#define HAVE_VIRTUAL_BASE_OFFSET
-	#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+2))
-	#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-	#define CDECL_RETURN_SIMPLE_IN_MEMORY
-	#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-	#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-	#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-	#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-	#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-	#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-	#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-
-	#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-	#define COMPLEX_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR)
-	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR)
-	#define STDCALL __stdcall
-	#define AS_SIZEOF_BOOL 1
-	#define AS_WINDOWS_THREADS
-	#undef THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
-
-	#define AS_WIN
-	#define AS_X86
-	#define ASM_INTEL
-
-	#define asVSNPRINTF(a, b, c, d) _vsnprintf(a, b, c, d)
-
-	#define fmodf(a,b) fmod(a,b)
-
-	#define UNREACHABLE_RETURN
-#endif
-
-// Microsoft Visual C++
-// Ref: http://msdn.microsoft.com/en-us/library/b0084kay.aspx
-#if defined(_MSC_VER) && !defined(__MWERKS__)
-
-	#if _MSC_VER <= 1200 // MSVC6
-		// Disable the useless warnings about truncated symbol names for template instances
-		#pragma warning( disable : 4786 )
-	#endif
-
-	#ifdef _M_X64
-		#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+2))
-		#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+4))
-	#else
-		#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
-		#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+3))
-	#endif
-	#define HAVE_VIRTUAL_BASE_OFFSET
-	#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-	#define THISCALL_PASS_OBJECT_POINTER_IN_ECX
-
-	// http://www.madewithmarmalade.com/
-	#if defined(__S3E__)
-		#ifndef AS_MARMALADE
-			// From now on we'll use the below define
-			#define AS_MARMALADE
-		#endif
-
-		// Marmalade doesn't use the Windows libraries
-		#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
-
-		// Marmalade doesn't seem to have proper support for
-		// atomic instructions or read/write locks, so we turn off
-		// multithread support
-		//#define AS_POSIX_THREADS
-		#define AS_NO_THREADS
-		#define AS_NO_ATOMIC
-
-		// Marmalade has it's own way of identifying the CPU target
-		// Note, when building for ARM, the gnuc compiler will always
-		// be used so we don't need to check for it here
-		#if defined(I3D_ARCH_X86)
-			#define AS_X86
-		#endif
-	#else
-		#if _MSC_VER < 1500  // MSVC++ 9 (aka MSVC++ .NET 2008)
-			#define asVSNPRINTF(a, b, c, d) _vsnprintf(a, b, c, d)
-		#else
-			#define asVSNPRINTF(a, b, c, d) vsnprintf_s(a, b, _TRUNCATE, c, d)
-		#endif
-
-		#define AS_WINDOWS_THREADS
-	#endif
-
-	#define THISCALL_CALLEE_POPS_ARGUMENTS
-	#define STDCALL __stdcall
-	#define AS_SIZEOF_BOOL 1
-	#define COMPLEX_OBJS_PASSED_BY_REF
-
-	#define ASM_INTEL  // Intel style for inline assembly on microsoft compilers
-
-	#if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
-		#define AS_WIN
-	#endif
-
-	#if _XBOX_VER >= 200
-		// 360 uses a Xenon processor (which is a modified 64bit PPC)
-		#define AS_XBOX360
-		#define AS_XENON
-		#define AS_BIG_ENDIAN
-	#else
-		#if defined(_XBOX) || (defined(_M_IX86) && !defined(__LP64__))
-			#define AS_X86
-			#ifndef _XBOX
-				// Not tested with xbox (only enabled if is Windows)
-				#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#endif 
-		#elif defined(_M_X64)
-			#define AS_X64_MSVC
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
-			#define AS_LARGE_OBJS_PASSED_BY_REF
-			#define AS_LARGE_OBJ_MIN_SIZE 3
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-		#endif
-	#endif
-
-	#if defined(_ARM_) || defined(_M_ARM)
-		#define AS_ARM
-		#define AS_CALLEE_DESTROY_OBJ_BY_VAL
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
-	
-		// Windows CE uses softfp calling convention, while Windows RT uses hardfp calling convention
-		// ref: http://stackoverflow.com/questions/16375355/what-is-the-windows-rt-on-arm-native-code-calling-convention
-		#if defined(_WIN32_WCE)
-			#define AS_SOFTFP
-		#endif
-	#endif
-
-	#ifndef COMPLEX_MASK
-		#define COMPLEX_MASK (asOBJ_APP_ARRAY)
-	#endif
-
-	#ifndef COMPLEX_RETURN_MASK
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
-	#endif
-
-	#define UNREACHABLE_RETURN
-#endif
-
-// Metrowerks CodeWarrior (experimental, let me know if something isn't working)
-#if defined(__MWERKS__) && !defined(EPPC) // JWC -- If Wii DO NOT use this even when using Metrowerks Compiler. Even though they are called Freescale...
-	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
-	#define HAVE_VIRTUAL_BASE_OFFSET
-	#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+3))
-	#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-	#define THISCALL_PASS_OBJECT_POINTER_IN_ECX
-	#define asVSNPRINTF(a, b, c, d) _vsnprintf(a, b, c, d)
-	#define THISCALL_CALLEE_POPS_ARGUMENTS
-	#define COMPLEX_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT)
-	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT)
-	#define AS_SIZEOF_BOOL 1
-	#define AS_WINDOWS_THREADS
-	#define STDCALL __stdcall
-
-	// Support native calling conventions on x86, but not 64bit yet
-	#if defined(_M_IX86) && !defined(__LP64__)
-		#define AS_X86
-		#define ASM_INTEL  // Intel style for inline assembly
-	#endif
-
-	#define UNREACHABLE_RETURN
-#endif
-
-// SN Systems ProDG
-#if defined(__SNC__) || defined(SNSYS)
-	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
-	#define CALLEE_POPS_HIDDEN_RETURN_POINTER
-	#define COMPLEX_OBJS_PASSED_BY_REF
-
-	#ifdef __psp2__
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
-		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-		#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-	#else
-		#define GNU_STYLE_VIRTUAL_METHOD
-		#define ASM_AT_N_T  // AT&T style inline assembly
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
-	#endif
-
-	#define AS_SIZEOF_BOOL 1
-	#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
-
-	// SN doesnt seem to like STDCALL.
-	// Maybe it can work with some fiddling, but I can't imagine linking to
-	// any STDCALL functions with a console anyway...
-	#define STDCALL
-
-	// Linux specific
-	#ifdef __linux__
-		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-	#endif
-
-	// Support native calling conventions on x86, but not 64bit yet
-	#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-		#define AS_X86
-	// PS3
-	#elif (defined(__PPC__) || defined(__ppc__)) && defined(__PPU__)
-		// Support native calling conventions on PS3
-		#define AS_PS3
-		#define AS_PPC_64
-		#define AS_NO_MEMORY_H
-		#define AS_NO_EXCEPTIONS
-		#include <stdlib.h>
-	// PSP
-	#elif defined(__psp__)
-		#define AS_NO_MEMORY_H
-		#define AS_MIPS
-		#define AS_PSP
-		#define AS_USE_DOUBLE_AS_FLOAT
-	// PSVita
-	#elif defined(__psp2__)
-		#define AS_PSVITA
-		#define AS_ARM
-		#define AS_NO_MEMORY_H
-		#define AS_NO_EXCEPTIONS
-		#define AS_CALLEE_DESTROY_OBJ_BY_VAL
-		#undef AS_NO_THISCALL_FUNCTOR_METHOD
-	#endif
-
-	#define UNREACHABLE_RETURN
-#endif
-
-// GNU C (and MinGW or Cygwin on Windows)
-// Use the following command to determine predefined macros: echo . | g++ -dM -E -
-// MSVC2015 can now use CLang too, but it shouldn't go in here
-#if (defined(__GNUC__) && !defined(__SNC__) && !defined(_MSC_VER)) || defined(EPPC) || defined(__CYGWIN__) // JWC -- use this instead for Wii
-	#define GNU_STYLE_VIRTUAL_METHOD
-	#define MULTI_BASE_OFFSET(x) (*((asPWORD*)(&x)+1))
-	#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
-	#define CALLEE_POPS_HIDDEN_RETURN_POINTER
-	#define COMPLEX_OBJS_PASSED_BY_REF
-	#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_ARRAY)
-	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_ARRAY)
-	#define AS_NO_MEMORY_H
-	#define AS_SIZEOF_BOOL 1
-	#define STDCALL __attribute__((stdcall))
-	#define ASM_AT_N_T
-
-	// WII U
-	#if defined(__ghs__)
-		#define AS_WIIU
-
-		// Native calling conventions are not yet supported
-		#define AS_MAX_PORTABILITY
-
-	// Marmalade is a cross platform SDK. It uses g++ to compile for iOS and Android
-	#elif defined(__S3E__)
-		#ifndef AS_MARMALADE
-			// From now on we'll use the below define
-			#define AS_MARMALADE
-		#endif
-
-		// STDCALL is not available on Marmalade when compiled for iOS or Android
-		#undef STDCALL
-		#define STDCALL
-
-		// Marmalade doesn't seem to have proper support for
-		// atomic instructions or read/write locks
-		#define AS_NO_THREADS
-		#define AS_NO_ATOMIC
-
-		// Identify for which CPU the library is being built
-		#if defined(I3D_ARCH_X86)
-			#define AS_X86
-		#elif defined(I3D_ARCH_ARM)
-			#define AS_ARM
-
-			#define AS_SOFTFP
-
-			// Marmalade appear to use the same ABI as Android when built for ARM
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-
-			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-
-			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-
-			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-
-			#undef GNU_STYLE_VIRTUAL_METHOD
-
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-
-			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
-		#endif
-
-	// MacOSX and IPhone
-	#elif defined(__APPLE__)
-
-		#include <TargetConditionals.h>
-
-		// Is this a Mac or an IPhone (or other iOS device)?
-		#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1
-			#define AS_IPHONE
-		#else
-			#define AS_MAC
-		#endif
-
-		// The sizeof bool is different depending on the target CPU
-		#undef AS_SIZEOF_BOOL
-		#if defined(__ppc__)
-			#define AS_SIZEOF_BOOL 4
-			// STDCALL is not available on PPC
-			#undef STDCALL
-			#define STDCALL
-		#else
-			#define AS_SIZEOF_BOOL 1
-		#endif
-
-		#if (defined(_ARM_) || defined(__arm__))
-			// iOS use ARM processor
-			#define AS_ARM
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-
-			#undef GNU_STYLE_VIRTUAL_METHOD
-
-			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-			#define COMPLEX_OBJS_PASSED_BY_REF
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-
-			// iOS uses soft-float ABI
-			#define AS_SOFTFP
-
-			// STDCALL is not available on ARM
-			#undef STDCALL
-			#define STDCALL
-
-		#elif (defined(__arm64__))
-			// The IPhone 5S+ uses an ARM64 processor
-
-			// AngelScript currently doesn't support native calling
-			// for 64bit ARM processors so it's necessary to turn on
-			// portability mode
-			#define AS_MAX_PORTABILITY
-
-			// STDCALL is not available on ARM
-			#undef STDCALL
-			#define STDCALL
-
-		#elif (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-			// Support native calling conventions on Mac OS X + Intel 32bit CPU
-			#define AS_X86
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-
-		#elif defined(__LP64__) && !defined(__ppc__) && !defined(__PPC__) && !defined(__arm64__)
-			// http://developer.apple.com/library/mac/#documentation/DeveloperTools/Conceptual/LowLevelABI/140-x86-64_Function_Calling_Conventions/x86_64.html#//apple_ref/doc/uid/TP40005035-SW1
-			#define AS_X64_GCC
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#define HAS_128_BIT_PRIMITIVES
-			#define SPLIT_OBJS_BY_MEMBER_TYPES
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#define AS_LARGE_OBJS_PASSED_BY_REF
-			#define AS_LARGE_OBJ_MIN_SIZE 5
-			// STDCALL is not available on 64bit Mac
-			#undef STDCALL
-			#define STDCALL
-
-		#elif (defined(__ppc__) || defined(__PPC__)) && !defined(__LP64__)
-			// Support native calling conventions on Mac OS X + PPC 32bit CPU
-			#define AS_PPC
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-
-		#elif (defined(__ppc__) || defined(__PPC__)) && defined(__LP64__)
-			#define AS_PPC_64
-		#else
-			// Unknown CPU type
-			#define AS_MAX_PORTABILITY
-		#endif
-		#define AS_POSIX_THREADS
-
-	// Windows
-	#elif defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
-		// On Windows the simple classes are returned in the EAX:EDX registers
-		//#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-		//#define CDECL_RETURN_SIMPLE_IN_MEMORY
-		//#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-
-		#undef COMPLEX_MASK
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-		#undef COMPLEX_RETURN_MASK
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-
-		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-			// Support native calling conventions on Intel 32bit CPU
-			#define AS_X86
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-
-			// As of version 4.7 MinGW changed the ABI, presumably
-			// to be better aligned with how MSVC works
-			#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || __GNUC__ > 4
-				#define AS_MINGW47
-			#endif
-		
-			#if (__clang_major__ == 3 && __clang_minor__ > 4) || __clang_major > 3
-				#define AS_MINGW47
-			#endif
-
-			#ifdef AS_MINGW47
-				#undef  CALLEE_POPS_HIDDEN_RETURN_POINTER
-				#define THISCALL_CALLEE_POPS_ARGUMENTS
-			#else
-				// Earlier versions than 4.7
-				#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-			#endif
-
-		#elif defined(__x86_64__)
-			#define AS_X64_MINGW
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#define AS_LARGE_OBJS_PASSED_BY_REF
-			#define AS_LARGE_OBJ_MIN_SIZE 3
-			#define COMPLEX_OBJS_PASSED_BY_REF
-		#else
-			#define AS_MAX_PORTABILITY
-		#endif
-		#define AS_WIN
-		#define AS_WINDOWS_THREADS
-
-	// Linux
-	#elif defined(__linux__) && !defined(ANDROID) && !defined(__ANDROID__)
-
-		#undef COMPLEX_MASK
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-		#undef COMPLEX_RETURN_MASK
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-
-		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-
-			// Support native calling conventions on Intel 32bit CPU
-			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-			#define AS_X86
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-		#elif defined(__LP64__) && !defined(__arm64__) && !defined(__PPC64__)
-			#define AS_X64_GCC
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#define HAS_128_BIT_PRIMITIVES
-			#define SPLIT_OBJS_BY_MEMBER_TYPES
-			#define AS_LARGE_OBJS_PASSED_BY_REF
-			#define AS_LARGE_OBJ_MIN_SIZE 5
-			// STDCALL is not available on 64bit Linux
-			#undef STDCALL
-			#define STDCALL
-		#elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__))
-			#define AS_ARM
-
-			// TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S
-			#define AS_NO_EXCEPTIONS
-
-			#undef STDCALL
-			#define STDCALL
-
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-
-			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-
-			#ifndef AS_MAX_PORTABILITY
-			// Make a few checks against incompatible ABI combinations
-			#if defined(__FAST_MATH__) && __FAST_MATH__ == 1
-				#error -ffast-math is not supported with native calling conventions
-			#endif
-			#endif
-
-			// Verify if soft-float or hard-float ABI is used
-			#if defined(__SOFTFP__) && __SOFTFP__ == 1
-				// -ffloat-abi=softfp or -ffloat-abi=soft
-				#define AS_SOFTFP
-			#endif
-
-			// Tested with both hard float and soft float abi
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-
-		#elif defined(__mips__)
-			#define AS_MIPS
-			#undef STDCALL
-			#define STDCALL
-
-			#ifdef _ABIO32
-				#define AS_MIPS
-
-				// All structures are returned in memory regardless of size or complexity
-				#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-				#define	THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-				#define CDECL_RETURN_SIMPLE_IN_MEMORY
-				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-				#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-				#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#else
-				// For other ABIs the native calling convention is not available (yet)
-				#define AS_MAX_PORTABILITY
-			#endif
-		#elif defined(__PPC64__)
-			// Support native calling conventions on Linux with PPC64
-			// TODO: This has not yet been confirmed to work
-			#define AS_PPC_64
-			#define SPLIT_OBJS_BY_MEMBER_TYPES
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-			#undef STDCALL
-			#define STDCALL
-		#else
-			#define AS_MAX_PORTABILITY
-		#endif
-		#define AS_LINUX
-		#define AS_POSIX_THREADS
-
-		#if !( ( (__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) || __GNUC__ > 4) )
-			// Only with GCC 4.1 was the atomic instructions available
-			#define AS_NO_ATOMIC
-		#endif
-
-	// Free BSD
-	#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__)
-		#define AS_BSD
-		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-			#define AS_X86
-		#elif defined(__LP64__) && !defined(__sparc64__)
-			#define AS_X64_GCC
-			#define HAS_128_BIT_PRIMITIVES
-			#define SPLIT_OBJS_BY_MEMBER_TYPES
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-			#define AS_LARGE_OBJS_PASSED_BY_REF
-			#define AS_LARGE_OBJ_MIN_SIZE 5
-			#undef STDCALL
-			#define STDCALL
-		#else
-			#define AS_MAX_PORTABILITY
-		#endif
-		#define AS_POSIX_THREADS
-		#if !( ( (__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) || __GNUC__ > 4) )
-			// Only with GCC 4.1 was the atomic instructions available
-			#define AS_NO_ATOMIC
-		#endif
-
-	// PSP and PS2
-	#elif defined(__PSP__) || defined(__psp__) || defined(_EE_) || defined(_PSP) || defined(_PS2)
-		// Support native calling conventions on MIPS architecture
-		#if (defined(_MIPS_ARCH) || defined(_mips) || defined(__MIPSEL__)) && !defined(__LP64__)
-			#define AS_MIPS
-			#define AS_USE_DOUBLE_AS_FLOAT
-		#else
-			#define AS_MAX_PORTABILITY
-		#endif
-
-	// PS3
-	#elif (defined(__PPC__) || defined(__ppc__)) && defined(__PPU__)
-		// Support native calling conventions on PS3
-		#define AS_PS3
-		#define AS_PPC_64
-		#define SPLIT_OBJS_BY_MEMBER_TYPES
-		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-		// PS3 doesn't have STDCALL
-		#undef STDCALL
-		#define STDCALL
-
-	// Dreamcast
-	#elif __SH4_SINGLE_ONLY__
-		// Support native calling conventions on Dreamcast
-		#define AS_DC
-		#define AS_SH4
-
-	// Wii JWC - Close to PS3 just no PPC_64 and AS_PS3
-	#elif defined(EPPC)
-		#define AS_WII
-		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-		#undef STDCALL
-		#define STDCALL
-
-	// Android
-	#elif defined(ANDROID) || defined(__ANDROID__)
-		#define AS_ANDROID
-
-		// Android 2.3+ supports posix threads
-		#define AS_POSIX_THREADS
-
-		// Common configuration with Android arm and x86
-		#define CDECL_RETURN_SIMPLE_IN_MEMORY
-		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-
-		#undef COMPLEX_MASK
-		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-		#undef COMPLEX_RETURN_MASK
-		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
-
-		#if (defined(_ARM_) || defined(__arm__))
-			// Android ARM
-
-			// TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S
-			#define AS_NO_EXCEPTIONS
-
-			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
-
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
-
-			// The stdcall calling convention is not used on the arm cpu
-			#undef STDCALL
-			#define STDCALL
-
-			#undef GNU_STYLE_VIRTUAL_METHOD
-
-			#define AS_ARM
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#define AS_SOFTFP
-			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
-		#elif (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-			// Android Intel x86 (same config as Linux x86). Tested with Intel x86 Atom System Image.
-
-			// Support native calling conventions on Intel 32bit CPU
-			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-			#define AS_X86
-			#undef AS_NO_THISCALL_FUNCTOR_METHOD
-		#elif defined(__mips__)
-			#define AS_MIPS
-			#undef STDCALL
-			#define STDCALL
-
-			#ifdef _ABIO32
-				#define AS_MIPS
-
-				// All structures are returned in memory regardless of size or complexity
-				#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-				#define	THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-				#define CDECL_RETURN_SIMPLE_IN_MEMORY
-				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-				#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
-				#undef AS_NO_THISCALL_FUNCTOR_METHOD
-			#else
-				// For other ABIs the native calling convention is not available (yet)
-				#define AS_MAX_PORTABILITY
-			#endif
-		#endif
-
-	// Haiku OS
-	#elif __HAIKU__
-		#define AS_HAIKU
-		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-			#define AS_X86
-			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-		#elif defined(__x86_64__)
-			#define AS_X64_GCC
-			#define HAS_128_BIT_PRIMITIVES
-			#undef COMPLEX_MASK
-			#define COMPLEX_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR)
-			#undef COMPLEX_RETURN_MASK
-			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR)
-			#define AS_LARGE_OBJS_PASSED_BY_REF
-			#define AS_LARGE_OBJ_MIN_SIZE 5
-			#undef STDCALL
-			#define STDCALL
-		#else
-			#define AS_MAX_PORTABILITY
-		#endif
-
-		#define AS_POSIX_THREADS
-		#if !( ( (__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) || __GNUC__ > 4) )
-			// Only with GCC 4.1 was the atomic instructions available
-			#define AS_NO_ATOMIC
-		#endif
-
-	// Illumos
-	#elif defined(__sun)
-		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
-			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
-			#define CDECL_RETURN_SIMPLE_IN_MEMORY
-			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
-
-			// Support native calling conventions on Intel 32bit CPU
-			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
-			#define AS_X86
-		#elif defined(__x86_64__)
-			#define AS_X64_GCC
-			#define HAS_128_BIT_PRIMITIVES
-			#define SPLIT_OBJS_BY_MEMBER_TYPES
-			// STDCALL is not available on 64bit Linux
-			#undef STDCALL
-			#define STDCALL
-		#else
-			#define AS_MAX_PORTABILITY
-		#endif
-		#define AS_ILLUMOS
-		#define AS_POSIX_THREADS
-
-		#if !( ( (__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) || __GNUC__ > 4) )
-			// Only with GCC 4.1 was the atomic instructions available
-			#define AS_NO_ATOMIC
-		#endif
-	#endif
-
-	#define UNREACHABLE_RETURN
-#endif
-
-// Sun CC
-// Initial information provided by Andrey Bergman
-#if defined(__SUNPRO_CC)
-	#if defined(__sparc)
-		#define AS_SPARC
-	#endif
-
-	#if defined(__sun)
-		#define AS_SUN
-	#endif
-
-	// Native calling conventions is not yet supported for Sun CC
-	#if !defined(AS_MAX_PORTABILITY)
-		#define AS_MAX_PORTABILITY
-	#endif
-
-	// I presume Sun CC uses a similar structure of method pointers as gnuc
-	#define MULTI_BASE_OFFSET(x) (*((asPWORD*)(&x)+1))
-
-	#if !defined(AS_SIZEOF_BOOL)
-		#define AS_SIZEOF_BOOL 1 // sizeof(bool) == 1
-	#endif
-	#if !defined(UNREACHABLE_RETURN)
-		#define UNREACHABLE_RETURN
-	#endif
-	#if !defined(STDCALL)
-		#define STDCALL // There is no stdcall on Solaris/SunPro/SPARC
-	#endif
-	#if !defined(asVSNPRINTF)
-		#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
-	#endif
-#endif
-
-
-//
-// Detect target hardware
-//------------------------------------------------
-
-// Big endian CPU target?
-// see: http://sourceforge.net/p/predef/wiki/Endianness/
-#if !defined(AS_BIG_ENDIAN) && \
-	defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN || \
-	defined(__BIG_ENDIAN__) || \
-	defined(__ARMEB__) || \
-	defined(__THUMBEB__) || \
-	defined(__AARCH64EB__) || \
-	defined(_MIBSEB) || defined(__MIBSEB) || defined(__MIBSEB__)
-		#define AS_BIG_ENDIAN
-#endif
-
-// Dreamcast and Gamecube use only 32bit floats, so treat doubles as floats
-#if defined(__SH4_SINGLE_ONLY__) || defined(_GC)
-	#define AS_USE_DOUBLE_AS_FLOAT	// use 32bit floats instead of doubles
-#endif
-
-// If there are no current support for native calling
-// conventions, then compile with AS_MAX_PORTABILITY
-#if (!defined(AS_X86) && !defined(AS_SH4) && !defined(AS_MIPS) && !defined(AS_PPC) && !defined(AS_PPC_64) && !defined(AS_XENON) && !defined(AS_X64_GCC) && !defined(AS_X64_MSVC) && !defined(AS_ARM) && !defined(AS_X64_MINGW))
-	#ifndef AS_MAX_PORTABILITY
-		#define AS_MAX_PORTABILITY
-	#endif
-#endif
-
-// If the platform doesn't support atomic instructions we can't allow
-// multithreading as the reference counters won't be threadsafe
-#if defined(AS_NO_ATOMIC) && !defined(AS_NO_THREADS)
-	#define AS_NO_THREADS
-#endif
-
-// If the form of threads to use hasn't been chosen
-// then the library will be compiled without support
-// for multithreading
-#if !defined(AS_POSIX_THREADS) && !defined(AS_WINDOWS_THREADS)
-	#define AS_NO_THREADS
-#endif
-
-
-// The assert macro
-#if defined(ANDROID)
-	#if defined(AS_DEBUG)
-		#include <android/log.h>
-		#include <stdlib.h>
-		#define asASSERT(x) \
-			do { \
-			    if (!(x)) { \
-			        __android_log_print(ANDROID_LOG_ERROR, "AngelScript", "Assert failed at %s:%d - %s", __FILE__, __LINE__, #x); \
-			        exit(1); \
-			    } \
-			} while (0)
-	#else
-		#define asASSERT(x)
-	#endif
-#else
-	#include <assert.h>
-	#define asASSERT(x) assert(x)
-#endif
-
-
-
-//
-// Internal defines (do not change these)
-//----------------------------------------------------------------
-
-#define ARG_W(b)     ((asWORD*)&b)
-#define ARG_DW(b)    ((asDWORD*)&b)
-#define ARG_QW(b)    ((asQWORD*)&b)
-#define ARG_PTR(b)   ((asPWORD*)&b)
-#define BCARG_W(b)   ((asWORD*)&(b)[1])
-#define BCARG_DW(b)  ((asDWORD*)&(b)[1])
-#define BCARG_QW(b)  ((asQWORD*)&(b)[1])
-#define BCARG_PTR(b) ((asPWORD*)&(b)[1])
-
-// This macro is used to avoid warnings about unused variables.
-// Usually where the variables are only used in debug mode.
-#define UNUSED_VAR(x) (void)(x)
-
-#include "../include/angelscript.h"
-#include "as_memory.h"
-
-#ifdef AS_USE_NAMESPACE
-using namespace AngelScript;
-#endif
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_config.h
+//
+// this file is used for configuring the compilation of the library
+//
+
+#ifndef AS_CONFIG_H
+#define AS_CONFIG_H
+
+
+
+//
+// Features
+//-----------------------------------------
+
+// AS_NO_THREADS
+// Turns off support for multithreading. By turning off
+// this when it's not needed a bit of performance is gained.
+
+// AS_WINDOWS_THREADS
+// If the library should be compiled using windows threads.
+
+// AS_POSIX_THREADS
+// If the library should be compiled using posix threads.
+
+// AS_NO_ATOMIC
+// If the compiler/platform doesn't support atomic instructions
+// then this should be defined to use critical sections instead.
+
+// AS_DEBUG
+// This flag can be defined to make the library write some extra output when
+// compiling and executing scripts.
+
+// AS_DEPRECATED
+// If this flag is defined then some backwards compatibility is maintained.
+// There is no guarantee for how well deprecated functionality will work though
+// so it is best to exchange it for the new functionality as soon as possible.
+
+// AS_NO_CLASS_METHODS
+// Disables the possibility to add class methods. Can increase the
+// portability of the library.
+
+// AS_MAX_PORTABILITY
+// Disables all platform specific code. Only the asCALL_GENERIC calling
+// convention will be available in with this flag set.
+
+// AS_DOUBLEBYTE_CHARSET
+// When this flag is defined, the parser will treat all characters in strings
+// that are greater than 127 as lead characters and automatically include the
+// next character in the script without checking its value. This should be
+// compatible with common encoding schemes, e.g. Big5. Shift-JIS is not compatible
+// though as it encodes some single byte characters above 127.
+//
+// If support for international text is desired, it is recommended that UTF-8
+// is used as this is supported natively by the compiler without the use for this
+// preprocessor flag.
+
+// AS_NO_COMPILER
+// Compiles the library without support for compiling scripts. This is intended
+// for those applications that will load pre-compiled bytecode and wants to decrease
+// the size of the executable.
+
+// AS_NO_EXCEPTIONS
+// Define this if exception handling is turned off or not available on the target platform.
+
+// AS_NO_MEMBER_INIT
+// Disable the support for initialization of class members directly in the declaration.
+// This was as a form to maintain backwards compatibility with versions before 2.26.0
+// if the new order of the member initialization caused null pointer exceptions in older
+// scripts (e.g. if a base class accessed members of a derived class through a virtual method).
+
+// AS_USE_NAMESPACE
+// Adds the AngelScript namespace on the declarations.
+
+
+
+//
+// Library usage
+//------------------------------------------
+
+// ANGELSCRIPT_EXPORT
+// This flag should be defined when compiling the library as a lib or dll.
+
+// ANGELSCRIPT_DLL_LIBRARY_IMPORT
+// This flag should be defined when using AngelScript as a dll with automatic
+// library import.
+
+// ANGELSCRIPT_DLL_MANUAL_IMPORT
+// This flag should be defined when using AngelScript as a dll with manual
+// loading of the library.
+
+
+
+
+//
+// Compiler differences
+//-----------------------------------------
+
+// asVSNPRINTF(a,b,c,d)
+// Some compilers use different names for this function. You must
+// define this macro to map to the proper function.
+
+// ASM_AT_N_T or ASM_INTEL
+// You should choose what inline assembly syntax to use when compiling.
+
+// VALUE_OF_BOOLEAN_TRUE
+// This flag allows to customize the exact value of boolean true.
+
+// AS_SIZEOF_BOOL
+// On some target platforms the sizeof(bool) is 4, but on most it is 1.
+
+// STDCALL
+// This is used to declare a function to use the stdcall calling convention.
+
+// AS_NO_MEMORY_H
+// Some compilers don't come with the memory.h header file.
+
+// AS_NO_THISCALL_FUNCTOR_METHOD
+// Defined if the support for functor methods hasn't been implemented on the platform.
+
+
+
+//
+// How to identify different compilers
+//-----------------------------------------
+// Ref: http://nadeausoftware.com/articles/2012/10/c_c_tip_how_detect_compiler_name_and_version_using_compiler_predefined_macros
+
+// MS Visual C++
+//  _MSC_VER   is defined
+//  __MWERKS__ is not defined
+
+// Metrowerks
+//  _MSC_VER   is defined
+//  __MWERKS__ is defined
+
+// GNU C based compilers
+//  __GNUC__   is defined
+
+// CLang/LLVM 
+// __clang__ is defined
+
+// Embarcadero C++Builder
+//  __BORLANDC__ is defined
+
+// Oracle Solaris Studio (previously known as Sun CC compiler)
+// __SUNPRO_CC is defined
+
+// Local (or Little) C Compiler
+// __LCC__ is defined
+// __e2k__ is not defined
+
+// MCST eLbrus C Compiler
+// __LCC__ is defined
+// __e2k__ is defined
+
+
+
+//
+// CPU differences
+//---------------------------------------
+
+// AS_USE_DOUBLE_AS_FLOAT
+// If there is no 64 bit floating point type, then this constant can be defined
+// to treat double like normal floats.
+
+// AS_X86
+// Use assembler code for the x86 CPU family
+
+// AS_SH4
+// Use assembler code for the SH4 CPU family
+
+// AS_MIPS
+// Use assembler code for the MIPS CPU family
+
+// AS_PPC
+// Use assembler code for the 32bit PowerPC CPU family
+
+// AS_PPC_64
+// Use assembler code for the 64bit PowerPC CPU family
+
+// AS_XENON
+// Use assembler code for the Xenon (XBOX360) CPU family
+
+// AS_ARM
+// Use assembler code for the ARM CPU family
+
+// AS_ARM64
+// Use assembler code for the ARM64/AArch64 CPU family
+
+// AS_SOFTFP
+// Use to tell compiler that ARM soft-float ABI
+// should be used instead of ARM hard-float ABI
+
+// AS_X64_GCC
+// Use GCC assembler code for the X64 AMD/Intel CPU family
+
+// AS_X64_MSVC
+// Use MSVC assembler code for the X64 AMD/Intel CPU family
+
+// AS_64BIT_PTR
+// Define this to make the engine store all pointers in 64bit words.
+
+// AS_BIG_ENDIAN
+// Define this for CPUs that use big endian memory layout, e.g. PPC
+
+// AS_SPARC
+// Define this for SPARC CPU family
+
+// AS_E2K
+// Define this for MCST Elbrus 2000 CPU family
+
+
+
+
+//
+// Target systems
+//--------------------------------
+// This group shows a few of the flags used to identify different target systems.
+// Sometimes there are differences on different target systems, while both CPU and
+// compiler is the same for both, when this is so these flags are used to produce the
+// right code.
+
+// AS_WIN            - Microsoft Windows
+// AS_LINUX          - Linux
+// AS_MAC            - Apple Macintosh
+// AS_BSD            - BSD based OS (FreeBSD, DragonFly, OpenBSD, etc)
+// AS_XBOX           - Microsoft XBox
+// AS_XBOX360        - Microsoft XBox 360
+// AS_PSP            - Sony Playstation Portable
+// AS_PSVITA         - Sony Playstation Vita
+// AS_PS2            - Sony Playstation 2
+// AS_PS3            - Sony Playstation 3
+// AS_DC             - Sega Dreamcast
+// AS_GC             - Nintendo GameCube
+// AS_WII            - Nintendo Wii
+// AS_WIIU           - Nintendo Wii U
+// AS_NINTENDOSWITCH - Nintendo Switch
+// AS_IPHONE         - Apple IPhone
+// AS_ANDROID        - Android
+// AS_HAIKU          - Haiku
+// AS_ILLUMOS        - Illumos like (OpenSolaris, OpenIndiana, NCP, etc)
+// AS_MARMALADE      - Marmalade cross platform SDK (a layer on top of the OS)
+// AS_SUN            - Sun UNIX
+
+
+
+
+//
+// Calling conventions
+//-----------------------------------------
+
+// GNU_STYLE_VIRTUAL_METHOD
+// This constant should be defined if method pointers store index for virtual
+// functions in the same location as the function pointer. In such cases the method
+// is identified as virtual if the least significant bit is set.
+
+// MULTI_BASE_OFFSET(x)
+// This macro is used to retrieve the offset added to the object pointer in order to
+// implicitly cast the object to the base object. x is the method pointer received by
+// the register function.
+
+// HAVE_VIRTUAL_BASE_OFFSET
+// Define this constant if the compiler stores the virtual base offset in the method
+// pointers. If it is not stored in the pointers then AngelScript have no way of
+// identifying a method as coming from a class with virtual inheritance.
+
+// VIRTUAL_BASE_OFFSET(x)
+// This macro is used to retrieve the offset added to the object pointer in order to
+// find the virtual base object. x is the method pointer received by the register
+// function;
+
+// COMPLEX_RETURN_MASK
+// This constant shows what attributes determine if an object is returned in memory
+// or in the registers as normal structures
+
+// COMPLEX_MASK
+// This constant shows what attributes determine if an object is implicitly passed
+// by reference or not, even if the argument is declared by value
+
+// THISCALL_RETURN_SIMPLE_IN_MEMORY
+// CDECL_RETURN_SIMPLE_IN_MEMORY
+// STDCALL_RETURN_SIMPLE_IN_MEMORY
+// When these constants are defined then the corresponding calling convention always
+// return classes/structs in memory regardless of size or complexity.
+
+// THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+// STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+// CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+// Specifies the minimum size in dwords a class/struct needs to be to be passed in memory
+
+// CALLEE_POPS_HIDDEN_RETURN_POINTER
+// This constant should be defined if the callee pops the hidden return pointer,
+// used when returning an object in memory.
+
+// THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
+// This constant should be defined if the callee pops the hidden return pointer
+// for thiscall functions; used when returning an object in memory.
+
+// THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+// With this constant defined AngelScript will pass the object pointer on the stack
+
+// THISCALL_CALLEE_POPS_ARGUMENTS
+// If the callee pops arguments for class methods then define this constant
+
+// COMPLEX_OBJS_PASSED_BY_REF
+// Some compilers always pass certain objects by reference. GNUC for example does
+// this if the the class has a defined destructor.
+
+// AS_LARGE_OBJS_PASSED_BY_REF
+// If this is defined large objects are passed by reference, whether they are complex or not
+
+// AS_LARGE_OBJ_MIN_SIZE
+// This is the size of objects determined as large ones
+
+// AS_CALLEE_DESTROY_OBJ_BY_VAL
+// When an object is passed by value the called function is the one responsible
+// for calling the destructor before returning.
+
+// HAS_128_BIT_PRIMITIVES
+// 64bit processors often support 128bit primitives. These may require special
+// treatment when passed in function arguments or returned by functions.
+
+// SPLIT_OBJS_BY_MEMBER_TYPES
+// On some platforms objects with primitive members are split over different
+// register types when passed by value to functions.
+
+
+
+
+
+//
+// Detect compiler
+//------------------------------------------------
+
+
+#define VALUE_OF_BOOLEAN_TRUE  1
+#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+#define THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
+
+// Not implemented by default. Undefined with tested platforms.
+#define AS_NO_THISCALL_FUNCTOR_METHOD
+
+
+// Emscripten compiler toolchain
+// ref: https://emscripten.org/
+#if defined(__EMSCRIPTEN__)
+  #define AS_MAX_PORTABILITY
+#endif
+
+
+
+// Embarcadero C++Builder
+#if defined(__BORLANDC__)
+ #ifndef _Windows
+  #error "Configuration doesn't yet support BCC for Linux or Mac OS."
+ #endif
+ #if defined(_M_X64)
+  #error "Configuration doesn't yet support BCC for AMD64."
+ #endif
+
+	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
+	#define HAVE_VIRTUAL_BASE_OFFSET
+	#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+2))
+	#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+	#define CDECL_RETURN_SIMPLE_IN_MEMORY
+	#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+	#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+	#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+	#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+	#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+	#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+	#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+
+	#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+	#define COMPLEX_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR)
+	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR)
+	#define STDCALL __stdcall
+	#define AS_SIZEOF_BOOL 1
+	#define AS_WINDOWS_THREADS
+	#undef THISCALL_CALLEE_POPS_HIDDEN_RETURN_POINTER
+
+	#define AS_WIN
+	#define AS_X86
+	#define ASM_INTEL
+
+	#define asVSNPRINTF(a, b, c, d) _vsnprintf(a, b, c, d)
+
+	#define fmodf(a,b) fmod(a,b)
+
+	#define UNREACHABLE_RETURN
+#endif
+
+// Microsoft Visual C++
+// Ref: http://msdn.microsoft.com/en-us/library/b0084kay.aspx
+#if defined(_MSC_VER) && !defined(__MWERKS__)
+
+	#if _MSC_VER <= 1200 // MSVC6
+		// Disable the useless warnings about truncated symbol names for template instances
+		#pragma warning( disable : 4786 )
+	#endif
+
+	#ifdef _M_X64
+		#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+2))
+		#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+4))
+	#else
+		#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
+		#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+3))
+	#endif
+	#define HAVE_VIRTUAL_BASE_OFFSET
+	#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+	#define THISCALL_PASS_OBJECT_POINTER_IN_ECX
+
+	// http://www.madewithmarmalade.com/
+	#if defined(__S3E__)
+		#ifndef AS_MARMALADE
+			// From now on we'll use the below define
+			#define AS_MARMALADE
+		#endif
+
+		// Marmalade doesn't use the Windows libraries
+		#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
+
+		// Marmalade doesn't seem to have proper support for
+		// atomic instructions or read/write locks, so we turn off
+		// multithread support
+		//#define AS_POSIX_THREADS
+		#define AS_NO_THREADS
+		#define AS_NO_ATOMIC
+
+		// Marmalade has it's own way of identifying the CPU target
+		// Note, when building for ARM, the gnuc compiler will always
+		// be used so we don't need to check for it here
+		#if defined(I3D_ARCH_X86)
+			#define AS_X86
+		#endif
+	#else
+		#if _MSC_VER < 1500  // MSVC++ 9 (aka MSVC++ .NET 2008)
+			#define asVSNPRINTF(a, b, c, d) _vsnprintf(a, b, c, d)
+		#else
+			#define asVSNPRINTF(a, b, c, d) vsnprintf_s(a, b, _TRUNCATE, c, d)
+		#endif
+
+		#define AS_WINDOWS_THREADS
+	#endif
+
+	#define THISCALL_CALLEE_POPS_ARGUMENTS
+	#define STDCALL __stdcall
+	#define AS_SIZEOF_BOOL 1
+	#define COMPLEX_OBJS_PASSED_BY_REF
+
+	#define ASM_INTEL  // Intel style for inline assembly on microsoft compilers
+
+	#if defined(WIN32) || defined(_WIN32) || defined(_WIN64)
+		#define AS_WIN
+	#endif
+
+	#if _XBOX_VER >= 200
+		// 360 uses a Xenon processor (which is a modified 64bit PPC)
+		#define AS_XBOX360
+		#define AS_XENON
+		#define AS_BIG_ENDIAN
+	#else
+		#if defined(_XBOX) || (defined(_M_IX86) && !defined(__LP64__))
+			#define AS_X86
+			#ifndef _XBOX
+				// Not tested with xbox (only enabled if is Windows)
+				#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#endif 
+		#elif defined(_M_X64)
+			#define AS_X64_MSVC
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
+			#define AS_LARGE_OBJS_PASSED_BY_REF
+			#define AS_LARGE_OBJ_MIN_SIZE 3
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY | asOBJ_APP_CLASS_MORE_CONSTRUCTORS)
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+		#endif
+	#endif
+
+	#if defined(_ARM_) || defined(_M_ARM)
+		#define AS_ARM
+		#define AS_CALLEE_DESTROY_OBJ_BY_VAL
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY)
+	
+		// Windows CE uses softfp calling convention, while Windows RT uses hardfp calling convention
+		// ref: http://stackoverflow.com/questions/16375355/what-is-the-windows-rt-on-arm-native-code-calling-convention
+		#if defined(_WIN32_WCE)
+			#define AS_SOFTFP
+		#endif
+	#endif
+
+	#if defined(_M_ARM64)
+		#define AS_ARM64
+
+		// TODO: MORE HERE
+	#endif
+
+	#ifndef COMPLEX_MASK
+		#define COMPLEX_MASK (asOBJ_APP_ARRAY)
+	#endif
+
+	#ifndef COMPLEX_RETURN_MASK
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT | asOBJ_APP_ARRAY | asOBJ_APP_CLASS_MORE_CONSTRUCTORS)
+	#endif
+
+	#define UNREACHABLE_RETURN
+#endif
+
+// Metrowerks CodeWarrior (experimental, let me know if something isn't working)
+#if defined(__MWERKS__) && !defined(EPPC) // JWC -- If Wii DO NOT use this even when using Metrowerks Compiler. Even though they are called Freescale...
+	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
+	#define HAVE_VIRTUAL_BASE_OFFSET
+	#define VIRTUAL_BASE_OFFSET(x) (*((asDWORD*)(&x)+3))
+	#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+	#define THISCALL_PASS_OBJECT_POINTER_IN_ECX
+	#define asVSNPRINTF(a, b, c, d) _vsnprintf(a, b, c, d)
+	#define THISCALL_CALLEE_POPS_ARGUMENTS
+	#define COMPLEX_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT)
+	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_CONSTRUCTOR | asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_ASSIGNMENT)
+	#define AS_SIZEOF_BOOL 1
+	#define AS_WINDOWS_THREADS
+	#define STDCALL __stdcall
+
+	// Support native calling conventions on x86, but not 64bit yet
+	#if defined(_M_IX86) && !defined(__LP64__)
+		#define AS_X86
+		#define ASM_INTEL  // Intel style for inline assembly
+	#endif
+
+	#define UNREACHABLE_RETURN
+#endif
+
+// SN Systems ProDG
+#if defined(__SNC__) || defined(SNSYS)
+	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
+	#define CALLEE_POPS_HIDDEN_RETURN_POINTER
+	#define COMPLEX_OBJS_PASSED_BY_REF
+
+	#ifdef __psp2__
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR)
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+	#else
+		#define GNU_STYLE_VIRTUAL_METHOD
+		#define ASM_AT_N_T  // AT&T style inline assembly
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR)
+	#endif
+
+	#define AS_SIZEOF_BOOL 1
+	#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
+
+	// SN doesnt seem to like STDCALL.
+	// Maybe it can work with some fiddling, but I can't imagine linking to
+	// any STDCALL functions with a console anyway...
+	#define STDCALL
+
+	// Linux specific
+	#ifdef __linux__
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+	#endif
+
+	// Support native calling conventions on x86, but not 64bit yet
+	#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+		#define AS_X86
+	// PS3
+	#elif (defined(__PPC__) || defined(__ppc__)) && defined(__PPU__)
+		// Support native calling conventions on PS3
+		#define AS_PS3
+		#define AS_PPC_64
+		#define AS_NO_MEMORY_H
+		#define AS_NO_EXCEPTIONS
+		#include <stdlib.h>
+	// PSP
+	#elif defined(__psp__)
+		#define AS_NO_MEMORY_H
+		#define AS_MIPS
+		#define AS_PSP
+		#define AS_USE_DOUBLE_AS_FLOAT
+	// PSVita
+	#elif defined(__psp2__)
+		#define AS_PSVITA
+		#define AS_ARM
+		#define AS_NO_MEMORY_H
+		#define AS_NO_EXCEPTIONS
+		#define AS_CALLEE_DESTROY_OBJ_BY_VAL
+		#undef AS_NO_THISCALL_FUNCTOR_METHOD
+	#endif
+
+	#define UNREACHABLE_RETURN
+#endif
+
+// GNU C (and MinGW or Cygwin on Windows)
+// Use the following command to determine predefined macros: echo . | g++ -dM -E -
+// MSVC2015 can now use CLang too, but it shouldn't go in here
+#if (defined(__GNUC__) && !defined(__SNC__) && !defined(_MSC_VER)) || defined(EPPC) || defined(__CYGWIN__) // JWC -- use this instead for Wii
+	#define GNU_STYLE_VIRTUAL_METHOD
+	#define MULTI_BASE_OFFSET(x) (*((asPWORD*)(&x)+1))
+	#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
+	#define CALLEE_POPS_HIDDEN_RETURN_POINTER
+	#define COMPLEX_OBJS_PASSED_BY_REF
+	#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_ARRAY)
+	#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_ARRAY)
+	#define AS_NO_MEMORY_H
+	#define AS_SIZEOF_BOOL 1
+	#define STDCALL __attribute__((stdcall))
+	#define ASM_AT_N_T
+
+	// WII U
+	#if defined(__ghs__)
+		#define AS_WIIU
+
+		// Native calling conventions are not yet supported
+		#define AS_MAX_PORTABILITY
+
+	// Nintendo Switch
+	// Note, __SWITCH__ is not an official define in the Nintendo dev kit. 
+	// You need to manually add this to the project when compiling for Switch.
+	#elif defined(__SWITCH__)
+		#define AS_NINTENDOSWITCH
+
+		#if (!defined(__LP64__))
+			#error write me
+		#else
+			#define AS_ARM64
+			#undef STDCALL
+			#define STDCALL
+
+			#undef GNU_STYLE_VIRTUAL_METHOD
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+
+			#define HAS_128_BIT_PRIMITIVES
+
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+
+			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 5
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE    5
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE  5
+		#endif
+
+	// Marmalade is a cross platform SDK. It uses g++ to compile for iOS and Android
+	#elif defined(__S3E__)
+		#ifndef AS_MARMALADE
+			// From now on we'll use the below define
+			#define AS_MARMALADE
+		#endif
+
+		// STDCALL is not available on Marmalade when compiled for iOS or Android
+		#undef STDCALL
+		#define STDCALL
+
+		// Marmalade doesn't seem to have proper support for
+		// atomic instructions or read/write locks
+		#define AS_NO_THREADS
+		#define AS_NO_ATOMIC
+
+		// Identify for which CPU the library is being built
+		#if defined(I3D_ARCH_X86)
+			#define AS_X86
+		#elif defined(I3D_ARCH_ARM)
+			#define AS_ARM
+
+			#define AS_SOFTFP
+
+			// Marmalade appear to use the same ABI as Android when built for ARM
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+
+			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+
+			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+
+			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+
+			#undef GNU_STYLE_VIRTUAL_METHOD
+
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+
+			#define AS_CALLEE_DESTROY_OBJ_BY_VAL
+		#endif
+
+	// MacOSX and IPhone
+	#elif defined(__APPLE__)
+
+		#include <TargetConditionals.h>
+
+		// Is this a Mac or an IPhone (or other iOS device)?
+		#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1
+			#define AS_IPHONE
+		#else
+			#define AS_MAC
+		#endif
+
+		// The sizeof bool is different depending on the target CPU
+		#undef AS_SIZEOF_BOOL
+		#if defined(__ppc__)
+			#define AS_SIZEOF_BOOL 4
+			// STDCALL is not available on PPC
+			#undef STDCALL
+			#define STDCALL
+		#else
+			#define AS_SIZEOF_BOOL 1
+		#endif
+
+		#if (defined(_ARM_) || defined(__arm__))
+			// iOS use ARM processor
+			#define AS_ARM
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+
+			#undef GNU_STYLE_VIRTUAL_METHOD
+
+			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+			#define COMPLEX_OBJS_PASSED_BY_REF
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+
+			// iOS uses soft-float ABI
+			#define AS_SOFTFP
+
+			// STDCALL is not available on ARM
+			#undef STDCALL
+			#define STDCALL
+
+		#elif (defined(__aarch64__))
+			// The IPhone 5S+ uses an ARM64 processor
+
+			// AngelScript currently doesn't support native calling
+			// for 64bit ARM processors so it's necessary to turn on
+			// portability mode
+			#define AS_MAX_PORTABILITY
+
+			// STDCALL is not available on ARM
+			#undef STDCALL
+			#define STDCALL
+
+		#elif (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			// Support native calling conventions on Mac OS X + Intel 32bit CPU
+			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+
+		#elif defined(__LP64__) && !defined(__ppc__) && !defined(__PPC__) && !defined(__aarch64__)
+			// http://developer.apple.com/library/mac/#documentation/DeveloperTools/Conceptual/LowLevelABI/140-x86-64_Function_Calling_Conventions/x86_64.html#//apple_ref/doc/uid/TP40005035-SW1
+			#define AS_X64_GCC
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#define HAS_128_BIT_PRIMITIVES
+			#define SPLIT_OBJS_BY_MEMBER_TYPES
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#define AS_LARGE_OBJS_PASSED_BY_REF
+			#define AS_LARGE_OBJ_MIN_SIZE 5
+			// STDCALL is not available on 64bit Mac
+			#undef STDCALL
+			#define STDCALL
+
+		#elif (defined(__ppc__) || defined(__PPC__)) && !defined(__LP64__)
+			// Support native calling conventions on Mac OS X + PPC 32bit CPU
+			#define AS_PPC
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+
+		#elif (defined(__ppc__) || defined(__PPC__)) && defined(__LP64__)
+			#define AS_PPC_64
+		#else
+			// Unknown CPU type
+			#define AS_MAX_PORTABILITY
+		#endif
+		#define AS_POSIX_THREADS
+
+	// Windows
+	#elif defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
+		// On Windows the simple classes are returned in the EAX:EDX registers
+		//#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+		//#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		//#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+
+		#undef COMPLEX_MASK
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+		#undef COMPLEX_RETURN_MASK
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+
+		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			// Support native calling conventions on Intel 32bit CPU
+			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+
+			// As of version 4.7 MinGW changed the ABI, presumably
+			// to be better aligned with how MSVC works
+			#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || __GNUC__ > 4
+				#define AS_MINGW47
+			#endif
+		
+			#if (__clang_major__ == 3 && __clang_minor__ > 4) || __clang_major > 3
+				#define AS_MINGW47
+			#endif
+
+			#ifdef AS_MINGW47
+				#undef  CALLEE_POPS_HIDDEN_RETURN_POINTER
+				#define THISCALL_CALLEE_POPS_ARGUMENTS
+			#else
+				// Earlier versions than 4.7
+				#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#endif
+
+		#elif defined(__x86_64__)
+			#define AS_X64_MINGW
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#define AS_LARGE_OBJS_PASSED_BY_REF
+			#define AS_LARGE_OBJ_MIN_SIZE 3
+			#define COMPLEX_OBJS_PASSED_BY_REF
+		#else
+			#define AS_MAX_PORTABILITY
+		#endif
+		#define AS_WIN
+		#define AS_WINDOWS_THREADS
+
+	// Linux
+	#elif defined(__linux__) && !defined(ANDROID) && !defined(__ANDROID__)
+
+		#undef COMPLEX_MASK
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+		#undef COMPLEX_RETURN_MASK
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+
+		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			// x86 32bit
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+
+			// Support native calling conventions on Intel 32bit CPU
+			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+		#elif defined(__x86_64__)
+			// x86 64bit
+			#define AS_X64_GCC
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#define HAS_128_BIT_PRIMITIVES
+			#define SPLIT_OBJS_BY_MEMBER_TYPES
+			#define AS_LARGE_OBJS_PASSED_BY_REF
+			#define AS_LARGE_OBJ_MIN_SIZE 5
+			// STDCALL is not available on 64bit Linux
+			#undef STDCALL
+			#define STDCALL
+		#elif defined(__ARMEL__) || defined(__arm__) || defined(__aarch64__) || defined(__AARCH64EL__)
+			// arm 
+
+			// The assembler code currently doesn't support arm v4
+			#if !defined(__ARM_ARCH_4__) && !defined(__ARM_ARCH_4T__) && !defined(__LP64__)
+				#define AS_ARM
+
+				// TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S
+				#define AS_NO_EXCEPTIONS
+
+				#undef STDCALL
+				#define STDCALL
+
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+
+				#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+				#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+				#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+
+				#ifndef AS_MAX_PORTABILITY
+				// Make a few checks against incompatible ABI combinations
+				#if defined(__FAST_MATH__) && __FAST_MATH__ == 1
+					#error -ffast-math is not supported with native calling conventions
+				#endif
+				#endif
+
+				// Verify if soft-float or hard-float ABI is used
+				#if (defined(__SOFTFP__) && __SOFTFP__ == 1) || defined(__ARM_PCS)
+					// -ffloat-abi=softfp or -ffloat-abi=soft
+					#define AS_SOFTFP
+				#endif
+
+				// Tested with both hard float and soft float abi
+				#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#elif defined(__LP64__) || defined(__aarch64__)
+				#define AS_ARM64
+
+				#undef STDCALL
+				#define STDCALL
+
+				#undef GNU_STYLE_VIRTUAL_METHOD
+				#undef AS_NO_THISCALL_FUNCTOR_METHOD
+
+				#define HAS_128_BIT_PRIMITIVES
+
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+
+				#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+				#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+				#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 5
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE    5
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE  5
+			#endif
+
+		#elif defined(__mips__)
+			// mips
+			#define AS_MIPS
+			#undef STDCALL
+			#define STDCALL
+
+			#ifdef _ABIO32
+				// 32bit O32 ABI
+				#define AS_MIPS
+
+				// All structures are returned in memory regardless of size or complexity
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+				#define	THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+				#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#else
+				// For other ABIs the native calling convention is not available (yet)
+				#define AS_MAX_PORTABILITY
+			#endif
+		#elif defined(__PPC64__)
+			// PPC 64bit
+
+			// The code in as_callfunc_ppc_64.cpp was built for PS3 and XBox 360, that 
+			// although use 64bit PPC only uses 32bit pointers.
+			// TODO: Add support for native calling conventions on Linux with PPC 64bit
+			#define AS_MAX_PORTABILITY
+		#elif defined(__e2k__)
+			// 64bit MCST Elbrus 2000
+			// ref: https://en.wikipedia.org/wiki/Elbrus_2000
+			#define AS_E2K
+			// AngelScript currently doesn't support native calling
+			// for MCST Elbrus 2000 processor so it's necessary to turn on
+			// portability mode
+			#define AS_MAX_PORTABILITY
+			// STDCALL is not available on 64bit Linux
+			#undef STDCALL
+			#define STDCALL
+		#else
+			#define AS_MAX_PORTABILITY
+		#endif
+		#define AS_LINUX
+		#define AS_POSIX_THREADS
+
+		#if !( ( (__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) || __GNUC__ > 4) )
+			// Only with GCC 4.1 was the atomic instructions available
+			#define AS_NO_ATOMIC
+		#endif
+
+	// Free BSD
+	#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+		#define AS_BSD
+		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#define AS_X86
+		#elif defined(__x86_64__)
+			#define AS_X64_GCC
+			#define HAS_128_BIT_PRIMITIVES
+			#define SPLIT_OBJS_BY_MEMBER_TYPES
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#define AS_LARGE_OBJS_PASSED_BY_REF
+			#define AS_LARGE_OBJ_MIN_SIZE 5
+			#undef STDCALL
+			#define STDCALL
+		#else
+			#define AS_MAX_PORTABILITY
+		#endif
+		#define AS_POSIX_THREADS
+		#if !( ( (__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) || __GNUC__ > 4) )
+			// Only with GCC 4.1 was the atomic instructions available
+			#define AS_NO_ATOMIC
+		#endif
+
+	// PSP and PS2
+	#elif defined(__PSP__) || defined(__psp__) || defined(_EE_) || defined(_PSP) || defined(_PS2)
+		// Support native calling conventions on MIPS architecture
+		#if (defined(_MIPS_ARCH) || defined(_mips) || defined(__MIPSEL__)) && !defined(__LP64__)
+			#define AS_MIPS
+			#define AS_USE_DOUBLE_AS_FLOAT
+		#else
+			#define AS_MAX_PORTABILITY
+		#endif
+
+	// PS3
+	#elif (defined(__PPC__) || defined(__ppc__)) && defined(__PPU__)
+		// Support native calling conventions on PS3
+		#define AS_PS3
+		#define AS_PPC_64
+		#define SPLIT_OBJS_BY_MEMBER_TYPES
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+		// PS3 doesn't have STDCALL
+		#undef STDCALL
+		#define STDCALL
+
+	// Dreamcast
+	#elif __SH4_SINGLE_ONLY__
+		// Support native calling conventions on Dreamcast
+		#define AS_DC
+		#define AS_SH4
+
+	// Wii JWC - Close to PS3 just no PPC_64 and AS_PS3
+	#elif defined(EPPC)
+		#define AS_WII
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+		#undef STDCALL
+		#define STDCALL
+
+	// Android
+	#elif defined(ANDROID) || defined(__ANDROID__)
+		#define AS_ANDROID
+
+		// Android 2.3+ supports posix threads
+		#define AS_POSIX_THREADS
+
+		// Common configuration with Android arm and x86
+		#define CDECL_RETURN_SIMPLE_IN_MEMORY
+		#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+		#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+
+		#undef COMPLEX_MASK
+		#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+		#undef COMPLEX_RETURN_MASK
+		#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+
+		#if (defined(_ARM_) || defined(__arm__) || defined(__aarch64__) || defined(__AARCH64EL__))
+			// Android ARM
+
+			#undef THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+			#undef STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE
+
+			// The stdcall calling convention is not used on the arm cpu
+			#undef STDCALL
+			#define STDCALL
+
+			#undef GNU_STYLE_VIRTUAL_METHOD
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+
+			#if (!defined(__LP64__))
+				// TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S
+				#define AS_NO_EXCEPTIONS
+
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 2
+
+				#define AS_ARM
+				#define AS_SOFTFP
+				#define AS_CALLEE_DESTROY_OBJ_BY_VAL
+			#elif (defined(__LP64__) || defined(__aarch64__))
+				#define AS_ARM64
+
+				#define HAS_128_BIT_PRIMITIVES
+
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 5
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE    5
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE  5
+			#endif
+		#elif (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			// Android Intel x86 (same config as Linux x86). Tested with Intel x86 Atom System Image.
+
+			// Support native calling conventions on Intel 32bit CPU
+			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#define AS_X86
+			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+		#elif defined(__mips__)
+			#define AS_MIPS
+			#undef STDCALL
+			#define STDCALL
+
+			#ifdef _ABIO32
+				#define AS_MIPS
+
+				// All structures are returned in memory regardless of size or complexity
+				#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+				#define	THISCALL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+				#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+				#define CDECL_RETURN_SIMPLE_IN_MEMORY_MIN_SIZE 0
+				#undef AS_NO_THISCALL_FUNCTOR_METHOD
+			#else
+				// For other ABIs the native calling convention is not available (yet)
+				#define AS_MAX_PORTABILITY
+			#endif
+		#endif
+
+	// Haiku OS
+	#elif __HAIKU__
+		#define AS_HAIKU
+		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			#define AS_X86
+			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+		#elif defined(__x86_64__)
+			#define AS_X64_GCC
+			#define HAS_128_BIT_PRIMITIVES
+			#define SPLIT_OBJS_BY_MEMBER_TYPES
+			#undef COMPLEX_MASK
+			#define COMPLEX_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#undef COMPLEX_RETURN_MASK
+			#define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY)
+			#define AS_LARGE_OBJS_PASSED_BY_REF
+			#define AS_LARGE_OBJ_MIN_SIZE 5
+			#undef STDCALL
+			#define STDCALL
+		#else
+			#define AS_MAX_PORTABILITY
+		#endif
+
+	// Illumos
+	#elif defined(__sun)
+		#if (defined(i386) || defined(__i386) || defined(__i386__)) && !defined(__LP64__)
+			#define THISCALL_RETURN_SIMPLE_IN_MEMORY
+			#define CDECL_RETURN_SIMPLE_IN_MEMORY
+			#define STDCALL_RETURN_SIMPLE_IN_MEMORY
+
+			// Support native calling conventions on Intel 32bit CPU
+			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+			#define AS_X86
+		#elif defined(__x86_64__)
+			#define AS_X64_GCC
+			#define HAS_128_BIT_PRIMITIVES
+			#define SPLIT_OBJS_BY_MEMBER_TYPES
+			// STDCALL is not available on 64bit Linux
+			#undef STDCALL
+			#define STDCALL
+		#else
+			#define AS_MAX_PORTABILITY
+		#endif
+		#define AS_ILLUMOS
+		#define AS_POSIX_THREADS
+
+		#if !( ( (__GNUC__ == 4) && (__GNUC_MINOR__ >= 1) || __GNUC__ > 4) )
+			// Only with GCC 4.1 was the atomic instructions available
+			#define AS_NO_ATOMIC
+		#endif
+	#endif
+
+	#define UNREACHABLE_RETURN
+#endif
+
+// Sun CC
+// Initial information provided by Andrey Bergman
+#if defined(__SUNPRO_CC)
+	#if defined(__sparc)
+		#define AS_SPARC
+	#endif
+
+	#if defined(__sun)
+		#define AS_SUN
+	#endif
+
+	// Native calling conventions is not yet supported for Sun CC
+	#if !defined(AS_MAX_PORTABILITY)
+		#define AS_MAX_PORTABILITY
+	#endif
+
+	// I presume Sun CC uses a similar structure of method pointers as gnuc
+	#define MULTI_BASE_OFFSET(x) (*((asPWORD*)(&x)+1))
+
+	#if !defined(AS_SIZEOF_BOOL)
+		#define AS_SIZEOF_BOOL 1 // sizeof(bool) == 1
+	#endif
+	#if !defined(UNREACHABLE_RETURN)
+		#define UNREACHABLE_RETURN
+	#endif
+	#if !defined(STDCALL)
+		#define STDCALL // There is no stdcall on Solaris/SunPro/SPARC
+	#endif
+	#if !defined(asVSNPRINTF)
+		#define asVSNPRINTF(a, b, c, d) vsnprintf(a, b, c, d)
+	#endif
+#endif
+
+
+//
+// Detect target hardware
+//------------------------------------------------
+
+// Big endian CPU target?
+// see: http://sourceforge.net/p/predef/wiki/Endianness/
+#if !defined(AS_BIG_ENDIAN) && \
+	defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN || \
+	defined(__BIG_ENDIAN__) || \
+	defined(__ARMEB__) || \
+	defined(__THUMBEB__) || \
+	defined(__AARCH64EB__) || \
+	defined(_MIBSEB) || defined(__MIBSEB) || defined(__MIBSEB__)
+		#define AS_BIG_ENDIAN
+#endif
+
+// Dreamcast and Gamecube use only 32bit floats, so treat doubles as floats
+#if defined(__SH4_SINGLE_ONLY__) || defined(_GC)
+	#define AS_USE_DOUBLE_AS_FLOAT	// use 32bit floats instead of doubles
+#endif
+
+// If there are no current support for native calling
+// conventions, then compile with AS_MAX_PORTABILITY
+#if (!defined(AS_X86) && !defined(AS_SH4) && !defined(AS_MIPS) && !defined(AS_PPC) && !defined(AS_PPC_64) && !defined(AS_XENON) && !defined(AS_X64_GCC) && !defined(AS_X64_MSVC) && !defined(AS_ARM) && !defined(AS_ARM64) && !defined(AS_X64_MINGW))
+	#ifndef AS_MAX_PORTABILITY
+		#define AS_MAX_PORTABILITY
+	#endif
+#endif
+
+// If the platform doesn't support atomic instructions we can't allow
+// multithreading as the reference counters won't be threadsafe
+#if defined(AS_NO_ATOMIC) && !defined(AS_NO_THREADS)
+	#define AS_NO_THREADS
+#endif
+
+// If the form of threads to use hasn't been chosen
+// then the library will be compiled without support
+// for multithreading
+#if !defined(AS_POSIX_THREADS) && !defined(AS_WINDOWS_THREADS)
+	#define AS_NO_THREADS
+#endif
+
+
+// The assert macro
+#if defined(ANDROID)
+	#if defined(AS_DEBUG)
+		#include <android/log.h>
+		#include <stdlib.h>
+		#define asASSERT(x) \
+			do { \
+			    if (!(x)) { \
+			        __android_log_print(ANDROID_LOG_ERROR, "AngelScript", "Assert failed at %s:%d - %s", __FILE__, __LINE__, #x); \
+			        exit(1); \
+			    } \
+			} while (0)
+	#else
+		#define asASSERT(x)
+	#endif
+#else
+	#include <assert.h>
+	#define asASSERT(x) assert(x)
+#endif
+
+
+
+//
+// Internal defines (do not change these)
+//----------------------------------------------------------------
+
+#define ARG_W(b)     ((asWORD*)&b)
+#define ARG_DW(b)    ((asDWORD*)&b)
+#define ARG_QW(b)    ((asQWORD*)&b)
+#define ARG_PTR(b)   ((asPWORD*)&b)
+#define BCARG_W(b)   ((asWORD*)&(b)[1])
+#define BCARG_DW(b)  ((asDWORD*)&(b)[1])
+#define BCARG_QW(b)  ((asQWORD*)&(b)[1])
+#define BCARG_PTR(b) ((asPWORD*)&(b)[1])
+
+// This macro is used to avoid warnings about unused variables.
+// Usually where the variables are only used in debug mode.
+#define UNUSED_VAR(x) (void)(x)
+
+#include "../include/angelscript.h"
+#include "as_memory.h"
+
+#ifdef AS_USE_NAMESPACE
+using namespace AngelScript;
+#endif
+
+#endif
diff --git a/Sources/AngelScript/source/as_configgroup.cpp b/Sources/AngelScript/source/as_configgroup.cpp
old mode 100755
new mode 100644
index 0d1fdd0e5..a29bc9336
--- a/Sources/AngelScript/source/as_configgroup.cpp
+++ b/Sources/AngelScript/source/as_configgroup.cpp
@@ -1,212 +1,209 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_configgroup.cpp
-//
-// This class holds configuration groups for the engine
-//
-
-
-
-#include "as_config.h"
-#include "as_configgroup.h"
-#include "as_scriptengine.h"
-#include "as_texts.h"
-
-BEGIN_AS_NAMESPACE
-
-asCConfigGroup::asCConfigGroup()
-{
-	refCount = 0;
-}
-
-asCConfigGroup::~asCConfigGroup()
-{
-}
-
-int asCConfigGroup::AddRef()
-{
-	refCount++;
-	return refCount;
-}
-
-int asCConfigGroup::Release()
-{
-	// Don't delete the object here, the engine will delete the object when ready
-	refCount--;
-	return refCount;
-}
-
-asCTypeInfo *asCConfigGroup::FindType(const char *obj)
-{
-	for( asUINT n = 0; n < types.GetLength(); n++ )
-		if( types[n]->name == obj )
-			return types[n];
-
-	return 0;
-}
-
-void asCConfigGroup::RefConfigGroup(asCConfigGroup *group)
-{
-	if( group == this || group == 0 ) return;
-
-	// Verify if the group is already referenced
-	for( asUINT n = 0; n < referencedConfigGroups.GetLength(); n++ )
-		if( referencedConfigGroups[n] == group )
-			return;
-
-	referencedConfigGroups.PushLast(group);
-	group->AddRef();
-}
-
-void asCConfigGroup::AddReferencesForFunc(asCScriptEngine *engine, asCScriptFunction *func)
-{
-	AddReferencesForType(engine, func->returnType.GetTypeInfo());
-	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
-		AddReferencesForType(engine, func->parameterTypes[n].GetTypeInfo());
-}
-
-void asCConfigGroup::AddReferencesForType(asCScriptEngine *engine, asCTypeInfo *type)
-{
-	if( type == 0 ) return;
-
-	// Keep reference to other groups
-	RefConfigGroup(engine->FindConfigGroupForTypeInfo(type));
-
-	// Keep track of which generated template instances the config group uses
-	if( type->flags & asOBJ_TEMPLATE && engine->generatedTemplateTypes.Exists(type->CastToObjectType()) && !generatedTemplateInstances.Exists(type->CastToObjectType()) )
-		generatedTemplateInstances.PushLast(type->CastToObjectType());
-}
-
-bool asCConfigGroup::HasLiveObjects()
-{
-	for( asUINT n = 0; n < types.GetLength(); n++ )
-		if( types[n]->externalRefCount.get() != 0 )
-			return true;
-
-	return false;
-}
-
-void asCConfigGroup::RemoveConfiguration(asCScriptEngine *engine, bool notUsed)
-{
-	asASSERT( refCount == 0 );
-
-	asUINT n;
-
-	// Remove global variables
-	for( n = 0; n < globalProps.GetLength(); n++ )
-	{
-		int index = engine->registeredGlobalProps.GetIndex(globalProps[n]);
-		if( index >= 0 )
-		{
-			globalProps[n]->Release();
-
-			// TODO: global: Should compact the registeredGlobalProps array
-			engine->registeredGlobalProps.Erase(index);
-		}
-	}
-	globalProps.SetLength(0);
-
-	// Remove global functions
-	for( n = 0; n < scriptFunctions.GetLength(); n++ )
-	{
-		int index = engine->registeredGlobalFuncs.GetIndex(scriptFunctions[n]);
-		if( index >= 0 )
-			engine->registeredGlobalFuncs.Erase(index);
-		scriptFunctions[n]->ReleaseInternal();
-		if( engine->stringFactory == scriptFunctions[n] )
-			engine->stringFactory = 0;
-	}
-	scriptFunctions.SetLength(0);
-
-	// Remove behaviours and members of object types
-	for( n = 0; n < types.GetLength(); n++ )
-	{
-		asCObjectType *obj = types[n]->CastToObjectType();
-		if( obj )
-			obj->ReleaseAllFunctions();
-	}
-
-	// Remove object types (skip this if it is possible other groups are still using the types)
-	if( !notUsed )
-	{
-		for( n = asUINT(types.GetLength()); n-- > 0; )
-		{
-			asCTypeInfo *t = types[n];
-			asSMapNode<asSNameSpaceNamePair, asCTypeInfo*> *cursor;
-			if( engine->allRegisteredTypes.MoveTo(&cursor, asSNameSpaceNamePair(t->nameSpace, t->name)) &&
-				cursor->value == t )
-			{
-				engine->allRegisteredTypes.Erase(cursor);
-
-				if( engine->defaultArrayObjectType == t )
-					engine->defaultArrayObjectType = 0;
-
-				if( t->flags & asOBJ_TYPEDEF )
-					engine->registeredTypeDefs.RemoveValue(t->CastToTypedefType());
-				else if( t->flags & asOBJ_ENUM )
-					engine->registeredEnums.RemoveValue(t->CastToEnumType());
-				else if (t->flags & asOBJ_TEMPLATE)
-					engine->registeredTemplateTypes.RemoveValue(t->CastToObjectType());
-				else if (t->flags & asOBJ_FUNCDEF)
-				{
-					engine->registeredFuncDefs.RemoveValue(t->CastToFuncdefType());
-					engine->RemoveFuncdef(t->CastToFuncdefType());
-				}
-				else
-					engine->registeredObjTypes.RemoveValue(t->CastToObjectType());
-
-				t->DestroyInternal();
-				t->ReleaseInternal();
-			}
-			else
-			{
-				int idx = engine->templateInstanceTypes.IndexOf(t->CastToObjectType());
-				if( idx >= 0 )
-				{
-					engine->templateInstanceTypes.RemoveIndexUnordered(idx);
-					asCObjectType *ot = t->CastToObjectType();
-					ot->DestroyInternal();
-					ot->ReleaseInternal();
-				}
-			}
-		}
-		types.SetLength(0);
-	}
-
-	// Release other config groups
-	for( n = 0; n < referencedConfigGroups.GetLength(); n++ )
-		referencedConfigGroups[n]->refCount--;
-	referencedConfigGroups.SetLength(0);
-}
-
-END_AS_NAMESPACE
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2020 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_configgroup.cpp
+//
+// This class holds configuration groups for the engine
+//
+
+
+
+#include "as_config.h"
+#include "as_configgroup.h"
+#include "as_scriptengine.h"
+#include "as_texts.h"
+
+BEGIN_AS_NAMESPACE
+
+asCConfigGroup::asCConfigGroup()
+{
+	refCount = 0;
+}
+
+asCConfigGroup::~asCConfigGroup()
+{
+}
+
+int asCConfigGroup::AddRef()
+{
+	refCount++;
+	return refCount;
+}
+
+int asCConfigGroup::Release()
+{
+	// Don't delete the object here, the engine will delete the object when ready
+	refCount--;
+	return refCount;
+}
+
+asCTypeInfo *asCConfigGroup::FindType(const char *obj)
+{
+	for( asUINT n = 0; n < types.GetLength(); n++ )
+		if( types[n]->name == obj )
+			return types[n];
+
+	return 0;
+}
+
+void asCConfigGroup::RefConfigGroup(asCConfigGroup *group)
+{
+	if( group == this || group == 0 ) return;
+
+	// Verify if the group is already referenced
+	for( asUINT n = 0; n < referencedConfigGroups.GetLength(); n++ )
+		if( referencedConfigGroups[n] == group )
+			return;
+
+	referencedConfigGroups.PushLast(group);
+	group->AddRef();
+}
+
+void asCConfigGroup::AddReferencesForFunc(asCScriptEngine *engine, asCScriptFunction *func)
+{
+	AddReferencesForType(engine, func->returnType.GetTypeInfo());
+	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
+		AddReferencesForType(engine, func->parameterTypes[n].GetTypeInfo());
+}
+
+void asCConfigGroup::AddReferencesForType(asCScriptEngine *engine, asCTypeInfo *type)
+{
+	if( type == 0 ) return;
+
+	// Keep reference to other groups
+	RefConfigGroup(engine->FindConfigGroupForTypeInfo(type));
+
+	// Keep track of which generated template instances the config group uses
+	if( type->flags & asOBJ_TEMPLATE && engine->generatedTemplateTypes.Exists(CastToObjectType(type)) && !generatedTemplateInstances.Exists(CastToObjectType(type)) )
+		generatedTemplateInstances.PushLast(CastToObjectType(type));
+}
+
+bool asCConfigGroup::HasLiveObjects()
+{
+	for( asUINT n = 0; n < types.GetLength(); n++ )
+		if( types[n]->externalRefCount.get() != 0 )
+			return true;
+
+	return false;
+}
+
+void asCConfigGroup::RemoveConfiguration(asCScriptEngine *engine, bool notUsed)
+{
+	asASSERT( refCount == 0 );
+
+	asUINT n;
+
+	// Remove global variables
+	for( n = 0; n < globalProps.GetLength(); n++ )
+	{
+		int index = engine->registeredGlobalProps.GetIndex(globalProps[n]);
+		if( index >= 0 )
+		{
+			globalProps[n]->Release();
+
+			engine->registeredGlobalProps.Erase(index);
+		}
+	}
+	globalProps.SetLength(0);
+
+	// Remove global functions
+	for( n = 0; n < scriptFunctions.GetLength(); n++ )
+	{
+		int index = engine->registeredGlobalFuncs.GetIndex(scriptFunctions[n]);
+		if( index >= 0 )
+			engine->registeredGlobalFuncs.Erase(index);
+		scriptFunctions[n]->ReleaseInternal();
+	}
+	scriptFunctions.SetLength(0);
+
+	// Remove behaviours and members of object types
+	for( n = 0; n < types.GetLength(); n++ )
+	{
+		asCObjectType *obj = CastToObjectType(types[n]);
+		if( obj )
+			obj->ReleaseAllFunctions();
+	}
+
+	// Remove object types (skip this if it is possible other groups are still using the types)
+	if( !notUsed )
+	{
+		for( n = asUINT(types.GetLength()); n-- > 0; )
+		{
+			asCTypeInfo *t = types[n];
+			asSMapNode<asSNameSpaceNamePair, asCTypeInfo*> *cursor;
+			if( engine->allRegisteredTypes.MoveTo(&cursor, asSNameSpaceNamePair(t->nameSpace, t->name)) &&
+				cursor->value == t )
+			{
+				engine->allRegisteredTypes.Erase(cursor);
+
+				if( engine->defaultArrayObjectType == t )
+					engine->defaultArrayObjectType = 0;
+
+				if( t->flags & asOBJ_TYPEDEF )
+					engine->registeredTypeDefs.RemoveValue(CastToTypedefType(t));
+				else if( t->flags & asOBJ_ENUM )
+					engine->registeredEnums.RemoveValue(CastToEnumType(t));
+				else if (t->flags & asOBJ_TEMPLATE)
+					engine->registeredTemplateTypes.RemoveValue(CastToObjectType(t));
+				else if (t->flags & asOBJ_FUNCDEF)
+				{
+					engine->registeredFuncDefs.RemoveValue(CastToFuncdefType(t));
+					engine->RemoveFuncdef(CastToFuncdefType(t));
+				}
+				else
+					engine->registeredObjTypes.RemoveValue(CastToObjectType(t));
+
+				t->DestroyInternal();
+				t->ReleaseInternal();
+			}
+			else
+			{
+				int idx = engine->templateInstanceTypes.IndexOf(CastToObjectType(t));
+				if( idx >= 0 )
+				{
+					engine->templateInstanceTypes.RemoveIndexUnordered(idx);
+					asCObjectType *ot = CastToObjectType(t);
+					ot->DestroyInternal();
+					ot->ReleaseInternal();
+				}
+			}
+		}
+		types.SetLength(0);
+	}
+
+	// Release other config groups
+	for( n = 0; n < referencedConfigGroups.GetLength(); n++ )
+		referencedConfigGroups[n]->refCount--;
+	referencedConfigGroups.SetLength(0);
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/source/as_configgroup.h b/Sources/AngelScript/source/as_configgroup.h
old mode 100755
new mode 100644
index 01caeef3c..48720301e
--- a/Sources/AngelScript/source/as_configgroup.h
+++ b/Sources/AngelScript/source/as_configgroup.h
@@ -1,84 +1,84 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_configgroup.h
-//
-// This class holds configuration groups for the engine
-//
-
-
-
-#ifndef AS_CONFIGGROUP_H
-#define AS_CONFIGGROUP_H
-
-#include "as_config.h"
-#include "as_string.h"
-#include "as_array.h"
-#include "as_objecttype.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCConfigGroup
-{
-public:
-	asCConfigGroup();
-	~asCConfigGroup();
-
-	// Memory management
-	int AddRef();
-	int Release();
-
-	asCTypeInfo *FindType(const char *name);
-	void RefConfigGroup(asCConfigGroup *group);
-
-	bool HasLiveObjects();
-	void RemoveConfiguration(asCScriptEngine *engine, bool notUsed = false);
-
-	void AddReferencesForFunc(asCScriptEngine *engine, asCScriptFunction *func);
-	void AddReferencesForType(asCScriptEngine *engine, asCTypeInfo *type);
-
-	asCString groupName;
-	int refCount;
-
-	asCArray<asCTypeInfo*>       types;
-	asCArray<asCScriptFunction*> scriptFunctions;
-	asCArray<asCGlobalProperty*> globalProps;
-	asCArray<asCConfigGroup*>    referencedConfigGroups;
-
-	// This array holds the generated template instances that are used 
-	// by the config group as part of function signature or property
-	asCArray<asCObjectType*>     generatedTemplateInstances;
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_configgroup.h
+//
+// This class holds configuration groups for the engine
+//
+
+
+
+#ifndef AS_CONFIGGROUP_H
+#define AS_CONFIGGROUP_H
+
+#include "as_config.h"
+#include "as_string.h"
+#include "as_array.h"
+#include "as_objecttype.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCConfigGroup
+{
+public:
+	asCConfigGroup();
+	~asCConfigGroup();
+
+	// Memory management
+	int AddRef();
+	int Release();
+
+	asCTypeInfo *FindType(const char *name);
+	void RefConfigGroup(asCConfigGroup *group);
+
+	bool HasLiveObjects();
+	void RemoveConfiguration(asCScriptEngine *engine, bool notUsed = false);
+
+	void AddReferencesForFunc(asCScriptEngine *engine, asCScriptFunction *func);
+	void AddReferencesForType(asCScriptEngine *engine, asCTypeInfo *type);
+
+	asCString groupName;
+	int refCount;
+
+	asCArray<asCTypeInfo*>       types;
+	asCArray<asCScriptFunction*> scriptFunctions;
+	asCArray<asCGlobalProperty*> globalProps;
+	asCArray<asCConfigGroup*>    referencedConfigGroups;
+
+	// This array holds the generated template instances that are used 
+	// by the config group as part of function signature or property
+	asCArray<asCObjectType*>     generatedTemplateInstances;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_context.cpp b/Sources/AngelScript/source/as_context.cpp
old mode 100755
new mode 100644
index c7c9d1bfb..e6867904b
--- a/Sources/AngelScript/source/as_context.cpp
+++ b/Sources/AngelScript/source/as_context.cpp
@@ -1,5780 +1,6666 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_context.cpp
-//
-// This class handles the execution of the byte code
-//
-
-#include <math.h> // fmodf() pow()
-
-#include "as_config.h"
-#include "as_context.h"
-#include "as_scriptengine.h"
-#include "as_tokendef.h"
-#include "as_texts.h"
-#include "as_callfunc.h"
-#include "as_generic.h"
-#include "as_debug.h" // mkdir()
-#include "as_bytecode.h"
-#include "as_scriptobject.h"
-
-#ifdef _MSC_VER
-#pragma warning(disable:4702) // unreachable code
-#endif
-
-BEGIN_AS_NAMESPACE
-
-// We need at least 2 PTRs reserved for exception handling
-// We need at least 1 PTR reserved for calling system functions
-const int RESERVE_STACK = 2*AS_PTR_SIZE;
-
-// For each script function call we push 9 PTRs on the call stack
-const int CALLSTACK_FRAME_SIZE = 9;
-
-#if defined(AS_DEBUG)
-
-class asCDebugStats
-{
-public:
-	asCDebugStats()
-	{
-		memset(instrCount, 0, sizeof(instrCount));
-		memset(instrCount2, 0, sizeof(instrCount2));
-		lastBC = 255;
-	}
-
-	~asCDebugStats()
-	{
-		// This code writes out some statistics for the VM.
-		// It's useful for determining what needs to be optimized.
-
-		_mkdir("AS_DEBUG");
-		#if _MSC_VER >= 1500 && !defined(AS_MARMALADE)
-			FILE *f;
-			fopen_s(&f, "AS_DEBUG/stats.txt", "wt");
-		#else
-			FILE *f = fopen("AS_DEBUG/stats.txt", "wt");
-		#endif
-		if( f )
-		{
-			// Output instruction statistics
-			fprintf(f, "\nTotal count\n");
-			int n;
-			for( n = 0; n < asBC_MAXBYTECODE; n++ )
-			{
-				if( asBCInfo[n].name && instrCount[n] > 0 )
-					fprintf(f, "%-10.10s : %.0f\n", asBCInfo[n].name, instrCount[n]);
-			}
-
-			fprintf(f, "\nNever executed\n");
-			for( n = 0; n < asBC_MAXBYTECODE; n++ )
-			{
-				if( asBCInfo[n].name && instrCount[n] == 0 )
-					fprintf(f, "%-10.10s\n", asBCInfo[n].name);
-			}
-
-			fprintf(f, "\nSequences\n");
-			for( n = 0; n < 256; n++ )
-			{
-				if( asBCInfo[n].name )
-				{
-					for( int m = 0; m < 256; m++ )
-					{
-						if( instrCount2[n][m] )
-							fprintf(f, "%-10.10s, %-10.10s : %.0f\n", asBCInfo[n].name, asBCInfo[m].name, instrCount2[n][m]);
-					}
-				}
-			}
-			fclose(f);
-		}
-	}
-
-	void Instr(asBYTE bc)
-	{
-		++instrCount[bc];
-		++instrCount2[lastBC][bc];
-		lastBC = bc;
-	}
-
-	// Instruction statistics
-	double instrCount[256];
-	double instrCount2[256][256];
-	int lastBC;
-} stats;
-
-#endif
-
-// interface
-AS_API asIScriptContext *asGetActiveContext()
-{
-	asCThreadLocalData *tld = asCThreadManager::GetLocalData();
-
-	// tld can be 0 if asGetActiveContext is called before any engine has been created.
-
-	// Observe! I've seen a case where an application linked with the library twice
-	// and thus ended up with two separate instances of the code and global variables.
-	// The application somehow mixed the two instances so that a function called from
-	// a script ended up calling asGetActiveContext from the other instance that had
-	// never been initialized.
-
-	if( tld == 0 || tld->activeContexts.GetLength() == 0 )
-		return 0;
-	return tld->activeContexts[tld->activeContexts.GetLength()-1];
-}
-
-// internal
-// Note: There is no asPopActiveContext(), just call tld->activeContexts.PopLast() instead
-asCThreadLocalData *asPushActiveContext(asIScriptContext *ctx)
-{
-	asCThreadLocalData *tld = asCThreadManager::GetLocalData();
-	asASSERT( tld );
-	if( tld == 0 )
-		return 0;
-	tld->activeContexts.PushLast(ctx);
-	return tld;
-}
-
-asCContext::asCContext(asCScriptEngine *engine, bool holdRef)
-{
-	m_refCount.set(1);
-
-	m_holdEngineRef = holdRef;
-	if( holdRef )
-		engine->AddRef();
-
-	m_engine                    = engine;
-	m_status                    = asEXECUTION_UNINITIALIZED;
-	m_stackBlockSize            = 0;
-	m_originalStackPointer      = 0;
-	m_inExceptionHandler        = false;
-	m_isStackMemoryNotAllocated = false;
-	m_needToCleanupArgs         = false;
-	m_currentFunction           = 0;
-	m_callingSystemFunction     = 0;
-	m_regs.objectRegister       = 0;
-	m_initialFunction           = 0;
-	m_lineCallback              = false;
-	m_exceptionCallback         = false;
-	m_regs.doProcessSuspend     = false;
-	m_doSuspend                 = false;
-	m_userData                  = 0;
-	m_regs.ctx                  = this;
-}
-
-asCContext::~asCContext()
-{
-	DetachEngine();
-}
-
-// interface
-bool asCContext::IsNested(asUINT *nestCount) const
-{
-	if( nestCount )
-		*nestCount = 0;
-
-	asUINT c = GetCallstackSize();
-	if( c == 0 )
-		return false;
-
-	// Search for a marker on the call stack
-	// This loop starts at 2 because the 0th entry is not stored in m_callStack,
-	// and then we need to subtract one more to get the base of each frame
-	for( asUINT n = 2; n <= c; n++ )
-	{
-		const asPWORD *s = m_callStack.AddressOf() + (c - n)*CALLSTACK_FRAME_SIZE;
-		if( s && s[0] == 0 )
-		{
-			if( nestCount )
-				(*nestCount)++;
-			else
-				return true;
-		}
-	}
-
-	if( nestCount && *nestCount > 0 )
-		return true;
-
-	return false;
-}
-
-// interface
-int asCContext::AddRef() const
-{
-	return m_refCount.atomicInc();
-}
-
-// interface
-int asCContext::Release() const
-{
-	int r = m_refCount.atomicDec();
-
-	if( r == 0 )
-	{
-		asDELETE(const_cast<asCContext*>(this),asCContext);
-		return 0;
-	}
-
-	return r;
-}
-
-// internal
-void asCContext::DetachEngine()
-{
-	if( m_engine == 0 ) return;
-
-	// Clean up all calls, included nested ones
-	do
-	{
-		// Abort any execution
-		Abort();
-
-		// Free all resources
-		Unprepare();
-	}
-	while( IsNested() );
-
-	// Free the stack blocks
-	for( asUINT n = 0; n < m_stackBlocks.GetLength(); n++ )
-	{
-		if( m_stackBlocks[n] )
-		{
-#ifndef WIP_16BYTE_ALIGN
-			asDELETEARRAY(m_stackBlocks[n]);
-#else
-			asDELETEARRAYALIGNED(m_stackBlocks[n]);
-#endif
-		}
-	}
-	m_stackBlocks.SetLength(0);
-	m_stackBlockSize = 0;
-
-	// Clean the user data
-	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
-	{
-		if( m_userData[n+1] )
-		{
-			for( asUINT c = 0; c < m_engine->cleanContextFuncs.GetLength(); c++ )
-				if( m_engine->cleanContextFuncs[c].type == m_userData[n] )
-					m_engine->cleanContextFuncs[c].cleanFunc(this);
-		}
-	}
-	m_userData.SetLength(0);
-
-	// Clear engine pointer
-	if( m_holdEngineRef )
-		m_engine->Release();
-	m_engine = 0;
-}
-
-// interface
-asIScriptEngine *asCContext::GetEngine() const
-{
-	return m_engine;
-}
-
-// interface
-void *asCContext::SetUserData(void *data, asPWORD type)
-{
-	// As a thread might add a new new user data at the same time as another
-	// it is necessary to protect both read and write access to the userData member
-	ACQUIREEXCLUSIVE(m_engine->engineRWLock);
-
-	// It is not intended to store a lot of different types of userdata,
-	// so a more complex structure like a associative map would just have
-	// more overhead than a simple array.
-	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
-	{
-		if( m_userData[n] == type )
-		{
-			void *oldData = reinterpret_cast<void*>(m_userData[n+1]);
-			m_userData[n+1] = reinterpret_cast<asPWORD>(data);
-
-			RELEASEEXCLUSIVE(m_engine->engineRWLock);
-
-			return oldData;
-		}
-	}
-
-	m_userData.PushLast(type);
-	m_userData.PushLast(reinterpret_cast<asPWORD>(data));
-
-	RELEASEEXCLUSIVE(m_engine->engineRWLock);
-
-	return 0;
-}
-
-// interface
-void *asCContext::GetUserData(asPWORD type) const
-{
-	// There may be multiple threads reading, but when
-	// setting the user data nobody must be reading.
-	ACQUIRESHARED(m_engine->engineRWLock);
-
-	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
-	{
-		if( m_userData[n] == type )
-		{
-			RELEASESHARED(m_engine->engineRWLock);
-			return reinterpret_cast<void*>(m_userData[n+1]);
-		}
-	}
-
-	RELEASESHARED(m_engine->engineRWLock);
-
-	return 0;
-}
-
-// interface
-asIScriptFunction *asCContext::GetSystemFunction()
-{
-	return m_callingSystemFunction;
-}
-
-// interface
-int asCContext::Prepare(asIScriptFunction *func)
-{
-	if( func == 0 )
-	{
-		asCString str;
-		str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_d, "Prepare", "null", asNO_FUNCTION);
-		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-		return asNO_FUNCTION;
-	}
-
-	if( m_status == asEXECUTION_ACTIVE || m_status == asEXECUTION_SUSPENDED )
-	{
-		asCString str;
-		str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_d, "Prepare", func->GetDeclaration(true, true), asCONTEXT_ACTIVE);
-		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-		return asCONTEXT_ACTIVE;
-	}
-
-	// Clean the stack if not done before
-	if( m_status != asEXECUTION_FINISHED && m_status != asEXECUTION_UNINITIALIZED )
-		CleanStack();
-
-	// Release the returned object (if any)
-	CleanReturnObject();
-
-	// Release the object if it is a script object
-	if( m_initialFunction && m_initialFunction->objectType && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
-	{
-		asCScriptObject *obj = *(asCScriptObject**)&m_regs.stackFramePointer[0];
-		if( obj )
-			obj->Release();
-
-		*(asPWORD*)&m_regs.stackFramePointer[0] = 0;
-	}
-
-	if( m_initialFunction && m_initialFunction == func )
-	{
-		// If the same function is executed again, we can skip a lot of the setup
-		m_currentFunction = m_initialFunction;
-
-		// Reset stack pointer
-		m_regs.stackPointer = m_originalStackPointer;
-
-		// Make sure the stack pointer is pointing to the original position,
-		// otherwise something is wrong with the way it is being updated
-		asASSERT( IsNested() || m_stackIndex > 0 || (m_regs.stackPointer == m_stackBlocks[0] + m_stackBlockSize) );
-	}
-	else
-	{
-		asASSERT( m_engine );
-
-		// Make sure the function is from the same engine as the context to avoid mixups
-		if( m_engine != func->GetEngine() )
-		{
-			asCString str;
-			str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_d, "Prepare", func->GetDeclaration(true, true), asINVALID_ARG);
-			m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-			return asINVALID_ARG;
-		}
-
-		if( m_initialFunction )
-		{
-			m_initialFunction->Release();
-
-			// Reset stack pointer
-			m_regs.stackPointer = m_originalStackPointer;
-
-			// Make sure the stack pointer is pointing to the original position,
-			// otherwise something is wrong with the way it is being updated
-			asASSERT( IsNested() || m_stackIndex > 0 || (m_regs.stackPointer == m_stackBlocks[0] + m_stackBlockSize) );
-		}
-
-		// We trust the application not to pass anything else but a asCScriptFunction
-		m_initialFunction = reinterpret_cast<asCScriptFunction *>(func);
-		m_initialFunction->AddRef();
-		m_currentFunction = m_initialFunction;
-
-		// TODO: runtime optimize: GetSpaceNeededForArguments() should be precomputed
-		m_argumentsSize = m_currentFunction->GetSpaceNeededForArguments() + (m_currentFunction->objectType ? AS_PTR_SIZE : 0);
-
-		// Reserve space for the arguments and return value
-		if( m_currentFunction->DoesReturnOnStack() )
-		{
-			m_returnValueSize = m_currentFunction->returnType.GetSizeInMemoryDWords();
-			m_argumentsSize += AS_PTR_SIZE;
-		}
-		else
-			m_returnValueSize = 0;
-
-		// Determine the minimum stack size needed
-		int stackSize = m_argumentsSize + m_returnValueSize;
-		if( m_currentFunction->scriptData )
-			stackSize += m_currentFunction->scriptData->stackNeeded;
-
-		// Make sure there is enough space on the stack for the arguments and return value
-		if( !ReserveStackSpace(stackSize) )
-			return asOUT_OF_MEMORY;
-	}
-
-	// Reset state
-	// Most of the time the previous state will be asEXECUTION_FINISHED, in which case the values are already initialized
-	if( m_status != asEXECUTION_FINISHED )
-	{
-		m_exceptionLine           = -1;
-		m_exceptionFunction       = 0;
-		m_doAbort                 = false;
-		m_doSuspend               = false;
-		m_regs.doProcessSuspend   = m_lineCallback;
-		m_externalSuspendRequest  = false;
-	}
-	m_status = asEXECUTION_PREPARED;
-	m_regs.programPointer = 0;
-
-	// Reserve space for the arguments and return value
-	m_regs.stackFramePointer = m_regs.stackPointer - m_argumentsSize - m_returnValueSize;
-	m_originalStackPointer   = m_regs.stackPointer;
-	m_regs.stackPointer      = m_regs.stackFramePointer;
-
-	// Set arguments to 0
-	memset(m_regs.stackPointer, 0, 4*m_argumentsSize);
-
-	if( m_returnValueSize )
-	{
-		// Set the address of the location where the return value should be put
-		asDWORD *ptr = m_regs.stackFramePointer;
-		if( m_currentFunction->objectType )
-			ptr += AS_PTR_SIZE;
-
-		*(void**)ptr = (void*)(m_regs.stackFramePointer + m_argumentsSize);
-	}
-
-	return asSUCCESS;
-}
-
-// Free all resources
-int asCContext::Unprepare()
-{
-	if( m_status == asEXECUTION_ACTIVE || m_status == asEXECUTION_SUSPENDED )
-		return asCONTEXT_ACTIVE;
-
-	// Only clean the stack if the context was prepared but not executed until the end
-	if( m_status != asEXECUTION_UNINITIALIZED &&
-		m_status != asEXECUTION_FINISHED )
-		CleanStack();
-
-	asASSERT( m_needToCleanupArgs == false );
-
-	// Release the returned object (if any)
-	CleanReturnObject();
-
-	// Release the object if it is a script object
-	if( m_initialFunction && m_initialFunction->objectType && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
-	{
-		asCScriptObject *obj = *(asCScriptObject**)&m_regs.stackFramePointer[0];
-		if( obj )
-			obj->Release();
-	}
-
-	// Release the initial function
-	if( m_initialFunction )
-	{
-		m_initialFunction->Release();
-
-		// Reset stack pointer
-		m_regs.stackPointer = m_originalStackPointer;
-
-		// Make sure the stack pointer is pointing to the original position,
-		// otherwise something is wrong with the way it is being updated
-		asASSERT( IsNested() || m_stackIndex > 0 || (m_regs.stackPointer == m_stackBlocks[0] + m_stackBlockSize) );
-	}
-
-	// Clear function pointers
-	m_initialFunction = 0;
-	m_currentFunction = 0;
-	m_exceptionFunction = 0;
-	m_regs.programPointer = 0;
-
-	// Reset status
-	m_status = asEXECUTION_UNINITIALIZED;
-
-	m_regs.stackFramePointer = 0;
-
-	return 0;
-}
-
-asBYTE asCContext::GetReturnByte()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
-
-	return *(asBYTE*)&m_regs.valueRegister;
-}
-
-asWORD asCContext::GetReturnWord()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
-
-	return *(asWORD*)&m_regs.valueRegister;
-}
-
-asDWORD asCContext::GetReturnDWord()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
-
-	return *(asDWORD*)&m_regs.valueRegister;
-}
-
-asQWORD asCContext::GetReturnQWord()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
-
-	return m_regs.valueRegister;
-}
-
-float asCContext::GetReturnFloat()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
-
-	return *(float*)&m_regs.valueRegister;
-}
-
-double asCContext::GetReturnDouble()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
-
-	return *(double*)&m_regs.valueRegister;
-}
-
-void *asCContext::GetReturnAddress()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( dt->IsReference() )
-		return *(void**)&m_regs.valueRegister;
-	else if( dt->IsObject() || dt->IsFuncdef() )
-	{
-		if( m_initialFunction->DoesReturnOnStack() )
-		{
-			// The address of the return value was passed as the first argument, after the object pointer
-			int offset = 0;
-			if( m_initialFunction->objectType )
-				offset += AS_PTR_SIZE;
-
-			return *(void**)(&m_regs.stackFramePointer[offset]);
-		}
-
-		return m_regs.objectRegister;
-	}
-
-	return 0;
-}
-
-void *asCContext::GetReturnObject()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	if( !dt->IsObject() && !dt->IsFuncdef() ) return 0;
-
-	if( dt->IsReference() )
-		return *(void**)(asPWORD)m_regs.valueRegister;
-	else
-	{
-		if( m_initialFunction->DoesReturnOnStack() )
-		{
-			// The address of the return value was passed as the first argument, after the object pointer
-			int offset = 0;
-			if( m_initialFunction->objectType )
-				offset += AS_PTR_SIZE;
-
-			return *(void**)(&m_regs.stackFramePointer[offset]);
-		}
-
-		return m_regs.objectRegister;
-	}
-}
-
-void *asCContext::GetAddressOfReturnValue()
-{
-	if( m_status != asEXECUTION_FINISHED ) return 0;
-
-	asCDataType *dt = &m_initialFunction->returnType;
-
-	// An object is stored in the objectRegister
-	if( !dt->IsReference() && (dt->IsObject() || dt->IsFuncdef()) )
-	{
-		// Need to dereference objects
-		if( !dt->IsObjectHandle() )
-		{
-			if( m_initialFunction->DoesReturnOnStack() )
-			{
-				// The address of the return value was passed as the first argument, after the object pointer
-				int offset = 0;
-				if( m_initialFunction->objectType )
-					offset += AS_PTR_SIZE;
-
-				return *(void**)(&m_regs.stackFramePointer[offset]);
-			}
-
-			return *(void**)&m_regs.objectRegister;
-		}
-		return &m_regs.objectRegister;
-	}
-
-	// Primitives and references are stored in valueRegister
-	return &m_regs.valueRegister;
-}
-
-int asCContext::SetObject(void *obj)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( !m_initialFunction->objectType )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asERROR;
-	}
-
-	asASSERT( *(asPWORD*)&m_regs.stackFramePointer[0] == 0 );
-
-	*(asPWORD*)&m_regs.stackFramePointer[0] = (asPWORD)obj;
-
-	// TODO: This should be optional by having a flag where the application can chose whether it should be done or not
-	//       The flag could be named something like takeOwnership and have default value of true
-	if( obj && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
-		reinterpret_cast<asCScriptObject*>(obj)->AddRef();
-
-	return 0;
-}
-
-int asCContext::SetArgByte(asUINT arg, asBYTE value)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	if( dt->GetSizeInMemoryBytes() != 1 )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(asBYTE*)&m_regs.stackFramePointer[offset] = value;
-
-	return 0;
-}
-
-int asCContext::SetArgWord(asUINT arg, asWORD value)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	if( dt->GetSizeInMemoryBytes() != 2 )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(asWORD*)&m_regs.stackFramePointer[offset] = value;
-
-	return 0;
-}
-
-int asCContext::SetArgDWord(asUINT arg, asDWORD value)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	if( dt->GetSizeInMemoryBytes() != 4 )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(asDWORD*)&m_regs.stackFramePointer[offset] = value;
-
-	return 0;
-}
-
-int asCContext::SetArgQWord(asUINT arg, asQWORD value)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	if( dt->GetSizeOnStackDWords() != 2 )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(asQWORD*)(&m_regs.stackFramePointer[offset]) = value;
-
-	return 0;
-}
-
-int asCContext::SetArgFloat(asUINT arg, float value)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	if( dt->GetSizeOnStackDWords() != 1 )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(float*)(&m_regs.stackFramePointer[offset]) = value;
-
-	return 0;
-}
-
-int asCContext::SetArgDouble(asUINT arg, double value)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	if( dt->GetSizeOnStackDWords() != 2 )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(double*)(&m_regs.stackFramePointer[offset]) = value;
-
-	return 0;
-}
-
-int asCContext::SetArgAddress(asUINT arg, void *value)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( !dt->IsReference() && !dt->IsObjectHandle() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(asPWORD*)(&m_regs.stackFramePointer[offset]) = (asPWORD)value;
-
-	return 0;
-}
-
-int asCContext::SetArgObject(asUINT arg, void *obj)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( !dt->IsObject() && !dt->IsFuncdef() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// If the object should be sent by value we must make a copy of it
-	if( !dt->IsReference() )
-	{
-		if( dt->IsObjectHandle() )
-		{
-			// Increase the reference counter
-			if (obj && dt->IsFuncdef())
-				((asIScriptFunction*)obj)->AddRef();
-			else
-			{
-				asSTypeBehaviour *beh = &dt->GetTypeInfo()->CastToObjectType()->beh;
-				if (obj && beh->addref)
-					m_engine->CallObjectMethod(obj, beh->addref);
-			}
-		}
-		else
-		{
-			obj = m_engine->CreateScriptObjectCopy(obj, dt->GetTypeInfo());
-		}
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the value
-	*(asPWORD*)(&m_regs.stackFramePointer[offset]) = (asPWORD)obj;
-
-	return 0;
-}
-
-int asCContext::SetArgVarType(asUINT arg, void *ptr, int typeId)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return asCONTEXT_NOT_PREPARED;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_ARG;
-	}
-
-	// Verify the type of the argument
-	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
-	if( dt->GetTokenType() != ttQuestion )
-	{
-		m_status = asEXECUTION_ERROR;
-		return asINVALID_TYPE;
-	}
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Set the typeId and pointer
-	*(asPWORD*)(&m_regs.stackFramePointer[offset]) = (asPWORD)ptr;
-	offset += AS_PTR_SIZE;
-	*(int*)(&m_regs.stackFramePointer[offset]) = typeId;
-
-	return 0;
-}
-
-// TODO: Instead of GetAddressOfArg, maybe we need a SetArgValue(int arg, void *value, bool takeOwnership) instead.
-
-// interface
-void *asCContext::GetAddressOfArg(asUINT arg)
-{
-	if( m_status != asEXECUTION_PREPARED )
-		return 0;
-
-	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	if( m_initialFunction->objectType )
-		offset += AS_PTR_SIZE;
-
-	// If function returns object by value an extra pointer is pushed on the stack
-	if( m_returnValueSize )
-		offset += AS_PTR_SIZE;
-
-	for( asUINT n = 0; n < arg; n++ )
-		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// We should return the address of the location where the argument value will be placed
-
-	// All registered types are always sent by reference, even if
-	// the function is declared to receive the argument by value.
-	return &m_regs.stackFramePointer[offset];
-}
-
-
-int asCContext::Abort()
-{
-	if( m_engine == 0 ) return asERROR;
-
-	// TODO: multithread: Make thread safe. There is a chance that the status
-	//                    changes to something else after being set to ABORTED here.
-	if( m_status == asEXECUTION_SUSPENDED )
-		m_status = asEXECUTION_ABORTED;
-
-	m_doSuspend = true;
-	m_regs.doProcessSuspend = true;
-	m_externalSuspendRequest = true;
-	m_doAbort = true;
-
-	return 0;
-}
-
-// interface
-int asCContext::Suspend()
-{
-	// This function just sets some internal flags and is safe
-	// to call from a secondary thread, even if the library has
-	// been built without multi-thread support.
-
-	if( m_engine == 0 ) return asERROR;
-
-	m_doSuspend = true;
-	m_externalSuspendRequest = true;
-	m_regs.doProcessSuspend = true;
-
-	return 0;
-}
-
-// interface
-int asCContext::Execute()
-{
-	asASSERT( m_engine != 0 );
-
-	if( m_status != asEXECUTION_SUSPENDED && m_status != asEXECUTION_PREPARED )
-	{
-		asCString str;
-		str.Format(TXT_FAILED_IN_FUNC_s_d, "Execute", asCONTEXT_NOT_PREPARED);
-		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-		return asCONTEXT_NOT_PREPARED;
-	}
-
-	m_status = asEXECUTION_ACTIVE;
-
-	asCThreadLocalData *tld = asPushActiveContext((asIScriptContext *)this);
-
-	if( m_regs.programPointer == 0 )
-	{
-		if( m_currentFunction->funcType == asFUNC_DELEGATE )
-		{
-			// Push the object pointer onto the stack
-			asASSERT( m_regs.stackPointer - AS_PTR_SIZE >= m_stackBlocks[m_stackIndex] );
-			m_regs.stackPointer -= AS_PTR_SIZE;
-			m_regs.stackFramePointer -= AS_PTR_SIZE;
-			*(asPWORD*)m_regs.stackPointer = asPWORD(m_currentFunction->objForDelegate);
-
-			// Make the call to the delegated object method
-			m_currentFunction = m_currentFunction->funcForDelegate;
-		}
-
-		if( m_currentFunction->funcType == asFUNC_VIRTUAL ||
-			m_currentFunction->funcType == asFUNC_INTERFACE )
-		{
-			// The currentFunction is a virtual method
-
-			// Determine the true function from the object
-			asCScriptObject *obj = *(asCScriptObject**)(asPWORD*)m_regs.stackFramePointer;
-			if( obj == 0 )
-			{
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-			}
-			else
-			{
-				asCObjectType *objType = obj->objType;
-				asCScriptFunction *realFunc = 0;
-
-				if( m_currentFunction->funcType == asFUNC_VIRTUAL )
-				{
-					if( objType->virtualFunctionTable.GetLength() > (asUINT)m_currentFunction->vfTableIdx )
-					{
-						realFunc = objType->virtualFunctionTable[m_currentFunction->vfTableIdx];
-					}
-				}
-				else
-				{
-					// Search the object type for a function that matches the interface function
-					for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
-					{
-						asCScriptFunction *f2 = m_engine->scriptFunctions[objType->methods[n]];
-						if( f2->signatureId == m_currentFunction->signatureId )
-						{
-							if( f2->funcType == asFUNC_VIRTUAL )
-								realFunc = objType->virtualFunctionTable[f2->vfTableIdx];
-							else
-								realFunc = f2;
-							break;
-						}
-					}
-				}
-
-				if( realFunc && realFunc->signatureId == m_currentFunction->signatureId )
-					m_currentFunction = realFunc;
-				else
-					SetInternalException(TXT_NULL_POINTER_ACCESS);
-			}
-		}
-		else if( m_currentFunction->funcType == asFUNC_IMPORTED )
-		{
-			int funcId = m_engine->importedFunctions[m_currentFunction->id & ~FUNC_IMPORTED]->boundFunctionId;
-			if( funcId > 0 )
-				m_currentFunction = m_engine->scriptFunctions[funcId];
-			else
-				SetInternalException(TXT_UNBOUND_FUNCTION);
-		}
-
-		if( m_currentFunction->funcType == asFUNC_SCRIPT )
-		{
-			m_regs.programPointer = m_currentFunction->scriptData->byteCode.AddressOf();
-
-			// Set up the internal registers for executing the script function
-			PrepareScriptFunction();
-		}
-		else if( m_currentFunction->funcType == asFUNC_SYSTEM )
-		{
-			// The current function is an application registered function
-
-			// Call the function directly
-			CallSystemFunction(m_currentFunction->id, this);
-
-			// Was the call successful?
-			if( m_status == asEXECUTION_ACTIVE )
-			{
-				m_status = asEXECUTION_FINISHED;
-			}
-		}
-		else
-		{
-			// This shouldn't happen unless there was an error in which
-			// case an exception should have been raised already
-			asASSERT( m_status == asEXECUTION_EXCEPTION );
-		}
-	}
-
-	asUINT gcPreObjects = 0;
-	if( m_engine->ep.autoGarbageCollect )
-		m_engine->gc.GetStatistics(&gcPreObjects, 0, 0, 0, 0);
-
-	while( m_status == asEXECUTION_ACTIVE )
-		ExecuteNext();
-
-	if( m_lineCallback )
-	{
-		// Call the line callback one last time before leaving
-		// so anyone listening can catch the state change
-		CallLineCallback();
-		m_regs.doProcessSuspend = true;
-	}
-	else
-		m_regs.doProcessSuspend = false;
-
-	m_doSuspend = false;
-
-	if( m_engine->ep.autoGarbageCollect )
-	{
-		asUINT gcPosObjects = 0;
-		m_engine->gc.GetStatistics(&gcPosObjects, 0, 0, 0, 0);
-		if( gcPosObjects > gcPreObjects )
-		{
-			// Execute as many steps as there were new objects created
-			m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE, gcPosObjects - gcPreObjects);
-		}
-		else if( gcPosObjects > 0 )
-		{
-			// Execute at least one step, even if no new objects were created
-			m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE, 1);
-		}
-	}
-
-	// Pop the active context
-	asASSERT(tld && tld->activeContexts[tld->activeContexts.GetLength()-1] == this);
-	if( tld )
-		tld->activeContexts.PopLast();
-
-	if( m_status == asEXECUTION_FINISHED )
-	{
-		m_regs.objectType = m_initialFunction->returnType.GetTypeInfo();
-		return asEXECUTION_FINISHED;
-	}
-
-	if( m_doAbort )
-	{
-		m_doAbort = false;
-
-		m_status = asEXECUTION_ABORTED;
-		return asEXECUTION_ABORTED;
-	}
-
-	if( m_status == asEXECUTION_SUSPENDED )
-		return asEXECUTION_SUSPENDED;
-
-	if( m_status == asEXECUTION_EXCEPTION )
-		return asEXECUTION_EXCEPTION;
-
-	return asERROR;
-}
-
-int asCContext::PushState()
-{
-	// Only allow the state to be pushed when active
-	// TODO: Can we support a suspended state too? So the reuse of
-	//       the context can be done outside the Execute() call?
-	if( m_status != asEXECUTION_ACTIVE )
-	{
-		// TODO: Write message. Wrong usage
-		return asERROR;
-	}
-
-	// Push the current script function that is calling the system function
-	PushCallState();
-
-	// Push the system function too, which will serve both as a marker and
-	// informing which system function that created the nested call
-	if( m_callStack.GetLength() == m_callStack.GetCapacity() )
-	{
-		// Allocate space for 10 call states at a time to save time
-		m_callStack.AllocateNoConstruct(m_callStack.GetLength() + 10*CALLSTACK_FRAME_SIZE, true);
-	}
-	m_callStack.SetLengthNoConstruct(m_callStack.GetLength() + CALLSTACK_FRAME_SIZE);
-
-	// Need to push m_initialFunction as it must be restored later
-	asPWORD *tmp = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
-	tmp[0] = 0;
-	tmp[1] = (asPWORD)m_callingSystemFunction;
-	tmp[2] = (asPWORD)m_initialFunction;
-	tmp[3] = (asPWORD)m_originalStackPointer;
-	tmp[4] = (asPWORD)m_argumentsSize;
-
-	// Need to push the value of registers so they can be restored
-	tmp[5] = (asPWORD)asDWORD(m_regs.valueRegister);
-	tmp[6] = (asPWORD)asDWORD(m_regs.valueRegister>>32);
-	tmp[7] = (asPWORD)m_regs.objectRegister;
-	tmp[8] = (asPWORD)m_regs.objectType;
-
-	// Decrease stackpointer to prevent the top value from being overwritten
-	m_regs.stackPointer -= 2;
-
-	// Clear the initial function so that Prepare() knows it must do all validations
-	m_initialFunction = 0;
-
-	// After this the state should appear as if uninitialized
-	m_callingSystemFunction = 0;
-
-	m_regs.objectRegister = 0;
-	m_regs.objectType = 0;
-
-	// Set the status to uninitialized as application
-	// should call Prepare() after this to reuse the context
-	m_status = asEXECUTION_UNINITIALIZED;
-
-	return asSUCCESS;
-}
-
-int asCContext::PopState()
-{
-	if( !IsNested() )
-		return asERROR;
-
-	// Clean up the current execution
-	Unprepare();
-
-	// The topmost state must be a marker for nested call
-	asASSERT( m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE] == 0 );
-
-	// Restore the previous state
-	asPWORD *tmp = &m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE];
-	m_callingSystemFunction = reinterpret_cast<asCScriptFunction*>(tmp[1]);
-	m_callStack.SetLength(m_callStack.GetLength() - CALLSTACK_FRAME_SIZE);
-
-	// Restore the previous initial function and the associated values
-	m_initialFunction      = reinterpret_cast<asCScriptFunction*>(tmp[2]);
-	m_originalStackPointer = (asDWORD*)tmp[3];
-	m_argumentsSize        = (int)tmp[4];
-
-	m_regs.valueRegister   = asQWORD(asDWORD(tmp[5]));
-	m_regs.valueRegister  |= asQWORD(tmp[6])<<32;
-	m_regs.objectRegister  = (void*)tmp[7];
-	m_regs.objectType      = (asITypeInfo*)tmp[8];
-
-	// Calculate the returnValueSize
-	if( m_initialFunction->DoesReturnOnStack() )
-		m_returnValueSize = m_initialFunction->returnType.GetSizeInMemoryDWords();
-	else
-		m_returnValueSize = 0;
-
-	// Pop the current script function. This will also restore the previous stack pointer
-	PopCallState();
-
-	m_status = asEXECUTION_ACTIVE;
-
-	return asSUCCESS;
-}
-
-void asCContext::PushCallState()
-{
-	if( m_callStack.GetLength() == m_callStack.GetCapacity() )
-	{
-		// Allocate space for 10 call states at a time to save time
-		m_callStack.AllocateNoConstruct(m_callStack.GetLength() + 10*CALLSTACK_FRAME_SIZE, true);
-	}
-	m_callStack.SetLengthNoConstruct(m_callStack.GetLength() + CALLSTACK_FRAME_SIZE);
-
-    // Separating the loads and stores limits data cache trash, and with a smart compiler
-    // could turn into SIMD style loading/storing if available.
-    // The compiler can't do this itself due to potential pointer aliasing between the pointers,
-    // ie writing to tmp could overwrite the data contained in registers.stackFramePointer for example
-    // for all the compiler knows. So introducing the local variable s, which is never referred to by
-    // its address we avoid this issue.
-
-	asPWORD s[5];
-	s[0] = (asPWORD)m_regs.stackFramePointer;
-	s[1] = (asPWORD)m_currentFunction;
-	s[2] = (asPWORD)m_regs.programPointer;
-	s[3] = (asPWORD)m_regs.stackPointer;
-	s[4] = m_stackIndex;
-
-	asPWORD *tmp = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
-	tmp[0] = s[0];
-	tmp[1] = s[1];
-	tmp[2] = s[2];
-	tmp[3] = s[3];
-	tmp[4] = s[4];
-}
-
-void asCContext::PopCallState()
-{
-	// See comments in PushCallState about pointer aliasing and data cache trashing
-	asPWORD *tmp = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
-	asPWORD s[5];
-	s[0] = tmp[0];
-	s[1] = tmp[1];
-	s[2] = tmp[2];
-	s[3] = tmp[3];
-	s[4] = tmp[4];
-
-	m_regs.stackFramePointer = (asDWORD*)s[0];
-	m_currentFunction        = (asCScriptFunction*)s[1];
-	m_regs.programPointer    = (asDWORD*)s[2];
-	m_regs.stackPointer      = (asDWORD*)s[3];
-	m_stackIndex             = (int)s[4];
-
-	m_callStack.SetLength(m_callStack.GetLength() - CALLSTACK_FRAME_SIZE);
-}
-
-// interface
-asUINT asCContext::GetCallstackSize() const
-{
-	if( m_currentFunction == 0 ) return 0;
-
-	// The current function is accessed at stackLevel 0
-	return asUINT(1 + m_callStack.GetLength() / CALLSTACK_FRAME_SIZE);
-}
-
-// interface
-asIScriptFunction *asCContext::GetFunction(asUINT stackLevel)
-{
-	if( stackLevel >= GetCallstackSize() ) return 0;
-
-	if( stackLevel == 0 ) return m_currentFunction;
-
-	asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize() - stackLevel - 1)*CALLSTACK_FRAME_SIZE;
-	asCScriptFunction *func = (asCScriptFunction*)s[1];
-
-	return func;
-}
-
-// interface
-int asCContext::GetLineNumber(asUINT stackLevel, int *column, const char **sectionName)
-{
-	if( stackLevel >= GetCallstackSize() ) return asINVALID_ARG;
-
-	asCScriptFunction *func;
-	asDWORD *bytePos;
-	if( stackLevel == 0 )
-	{
-		func = m_currentFunction;
-		if( func->scriptData == 0 ) return 0;
-		bytePos = m_regs.programPointer;
-	}
-	else
-	{
-		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
-		func = (asCScriptFunction*)s[1];
-		if( func->scriptData == 0 ) return 0;
-		bytePos = (asDWORD*)s[2];
-
-		// Subract 1 from the bytePos, because we want the line where
-		// the call was made, and not the instruction after the call
-		bytePos -= 1;
-	}
-
-	// For nested calls it is possible that func is null
-	if( func == 0 )
-	{
-		if( column ) *column = 0;
-		if( sectionName ) *sectionName = 0;
-		return 0;
-	}
-
-	int sectionIdx;
-	asDWORD line = func->GetLineNumber(int(bytePos - func->scriptData->byteCode.AddressOf()), &sectionIdx);
-	if( column ) *column = (line >> 20);
-	if( sectionName )
-	{
-		asASSERT( sectionIdx < int(m_engine->scriptSectionNames.GetLength()) );
-		if( sectionIdx >= 0 && asUINT(sectionIdx) < m_engine->scriptSectionNames.GetLength() )
-			*sectionName = m_engine->scriptSectionNames[sectionIdx]->AddressOf();
-		else
-			*sectionName = 0;
-	}
-	return (line & 0xFFFFF);
-}
-
-// internal
-bool asCContext::ReserveStackSpace(asUINT size)
-{
-#ifdef WIP_16BYTE_ALIGN
-	// Pad size to a multiple of MAX_TYPE_ALIGNMENT.
-	const asUINT remainder = size % MAX_TYPE_ALIGNMENT;
-	if(remainder != 0)
-	{
-		size = size + (MAX_TYPE_ALIGNMENT - (size % MAX_TYPE_ALIGNMENT));
-	}
-#endif
-
-	// Make sure the first stack block is allocated
-	if( m_stackBlocks.GetLength() == 0 )
-	{
-		m_stackBlockSize = m_engine->initialContextStackSize;
-		asASSERT( m_stackBlockSize > 0 );
-
-#ifndef WIP_16BYTE_ALIGN
-		asDWORD *stack = asNEWARRAY(asDWORD,m_stackBlockSize);
-#else
-		asDWORD *stack = asNEWARRAYALIGNED(asDWORD, m_stackBlockSize, MAX_TYPE_ALIGNMENT);
-#endif
-		if( stack == 0 )
-		{
-			// Out of memory
-			return false;
-		}
-
-#ifdef WIP_16BYTE_ALIGN
-		asASSERT( isAligned(stack, MAX_TYPE_ALIGNMENT) );
-#endif
-
-		m_stackBlocks.PushLast(stack);
-		m_stackIndex = 0;
-		m_regs.stackPointer = m_stackBlocks[0] + m_stackBlockSize;
-
-#ifdef WIP_16BYTE_ALIGN
-		// Align the stack pointer. This is necessary as the m_stackBlockSize is not necessarily evenly divisable with the max alignment
-		((asPWORD&)m_regs.stackPointer) &= ~(MAX_TYPE_ALIGNMENT-1);
-
-		asASSERT( isAligned(m_regs.stackPointer, MAX_TYPE_ALIGNMENT) );
-#endif
-	}
-
-	// Check if there is enough space on the current stack block, otherwise move
-	// to the next one. New and larger blocks will be allocated as necessary
-	while( m_regs.stackPointer - (size + RESERVE_STACK) < m_stackBlocks[m_stackIndex] )
-	{
-		// Make sure we don't allocate more space than allowed
-		if( m_engine->ep.maximumContextStackSize )
-		{
-			// This test will only stop growth once it has already crossed the limit
-			if( m_stackBlockSize * ((1 << (m_stackIndex+1)) - 1) > m_engine->ep.maximumContextStackSize )
-			{
-				m_isStackMemoryNotAllocated = true;
-
-				// Set the stackFramePointer, even though the stackPointer wasn't updated
-				m_regs.stackFramePointer = m_regs.stackPointer;
-
-				SetInternalException(TXT_STACK_OVERFLOW);
-				return false;
-			}
-		}
-
-		m_stackIndex++;
-		if( m_stackBlocks.GetLength() == m_stackIndex )
-		{
-			// Allocate the new stack block, with twice the size of the previous
-#ifndef WIP_16BYTE_ALIGN
-			asDWORD *stack = asNEWARRAY(asDWORD, (m_stackBlockSize << m_stackIndex));
-#else
-			asDWORD *stack = asNEWARRAYALIGNED(asDWORD, (m_stackBlockSize << m_stackIndex), MAX_TYPE_ALIGNMENT);
-#endif
-			if( stack == 0 )
-			{
-				// Out of memory
-				m_isStackMemoryNotAllocated = true;
-
-				// Set the stackFramePointer, even though the stackPointer wasn't updated
-				m_regs.stackFramePointer = m_regs.stackPointer;
-
-				SetInternalException(TXT_STACK_OVERFLOW);
-				return false;
-			}
-
-#ifdef WIP_16BYTE_ALIGN
-			asASSERT( isAligned(stack, MAX_TYPE_ALIGNMENT) );
-#endif
-
-			m_stackBlocks.PushLast(stack);
-		}
-
-		// Update the stack pointer to point to the new block.
-		// Leave enough room above the stackpointer to copy the arguments from the previous stackblock
-		m_regs.stackPointer = m_stackBlocks[m_stackIndex] +
-			                  (m_stackBlockSize<<m_stackIndex) -
-			                  m_currentFunction->GetSpaceNeededForArguments() -
-			                  (m_currentFunction->objectType ? AS_PTR_SIZE : 0) -
-			                  (m_currentFunction->DoesReturnOnStack() ? AS_PTR_SIZE : 0);
-
-#ifdef WIP_16BYTE_ALIGN
-		// Align the stack pointer 
-		(asPWORD&)m_regs.stackPointer &= ~(MAX_TYPE_ALIGNMENT-1);
-
-		asASSERT( isAligned(m_regs.stackPointer, MAX_TYPE_ALIGNMENT) );
-#endif
-	}
-
-	return true;
-}
-
-// internal
-void asCContext::CallScriptFunction(asCScriptFunction *func)
-{
-	asASSERT( func->scriptData );
-
-	// Push the framepointer, function id and programCounter on the stack
-	PushCallState();
-
-	// Update the current function and program position before increasing the stack
-	// so the exception handler will know what to do if there is a stack overflow
-	m_currentFunction = func;
-	m_regs.programPointer = m_currentFunction->scriptData->byteCode.AddressOf();
-
-	PrepareScriptFunction();
-}
-
-void asCContext::PrepareScriptFunction()
-{
-	asASSERT( m_currentFunction->scriptData );
-
-	// Make sure there is space on the stack to execute the function
-	asDWORD *oldStackPointer = m_regs.stackPointer;
-	if( !ReserveStackSpace(m_currentFunction->scriptData->stackNeeded) )
-		return;
-
-	// If a new stack block was allocated then we'll need to move
-	// over the function arguments to the new block.
-	if( m_regs.stackPointer != oldStackPointer )
-	{
-		int numDwords = m_currentFunction->GetSpaceNeededForArguments() + 
-		                (m_currentFunction->objectType ? AS_PTR_SIZE : 0) + 
-		                (m_currentFunction->DoesReturnOnStack() ? AS_PTR_SIZE : 0);
-		memcpy(m_regs.stackPointer, oldStackPointer, sizeof(asDWORD)*numDwords);
-	}
-
-	// Update framepointer
-	m_regs.stackFramePointer = m_regs.stackPointer;
-
-	// Set all object variables to 0 to guarantee that they are null before they are used
-	// Only variables on the heap should be cleared. The rest will be cleared by calling the constructor
-	asUINT n = m_currentFunction->scriptData->objVariablesOnHeap;
-	while( n-- > 0 )
-	{
-		int pos = m_currentFunction->scriptData->objVariablePos[n];
-		*(asPWORD*)&m_regs.stackFramePointer[-pos] = 0;
-	}
-
-	// Initialize the stack pointer with the space needed for local variables
-	m_regs.stackPointer -= m_currentFunction->scriptData->variableSpace;
-
-	// Call the line callback for each script function, to guarantee that infinitely recursive scripts can
-	// be interrupted, even if the scripts have been compiled with asEP_BUILD_WITHOUT_LINE_CUES
-	if( m_regs.doProcessSuspend )
-	{
-		if( m_lineCallback )
-			CallLineCallback();
-		if( m_doSuspend )
-			m_status = asEXECUTION_SUSPENDED;
-	}
-}
-
-void asCContext::CallInterfaceMethod(asCScriptFunction *func)
-{
-	// Resolve the interface method using the current script type
-	asCScriptObject *obj = *(asCScriptObject**)(asPWORD*)m_regs.stackPointer;
-	if( obj == 0 )
-	{
-		// Tell the exception handler to clean up the arguments to this method
-		m_needToCleanupArgs = true;
-		SetInternalException(TXT_NULL_POINTER_ACCESS);
-		return;
-	}
-
-	asCObjectType *objType = obj->objType;
-
-	// Search the object type for a function that matches the interface function
-	asCScriptFunction *realFunc = 0;
-	if( func->funcType == asFUNC_INTERFACE )
-	{
-		// Find the offset for the interface's virtual function table chunk
-		asUINT offset = 0;
-		bool found = false;
-		asCObjectType *findInterface = func->objectType;
-
-		// TODO: runtime optimize: The list of interfaces should be ordered by the address
-		//                         Then a binary search pattern can be used.
-		asUINT intfCount = asUINT(objType->interfaces.GetLength());
-		for( asUINT n = 0; n < intfCount; n++ )
-		{
-			if( objType->interfaces[n] == findInterface )
-			{
-				offset = objType->interfaceVFTOffsets[n];
-				found = true;
-				break;
-			}
-		}
-
-		if( !found )
-		{
-			// Tell the exception handler to clean up the arguments to this method
-			m_needToCleanupArgs = true;
-			SetInternalException(TXT_NULL_POINTER_ACCESS);
-			return;
-		}
-
-		// Find the real function in the virtual table chunk with the found offset
-		realFunc = objType->virtualFunctionTable[func->vfTableIdx + offset];
-
-		// Since the interface was implemented by the class, it shouldn't
-		// be possible that the real function isn't found
-		asASSERT( realFunc );
-
-		asASSERT( realFunc->signatureId == func->signatureId );
-	}
-	else // if( func->funcType == asFUNC_VIRTUAL )
-	{
-		realFunc = objType->virtualFunctionTable[func->vfTableIdx];
-	}
-
-	// Then call the true script function
-	CallScriptFunction(realFunc);
-}
-
-void asCContext::ExecuteNext()
-{
-	asDWORD *l_bc = m_regs.programPointer;
-	asDWORD *l_sp = m_regs.stackPointer;
-	asDWORD *l_fp = m_regs.stackFramePointer;
-
-	for(;;)
-	{
-
-#ifdef AS_DEBUG
-	// Gather statistics on executed bytecode
-	stats.Instr(*(asBYTE*)l_bc);
-
-	// Used to verify that the size of the instructions are correct
-	asDWORD *old = l_bc;
-#endif
-
-
-	// Remember to keep the cases in order and without
-	// gaps, because that will make the switch faster.
-	// It will be faster since only one lookup will be
-	// made to find the correct jump destination. If not
-	// in order, the switch will make two lookups.
-	switch( *(asBYTE*)l_bc )
-	{
-//--------------
-// memory access functions
-
-	case asBC_PopPtr:
-		// Pop a pointer from the stack
-		l_sp += AS_PTR_SIZE;
-		l_bc++;
-		break;
-
-	case asBC_PshGPtr:
-		// Replaces PGA + RDSPtr
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = *(asPWORD*)asBC_PTRARG(l_bc);
-		l_bc += 1 + AS_PTR_SIZE;
-		break;
-
-	// Push a dword value on the stack
-	case asBC_PshC4:
-		--l_sp;
-		*l_sp = asBC_DWORDARG(l_bc);
-		l_bc += 2;
-		break;
-
-	// Push the dword value of a variable on the stack
-	case asBC_PshV4:
-		--l_sp;
-		*l_sp = *(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	// Push the address of a variable on the stack
-	case asBC_PSF:
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = asPWORD(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	// Swap the top 2 pointers on the stack
-	case asBC_SwapPtr:
-		{
-			asPWORD p = *(asPWORD*)l_sp;
-			*(asPWORD*)l_sp = *(asPWORD*)(l_sp+AS_PTR_SIZE);
-			*(asPWORD*)(l_sp+AS_PTR_SIZE) = p;
-			l_bc++;
-		}
-		break;
-
-	// Do a boolean not operation, modifying the value of the variable
-	case asBC_NOT:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Set the value to true if it is equal to 0
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on the pointer.
-
-			volatile asBYTE *ptr = (asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
-			asBYTE val = (ptr[0] == 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
-			ptr[0] = val; // The result is stored in the lower byte
-			ptr[1] = 0;   // Make sure the rest of the DWORD is 0
-			ptr[2] = 0;
-			ptr[3] = 0;
-		}
-#else
-		*(l_fp - asBC_SWORDARG0(l_bc)) = (*(l_fp - asBC_SWORDARG0(l_bc)) == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-#endif
-		l_bc++;
-		break;
-
-	// Push the dword value of a global variable on the stack
-	case asBC_PshG4:
-		--l_sp;
-		*l_sp = *(asDWORD*)asBC_PTRARG(l_bc);
-		l_bc += 1 + AS_PTR_SIZE;
-		break;
-
-	// Load the address of a global variable in the register, then
-	// copy the value of the global variable into a local variable
-	case asBC_LdGRdR4:
-		*(void**)&m_regs.valueRegister = (void*)asBC_PTRARG(l_bc);
-		*(l_fp - asBC_SWORDARG0(l_bc)) = **(asDWORD**)&m_regs.valueRegister;
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-//----------------
-// path control instructions
-
-	// Begin execution of a script function
-	case asBC_CALL:
-		{
-			int i = asBC_INTARG(l_bc);
-			l_bc += 2;
-
-			asASSERT( i >= 0 );
-			asASSERT( (i & FUNC_IMPORTED) == 0 );
-
-			// Need to move the values back to the context
-			m_regs.programPointer = l_bc;
-			m_regs.stackPointer = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			CallScriptFunction(m_engine->scriptFunctions[i]);
-
-			// Extract the values from the context again
-			l_bc = m_regs.programPointer;
-			l_sp = m_regs.stackPointer;
-			l_fp = m_regs.stackFramePointer;
-
-			// If status isn't active anymore then we must stop
-			if( m_status != asEXECUTION_ACTIVE )
-				return;
-		}
-		break;
-
-	// Return to the caller, and remove the arguments from the stack
-	case asBC_RET:
-		{
-			// Return if this was the first function, or a nested execution
-			if( m_callStack.GetLength() == 0 ||
-				m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE] == 0 )
-			{
-				m_status = asEXECUTION_FINISHED;
-				return;
-			}
-
-			asWORD w = asBC_WORDARG0(l_bc);
-
-			// Read the old framepointer, functionid, and programCounter from the call stack
-			PopCallState();
-
-			// Extract the values from the context again
-			l_bc = m_regs.programPointer;
-			l_sp = m_regs.stackPointer;
-			l_fp = m_regs.stackFramePointer;
-
-			// Pop arguments from stack
-			l_sp += w;
-		}
-		break;
-
-	// Jump to a relative position
-	case asBC_JMP:
-		l_bc += 2 + asBC_INTARG(l_bc);
-		break;
-
-//----------------
-// Conditional jumps
-
-	// Jump to a relative position if the value in the register is 0
-	case asBC_JZ:
-		if( *(int*)&m_regs.valueRegister == 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-
-	// Jump to a relative position if the value in the register is not 0
-	case asBC_JNZ:
-		if( *(int*)&m_regs.valueRegister != 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-
-	// Jump to a relative position if the value in the register is negative
-	case asBC_JS:
-		if( *(int*)&m_regs.valueRegister < 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-
-	// Jump to a relative position if the value in the register it not negative
-	case asBC_JNS:
-		if( *(int*)&m_regs.valueRegister >= 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-
-	// Jump to a relative position if the value in the register is greater than 0
-	case asBC_JP:
-		if( *(int*)&m_regs.valueRegister > 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-
-	// Jump to a relative position if the value in the register is not greater than 0
-	case asBC_JNP:
-		if( *(int*)&m_regs.valueRegister <= 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-//--------------------
-// test instructions
-
-	// If the value in the register is 0, then set the register to 1, else to 0
-	case asBC_TZ:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Set the value to true if it is equal to 0
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on valueRegister.
-
-			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
-			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
-			asBYTE val = (regPtr[0] == 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
-			regBptr[0] = val; // The result is stored in the lower byte
-			regBptr[1] = 0;   // Make sure the rest of the register is 0
-			regBptr[2] = 0;
-			regBptr[3] = 0;
-			regBptr[4] = 0;
-			regBptr[5] = 0;
-			regBptr[6] = 0;
-			regBptr[7] = 0;
-		}
-#else
-		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-#endif
-		l_bc++;
-		break;
-
-	// If the value in the register is not 0, then set the register to 1, else to 0
-	case asBC_TNZ:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Set the value to true if it is not equal to 0
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on valueRegister.
-
-			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
-			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
-			asBYTE val = (regPtr[0] == 0) ? 0 : VALUE_OF_BOOLEAN_TRUE;
-			regBptr[0] = val; // The result is stored in the lower byte
-			regBptr[1] = 0;   // Make sure the rest of the register is 0
-			regBptr[2] = 0;
-			regBptr[3] = 0;
-			regBptr[4] = 0;
-			regBptr[5] = 0;
-			regBptr[6] = 0;
-			regBptr[7] = 0;
-		}
-#else
-		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister == 0 ? 0 : VALUE_OF_BOOLEAN_TRUE);
-#endif
-		l_bc++;
-		break;
-
-	// If the value in the register is negative, then set the register to 1, else to 0
-	case asBC_TS:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Set the value to true if it is less than 0
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on valueRegister.
-
-			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
-			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
-			asBYTE val = (regPtr[0] < 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
-			regBptr[0] = val; // The result is stored in the lower byte
-			regBptr[1] = 0;   // Make sure the rest of the register is 0
-			regBptr[2] = 0;
-			regBptr[3] = 0;
-			regBptr[4] = 0;
-			regBptr[5] = 0;
-			regBptr[6] = 0;
-			regBptr[7] = 0;
-		}
-#else
-		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister < 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-#endif
-		l_bc++;
-		break;
-
-	// If the value in the register is not negative, then set the register to 1, else to 0
-	case asBC_TNS:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Set the value to true if it is not less than 0
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on valueRegister.
-
-			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
-			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
-			asBYTE val = (regPtr[0] >= 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
-			regBptr[0] = val; // The result is stored in the lower byte
-			regBptr[1] = 0;   // Make sure the rest of the register is 0
-			regBptr[2] = 0;
-			regBptr[3] = 0;
-			regBptr[4] = 0;
-			regBptr[5] = 0;
-			regBptr[6] = 0;
-			regBptr[7] = 0;
-		}
-#else
-		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister < 0 ? 0 : VALUE_OF_BOOLEAN_TRUE);
-#endif
-		l_bc++;
-		break;
-
-	// If the value in the register is greater than 0, then set the register to 1, else to 0
-	case asBC_TP:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Set the value to true if it is greater than 0
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on valueRegister.
-
-			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
-			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
-			asBYTE val = (regPtr[0] > 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
-			regBptr[0] = val; // The result is stored in the lower byte
-			regBptr[1] = 0;   // Make sure the rest of the register is 0
-			regBptr[2] = 0;
-			regBptr[3] = 0;
-			regBptr[4] = 0;
-			regBptr[5] = 0;
-			regBptr[6] = 0;
-			regBptr[7] = 0;
-		}
-#else
-		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister > 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
-#endif
-		l_bc++;
-		break;
-
-	// If the value in the register is not greater than 0, then set the register to 1, else to 0
-	case asBC_TNP:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Set the value to true if it is not greater than 0
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on valueRegister.
-
-			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
-			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
-			asBYTE val = (regPtr[0] <= 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
-			regBptr[0] = val; // The result is stored in the lower byte
-			regBptr[1] = 0;   // Make sure the rest of the register is 0
-			regBptr[2] = 0;
-			regBptr[3] = 0;
-			regBptr[4] = 0;
-			regBptr[5] = 0;
-			regBptr[6] = 0;
-			regBptr[7] = 0;
-		}
-#else
-		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister > 0 ? 0 : VALUE_OF_BOOLEAN_TRUE);
-#endif
-		l_bc++;
-		break;
-
-//--------------------
-// negate value
-
-	// Negate the integer value in the variable
-	case asBC_NEGi:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = asDWORD(-int(*(l_fp - asBC_SWORDARG0(l_bc))));
-		l_bc++;
-		break;
-
-	// Negate the float value in the variable
-	case asBC_NEGf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = -*(float*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	// Negate the double value in the variable
-	case asBC_NEGd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = -*(double*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-//-------------------------
-// Increment value pointed to by address in register
-
-	// Increment the short value pointed to by the register
-	case asBC_INCi16:
-		(**(short**)&m_regs.valueRegister)++;
-		l_bc++;
-		break;
-
-	// Increment the byte value pointed to by the register
-	case asBC_INCi8:
-		(**(char**)&m_regs.valueRegister)++;
-		l_bc++;
-		break;
-
-	// Decrement the short value pointed to by the register
-	case asBC_DECi16:
-		(**(short**)&m_regs.valueRegister)--;
-		l_bc++;
-		break;
-
-	// Decrement the byte value pointed to by the register
-	case asBC_DECi8:
-		(**(char**)&m_regs.valueRegister)--;
-		l_bc++;
-		break;
-
-	// Increment the integer value pointed to by the register
-	case asBC_INCi:
-		++(**(int**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	// Decrement the integer value pointed to by the register
-	case asBC_DECi:
-		--(**(int**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	// Increment the float value pointed to by the register
-	case asBC_INCf:
-		++(**(float**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	// Decrement the float value pointed to by the register
-	case asBC_DECf:
-		--(**(float**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	// Increment the double value pointed to by the register
-	case asBC_INCd:
-		++(**(double**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	// Decrement the double value pointed to by the register
-	case asBC_DECd:
-		--(**(double**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	// Increment the local integer variable
-	case asBC_IncVi:
-		(*(int*)(l_fp - asBC_SWORDARG0(l_bc)))++;
-		l_bc++;
-		break;
-
-	// Decrement the local integer variable
-	case asBC_DecVi:
-		(*(int*)(l_fp - asBC_SWORDARG0(l_bc)))--;
-		l_bc++;
-		break;
-
-//--------------------
-// bits instructions
-
-	// Do a bitwise not on the value in the variable
-	case asBC_BNOT:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = ~*(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	// Do a bitwise and of two variables and store the result in a third variable
-	case asBC_BAND:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) & *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	// Do a bitwise or of two variables and store the result in a third variable
-	case asBC_BOR:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) | *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	// Do a bitwise xor of two variables and store the result in a third variable
-	case asBC_BXOR:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) ^ *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	// Do a logical shift left of two variables and store the result in a third variable
-	case asBC_BSLL:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) << *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	// Do a logical shift right of two variables and store the result in a third variable
-	case asBC_BSRL:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) >> *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	// Do an arithmetic shift right of two variables and store the result in a third variable
-	case asBC_BSRA:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(l_fp - asBC_SWORDARG1(l_bc))) >> *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_COPY:
-		{
-			void *d = (void*)*(asPWORD*)l_sp; l_sp += AS_PTR_SIZE;
-			void *s = (void*)*(asPWORD*)l_sp;
-			if( s == 0 || d == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-			memcpy(d, s, asBC_WORDARG0(l_bc)*4);
-
-			// replace the pointer on the stack with the lvalue
-			*(asPWORD**)l_sp = (asPWORD*)d;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_PshC8:
-		l_sp -= 2;
-		*(asQWORD*)l_sp = asBC_QWORDARG(l_bc);
-		l_bc += 3;
-		break;
-
-	case asBC_PshVPtr:
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = *(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_RDSPtr:
-		{
-			// The pointer must not be null
-			asPWORD a = *(asPWORD*)l_sp;
-			if( a == 0 )
-			{
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-			// Pop an address from the stack, read a pointer from that address and push it on the stack
-			*(asPWORD*)l_sp = *(asPWORD*)a;
-		}
-		l_bc++;
-		break;
-
-	//----------------------------
-	// Comparisons
-	case asBC_CMPd:
-		{
-			// Do a comparison of the values, rather than a subtraction
-			// in order to get proper behaviour for infinity values.
-			double dbl1 = *(double*)(l_fp - asBC_SWORDARG0(l_bc));
-			double dbl2 = *(double*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( dbl1 == dbl2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( dbl1 < dbl2 ) *(int*)&m_regs.valueRegister = -1;
-			else                   *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_CMPu:
-		{
-			asDWORD d1 = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-			asDWORD d2 = *(asDWORD*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( d1 == d2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( d1 < d2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_CMPf:
-		{
-			// Do a comparison of the values, rather than a subtraction
-			// in order to get proper behaviour for infinity values.
-			float f1 = *(float*)(l_fp - asBC_SWORDARG0(l_bc));
-			float f2 = *(float*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( f1 == f2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( f1 < f2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_CMPi:
-		{
-			int i1 = *(int*)(l_fp - asBC_SWORDARG0(l_bc));
-			int i2 = *(int*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( i1 == i2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( i1 < i2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	//----------------------------
-	// Comparisons with constant value
-	case asBC_CMPIi:
-		{
-			int i1 = *(int*)(l_fp - asBC_SWORDARG0(l_bc));
-			int i2 = asBC_INTARG(l_bc);
-			if( i1 == i2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( i1 < i2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_CMPIf:
-		{
-			// Do a comparison of the values, rather than a subtraction
-			// in order to get proper behaviour for infinity values.
-			float f1 = *(float*)(l_fp - asBC_SWORDARG0(l_bc));
-			float f2 = asBC_FLOATARG(l_bc);
-			if( f1 == f2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( f1 < f2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_CMPIu:
-		{
-			asDWORD d1 = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-			asDWORD d2 = asBC_DWORDARG(l_bc);
-			if( d1 == d2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( d1 < d2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_JMPP:
-		l_bc += 1 + (*(int*)(l_fp - asBC_SWORDARG0(l_bc)))*2;
-		break;
-
-	case asBC_PopRPtr:
-		*(asPWORD*)&m_regs.valueRegister = *(asPWORD*)l_sp;
-		l_sp += AS_PTR_SIZE;
-		l_bc++;
-		break;
-
-	case asBC_PshRPtr:
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = *(asPWORD*)&m_regs.valueRegister;
-		l_bc++;
-		break;
-
-	case asBC_STR:
-		{
-			// Get the string id from the argument
-			asWORD w = asBC_WORDARG0(l_bc);
-			// Push the string pointer on the stack
-			const asCString &b = m_engine->GetConstantString(w);
-			l_sp -= AS_PTR_SIZE;
-			*(asPWORD*)l_sp = (asPWORD)b.AddressOf();
-			// Push the string length on the stack
-			--l_sp;
-			*l_sp = (asDWORD)b.GetLength();
-			l_bc++;
-		}
-		break;
-
-	case asBC_CALLSYS:
-		{
-			// Get function ID from the argument
-			int i = asBC_INTARG(l_bc);
-
-			// Need to move the values back to the context as the called functions
-			// may use the debug interface to inspect the registers
-			m_regs.programPointer    = l_bc;
-			m_regs.stackPointer      = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			l_sp += CallSystemFunction(i, this);
-
-			// Update the program position after the call so that line number is correct
-			l_bc += 2;
-
-			if( m_regs.doProcessSuspend )
-			{
-				// Should the execution be suspended?
-				if( m_doSuspend )
-				{
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					m_status = asEXECUTION_SUSPENDED;
-					return;
-				}
-				// An exception might have been raised
-				if( m_status != asEXECUTION_ACTIVE )
-				{
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					return;
-				}
-			}
-		}
-		break;
-
-	case asBC_CALLBND:
-		{
-			// TODO: Clean-up: This code is very similar to asBC_CallPtr. Create a shared method for them
-			// Get the function ID from the stack
-			int i = asBC_INTARG(l_bc);
-
-			asASSERT( i >= 0 );
-			asASSERT( i & FUNC_IMPORTED );
-
-			// Need to move the values back to the context
-			m_regs.programPointer    = l_bc;
-			m_regs.stackPointer      = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			int funcId = m_engine->importedFunctions[i & ~FUNC_IMPORTED]->boundFunctionId;
-			if( funcId == -1 )
-			{
-				// Need to update the program pointer for the exception handler
-				m_regs.programPointer += 2;
-
-				// Tell the exception handler to clean up the arguments to this function
-				m_needToCleanupArgs = true;
-				SetInternalException(TXT_UNBOUND_FUNCTION);
-				return;
-			}
-			else
-			{
-				asCScriptFunction *func = m_engine->GetScriptFunction(funcId);
-				if( func->funcType == asFUNC_SCRIPT )
-				{
-					m_regs.programPointer += 2;
-					CallScriptFunction(func);
-				}
-				else if( func->funcType == asFUNC_DELEGATE )
-				{
-					// Push the object pointer on the stack. There is always a reserved space for this so
-					// we don't don't need to worry about overflowing the allocated memory buffer
-					asASSERT( m_regs.stackPointer - AS_PTR_SIZE >= m_stackBlocks[m_stackIndex] );
-					m_regs.stackPointer -= AS_PTR_SIZE;
-					*(asPWORD*)m_regs.stackPointer = asPWORD(func->objForDelegate);
-
-					// Call the delegated method
-					if( func->funcForDelegate->funcType == asFUNC_SYSTEM )
-					{
-						m_regs.stackPointer += CallSystemFunction(func->funcForDelegate->id, this);
-
-						// Update program position after the call so the line number
-						// is correct in case the system function queries it
-						m_regs.programPointer += 2;
-					}
-					else
-					{
-						m_regs.programPointer += 2;
-
-						// TODO: run-time optimize: The true method could be figured out when creating the delegate
-						CallInterfaceMethod(func->funcForDelegate);
-					}
-				}
-				else
-				{
-					asASSERT( func->funcType == asFUNC_SYSTEM );
-
-					m_regs.stackPointer += CallSystemFunction(func->id, this);
-
-					// Update program position after the call so the line number
-					// is correct in case the system function queries it
-					m_regs.programPointer += 2;
-				}
-			}
-
-			// Extract the values from the context again
-			l_bc = m_regs.programPointer;
-			l_sp = m_regs.stackPointer;
-			l_fp = m_regs.stackFramePointer;
-
-			// If status isn't active anymore then we must stop
-			if( m_status != asEXECUTION_ACTIVE )
-				return;
-		}
-		break;
-
-	case asBC_SUSPEND:
-		if( m_regs.doProcessSuspend )
-		{
-			if( m_lineCallback )
-			{
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				CallLineCallback();
-			}
-			if( m_doSuspend )
-			{
-				l_bc++;
-
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				m_status = asEXECUTION_SUSPENDED;
-				return;
-			}
-		}
-
-		l_bc++;
-		break;
-
-	case asBC_ALLOC:
-		{
-			asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
-			int func = asBC_INTARG(l_bc+AS_PTR_SIZE);
-
-			if( objType->flags & asOBJ_SCRIPT_OBJECT )
-			{
-				// Need to move the values back to the context as the construction
-				// of the script object may reuse the context for nested calls.
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Pre-allocate the memory
-				asDWORD *mem = (asDWORD*)m_engine->CallAlloc(objType);
-
-				// Pre-initialize the memory by calling the constructor for asCScriptObject
-				ScriptObject_Construct(objType, (asCScriptObject*)mem);
-
-				// Call the constructor to initalize the memory
-				asCScriptFunction *f = m_engine->scriptFunctions[func];
-
-				asDWORD **a = (asDWORD**)*(asPWORD*)(m_regs.stackPointer + f->GetSpaceNeededForArguments());
-				if( a ) *a = mem;
-
-				// Push the object pointer on the stack
-				m_regs.stackPointer -= AS_PTR_SIZE;
-				*(asPWORD*)m_regs.stackPointer = (asPWORD)mem;
-
-				m_regs.programPointer += 2+AS_PTR_SIZE;
-
-				CallScriptFunction(f);
-
-				// Extract the values from the context again
-				l_bc = m_regs.programPointer;
-				l_sp = m_regs.stackPointer;
-				l_fp = m_regs.stackFramePointer;
-
-				// If status isn't active anymore then we must stop
-				if( m_status != asEXECUTION_ACTIVE )
-					return;
-			}
-			else
-			{
-				// Pre-allocate the memory
-				asDWORD *mem = (asDWORD*)m_engine->CallAlloc(objType);
-
-				if( func )
-				{
-					// Push the object pointer on the stack (it will be popped by the function)
-					l_sp -= AS_PTR_SIZE;
-					*(asPWORD*)l_sp = (asPWORD)mem;
-
-					// Need to move the values back to the context as the called functions
-					// may use the debug interface to inspect the registers
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					l_sp += CallSystemFunction(func, this);
-				}
-
-				// Pop the variable address from the stack
-				asDWORD **a = (asDWORD**)*(asPWORD*)l_sp;
-				l_sp += AS_PTR_SIZE;
-				if( a ) *a = mem;
-
-				l_bc += 2+AS_PTR_SIZE;
-
-				if( m_regs.doProcessSuspend )
-				{
-					// Should the execution be suspended?
-					if( m_doSuspend )
-					{
-						m_regs.programPointer    = l_bc;
-						m_regs.stackPointer      = l_sp;
-						m_regs.stackFramePointer = l_fp;
-
-						m_status = asEXECUTION_SUSPENDED;
-						return;
-					}
-					// An exception might have been raised
-					if( m_status != asEXECUTION_ACTIVE )
-					{
-						m_regs.programPointer    = l_bc;
-						m_regs.stackPointer      = l_sp;
-						m_regs.stackFramePointer = l_fp;
-
-						m_engine->CallFree(mem);
-						*a = 0;
-
-						return;
-					}
-				}
-			}
-		}
-		break;
-
-	case asBC_FREE:
-		{
-			// Get the variable that holds the object handle/reference
-			asPWORD *a = (asPWORD*)asPWORD(l_fp - asBC_SWORDARG0(l_bc));
-			if( *a )
-			{
-				asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
-				asSTypeBehaviour *beh = &objType->beh;
-
-				// Need to move the values back to the context as the called functions
-				// may use the debug interface to inspect the registers
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				if( objType->flags & asOBJ_REF )
-				{
-					asASSERT( (objType->flags & asOBJ_NOCOUNT) || beh->release );
-					if( beh->release )
-						m_engine->CallObjectMethod((void*)(asPWORD)*a, beh->release);
-				}
-				else
-				{
-					if( beh->destruct )
-						m_engine->CallObjectMethod((void*)(asPWORD)*a, beh->destruct);
-					else if( objType->flags & asOBJ_LIST_PATTERN )
-						m_engine->DestroyList((asBYTE*)(asPWORD)*a, objType);
-
-					m_engine->CallFree((void*)(asPWORD)*a);
-				}
-
-				// Clear the variable
-				*a = 0;
-			}
-		}
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-	case asBC_LOADOBJ:
-		{
-			// Move the object pointer from the object variable into the object register
-			void **a = (void**)(l_fp - asBC_SWORDARG0(l_bc));
-			m_regs.objectType = 0;
-			m_regs.objectRegister = *a;
-			*a = 0;
-		}
-		l_bc++;
-		break;
-
-	case asBC_STOREOBJ:
-		// Move the object pointer from the object register to the object variable
-		*(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asPWORD(m_regs.objectRegister);
-		m_regs.objectRegister = 0;
-		l_bc++;
-		break;
-
-	case asBC_GETOBJ:
-		{
-			// Read variable index from location on stack
-			asPWORD *a = (asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
-			asPWORD offset = *a;
-			// Move pointer from variable to the same location on the stack
-			asPWORD *v = (asPWORD*)(l_fp - offset);
-			*a = *v;
-			// Clear variable
-			*v = 0;
-		}
-		l_bc++;
-		break;
-
-	case asBC_REFCPY:
-		{
-			asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
-			asSTypeBehaviour *beh = &objType->beh;
-
-			// Pop address of destination pointer from the stack
-			void **d = (void**)*(asPWORD*)l_sp;
-			l_sp += AS_PTR_SIZE;
-
-			// Read wanted pointer from the stack
-			void *s = (void*)*(asPWORD*)l_sp;
-
-			// Need to move the values back to the context as the called functions
-			// may use the debug interface to inspect the registers
-			m_regs.programPointer    = l_bc;
-			m_regs.stackPointer      = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			if( !(objType->flags & asOBJ_NOCOUNT) )
-			{
-				// Release previous object held by destination pointer
-				if( *d != 0 )
-					m_engine->CallObjectMethod(*d, beh->release);
-				// Increase ref counter of wanted object
-				if( s != 0 )
-					m_engine->CallObjectMethod(s, beh->addref);
-			}
-
-			// Set the new object in the destination
-			*d = s;
-		}
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-	case asBC_CHKREF:
-		{
-			// Verify if the pointer on the stack is null
-			// This is used when validating a pointer that an operator will work on
-			asPWORD a = *(asPWORD*)l_sp;
-			if( a == 0 )
-			{
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-		}
-		l_bc++;
-		break;
-
-	case asBC_GETOBJREF:
-		{
-			// Get the location on the stack where the reference will be placed
-			asPWORD *a = (asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
-
-			// Replace the variable index with the object handle held in the variable
-			*(asPWORD**)a = *(asPWORD**)(l_fp - *a);
-		}
-		l_bc++;
-		break;
-
-	case asBC_GETREF:
-		{
-			// Get the location on the stack where the reference will be placed
-			asPWORD *a = (asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
-
-			// Replace the variable index with the address of the variable
-			*(asPWORD**)a = (asPWORD*)(l_fp - (int)*a);
-		}
-		l_bc++;
-		break;
-
-	case asBC_PshNull:
-		// Push a null pointer on the stack
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = 0;
-		l_bc++;
-		break;
-
-	case asBC_ClrVPtr:
-		// TODO: runtime optimize: Is this instruction really necessary?
-		//                         CallScriptFunction() can clear the null handles upon entry, just as is done for
-		//                         all other object variables
-		// Clear pointer variable
-		*(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = 0;
-		l_bc++;
-		break;
-
-	case asBC_OBJTYPE:
-		// Push the object type on the stack
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = asBC_PTRARG(l_bc);
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-	case asBC_TYPEID:
-		// Equivalent to PshC4, but kept as separate instruction for bytecode serialization
-		--l_sp;
-		*l_sp = asBC_DWORDARG(l_bc);
-		l_bc += 2;
-		break;
-
-	case asBC_SetV4:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = asBC_DWORDARG(l_bc);
-		l_bc += 2;
-		break;
-
-	case asBC_SetV8:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asBC_QWORDARG(l_bc);
-		l_bc += 3;
-		break;
-
-	case asBC_ADDSi:
-		{
-			// The pointer must not be null
-			asPWORD a = *(asPWORD*)l_sp;
-			if( a == 0 )
-			{
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-			// Add an offset to the pointer
-			*(asPWORD*)l_sp = a + asBC_SWORDARG0(l_bc);
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_CpyVtoV4:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_CpyVtoV8:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_CpyVtoR4:
-		*(asDWORD*)&m_regs.valueRegister = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_CpyVtoR8:
-		*(asQWORD*)&m_regs.valueRegister = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_CpyVtoG4:
-		*(asDWORD*)asBC_PTRARG(l_bc) = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc += 1 + AS_PTR_SIZE;
-		break;
-
-	case asBC_CpyRtoV4:
-		*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asDWORD*)&m_regs.valueRegister;
-		l_bc++;
-		break;
-
-	case asBC_CpyRtoV8:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = m_regs.valueRegister;
-		l_bc++;
-		break;
-
-	case asBC_CpyGtoV4:
-		*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asDWORD*)asBC_PTRARG(l_bc);
-		l_bc += 1 + AS_PTR_SIZE;
-		break;
-
-	case asBC_WRTV1:
-		// The pointer in the register points to a byte, and *(l_fp - offset) too
-		**(asBYTE**)&m_regs.valueRegister = *(asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_WRTV2:
-		// The pointer in the register points to a word, and *(l_fp - offset) too
-		**(asWORD**)&m_regs.valueRegister = *(asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_WRTV4:
-		**(asDWORD**)&m_regs.valueRegister = *(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_WRTV8:
-		**(asQWORD**)&m_regs.valueRegister = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_RDR1:
-		{
-			// The pointer in the register points to a byte, and *(l_fp - offset) will also point to a byte
-			asBYTE *bPtr = (asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
-			bPtr[0] = **(asBYTE**)&m_regs.valueRegister; // read the byte
-			bPtr[1] = 0;                      // 0 the rest of the DWORD
-			bPtr[2] = 0;
-			bPtr[3] = 0;
-		}
-		l_bc++;
-		break;
-
-	case asBC_RDR2:
-		{
-			// The pointer in the register points to a word, and *(l_fp - offset) will also point to a word
-			asWORD *wPtr = (asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-			wPtr[0] = **(asWORD**)&m_regs.valueRegister; // read the word
-			wPtr[1] = 0;                      // 0 the rest of the DWORD
-		}
-		l_bc++;
-		break;
-
-	case asBC_RDR4:
-		*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = **(asDWORD**)&m_regs.valueRegister;
-		l_bc++;
-		break;
-
-	case asBC_RDR8:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = **(asQWORD**)&m_regs.valueRegister;
-		l_bc++;
-		break;
-
-	case asBC_LDG:
-		*(asPWORD*)&m_regs.valueRegister = asBC_PTRARG(l_bc);
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-	case asBC_LDV:
-		*(asDWORD**)&m_regs.valueRegister = (l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_PGA:
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = asBC_PTRARG(l_bc);
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-	case asBC_CmpPtr:
-		{
-			// TODO: runtime optimize: This instruction should really just be an equals, and return true or false.
-			//                         The instruction is only used for is and !is tests anyway.
-			asPWORD p1 = *(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-			asPWORD p2 = *(asPWORD*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( p1 == p2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( p1 < p2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_VAR:
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = (asPWORD)asBC_SWORDARG0(l_bc);
-		l_bc++;
-		break;
-
-	//----------------------------
-	// Type conversions
-	case asBC_iTOf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(int*)(l_fp - asBC_SWORDARG0(l_bc)));
-		l_bc++;
-		break;
-
-	case asBC_fTOi:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(float*)(l_fp - asBC_SWORDARG0(l_bc)));
-		l_bc++;
-		break;
-
-	case asBC_uTOf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(l_fp - asBC_SWORDARG0(l_bc)));
-		l_bc++;
-		break;
-
-	case asBC_fTOu:
-		// We must cast to int first, because on some compilers the cast of a negative float value to uint result in 0
-		*(l_fp - asBC_SWORDARG0(l_bc)) = asUINT(int(*(float*)(l_fp - asBC_SWORDARG0(l_bc))));
-		l_bc++;
-		break;
-
-	case asBC_sbTOi:
-		// *(l_fp - offset) points to a char, and will point to an int afterwards
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(signed char*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_swTOi:
-		// *(l_fp - offset) points to a short, and will point to an int afterwards
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(short*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_ubTOi:
-		// (l_fp - offset) points to a byte, and will point to an int afterwards
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_uwTOi:
-		// *(l_fp - offset) points to a word, and will point to an int afterwards
-		*(l_fp - asBC_SWORDARG0(l_bc)) = *(asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_dTOi:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(double*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_dTOu:
-		// We must cast to int first, because on some compilers the cast of a negative float value to uint result in 0
-		*(l_fp - asBC_SWORDARG0(l_bc)) = asUINT(int(*(double*)(l_fp - asBC_SWORDARG1(l_bc))));
-		l_bc += 2;
-		break;
-
-	case asBC_dTOf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(double*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_iTOd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(int*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_uTOd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_fTOd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(float*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	//------------------------------
-	// Math operations
-	case asBC_ADDi:
-		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) + *(int*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_SUBi:
-		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) - *(int*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_MULi:
-		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) * *(int*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_DIVi:
-		{
-			int divider = *(int*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			else if( divider == -1 )
-			{
-				// Need to check if the value that is divided is 0x80000000
-				// as dividing it with -1 will cause an overflow exception
-				if( *(int*)(l_fp - asBC_SWORDARG1(l_bc)) == int(0x80000000) )
-				{
-					// Need to move the values back to the context
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					// Raise exception
-					SetInternalException(TXT_DIVIDE_OVERFLOW);
-					return;
-				}
-			}
-			*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_MODi:
-		{
-			int divider = *(int*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			else if( divider == -1 )
-			{
-				// Need to check if the value that is divided is 0x80000000
-				// as dividing it with -1 will cause an overflow exception
-				if( *(int*)(l_fp - asBC_SWORDARG1(l_bc)) == int(0x80000000) )
-				{
-					// Need to move the values back to the context
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					// Raise exception
-					SetInternalException(TXT_DIVIDE_OVERFLOW);
-					return;
-				}
-			}
-			*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_ADDf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) + *(float*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_SUBf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) - *(float*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_MULf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) * *(float*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_DIVf:
-		{
-			float divider = *(float*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_MODf:
-		{
-			float divider = *(float*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = fmodf(*(float*)(l_fp - asBC_SWORDARG1(l_bc)), divider);
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_ADDd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) + *(double*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_SUBd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) - *(double*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_MULd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) * *(double*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_DIVd:
-		{
-			double divider = *(double*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-
-			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_MODd:
-		{
-			double divider = *(double*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-
-			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = fmod(*(double*)(l_fp - asBC_SWORDARG1(l_bc)), divider);
-			l_bc += 2;
-		}
-		break;
-
-	//------------------------------
-	// Math operations with constant value
-	case asBC_ADDIi:
-		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) + asBC_INTARG(l_bc+1);
-		l_bc += 3;
-		break;
-
-	case asBC_SUBIi:
-		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) - asBC_INTARG(l_bc+1);
-		l_bc += 3;
-		break;
-
-	case asBC_MULIi:
-		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) * asBC_INTARG(l_bc+1);
-		l_bc += 3;
-		break;
-
-	case asBC_ADDIf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) + asBC_FLOATARG(l_bc+1);
-		l_bc += 3;
-		break;
-
-	case asBC_SUBIf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) - asBC_FLOATARG(l_bc+1);
-		l_bc += 3;
-		break;
-
-	case asBC_MULIf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) * asBC_FLOATARG(l_bc+1);
-		l_bc += 3;
-		break;
-
-	//-----------------------------------
-	case asBC_SetG4:
-		*(asDWORD*)asBC_PTRARG(l_bc) = asBC_DWORDARG(l_bc+AS_PTR_SIZE);
-		l_bc += 2 + AS_PTR_SIZE;
-		break;
-
-	case asBC_ChkRefS:
-		{
-			// Verify if the pointer on the stack refers to a non-null value
-			// This is used to validate a reference to a handle
-			asPWORD *a = (asPWORD*)*(asPWORD*)l_sp;
-			if( *a == 0 )
-			{
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-		}
-		l_bc++;
-		break;
-
-	case asBC_ChkNullV:
-		{
-			// Verify if variable (on the stack) is not null
-			asDWORD *a = *(asDWORD**)(l_fp - asBC_SWORDARG0(l_bc));
-			if( a == 0 )
-			{
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-		}
-		l_bc++;
-		break;
-
-	case asBC_CALLINTF:
-		{
-			int i = asBC_INTARG(l_bc);
-			l_bc += 2;
-
-			asASSERT( i >= 0 );
-			asASSERT( (i & FUNC_IMPORTED) == 0 );
-
-			// Need to move the values back to the context
-			m_regs.programPointer    = l_bc;
-			m_regs.stackPointer      = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			CallInterfaceMethod(m_engine->GetScriptFunction(i));
-
-			// Extract the values from the context again
-			l_bc = m_regs.programPointer;
-			l_sp = m_regs.stackPointer;
-			l_fp = m_regs.stackFramePointer;
-
-			// If status isn't active anymore then we must stop
-			if( m_status != asEXECUTION_ACTIVE )
-				return;
-		}
-		break;
-
-	case asBC_iTOb:
-		{
-			// *(l_fp - offset) points to an int, and will point to a byte afterwards
-
-			// We need to use volatile here to tell the compiler not to rearrange
-			// read and write operations during optimizations.
-			volatile asDWORD val  = *(l_fp - asBC_SWORDARG0(l_bc));
-			volatile asBYTE *bPtr = (asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
-			bPtr[0] = (asBYTE)val; // write the byte
-			bPtr[1] = 0;           // 0 the rest of the DWORD
-			bPtr[2] = 0;
-			bPtr[3] = 0;
-		}
-		l_bc++;
-		break;
-
-	case asBC_iTOw:
-		{
-			// *(l_fp - offset) points to an int, and will point to word afterwards
-
-			// We need to use volatile here to tell the compiler not to rearrange
-			// read and write operations during optimizations.
-			volatile asDWORD val  = *(l_fp - asBC_SWORDARG0(l_bc));
-			volatile asWORD *wPtr = (asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-			wPtr[0] = (asWORD)val; // write the word
-			wPtr[1] = 0;           // 0 the rest of the DWORD
-		}
-		l_bc++;
-		break;
-
-	case asBC_SetV1:
-		// TODO: This is exactly the same as SetV4. This is a left over from the time
-		//       when the bytecode instructions were more tightly packed. It can now
-		//       be removed. When removing it, make sure the value is correctly converted
-		//       on big-endian CPUs.
-
-		// The byte is already stored correctly in the argument
-		*(l_fp - asBC_SWORDARG0(l_bc)) = asBC_DWORDARG(l_bc);
-		l_bc += 2;
-		break;
-
-	case asBC_SetV2:
-		// TODO: This is exactly the same as SetV4. This is a left over from the time
-		//       when the bytecode instructions were more tightly packed. It can now
-		//       be removed. When removing it, make sure the value is correctly converted
-		//       on big-endian CPUs.
-
-		// The word is already stored correctly in the argument
-		*(l_fp - asBC_SWORDARG0(l_bc)) = asBC_DWORDARG(l_bc);
-		l_bc += 2;
-		break;
-
-	case asBC_Cast:
-		// Cast the handle at the top of the stack to the type in the argument
-		{
-			asDWORD **a = (asDWORD**)*(asPWORD*)l_sp;
-			if( a && *a )
-			{
-				asDWORD typeId = asBC_DWORDARG(l_bc);
-
-				asCScriptObject *obj = (asCScriptObject *)* a;
-				asCObjectType *objType = obj->objType;
-				asCObjectType *to = m_engine->GetObjectTypeFromTypeId(typeId);
-
-				// This instruction can only be used with script classes and interfaces
-				asASSERT( objType->flags & asOBJ_SCRIPT_OBJECT );
-				asASSERT( to->flags & asOBJ_SCRIPT_OBJECT );
-
-				if( objType->Implements(to) || objType->DerivesFrom(to) )
-				{
-					m_regs.objectType = 0;
-					m_regs.objectRegister = obj;
-					obj->AddRef();
-				}
-				else
-				{
-					// The object register should already be null, so there
-					// is no need to clear it if the cast is unsuccessful
-					asASSERT( m_regs.objectRegister == 0 );
-				}
-			}
-			l_sp += AS_PTR_SIZE;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_i64TOi:
-		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_uTOi64:
-		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_iTOi64:
-		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(int*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_fTOi64:
-		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(float*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_dTOi64:
-		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(double*)(l_fp - asBC_SWORDARG0(l_bc)));
-		l_bc++;
-		break;
-
-	case asBC_fTOu64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asQWORD(asINT64(*(float*)(l_fp - asBC_SWORDARG1(l_bc))));
-		l_bc += 2;
-		break;
-
-	case asBC_dTOu64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asQWORD(asINT64(*(double*)(l_fp - asBC_SWORDARG0(l_bc))));
-		l_bc++;
-		break;
-
-	case asBC_i64TOf:
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)));
-		l_bc += 2;
-		break;
-
-	case asBC_u64TOf:
-#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC6
-		{
-			// MSVC6 doesn't permit UINT64 to double
-			asINT64 v = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( v < 0 )
-				*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = 18446744073709551615.0f+float(v);
-			else
-				*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(v);
-		}
-#else
-		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)));
-#endif
-		l_bc += 2;
-		break;
-
-	case asBC_i64TOd:
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)));
-		l_bc++;
-		break;
-
-	case asBC_u64TOd:
-#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC6
-		{
-			// MSVC6 doesn't permit UINT64 to double
-			asINT64 v = *(asINT64*)(l_fp - asBC_SWORDARG0(l_bc));
-			if( v < 0 )
-				*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = 18446744073709551615.0+double(v);
-			else
-				*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(v);
-		}
-#else
-		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)));
-#endif
-		l_bc++;
-		break;
-
-	case asBC_NEGi64:
-		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = -*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_INCi64:
-		++(**(asQWORD**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	case asBC_DECi64:
-		--(**(asQWORD**)&m_regs.valueRegister);
-		l_bc++;
-		break;
-
-	case asBC_BNOT64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = ~*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_ADDi64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) + *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_SUBi64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) - *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_MULi64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) * *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_DIVi64:
-		{
-			asINT64 divider = *(asINT64*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			else if( divider == -1 )
-			{
-				// Need to check if the value that is divided is 1<<63
-				// as dividing it with -1 will cause an overflow exception
-				if( *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) == (asINT64(1)<<63) )
-				{
-					// Need to move the values back to the context
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					// Raise exception
-					SetInternalException(TXT_DIVIDE_OVERFLOW);
-					return;
-				}
-			}
-
-			*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_MODi64:
-		{
-			asINT64 divider = *(asINT64*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			else if( divider == -1 )
-			{
-				// Need to check if the value that is divided is 1<<63
-				// as dividing it with -1 will cause an overflow exception
-				if( *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) == (asINT64(1)<<63) )
-				{
-					// Need to move the values back to the context
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					// Raise exception
-					SetInternalException(TXT_DIVIDE_OVERFLOW);
-					return;
-				}
-			}
-			*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_BAND64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) & *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_BOR64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) | *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_BXOR64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) ^ *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_BSLL64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) << *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_BSRL64:
-		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) >> *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_BSRA64:
-		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) >> *(l_fp - asBC_SWORDARG2(l_bc));
-		l_bc += 2;
-		break;
-
-	case asBC_CMPi64:
-		{
-			asINT64 i1 = *(asINT64*)(l_fp - asBC_SWORDARG0(l_bc));
-			asINT64 i2 = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( i1 == i2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( i1 < i2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_CMPu64:
-		{
-			asQWORD d1 = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-			asQWORD d2 = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc));
-			if( d1 == d2 )     *(int*)&m_regs.valueRegister =  0;
-			else if( d1 < d2 ) *(int*)&m_regs.valueRegister = -1;
-			else               *(int*)&m_regs.valueRegister =  1;
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_ChkNullS:
-		{
-			// Verify if the pointer on the stack is null
-			// This is used for example when validating handles passed as function arguments
-			asPWORD a = *(asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
-			if( a == 0 )
-			{
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-		}
-		l_bc++;
-		break;
-
-	case asBC_ClrHi:
-#if AS_SIZEOF_BOOL == 1
-		{
-			// Clear the upper bytes, so that trash data don't interfere with boolean operations
-
-			// We need to use volatile here to tell the compiler it cannot
-			// change the order of read and write operations on the pointer.
-
-			volatile asBYTE *ptr = (asBYTE*)&m_regs.valueRegister;
-			ptr[1] = 0;   // The boolean value is stored in the lower byte, so we clear the rest
-			ptr[2] = 0;
-			ptr[3] = 0;
-		}
-#else
-		// We don't have anything to do here
-#endif
-		l_bc++;
-		break;
-
-	case asBC_JitEntry:
-		{
-			if( m_currentFunction->scriptData->jitFunction )
-			{
-				asPWORD jitArg = asBC_PTRARG(l_bc);
-
-				if( jitArg )
-				{
-					// Resume JIT operation
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					(m_currentFunction->scriptData->jitFunction)(&m_regs, jitArg);
-
-					l_bc = m_regs.programPointer;
-					l_sp = m_regs.stackPointer;
-					l_fp = m_regs.stackFramePointer;
-
-					// If status isn't active anymore then we must stop
-					if( m_status != asEXECUTION_ACTIVE )
-						return;
-
-					break;
-				}
-			}
-
-			// Not a JIT resume point, treat as nop
-			l_bc += 1+AS_PTR_SIZE;
-		}
-		break;
-
-	case asBC_CallPtr:
-		{
-			// Get the function pointer from the local variable
-			asCScriptFunction *func = *(asCScriptFunction**)(l_fp - asBC_SWORDARG0(l_bc));
-
-			// Need to move the values back to the context
-			m_regs.programPointer    = l_bc;
-			m_regs.stackPointer      = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			if( func == 0 )
-			{
-				// Need to update the program pointer anyway for the exception handler
-				m_regs.programPointer++;
-
-				// Tell the exception handler to clean up the arguments to this method
-				m_needToCleanupArgs = true;
-
-				// TODO: funcdef: Should we have a different exception string?
-				SetInternalException(TXT_UNBOUND_FUNCTION);
-				return;
-			}
-			else
-			{
-				if( func->funcType == asFUNC_SCRIPT )
-				{
-					m_regs.programPointer++;
-					CallScriptFunction(func);
-				}
-				else if( func->funcType == asFUNC_DELEGATE )
-				{
-					// Push the object pointer on the stack. There is always a reserved space for this so
-					// we don't don't need to worry about overflowing the allocated memory buffer
-					asASSERT( m_regs.stackPointer - AS_PTR_SIZE >= m_stackBlocks[m_stackIndex] );
-					m_regs.stackPointer -= AS_PTR_SIZE;
-					*(asPWORD*)m_regs.stackPointer = asPWORD(func->objForDelegate);
-
-					// Call the delegated method
-					if( func->funcForDelegate->funcType == asFUNC_SYSTEM )
-					{
-						m_regs.stackPointer += CallSystemFunction(func->funcForDelegate->id, this);
-
-						// Update program position after the call so the line number
-						// is correct in case the system function queries it
-						m_regs.programPointer++;
-					}
-					else
-					{
-						m_regs.programPointer++;
-
-						// TODO: run-time optimize: The true method could be figured out when creating the delegate
-						CallInterfaceMethod(func->funcForDelegate);
-					}
-				}
-				else
-				{
-					asASSERT( func->funcType == asFUNC_SYSTEM );
-
-					m_regs.stackPointer += CallSystemFunction(func->id, this);
-
-					// Update program position after the call so the line number
-					// is correct in case the system function queries it
-					m_regs.programPointer++;
-				}
-			}
-
-			// Extract the values from the context again
-			l_bc = m_regs.programPointer;
-			l_sp = m_regs.stackPointer;
-			l_fp = m_regs.stackFramePointer;
-
-			// If status isn't active anymore then we must stop
-			if( m_status != asEXECUTION_ACTIVE )
-				return;
-		}
-		break;
-
-	case asBC_FuncPtr:
-		// Push the function pointer on the stack. The pointer is in the argument
-		l_sp -= AS_PTR_SIZE;
-		*(asPWORD*)l_sp = asBC_PTRARG(l_bc);
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-	case asBC_LoadThisR:
-		{
-			// PshVPtr 0
-			asPWORD tmp = *(asPWORD*)l_fp;
-
-			// Make sure the pointer is not null
-			if( tmp == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-
-			// ADDSi
-			tmp = tmp + asBC_SWORDARG0(l_bc);
-
-			// PopRPtr
-			*(asPWORD*)&m_regs.valueRegister = tmp;
-			l_bc += 2;
-		}
-		break;
-
-	// Push the qword value of a variable on the stack
-	case asBC_PshV8:
-		l_sp -= 2;
-		*(asQWORD*)l_sp = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-		l_bc++;
-		break;
-
-	case asBC_DIVu:
-		{
-			asUINT divider = *(asUINT*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			*(asUINT*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_MODu:
-		{
-			asUINT divider = *(asUINT*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			*(asUINT*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_DIVu64:
-		{
-			asQWORD divider = *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_MODu64:
-		{
-			asQWORD divider = *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
-			if( divider == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_DIVIDE_BY_ZERO);
-				return;
-			}
-			*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_LoadRObjR:
-		{
-			// PshVPtr x
-			asPWORD tmp = *(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc));
-
-			// Make sure the pointer is not null
-			if( tmp == 0 )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-				return;
-			}
-
-			// ADDSi y
-			tmp = tmp + asBC_SWORDARG1(l_bc);
-
-			// PopRPtr
-			*(asPWORD*)&m_regs.valueRegister = tmp;
-			l_bc += 3;
-		}
-		break;
-
-	case asBC_LoadVObjR:
-		{
-			// PSF x
-			asPWORD tmp = (asPWORD)(l_fp - asBC_SWORDARG0(l_bc));
-
-			// ADDSi y
-			tmp = tmp + asBC_SWORDARG1(l_bc);
-
-			// PopRPtr
-			*(asPWORD*)&m_regs.valueRegister = tmp;
-			l_bc += 3;
-		}
-		break;
-
-	case asBC_RefCpyV:
-		// Same as PSF v, REFCPY
-		{
-			asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
-			asSTypeBehaviour *beh = &objType->beh;
-
-			// Determine destination from argument
-			void **d = (void**)asPWORD(l_fp - asBC_SWORDARG0(l_bc));
-
-			// Read wanted pointer from the stack
-			void *s = (void*)*(asPWORD*)l_sp;
-
-			// Need to move the values back to the context as the called functions
-			// may use the debug interface to inspect the registers
-			m_regs.programPointer    = l_bc;
-			m_regs.stackPointer      = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			if( !(objType->flags & asOBJ_NOCOUNT) )
-			{
-				// Release previous object held by destination pointer
-				if( *d != 0 )
-					m_engine->CallObjectMethod(*d, beh->release);
-				// Increase ref counter of wanted object
-				if( s != 0 )
-					m_engine->CallObjectMethod(s, beh->addref);
-			}
-
-			// Set the new object in the destination
-			*d = s;
-		}
-		l_bc += 1+AS_PTR_SIZE;
-		break;
-
-	case asBC_JLowZ:
-		if( *(asBYTE*)&m_regs.valueRegister == 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-
-	case asBC_JLowNZ:
-		if( *(asBYTE*)&m_regs.valueRegister != 0 )
-			l_bc += asBC_INTARG(l_bc) + 2;
-		else
-			l_bc += 2;
-		break;
-
-	case asBC_AllocMem:
-		// Allocate a buffer and store the pointer in the local variable
-		{
-			// TODO: runtime optimize: As the list buffers are going to be short lived, it may be interesting
-			//                         to use a memory pool to avoid reallocating the memory all the time
-
-			asUINT size = asBC_DWORDARG(l_bc);
-			asBYTE **var = (asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
-#ifndef WIP_16BYTE_ALIGN
-			*var = asNEWARRAY(asBYTE, size);
-#else
-			*var = asNEWARRAYALIGNED(asBYTE, size, MAX_TYPE_ALIGNMENT);
-#endif
-
-			// Clear the buffer for the pointers that will be placed in it
-			memset(*var, 0, size);
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_SetListSize:
-		{
-			// Set the size element in the buffer
-			asBYTE *var = *(asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
-			asUINT off  = asBC_DWORDARG(l_bc);
-			asUINT size = asBC_DWORDARG(l_bc+1);
-
-			asASSERT( var );
-
-			*(asUINT*)(var+off) = size;
-		}
-		l_bc += 3;
-		break;
-
-	case asBC_PshListElmnt:
-		{
-			// Push the pointer to the list element on the stack
-			// In essence it does the same as PSF, RDSPtr, ADDSi
-			asBYTE *var = *(asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
-			asUINT off = asBC_DWORDARG(l_bc);
-
-			asASSERT( var );
-
-			l_sp -= AS_PTR_SIZE;
-			*(asPWORD*)l_sp = asPWORD(var+off);
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_SetListType:
-		{
-			// Set the type id in the buffer
-			asBYTE *var = *(asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
-			asUINT off  = asBC_DWORDARG(l_bc);
-			asUINT type = asBC_DWORDARG(l_bc+1);
-
-			asASSERT( var );
-
-			*(asUINT*)(var+off) = type;
-		}
-		l_bc += 3;
-		break;
-
-	//------------------------------
-	// Exponent operations
-	case asBC_POWi:
-		{
-			bool isOverflow;
-			*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powi(*(int*)(l_fp - asBC_SWORDARG1(l_bc)), *(int*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
-			if( isOverflow )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_POW_OVERFLOW);
-				return;
-			}
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_POWu:
-		{
-			bool isOverflow;
-			*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powu(*(asDWORD*)(l_fp - asBC_SWORDARG1(l_bc)), *(asDWORD*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
-			if( isOverflow )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_POW_OVERFLOW);
-				return;
-			}
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_POWf:
-		{
-			float r = powf(*(float*)(l_fp - asBC_SWORDARG1(l_bc)), *(float*)(l_fp - asBC_SWORDARG2(l_bc)));
-			*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = r;
-			if( r == float(HUGE_VAL) )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_POW_OVERFLOW);
-				return;
-			}
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_POWd:
-		{
-			double r = pow(*(double*)(l_fp - asBC_SWORDARG1(l_bc)), *(double*)(l_fp - asBC_SWORDARG2(l_bc)));
-			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = r;
-			if( r == HUGE_VAL )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_POW_OVERFLOW);
-				return;
-			}
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_POWdi:
-		{
-			double r = pow(*(double*)(l_fp - asBC_SWORDARG1(l_bc)), *(int*)(l_fp - asBC_SWORDARG2(l_bc)));
-			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = r;
-			if( r == HUGE_VAL )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_POW_OVERFLOW);
-				return;
-			}
-			l_bc += 2;
-		}
-		break;
-
-	case asBC_POWi64:
-		{
-			bool isOverflow;
-			*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powi64(*(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)), *(asINT64*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
-			if( isOverflow )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_POW_OVERFLOW);
-				return;
-			}
-		}
-		l_bc += 2;
-		break;
-
-	case asBC_POWu64:
-		{
-			bool isOverflow;
-			*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powu64(*(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)), *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
-			if( isOverflow )
-			{
-				// Need to move the values back to the context
-				m_regs.programPointer    = l_bc;
-				m_regs.stackPointer      = l_sp;
-				m_regs.stackFramePointer = l_fp;
-
-				// Raise exception
-				SetInternalException(TXT_POW_OVERFLOW);
-				return;
-			}
-		}
-		l_bc += 2;
-		break;
-	case asBC_Thiscall1:
-		// This instruction is a faster version of asBC_CALLSYS. It is faster because
-		// it has much less runtime overhead with determining the calling convention 
-		// and no dynamic code for loading the parameters. The instruction can only
-		// be used to call functions with the following signatures:
-		//
-		//  type &obj::func(int)
-		//  type &obj::func(uint)
-		//  void  obj::func(int)
-		//  void  obj::func(uint)
-		{
-			// Get function ID from the argument
-			int i = asBC_INTARG(l_bc);
-
-			// Need to move the values back to the context as the called functions
-			// may use the debug interface to inspect the registers
-			m_regs.programPointer    = l_bc;
-			m_regs.stackPointer      = l_sp;
-			m_regs.stackFramePointer = l_fp;
-
-			// Pop the thispointer from the stack
-			void *obj = *(void**)l_sp;
-			if (obj == 0)
-				SetInternalException(TXT_NULL_POINTER_ACCESS);
-			else
-			{
-				// Only update the stack pointer if all is OK so the 
-				// exception handler can properly clean up the stack
-				l_sp += AS_PTR_SIZE;
-
-				// Pop the int arg from the stack
-				int arg = *(int*)l_sp;
-				l_sp++;
-
-				// Call the method
-				m_callingSystemFunction = m_engine->scriptFunctions[i];
-				void *ptr = m_engine->CallObjectMethodRetPtr(obj, arg, m_callingSystemFunction);
-				m_callingSystemFunction = 0;
-				*(asPWORD*)&m_regs.valueRegister = (asPWORD)ptr;
-			}
-
-			// Update the program position after the call so that line number is correct
-			l_bc += 2;
-
-			if( m_regs.doProcessSuspend )
-			{
-				// Should the execution be suspended?
-				if( m_doSuspend )
-				{
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					m_status = asEXECUTION_SUSPENDED;
-					return;
-				}
-				// An exception might have been raised
-				if( m_status != asEXECUTION_ACTIVE )
-				{
-					m_regs.programPointer    = l_bc;
-					m_regs.stackPointer      = l_sp;
-					m_regs.stackFramePointer = l_fp;
-
-					return;
-				}
-			}
-		}
-		break;
-
-	// Don't let the optimizer optimize for size,
-	// since it requires extra conditions and jumps
-	case 201: l_bc = (asDWORD*)201; break;
-	case 202: l_bc = (asDWORD*)202; break;
-	case 203: l_bc = (asDWORD*)203; break;
-	case 204: l_bc = (asDWORD*)204; break;
-	case 205: l_bc = (asDWORD*)205; break;
-	case 206: l_bc = (asDWORD*)206; break;
-	case 207: l_bc = (asDWORD*)207; break;
-	case 208: l_bc = (asDWORD*)208; break;
-	case 209: l_bc = (asDWORD*)209; break;
-	case 210: l_bc = (asDWORD*)210; break;
-	case 211: l_bc = (asDWORD*)211; break;
-	case 212: l_bc = (asDWORD*)212; break;
-	case 213: l_bc = (asDWORD*)213; break;
-	case 214: l_bc = (asDWORD*)214; break;
-	case 215: l_bc = (asDWORD*)215; break;
-	case 216: l_bc = (asDWORD*)216; break;
-	case 217: l_bc = (asDWORD*)217; break;
-	case 218: l_bc = (asDWORD*)218; break;
-	case 219: l_bc = (asDWORD*)219; break;
-	case 220: l_bc = (asDWORD*)220; break;
-	case 221: l_bc = (asDWORD*)221; break;
-	case 222: l_bc = (asDWORD*)222; break;
-	case 223: l_bc = (asDWORD*)223; break;
-	case 224: l_bc = (asDWORD*)224; break;
-	case 225: l_bc = (asDWORD*)225; break;
-	case 226: l_bc = (asDWORD*)226; break;
-	case 227: l_bc = (asDWORD*)227; break;
-	case 228: l_bc = (asDWORD*)228; break;
-	case 229: l_bc = (asDWORD*)229; break;
-	case 230: l_bc = (asDWORD*)230; break;
-	case 231: l_bc = (asDWORD*)231; break;
-	case 232: l_bc = (asDWORD*)232; break;
-	case 233: l_bc = (asDWORD*)233; break;
-	case 234: l_bc = (asDWORD*)234; break;
-	case 235: l_bc = (asDWORD*)235; break;
-	case 236: l_bc = (asDWORD*)236; break;
-	case 237: l_bc = (asDWORD*)237; break;
-	case 238: l_bc = (asDWORD*)238; break;
-	case 239: l_bc = (asDWORD*)239; break;
-	case 240: l_bc = (asDWORD*)240; break;
-	case 241: l_bc = (asDWORD*)241; break;
-	case 242: l_bc = (asDWORD*)242; break;
-	case 243: l_bc = (asDWORD*)243; break;
-	case 244: l_bc = (asDWORD*)244; break;
-	case 245: l_bc = (asDWORD*)245; break;
-	case 246: l_bc = (asDWORD*)246; break;
-	case 247: l_bc = (asDWORD*)247; break;
-	case 248: l_bc = (asDWORD*)248; break;
-	case 249: l_bc = (asDWORD*)249; break;
-	case 250: l_bc = (asDWORD*)250; break;
-	case 251: l_bc = (asDWORD*)251; break;
-	case 252: l_bc = (asDWORD*)252; break;
-	case 253: l_bc = (asDWORD*)253; break;
-	case 254: l_bc = (asDWORD*)254; break;
-	case 255: l_bc = (asDWORD*)255; break;
-
-#ifdef AS_DEBUG
-	default:
-		asASSERT(false);
-		SetInternalException(TXT_UNRECOGNIZED_BYTE_CODE);
-#endif
-#if defined(_MSC_VER) && !defined(AS_DEBUG)
-	default:
-		// This Microsoft specific code allows the
-		// compiler to optimize the switch case as
-		// it will know that the code will never
-		// reach this point
-		__assume(0);
-#endif
-	}
-
-#ifdef AS_DEBUG
-		asDWORD instr = *(asBYTE*)old;
-		if( instr != asBC_JMP && instr != asBC_JMPP && (instr < asBC_JZ || instr > asBC_JNP) && instr != asBC_JLowZ && instr != asBC_JLowNZ &&
-			instr != asBC_CALL && instr != asBC_CALLBND && instr != asBC_CALLINTF && instr != asBC_RET && instr != asBC_ALLOC && instr != asBC_CallPtr &&
-			instr != asBC_JitEntry )
-		{
-			asASSERT( (l_bc - old) == asBCTypeSize[asBCInfo[instr].type] );
-		}
-#endif
-	}
-}
-
-int asCContext::SetException(const char *descr)
-{
-	// Only allow this if we're executing a CALL byte code
-	if( m_callingSystemFunction == 0 ) return asERROR;
-
-	SetInternalException(descr);
-
-	return 0;
-}
-
-void asCContext::SetInternalException(const char *descr)
-{
-	if( m_inExceptionHandler )
-	{
-		asASSERT(false); // Shouldn't happen
-		return; // but if it does, at least this will not crash the application
-	}
-
-	m_status                = asEXECUTION_EXCEPTION;
-	m_regs.doProcessSuspend = true;
-
-	m_exceptionString       = descr;
-	m_exceptionFunction     = m_currentFunction->id;
-
-	if( m_currentFunction->scriptData )
-	{
-		m_exceptionLine    = m_currentFunction->GetLineNumber(int(m_regs.programPointer - m_currentFunction->scriptData->byteCode.AddressOf()), &m_exceptionSectionIdx);
-		m_exceptionColumn  = m_exceptionLine >> 20;
-		m_exceptionLine   &= 0xFFFFF;
-	}
-	else
-	{
-		m_exceptionSectionIdx = 0;
-		m_exceptionLine       = 0;
-		m_exceptionColumn     = 0;
-	}
-
-	if( m_exceptionCallback )
-		CallExceptionCallback();
-}
-
-void asCContext::CleanReturnObject()
-{
-	if( m_initialFunction && m_initialFunction->DoesReturnOnStack() && m_status == asEXECUTION_FINISHED )
-	{
-		// If function returns on stack we need to call the destructor on the returned object
-		if( m_initialFunction->returnType.GetTypeInfo()->CastToObjectType()->beh.destruct )
-			m_engine->CallObjectMethod(GetReturnObject(), m_initialFunction->returnType.GetTypeInfo()->CastToObjectType()->beh.destruct);
-
-		return;
-	}
-
-	if( m_regs.objectRegister == 0 ) return;
-
-	asASSERT( m_regs.objectType != 0 );
-
-	if( m_regs.objectType )
-	{
-		if (m_regs.objectType->GetFlags() & asOBJ_FUNCDEF)
-		{
-			// Release the function pointer
-			reinterpret_cast<asIScriptFunction*>(m_regs.objectRegister)->Release();
-			m_regs.objectRegister = 0;
-		}
-		else
-		{
-			// Call the destructor on the object
-			asSTypeBehaviour *beh = &(reinterpret_cast<asCTypeInfo*>(m_regs.objectType)->CastToObjectType()->beh);
-			if (m_regs.objectType->GetFlags() & asOBJ_REF)
-			{
-				asASSERT(beh->release || (m_regs.objectType->GetFlags() & asOBJ_NOCOUNT));
-
-				if (beh->release)
-					m_engine->CallObjectMethod(m_regs.objectRegister, beh->release);
-
-				m_regs.objectRegister = 0;
-			}
-			else
-			{
-				if (beh->destruct)
-					m_engine->CallObjectMethod(m_regs.objectRegister, beh->destruct);
-
-				// Free the memory
-				m_engine->CallFree(m_regs.objectRegister);
-				m_regs.objectRegister = 0;
-			}
-		}
-	}
-}
-
-void asCContext::CleanStack()
-{
-	m_inExceptionHandler = true;
-
-	// Run the clean up code for each of the functions called
-	CleanStackFrame();
-
-	// Set the status to exception so that the stack unwind is done correctly.
-	// This shouldn't be done for the current function, which is why we only
-	// do this after the first CleanStackFrame() is done.
-	m_status = asEXECUTION_EXCEPTION;
-
-	while( m_callStack.GetLength() > 0 )
-	{
-		// Only clean up until the top most marker for a nested call
-		asPWORD *s = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
-		if( s[0] == 0 )
-			break;
-
-		PopCallState();
-
-		CleanStackFrame();
-	}
-
-	m_inExceptionHandler = false;
-}
-
-// Interface
-bool asCContext::IsVarInScope(asUINT varIndex, asUINT stackLevel)
-{
-	// Don't return anything if there is no bytecode, e.g. before calling Execute()
-	if( m_regs.programPointer == 0 ) return false;
-
-	if( stackLevel >= GetCallstackSize() ) return false;
-
-	asCScriptFunction *func;
-	asUINT pos;
-
-	if( stackLevel == 0 )
-	{
-		func = m_currentFunction;
-		if( func->scriptData == 0 ) return false;
-		pos = asUINT(m_regs.programPointer - func->scriptData->byteCode.AddressOf());
-	}
-	else
-	{
-		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
-		func = (asCScriptFunction*)s[1];
-		if( func->scriptData == 0 ) return false;
-		pos = asUINT((asDWORD*)s[2] - func->scriptData->byteCode.AddressOf());
-	}
-
-	// First determine if the program position is after the variable declaration
-	if( func->scriptData->variables.GetLength() <= varIndex ) return false;
-	if( func->scriptData->variables[varIndex]->declaredAtProgramPos > pos ) return false;
-
-	asUINT declaredAt = func->scriptData->variables[varIndex]->declaredAtProgramPos;
-
-	// If the program position is after the variable declaration it is necessary
-	// determine if the program position is still inside the statement block where
-	// the variable was delcared.
-	for( int n = 0; n < (int)func->scriptData->objVariableInfo.GetLength(); n++ )
-	{
-		if( func->scriptData->objVariableInfo[n].programPos >= declaredAt )
-		{
-			// If the current block ends between the declaredAt and current
-			// program position, then we know the variable is no longer visible
-			int level = 0;
-			for( ; n < (int)func->scriptData->objVariableInfo.GetLength(); n++ )
-			{
-				if( func->scriptData->objVariableInfo[n].programPos > pos )
-					break;
-
-				if( func->scriptData->objVariableInfo[n].option == asBLOCK_BEGIN ) level++;
-				if( func->scriptData->objVariableInfo[n].option == asBLOCK_END && --level < 0 )
-					return false;
-			}
-
-			break;
-		}
-	}
-
-	// Variable is visible
-	return true;
-}
-
-// Internal
-void asCContext::DetermineLiveObjects(asCArray<int> &liveObjects, asUINT stackLevel)
-{
-	asASSERT( stackLevel < GetCallstackSize() );
-
-	asCScriptFunction *func;
-	asUINT pos;
-
-	if( stackLevel == 0 )
-	{
-		func = m_currentFunction;
-		if( func->scriptData == 0 )
-			return;
-
-		pos = asUINT(m_regs.programPointer - func->scriptData->byteCode.AddressOf());
-
-		if( m_status == asEXECUTION_EXCEPTION )
-		{
-			// Don't consider the last instruction as executed, as it failed with an exception
-			// It's not actually necessary to decrease the exact size of the instruction. Just
-			// before the current position is enough to disconsider it.
-			pos--;
-		}
-	}
-	else
-	{
-		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
-		func = (asCScriptFunction*)s[1];
-		if( func->scriptData == 0 )
-			return;
-
-		pos = asUINT((asDWORD*)s[2] - func->scriptData->byteCode.AddressOf());
-
-		// Don't consider the last instruction as executed, as the function that was called by it
-		// is still being executed. If we consider it as executed already, then a value object
-		// returned by value would be considered alive, which it is not.
-		pos--;
-	}
-
-	// Determine which object variables that are really live ones
-	liveObjects.SetLength(func->scriptData->objVariablePos.GetLength());
-	memset(liveObjects.AddressOf(), 0, sizeof(int)*liveObjects.GetLength());
-	for( int n = 0; n < (int)func->scriptData->objVariableInfo.GetLength(); n++ )
-	{
-		// Find the first variable info with a larger position than the current
-		// As the variable info are always placed on the instruction right after the
-		// one that initialized or freed the object, the current position needs to be
-		// considered as valid.
-		if( func->scriptData->objVariableInfo[n].programPos > pos )
-		{
-			// We've determined how far the execution ran, now determine which variables are alive
-			for( --n; n >= 0; n-- )
-			{
-				switch( func->scriptData->objVariableInfo[n].option )
-				{
-				case asOBJ_UNINIT: // Object was destroyed
-					{
-						// TODO: optimize: This should have been done by the compiler already
-						// Which variable is this?
-						asUINT var = 0;
-						for( asUINT v = 0; v < func->scriptData->objVariablePos.GetLength(); v++ )
-							if( func->scriptData->objVariablePos[v] == func->scriptData->objVariableInfo[n].variableOffset )
-							{
-								var = v;
-								break;
-							}
-						liveObjects[var] -= 1;
-					}
-					break;
-				case asOBJ_INIT: // Object was created
-					{
-						// Which variable is this?
-						asUINT var = 0;
-						for( asUINT v = 0; v < func->scriptData->objVariablePos.GetLength(); v++ )
-							if( func->scriptData->objVariablePos[v] == func->scriptData->objVariableInfo[n].variableOffset )
-							{
-								var = v;
-								break;
-							}
-						liveObjects[var] += 1;
-					}
-					break;
-				case asBLOCK_BEGIN: // Start block
-					// We should ignore start blocks, since it just means the
-					// program was within the block when the exception ocurred
-					break;
-				case asBLOCK_END: // End block
-					// We need to skip the entire block, as the objects created
-					// and destroyed inside this block are already out of scope
-					{
-						int nested = 1;
-						while( nested > 0 )
-						{
-							int option = func->scriptData->objVariableInfo[--n].option;
-							if( option == 3 )
-								nested++;
-							if( option == 2 )
-								nested--;
-						}
-					}
-					break;
-				}
-			}
-
-			// We're done with the investigation
-			break;
-		}
-	}
-}
-
-void asCContext::CleanArgsOnStack()
-{
-	if( !m_needToCleanupArgs )
-		return;
-
-	asASSERT( m_currentFunction->scriptData );
-
-	// Find the instruction just before the current program pointer
-	asDWORD *instr = m_currentFunction->scriptData->byteCode.AddressOf();
-	asDWORD *prevInstr = 0;
-	while( instr < m_regs.programPointer )
-	{
-		prevInstr = instr;
-		instr += asBCTypeSize[asBCInfo[*(asBYTE*)(instr)].type];
-	}
-
-	// Determine what function was being called
-	asCScriptFunction *func = 0;
-	asBYTE bc = *(asBYTE*)prevInstr;
-	if( bc == asBC_CALL || bc == asBC_CALLSYS || bc == asBC_CALLINTF )
-	{
-		int funcId = asBC_INTARG(prevInstr);
-		func = m_engine->scriptFunctions[funcId];
-	}
-	else if( bc == asBC_CALLBND )
-	{
-		int funcId = asBC_INTARG(prevInstr);
-		func = m_engine->importedFunctions[funcId & ~FUNC_IMPORTED]->importedFunctionSignature;
-	}
-	else if( bc == asBC_CallPtr )
-	{
-		asUINT v;
-		int var = asBC_SWORDARG0(prevInstr);
-
-		// Find the funcdef from the local variable
-		for( v = 0; v < m_currentFunction->scriptData->objVariablePos.GetLength(); v++ )
-			if( m_currentFunction->scriptData->objVariablePos[v] == var )
-			{
-				func = m_currentFunction->scriptData->objVariableTypes[v]->CastToFuncdefType()->funcdef;
-				break;
-			}
-
-		if( func == 0 )
-		{
-			// Look in parameters
-			int paramPos = 0;
-			if( m_currentFunction->objectType )
-				paramPos -= AS_PTR_SIZE;
-			if( m_currentFunction->DoesReturnOnStack() )
-				paramPos -= AS_PTR_SIZE;
-			for( v = 0; v < m_currentFunction->parameterTypes.GetLength(); v++ )
-			{
-				if( var == paramPos )
-				{
-					if (m_currentFunction->parameterTypes[v].IsFuncdef())
-						func = m_currentFunction->parameterTypes[v].GetTypeInfo()->CastToFuncdefType()->funcdef;
-					break;
-				}
-				paramPos -= m_currentFunction->parameterTypes[v].GetSizeOnStackDWords();
-			}
-		}
-	}
-	else
-		asASSERT( false );
-
-	asASSERT( func );
-
-	// Clean parameters
-	int offset = 0;
-	if( func->objectType )
-		offset += AS_PTR_SIZE;
-	if( func->DoesReturnOnStack() )
-		offset += AS_PTR_SIZE;
-	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( (func->parameterTypes[n].IsObject() || func->parameterTypes[n].IsFuncdef()) && !func->parameterTypes[n].IsReference() )
-		{
-			// TODO: cleanup: This logic is repeated twice in CleanStackFrame too. Should create a common function to share the code
-			if( *(asPWORD*)&m_regs.stackPointer[offset] )
-			{
-				// Call the object's destructor
-				asSTypeBehaviour *beh = func->parameterTypes[n].GetBehaviour();
-				if (func->parameterTypes[n].GetTypeInfo()->flags & asOBJ_FUNCDEF)
-				{
-					(*(asCScriptFunction**)&m_regs.stackPointer[offset])->Release();
-				}
-				else if( func->parameterTypes[n].GetTypeInfo()->flags & asOBJ_REF )
-				{
-					asASSERT( (func->parameterTypes[n].GetTypeInfo()->flags & asOBJ_NOCOUNT) || beh->release );
-
-					if( beh->release )
-						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackPointer[offset], beh->release);
-				}
-				else
-				{
-					if( beh->destruct )
-						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackPointer[offset], beh->destruct);
-
-					// Free the memory
-					m_engine->CallFree((void*)*(asPWORD*)&m_regs.stackPointer[offset]);
-				}
-				*(asPWORD*)&m_regs.stackPointer[offset] = 0;
-			}
-		}
-
-		offset += func->parameterTypes[n].GetSizeOnStackDWords();
-	}
-
-	m_needToCleanupArgs = false;
-}
-
-void asCContext::CleanStackFrame()
-{
-	// Clean object variables on the stack
-	// If the stack memory is not allocated or the program pointer
-	// is not set, then there is nothing to clean up on the stack frame
-	if( !m_isStackMemoryNotAllocated && m_regs.programPointer )
-	{
-		// If the exception occurred while calling a function it is necessary
-		// to clean up the arguments that were put on the stack.
-		CleanArgsOnStack();
-
-		// Restore the stack pointer
-		asASSERT( m_currentFunction->scriptData );
-		m_regs.stackPointer += m_currentFunction->scriptData->variableSpace;
-
-		// Determine which object variables that are really live ones
-		asCArray<int> liveObjects;
-		DetermineLiveObjects(liveObjects, 0);
-
-		for( asUINT n = 0; n < m_currentFunction->scriptData->objVariablePos.GetLength(); n++ )
-		{
-			int pos = m_currentFunction->scriptData->objVariablePos[n];
-			if( n < m_currentFunction->scriptData->objVariablesOnHeap )
-			{
-				// Check if the pointer is initialized
-				if( *(asPWORD*)&m_regs.stackFramePointer[-pos] )
-				{
-					// Call the object's destructor
-					if (m_currentFunction->scriptData->objVariableTypes[n]->flags & asOBJ_FUNCDEF)
-					{
-						(*(asCScriptFunction**)&m_regs.stackFramePointer[-pos])->Release();
-					}
-					else if( m_currentFunction->scriptData->objVariableTypes[n]->flags & asOBJ_REF )
-					{
-						asSTypeBehaviour *beh = &m_currentFunction->scriptData->objVariableTypes[n]->CastToObjectType()->beh;
-						asASSERT( (m_currentFunction->scriptData->objVariableTypes[n]->flags & asOBJ_NOCOUNT) || beh->release );
-						if( beh->release )
-							m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[-pos], beh->release);
-					}
-					else
-					{
-						asSTypeBehaviour *beh = &m_currentFunction->scriptData->objVariableTypes[n]->CastToObjectType()->beh;
-						if( beh->destruct )
-							m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[-pos], beh->destruct);
-						else if( m_currentFunction->scriptData->objVariableTypes[n]->flags & asOBJ_LIST_PATTERN )
-							m_engine->DestroyList((asBYTE*)*(asPWORD*)&m_regs.stackFramePointer[-pos], m_currentFunction->scriptData->objVariableTypes[n]->CastToObjectType());
-
-						// Free the memory
-						m_engine->CallFree((void*)*(asPWORD*)&m_regs.stackFramePointer[-pos]);
-					}
-					*(asPWORD*)&m_regs.stackFramePointer[-pos] = 0;
-				}
-			}
-			else
-			{
-				asASSERT( m_currentFunction->scriptData->objVariableTypes[n]->GetFlags() & asOBJ_VALUE );
-
-				// Only destroy the object if it is truly alive
-				if( liveObjects[n] > 0 )
-				{
-					asSTypeBehaviour *beh = &m_currentFunction->scriptData->objVariableTypes[n]->CastToObjectType()->beh;
-					if( beh->destruct )
-						m_engine->CallObjectMethod((void*)(asPWORD*)&m_regs.stackFramePointer[-pos], beh->destruct);
-				}
-			}
-		}
-	}
-	else
-		m_isStackMemoryNotAllocated = false;
-
-	// Functions that do not own the object and parameters shouldn't do any clean up
-	if( m_currentFunction->dontCleanUpOnException )
-		return;
-
-	// Clean object and parameters
-	int offset = 0;
-	if( m_currentFunction->objectType )
-		offset += AS_PTR_SIZE;
-	if( m_currentFunction->DoesReturnOnStack() )
-		offset += AS_PTR_SIZE;
-	for( asUINT n = 0; n < m_currentFunction->parameterTypes.GetLength(); n++ )
-	{
-		if( (m_currentFunction->parameterTypes[n].IsObject() ||m_currentFunction->parameterTypes[n].IsFuncdef()) && !m_currentFunction->parameterTypes[n].IsReference() )
-		{
-			if( *(asPWORD*)&m_regs.stackFramePointer[offset] )
-			{
-				// Call the object's destructor
-				asSTypeBehaviour *beh = m_currentFunction->parameterTypes[n].GetBehaviour();
-				if (m_currentFunction->parameterTypes[n].GetTypeInfo()->flags & asOBJ_FUNCDEF)
-				{
-					(*(asCScriptFunction**)&m_regs.stackFramePointer[offset])->Release();
-				}
-				else if( m_currentFunction->parameterTypes[n].GetTypeInfo()->flags & asOBJ_REF )
-				{
-					asASSERT( (m_currentFunction->parameterTypes[n].GetTypeInfo()->flags & asOBJ_NOCOUNT) || beh->release );
-
-					if( beh->release )
-						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[offset], beh->release);
-				}
-				else
-				{
-					if( beh->destruct )
-						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[offset], beh->destruct);
-
-					// Free the memory
-					m_engine->CallFree((void*)*(asPWORD*)&m_regs.stackFramePointer[offset]);
-				}
-				*(asPWORD*)&m_regs.stackFramePointer[offset] = 0;
-			}
-		}
-
-		offset += m_currentFunction->parameterTypes[n].GetSizeOnStackDWords();
-	}
-}
-
-// interface
-int asCContext::GetExceptionLineNumber(int *column, const char **sectionName)
-{
-	if( GetState() != asEXECUTION_EXCEPTION ) return asERROR;
-
-	if( column ) *column = m_exceptionColumn;
-
-	if( sectionName )
-	{
-		// The section index can be -1 if the exception was raised in a generated function, e.g. $fact for templates
-		if( m_exceptionSectionIdx >= 0 )
-			*sectionName = m_engine->scriptSectionNames[m_exceptionSectionIdx]->AddressOf();
-		else
-			*sectionName = 0;
-	}
-
-	return m_exceptionLine;
-}
-
-// interface
-asIScriptFunction *asCContext::GetExceptionFunction()
-{
-	if( GetState() != asEXECUTION_EXCEPTION ) return 0;
-
-	return m_engine->scriptFunctions[m_exceptionFunction];
-}
-
-// interface
-const char *asCContext::GetExceptionString()
-{
-	if( GetState() != asEXECUTION_EXCEPTION ) return 0;
-
-	return m_exceptionString.AddressOf();
-}
-
-// interface
-asEContextState asCContext::GetState() const
-{
-	return m_status;
-}
-
-// interface
-int asCContext::SetLineCallback(asSFuncPtr callback, void *obj, int callConv)
-{
-	// First turn off the line callback to avoid a second thread 
-	// attempting to call it while the new one is still being set
-	m_lineCallback = false;
-
-	m_lineCallbackObj = obj;
-	bool isObj = false;
-	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
-	{
-		m_regs.doProcessSuspend = m_doSuspend;
-		return asNOT_SUPPORTED;
-	}
-	if( (unsigned)callConv >= asCALL_THISCALL )
-	{
-		isObj = true;
-		if( obj == 0 )
-		{
-			m_regs.doProcessSuspend = m_doSuspend;
-			return asINVALID_ARG;
-		}
-	}
-
-	int r = DetectCallingConvention(isObj, callback, callConv, 0, &m_lineCallbackFunc);
-	
-	// Turn on the line callback after setting both the function pointer and object pointer
-	if( r >= 0 ) m_lineCallback = true;
-
-	// The BC_SUSPEND instruction should be processed if either line 
-	// callback is set or if the application has requested a suspension
-	m_regs.doProcessSuspend = m_doSuspend || m_lineCallback;
-
-	return r;
-}
-
-void asCContext::CallLineCallback()
-{
-	if( m_lineCallbackFunc.callConv < ICC_THISCALL )
-		m_engine->CallGlobalFunction(this, m_lineCallbackObj, &m_lineCallbackFunc, 0);
-	else
-		m_engine->CallObjectMethod(m_lineCallbackObj, this, &m_lineCallbackFunc, 0);
-}
-
-// interface
-int asCContext::SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv)
-{
-	m_exceptionCallback = true;
-	m_exceptionCallbackObj = obj;
-	bool isObj = false;
-	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
-		return asNOT_SUPPORTED;
-	if( (unsigned)callConv >= asCALL_THISCALL )
-	{
-		isObj = true;
-		if( obj == 0 )
-		{
-			m_exceptionCallback = false;
-			return asINVALID_ARG;
-		}
-	}
-	int r = DetectCallingConvention(isObj, callback, callConv, 0, &m_exceptionCallbackFunc);
-	if( r < 0 ) m_exceptionCallback = false;
-	return r;
-}
-
-void asCContext::CallExceptionCallback()
-{
-	if( m_exceptionCallbackFunc.callConv < ICC_THISCALL )
-		m_engine->CallGlobalFunction(this, m_exceptionCallbackObj, &m_exceptionCallbackFunc, 0);
-	else
-		m_engine->CallObjectMethod(m_exceptionCallbackObj, this, &m_exceptionCallbackFunc, 0);
-}
-
-// interface
-void asCContext::ClearLineCallback()
-{
-	m_lineCallback = false;
-	m_regs.doProcessSuspend = m_doSuspend;
-}
-
-// interface
-void asCContext::ClearExceptionCallback()
-{
-	m_exceptionCallback = false;
-}
-
-int asCContext::CallGeneric(asCScriptFunction *descr)
-{
-	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
-	void (*func)(asIScriptGeneric*) = (void (*)(asIScriptGeneric*))sysFunc->func;
-	int popSize = sysFunc->paramSize;
-	asDWORD *args = m_regs.stackPointer;
-
-	// Verify the object pointer if it is a class method
-	void *currentObject = 0;
-	asASSERT( sysFunc->callConv == ICC_GENERIC_FUNC || sysFunc->callConv == ICC_GENERIC_METHOD );
-	if( sysFunc->callConv == ICC_GENERIC_METHOD )
-	{
-		// The object pointer should be popped from the context stack
-		popSize += AS_PTR_SIZE;
-
-		// Check for null pointer
-		currentObject = (void*)*(asPWORD*)(args);
-		if( currentObject == 0 )
-		{
-			SetInternalException(TXT_NULL_POINTER_ACCESS);
-			return 0;
-		}
-
-		asASSERT( sysFunc->baseOffset == 0 );
-
-		// Skip object pointer
-		args += AS_PTR_SIZE;
-	}
-
-	if( descr->DoesReturnOnStack() )
-	{
-		// Skip the address where the return value will be stored
-		args += AS_PTR_SIZE;
-		popSize += AS_PTR_SIZE;
-	}
-
-	asCGeneric gen(m_engine, descr, currentObject, args);
-
-	m_callingSystemFunction = descr;
-#ifdef AS_NO_EXCEPTIONS
-	func(&gen);
-#else
-	// This try/catch block is to catch potential exception that may 
-	// be thrown by the registered function. 
-	try
-	{
-		func(&gen);
-	}
-	catch (...)
-	{
-		// Convert the exception to a script exception so the VM can 
-		// properly report the error to the application and then clean up
-		SetException(TXT_EXCEPTION_CAUGHT);
-	}
-#endif
-	m_callingSystemFunction = 0;
-
-	m_regs.valueRegister = gen.returnVal;
-	m_regs.objectRegister = gen.objectRegister;
-	m_regs.objectType = descr->returnType.GetTypeInfo();
-
-	// Clean up arguments
-	const asUINT cleanCount = sysFunc->cleanArgs.GetLength();
-	if( cleanCount )
-	{
-		asSSystemFunctionInterface::SClean *clean = sysFunc->cleanArgs.AddressOf();
-		for( asUINT n = 0; n < cleanCount; n++, clean++ )
-		{
-			void **addr = (void**)&args[clean->off];
-			if( clean->op == 0 )
-			{
-				if( *addr != 0 )
-				{
-					m_engine->CallObjectMethod(*addr, clean->ot->beh.release);
-					*addr = 0;
-				}
-			}
-			else 
-			{
-				asASSERT( clean->op == 1 || clean->op == 2 );
-				asASSERT( *addr );
-
-				if( clean->op == 2 )
-					m_engine->CallObjectMethod(*addr, clean->ot->beh.destruct);
-				
-				m_engine->CallFree(*addr);
-			}
-		}
-	}
-
-	// Return how much should be popped from the stack
-	return popSize;
-}
-
-// interface
-int asCContext::GetVarCount(asUINT stackLevel)
-{
-	asIScriptFunction *func = GetFunction(stackLevel);
-	if( func == 0 ) return asINVALID_ARG;
-
-	return func->GetVarCount();
-}
-
-// interface
-const char *asCContext::GetVarName(asUINT varIndex, asUINT stackLevel)
-{
-	asIScriptFunction *func = GetFunction(stackLevel);
-	if( func == 0 ) return 0;
-
-	const char *name = 0;
-	int r = func->GetVar(varIndex, &name);
-	return r >= 0 ? name : 0;
-}
-
-// interface
-const char *asCContext::GetVarDeclaration(asUINT varIndex, asUINT stackLevel, bool includeNamespace)
-{
-	asIScriptFunction *func = GetFunction(stackLevel);
-	if( func == 0 ) return 0;
-
-	return func->GetVarDecl(varIndex, includeNamespace);
-}
-
-// interface
-int asCContext::GetVarTypeId(asUINT varIndex, asUINT stackLevel)
-{
-	asIScriptFunction *func = GetFunction(stackLevel);
-	if( func == 0 ) return asINVALID_ARG;
-
-	int typeId;
-	int r = func->GetVar(varIndex, 0, &typeId);
-	return r < 0 ? r : typeId;
-}
-
-// interface
-void *asCContext::GetAddressOfVar(asUINT varIndex, asUINT stackLevel)
-{
-	// Don't return anything if there is no bytecode, e.g. before calling Execute()
-	if( m_regs.programPointer == 0 ) return 0;
-
-	if( stackLevel >= GetCallstackSize() ) return 0;
-
-	asCScriptFunction *func;
-	asDWORD *sf;
-	if( stackLevel == 0 )
-	{
-		func = m_currentFunction;
-		sf = m_regs.stackFramePointer;
-	}
-	else
-	{
-		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
-		func = (asCScriptFunction*)s[1];
-		sf = (asDWORD*)s[0];
-	}
-
-	if( func == 0 )
-		return 0;
-
-	if( func->scriptData == 0 )
-		return 0;
-
-	if( varIndex >= func->scriptData->variables.GetLength() )
-		return 0;
-
-	// For object variables it's necessary to dereference the pointer to get the address of the value
-	// Reference parameters must also be dereferenced to give the address of the value
-	int pos = func->scriptData->variables[varIndex]->stackOffset;
-	if( (func->scriptData->variables[varIndex]->type.IsObject() && !func->scriptData->variables[varIndex]->type.IsObjectHandle()) || (pos <= 0) )
-	{
-		// Determine if the object is really on the heap
-		bool onHeap = false;
-		if( func->scriptData->variables[varIndex]->type.IsObject() &&
-			!func->scriptData->variables[varIndex]->type.IsObjectHandle() )
-		{
-			onHeap = true;
-			if( func->scriptData->variables[varIndex]->type.GetTypeInfo()->GetFlags() & asOBJ_VALUE )
-			{
-				for( asUINT n = 0; n < func->scriptData->objVariablePos.GetLength(); n++ )
-				{
-					if( func->scriptData->objVariablePos[n] == pos )
-					{
-						onHeap = n < func->scriptData->objVariablesOnHeap;
-
-						if( !onHeap )
-						{
-							// If the object on the stack is not initialized return a null pointer instead
-							asCArray<int> liveObjects;
-							DetermineLiveObjects(liveObjects, stackLevel);
-
-							if( liveObjects[n] <= 0 )
-								return 0;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-
-		// If it wasn't an object on the heap, then check if it is a reference parameter
-		if( !onHeap && pos <= 0 )
-		{
-			// Determine what function argument this position matches
-			int stackPos = 0;
-			if( func->objectType )
-				stackPos -= AS_PTR_SIZE;
-
-			if( func->DoesReturnOnStack() )
-				stackPos -= AS_PTR_SIZE;
-
-			for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
-			{
-				if( stackPos == pos )
-				{
-					// The right argument was found. Is this a reference parameter?
-					if( func->inOutFlags[n] != asTM_NONE )
-						onHeap = true;
-
-					break;
-				}
-				stackPos -= func->parameterTypes[n].GetSizeOnStackDWords();
-			}
-		}
-
-		if( onHeap )
-			return *(void**)(sf - func->scriptData->variables[varIndex]->stackOffset);
-	}
-
-	return sf - func->scriptData->variables[varIndex]->stackOffset;
-}
-
-// interface
-// returns the typeId of the 'this' object at the given call stack level (-1 for current)
-// returns 0 if the function call at the given stack level is not a method
-int asCContext::GetThisTypeId(asUINT stackLevel)
-{
-	asIScriptFunction *func = GetFunction(stackLevel);
-	if( func == 0 ) return asINVALID_ARG;
-
-	if( func->GetObjectType() == 0 )
-		return 0; // not in a method
-
-	// create a datatype
-	asCDataType dt = asCDataType::CreateType((asCObjectType*)func->GetObjectType(), false);
-
-	// return a typeId from the data type
-	return m_engine->GetTypeIdFromDataType(dt);
-}
-
-// interface
-// returns the 'this' object pointer at the given call stack level (-1 for current)
-// returns 0 if the function call at the given stack level is not a method
-void *asCContext::GetThisPointer(asUINT stackLevel)
-{
-	if( stackLevel >= GetCallstackSize() )
-		return 0;
-
-	asCScriptFunction *func;
-	asDWORD *sf;
-	if( stackLevel == 0 )
-	{
-		func = m_currentFunction;
-		sf = m_regs.stackFramePointer;
-	}
-	else
-	{
-		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
-		func = (asCScriptFunction*)s[1];
-		sf = (asDWORD*)s[0];
-	}
-
-	if( func == 0 )
-		return 0;
-
-	if( func->objectType == 0 )
-		return 0; // not in a method
-
-	void *thisPointer = (void*)*(asPWORD*)(sf);
-	if( thisPointer == 0 )
-	{
-		return 0;
-	}
-
-	// NOTE: this returns the pointer to the 'this' while the GetVarPointer functions return
-	// a pointer to a pointer. I can't imagine someone would want to change the 'this'
-	return thisPointer;
-}
-
-
-
-
-
-
-
-// TODO: Move these to as_utils.cpp
-
-struct POW_INFO
-{
-	asQWORD MaxBaseu64;
-	asDWORD MaxBasei64;
-	asWORD  MaxBaseu32;
-	asWORD  MaxBasei32;
-	char    HighBit;
-};
-
-const POW_INFO pow_info[] =
-{
-	{          0ULL,          0UL,     0,     0, 0 },  // 0 is a special case
-	{          0ULL,          0UL,     0,     0, 1 },  // 1 is a special case
-    { 3037000499ULL, 2147483647UL, 65535, 46340, 2 },  // 2
-    {    2097152ULL,    1664510UL,  1625,  1290, 2 },  // 3
-    {      55108ULL,      46340UL,   255,   215, 3 },  // 4
-    {       6208ULL,       5404UL,    84,    73, 3 },  // 5
-    {       1448ULL,       1290UL,    40,    35, 3 },  // 6
-    {        511ULL,        463UL,    23,    21, 3 },  // 7
-    {        234ULL,        215UL,    15,    14, 4 },  // 8
-    {        128ULL,        118UL,    11,    10, 4 },  // 9
-    {         78ULL,         73UL,     9,     8, 4 },  // 10
-    {         52ULL,         49UL,     7,     7, 4 },  // 11
-    {         38ULL,         35UL,     6,     5, 4 },  // 12
-    {         28ULL,         27UL,     5,     5, 4 },  // 13
-    {         22ULL,         21UL,     4,     4, 4 },  // 14
-    {         18ULL,         17UL,     4,     4, 4 },  // 15
-    {         15ULL,         14UL,     3,     3, 5 },  // 16
-    {         13ULL,         12UL,     3,     3, 5 },  // 17
-    {         11ULL,         10UL,     3,     3, 5 },  // 18
-    {          9ULL,          9UL,     3,     3, 5 },  // 19
-    {          8ULL,          8UL,     3,     2, 5 },  // 20
-    {          8ULL,          7UL,     2,     2, 5 },  // 21
-    {          7ULL,          7UL,     2,     2, 5 },  // 22
-    {          6ULL,          6UL,     2,     2, 5 },  // 23
-    {          6ULL,          5UL,     2,     2, 5 },  // 24
-    {          5ULL,          5UL,     2,     2, 5 },  // 25
-    {          5ULL,          5UL,     2,     2, 5 },  // 26
-    {          5ULL,          4UL,     2,     2, 5 },  // 27
-    {          4ULL,          4UL,     2,     2, 5 },  // 28
-    {          4ULL,          4UL,     2,     2, 5 },  // 29
-    {          4ULL,          4UL,     2,     2, 5 },  // 30
-    {          4ULL,          4UL,     2,     1, 5 },  // 31
-    {          3ULL,          3UL,     1,     1, 6 },  // 32
-    {          3ULL,          3UL,     1,     1, 6 },  // 33
-    {          3ULL,          3UL,     1,     1, 6 },  // 34
-    {          3ULL,          3UL,     1,     1, 6 },  // 35
-    {          3ULL,          3UL,     1,     1, 6 },  // 36
-    {          3ULL,          3UL,     1,     1, 6 },  // 37
-    {          3ULL,          3UL,     1,     1, 6 },  // 38
-    {          3ULL,          3UL,     1,     1, 6 },  // 39
-    {          2ULL,          2UL,     1,     1, 6 },  // 40
-    {          2ULL,          2UL,     1,     1, 6 },  // 41
-    {          2ULL,          2UL,     1,     1, 6 },  // 42
-    {          2ULL,          2UL,     1,     1, 6 },  // 43
-    {          2ULL,          2UL,     1,     1, 6 },  // 44
-    {          2ULL,          2UL,     1,     1, 6 },  // 45
-    {          2ULL,          2UL,     1,     1, 6 },  // 46
-    {          2ULL,          2UL,     1,     1, 6 },  // 47
-    {          2ULL,          2UL,     1,     1, 6 },  // 48
-    {          2ULL,          2UL,     1,     1, 6 },  // 49
-    {          2ULL,          2UL,     1,     1, 6 },  // 50
-    {          2ULL,          2UL,     1,     1, 6 },  // 51
-    {          2ULL,          2UL,     1,     1, 6 },  // 52
-    {          2ULL,          2UL,     1,     1, 6 },  // 53
-    {          2ULL,          2UL,     1,     1, 6 },  // 54
-    {          2ULL,          2UL,     1,     1, 6 },  // 55
-    {          2ULL,          2UL,     1,     1, 6 },  // 56
-    {          2ULL,          2UL,     1,     1, 6 },  // 57
-    {          2ULL,          2UL,     1,     1, 6 },  // 58
-    {          2ULL,          2UL,     1,     1, 6 },  // 59
-    {          2ULL,          2UL,     1,     1, 6 },  // 60
-    {          2ULL,          2UL,     1,     1, 6 },  // 61
-    {          2ULL,          2UL,     1,     1, 6 },  // 62
-	{          2ULL,          1UL,     1,     1, 6 },  // 63
-};
-
-int as_powi(int base, int exponent, bool& isOverflow)
-{
-	if( exponent < 0 )
-	{
-		if( base == 0 )
-			// Divide by zero
-			isOverflow = true;
-		else
-			// Result is less than 1, so it truncates to 0
-			isOverflow = false;
-
-		return 0;
-	}
-	else if( exponent == 0 && base == 0 )
-	{
-		// Domain error
-		isOverflow = true;
-		return 0;
-	}
-	else if( exponent >= 31 )
-	{
-		switch( base )
-		{
-		case -1:
-			isOverflow = false;
-			return exponent & 1 ? -1 : 1;
-		case 0:
-			isOverflow = false;
-			break;
-		case 1:
-			isOverflow = false;
-			return 1;
-		default:
-			isOverflow = true;
-			break;
-		}
-		return 0;
-	}
-	else
-	{
-		const asWORD max_base = pow_info[exponent].MaxBasei32;
-		const char high_bit = pow_info[exponent].HighBit;
-		if( max_base != 0 && max_base < (base < 0 ? -base : base) )
-		{
-			isOverflow = true;
-			return 0;  // overflow
-		}
-
-		int result = 1;
-		switch( high_bit )
-		{
-		case 5:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 4:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 3:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 2:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 1:
-			if( exponent ) result *= base;
-		default:
-			isOverflow = false;
-			return result;
-		}
-	}
-}
-
-asDWORD as_powu(asDWORD base, asDWORD exponent, bool& isOverflow)
-{
-	if( exponent == 0 && base == 0 )
-	{
-		// Domain error
-		isOverflow = true;
-		return 0;
-	}
-	else if( exponent >= 32 )
-	{
-		switch( base )
-		{
-		case 0:
-			isOverflow = false;
-			break;
-		case 1:
-			isOverflow = false;
-			return 1;
-		default:
-			isOverflow = true;
-			break;
-		}
-		return 0;
-	}
-	else
-	{
-		const asWORD max_base = pow_info[exponent].MaxBaseu32;
-		const char high_bit = pow_info[exponent].HighBit;
-		if( max_base != 0 && max_base < base )
-		{
-			isOverflow = true;
-			return 0;  // overflow
-		}
-
-		asDWORD result = 1;
-		switch( high_bit )
-		{
-		case 5:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 4:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 3:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 2:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 1:
-			if( exponent ) result *= base;
-		default:
-			isOverflow = false;
-			return result;
-		}
-	}
-}
-
-asINT64 as_powi64(asINT64 base, asINT64 exponent, bool& isOverflow)
-{
-	if( exponent < 0 )
-	{
-		if( base == 0 )
-			// Divide by zero
-			isOverflow = true;
-		else
-			// Result is less than 1, so it truncates to 0
-			isOverflow = false;
-
-		return 0;
-	}
-	else if( exponent == 0 && base == 0 )
-	{
-		// Domain error
-		isOverflow = true;
-		return 0;
-	}
-	else if( exponent >= 63 )
-	{
-		switch( base )
-		{
-		case -1:
-			isOverflow = false;
-			return exponent & 1 ? -1 : 1;
-		case 0:
-			isOverflow = false;
-			break;
-		case 1:
-			isOverflow = false;
-			return 1;
-		default:
-			isOverflow = true;
-			break;
-		}
-		return 0;
-	}
-	else
-	{
-		const asDWORD max_base = pow_info[exponent].MaxBasei64;
-		const char high_bit = pow_info[exponent].HighBit;
-		if( max_base != 0 && max_base < (base < 0 ? -base : base) )
-		{
-			isOverflow = true;
-			return 0;  // overflow
-		}
-
-		asINT64 result = 1;
-		switch( high_bit )
-		{
-		case 6:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 5:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 4:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 3:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 2:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 1:
-			if( exponent ) result *= base;
-		default:
-			isOverflow = false;
-			return result;
-		}
-	}
-}
-
-asQWORD as_powu64(asQWORD base, asQWORD exponent, bool& isOverflow)
-{
-	if( exponent == 0 && base == 0 )
-	{
-		// Domain error
-		isOverflow = true;
-		return 0;
-	}
-	else if( exponent >= 64 )
-	{
-		switch( base )
-		{
-		case 0:
-			isOverflow = false;
-			break;
-		case 1:
-			isOverflow = false;
-			return 1;
-		default:
-			isOverflow = true;
-			break;
-		}
-		return 0;
-	}
-	else
-	{
-		const asQWORD max_base = pow_info[exponent].MaxBaseu64;
-		const char high_bit = pow_info[exponent].HighBit;
-		if( max_base != 0 && max_base < base )
-		{
-			isOverflow = true;
-			return 0;  // overflow
-		}
-
-		asQWORD result = 1;
-		switch( high_bit )
-		{
-		case 6:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 5:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 4:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 3:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 2:
-			if( exponent & 1 ) result *= base;
-			exponent >>= 1;
-			base *= base;
-		case 1:
-			if( exponent ) result *= base;
-		default:
-			isOverflow = false;
-			return result;
-		}
-	}
-}
-
-END_AS_NAMESPACE
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_context.cpp
+//
+// This class handles the execution of the byte code
+//
+
+#include <math.h> // fmodf() pow()
+
+#include "as_config.h"
+#include "as_context.h"
+#include "as_scriptengine.h"
+#include "as_tokendef.h"
+#include "as_texts.h"
+#include "as_callfunc.h"
+#include "as_generic.h"
+#include "as_debug.h" // mkdir()
+#include "as_bytecode.h"
+#include "as_scriptobject.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable:4702) // unreachable code
+#endif
+
+BEGIN_AS_NAMESPACE
+
+// We need at least 2 PTRs reserved for exception handling
+// We need at least 1 PTR reserved for calling system functions
+const int RESERVE_STACK = 2*AS_PTR_SIZE;
+
+// For each script function call we push 9 PTRs on the call stack
+const int CALLSTACK_FRAME_SIZE = 9;
+
+#if defined(AS_DEBUG)
+
+class asCDebugStats
+{
+public:
+	asCDebugStats()
+	{
+		memset(instrCount, 0, sizeof(instrCount));
+		memset(instrCount2, 0, sizeof(instrCount2));
+		lastBC = 255;
+	}
+
+	~asCDebugStats()
+	{
+		// This code writes out some statistics for the VM.
+		// It's useful for determining what needs to be optimized.
+
+#ifndef __MINGW32__
+		// _mkdir is broken on mingw
+		_mkdir("AS_DEBUG");
+#endif
+		#if _MSC_VER >= 1500 && !defined(AS_MARMALADE)
+			FILE *f;
+			fopen_s(&f, "AS_DEBUG/stats.txt", "wt");
+		#else
+			FILE *f = fopen("AS_DEBUG/stats.txt", "wt");
+		#endif
+		if( f )
+		{
+			// Output instruction statistics
+			fprintf(f, "\nTotal count\n");
+			int n;
+			for( n = 0; n < asBC_MAXBYTECODE; n++ )
+			{
+				if( asBCInfo[n].name && instrCount[n] > 0 )
+					fprintf(f, "%-10.10s : %.0f\n", asBCInfo[n].name, instrCount[n]);
+			}
+
+			fprintf(f, "\nNever executed\n");
+			for( n = 0; n < asBC_MAXBYTECODE; n++ )
+			{
+				if( asBCInfo[n].name && instrCount[n] == 0 )
+					fprintf(f, "%-10.10s\n", asBCInfo[n].name);
+			}
+
+			fprintf(f, "\nSequences\n");
+			for( n = 0; n < 256; n++ )
+			{
+				if( asBCInfo[n].name )
+				{
+					for( int m = 0; m < 256; m++ )
+					{
+						if( instrCount2[n][m] )
+							fprintf(f, "%-10.10s, %-10.10s : %.0f\n", asBCInfo[n].name, asBCInfo[m].name, instrCount2[n][m]);
+					}
+				}
+			}
+			fclose(f);
+		}
+	}
+
+	void Instr(asBYTE bc)
+	{
+		++instrCount[bc];
+		++instrCount2[lastBC][bc];
+		lastBC = bc;
+	}
+
+	// Instruction statistics
+	double instrCount[256];
+	double instrCount2[256][256];
+	int lastBC;
+} stats;
+
+#endif
+
+// interface
+AS_API asIScriptContext *asGetActiveContext()
+{
+	asCThreadLocalData *tld = asCThreadManager::GetLocalData();
+
+	// tld can be 0 if asGetActiveContext is called before any engine has been created.
+
+	// Observe! I've seen a case where an application linked with the library twice
+	// and thus ended up with two separate instances of the code and global variables.
+	// The application somehow mixed the two instances so that a function called from
+	// a script ended up calling asGetActiveContext from the other instance that had
+	// never been initialized.
+
+	if( tld == 0 || tld->activeContexts.GetLength() == 0 )
+		return 0;
+	return tld->activeContexts[tld->activeContexts.GetLength()-1];
+}
+
+// internal
+asCThreadLocalData *asPushActiveContext(asIScriptContext *ctx)
+{
+	asCThreadLocalData *tld = asCThreadManager::GetLocalData();
+	asASSERT( tld );
+	if( tld == 0 )
+		return 0;
+	tld->activeContexts.PushLast(ctx);
+	return tld;
+}
+
+// internal
+void asPopActiveContext(asCThreadLocalData *tld, asIScriptContext *ctx)
+{
+	UNUSED_VAR(ctx);
+	asASSERT(tld && tld->activeContexts[tld->activeContexts.GetLength() - 1] == ctx);
+	if (tld)
+		tld->activeContexts.PopLast();
+}
+
+asCContext::asCContext(asCScriptEngine *engine, bool holdRef)
+{
+	m_refCount.set(1);
+
+	m_holdEngineRef = holdRef;
+	if( holdRef )
+		engine->AddRef();
+
+	m_engine                    = engine;
+	m_status                    = asEXECUTION_UNINITIALIZED;
+	m_stackBlockSize            = 0;
+	m_originalStackPointer      = 0;
+	m_inExceptionHandler        = false;
+	m_isStackMemoryNotAllocated = false;
+	m_needToCleanupArgs         = false;
+	m_currentFunction           = 0;
+	m_callingSystemFunction     = 0;
+	m_initialFunction           = 0;
+	m_lineCallback              = false;
+	m_exceptionCallback         = false;
+	m_regs.doProcessSuspend     = false;
+	m_doSuspend                 = false;
+	m_userData                  = 0;
+	m_exceptionWillBeCaught     = false;
+	m_regs.ctx                  = this;
+	m_regs.objectRegister       = 0;
+	m_regs.objectType           = 0;
+}
+
+asCContext::~asCContext()
+{
+	DetachEngine();
+}
+
+// interface
+bool asCContext::IsNested(asUINT *nestCount) const
+{
+	if( nestCount )
+		*nestCount = 0;
+
+	asUINT c = GetCallstackSize();
+	if( c == 0 )
+		return false;
+
+	// Search for a marker on the call stack
+	// This loop starts at 2 because the 0th entry is not stored in m_callStack,
+	// and then we need to subtract one more to get the base of each frame
+	for( asUINT n = 2; n <= c; n++ )
+	{
+		const asPWORD *s = m_callStack.AddressOf() + (c - n)*CALLSTACK_FRAME_SIZE;
+		if( s && s[0] == 0 )
+		{
+			if( nestCount )
+				(*nestCount)++;
+			else
+				return true;
+		}
+	}
+
+	if( nestCount && *nestCount > 0 )
+		return true;
+
+	return false;
+}
+
+// interface
+int asCContext::AddRef() const
+{
+	return m_refCount.atomicInc();
+}
+
+// interface
+int asCContext::Release() const
+{
+	int r = m_refCount.atomicDec();
+
+	if( r == 0 )
+	{
+		asDELETE(const_cast<asCContext*>(this),asCContext);
+		return 0;
+	}
+
+	return r;
+}
+
+// internal
+void asCContext::DetachEngine()
+{
+	if( m_engine == 0 ) return;
+
+	// Clean up all calls, included nested ones
+	do
+	{
+		// Abort any execution
+		Abort();
+
+		// Free all resources
+		Unprepare();
+	}
+	while( IsNested() );
+
+	// Free the stack blocks
+	for( asUINT n = 0; n < m_stackBlocks.GetLength(); n++ )
+	{
+		if( m_stackBlocks[n] )
+		{
+#ifndef WIP_16BYTE_ALIGN
+			asDELETEARRAY(m_stackBlocks[n]);
+#else
+			asDELETEARRAYALIGNED(m_stackBlocks[n]);
+#endif
+		}
+	}
+	m_stackBlocks.SetLength(0);
+	m_stackBlockSize = 0;
+
+	// Clean the user data
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n+1] )
+		{
+			for( asUINT c = 0; c < m_engine->cleanContextFuncs.GetLength(); c++ )
+				if( m_engine->cleanContextFuncs[c].type == m_userData[n] )
+					m_engine->cleanContextFuncs[c].cleanFunc(this);
+		}
+	}
+	m_userData.SetLength(0);
+
+	// Clear engine pointer
+	if( m_holdEngineRef )
+		m_engine->Release();
+	m_engine = 0;
+}
+
+// interface
+asIScriptEngine *asCContext::GetEngine() const
+{
+	return m_engine;
+}
+
+// interface
+void *asCContext::SetUserData(void *data, asPWORD type)
+{
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(m_engine->engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(m_userData[n+1]);
+			m_userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(m_engine->engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	m_userData.PushLast(type);
+	m_userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(m_engine->engineRWLock);
+
+	return 0;
+}
+
+// interface
+void *asCContext::GetUserData(asPWORD type) const
+{
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(m_engine->engineRWLock);
+
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n] == type )
+		{
+			RELEASESHARED(m_engine->engineRWLock);
+			return reinterpret_cast<void*>(m_userData[n+1]);
+		}
+	}
+
+	RELEASESHARED(m_engine->engineRWLock);
+
+	return 0;
+}
+
+// interface
+asIScriptFunction *asCContext::GetSystemFunction()
+{
+	return m_callingSystemFunction;
+}
+
+// interface
+int asCContext::PushFunction(asIScriptFunction *func, void *object)
+{
+	asCScriptFunction *realFunc = static_cast<asCScriptFunction*>(func);
+
+	if( realFunc == 0 )
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "PushFunction", errorNames[-asINVALID_ARG], asINVALID_ARG);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asINVALID_ARG;
+	}
+
+	if( m_status != asEXECUTION_DESERIALIZATION )
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "PushFunction", errorNames[-asCONTEXT_NOT_PREPARED], asCONTEXT_NOT_PREPARED);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asCONTEXT_NOT_PREPARED;
+	}
+
+	if( realFunc->funcType == asFUNC_DELEGATE )
+	{
+		asASSERT(object == 0);
+
+		object   = realFunc->objForDelegate;
+		realFunc = realFunc->funcForDelegate;
+	}
+
+	realFunc = GetRealFunc(realFunc, &object);
+
+	if( GetCallstackSize() == 0 )
+	{
+		m_status = asEXECUTION_UNINITIALIZED;
+		Prepare(realFunc);
+		if(object) 
+			*(asPWORD*)&m_regs.stackFramePointer[0] = (asPWORD)object;
+		m_status = asEXECUTION_DESERIALIZATION;
+	}
+	else
+	{
+		if(realFunc->funcType == asFUNC_INTERFACE || realFunc->funcType == asFUNC_VIRTUAL)
+			CallInterfaceMethod(realFunc);
+		else
+			CallScriptFunction(realFunc);
+
+		if(object) 
+			*(asPWORD*)&m_regs.stackFramePointer[0] = (asPWORD)object;
+	}
+
+	asASSERT(m_currentFunction->funcType != asFUNC_DELEGATE);
+
+	return asSUCCESS;
+}
+
+// interface
+int asCContext::GetStateRegisters(asUINT stackLevel, asIScriptFunction **_callingSystemFunction, asIScriptFunction **_initialFunction, asDWORD *_originalStackPointer, asDWORD *_argumentSize, asQWORD *_valueRegister, void **_objectRegister, asITypeInfo **_objectRegisterType)
+{
+	asIScriptFunction * callingSystemFunction;
+	asIScriptFunction * initialFunction;
+	asDWORD *           originalStackPointer;
+	int                 argumentsSize;
+	asQWORD             valueRegister;
+	void *              objectRegister;
+	asITypeInfo *       objectType;
+
+	if (stackLevel >= GetCallstackSize()) 
+		return asINVALID_ARG;
+
+	if( stackLevel == 0 )
+	{
+		callingSystemFunction = m_callingSystemFunction;
+		initialFunction       = m_initialFunction;
+		originalStackPointer  = m_originalStackPointer;
+		argumentsSize         = m_argumentsSize;
+
+		// Need to push the value of registers so they can be restored
+		valueRegister         = m_regs.valueRegister;
+		objectRegister        = m_regs.objectRegister;
+		objectType            = m_regs.objectType;
+	}
+	else
+	{
+		asPWORD const *tmp = &m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE*stackLevel];
+
+		// Only return state registers for a nested call, see PushState()
+		if( tmp[0] != 0 )
+			return asERROR;
+
+		// Restore the previous initial function and the associated values
+		callingSystemFunction = reinterpret_cast<asCScriptFunction*>(tmp[1]);
+		initialFunction       = reinterpret_cast<asCScriptFunction*>(tmp[2]);
+		originalStackPointer  = (asDWORD*)tmp[3];
+		argumentsSize         = (int)tmp[4];
+
+		valueRegister   = asQWORD(asDWORD(tmp[5]));
+		valueRegister  |= asQWORD(tmp[6])<<32;
+		objectRegister  = (void*)tmp[7];
+		objectType      = (asITypeInfo*)tmp[8];
+	}
+
+	if(_callingSystemFunction) *_callingSystemFunction = callingSystemFunction;
+	if(_initialFunction)       *_initialFunction       = initialFunction;
+	if(_originalStackPointer)  *_originalStackPointer  = SerializeStackPointer(originalStackPointer);
+	if(_argumentSize)          *_argumentSize          = argumentsSize;
+	if(_valueRegister)         *_valueRegister         = valueRegister;
+	if(_objectRegister)        *_objectRegister        = objectRegister;
+	if(_objectRegisterType)    *_objectRegisterType    = objectType;
+
+	return asSUCCESS;
+}
+
+// interface
+int asCContext::GetCallStateRegisters(asUINT stackLevel, asDWORD *_stackFramePointer, asIScriptFunction **_currentFunction, asDWORD *_programPointer, asDWORD *_stackPointer, asDWORD *_stackIndex)
+{
+	asDWORD           *stackFramePointer;
+	asCScriptFunction *currentFunction;
+	asDWORD           *programPointer;
+	asDWORD           *stackPointer;
+	int                stackIndex;
+
+	if (stackLevel >= GetCallstackSize())
+		return asINVALID_ARG;
+
+	if( stackLevel == 0 )
+	{
+		stackFramePointer = m_regs.stackFramePointer;
+		currentFunction   = m_currentFunction;
+		programPointer    = m_regs.programPointer;
+		stackPointer      = m_regs.stackPointer;
+		stackIndex        = m_stackIndex;
+	}
+	else
+	{
+		asPWORD const*s = &m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE*stackLevel];
+
+		stackFramePointer = (asDWORD*)s[0];
+		currentFunction   = (asCScriptFunction*)s[1];
+		programPointer    = (asDWORD*)s[2];
+		stackPointer      = (asDWORD*)s[3];
+		stackIndex        = (int)s[4];
+	}
+
+	if( stackFramePointer == 0 )
+		return asERROR; // TODO: This is not really an error. It just means that the stackLevel represent a pushed state
+
+	if(_stackFramePointer) *_stackFramePointer = SerializeStackPointer(stackFramePointer);
+	if(_currentFunction)   *_currentFunction   = currentFunction;
+	if(_programPointer)    *_programPointer    = programPointer != 0? asUINT(programPointer - currentFunction->scriptData->byteCode.AddressOf()) : -1;
+	if(_stackPointer)      *_stackPointer      = SerializeStackPointer(stackPointer);
+	if(_stackIndex)        *_stackIndex        = stackIndex;
+
+	return asSUCCESS;
+}
+
+// interface
+int asCContext::SetStateRegisters(asUINT stackLevel, asIScriptFunction *callingSystemFunction, asIScriptFunction *initialFunction, asDWORD originalStackPointer, asDWORD argumentsSize, asQWORD valueRegister, void *objectRegister, asITypeInfo *objectType)
+{
+	if( m_status != asEXECUTION_DESERIALIZATION)
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "SetStateRegisters", errorNames[-asCONTEXT_ACTIVE], asCONTEXT_ACTIVE);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asCONTEXT_ACTIVE;
+	}
+
+	if (stackLevel >= GetCallstackSize())
+		return asINVALID_ARG;
+
+	if( stackLevel == 0 )
+	{
+		m_callingSystemFunction = reinterpret_cast<asCScriptFunction*>(callingSystemFunction);
+		m_initialFunction       = reinterpret_cast<asCScriptFunction*>(initialFunction);
+		m_originalStackPointer  = DeserializeStackPointer(originalStackPointer);
+		m_argumentsSize         = argumentsSize; // TODO: Calculate this from the initialFunction so it doesn't need to be serialized
+
+		// Need to push the value of registers so they can be restored
+		m_regs.valueRegister  = valueRegister;
+		m_regs.objectRegister = objectRegister;
+		m_regs.objectType     = objectType;
+	}
+	else
+	{
+		asPWORD *tmp = &m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE*stackLevel];
+
+		if(tmp[0] != 0)
+			return asERROR; // TODO: This is not really an error. It just means that the stackLevel doesn't represent a pushed state
+
+		tmp[0] = 0;
+		tmp[1] = (asPWORD)callingSystemFunction;
+		tmp[2] = (asPWORD)initialFunction;
+		tmp[3] = (asPWORD)DeserializeStackPointer(originalStackPointer);
+		tmp[4] = (asPWORD)argumentsSize; // TODO: Calculate this from the initialFunction so it doesn't need to be serialized
+
+		// Need to push the value of registers so they can be restored
+		tmp[5] = (asPWORD)asDWORD(valueRegister);
+		tmp[6] = (asPWORD)asDWORD(valueRegister>>32);
+		tmp[7] = (asPWORD)objectRegister;
+		tmp[8] = (asPWORD)objectType;
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+int asCContext::SetCallStateRegisters(asUINT stackLevel, asDWORD stackFramePointer, asIScriptFunction *_currentFunction, asDWORD _programPointer, asDWORD stackPointer, asDWORD stackIndex)
+{
+	if( m_status != asEXECUTION_DESERIALIZATION)
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "SetCallStateRegisters", errorNames[-asCONTEXT_ACTIVE], asCONTEXT_ACTIVE);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asCONTEXT_ACTIVE;
+	}
+
+	if (stackLevel >= GetCallstackSize())
+		return asINVALID_ARG;
+
+	// TODO: The arg _currentFunction is just used in debug mode to validate that it is the same that is already given in m_currentFunction or on the call stack. Do we really need to take this argument?
+	asCScriptFunction *currentFunction =  static_cast<asCScriptFunction*>(_currentFunction);
+
+	if( currentFunction->funcType == asFUNC_DELEGATE )
+	{
+		currentFunction = currentFunction->funcForDelegate;
+	}
+
+	if( stackLevel == 0 )
+	{
+		asASSERT(currentFunction->signatureId == m_currentFunction->signatureId);
+		currentFunction = m_currentFunction;
+
+		asDWORD *programPointer = currentFunction->scriptData->byteCode.AddressOf();
+		if(currentFunction->scriptData->byteCode.GetLength() > _programPointer)
+		{
+			programPointer += _programPointer;
+		}
+
+		m_regs.stackFramePointer = DeserializeStackPointer(stackFramePointer);
+		m_regs.programPointer    = programPointer;
+		m_regs.stackPointer      = DeserializeStackPointer(stackPointer);
+		m_stackIndex             = stackIndex;
+	}
+	else
+	{
+		asPWORD *tmp = &m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE*stackLevel];
+
+		asASSERT(currentFunction->signatureId == ((asCScriptFunction*)tmp[1])->signatureId);
+		currentFunction = ((asCScriptFunction*)tmp[1]);
+
+		asDWORD *programPointer = currentFunction->scriptData->byteCode.AddressOf();
+		if(currentFunction->scriptData->byteCode.GetLength() > _programPointer)
+		{
+			programPointer += _programPointer;
+		}
+
+		tmp[0] = (asPWORD)DeserializeStackPointer(stackFramePointer);
+	//	tmp[1] = (asPWORD)(currentFunction);
+		tmp[2] = (asPWORD)programPointer;
+		tmp[3] = (asPWORD)DeserializeStackPointer(stackPointer);
+		tmp[4] = (asPWORD)stackIndex;
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+int asCContext::Prepare(asIScriptFunction *func)
+{
+	if( func == 0 )
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_s_d, "Prepare", "null", errorNames[-asNO_FUNCTION], asNO_FUNCTION);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asNO_FUNCTION;
+	}
+
+	if( m_status == asEXECUTION_ACTIVE || m_status == asEXECUTION_SUSPENDED )
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_s_d, "Prepare", func->GetDeclaration(true, true), errorNames[-asCONTEXT_ACTIVE], asCONTEXT_ACTIVE);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asCONTEXT_ACTIVE;
+	}
+
+	// Clean the stack if not done before
+	if( m_status != asEXECUTION_FINISHED && m_status != asEXECUTION_UNINITIALIZED )
+		CleanStack();
+
+	// Release the returned object (if any)
+	CleanReturnObject();
+
+	// Release the object if it is a script object
+	if( m_initialFunction && m_initialFunction->objectType && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
+	{
+		asCScriptObject *obj = *(asCScriptObject**)&m_regs.stackFramePointer[0];
+		if( obj )
+			obj->Release();
+
+		*(asPWORD*)&m_regs.stackFramePointer[0] = 0;
+	}
+
+	if( m_initialFunction && m_initialFunction == func )
+	{
+		// If the same function is executed again, we can skip a lot of the setup
+		m_currentFunction = m_initialFunction;
+
+		// Reset stack pointer
+		m_regs.stackPointer = m_originalStackPointer;
+
+		// Make sure the stack pointer is pointing to the original position,
+		// otherwise something is wrong with the way it is being updated
+		asASSERT( IsNested() || m_stackIndex > 0 || (m_regs.stackPointer == m_stackBlocks[0] + m_stackBlockSize) );
+	}
+	else
+	{
+		asASSERT( m_engine );
+
+		// Make sure the function is from the same engine as the context to avoid mixups
+		if( m_engine != func->GetEngine() )
+		{
+			asCString str;
+			str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_s_d, "Prepare", func->GetDeclaration(true, true), errorNames[-asINVALID_ARG], asINVALID_ARG);
+			m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			return asINVALID_ARG;
+		}
+
+		if( m_initialFunction )
+		{
+			m_initialFunction->Release();
+
+			// Reset stack pointer
+			m_regs.stackPointer = m_originalStackPointer;
+
+			// Make sure the stack pointer is pointing to the original position,
+			// otherwise something is wrong with the way it is being updated
+			asASSERT( IsNested() || m_stackIndex > 0 || (m_regs.stackPointer == m_stackBlocks[0] + m_stackBlockSize) );
+		}
+
+		// We trust the application not to pass anything else but a asCScriptFunction
+		m_initialFunction = reinterpret_cast<asCScriptFunction *>(func);
+		m_initialFunction->AddRef();
+		m_currentFunction = m_initialFunction;
+
+		// TODO: runtime optimize: GetSpaceNeededForArguments() should be precomputed
+		m_argumentsSize = m_currentFunction->GetSpaceNeededForArguments() + (m_currentFunction->objectType ? AS_PTR_SIZE : 0);
+
+		// Reserve space for the arguments and return value
+		if( m_currentFunction->DoesReturnOnStack() )
+		{
+			m_returnValueSize = m_currentFunction->returnType.GetSizeInMemoryDWords();
+			m_argumentsSize += AS_PTR_SIZE;
+		}
+		else
+			m_returnValueSize = 0;
+
+		// Determine the minimum stack size needed
+		int stackSize = m_argumentsSize + m_returnValueSize;
+		if( m_currentFunction->scriptData )
+			stackSize += m_currentFunction->scriptData->stackNeeded;
+
+		// Make sure there is enough space on the stack for the arguments and return value
+		if( !ReserveStackSpace(stackSize) )
+			return asOUT_OF_MEMORY;
+
+		// Set up the call stack too
+		if (m_callStack.GetCapacity() < m_engine->ep.initCallStackSize)
+			m_callStack.AllocateNoConstruct(m_engine->ep.initCallStackSize * CALLSTACK_FRAME_SIZE, true);
+	}
+
+	// Reset state
+	// Most of the time the previous state will be asEXECUTION_FINISHED, in which case the values are already initialized
+	if( m_status != asEXECUTION_FINISHED )
+	{
+		m_exceptionLine           = -1;
+		m_exceptionFunction       = 0;
+		m_doAbort                 = false;
+		m_doSuspend               = false;
+		m_regs.doProcessSuspend   = m_lineCallback;
+		m_externalSuspendRequest  = false;
+	}
+	m_status = asEXECUTION_PREPARED;
+	m_regs.programPointer = 0;
+
+	// Reserve space for the arguments and return value
+	m_regs.stackFramePointer = m_regs.stackPointer - m_argumentsSize - m_returnValueSize;
+	m_originalStackPointer   = m_regs.stackPointer;
+	m_regs.stackPointer      = m_regs.stackFramePointer;
+
+	// Set arguments to 0
+	memset(m_regs.stackPointer, 0, 4*m_argumentsSize);
+
+	if( m_returnValueSize )
+	{
+		// Set the address of the location where the return value should be put
+		asDWORD *ptr = m_regs.stackFramePointer;
+		if( m_currentFunction->objectType )
+			ptr += AS_PTR_SIZE;
+
+		*(void**)ptr = (void*)(m_regs.stackFramePointer + m_argumentsSize);
+	}
+
+	return asSUCCESS;
+}
+
+// Free all resources
+int asCContext::Unprepare()
+{
+	if( m_status == asEXECUTION_ACTIVE || m_status == asEXECUTION_SUSPENDED )
+		return asCONTEXT_ACTIVE;
+
+	// Set the context as active so that any clean up code can use access it if desired
+	asCThreadLocalData *tld = asPushActiveContext((asIScriptContext *)this);
+	asDWORD count = m_refCount.get();
+	UNUSED_VAR(count);
+
+	// Only clean the stack if the context was prepared but not executed until the end
+	if( m_status != asEXECUTION_UNINITIALIZED &&
+		m_status != asEXECUTION_FINISHED )
+		CleanStack();
+
+	asASSERT( m_needToCleanupArgs == false );
+
+	// Release the returned object (if any)
+	CleanReturnObject();
+
+	// TODO: Unprepare is called during destruction, so nobody
+	//       must be allowed to keep an extra reference
+	asASSERT(m_refCount.get() == count);
+	asPopActiveContext(tld, this);
+
+	// Release the object if it is a script object
+	if( m_initialFunction && m_initialFunction->objectType && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
+	{
+		asCScriptObject *obj = *(asCScriptObject**)&m_regs.stackFramePointer[0];
+		if( obj )
+			obj->Release();
+	}
+
+	// Release the initial function
+	if( m_initialFunction )
+	{
+		m_initialFunction->Release();
+
+		// Reset stack pointer
+		m_regs.stackPointer = m_originalStackPointer;
+
+		// Make sure the stack pointer is pointing to the original position,
+		// otherwise something is wrong with the way it is being updated
+		asASSERT( IsNested() || m_stackIndex > 0 || (m_regs.stackPointer == m_stackBlocks[0] + m_stackBlockSize) );
+	}
+
+	// Clear function pointers
+	m_initialFunction = 0;
+	m_currentFunction = 0;
+	m_exceptionFunction = 0;
+	m_regs.programPointer = 0;
+
+	// Reset status
+	m_status = asEXECUTION_UNINITIALIZED;
+
+	m_regs.stackFramePointer = 0;
+
+	return 0;
+}
+
+asBYTE asCContext::GetReturnByte()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
+
+	return *(asBYTE*)&m_regs.valueRegister;
+}
+
+asWORD asCContext::GetReturnWord()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
+
+	return *(asWORD*)&m_regs.valueRegister;
+}
+
+asDWORD asCContext::GetReturnDWord()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
+
+	return *(asDWORD*)&m_regs.valueRegister;
+}
+
+asQWORD asCContext::GetReturnQWord()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
+
+	return m_regs.valueRegister;
+}
+
+float asCContext::GetReturnFloat()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
+
+	return *(float*)&m_regs.valueRegister;
+}
+
+double asCContext::GetReturnDouble()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() ) return 0;
+
+	return *(double*)&m_regs.valueRegister;
+}
+
+void *asCContext::GetReturnAddress()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( dt->IsReference() )
+		return *(void**)&m_regs.valueRegister;
+	else if( dt->IsObject() || dt->IsFuncdef() )
+	{
+		if( m_initialFunction->DoesReturnOnStack() )
+		{
+			// The address of the return value was passed as the first argument, after the object pointer
+			int offset = 0;
+			if( m_initialFunction->objectType )
+				offset += AS_PTR_SIZE;
+
+			return *(void**)(&m_regs.stackFramePointer[offset]);
+		}
+
+		return m_regs.objectRegister;
+	}
+
+	return 0;
+}
+
+void *asCContext::GetReturnObject()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	if( !dt->IsObject() && !dt->IsFuncdef() ) return 0;
+
+	if( dt->IsReference() )
+		return *(void**)(asPWORD)m_regs.valueRegister;
+	else
+	{
+		if( m_initialFunction->DoesReturnOnStack() )
+		{
+			// The address of the return value was passed as the first argument, after the object pointer
+			int offset = 0;
+			if( m_initialFunction->objectType )
+				offset += AS_PTR_SIZE;
+
+			return *(void**)(&m_regs.stackFramePointer[offset]);
+		}
+
+		return m_regs.objectRegister;
+	}
+}
+
+void *asCContext::GetAddressOfReturnValue()
+{
+	if( m_status != asEXECUTION_FINISHED ) return 0;
+
+	asCDataType *dt = &m_initialFunction->returnType;
+
+	// An object is stored in the objectRegister
+	if( !dt->IsReference() && (dt->IsObject() || dt->IsFuncdef()) )
+	{
+		// Need to dereference objects
+		if( !dt->IsObjectHandle() )
+		{
+			if( m_initialFunction->DoesReturnOnStack() )
+			{
+				// The address of the return value was passed as the first argument, after the object pointer
+				int offset = 0;
+				if( m_initialFunction->objectType )
+					offset += AS_PTR_SIZE;
+
+				return *(void**)(&m_regs.stackFramePointer[offset]);
+			}
+
+			return *(void**)&m_regs.objectRegister;
+		}
+		return &m_regs.objectRegister;
+	}
+
+	// Primitives and references are stored in valueRegister
+	return &m_regs.valueRegister;
+}
+
+int asCContext::SetObject(void *obj)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( !m_initialFunction->objectType )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asERROR;
+	}
+
+	asASSERT( *(asPWORD*)&m_regs.stackFramePointer[0] == 0 );
+
+	*(asPWORD*)&m_regs.stackFramePointer[0] = (asPWORD)obj;
+
+	// TODO: This should be optional by having a flag where the application can chose whether it should be done or not
+	//       The flag could be named something like takeOwnership and have default value of true
+	if( obj && (m_initialFunction->objectType->flags & asOBJ_SCRIPT_OBJECT) )
+		reinterpret_cast<asCScriptObject*>(obj)->AddRef();
+
+	return 0;
+}
+
+int asCContext::SetArgByte(asUINT arg, asBYTE value)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	if( dt->GetSizeInMemoryBytes() != 1 )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(asBYTE*)&m_regs.stackFramePointer[offset] = value;
+
+	return 0;
+}
+
+int asCContext::SetArgWord(asUINT arg, asWORD value)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	if( dt->GetSizeInMemoryBytes() != 2 )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(asWORD*)&m_regs.stackFramePointer[offset] = value;
+
+	return 0;
+}
+
+int asCContext::SetArgDWord(asUINT arg, asDWORD value)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	if( dt->GetSizeInMemoryBytes() != 4 )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(asDWORD*)&m_regs.stackFramePointer[offset] = value;
+
+	return 0;
+}
+
+int asCContext::SetArgQWord(asUINT arg, asQWORD value)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	if( dt->GetSizeOnStackDWords() != 2 )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(asQWORD*)(&m_regs.stackFramePointer[offset]) = value;
+
+	return 0;
+}
+
+int asCContext::SetArgFloat(asUINT arg, float value)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	if( dt->GetSizeOnStackDWords() != 1 )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(float*)(&m_regs.stackFramePointer[offset]) = value;
+
+	return 0;
+}
+
+int asCContext::SetArgDouble(asUINT arg, double value)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->IsObject() || dt->IsFuncdef() || dt->IsReference() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	if( dt->GetSizeOnStackDWords() != 2 )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(double*)(&m_regs.stackFramePointer[offset]) = value;
+
+	return 0;
+}
+
+int asCContext::SetArgAddress(asUINT arg, void *value)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( !dt->IsReference() && !dt->IsObjectHandle() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(asPWORD*)(&m_regs.stackFramePointer[offset]) = (asPWORD)value;
+
+	return 0;
+}
+
+int asCContext::SetArgObject(asUINT arg, void *obj)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( !dt->IsObject() && !dt->IsFuncdef() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// If the object should be sent by value we must make a copy of it
+	if( !dt->IsReference() )
+	{
+		if( dt->IsObjectHandle() )
+		{
+			// Increase the reference counter
+			if (obj && dt->IsFuncdef())
+				((asIScriptFunction*)obj)->AddRef();
+			else
+			{
+				asSTypeBehaviour *beh = &CastToObjectType(dt->GetTypeInfo())->beh;
+				if (obj && beh->addref)
+					m_engine->CallObjectMethod(obj, beh->addref);
+			}
+		}
+		else
+		{
+			obj = m_engine->CreateScriptObjectCopy(obj, dt->GetTypeInfo());
+		}
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the value
+	*(asPWORD*)(&m_regs.stackFramePointer[offset]) = (asPWORD)obj;
+
+	return 0;
+}
+
+int asCContext::SetArgVarType(asUINT arg, void *ptr, int typeId)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return asCONTEXT_NOT_PREPARED;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_ARG;
+	}
+
+	// Verify the type of the argument
+	asCDataType *dt = &m_initialFunction->parameterTypes[arg];
+	if( dt->GetTokenType() != ttQuestion )
+	{
+		m_status = asEXECUTION_ERROR;
+		return asINVALID_TYPE;
+	}
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Set the typeId and pointer
+	*(asPWORD*)(&m_regs.stackFramePointer[offset]) = (asPWORD)ptr;
+	offset += AS_PTR_SIZE;
+	*(int*)(&m_regs.stackFramePointer[offset]) = typeId;
+
+	return 0;
+}
+
+// TODO: Instead of GetAddressOfArg, maybe we need a SetArgValue(int arg, void *value, bool takeOwnership) instead.
+
+// interface
+void *asCContext::GetAddressOfArg(asUINT arg)
+{
+	if( m_status != asEXECUTION_PREPARED )
+		return 0;
+
+	if( arg >= (unsigned)m_initialFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	if( m_initialFunction->objectType )
+		offset += AS_PTR_SIZE;
+
+	// If function returns object by value an extra pointer is pushed on the stack
+	if( m_returnValueSize )
+		offset += AS_PTR_SIZE;
+
+	for( asUINT n = 0; n < arg; n++ )
+		offset += m_initialFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// We should return the address of the location where the argument value will be placed
+
+	// All registered types are always sent by reference, even if
+	// the function is declared to receive the argument by value.
+	return &m_regs.stackFramePointer[offset];
+}
+
+
+int asCContext::Abort()
+{
+	if( m_engine == 0 ) return asERROR;
+
+	// TODO: multithread: Make thread safe. There is a chance that the status
+	//                    changes to something else after being set to ABORTED here.
+	if( m_status == asEXECUTION_SUSPENDED )
+		m_status = asEXECUTION_ABORTED;
+
+	m_doSuspend = true;
+	m_regs.doProcessSuspend = true;
+	m_externalSuspendRequest = true;
+	m_doAbort = true;
+
+	return 0;
+}
+
+// interface
+int asCContext::Suspend()
+{
+	// This function just sets some internal flags and is safe
+	// to call from a secondary thread, even if the library has
+	// been built without multi-thread support.
+
+	if( m_engine == 0 ) return asERROR;
+
+	m_doSuspend = true;
+	m_externalSuspendRequest = true;
+	m_regs.doProcessSuspend = true;
+
+	return 0;
+}
+
+// interface
+int asCContext::Execute()
+{
+	asASSERT( m_engine != 0 );
+
+	if( m_status != asEXECUTION_SUSPENDED && m_status != asEXECUTION_PREPARED )
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "Execute", errorNames[-asCONTEXT_NOT_PREPARED], asCONTEXT_NOT_PREPARED);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asCONTEXT_NOT_PREPARED;
+	}
+
+	m_status = asEXECUTION_ACTIVE;
+
+	asCThreadLocalData *tld = asPushActiveContext((asIScriptContext *)this);
+
+	// Make sure there are not too many nested calls, as it could crash the application
+	// by filling up the thread call stack
+	if (tld->activeContexts.GetLength() > m_engine->ep.maxNestedCalls)
+		SetInternalException(TXT_TOO_MANY_NESTED_CALLS);
+	else if( m_regs.programPointer == 0 )
+		SetProgramPointer();
+
+	asUINT gcPreObjects = 0;
+	if( m_engine->ep.autoGarbageCollect )
+		m_engine->gc.GetStatistics(&gcPreObjects, 0, 0, 0, 0);
+
+	while (m_status == asEXECUTION_ACTIVE)
+	{
+		ExecuteNext();
+
+		// If an exception was raised that will be caught, then unwind the stack
+		// and move the program pointer to the catch block before proceeding
+		if (m_status == asEXECUTION_EXCEPTION && m_exceptionWillBeCaught)
+			CleanStack(true);
+	}
+
+	if( m_lineCallback )
+	{
+		// Call the line callback one last time before leaving
+		// so anyone listening can catch the state change
+		CallLineCallback();
+		m_regs.doProcessSuspend = true;
+	}
+	else
+		m_regs.doProcessSuspend = false;
+
+	m_doSuspend = false;
+
+	if( m_engine->ep.autoGarbageCollect )
+	{
+		asUINT gcPosObjects = 0;
+		m_engine->gc.GetStatistics(&gcPosObjects, 0, 0, 0, 0);
+		if( gcPosObjects > gcPreObjects )
+		{
+			// Execute as many steps as there were new objects created
+			m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE, gcPosObjects - gcPreObjects);
+		}
+		else if( gcPosObjects > 0 )
+		{
+			// Execute at least one step, even if no new objects were created
+			m_engine->GarbageCollect(asGC_ONE_STEP | asGC_DESTROY_GARBAGE | asGC_DETECT_GARBAGE, 1);
+		}
+	}
+
+	// Pop the active context
+	asPopActiveContext(tld, this);
+
+	if( m_status == asEXECUTION_FINISHED )
+	{
+		m_regs.objectType = m_initialFunction->returnType.GetTypeInfo();
+		return asEXECUTION_FINISHED;
+	}
+
+	if( m_doAbort )
+	{
+		m_doAbort = false;
+
+		m_status = asEXECUTION_ABORTED;
+		return asEXECUTION_ABORTED;
+	}
+
+	if( m_status == asEXECUTION_SUSPENDED )
+		return asEXECUTION_SUSPENDED;
+
+	if( m_status == asEXECUTION_EXCEPTION )
+		return asEXECUTION_EXCEPTION;
+
+	return asERROR;
+}
+
+// internal
+asCScriptFunction *asCContext::GetRealFunc(asCScriptFunction * currentFunction, void ** _This)
+{
+	if( currentFunction->funcType == asFUNC_VIRTUAL ||
+		currentFunction->funcType == asFUNC_INTERFACE )
+	{
+		// The currentFunction is a virtual method
+
+		// Determine the true function from the object
+		asCScriptObject *obj = *(asCScriptObject**)_This;
+
+		if( obj == 0 )
+		{
+			SetInternalException(TXT_NULL_POINTER_ACCESS);
+		}
+		else
+		{
+			asCObjectType *objType = obj->objType;
+			asCScriptFunction * realFunc = 0;
+
+			if( currentFunction->funcType == asFUNC_VIRTUAL )
+			{
+				if( objType->virtualFunctionTable.GetLength() > (asUINT)currentFunction->vfTableIdx )
+				{
+					realFunc = objType->virtualFunctionTable[currentFunction->vfTableIdx];
+				}
+			}
+			else
+			{
+				// Search the object type for a function that matches the interface function
+				for( asUINT n = 0; n < objType->methods.GetLength(); n++ )
+				{
+					asCScriptFunction *f2 = m_engine->scriptFunctions[objType->methods[n]];
+					if( f2->signatureId == currentFunction->signatureId )
+					{
+						if( f2->funcType == asFUNC_VIRTUAL )
+							realFunc = objType->virtualFunctionTable[f2->vfTableIdx];
+						else
+							realFunc = f2;
+
+						break;
+					}
+				}
+			}
+
+			if( realFunc && realFunc->signatureId == currentFunction->signatureId )
+				return realFunc;
+			else
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+		}
+	}
+	else if( currentFunction->funcType == asFUNC_IMPORTED )
+	{
+		int funcId = m_engine->importedFunctions[currentFunction->id & ~FUNC_IMPORTED]->boundFunctionId;
+		if( funcId > 0 )
+			return m_engine->scriptFunctions[funcId];
+		else
+			SetInternalException(TXT_UNBOUND_FUNCTION);
+	}
+
+	return currentFunction;
+}
+
+// internal
+void asCContext::SetProgramPointer()
+{
+	// This shouldn't be called if the program pointer is already set
+	asASSERT(m_regs.programPointer == 0);
+
+	// Can't set up the program pointer if no function has been set yet
+	asASSERT(m_currentFunction != 0);
+
+	// If the function is a delegate then get then set the function and object from the delegate
+	if( m_currentFunction->funcType == asFUNC_DELEGATE )
+	{
+		// Push the object pointer onto the stack
+		asASSERT( m_regs.stackPointer - AS_PTR_SIZE >= m_stackBlocks[m_stackIndex] );
+		m_regs.stackPointer -= AS_PTR_SIZE;
+		m_regs.stackFramePointer -= AS_PTR_SIZE;
+		*(asPWORD*)m_regs.stackPointer = asPWORD(m_currentFunction->objForDelegate);
+
+		// Make the call to the delegated object method
+		m_currentFunction = m_currentFunction->funcForDelegate;
+	}
+
+	m_currentFunction = GetRealFunc(m_currentFunction, (void**)m_regs.stackFramePointer);
+
+	if( m_currentFunction->funcType == asFUNC_SCRIPT )
+	{
+		m_regs.programPointer = m_currentFunction->scriptData->byteCode.AddressOf();
+
+		// Set up the internal registers for executing the script function
+		PrepareScriptFunction();
+	}
+	else if( m_currentFunction->funcType == asFUNC_SYSTEM )
+	{
+		asASSERT(m_status != asEXECUTION_DESERIALIZATION);
+
+		// The current function is an application registered function
+
+		// Call the function directly
+		CallSystemFunction(m_currentFunction->id, this);
+
+		// Was the call successful?
+		if( m_status == asEXECUTION_ACTIVE )
+		{
+			m_status = asEXECUTION_FINISHED;
+		}
+	}
+	else
+	{
+		// This shouldn't happen unless there was an error in which
+		// case an exception should have been raised already
+		asASSERT( m_status == asEXECUTION_EXCEPTION );
+	}
+}
+
+// interface
+int asCContext::PushState()
+{
+	// Only allow the state to be pushed when active or deserialising
+	// TODO: Can we support a suspended state too? So the reuse of
+	//       the context can be done outside the Execute() call?
+	if( m_status != asEXECUTION_ACTIVE || m_status == asEXECUTION_DESERIALIZATION)
+	{
+		// TODO: Write message. Wrong usage
+		return asERROR;
+	}
+
+	// Allocate space on the callstack for at least two states
+	if (m_callStack.GetLength() >= m_callStack.GetCapacity() - 2*CALLSTACK_FRAME_SIZE)
+	{
+		if (m_engine->ep.maxCallStackSize > 0 && m_callStack.GetLength() >= m_engine->ep.maxCallStackSize*CALLSTACK_FRAME_SIZE)
+		{
+			// The call stack is too big to grow further
+			// If an error occurs, no change to the context should be done
+			return asOUT_OF_MEMORY;
+		}
+
+		// Allocate space for 10 call states at a time to save time
+		m_callStack.AllocateNoConstruct(m_callStack.GetLength() + 10 * CALLSTACK_FRAME_SIZE, true);
+	}
+
+	// Push the current script function that is calling the system function
+	// This cannot fail, since the memory was already allocated above
+	PushCallState();
+
+	// Push the system function too, which will serve both as a marker and
+	// informing which system function that created the nested call
+	m_callStack.SetLengthNoConstruct(m_callStack.GetLength() + CALLSTACK_FRAME_SIZE);
+
+	// Need to push m_initialFunction as it must be restored later
+	asPWORD *tmp = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
+	tmp[0] = 0;
+	tmp[1] = (asPWORD)m_callingSystemFunction;
+	tmp[2] = (asPWORD)m_initialFunction;
+	tmp[3] = (asPWORD)m_originalStackPointer;
+	tmp[4] = (asPWORD)m_argumentsSize;
+
+	// Need to push the value of registers so they can be restored
+	tmp[5] = (asPWORD)asDWORD(m_regs.valueRegister);
+	tmp[6] = (asPWORD)asDWORD(m_regs.valueRegister>>32);
+	tmp[7] = (asPWORD)m_regs.objectRegister;
+	tmp[8] = (asPWORD)m_regs.objectType;
+
+	// Decrease stackpointer to prevent the top value from being overwritten
+	m_regs.stackPointer -= 2;
+
+	// Clear the initial function so that Prepare() knows it must do all validations
+	m_initialFunction = 0;
+
+	// After this the state should appear as if uninitialized
+	m_callingSystemFunction = 0;
+
+	m_regs.objectRegister = 0;
+	m_regs.objectType = 0;
+
+	// Set the status to uninitialized as application
+	// should call Prepare() after this to reuse the context
+	if( m_status != asEXECUTION_DESERIALIZATION )
+		m_status = asEXECUTION_UNINITIALIZED;
+
+	return asSUCCESS;
+}
+
+// interface
+int asCContext::PopState()
+{
+	if( !IsNested() )
+		return asERROR;
+
+	// Clean up the current execution
+	Unprepare();
+
+	// The topmost state must be a marker for nested call
+	asASSERT( m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE] == 0 );
+
+	// Restore the previous state
+	asPWORD *tmp = &m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE];
+	m_callingSystemFunction = reinterpret_cast<asCScriptFunction*>(tmp[1]);
+	m_callStack.SetLength(m_callStack.GetLength() - CALLSTACK_FRAME_SIZE);
+
+	// Restore the previous initial function and the associated values
+	m_initialFunction      = reinterpret_cast<asCScriptFunction*>(tmp[2]);
+	m_originalStackPointer = (asDWORD*)tmp[3];
+	m_argumentsSize        = (int)tmp[4];
+
+	m_regs.valueRegister   = asQWORD(asDWORD(tmp[5]));
+	m_regs.valueRegister  |= asQWORD(tmp[6])<<32;
+	m_regs.objectRegister  = (void*)tmp[7];
+	m_regs.objectType      = (asITypeInfo*)tmp[8];
+
+	// Calculate the returnValueSize
+	if( m_initialFunction->DoesReturnOnStack() )
+		m_returnValueSize = m_initialFunction->returnType.GetSizeInMemoryDWords();
+	else
+		m_returnValueSize = 0;
+
+	// Pop the current script function. This will also restore the previous stack pointer
+	PopCallState();
+
+	m_status = asEXECUTION_ACTIVE;
+
+	return asSUCCESS;
+}
+
+// internal
+int asCContext::PushCallState()
+{
+	if( m_callStack.GetLength() == m_callStack.GetCapacity() )
+	{
+		if (m_engine->ep.maxCallStackSize > 0 && m_callStack.GetLength() >= m_engine->ep.maxCallStackSize*CALLSTACK_FRAME_SIZE)
+		{
+			// The call stack is too big to grow further
+			SetInternalException(TXT_STACK_OVERFLOW);
+			return asERROR;
+		}
+
+		// Allocate space for 10 call states at a time to save time
+		m_callStack.AllocateNoConstruct(m_callStack.GetLength() + 10*CALLSTACK_FRAME_SIZE, true);
+	}
+	m_callStack.SetLengthNoConstruct(m_callStack.GetLength() + CALLSTACK_FRAME_SIZE);
+
+    // Separating the loads and stores limits data cache trash, and with a smart compiler
+    // could turn into SIMD style loading/storing if available.
+    // The compiler can't do this itself due to potential pointer aliasing between the pointers,
+    // ie writing to tmp could overwrite the data contained in registers.stackFramePointer for example
+    // for all the compiler knows. So introducing the local variable s, which is never referred to by
+    // its address we avoid this issue.
+
+	asPWORD s[5];
+	s[0] = (asPWORD)m_regs.stackFramePointer;
+	s[1] = (asPWORD)m_currentFunction;
+	s[2] = (asPWORD)m_regs.programPointer;
+	s[3] = (asPWORD)m_regs.stackPointer;
+	s[4] = m_stackIndex;
+
+	asPWORD *tmp = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
+	tmp[0] = s[0];
+	tmp[1] = s[1];
+	tmp[2] = s[2];
+	tmp[3] = s[3];
+	tmp[4] = s[4];
+
+	return asSUCCESS;
+}
+
+// internal
+void asCContext::PopCallState()
+{
+	// See comments in PushCallState about pointer aliasing and data cache trashing
+	asPWORD *tmp = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
+	asPWORD s[5];
+	s[0] = tmp[0];
+	s[1] = tmp[1];
+	s[2] = tmp[2];
+	s[3] = tmp[3];
+	s[4] = tmp[4];
+
+	m_regs.stackFramePointer = (asDWORD*)s[0];
+	m_currentFunction        = (asCScriptFunction*)s[1];
+	m_regs.programPointer    = (asDWORD*)s[2];
+	m_regs.stackPointer      = (asDWORD*)s[3];
+	m_stackIndex             = (int)s[4];
+
+	m_callStack.SetLength(m_callStack.GetLength() - CALLSTACK_FRAME_SIZE);
+}
+
+// interface
+asUINT asCContext::GetCallstackSize() const
+{
+	if( m_currentFunction == 0 ) return 0;
+
+	// The current function is accessed at stackLevel 0
+	return asUINT(1 + m_callStack.GetLength() / CALLSTACK_FRAME_SIZE);
+}
+
+// interface
+asIScriptFunction *asCContext::GetFunction(asUINT stackLevel)
+{
+	if( stackLevel >= GetCallstackSize() ) return 0;
+
+	if( stackLevel == 0 ) return m_currentFunction;
+
+	asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize() - stackLevel - 1)*CALLSTACK_FRAME_SIZE;
+	asCScriptFunction *func = (asCScriptFunction*)s[1];
+
+	return func;
+}
+
+// interface
+int asCContext::GetLineNumber(asUINT stackLevel, int *column, const char **sectionName)
+{
+	if( stackLevel >= GetCallstackSize() ) return asINVALID_ARG;
+
+	asCScriptFunction *func;
+	asDWORD *bytePos;
+	if( stackLevel == 0 )
+	{
+		func = m_currentFunction;
+		if( func->scriptData == 0 ) return 0;
+		bytePos = m_regs.programPointer;
+	}
+	else
+	{
+		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
+		func = (asCScriptFunction*)s[1];
+		if( func->scriptData == 0 ) return 0;
+		bytePos = (asDWORD*)s[2];
+
+		// Subract 1 from the bytePos, because we want the line where
+		// the call was made, and not the instruction after the call
+		bytePos -= 1;
+	}
+
+	// For nested calls it is possible that func is null
+	if( func == 0 )
+	{
+		if( column ) *column = 0;
+		if( sectionName ) *sectionName = 0;
+		return 0;
+	}
+
+	int sectionIdx;
+	asDWORD line = func->GetLineNumber(int(bytePos - func->scriptData->byteCode.AddressOf()), &sectionIdx);
+	if( column ) *column = (line >> 20);
+	if( sectionName )
+	{
+		asASSERT( sectionIdx < int(m_engine->scriptSectionNames.GetLength()) );
+		if( sectionIdx >= 0 && asUINT(sectionIdx) < m_engine->scriptSectionNames.GetLength() )
+			*sectionName = m_engine->scriptSectionNames[sectionIdx]->AddressOf();
+		else
+			*sectionName = 0;
+	}
+	return (line & 0xFFFFF);
+}
+
+// internal
+bool asCContext::ReserveStackSpace(asUINT size)
+{
+#ifdef WIP_16BYTE_ALIGN
+	// Pad size to a multiple of MAX_TYPE_ALIGNMENT.
+	const asUINT remainder = size % MAX_TYPE_ALIGNMENT;
+	if(remainder != 0)
+	{
+		size = size + (MAX_TYPE_ALIGNMENT - (size % MAX_TYPE_ALIGNMENT));
+	}
+#endif
+
+	// Make sure the first stack block is allocated
+	if( m_stackBlocks.GetLength() == 0 )
+	{
+		m_stackBlockSize = m_engine->ep.initContextStackSize;
+		asASSERT( m_stackBlockSize > 0 );
+
+#ifndef WIP_16BYTE_ALIGN
+		asDWORD *stack = asNEWARRAY(asDWORD,m_stackBlockSize);
+#else
+		asDWORD *stack = asNEWARRAYALIGNED(asDWORD, m_stackBlockSize, MAX_TYPE_ALIGNMENT);
+#endif
+		if( stack == 0 )
+		{
+			// Out of memory
+			return false;
+		}
+
+#ifdef WIP_16BYTE_ALIGN
+		asASSERT( isAligned(stack, MAX_TYPE_ALIGNMENT) );
+#endif
+
+		m_stackBlocks.PushLast(stack);
+		m_stackIndex = 0;
+		m_regs.stackPointer = m_stackBlocks[0] + m_stackBlockSize;
+
+#ifdef WIP_16BYTE_ALIGN
+		// Align the stack pointer. This is necessary as the m_stackBlockSize is not necessarily evenly divisable with the max alignment
+		((asPWORD&)m_regs.stackPointer) &= ~(MAX_TYPE_ALIGNMENT-1);
+
+		asASSERT( isAligned(m_regs.stackPointer, MAX_TYPE_ALIGNMENT) );
+#endif
+	}
+
+	// Check if there is enough space on the current stack block, otherwise move
+	// to the next one. New and larger blocks will be allocated as necessary
+	while( m_regs.stackPointer - (size + RESERVE_STACK) < m_stackBlocks[m_stackIndex] )
+	{
+		// Make sure we don't allocate more space than allowed
+		if( m_engine->ep.maximumContextStackSize )
+		{
+			// This test will only stop growth once it is on or already crossed the limit
+			if( m_stackBlockSize * ((1 << (m_stackIndex+1)) - 1) >= m_engine->ep.maximumContextStackSize )
+			{
+				m_isStackMemoryNotAllocated = true;
+
+				// Set the stackFramePointer, even though the stackPointer wasn't updated
+				m_regs.stackFramePointer = m_regs.stackPointer;
+
+				SetInternalException(TXT_STACK_OVERFLOW);
+				return false;
+			}
+		}
+
+		m_stackIndex++;
+		if( m_stackBlocks.GetLength() == m_stackIndex )
+		{
+			// Allocate the new stack block, with twice the size of the previous
+#ifndef WIP_16BYTE_ALIGN
+			asDWORD *stack = asNEWARRAY(asDWORD, (m_stackBlockSize << m_stackIndex));
+#else
+			asDWORD *stack = asNEWARRAYALIGNED(asDWORD, (m_stackBlockSize << m_stackIndex), MAX_TYPE_ALIGNMENT);
+#endif
+			if( stack == 0 )
+			{
+				// Out of memory
+				m_isStackMemoryNotAllocated = true;
+
+				// Set the stackFramePointer, even though the stackPointer wasn't updated
+				m_regs.stackFramePointer = m_regs.stackPointer;
+
+				SetInternalException(TXT_STACK_OVERFLOW);
+				return false;
+			}
+
+#ifdef WIP_16BYTE_ALIGN
+			asASSERT( isAligned(stack, MAX_TYPE_ALIGNMENT) );
+#endif
+
+			m_stackBlocks.PushLast(stack);
+		}
+
+		// Update the stack pointer to point to the new block.
+		// Leave enough room above the stackpointer to copy the arguments from the previous stackblock
+		m_regs.stackPointer = m_stackBlocks[m_stackIndex] +
+			                  (m_stackBlockSize<<m_stackIndex) -
+			                  m_currentFunction->GetSpaceNeededForArguments() -
+			                  (m_currentFunction->objectType ? AS_PTR_SIZE : 0) -
+			                  (m_currentFunction->DoesReturnOnStack() ? AS_PTR_SIZE : 0);
+
+#ifdef WIP_16BYTE_ALIGN
+		// Align the stack pointer
+		(asPWORD&)m_regs.stackPointer &= ~(MAX_TYPE_ALIGNMENT-1);
+
+		asASSERT( isAligned(m_regs.stackPointer, MAX_TYPE_ALIGNMENT) );
+#endif
+	}
+
+	return true;
+}
+
+// internal
+void asCContext::CallScriptFunction(asCScriptFunction *func)
+{
+	asASSERT( func->scriptData );
+
+	// Push the framepointer, function id and programCounter on the stack
+	if (PushCallState() < 0)
+		return;
+
+	// Update the current function and program position before increasing the stack
+	// so the exception handler will know what to do if there is a stack overflow
+	m_currentFunction = func;
+	m_regs.programPointer = m_currentFunction->scriptData->byteCode.AddressOf();
+
+	PrepareScriptFunction();
+}
+
+void asCContext::PrepareScriptFunction()
+{
+	asASSERT( m_currentFunction->scriptData );
+
+	// Make sure there is space on the stack to execute the function
+	asDWORD *oldStackPointer = m_regs.stackPointer;
+	if( !ReserveStackSpace(m_currentFunction->scriptData->stackNeeded) )
+		return;
+
+	// If a new stack block was allocated then we'll need to move
+	// over the function arguments to the new block.
+	if( m_regs.stackPointer != oldStackPointer )
+	{
+		int numDwords = m_currentFunction->GetSpaceNeededForArguments() +
+		                (m_currentFunction->objectType ? AS_PTR_SIZE : 0) +
+		                (m_currentFunction->DoesReturnOnStack() ? AS_PTR_SIZE : 0);
+		memcpy(m_regs.stackPointer, oldStackPointer, sizeof(asDWORD)*numDwords);
+	}
+
+	// Update framepointer
+	m_regs.stackFramePointer = m_regs.stackPointer;
+
+	// Set all object variables to 0 to guarantee that they are null before they are used
+	// Only variables on the heap should be cleared. The rest will be cleared by calling the constructor
+	// TODO: Need a fast way to iterate over this list (perhaps a pointer in variables to give index of next object var, or perhaps just order the array with object types first)
+	for (asUINT n = m_currentFunction->scriptData->variables.GetLength(); n-- > 0; )
+	{
+		asSScriptVariable *var = m_currentFunction->scriptData->variables[n];
+
+		// Dopn't clear the function arguments
+		if (var->stackOffset <= 0)
+			continue;
+
+		if( var->onHeap && (var->type.IsObject() || var->type.IsFuncdef()) )
+			*(asPWORD*)&m_regs.stackFramePointer[-var->stackOffset] = 0;
+	}
+
+	// Initialize the stack pointer with the space needed for local variables
+	m_regs.stackPointer -= m_currentFunction->scriptData->variableSpace;
+
+	// Call the line callback for each script function, to guarantee that infinitely recursive scripts can
+	// be interrupted, even if the scripts have been compiled with asEP_BUILD_WITHOUT_LINE_CUES
+	if( m_regs.doProcessSuspend )
+	{
+		if( m_lineCallback )
+			CallLineCallback();
+		if( m_doSuspend )
+			m_status = asEXECUTION_SUSPENDED;
+	}
+}
+
+void asCContext::CallInterfaceMethod(asCScriptFunction *func)
+{
+	// Resolve the interface method using the current script type
+	asCScriptObject *obj = *(asCScriptObject**)(asPWORD*)m_regs.stackPointer;
+	if( obj == 0 )
+	{
+		// Tell the exception handler to clean up the arguments to this method
+		m_needToCleanupArgs = true;
+		SetInternalException(TXT_NULL_POINTER_ACCESS);
+		return;
+	}
+
+	asCObjectType *objType = obj->objType;
+
+	// Search the object type for a function that matches the interface function
+	asCScriptFunction *realFunc = 0;
+	if( func->funcType == asFUNC_INTERFACE )
+	{
+		// Find the offset for the interface's virtual function table chunk
+		asUINT offset = 0;
+		bool found = false;
+		asCObjectType *findInterface = func->objectType;
+
+		// TODO: runtime optimize: The list of interfaces should be ordered by the address
+		//                         Then a binary search pattern can be used.
+		asUINT intfCount = asUINT(objType->interfaces.GetLength());
+		for( asUINT n = 0; n < intfCount; n++ )
+		{
+			if( objType->interfaces[n] == findInterface )
+			{
+				offset = objType->interfaceVFTOffsets[n];
+				found = true;
+				break;
+			}
+		}
+
+		if( !found )
+		{
+			// Tell the exception handler to clean up the arguments to this method
+			m_needToCleanupArgs = true;
+			SetInternalException(TXT_NULL_POINTER_ACCESS);
+			return;
+		}
+
+		// Find the real function in the virtual table chunk with the found offset
+		realFunc = objType->virtualFunctionTable[func->vfTableIdx + offset];
+
+		// Since the interface was implemented by the class, it shouldn't
+		// be possible that the real function isn't found
+		asASSERT( realFunc );
+
+		asASSERT( realFunc->signatureId == func->signatureId );
+	}
+	else // if( func->funcType == asFUNC_VIRTUAL )
+	{
+		realFunc = objType->virtualFunctionTable[func->vfTableIdx];
+	}
+
+	// Then call the true script function
+	CallScriptFunction(realFunc);
+}
+
+void asCContext::ExecuteNext()
+{
+	asDWORD *l_bc = m_regs.programPointer;
+	asDWORD *l_sp = m_regs.stackPointer;
+	asDWORD *l_fp = m_regs.stackFramePointer;
+
+	for(;;)
+	{
+
+#ifdef AS_DEBUG
+	// Gather statistics on executed bytecode
+	stats.Instr(*(asBYTE*)l_bc);
+
+	// Used to verify that the size of the instructions are correct
+	asDWORD *old = l_bc;
+#endif
+
+
+	// Remember to keep the cases in order and without
+	// gaps, because that will make the switch faster.
+	// It will be faster since only one lookup will be
+	// made to find the correct jump destination. If not
+	// in order, the switch will make two lookups.
+	switch( *(asBYTE*)l_bc )
+	{
+//--------------
+// memory access functions
+
+	case asBC_PopPtr:
+		// Pop a pointer from the stack
+		l_sp += AS_PTR_SIZE;
+		l_bc++;
+		break;
+
+	case asBC_PshGPtr:
+		// Replaces PGA + RDSPtr
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = *(asPWORD*)asBC_PTRARG(l_bc);
+		l_bc += 1 + AS_PTR_SIZE;
+		break;
+
+	// Push a dword value on the stack
+	case asBC_PshC4:
+		--l_sp;
+		*l_sp = asBC_DWORDARG(l_bc);
+		l_bc += 2;
+		break;
+
+	// Push the dword value of a variable on the stack
+	case asBC_PshV4:
+		--l_sp;
+		*l_sp = *(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	// Push the address of a variable on the stack
+	case asBC_PSF:
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = asPWORD(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	// Swap the top 2 pointers on the stack
+	case asBC_SwapPtr:
+		{
+			asPWORD p = *(asPWORD*)l_sp;
+			*(asPWORD*)l_sp = *(asPWORD*)(l_sp+AS_PTR_SIZE);
+			*(asPWORD*)(l_sp+AS_PTR_SIZE) = p;
+			l_bc++;
+		}
+		break;
+
+	// Do a boolean not operation, modifying the value of the variable
+	case asBC_NOT:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Set the value to true if it is equal to 0
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on the pointer.
+
+			volatile asBYTE *ptr = (asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
+			asBYTE val = (ptr[0] == 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
+			ptr[0] = val; // The result is stored in the lower byte
+			ptr[1] = 0;   // Make sure the rest of the DWORD is 0
+			ptr[2] = 0;
+			ptr[3] = 0;
+		}
+#else
+		*(l_fp - asBC_SWORDARG0(l_bc)) = (*(l_fp - asBC_SWORDARG0(l_bc)) == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+#endif
+		l_bc++;
+		break;
+
+	// Push the dword value of a global variable on the stack
+	case asBC_PshG4:
+		--l_sp;
+		*l_sp = *(asDWORD*)asBC_PTRARG(l_bc);
+		l_bc += 1 + AS_PTR_SIZE;
+		break;
+
+	// Load the address of a global variable in the register, then
+	// copy the value of the global variable into a local variable
+	case asBC_LdGRdR4:
+		*(void**)&m_regs.valueRegister = (void*)asBC_PTRARG(l_bc);
+		*(l_fp - asBC_SWORDARG0(l_bc)) = **(asDWORD**)&m_regs.valueRegister;
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+//----------------
+// path control instructions
+
+	// Begin execution of a script function
+	case asBC_CALL:
+		{
+			int i = asBC_INTARG(l_bc);
+			l_bc += 2;
+
+			asASSERT( i >= 0 );
+			asASSERT( (i & FUNC_IMPORTED) == 0 );
+
+			// Need to move the values back to the context
+			m_regs.programPointer = l_bc;
+			m_regs.stackPointer = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			CallScriptFunction(m_engine->scriptFunctions[i]);
+
+			// Extract the values from the context again
+			l_bc = m_regs.programPointer;
+			l_sp = m_regs.stackPointer;
+			l_fp = m_regs.stackFramePointer;
+
+			// If status isn't active anymore then we must stop
+			if( m_status != asEXECUTION_ACTIVE )
+				return;
+		}
+		break;
+
+	// Return to the caller, and remove the arguments from the stack
+	case asBC_RET:
+		{
+			// Return if this was the first function, or a nested execution
+			if( m_callStack.GetLength() == 0 ||
+				m_callStack[m_callStack.GetLength() - CALLSTACK_FRAME_SIZE] == 0 )
+			{
+				m_status = asEXECUTION_FINISHED;
+				return;
+			}
+
+			asWORD w = asBC_WORDARG0(l_bc);
+
+			// Read the old framepointer, functionid, and programCounter from the call stack
+			PopCallState();
+
+			// Extract the values from the context again
+			l_bc = m_regs.programPointer;
+			l_sp = m_regs.stackPointer;
+			l_fp = m_regs.stackFramePointer;
+
+			// Pop arguments from stack
+			l_sp += w;
+		}
+		break;
+
+	// Jump to a relative position
+	case asBC_JMP:
+		l_bc += 2 + asBC_INTARG(l_bc);
+		break;
+
+//----------------
+// Conditional jumps
+
+	// Jump to a relative position if the value in the register is 0
+	case asBC_JZ:
+		if( *(int*)&m_regs.valueRegister == 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+
+	// Jump to a relative position if the value in the register is not 0
+	case asBC_JNZ:
+		if( *(int*)&m_regs.valueRegister != 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+
+	// Jump to a relative position if the value in the register is negative
+	case asBC_JS:
+		if( *(int*)&m_regs.valueRegister < 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+
+	// Jump to a relative position if the value in the register it not negative
+	case asBC_JNS:
+		if( *(int*)&m_regs.valueRegister >= 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+
+	// Jump to a relative position if the value in the register is greater than 0
+	case asBC_JP:
+		if( *(int*)&m_regs.valueRegister > 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+
+	// Jump to a relative position if the value in the register is not greater than 0
+	case asBC_JNP:
+		if( *(int*)&m_regs.valueRegister <= 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+//--------------------
+// test instructions
+
+	// If the value in the register is 0, then set the register to 1, else to 0
+	case asBC_TZ:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Set the value to true if it is equal to 0
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on valueRegister.
+
+			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
+			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
+			asBYTE val = (regPtr[0] == 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
+			regBptr[0] = val; // The result is stored in the lower byte
+			regBptr[1] = 0;   // Make sure the rest of the register is 0
+			regBptr[2] = 0;
+			regBptr[3] = 0;
+			regBptr[4] = 0;
+			regBptr[5] = 0;
+			regBptr[6] = 0;
+			regBptr[7] = 0;
+		}
+#else
+		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister == 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+#endif
+		l_bc++;
+		break;
+
+	// If the value in the register is not 0, then set the register to 1, else to 0
+	case asBC_TNZ:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Set the value to true if it is not equal to 0
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on valueRegister.
+
+			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
+			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
+			asBYTE val = (regPtr[0] == 0) ? 0 : VALUE_OF_BOOLEAN_TRUE;
+			regBptr[0] = val; // The result is stored in the lower byte
+			regBptr[1] = 0;   // Make sure the rest of the register is 0
+			regBptr[2] = 0;
+			regBptr[3] = 0;
+			regBptr[4] = 0;
+			regBptr[5] = 0;
+			regBptr[6] = 0;
+			regBptr[7] = 0;
+		}
+#else
+		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister == 0 ? 0 : VALUE_OF_BOOLEAN_TRUE);
+#endif
+		l_bc++;
+		break;
+
+	// If the value in the register is negative, then set the register to 1, else to 0
+	case asBC_TS:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Set the value to true if it is less than 0
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on valueRegister.
+
+			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
+			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
+			asBYTE val = (regPtr[0] < 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
+			regBptr[0] = val; // The result is stored in the lower byte
+			regBptr[1] = 0;   // Make sure the rest of the register is 0
+			regBptr[2] = 0;
+			regBptr[3] = 0;
+			regBptr[4] = 0;
+			regBptr[5] = 0;
+			regBptr[6] = 0;
+			regBptr[7] = 0;
+		}
+#else
+		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister < 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+#endif
+		l_bc++;
+		break;
+
+	// If the value in the register is not negative, then set the register to 1, else to 0
+	case asBC_TNS:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Set the value to true if it is not less than 0
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on valueRegister.
+
+			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
+			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
+			asBYTE val = (regPtr[0] >= 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
+			regBptr[0] = val; // The result is stored in the lower byte
+			regBptr[1] = 0;   // Make sure the rest of the register is 0
+			regBptr[2] = 0;
+			regBptr[3] = 0;
+			regBptr[4] = 0;
+			regBptr[5] = 0;
+			regBptr[6] = 0;
+			regBptr[7] = 0;
+		}
+#else
+		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister < 0 ? 0 : VALUE_OF_BOOLEAN_TRUE);
+#endif
+		l_bc++;
+		break;
+
+	// If the value in the register is greater than 0, then set the register to 1, else to 0
+	case asBC_TP:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Set the value to true if it is greater than 0
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on valueRegister.
+
+			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
+			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
+			asBYTE val = (regPtr[0] > 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
+			regBptr[0] = val; // The result is stored in the lower byte
+			regBptr[1] = 0;   // Make sure the rest of the register is 0
+			regBptr[2] = 0;
+			regBptr[3] = 0;
+			regBptr[4] = 0;
+			regBptr[5] = 0;
+			regBptr[6] = 0;
+			regBptr[7] = 0;
+		}
+#else
+		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister > 0 ? VALUE_OF_BOOLEAN_TRUE : 0);
+#endif
+		l_bc++;
+		break;
+
+	// If the value in the register is not greater than 0, then set the register to 1, else to 0
+	case asBC_TNP:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Set the value to true if it is not greater than 0
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on valueRegister.
+
+			volatile int    *regPtr  = (int*)&m_regs.valueRegister;
+			volatile asBYTE *regBptr = (asBYTE*)&m_regs.valueRegister;
+			asBYTE val = (regPtr[0] <= 0) ? VALUE_OF_BOOLEAN_TRUE : 0;
+			regBptr[0] = val; // The result is stored in the lower byte
+			regBptr[1] = 0;   // Make sure the rest of the register is 0
+			regBptr[2] = 0;
+			regBptr[3] = 0;
+			regBptr[4] = 0;
+			regBptr[5] = 0;
+			regBptr[6] = 0;
+			regBptr[7] = 0;
+		}
+#else
+		*(int*)&m_regs.valueRegister = (*(int*)&m_regs.valueRegister > 0 ? 0 : VALUE_OF_BOOLEAN_TRUE);
+#endif
+		l_bc++;
+		break;
+
+//--------------------
+// negate value
+
+	// Negate the integer value in the variable
+	case asBC_NEGi:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = asDWORD(-int(*(l_fp - asBC_SWORDARG0(l_bc))));
+		l_bc++;
+		break;
+
+	// Negate the float value in the variable
+	case asBC_NEGf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = -*(float*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	// Negate the double value in the variable
+	case asBC_NEGd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = -*(double*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+//-------------------------
+// Increment value pointed to by address in register
+
+	// Increment the short value pointed to by the register
+	case asBC_INCi16:
+		(**(short**)&m_regs.valueRegister)++;
+		l_bc++;
+		break;
+
+	// Increment the byte value pointed to by the register
+	case asBC_INCi8:
+		(**(char**)&m_regs.valueRegister)++;
+		l_bc++;
+		break;
+
+	// Decrement the short value pointed to by the register
+	case asBC_DECi16:
+		(**(short**)&m_regs.valueRegister)--;
+		l_bc++;
+		break;
+
+	// Decrement the byte value pointed to by the register
+	case asBC_DECi8:
+		(**(char**)&m_regs.valueRegister)--;
+		l_bc++;
+		break;
+
+	// Increment the integer value pointed to by the register
+	case asBC_INCi:
+		++(**(int**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	// Decrement the integer value pointed to by the register
+	case asBC_DECi:
+		--(**(int**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	// Increment the float value pointed to by the register
+	case asBC_INCf:
+		++(**(float**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	// Decrement the float value pointed to by the register
+	case asBC_DECf:
+		--(**(float**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	// Increment the double value pointed to by the register
+	case asBC_INCd:
+		++(**(double**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	// Decrement the double value pointed to by the register
+	case asBC_DECd:
+		--(**(double**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	// Increment the local integer variable
+	case asBC_IncVi:
+		(*(int*)(l_fp - asBC_SWORDARG0(l_bc)))++;
+		l_bc++;
+		break;
+
+	// Decrement the local integer variable
+	case asBC_DecVi:
+		(*(int*)(l_fp - asBC_SWORDARG0(l_bc)))--;
+		l_bc++;
+		break;
+
+//--------------------
+// bits instructions
+
+	// Do a bitwise not on the value in the variable
+	case asBC_BNOT:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = ~*(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	// Do a bitwise and of two variables and store the result in a third variable
+	case asBC_BAND:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) & *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	// Do a bitwise or of two variables and store the result in a third variable
+	case asBC_BOR:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) | *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	// Do a bitwise xor of two variables and store the result in a third variable
+	case asBC_BXOR:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) ^ *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	// Do a logical shift left of two variables and store the result in a third variable
+	case asBC_BSLL:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) << *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	// Do a logical shift right of two variables and store the result in a third variable
+	case asBC_BSRL:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc)) >> *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	// Do an arithmetic shift right of two variables and store the result in a third variable
+	case asBC_BSRA:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(l_fp - asBC_SWORDARG1(l_bc))) >> *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_COPY:
+		{
+			void *d = (void*)*(asPWORD*)l_sp; l_sp += AS_PTR_SIZE;
+			void *s = (void*)*(asPWORD*)l_sp;
+			if( s == 0 || d == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+			memcpy(d, s, asBC_WORDARG0(l_bc)*4);
+
+			// replace the pointer on the stack with the lvalue
+			*(asPWORD**)l_sp = (asPWORD*)d;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_PshC8:
+		l_sp -= 2;
+		*(asQWORD*)l_sp = asBC_QWORDARG(l_bc);
+		l_bc += 3;
+		break;
+
+	case asBC_PshVPtr:
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = *(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_RDSPtr:
+		{
+			// The pointer must not be null
+			asPWORD a = *(asPWORD*)l_sp;
+			if( a == 0 )
+			{
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+			// Pop an address from the stack, read a pointer from that address and push it on the stack
+			*(asPWORD*)l_sp = *(asPWORD*)a;
+		}
+		l_bc++;
+		break;
+
+	//----------------------------
+	// Comparisons
+	case asBC_CMPd:
+		{
+			// Do a comparison of the values, rather than a subtraction
+			// in order to get proper behaviour for infinity values.
+			double dbl1 = *(double*)(l_fp - asBC_SWORDARG0(l_bc));
+			double dbl2 = *(double*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( dbl1 == dbl2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( dbl1 < dbl2 ) *(int*)&m_regs.valueRegister = -1;
+			else                   *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_CMPu:
+		{
+			asDWORD d1 = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+			asDWORD d2 = *(asDWORD*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( d1 == d2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( d1 < d2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_CMPf:
+		{
+			// Do a comparison of the values, rather than a subtraction
+			// in order to get proper behaviour for infinity values.
+			float f1 = *(float*)(l_fp - asBC_SWORDARG0(l_bc));
+			float f2 = *(float*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( f1 == f2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( f1 < f2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_CMPi:
+		{
+			int i1 = *(int*)(l_fp - asBC_SWORDARG0(l_bc));
+			int i2 = *(int*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( i1 == i2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( i1 < i2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	//----------------------------
+	// Comparisons with constant value
+	case asBC_CMPIi:
+		{
+			int i1 = *(int*)(l_fp - asBC_SWORDARG0(l_bc));
+			int i2 = asBC_INTARG(l_bc);
+			if( i1 == i2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( i1 < i2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_CMPIf:
+		{
+			// Do a comparison of the values, rather than a subtraction
+			// in order to get proper behaviour for infinity values.
+			float f1 = *(float*)(l_fp - asBC_SWORDARG0(l_bc));
+			float f2 = asBC_FLOATARG(l_bc);
+			if( f1 == f2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( f1 < f2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_CMPIu:
+		{
+			asDWORD d1 = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+			asDWORD d2 = asBC_DWORDARG(l_bc);
+			if( d1 == d2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( d1 < d2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_JMPP:
+		l_bc += 1 + (*(int*)(l_fp - asBC_SWORDARG0(l_bc)))*2;
+		break;
+
+	case asBC_PopRPtr:
+		*(asPWORD*)&m_regs.valueRegister = *(asPWORD*)l_sp;
+		l_sp += AS_PTR_SIZE;
+		l_bc++;
+		break;
+
+	case asBC_PshRPtr:
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = *(asPWORD*)&m_regs.valueRegister;
+		l_bc++;
+		break;
+
+	case asBC_STR:
+		// TODO: NEWSTRING: Deprecate this instruction
+		asASSERT(false);
+		l_bc++;
+		break;
+
+	case asBC_CALLSYS:
+		{
+			// Get function ID from the argument
+			int i = asBC_INTARG(l_bc);
+
+			// Need to move the values back to the context as the called functions
+			// may use the debug interface to inspect the registers
+			m_regs.programPointer    = l_bc;
+			m_regs.stackPointer      = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			l_sp += CallSystemFunction(i, this);
+
+			// Update the program position after the call so that line number is correct
+			l_bc += 2;
+
+			if( m_regs.doProcessSuspend )
+			{
+				// Should the execution be suspended?
+				if( m_doSuspend )
+				{
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					m_status = asEXECUTION_SUSPENDED;
+					return;
+				}
+				// An exception might have been raised
+				if( m_status != asEXECUTION_ACTIVE )
+				{
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					return;
+				}
+			}
+		}
+		break;
+
+	case asBC_CALLBND:
+		{
+			// TODO: Clean-up: This code is very similar to asBC_CallPtr. Create a shared method for them
+			// Get the function ID from the stack
+			int i = asBC_INTARG(l_bc);
+
+			asASSERT( i >= 0 );
+			asASSERT( i & FUNC_IMPORTED );
+
+			// Need to move the values back to the context
+			m_regs.programPointer    = l_bc;
+			m_regs.stackPointer      = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			int funcId = m_engine->importedFunctions[i & ~FUNC_IMPORTED]->boundFunctionId;
+			if( funcId == -1 )
+			{
+				// Need to update the program pointer for the exception handler
+				m_regs.programPointer += 2;
+
+				// Tell the exception handler to clean up the arguments to this function
+				m_needToCleanupArgs = true;
+				SetInternalException(TXT_UNBOUND_FUNCTION);
+				return;
+			}
+			else
+			{
+				asCScriptFunction *func = m_engine->GetScriptFunction(funcId);
+				if( func->funcType == asFUNC_SCRIPT )
+				{
+					m_regs.programPointer += 2;
+					CallScriptFunction(func);
+				}
+				else if( func->funcType == asFUNC_DELEGATE )
+				{
+					// Push the object pointer on the stack. There is always a reserved space for this so
+					// we don't don't need to worry about overflowing the allocated memory buffer
+					asASSERT( m_regs.stackPointer - AS_PTR_SIZE >= m_stackBlocks[m_stackIndex] );
+					m_regs.stackPointer -= AS_PTR_SIZE;
+					*(asPWORD*)m_regs.stackPointer = asPWORD(func->objForDelegate);
+
+					// Call the delegated method
+					if( func->funcForDelegate->funcType == asFUNC_SYSTEM )
+					{
+						m_regs.stackPointer += CallSystemFunction(func->funcForDelegate->id, this);
+
+						// Update program position after the call so the line number
+						// is correct in case the system function queries it
+						m_regs.programPointer += 2;
+					}
+					else
+					{
+						m_regs.programPointer += 2;
+
+						// TODO: run-time optimize: The true method could be figured out when creating the delegate
+						CallInterfaceMethod(func->funcForDelegate);
+					}
+				}
+				else
+				{
+					asASSERT( func->funcType == asFUNC_SYSTEM );
+
+					m_regs.stackPointer += CallSystemFunction(func->id, this);
+
+					// Update program position after the call so the line number
+					// is correct in case the system function queries it
+					m_regs.programPointer += 2;
+				}
+			}
+
+			// Extract the values from the context again
+			l_bc = m_regs.programPointer;
+			l_sp = m_regs.stackPointer;
+			l_fp = m_regs.stackFramePointer;
+
+			// If status isn't active anymore then we must stop
+			if( m_status != asEXECUTION_ACTIVE )
+				return;
+		}
+		break;
+
+	case asBC_SUSPEND:
+		if( m_regs.doProcessSuspend )
+		{
+			if( m_lineCallback )
+			{
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				CallLineCallback();
+			}
+			if( m_doSuspend )
+			{
+				l_bc++;
+
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				m_status = asEXECUTION_SUSPENDED;
+				return;
+			}
+		}
+
+		l_bc++;
+		break;
+
+	case asBC_ALLOC:
+		{
+			asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
+			int func = asBC_INTARG(l_bc+AS_PTR_SIZE);
+
+			if( objType->flags & asOBJ_SCRIPT_OBJECT )
+			{
+				// Need to move the values back to the context as the construction
+				// of the script object may reuse the context for nested calls.
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Pre-allocate the memory
+				asDWORD *mem = (asDWORD*)m_engine->CallAlloc(objType);
+
+				// Pre-initialize the memory by calling the constructor for asCScriptObject
+				ScriptObject_Construct(objType, (asCScriptObject*)mem);
+
+				// Call the constructor to initalize the memory
+				asCScriptFunction *f = m_engine->scriptFunctions[func];
+
+				asDWORD **a = (asDWORD**)*(asPWORD*)(m_regs.stackPointer + f->GetSpaceNeededForArguments());
+				if( a ) *a = mem;
+
+				// Push the object pointer on the stack
+				m_regs.stackPointer -= AS_PTR_SIZE;
+				*(asPWORD*)m_regs.stackPointer = (asPWORD)mem;
+
+				m_regs.programPointer += 2+AS_PTR_SIZE;
+
+				CallScriptFunction(f);
+
+				// Extract the values from the context again
+				l_bc = m_regs.programPointer;
+				l_sp = m_regs.stackPointer;
+				l_fp = m_regs.stackFramePointer;
+
+				// If status isn't active anymore then we must stop
+				if( m_status != asEXECUTION_ACTIVE )
+					return;
+			}
+			else
+			{
+				// Pre-allocate the memory
+				asDWORD *mem = (asDWORD*)m_engine->CallAlloc(objType);
+
+				if( func )
+				{
+					// Push the object pointer on the stack (it will be popped by the function)
+					l_sp -= AS_PTR_SIZE;
+					*(asPWORD*)l_sp = (asPWORD)mem;
+
+					// Need to move the values back to the context as the called functions
+					// may use the debug interface to inspect the registers
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					l_sp += CallSystemFunction(func, this);
+				}
+
+				// Pop the variable address from the stack
+				asDWORD **a = (asDWORD**)*(asPWORD*)l_sp;
+				l_sp += AS_PTR_SIZE;
+				if( a ) *a = mem;
+
+				l_bc += 2+AS_PTR_SIZE;
+
+				if( m_regs.doProcessSuspend )
+				{
+					// Should the execution be suspended?
+					if( m_doSuspend )
+					{
+						m_regs.programPointer    = l_bc;
+						m_regs.stackPointer      = l_sp;
+						m_regs.stackFramePointer = l_fp;
+
+						m_status = asEXECUTION_SUSPENDED;
+						return;
+					}
+					// An exception might have been raised
+					if( m_status != asEXECUTION_ACTIVE )
+					{
+						m_regs.programPointer    = l_bc;
+						m_regs.stackPointer      = l_sp;
+						m_regs.stackFramePointer = l_fp;
+
+						m_engine->CallFree(mem);
+						*a = 0;
+
+						return;
+					}
+				}
+			}
+		}
+		break;
+
+	case asBC_FREE:
+		{
+			// Get the variable that holds the object handle/reference
+			asPWORD *a = (asPWORD*)asPWORD(l_fp - asBC_SWORDARG0(l_bc));
+			if( *a )
+			{
+				asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
+				asSTypeBehaviour *beh = &objType->beh;
+
+				// Need to move the values back to the context as the called functions
+				// may use the debug interface to inspect the registers
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				if( objType->flags & asOBJ_REF )
+				{
+					asASSERT( (objType->flags & asOBJ_NOCOUNT) || beh->release );
+					if( beh->release )
+						m_engine->CallObjectMethod((void*)(asPWORD)*a, beh->release);
+				}
+				else
+				{
+					if( beh->destruct )
+						m_engine->CallObjectMethod((void*)(asPWORD)*a, beh->destruct);
+					else if( objType->flags & asOBJ_LIST_PATTERN )
+						m_engine->DestroyList((asBYTE*)(asPWORD)*a, objType);
+
+					m_engine->CallFree((void*)(asPWORD)*a);
+				}
+
+				// Clear the variable
+				*a = 0;
+			}
+		}
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+	case asBC_LOADOBJ:
+		{
+			// Move the object pointer from the object variable into the object register
+			void **a = (void**)(l_fp - asBC_SWORDARG0(l_bc));
+			m_regs.objectType = 0;
+			m_regs.objectRegister = *a;
+			*a = 0;
+		}
+		l_bc++;
+		break;
+
+	case asBC_STOREOBJ:
+		// Move the object pointer from the object register to the object variable
+		*(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asPWORD(m_regs.objectRegister);
+		m_regs.objectRegister = 0;
+		l_bc++;
+		break;
+
+	case asBC_GETOBJ:
+		{
+			// Read variable index from location on stack
+			asPWORD *a = (asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
+			asPWORD offset = *a;
+			// Move pointer from variable to the same location on the stack
+			asPWORD *v = (asPWORD*)(l_fp - offset);
+			*a = *v;
+			// Clear variable
+			*v = 0;
+		}
+		l_bc++;
+		break;
+
+	case asBC_REFCPY:
+		{
+			asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
+			asSTypeBehaviour *beh = &objType->beh;
+
+			// Pop address of destination pointer from the stack
+			void **d = (void**)*(asPWORD*)l_sp;
+			l_sp += AS_PTR_SIZE;
+
+			// Read wanted pointer from the stack
+			void *s = (void*)*(asPWORD*)l_sp;
+
+			// Need to move the values back to the context as the called functions
+			// may use the debug interface to inspect the registers
+			m_regs.programPointer    = l_bc;
+			m_regs.stackPointer      = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			// Update ref counter for object types that require it
+			if( !(objType->flags & (asOBJ_NOCOUNT | asOBJ_VALUE)) )
+			{
+				// Release previous object held by destination pointer
+				if( *d != 0 && beh->release )
+					m_engine->CallObjectMethod(*d, beh->release);
+				// Increase ref counter of wanted object
+				if( s != 0 && beh->addref )
+					m_engine->CallObjectMethod(s, beh->addref);
+			}
+
+			// Set the new object in the destination
+			*d = s;
+		}
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+	case asBC_CHKREF:
+		{
+			// Verify if the pointer on the stack is null
+			// This is used when validating a pointer that an operator will work on
+			asPWORD a = *(asPWORD*)l_sp;
+			if( a == 0 )
+			{
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+		}
+		l_bc++;
+		break;
+
+	case asBC_GETOBJREF:
+		{
+			// Get the location on the stack where the reference will be placed
+			asPWORD *a = (asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
+
+			// Replace the variable index with the object handle held in the variable
+			*(asPWORD**)a = *(asPWORD**)(l_fp - *a);
+		}
+		l_bc++;
+		break;
+
+	case asBC_GETREF:
+		{
+			// Get the location on the stack where the reference will be placed
+			asPWORD *a = (asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
+
+			// Replace the variable index with the address of the variable
+			*(asPWORD**)a = (asPWORD*)(l_fp - (int)*a);
+		}
+		l_bc++;
+		break;
+
+	case asBC_PshNull:
+		// Push a null pointer on the stack
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = 0;
+		l_bc++;
+		break;
+
+	case asBC_ClrVPtr:
+		// TODO: runtime optimize: Is this instruction really necessary?
+		//                         CallScriptFunction() can clear the null handles upon entry, just as is done for
+		//                         all other object variables
+		// Clear pointer variable
+		*(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = 0;
+		l_bc++;
+		break;
+
+	case asBC_OBJTYPE:
+		// Push the object type on the stack
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = asBC_PTRARG(l_bc);
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+	case asBC_TYPEID:
+		// Equivalent to PshC4, but kept as separate instruction for bytecode serialization
+		--l_sp;
+		*l_sp = asBC_DWORDARG(l_bc);
+		l_bc += 2;
+		break;
+
+	case asBC_SetV4:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = asBC_DWORDARG(l_bc);
+		l_bc += 2;
+		break;
+
+	case asBC_SetV8:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asBC_QWORDARG(l_bc);
+		l_bc += 3;
+		break;
+
+	case asBC_ADDSi:
+		{
+			// The pointer must not be null
+			asPWORD a = *(asPWORD*)l_sp;
+			if( a == 0 )
+			{
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+			// Add an offset to the pointer
+			*(asPWORD*)l_sp = a + asBC_SWORDARG0(l_bc);
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_CpyVtoV4:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(l_fp - asBC_SWORDARG1(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_CpyVtoV8:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_CpyVtoR4:
+		*(asDWORD*)&m_regs.valueRegister = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_CpyVtoR8:
+		*(asQWORD*)&m_regs.valueRegister = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_CpyVtoG4:
+		*(asDWORD*)asBC_PTRARG(l_bc) = *(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc += 1 + AS_PTR_SIZE;
+		break;
+
+	case asBC_CpyRtoV4:
+		*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asDWORD*)&m_regs.valueRegister;
+		l_bc++;
+		break;
+
+	case asBC_CpyRtoV8:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = m_regs.valueRegister;
+		l_bc++;
+		break;
+
+	case asBC_CpyGtoV4:
+		*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asDWORD*)asBC_PTRARG(l_bc);
+		l_bc += 1 + AS_PTR_SIZE;
+		break;
+
+	case asBC_WRTV1:
+		// The pointer in the register points to a byte, and *(l_fp - offset) too
+		**(asBYTE**)&m_regs.valueRegister = *(asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_WRTV2:
+		// The pointer in the register points to a word, and *(l_fp - offset) too
+		**(asWORD**)&m_regs.valueRegister = *(asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_WRTV4:
+		**(asDWORD**)&m_regs.valueRegister = *(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_WRTV8:
+		**(asQWORD**)&m_regs.valueRegister = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_RDR1:
+		{
+			// The pointer in the register points to a byte, and *(l_fp - offset) will also point to a byte
+			asBYTE *bPtr = (asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
+			bPtr[0] = **(asBYTE**)&m_regs.valueRegister; // read the byte
+			bPtr[1] = 0;                      // 0 the rest of the DWORD
+			bPtr[2] = 0;
+			bPtr[3] = 0;
+		}
+		l_bc++;
+		break;
+
+	case asBC_RDR2:
+		{
+			// The pointer in the register points to a word, and *(l_fp - offset) will also point to a word
+			asWORD *wPtr = (asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+			wPtr[0] = **(asWORD**)&m_regs.valueRegister; // read the word
+			wPtr[1] = 0;                      // 0 the rest of the DWORD
+		}
+		l_bc++;
+		break;
+
+	case asBC_RDR4:
+		*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = **(asDWORD**)&m_regs.valueRegister;
+		l_bc++;
+		break;
+
+	case asBC_RDR8:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = **(asQWORD**)&m_regs.valueRegister;
+		l_bc++;
+		break;
+
+	case asBC_LDG:
+		*(asPWORD*)&m_regs.valueRegister = asBC_PTRARG(l_bc);
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+	case asBC_LDV:
+		*(asDWORD**)&m_regs.valueRegister = (l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_PGA:
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = asBC_PTRARG(l_bc);
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+	case asBC_CmpPtr:
+		{
+			// TODO: runtime optimize: This instruction should really just be an equals, and return true or false.
+			//                         The instruction is only used for is and !is tests anyway.
+			asPWORD p1 = *(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+			asPWORD p2 = *(asPWORD*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( p1 == p2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( p1 < p2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_VAR:
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = (asPWORD)asBC_SWORDARG0(l_bc);
+		l_bc++;
+		break;
+
+	//----------------------------
+	// Type conversions
+	case asBC_iTOf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(int*)(l_fp - asBC_SWORDARG0(l_bc)));
+		l_bc++;
+		break;
+
+	case asBC_fTOi:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(float*)(l_fp - asBC_SWORDARG0(l_bc)));
+		l_bc++;
+		break;
+
+	case asBC_uTOf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(l_fp - asBC_SWORDARG0(l_bc)));
+		l_bc++;
+		break;
+
+	case asBC_fTOu:
+		// We must cast to int first, because on some compilers the cast of a negative float value to uint result in 0
+		*(l_fp - asBC_SWORDARG0(l_bc)) = asUINT(int(*(float*)(l_fp - asBC_SWORDARG0(l_bc))));
+		l_bc++;
+		break;
+
+	case asBC_sbTOi:
+		// *(l_fp - offset) points to a char, and will point to an int afterwards
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(signed char*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_swTOi:
+		// *(l_fp - offset) points to a short, and will point to an int afterwards
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(short*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_ubTOi:
+		// (l_fp - offset) points to a byte, and will point to an int afterwards
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_uwTOi:
+		// *(l_fp - offset) points to a word, and will point to an int afterwards
+		*(l_fp - asBC_SWORDARG0(l_bc)) = *(asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_dTOi:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(double*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_dTOu:
+		// We must cast to int first, because on some compilers the cast of a negative float value to uint result in 0
+		*(l_fp - asBC_SWORDARG0(l_bc)) = asUINT(int(*(double*)(l_fp - asBC_SWORDARG1(l_bc))));
+		l_bc += 2;
+		break;
+
+	case asBC_dTOf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(double*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_iTOd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(int*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_uTOd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_fTOd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(float*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	//------------------------------
+	// Math operations
+	case asBC_ADDi:
+		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) + *(int*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_SUBi:
+		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) - *(int*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_MULi:
+		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) * *(int*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_DIVi:
+		{
+			int divider = *(int*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			else if( divider == -1 )
+			{
+				// Need to check if the value that is divided is 0x80000000
+				// as dividing it with -1 will cause an overflow exception
+				if( *(int*)(l_fp - asBC_SWORDARG1(l_bc)) == int(0x80000000) )
+				{
+					// Need to move the values back to the context
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					// Raise exception
+					SetInternalException(TXT_DIVIDE_OVERFLOW);
+					return;
+				}
+			}
+			*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_MODi:
+		{
+			int divider = *(int*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			else if( divider == -1 )
+			{
+				// Need to check if the value that is divided is 0x80000000
+				// as dividing it with -1 will cause an overflow exception
+				if( *(int*)(l_fp - asBC_SWORDARG1(l_bc)) == int(0x80000000) )
+				{
+					// Need to move the values back to the context
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					// Raise exception
+					SetInternalException(TXT_DIVIDE_OVERFLOW);
+					return;
+				}
+			}
+			*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_ADDf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) + *(float*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_SUBf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) - *(float*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_MULf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) * *(float*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_DIVf:
+		{
+			float divider = *(float*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_MODf:
+		{
+			float divider = *(float*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = fmodf(*(float*)(l_fp - asBC_SWORDARG1(l_bc)), divider);
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_ADDd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) + *(double*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_SUBd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) - *(double*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_MULd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) * *(double*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_DIVd:
+		{
+			double divider = *(double*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+
+			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = *(double*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_MODd:
+		{
+			double divider = *(double*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+
+			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = fmod(*(double*)(l_fp - asBC_SWORDARG1(l_bc)), divider);
+			l_bc += 2;
+		}
+		break;
+
+	//------------------------------
+	// Math operations with constant value
+	case asBC_ADDIi:
+		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) + asBC_INTARG(l_bc+1);
+		l_bc += 3;
+		break;
+
+	case asBC_SUBIi:
+		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) - asBC_INTARG(l_bc+1);
+		l_bc += 3;
+		break;
+
+	case asBC_MULIi:
+		*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = *(int*)(l_fp - asBC_SWORDARG1(l_bc)) * asBC_INTARG(l_bc+1);
+		l_bc += 3;
+		break;
+
+	case asBC_ADDIf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) + asBC_FLOATARG(l_bc+1);
+		l_bc += 3;
+		break;
+
+	case asBC_SUBIf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) - asBC_FLOATARG(l_bc+1);
+		l_bc += 3;
+		break;
+
+	case asBC_MULIf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = *(float*)(l_fp - asBC_SWORDARG1(l_bc)) * asBC_FLOATARG(l_bc+1);
+		l_bc += 3;
+		break;
+
+	//-----------------------------------
+	case asBC_SetG4:
+		*(asDWORD*)asBC_PTRARG(l_bc) = asBC_DWORDARG(l_bc+AS_PTR_SIZE);
+		l_bc += 2 + AS_PTR_SIZE;
+		break;
+
+	case asBC_ChkRefS:
+		{
+			// Verify if the pointer on the stack refers to a non-null value
+			// This is used to validate a reference to a handle
+			asPWORD *a = (asPWORD*)*(asPWORD*)l_sp;
+			if( *a == 0 )
+			{
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+		}
+		l_bc++;
+		break;
+
+	case asBC_ChkNullV:
+		{
+			// Verify if variable (on the stack) is not null
+			asDWORD *a = *(asDWORD**)(l_fp - asBC_SWORDARG0(l_bc));
+			if( a == 0 )
+			{
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+		}
+		l_bc++;
+		break;
+
+	case asBC_CALLINTF:
+		{
+			int i = asBC_INTARG(l_bc);
+			l_bc += 2;
+
+			asASSERT( i >= 0 );
+			asASSERT( (i & FUNC_IMPORTED) == 0 );
+
+			// Need to move the values back to the context
+			m_regs.programPointer    = l_bc;
+			m_regs.stackPointer      = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			CallInterfaceMethod(m_engine->GetScriptFunction(i));
+
+			// Extract the values from the context again
+			l_bc = m_regs.programPointer;
+			l_sp = m_regs.stackPointer;
+			l_fp = m_regs.stackFramePointer;
+
+			// If status isn't active anymore then we must stop
+			if( m_status != asEXECUTION_ACTIVE )
+				return;
+		}
+		break;
+
+	case asBC_iTOb:
+		{
+			// *(l_fp - offset) points to an int, and will point to a byte afterwards
+
+			// We need to use volatile here to tell the compiler not to rearrange
+			// read and write operations during optimizations.
+			volatile asDWORD val  = *(l_fp - asBC_SWORDARG0(l_bc));
+			volatile asBYTE *bPtr = (asBYTE*)(l_fp - asBC_SWORDARG0(l_bc));
+			bPtr[0] = (asBYTE)val; // write the byte
+			bPtr[1] = 0;           // 0 the rest of the DWORD
+			bPtr[2] = 0;
+			bPtr[3] = 0;
+		}
+		l_bc++;
+		break;
+
+	case asBC_iTOw:
+		{
+			// *(l_fp - offset) points to an int, and will point to word afterwards
+
+			// We need to use volatile here to tell the compiler not to rearrange
+			// read and write operations during optimizations.
+			volatile asDWORD val  = *(l_fp - asBC_SWORDARG0(l_bc));
+			volatile asWORD *wPtr = (asWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+			wPtr[0] = (asWORD)val; // write the word
+			wPtr[1] = 0;           // 0 the rest of the DWORD
+		}
+		l_bc++;
+		break;
+
+	case asBC_SetV1:
+		// TODO: This is exactly the same as SetV4. This is a left over from the time
+		//       when the bytecode instructions were more tightly packed. It can now
+		//       be removed. When removing it, make sure the value is correctly converted
+		//       on big-endian CPUs.
+
+		// The byte is already stored correctly in the argument
+		*(l_fp - asBC_SWORDARG0(l_bc)) = asBC_DWORDARG(l_bc);
+		l_bc += 2;
+		break;
+
+	case asBC_SetV2:
+		// TODO: This is exactly the same as SetV4. This is a left over from the time
+		//       when the bytecode instructions were more tightly packed. It can now
+		//       be removed. When removing it, make sure the value is correctly converted
+		//       on big-endian CPUs.
+
+		// The word is already stored correctly in the argument
+		*(l_fp - asBC_SWORDARG0(l_bc)) = asBC_DWORDARG(l_bc);
+		l_bc += 2;
+		break;
+
+	case asBC_Cast:
+		// Cast the handle at the top of the stack to the type in the argument
+		{
+			asDWORD **a = (asDWORD**)*(asPWORD*)l_sp;
+			if( a && *a )
+			{
+				asDWORD typeId = asBC_DWORDARG(l_bc);
+
+				asCScriptObject *obj = (asCScriptObject *)* a;
+				asCObjectType *objType = obj->objType;
+				asCObjectType *to = m_engine->GetObjectTypeFromTypeId(typeId);
+
+				// This instruction can only be used with script classes and interfaces
+				asASSERT( objType->flags & asOBJ_SCRIPT_OBJECT );
+				asASSERT( to->flags & asOBJ_SCRIPT_OBJECT );
+
+				if( objType->Implements(to) || objType->DerivesFrom(to) )
+				{
+					m_regs.objectType = 0;
+					m_regs.objectRegister = obj;
+					obj->AddRef();
+				}
+				else
+				{
+					// The object register should already be null, so there
+					// is no need to clear it if the cast is unsuccessful
+					asASSERT( m_regs.objectRegister == 0 );
+				}
+			}
+			l_sp += AS_PTR_SIZE;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_i64TOi:
+		*(l_fp - asBC_SWORDARG0(l_bc)) = int(*(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_uTOi64:
+		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_iTOi64:
+		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(int*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_fTOi64:
+		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(float*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_dTOi64:
+		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = asINT64(*(double*)(l_fp - asBC_SWORDARG0(l_bc)));
+		l_bc++;
+		break;
+
+	case asBC_fTOu64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asQWORD(asINT64(*(float*)(l_fp - asBC_SWORDARG1(l_bc))));
+		l_bc += 2;
+		break;
+
+	case asBC_dTOu64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = asQWORD(asINT64(*(double*)(l_fp - asBC_SWORDARG0(l_bc))));
+		l_bc++;
+		break;
+
+	case asBC_i64TOf:
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)));
+		l_bc += 2;
+		break;
+
+	case asBC_u64TOf:
+#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC6
+		{
+			// MSVC6 doesn't permit UINT64 to double
+			asINT64 v = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( v < 0 )
+				*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = 18446744073709551615.0f+float(v);
+			else
+				*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(v);
+		}
+#else
+		*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = float(*(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)));
+#endif
+		l_bc += 2;
+		break;
+
+	case asBC_i64TOd:
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)));
+		l_bc++;
+		break;
+
+	case asBC_u64TOd:
+#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC6
+		{
+			// MSVC6 doesn't permit UINT64 to double
+			asINT64 v = *(asINT64*)(l_fp - asBC_SWORDARG0(l_bc));
+			if( v < 0 )
+				*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = 18446744073709551615.0+double(v);
+			else
+				*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(v);
+		}
+#else
+		*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = double(*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)));
+#endif
+		l_bc++;
+		break;
+
+	case asBC_NEGi64:
+		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = -*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_INCi64:
+		++(**(asQWORD**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	case asBC_DECi64:
+		--(**(asQWORD**)&m_regs.valueRegister);
+		l_bc++;
+		break;
+
+	case asBC_BNOT64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = ~*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_ADDi64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) + *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_SUBi64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) - *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_MULi64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) * *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_DIVi64:
+		{
+			asINT64 divider = *(asINT64*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			else if( divider == -1 )
+			{
+				// Need to check if the value that is divided is 1<<63
+				// as dividing it with -1 will cause an overflow exception
+				if( *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) == (asINT64(1)<<63) )
+				{
+					// Need to move the values back to the context
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					// Raise exception
+					SetInternalException(TXT_DIVIDE_OVERFLOW);
+					return;
+				}
+			}
+
+			*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_MODi64:
+		{
+			asINT64 divider = *(asINT64*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			else if( divider == -1 )
+			{
+				// Need to check if the value that is divided is 1<<63
+				// as dividing it with -1 will cause an overflow exception
+				if( *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) == (asINT64(1)<<63) )
+				{
+					// Need to move the values back to the context
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					// Raise exception
+					SetInternalException(TXT_DIVIDE_OVERFLOW);
+					return;
+				}
+			}
+			*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_BAND64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) & *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_BOR64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) | *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_BXOR64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) ^ *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_BSLL64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) << *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_BSRL64:
+		*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) >> *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_BSRA64:
+		*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)) >> *(l_fp - asBC_SWORDARG2(l_bc));
+		l_bc += 2;
+		break;
+
+	case asBC_CMPi64:
+		{
+			asINT64 i1 = *(asINT64*)(l_fp - asBC_SWORDARG0(l_bc));
+			asINT64 i2 = *(asINT64*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( i1 == i2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( i1 < i2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_CMPu64:
+		{
+			asQWORD d1 = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+			asQWORD d2 = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc));
+			if( d1 == d2 )     *(int*)&m_regs.valueRegister =  0;
+			else if( d1 < d2 ) *(int*)&m_regs.valueRegister = -1;
+			else               *(int*)&m_regs.valueRegister =  1;
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_ChkNullS:
+		{
+			// Verify if the pointer on the stack is null
+			// This is used for example when validating handles passed as function arguments
+			asPWORD a = *(asPWORD*)(l_sp + asBC_WORDARG0(l_bc));
+			if( a == 0 )
+			{
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+		}
+		l_bc++;
+		break;
+
+	case asBC_ClrHi:
+#if AS_SIZEOF_BOOL == 1
+		{
+			// Clear the upper bytes, so that trash data don't interfere with boolean operations
+
+			// We need to use volatile here to tell the compiler it cannot
+			// change the order of read and write operations on the pointer.
+
+			volatile asBYTE *ptr = (asBYTE*)&m_regs.valueRegister;
+			ptr[1] = 0;   // The boolean value is stored in the lower byte, so we clear the rest
+			ptr[2] = 0;
+			ptr[3] = 0;
+		}
+#else
+		// We don't have anything to do here
+#endif
+		l_bc++;
+		break;
+
+	case asBC_JitEntry:
+		{
+			if( m_currentFunction->scriptData->jitFunction )
+			{
+				asPWORD jitArg = asBC_PTRARG(l_bc);
+
+				if( jitArg )
+				{
+					// Resume JIT operation
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					(m_currentFunction->scriptData->jitFunction)(&m_regs, jitArg);
+
+					l_bc = m_regs.programPointer;
+					l_sp = m_regs.stackPointer;
+					l_fp = m_regs.stackFramePointer;
+
+					// If status isn't active anymore then we must stop
+					if( m_status != asEXECUTION_ACTIVE )
+						return;
+
+					break;
+				}
+			}
+
+			// Not a JIT resume point, treat as nop
+			l_bc += 1+AS_PTR_SIZE;
+		}
+		break;
+
+	case asBC_CallPtr:
+		{
+			// Get the function pointer from the local variable
+			asCScriptFunction *func = *(asCScriptFunction**)(l_fp - asBC_SWORDARG0(l_bc));
+
+			// Need to move the values back to the context
+			m_regs.programPointer    = l_bc;
+			m_regs.stackPointer      = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			if( func == 0 )
+			{
+				// Need to update the program pointer anyway for the exception handler
+				m_regs.programPointer++;
+
+				// Tell the exception handler to clean up the arguments to this method
+				m_needToCleanupArgs = true;
+
+				// TODO: funcdef: Should we have a different exception string?
+				SetInternalException(TXT_UNBOUND_FUNCTION);
+				return;
+			}
+			else
+			{
+				if (func->funcType == asFUNC_SCRIPT)
+				{
+					m_regs.programPointer++;
+					CallScriptFunction(func);
+				}
+				else if (func->funcType == asFUNC_DELEGATE)
+				{
+					// Push the object pointer on the stack. There is always a reserved space for this so
+					// we don't don't need to worry about overflowing the allocated memory buffer
+					asASSERT(m_regs.stackPointer - AS_PTR_SIZE >= m_stackBlocks[m_stackIndex]);
+					m_regs.stackPointer -= AS_PTR_SIZE;
+					*(asPWORD*)m_regs.stackPointer = asPWORD(func->objForDelegate);
+
+					// Call the delegated method
+					if (func->funcForDelegate->funcType == asFUNC_SYSTEM)
+					{
+						m_regs.stackPointer += CallSystemFunction(func->funcForDelegate->id, this);
+
+						// Update program position after the call so the line number
+						// is correct in case the system function queries it
+						m_regs.programPointer++;
+					}
+					else
+					{
+						m_regs.programPointer++;
+
+						// TODO: run-time optimize: The true method could be figured out when creating the delegate
+						CallInterfaceMethod(func->funcForDelegate);
+					}
+				}
+				else if (func->funcType == asFUNC_SYSTEM)
+				{
+					m_regs.stackPointer += CallSystemFunction(func->id, this);
+
+					// Update program position after the call so the line number
+					// is correct in case the system function queries it
+					m_regs.programPointer++;
+				}
+				else if (func->funcType == asFUNC_IMPORTED)
+				{
+					m_regs.programPointer++;
+					int funcId = m_engine->importedFunctions[func->id & ~FUNC_IMPORTED]->boundFunctionId;
+					if (funcId > 0)
+						CallScriptFunction(m_engine->scriptFunctions[funcId]);
+					else
+					{
+						// Tell the exception handler to clean up the arguments to this method
+						m_needToCleanupArgs = true;
+
+						SetInternalException(TXT_UNBOUND_FUNCTION);
+					}
+				}
+				else
+				{
+					// Should not get here
+					asASSERT(false);
+				}
+			}
+
+			// Extract the values from the context again
+			l_bc = m_regs.programPointer;
+			l_sp = m_regs.stackPointer;
+			l_fp = m_regs.stackFramePointer;
+
+			// If status isn't active anymore then we must stop
+			if( m_status != asEXECUTION_ACTIVE )
+				return;
+		}
+		break;
+
+	case asBC_FuncPtr:
+		// Push the function pointer on the stack. The pointer is in the argument
+		l_sp -= AS_PTR_SIZE;
+		*(asPWORD*)l_sp = asBC_PTRARG(l_bc);
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+	case asBC_LoadThisR:
+		{
+			// PshVPtr 0
+			asPWORD tmp = *(asPWORD*)l_fp;
+
+			// Make sure the pointer is not null
+			if( tmp == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+
+			// ADDSi
+			tmp = tmp + asBC_SWORDARG0(l_bc);
+
+			// PopRPtr
+			*(asPWORD*)&m_regs.valueRegister = tmp;
+			l_bc += 2;
+		}
+		break;
+
+	// Push the qword value of a variable on the stack
+	case asBC_PshV8:
+		l_sp -= 2;
+		*(asQWORD*)l_sp = *(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+		l_bc++;
+		break;
+
+	case asBC_DIVu:
+		{
+			asUINT divider = *(asUINT*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			*(asUINT*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_MODu:
+		{
+			asUINT divider = *(asUINT*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			*(asUINT*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asUINT*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_DIVu64:
+		{
+			asQWORD divider = *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) / divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_MODu64:
+		{
+			asQWORD divider = *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc));
+			if( divider == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_DIVIDE_BY_ZERO);
+				return;
+			}
+			*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = *(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)) % divider;
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_LoadRObjR:
+		{
+			// PshVPtr x
+			asPWORD tmp = *(asPWORD*)(l_fp - asBC_SWORDARG0(l_bc));
+
+			// Make sure the pointer is not null
+			if( tmp == 0 )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+				return;
+			}
+
+			// ADDSi y
+			tmp = tmp + asBC_SWORDARG1(l_bc);
+
+			// PopRPtr
+			*(asPWORD*)&m_regs.valueRegister = tmp;
+			l_bc += 3;
+		}
+		break;
+
+	case asBC_LoadVObjR:
+		{
+			// PSF x
+			asPWORD tmp = (asPWORD)(l_fp - asBC_SWORDARG0(l_bc));
+
+			// ADDSi y
+			tmp = tmp + asBC_SWORDARG1(l_bc);
+
+			// PopRPtr
+			*(asPWORD*)&m_regs.valueRegister = tmp;
+			l_bc += 3;
+		}
+		break;
+
+	case asBC_RefCpyV:
+		// Same as PSF v, REFCPY
+		{
+			asCObjectType *objType = (asCObjectType*)asBC_PTRARG(l_bc);
+			asSTypeBehaviour *beh = &objType->beh;
+
+			// Determine destination from argument
+			void **d = (void**)asPWORD(l_fp - asBC_SWORDARG0(l_bc));
+
+			// Read wanted pointer from the stack
+			void *s = (void*)*(asPWORD*)l_sp;
+
+			// Need to move the values back to the context as the called functions
+			// may use the debug interface to inspect the registers
+			m_regs.programPointer    = l_bc;
+			m_regs.stackPointer      = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			// Update ref counter for object types that require it
+			if( !(objType->flags & (asOBJ_NOCOUNT | asOBJ_VALUE)) )
+			{
+				// Release previous object held by destination pointer
+				if( *d != 0 && beh->release )
+					m_engine->CallObjectMethod(*d, beh->release);
+				// Increase ref counter of wanted object
+				if( s != 0 && beh->addref )
+					m_engine->CallObjectMethod(s, beh->addref);
+			}
+
+			// Set the new object in the destination
+			*d = s;
+		}
+		l_bc += 1+AS_PTR_SIZE;
+		break;
+
+	case asBC_JLowZ:
+		if( *(asBYTE*)&m_regs.valueRegister == 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+
+	case asBC_JLowNZ:
+		if( *(asBYTE*)&m_regs.valueRegister != 0 )
+			l_bc += asBC_INTARG(l_bc) + 2;
+		else
+			l_bc += 2;
+		break;
+
+	case asBC_AllocMem:
+		// Allocate a buffer and store the pointer in the local variable
+		{
+			// TODO: runtime optimize: As the list buffers are going to be short lived, it may be interesting
+			//                         to use a memory pool to avoid reallocating the memory all the time
+
+			asUINT size = asBC_DWORDARG(l_bc);
+			asBYTE **var = (asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
+#ifndef WIP_16BYTE_ALIGN
+			*var = asNEWARRAY(asBYTE, size);
+#else
+			*var = asNEWARRAYALIGNED(asBYTE, size, MAX_TYPE_ALIGNMENT);
+#endif
+
+			// Clear the buffer for the pointers that will be placed in it
+			memset(*var, 0, size);
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_SetListSize:
+		{
+			// Set the size element in the buffer
+			asBYTE *var = *(asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
+			asUINT off  = asBC_DWORDARG(l_bc);
+			asUINT size = asBC_DWORDARG(l_bc+1);
+
+			asASSERT( var );
+
+			*(asUINT*)(var+off) = size;
+		}
+		l_bc += 3;
+		break;
+
+	case asBC_PshListElmnt:
+		{
+			// Push the pointer to the list element on the stack
+			// In essence it does the same as PSF, RDSPtr, ADDSi
+			asBYTE *var = *(asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
+			asUINT off = asBC_DWORDARG(l_bc);
+
+			asASSERT( var );
+
+			l_sp -= AS_PTR_SIZE;
+			*(asPWORD*)l_sp = asPWORD(var+off);
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_SetListType:
+		{
+			// Set the type id in the buffer
+			asBYTE *var = *(asBYTE**)(l_fp - asBC_SWORDARG0(l_bc));
+			asUINT off  = asBC_DWORDARG(l_bc);
+			asUINT type = asBC_DWORDARG(l_bc+1);
+
+			asASSERT( var );
+
+			*(asUINT*)(var+off) = type;
+		}
+		l_bc += 3;
+		break;
+
+	//------------------------------
+	// Exponent operations
+	case asBC_POWi:
+		{
+			bool isOverflow;
+			*(int*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powi(*(int*)(l_fp - asBC_SWORDARG1(l_bc)), *(int*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
+			if( isOverflow )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_POW_OVERFLOW);
+				return;
+			}
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_POWu:
+		{
+			bool isOverflow;
+			*(asDWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powu(*(asDWORD*)(l_fp - asBC_SWORDARG1(l_bc)), *(asDWORD*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
+			if( isOverflow )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_POW_OVERFLOW);
+				return;
+			}
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_POWf:
+		{
+			float r = powf(*(float*)(l_fp - asBC_SWORDARG1(l_bc)), *(float*)(l_fp - asBC_SWORDARG2(l_bc)));
+			*(float*)(l_fp - asBC_SWORDARG0(l_bc)) = r;
+			if( r == float(HUGE_VAL) )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_POW_OVERFLOW);
+				return;
+			}
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_POWd:
+		{
+			double r = pow(*(double*)(l_fp - asBC_SWORDARG1(l_bc)), *(double*)(l_fp - asBC_SWORDARG2(l_bc)));
+			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = r;
+			if( r == HUGE_VAL )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_POW_OVERFLOW);
+				return;
+			}
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_POWdi:
+		{
+			double r = pow(*(double*)(l_fp - asBC_SWORDARG1(l_bc)), *(int*)(l_fp - asBC_SWORDARG2(l_bc)));
+			*(double*)(l_fp - asBC_SWORDARG0(l_bc)) = r;
+			if( r == HUGE_VAL )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_POW_OVERFLOW);
+				return;
+			}
+			l_bc += 2;
+		}
+		break;
+
+	case asBC_POWi64:
+		{
+			bool isOverflow;
+			*(asINT64*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powi64(*(asINT64*)(l_fp - asBC_SWORDARG1(l_bc)), *(asINT64*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
+			if( isOverflow )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_POW_OVERFLOW);
+				return;
+			}
+		}
+		l_bc += 2;
+		break;
+
+	case asBC_POWu64:
+		{
+			bool isOverflow;
+			*(asQWORD*)(l_fp - asBC_SWORDARG0(l_bc)) = as_powu64(*(asQWORD*)(l_fp - asBC_SWORDARG1(l_bc)), *(asQWORD*)(l_fp - asBC_SWORDARG2(l_bc)), isOverflow);
+			if( isOverflow )
+			{
+				// Need to move the values back to the context
+				m_regs.programPointer    = l_bc;
+				m_regs.stackPointer      = l_sp;
+				m_regs.stackFramePointer = l_fp;
+
+				// Raise exception
+				SetInternalException(TXT_POW_OVERFLOW);
+				return;
+			}
+		}
+		l_bc += 2;
+		break;
+	case asBC_Thiscall1:
+		// This instruction is a faster version of asBC_CALLSYS. It is faster because
+		// it has much less runtime overhead with determining the calling convention
+		// and no dynamic code for loading the parameters. The instruction can only
+		// be used to call functions with the following signatures:
+		//
+		//  type &obj::func(int)
+		//  type &obj::func(uint)
+		//  void  obj::func(int)
+		//  void  obj::func(uint)
+		{
+			// Get function ID from the argument
+			int i = asBC_INTARG(l_bc);
+
+			// Need to move the values back to the context as the called functions
+			// may use the debug interface to inspect the registers
+			m_regs.programPointer    = l_bc;
+			m_regs.stackPointer      = l_sp;
+			m_regs.stackFramePointer = l_fp;
+
+			// Pop the thispointer from the stack
+			void *obj = *(void**)l_sp;
+			if (obj == 0)
+				SetInternalException(TXT_NULL_POINTER_ACCESS);
+			else
+			{
+				// Only update the stack pointer if all is OK so the
+				// exception handler can properly clean up the stack
+				l_sp += AS_PTR_SIZE;
+
+				// Pop the int arg from the stack
+				int arg = *(int*)l_sp;
+				l_sp++;
+
+				// Call the method
+				m_callingSystemFunction = m_engine->scriptFunctions[i];
+				void *ptr = 0;
+#ifdef AS_NO_EXCEPTIONS
+				ptr = m_engine->CallObjectMethodRetPtr(obj, arg, m_callingSystemFunction);
+#else
+				// This try/catch block is to catch potential exception that may
+				// be thrown by the registered function.
+				try
+				{
+					ptr = m_engine->CallObjectMethodRetPtr(obj, arg, m_callingSystemFunction);
+				}
+				catch (...)
+				{
+					// Convert the exception to a script exception so the VM can
+					// properly report the error to the application and then clean up
+					HandleAppException();
+				}
+#endif
+				m_callingSystemFunction = 0;
+				*(asPWORD*)&m_regs.valueRegister = (asPWORD)ptr;
+			}
+
+			// Update the program position after the call so that line number is correct
+			l_bc += 2;
+
+			if( m_regs.doProcessSuspend )
+			{
+				// Should the execution be suspended?
+				if( m_doSuspend )
+				{
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					m_status = asEXECUTION_SUSPENDED;
+					return;
+				}
+				// An exception might have been raised
+				if( m_status != asEXECUTION_ACTIVE )
+				{
+					m_regs.programPointer    = l_bc;
+					m_regs.stackPointer      = l_sp;
+					m_regs.stackFramePointer = l_fp;
+
+					return;
+				}
+			}
+		}
+		break;
+
+	// Don't let the optimizer optimize for size,
+	// since it requires extra conditions and jumps
+	case 201: l_bc = (asDWORD*)201; break;
+	case 202: l_bc = (asDWORD*)202; break;
+	case 203: l_bc = (asDWORD*)203; break;
+	case 204: l_bc = (asDWORD*)204; break;
+	case 205: l_bc = (asDWORD*)205; break;
+	case 206: l_bc = (asDWORD*)206; break;
+	case 207: l_bc = (asDWORD*)207; break;
+	case 208: l_bc = (asDWORD*)208; break;
+	case 209: l_bc = (asDWORD*)209; break;
+	case 210: l_bc = (asDWORD*)210; break;
+	case 211: l_bc = (asDWORD*)211; break;
+	case 212: l_bc = (asDWORD*)212; break;
+	case 213: l_bc = (asDWORD*)213; break;
+	case 214: l_bc = (asDWORD*)214; break;
+	case 215: l_bc = (asDWORD*)215; break;
+	case 216: l_bc = (asDWORD*)216; break;
+	case 217: l_bc = (asDWORD*)217; break;
+	case 218: l_bc = (asDWORD*)218; break;
+	case 219: l_bc = (asDWORD*)219; break;
+	case 220: l_bc = (asDWORD*)220; break;
+	case 221: l_bc = (asDWORD*)221; break;
+	case 222: l_bc = (asDWORD*)222; break;
+	case 223: l_bc = (asDWORD*)223; break;
+	case 224: l_bc = (asDWORD*)224; break;
+	case 225: l_bc = (asDWORD*)225; break;
+	case 226: l_bc = (asDWORD*)226; break;
+	case 227: l_bc = (asDWORD*)227; break;
+	case 228: l_bc = (asDWORD*)228; break;
+	case 229: l_bc = (asDWORD*)229; break;
+	case 230: l_bc = (asDWORD*)230; break;
+	case 231: l_bc = (asDWORD*)231; break;
+	case 232: l_bc = (asDWORD*)232; break;
+	case 233: l_bc = (asDWORD*)233; break;
+	case 234: l_bc = (asDWORD*)234; break;
+	case 235: l_bc = (asDWORD*)235; break;
+	case 236: l_bc = (asDWORD*)236; break;
+	case 237: l_bc = (asDWORD*)237; break;
+	case 238: l_bc = (asDWORD*)238; break;
+	case 239: l_bc = (asDWORD*)239; break;
+	case 240: l_bc = (asDWORD*)240; break;
+	case 241: l_bc = (asDWORD*)241; break;
+	case 242: l_bc = (asDWORD*)242; break;
+	case 243: l_bc = (asDWORD*)243; break;
+	case 244: l_bc = (asDWORD*)244; break;
+	case 245: l_bc = (asDWORD*)245; break;
+	case 246: l_bc = (asDWORD*)246; break;
+	case 247: l_bc = (asDWORD*)247; break;
+	case 248: l_bc = (asDWORD*)248; break;
+	case 249: l_bc = (asDWORD*)249; break;
+	case 250: l_bc = (asDWORD*)250; break;
+	case 251: l_bc = (asDWORD*)251; break;
+	case 252: l_bc = (asDWORD*)252; break;
+	case 253: l_bc = (asDWORD*)253; break;
+	case 254: l_bc = (asDWORD*)254; break;
+	case 255: l_bc = (asDWORD*)255; break;
+
+#ifdef AS_DEBUG
+	default:
+		asASSERT(false);
+		SetInternalException(TXT_UNRECOGNIZED_BYTE_CODE);
+#endif
+#if defined(_MSC_VER) && !defined(AS_DEBUG)
+	default:
+		// This Microsoft specific code allows the
+		// compiler to optimize the switch case as
+		// it will know that the code will never
+		// reach this point
+		__assume(0);
+#endif
+	}
+
+#ifdef AS_DEBUG
+		asDWORD instr = *(asBYTE*)old;
+		if( instr != asBC_JMP && instr != asBC_JMPP && (instr < asBC_JZ || instr > asBC_JNP) && instr != asBC_JLowZ && instr != asBC_JLowNZ &&
+			instr != asBC_CALL && instr != asBC_CALLBND && instr != asBC_CALLINTF && instr != asBC_RET && instr != asBC_ALLOC && instr != asBC_CallPtr &&
+			instr != asBC_JitEntry )
+		{
+			asASSERT( (l_bc - old) == asBCTypeSize[asBCInfo[instr].type] );
+		}
+#endif
+	}
+}
+
+// interface
+int asCContext::SetException(const char *descr, bool allowCatch)
+{
+	// Only allow this if we're executing a CALL byte code
+	if( m_callingSystemFunction == 0 ) return asERROR;
+
+	SetInternalException(descr, allowCatch);
+
+	return 0;
+}
+
+void asCContext::SetInternalException(const char *descr, bool allowCatch)
+{
+	if( m_inExceptionHandler )
+	{
+		asASSERT(false); // Shouldn't happen
+		return; // but if it does, at least this will not crash the application
+	}
+
+	m_status                = asEXECUTION_EXCEPTION;
+	m_regs.doProcessSuspend = true;
+
+	m_exceptionString       = descr;
+	m_exceptionFunction     = m_currentFunction->id;
+
+	if( m_currentFunction->scriptData )
+	{
+		m_exceptionLine    = m_currentFunction->GetLineNumber(int(m_regs.programPointer - m_currentFunction->scriptData->byteCode.AddressOf()), &m_exceptionSectionIdx);
+		m_exceptionColumn  = m_exceptionLine >> 20;
+		m_exceptionLine   &= 0xFFFFF;
+	}
+	else
+	{
+		m_exceptionSectionIdx = 0;
+		m_exceptionLine       = 0;
+		m_exceptionColumn     = 0;
+	}
+
+	// Recursively search the callstack for try/catch blocks
+	m_exceptionWillBeCaught = allowCatch && FindExceptionTryCatch();
+
+	if( m_exceptionCallback )
+		CallExceptionCallback();
+}
+
+// interface
+bool asCContext::WillExceptionBeCaught()
+{
+	return m_exceptionWillBeCaught;
+}
+
+void asCContext::CleanReturnObject()
+{
+	if( m_initialFunction && m_initialFunction->DoesReturnOnStack() && m_status == asEXECUTION_FINISHED )
+	{
+		// If function returns on stack we need to call the destructor on the returned object
+		if(CastToObjectType(m_initialFunction->returnType.GetTypeInfo())->beh.destruct )
+			m_engine->CallObjectMethod(GetReturnObject(), CastToObjectType(m_initialFunction->returnType.GetTypeInfo())->beh.destruct);
+
+		return;
+	}
+
+	if( m_regs.objectRegister == 0 ) return;
+
+	asASSERT( m_regs.objectType != 0 );
+
+	if( m_regs.objectType )
+	{
+		if (m_regs.objectType->GetFlags() & asOBJ_FUNCDEF)
+		{
+			// Release the function pointer
+			reinterpret_cast<asIScriptFunction*>(m_regs.objectRegister)->Release();
+			m_regs.objectRegister = 0;
+		}
+		else
+		{
+			// Call the destructor on the object
+			asSTypeBehaviour *beh = &(CastToObjectType(reinterpret_cast<asCTypeInfo*>(m_regs.objectType))->beh);
+			if (m_regs.objectType->GetFlags() & asOBJ_REF)
+			{
+				asASSERT(beh->release || (m_regs.objectType->GetFlags() & asOBJ_NOCOUNT));
+
+				if (beh->release)
+					m_engine->CallObjectMethod(m_regs.objectRegister, beh->release);
+
+				m_regs.objectRegister = 0;
+			}
+			else
+			{
+				if (beh->destruct)
+					m_engine->CallObjectMethod(m_regs.objectRegister, beh->destruct);
+
+				// Free the memory
+				m_engine->CallFree(m_regs.objectRegister);
+				m_regs.objectRegister = 0;
+			}
+		}
+	}
+}
+
+void asCContext::CleanStack(bool catchException)
+{
+	m_inExceptionHandler = true;
+
+	// Run the clean up code and move to catch block
+	bool caught = CleanStackFrame(catchException);
+	if( !caught )
+	{
+		// Set the status to exception so that the stack unwind is done correctly.
+		// This shouldn't be done for the current function, which is why we only
+		// do this after the first CleanStackFrame() is done.
+		m_status = asEXECUTION_EXCEPTION;
+
+		while (!caught && m_callStack.GetLength() > 0)
+		{
+			// Only clean up until the top most marker for a nested call
+			asPWORD *s = m_callStack.AddressOf() + m_callStack.GetLength() - CALLSTACK_FRAME_SIZE;
+			if (s[0] == 0)
+				break;
+
+			PopCallState();
+
+			caught = CleanStackFrame(catchException);
+		}
+	}
+
+	// If the exception was caught, then move the status to
+	// active as is now possible to resume the execution
+	if (caught)
+		m_status = asEXECUTION_ACTIVE;
+
+	m_inExceptionHandler = false;
+}
+
+// Interface
+bool asCContext::IsVarInScope(asUINT varIndex, asUINT stackLevel)
+{
+	// Don't return anything if there is no bytecode, e.g. before calling Execute()
+	if( m_regs.programPointer == 0 ) return false;
+
+	if( stackLevel >= GetCallstackSize() ) return false;
+
+	asCScriptFunction *func;
+	asUINT pos;
+
+	if( stackLevel == 0 )
+	{
+		func = m_currentFunction;
+		if( func->scriptData == 0 ) return false;
+		pos = asUINT(m_regs.programPointer - func->scriptData->byteCode.AddressOf());
+	}
+	else
+	{
+		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
+		func = (asCScriptFunction*)s[1];
+		if( func->scriptData == 0 ) return false;
+		pos = asUINT((asDWORD*)s[2] - func->scriptData->byteCode.AddressOf());
+	}
+
+	// First determine if the program position is after the variable declaration
+	if( func->scriptData->variables.GetLength() <= varIndex ) return false;
+	if( func->scriptData->variables[varIndex]->declaredAtProgramPos > pos ) return false;
+
+	asUINT declaredAt = func->scriptData->variables[varIndex]->declaredAtProgramPos;
+
+	// If the program position is after the variable declaration it is necessary
+	// determine if the program position is still inside the statement block where
+	// the variable was declared.
+	for( int n = 0; n < (int)func->scriptData->objVariableInfo.GetLength(); n++ )
+	{
+		if( func->scriptData->objVariableInfo[n].programPos >= declaredAt )
+		{
+			// If the current block ends between the declaredAt and current
+			// program position, then we know the variable is no longer visible
+			int level = 0;
+			for( ; n < (int)func->scriptData->objVariableInfo.GetLength(); n++ )
+			{
+				if( func->scriptData->objVariableInfo[n].programPos > pos )
+					break;
+
+				if( func->scriptData->objVariableInfo[n].option == asBLOCK_BEGIN ) level++;
+				if( func->scriptData->objVariableInfo[n].option == asBLOCK_END && --level < 0 )
+					return false;
+			}
+
+			break;
+		}
+	}
+
+	// Variable is visible
+	return true;
+}
+
+// Internal
+void asCContext::DetermineLiveObjects(asCArray<int> &liveObjects, asUINT stackLevel)
+{
+	asASSERT( stackLevel < GetCallstackSize() );
+
+	asCScriptFunction *func;
+	asUINT pos;
+
+	if( stackLevel == 0 )
+	{
+		func = m_currentFunction;
+		if( func->scriptData == 0 )
+			return;
+
+		pos = asUINT(m_regs.programPointer - func->scriptData->byteCode.AddressOf());
+
+		if( m_status == asEXECUTION_EXCEPTION )
+		{
+			// Don't consider the last instruction as executed, as it failed with an exception
+			// It's not actually necessary to decrease the exact size of the instruction. Just
+			// before the current position is enough to disconsider it.
+			pos--;
+		}
+	}
+	else
+	{
+		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
+		func = (asCScriptFunction*)s[1];
+		if( func->scriptData == 0 )
+			return;
+
+		pos = asUINT((asDWORD*)s[2] - func->scriptData->byteCode.AddressOf());
+
+		// Don't consider the last instruction as executed, as the function that was called by it
+		// is still being executed. If we consider it as executed already, then a value object
+		// returned by value would be considered alive, which it is not.
+		pos--;
+	}
+
+	// Determine which object variables that are really live ones
+	liveObjects.SetLength(func->scriptData->variables.GetLength());
+	memset(liveObjects.AddressOf(), 0, sizeof(int)*liveObjects.GetLength());
+	for( int n = 0; n < (int)func->scriptData->objVariableInfo.GetLength(); n++ )
+	{
+		// Find the first variable info with a larger position than the current
+		// As the variable info are always placed on the instruction right after the
+		// one that initialized or freed the object, the current position needs to be
+		// considered as valid.
+		if( func->scriptData->objVariableInfo[n].programPos > pos )
+		{
+			// We've determined how far the execution ran, now determine which variables are alive
+			for( --n; n >= 0; n-- )
+			{
+				switch( func->scriptData->objVariableInfo[n].option )
+				{
+				case asOBJ_UNINIT: // Object was destroyed
+					{
+						// TODO: optimize: This should have been done by the compiler already
+						// Which variable is this? Use IsVarInScope to get the correct variable in case there are multiple variables sharing the same offset
+						asUINT var = asUINT(-1);
+						for (asUINT v = 0; v < func->scriptData->variables.GetLength(); v++)
+							if (func->scriptData->variables[v]->stackOffset == func->scriptData->objVariableInfo[n].variableOffset && 
+								IsVarInScope(v, stackLevel) )
+							{
+								var = v;
+								break;
+							}
+						asASSERT(var != asUINT(-1));
+						liveObjects[var] -= 1;
+					}
+					break;
+				case asOBJ_INIT: // Object was created
+					{
+						// Which variable is this? Use IsVarInScope to get the correct variable in case there are multiple variables sharing the same offset
+						asUINT var = asUINT(-1);
+						for (asUINT v = 0; v < func->scriptData->variables.GetLength(); v++)
+							if (func->scriptData->variables[v]->stackOffset == func->scriptData->objVariableInfo[n].variableOffset &&
+								IsVarInScope(v, stackLevel) )
+							{
+								var = v;
+								break;
+							}
+						asASSERT(var != asUINT(-1));
+						liveObjects[var] += 1;
+					}
+					break;
+				case asBLOCK_BEGIN: // Start block
+					// We should ignore start blocks, since it just means the
+					// program was within the block when the exception occurred
+					break;
+				case asBLOCK_END: // End block
+					// We need to skip the entire block, as the objects created
+					// and destroyed inside this block are already out of scope
+					{
+						int nested = 1;
+						while( nested > 0 )
+						{
+							int option = func->scriptData->objVariableInfo[--n].option;
+							if( option == 3 )
+								nested++;
+							if( option == 2 )
+								nested--;
+						}
+					}
+					break;
+				case asOBJ_VARDECL: // A variable was declared
+					// We don't really care about the variable declarations at this moment
+					break;
+				}
+			}
+
+			// We're done with the investigation
+			break;
+		}
+	}
+}
+
+void asCContext::CleanArgsOnStack()
+{
+	if( !m_needToCleanupArgs )
+		return;
+
+	asASSERT( m_currentFunction->scriptData );
+
+	// Find the instruction just before the current program pointer
+	asDWORD *instr = m_currentFunction->scriptData->byteCode.AddressOf();
+	asDWORD *prevInstr = 0;
+	while( instr < m_regs.programPointer )
+	{
+		prevInstr = instr;
+		instr += asBCTypeSize[asBCInfo[*(asBYTE*)(instr)].type];
+	}
+
+	// Determine what function was being called
+	asCScriptFunction *func = 0;
+	asBYTE bc = *(asBYTE*)prevInstr;
+	if( bc == asBC_CALL || bc == asBC_CALLSYS || bc == asBC_CALLINTF )
+	{
+		int funcId = asBC_INTARG(prevInstr);
+		func = m_engine->scriptFunctions[funcId];
+	}
+	else if( bc == asBC_CALLBND )
+	{
+		int funcId = asBC_INTARG(prevInstr);
+		func = m_engine->importedFunctions[funcId & ~FUNC_IMPORTED]->importedFunctionSignature;
+	}
+	else if( bc == asBC_CallPtr )
+	{
+		asUINT v;
+		int var = asBC_SWORDARG0(prevInstr);
+
+		// Find the funcdef from the local variable
+		for( v = 0; v < m_currentFunction->scriptData->variables.GetLength(); v++ )
+			if( m_currentFunction->scriptData->variables[v]->stackOffset == var )
+			{
+				asASSERT(m_currentFunction->scriptData->variables[v]->type.GetTypeInfo());
+				func = CastToFuncdefType(m_currentFunction->scriptData->variables[v]->type.GetTypeInfo())->funcdef;
+				break;
+			}
+
+		if( func == 0 )
+		{
+			// Look in parameters
+			int paramPos = 0;
+			if( m_currentFunction->objectType )
+				paramPos -= AS_PTR_SIZE;
+			if( m_currentFunction->DoesReturnOnStack() )
+				paramPos -= AS_PTR_SIZE;
+			for( v = 0; v < m_currentFunction->parameterTypes.GetLength(); v++ )
+			{
+				if( var == paramPos )
+				{
+					if (m_currentFunction->parameterTypes[v].IsFuncdef())
+						func = CastToFuncdefType(m_currentFunction->parameterTypes[v].GetTypeInfo())->funcdef;
+					break;
+				}
+				paramPos -= m_currentFunction->parameterTypes[v].GetSizeOnStackDWords();
+			}
+		}
+	}
+	else
+		asASSERT( false );
+
+	asASSERT( func );
+
+	// Clean parameters
+	int offset = 0;
+	if( func->objectType )
+		offset += AS_PTR_SIZE;
+	if( func->DoesReturnOnStack() )
+		offset += AS_PTR_SIZE;
+	for( asUINT n = 0; n < func->parameterTypes.GetLength(); n++ )
+	{
+		if( (func->parameterTypes[n].IsObject() || func->parameterTypes[n].IsFuncdef()) && !func->parameterTypes[n].IsReference() )
+		{
+			// TODO: cleanup: This logic is repeated twice in CleanStackFrame too. Should create a common function to share the code
+			if( *(asPWORD*)&m_regs.stackPointer[offset] )
+			{
+				// Call the object's destructor
+				asSTypeBehaviour *beh = func->parameterTypes[n].GetBehaviour();
+				if (func->parameterTypes[n].GetTypeInfo()->flags & asOBJ_FUNCDEF)
+				{
+					(*(asCScriptFunction**)&m_regs.stackPointer[offset])->Release();
+				}
+				else if( func->parameterTypes[n].GetTypeInfo()->flags & asOBJ_REF )
+				{
+					asASSERT( (func->parameterTypes[n].GetTypeInfo()->flags & asOBJ_NOCOUNT) || beh->release );
+
+					if( beh->release )
+						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackPointer[offset], beh->release);
+				}
+				else
+				{
+					if( beh->destruct )
+						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackPointer[offset], beh->destruct);
+
+					// Free the memory
+					m_engine->CallFree((void*)*(asPWORD*)&m_regs.stackPointer[offset]);
+				}
+				*(asPWORD*)&m_regs.stackPointer[offset] = 0;
+			}
+		}
+
+		offset += func->parameterTypes[n].GetSizeOnStackDWords();
+	}
+
+	m_needToCleanupArgs = false;
+}
+
+bool asCContext::FindExceptionTryCatch()
+{
+	// Check each of the script functions on the callstack to see if
+	// the current program position is within a try/catch block
+	if (m_currentFunction && m_currentFunction->scriptData)
+	{
+		asUINT currPos = asUINT(m_regs.programPointer - m_currentFunction->scriptData->byteCode.AddressOf());
+		for (asUINT n = 0; n < m_currentFunction->scriptData->tryCatchInfo.GetLength(); n++)
+		{
+			if (currPos >= m_currentFunction->scriptData->tryCatchInfo[n].tryPos &&
+				currPos < m_currentFunction->scriptData->tryCatchInfo[n].catchPos)
+				return true;
+		}
+	}
+
+	int stackSize = GetCallstackSize();
+	for (int level = 1; level < stackSize; level++)
+	{
+		asPWORD *s = m_callStack.AddressOf() + (stackSize - level - 1)*CALLSTACK_FRAME_SIZE;
+		asCScriptFunction *func = (asCScriptFunction*)s[1];
+		if (func && func->scriptData)
+		{
+			asUINT currPos = asUINT((asDWORD*)s[2] - func->scriptData->byteCode.AddressOf());
+			for (asUINT n = 0; n < func->scriptData->tryCatchInfo.GetLength(); n++)
+			{
+				if (currPos >= func->scriptData->tryCatchInfo[n].tryPos &&
+					currPos < func->scriptData->tryCatchInfo[n].catchPos)
+					return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+bool asCContext::CleanStackFrame(bool catchException)
+{
+	bool exceptionCaught = false;
+	asSTryCatchInfo *tryCatchInfo = 0;
+
+	// Clean object variables on the stack
+	// If the stack memory is not allocated or the program pointer
+	// is not set, then there is nothing to clean up on the stack frame
+	if( !m_isStackMemoryNotAllocated && m_regs.programPointer )
+	{
+		// If the exception occurred while calling a function it is necessary
+		// to clean up the arguments that were put on the stack.
+		CleanArgsOnStack();
+
+		// Check if this function will catch the exception
+		// Try blocks can be nested, so use the innermost block
+		asASSERT(m_currentFunction->scriptData);
+		if (catchException && m_currentFunction->scriptData)
+		{
+			asUINT currPos = asUINT(m_regs.programPointer - m_currentFunction->scriptData->byteCode.AddressOf());
+
+			for (asUINT n = 0; n < m_currentFunction->scriptData->tryCatchInfo.GetLength(); n++)
+			{
+				if (currPos >= m_currentFunction->scriptData->tryCatchInfo[n].tryPos &&
+					currPos < m_currentFunction->scriptData->tryCatchInfo[n].catchPos)
+				{
+					tryCatchInfo = &m_currentFunction->scriptData->tryCatchInfo[n];
+					exceptionCaught = true;
+				}
+				if (currPos < m_currentFunction->scriptData->tryCatchInfo[n].tryPos)
+					break;
+			}
+		}
+
+		// Restore the stack pointer
+		if( !exceptionCaught )
+			m_regs.stackPointer += m_currentFunction->scriptData->variableSpace;
+
+		// Determine which object variables that are really live ones
+		asCArray<int> liveObjects;
+		DetermineLiveObjects(liveObjects, 0);
+
+		for (asUINT n = 0; n < m_currentFunction->scriptData->variables.GetLength(); n++)
+		{
+			int pos = m_currentFunction->scriptData->variables[n]->stackOffset;
+
+			// If the exception was caught, then only clean up objects within the try block
+			if (exceptionCaught)
+			{
+				// Find out where the variable was declared, and skip cleaning of those that were declared before the try catch
+				// Multiple variables in different scopes may occupy the same slot on the stack so it is necessary to search
+				// the entire list to determine which variable occupies the slot now.
+				int skipClean = 0;
+				for( asUINT p = 0; p < m_currentFunction->scriptData->objVariableInfo.GetLength(); p++ )
+				{
+					asSObjectVariableInfo &info = m_currentFunction->scriptData->objVariableInfo[p];
+					if (info.variableOffset == pos &&
+						info.option == asOBJ_VARDECL )
+					{
+						asUINT progPos = info.programPos;
+						if (progPos < tryCatchInfo->tryPos )
+						{
+							if( skipClean >= 0 )
+								skipClean = 1;
+							break;
+						}
+						else if( progPos < tryCatchInfo->catchPos )
+						{
+							skipClean = -1;
+							break;
+						}
+					}
+				}
+
+				// Skip only variables that have been declared before the try block. Variables declared
+				// within the try block and variables whose declaration was not identified (temporary objects)
+				// will not be skipped.
+				// TODO: What if a temporary variable reuses a slot from a declared variable that is no longer in scope?
+				if (skipClean > 0)
+					continue;
+			}
+
+			if( m_currentFunction->scriptData->variables[n]->onHeap )
+			{
+				// Check if the pointer is initialized
+				if( *(asPWORD*)&m_regs.stackFramePointer[-pos] )
+				{
+					// Skip pointers with unknown types, as this is either a null pointer or just a reference that is not owned by function
+					if( m_currentFunction->scriptData->variables[n]->type.GetTypeInfo() && !m_currentFunction->scriptData->variables[n]->type.IsReference() )
+					{
+						// Call the object's destructor
+						if( m_currentFunction->scriptData->variables[n]->type.GetTypeInfo()->flags & asOBJ_FUNCDEF )
+						{
+							(*(asCScriptFunction**)&m_regs.stackFramePointer[-pos])->Release();
+						}
+						else if (m_currentFunction->scriptData->variables[n]->type.GetTypeInfo()->flags & asOBJ_REF)
+						{
+							asSTypeBehaviour* beh = &CastToObjectType(m_currentFunction->scriptData->variables[n]->type.GetTypeInfo())->beh;
+							asASSERT((m_currentFunction->scriptData->variables[n]->type.GetTypeInfo()->flags & asOBJ_NOCOUNT) || beh->release);
+							if( beh->release )
+								m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[-pos], beh->release);
+						}
+						else
+						{
+							asSTypeBehaviour* beh = &CastToObjectType(m_currentFunction->scriptData->variables[n]->type.GetTypeInfo())->beh;
+							if (beh->destruct)
+								m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[-pos], beh->destruct);
+							else if (m_currentFunction->scriptData->variables[n]->type.GetTypeInfo()->flags & asOBJ_LIST_PATTERN)
+								m_engine->DestroyList((asBYTE*)*(asPWORD*)&m_regs.stackFramePointer[-pos], CastToObjectType(m_currentFunction->scriptData->variables[n]->type.GetTypeInfo()));
+
+							// Free the memory
+							m_engine->CallFree((void*)*(asPWORD*)&m_regs.stackFramePointer[-pos]);
+						}
+					}
+					*(asPWORD*)&m_regs.stackFramePointer[-pos] = 0;
+				}
+			}
+			else
+			{
+				// Only destroy the object if it is truly alive
+				if( liveObjects[n] > 0 )
+				{
+					asASSERT(m_currentFunction->scriptData->variables[n]->type.GetTypeInfo() && m_currentFunction->scriptData->variables[n]->type.GetTypeInfo()->GetFlags() & asOBJ_VALUE);
+
+					asSTypeBehaviour* beh = &CastToObjectType(m_currentFunction->scriptData->variables[n]->type.GetTypeInfo())->beh;
+					if( beh->destruct )
+						m_engine->CallObjectMethod((void*)(asPWORD*)&m_regs.stackFramePointer[-pos], beh->destruct);
+				}
+			}
+		}
+	}
+	else
+		m_isStackMemoryNotAllocated = false;
+
+	// If the exception was caught then move the program position to the catch block then stop the unwinding
+	if (exceptionCaught)
+	{
+		m_regs.programPointer = m_currentFunction->scriptData->byteCode.AddressOf() + tryCatchInfo->catchPos;
+		return exceptionCaught;
+	}
+
+	// Functions that do not own the object and parameters shouldn't do any clean up
+	if( m_currentFunction == 0 || m_currentFunction->dontCleanUpOnException )
+		return exceptionCaught;
+
+	// Clean object and parameters
+	int offset = 0;
+	if( m_currentFunction->objectType )
+		offset += AS_PTR_SIZE;
+	if( m_currentFunction->DoesReturnOnStack() )
+		offset += AS_PTR_SIZE;
+	for( asUINT n = 0; n < m_currentFunction->parameterTypes.GetLength(); n++ )
+	{
+		if( (m_currentFunction->parameterTypes[n].IsObject() ||m_currentFunction->parameterTypes[n].IsFuncdef()) && !m_currentFunction->parameterTypes[n].IsReference() )
+		{
+			if( *(asPWORD*)&m_regs.stackFramePointer[offset] )
+			{
+				// Call the object's destructor
+				asSTypeBehaviour *beh = m_currentFunction->parameterTypes[n].GetBehaviour();
+				if (m_currentFunction->parameterTypes[n].GetTypeInfo()->flags & asOBJ_FUNCDEF)
+				{
+					(*(asCScriptFunction**)&m_regs.stackFramePointer[offset])->Release();
+				}
+				else if( m_currentFunction->parameterTypes[n].GetTypeInfo()->flags & asOBJ_REF )
+				{
+					asASSERT( (m_currentFunction->parameterTypes[n].GetTypeInfo()->flags & asOBJ_NOCOUNT) || beh->release );
+
+					if( beh->release )
+						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[offset], beh->release);
+				}
+				else
+				{
+					if( beh->destruct )
+						m_engine->CallObjectMethod((void*)*(asPWORD*)&m_regs.stackFramePointer[offset], beh->destruct);
+
+					// Free the memory
+					m_engine->CallFree((void*)*(asPWORD*)&m_regs.stackFramePointer[offset]);
+				}
+				*(asPWORD*)&m_regs.stackFramePointer[offset] = 0;
+			}
+		}
+
+		offset += m_currentFunction->parameterTypes[n].GetSizeOnStackDWords();
+	}
+
+	return exceptionCaught;
+}
+
+// interface
+int asCContext::GetExceptionLineNumber(int *column, const char **sectionName)
+{
+	// Return the last exception even if the context is no longer in the exception state
+	// if( GetState() != asEXECUTION_EXCEPTION ) return asERROR;
+
+	if( column ) *column = m_exceptionColumn;
+
+	if( sectionName )
+	{
+		// The section index can be -1 if the exception was raised in a generated function, e.g. $fact for templates
+		if( m_exceptionSectionIdx >= 0 )
+			*sectionName = m_engine->scriptSectionNames[m_exceptionSectionIdx]->AddressOf();
+		else
+			*sectionName = 0;
+	}
+
+	return m_exceptionLine;
+}
+
+// interface
+asIScriptFunction *asCContext::GetExceptionFunction()
+{
+	// Return the last exception even if the context is no longer in the exception state
+	// if( GetState() != asEXECUTION_EXCEPTION ) return 0;
+
+	return m_engine->scriptFunctions[m_exceptionFunction];
+}
+
+// interface
+const char *asCContext::GetExceptionString()
+{
+	// Return the last exception even if the context is no longer in the exception state
+	// if( GetState() != asEXECUTION_EXCEPTION ) return 0;
+
+	return m_exceptionString.AddressOf();
+}
+
+// interface
+asEContextState asCContext::GetState() const
+{
+	return m_status;
+}
+
+// interface
+int asCContext::SetLineCallback(asSFuncPtr callback, void *obj, int callConv)
+{
+	// First turn off the line callback to avoid a second thread
+	// attempting to call it while the new one is still being set
+	m_lineCallback = false;
+
+	m_lineCallbackObj = obj;
+	bool isObj = false;
+	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
+	{
+		m_regs.doProcessSuspend = m_doSuspend;
+		return asNOT_SUPPORTED;
+	}
+	if( (unsigned)callConv >= asCALL_THISCALL )
+	{
+		isObj = true;
+		if( obj == 0 )
+		{
+			m_regs.doProcessSuspend = m_doSuspend;
+			return asINVALID_ARG;
+		}
+	}
+
+	int r = DetectCallingConvention(isObj, callback, callConv, 0, &m_lineCallbackFunc);
+
+	// Turn on the line callback after setting both the function pointer and object pointer
+	if( r >= 0 ) m_lineCallback = true;
+
+	// The BC_SUSPEND instruction should be processed if either line
+	// callback is set or if the application has requested a suspension
+	m_regs.doProcessSuspend = m_doSuspend || m_lineCallback;
+
+	return r;
+}
+
+void asCContext::CallLineCallback()
+{
+	if( m_lineCallbackFunc.callConv < ICC_THISCALL )
+		m_engine->CallGlobalFunction(this, m_lineCallbackObj, &m_lineCallbackFunc, 0);
+	else
+		m_engine->CallObjectMethod(m_lineCallbackObj, this, &m_lineCallbackFunc, 0);
+}
+
+// interface
+int asCContext::SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv)
+{
+	m_exceptionCallback = true;
+	m_exceptionCallbackObj = obj;
+	bool isObj = false;
+	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
+		return asNOT_SUPPORTED;
+	if( (unsigned)callConv >= asCALL_THISCALL )
+	{
+		isObj = true;
+		if( obj == 0 )
+		{
+			m_exceptionCallback = false;
+			return asINVALID_ARG;
+		}
+	}
+	int r = DetectCallingConvention(isObj, callback, callConv, 0, &m_exceptionCallbackFunc);
+	if( r < 0 ) m_exceptionCallback = false;
+	return r;
+}
+
+void asCContext::CallExceptionCallback()
+{
+	if( m_exceptionCallbackFunc.callConv < ICC_THISCALL )
+		m_engine->CallGlobalFunction(this, m_exceptionCallbackObj, &m_exceptionCallbackFunc, 0);
+	else
+		m_engine->CallObjectMethod(m_exceptionCallbackObj, this, &m_exceptionCallbackFunc, 0);
+}
+
+#ifndef AS_NO_EXCEPTIONS
+// internal
+void asCContext::HandleAppException()
+{
+	// This method is called from within a catch(...) block
+	if (m_engine->translateExceptionCallback)
+	{
+		// Allow the application to translate the application exception to a proper exception string
+		if (m_engine->translateExceptionCallbackFunc.callConv < ICC_THISCALL)
+			m_engine->CallGlobalFunction(this, m_engine->translateExceptionCallbackObj, &m_engine->translateExceptionCallbackFunc, 0);
+		else
+			m_engine->CallObjectMethod(m_engine->translateExceptionCallbackObj, this, &m_engine->translateExceptionCallbackFunc, 0);
+	}
+
+	// Make sure an exception is set even if the application decides not to do any specific translation
+	if( m_status != asEXECUTION_EXCEPTION )
+		SetException(TXT_EXCEPTION_CAUGHT);
+}
+#endif
+
+// interface
+void asCContext::ClearLineCallback()
+{
+	m_lineCallback = false;
+	m_regs.doProcessSuspend = m_doSuspend;
+}
+
+// interface
+void asCContext::ClearExceptionCallback()
+{
+	m_exceptionCallback = false;
+}
+
+int asCContext::CallGeneric(asCScriptFunction *descr)
+{
+	asSSystemFunctionInterface *sysFunc = descr->sysFuncIntf;
+	void (*func)(asIScriptGeneric*) = (void (*)(asIScriptGeneric*))sysFunc->func;
+	int popSize = sysFunc->paramSize;
+	asDWORD *args = m_regs.stackPointer;
+
+	// Verify the object pointer if it is a class method
+	void *currentObject = 0;
+	asASSERT( sysFunc->callConv == ICC_GENERIC_FUNC || sysFunc->callConv == ICC_GENERIC_METHOD );
+	if( sysFunc->callConv == ICC_GENERIC_METHOD )
+	{
+		// The object pointer should be popped from the context stack
+		popSize += AS_PTR_SIZE;
+
+		// Check for null pointer
+		currentObject = (void*)*(asPWORD*)(args);
+		if( currentObject == 0 )
+		{
+			SetInternalException(TXT_NULL_POINTER_ACCESS);
+			return 0;
+		}
+
+		asASSERT( sysFunc->baseOffset == 0 );
+
+		// Skip object pointer
+		args += AS_PTR_SIZE;
+	}
+
+	if( descr->DoesReturnOnStack() )
+	{
+		// Skip the address where the return value will be stored
+		args += AS_PTR_SIZE;
+		popSize += AS_PTR_SIZE;
+	}
+
+	asCGeneric gen(m_engine, descr, currentObject, args);
+
+	m_callingSystemFunction = descr;
+#ifdef AS_NO_EXCEPTIONS
+	func(&gen);
+#else
+	// This try/catch block is to catch potential exception that may
+	// be thrown by the registered function.
+	try
+	{
+		func(&gen);
+	}
+	catch (...)
+	{
+		// Convert the exception to a script exception so the VM can
+		// properly report the error to the application and then clean up
+		HandleAppException();
+	}
+#endif
+	m_callingSystemFunction = 0;
+
+	m_regs.valueRegister = gen.returnVal;
+	m_regs.objectRegister = gen.objectRegister;
+	m_regs.objectType = descr->returnType.GetTypeInfo();
+
+	// Increase the returned handle if the function has been declared with autohandles
+	// and the engine is not set to use the old mode for the generic calling convention
+	if (sysFunc->returnAutoHandle && m_engine->ep.genericCallMode == 1 && m_regs.objectRegister)
+	{
+		asASSERT(!(descr->returnType.GetTypeInfo()->flags & asOBJ_NOCOUNT));
+		m_engine->CallObjectMethod(m_regs.objectRegister, CastToObjectType(descr->returnType.GetTypeInfo())->beh.addref);
+	}
+
+	// Clean up arguments
+	const asUINT cleanCount = sysFunc->cleanArgs.GetLength();
+	if( cleanCount )
+	{
+		asSSystemFunctionInterface::SClean *clean = sysFunc->cleanArgs.AddressOf();
+		for( asUINT n = 0; n < cleanCount; n++, clean++ )
+		{
+			void **addr = (void**)&args[clean->off];
+			if( clean->op == 0 )
+			{
+				if( *addr != 0 )
+				{
+					m_engine->CallObjectMethod(*addr, clean->ot->beh.release);
+					*addr = 0;
+				}
+			}
+			else
+			{
+				asASSERT( clean->op == 1 || clean->op == 2 );
+				asASSERT( *addr );
+
+				if( clean->op == 2 )
+					m_engine->CallObjectMethod(*addr, clean->ot->beh.destruct);
+
+				m_engine->CallFree(*addr);
+			}
+		}
+	}
+
+	// Return how much should be popped from the stack
+	return popSize;
+}
+
+// interface
+int asCContext::GetVarCount(asUINT stackLevel)
+{
+	asIScriptFunction *func = GetFunction(stackLevel);
+	if( func == 0 ) return asINVALID_ARG;
+
+	return func->GetVarCount();
+}
+
+// interface
+int asCContext::GetVar(asUINT varIndex, asUINT stackLevel, const char** name, int* typeId, asETypeModifiers* typeModifiers, bool* isVarOnHeap, int* stackOffset)
+{
+	asCScriptFunction* func = reinterpret_cast<asCScriptFunction*>(GetFunction(stackLevel));
+	if (func == 0) return asINVALID_ARG;
+
+	int r = func->GetVar(varIndex, name, typeId);
+	if (r < 0) 
+		return r;
+
+	if (isVarOnHeap)
+		*isVarOnHeap = func->scriptData->variables[varIndex]->onHeap;
+
+	if( stackOffset )
+		*stackOffset = func->scriptData->variables[varIndex]->stackOffset;
+
+	if (typeModifiers)
+	{
+		*typeModifiers = asTM_NONE;
+
+		if (func->scriptData && func->scriptData->variables[varIndex]->type.IsReference())
+		{
+			// Find the function argument if it is not a local variable
+			int pos = func->scriptData->variables[varIndex]->stackOffset;
+			if (pos <= 0)
+			{
+				int stackPos = 0;
+				if (func->objectType)
+					stackPos -= AS_PTR_SIZE;
+
+				if (func->DoesReturnOnStack())
+				{
+					if (stackPos == pos)
+						*typeModifiers = asTM_INOUTREF;
+					stackPos -= AS_PTR_SIZE;
+				}
+
+				for (asUINT n = 0; n < func->parameterTypes.GetLength(); n++)
+				{
+					if (stackPos == pos)
+					{
+						// The right argument was found. Is this a reference parameter?
+						*typeModifiers = func->inOutFlags[n];
+						break;
+					}
+					stackPos -= func->parameterTypes[n].GetSizeOnStackDWords();
+				}
+			}
+			else
+				*typeModifiers = asTM_INOUTREF;
+		}
+	}
+
+	return asSUCCESS;
+}
+
+#ifdef AS_DEPRECATED
+// interface
+const char *asCContext::GetVarName(asUINT varIndex, asUINT stackLevel)
+{
+	asIScriptFunction *func = GetFunction(stackLevel);
+	if( func == 0 ) return 0;
+
+	const char *name = 0;
+	int r = func->GetVar(varIndex, &name);
+	return r >= 0 ? name : 0;
+}
+#endif
+
+// interface
+const char *asCContext::GetVarDeclaration(asUINT varIndex, asUINT stackLevel, bool includeNamespace)
+{
+	asIScriptFunction *func = GetFunction(stackLevel);
+	if( func == 0 ) return 0;
+
+	return func->GetVarDecl(varIndex, includeNamespace);
+}
+
+#ifdef AS_DEPRECATED
+// interface
+int asCContext::GetVarTypeId(asUINT varIndex, asUINT stackLevel)
+{
+	asCScriptFunction *func = reinterpret_cast<asCScriptFunction*>(GetFunction(stackLevel));
+	if( func == 0 ) return asINVALID_ARG;
+
+	int typeId;
+	int r = func->GetVar(varIndex, 0, &typeId);
+	if (r < 0)
+		return r;
+
+	return typeId;
+}
+#endif
+
+// interface
+void *asCContext::GetAddressOfVar(asUINT varIndex, asUINT stackLevel, bool dontDereference, bool returnAddressOfUnitializedObjects)
+{
+	// Don't return anything if there is no bytecode, e.g. before calling Execute()
+	if( m_regs.programPointer == 0 ) return 0;
+
+	if( stackLevel >= GetCallstackSize() ) return 0;
+
+	asCScriptFunction *func;
+	asDWORD *sf;
+	if( stackLevel == 0 )
+	{
+		func = m_currentFunction;
+		sf = m_regs.stackFramePointer;
+	}
+	else
+	{
+		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
+		func = (asCScriptFunction*)s[1];
+		sf = (asDWORD*)s[0];
+	}
+
+	if( func == 0 )
+		return 0;
+
+	if( func->scriptData == 0 )
+		return 0;
+
+	if( varIndex >= func->scriptData->variables.GetLength() )
+		return 0;
+
+	// For object variables it's necessary to dereference the pointer to get the address of the value
+	// Reference parameters must also be dereferenced to give the address of the value
+	int pos = func->scriptData->variables[varIndex]->stackOffset;
+	if( (func->scriptData->variables[varIndex]->type.IsObject() && !func->scriptData->variables[varIndex]->type.IsObjectHandle()) || (pos <= 0) )
+	{
+		// Determine if the object is really on the heap
+		bool onHeap = func->scriptData->variables[varIndex]->onHeap;
+		if( func->scriptData->variables[varIndex]->type.IsObject() &&
+			!func->scriptData->variables[varIndex]->type.IsObjectHandle() &&
+			!func->scriptData->variables[varIndex]->type.IsReference() )
+		{
+			if( func->scriptData->variables[varIndex]->type.GetTypeInfo()->GetFlags() & asOBJ_VALUE )
+			{
+				if (!onHeap && !returnAddressOfUnitializedObjects)
+				{
+					// If the object on the stack is not initialized return a null pointer instead
+					asCArray<int> liveObjects;
+					DetermineLiveObjects(liveObjects, stackLevel);
+
+					if (liveObjects[varIndex] <= 0)
+						return 0;
+				}
+			}
+		}
+
+		// If it wasn't an object on the heap, then check if it is a reference parameter
+		if( !onHeap && pos <= 0 )
+		{
+			if (func->scriptData->variables[varIndex]->type.IsReference())
+				onHeap = true;
+		}
+
+		// If dontDereference is true then the application wants the address of the reference, rather than the value it refers to
+		if( onHeap && !dontDereference )
+			return *(void**)(sf - func->scriptData->variables[varIndex]->stackOffset);
+	}
+
+	return sf - func->scriptData->variables[varIndex]->stackOffset;
+}
+
+// interface
+// returns the typeId of the 'this' object at the given call stack level (0 for current)
+// returns 0 if the function call at the given stack level is not a method
+int asCContext::GetThisTypeId(asUINT stackLevel)
+{
+	asIScriptFunction *func = GetFunction(stackLevel);
+	if( func == 0 ) return asINVALID_ARG;
+
+	if( func->GetObjectType() == 0 )
+		return 0; // not in a method
+
+	// create a datatype
+	asCDataType dt = asCDataType::CreateType((asCObjectType*)func->GetObjectType(), false);
+
+	// return a typeId from the data type
+	return m_engine->GetTypeIdFromDataType(dt);
+}
+
+// interface
+// returns the 'this' object pointer at the given call stack level (0 for current)
+// returns 0 if the function call at the given stack level is not a method
+void *asCContext::GetThisPointer(asUINT stackLevel)
+{
+	if( stackLevel >= GetCallstackSize() )
+		return 0;
+
+	asCScriptFunction *func;
+	asDWORD *sf;
+	if( stackLevel == 0 )
+	{
+		func = m_currentFunction;
+		sf = m_regs.stackFramePointer;
+	}
+	else
+	{
+		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize()-stackLevel-1)*CALLSTACK_FRAME_SIZE;
+		func = (asCScriptFunction*)s[1];
+		sf = (asDWORD*)s[0];
+	}
+
+	if( func == 0 )
+		return 0;
+
+	if( func->objectType == 0 )
+		return 0; // not in a method
+
+	void *thisPointer = (void*)*(asPWORD*)(sf);
+	if( thisPointer == 0 )
+	{
+		return 0;
+	}
+
+	// NOTE: this returns the pointer to the 'this' while the GetVarPointer functions return
+	// a pointer to a pointer. I can't imagine someone would want to change the 'this'
+	return thisPointer;
+}
+
+// interface
+int asCContext::StartDeserialization()
+{
+	if( m_status == asEXECUTION_ACTIVE || m_status == asEXECUTION_SUSPENDED )
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "StartDeserialization", errorNames[-asCONTEXT_ACTIVE], asCONTEXT_ACTIVE);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asCONTEXT_ACTIVE;
+	}
+
+	Unprepare();
+	m_status = asEXECUTION_DESERIALIZATION;
+
+	return asSUCCESS;
+}
+
+// internal
+int asCContext::DeserializeProgramPointer(int programPointer, asCScriptFunction *currentFunction, void *object, asDWORD *&p, asCScriptFunction *&realFunc)
+{
+	realFunc = currentFunction;
+
+	if( currentFunction->funcType == asFUNC_VIRTUAL ||
+		currentFunction->funcType == asFUNC_INTERFACE )
+	{
+		// The currentFunction is a virtual method
+
+		// Determine the true function from the object
+		asCScriptObject *obj = *(asCScriptObject**)(asPWORD*)object;
+
+		if( obj == 0 )
+		{
+			return asINVALID_ARG;
+		}
+		else
+		{
+			realFunc = GetRealFunc(m_currentFunction, (void**)&obj);
+
+			if( realFunc && realFunc->signatureId == m_currentFunction->signatureId )
+				m_currentFunction = realFunc;
+			else
+				return asINVALID_ARG;
+		}
+	}
+
+	if( currentFunction->funcType == asFUNC_SCRIPT )
+	{
+		// TODO: Instead of returning pointer, this should count number of instructions so that the deserialized program pointer is 32/64bit agnostic
+		p = currentFunction->scriptData->byteCode.AddressOf() + programPointer;
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+int asCContext::FinishDeserialization()
+{
+	if( m_status != asEXECUTION_DESERIALIZATION )
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "FinishDeserialization", errorNames[-asCONTEXT_NOT_PREPARED], asCONTEXT_NOT_PREPARED);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return asCONTEXT_NOT_PREPARED;
+	}
+
+	// Sanity test
+	if (m_currentFunction == 0)
+	{
+		asCString str;
+		str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_s_d, "FinishDeserialization", "No function set", errorNames[-asCONTEXT_NOT_PREPARED], asCONTEXT_NOT_PREPARED);
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+
+		// Clean up before returning to leave the context in a valid state
+		Unprepare();
+
+		return asCONTEXT_NOT_PREPARED;
+	}
+	
+	m_status = asEXECUTION_SUSPENDED;
+
+	return asSUCCESS;
+}
+
+// internal
+asDWORD *asCContext::DeserializeStackPointer(asDWORD v)
+{
+	// TODO: This function should find the correct stack block and then get the address within that stack block. It must not be expected that the same initContextStackSize was used when the stack pointer was serialized
+	int block = (v >> (32-6)) & 0x3F;
+	uint32_t offset = v & 0x03FFFFFF;
+
+	asASSERT((asUINT)block < m_stackBlocks.GetLength());
+	asASSERT(offset <= m_engine->ep.initContextStackSize*(1 << block));
+
+	return m_stackBlocks[block] + offset;
+}
+
+// internal
+asDWORD asCContext::SerializeStackPointer(asDWORD *v) const
+{
+	// TODO: This function should determine actual offset from the lowest stack by unwinding the stack. This way when deserializing it doesn't matter if the same block sizes are used or not
+	asASSERT(v != 0);
+	asASSERT(m_stackBlocks.GetLength());
+
+	uint64_t min = ~0llu;
+	int best     = -1;
+
+	// Find the stack block that is used, and the offset into that block
+	for(asUINT i = 0; i < m_stackBlocks.GetLength(); ++i)
+	{
+		uint64_t delta = v - m_stackBlocks[i];
+
+		if(delta < min)
+		{
+			min = delta;
+			best = i;
+		}
+	}
+
+	asASSERT(min < 0x03FFFFFF && (asUINT)best < 0x3F);
+
+	// Return the seriaized pointer as the offset in the lower 26 bits + the index of the stack block in the upper 6 bits
+	return (min & 0x03FFFFFF) | (( best & 0x3F) << (32-6));
+}
+
+// interface
+int asCContext::GetArgsOnStackCount(asUINT stackLevel)
+{
+	// Clear cache
+	m_argsOnStackCache.SetLength(0);
+	m_argsOnStackCacheProgPos = 0;
+	m_argsOnStackCacheFunc = 0;
+
+	// Don't return anything if there is no bytecode, e.g. before calling Execute()
+	if (m_regs.programPointer == 0) return asERROR;
+
+	if (stackLevel >= GetCallstackSize()) return asINVALID_ARG;
+
+	asCScriptFunction* func;
+	asDWORD* sf;
+	asDWORD* sp;
+	asDWORD* progPointer;
+	if (stackLevel == 0)
+	{
+		func = m_currentFunction;
+		sf = m_regs.stackFramePointer;
+		sp = m_regs.stackPointer;
+		progPointer = m_regs.programPointer;
+	}
+	else
+	{
+		asPWORD* s = m_callStack.AddressOf() + (GetCallstackSize() - stackLevel - 1) * CALLSTACK_FRAME_SIZE;
+		func = (asCScriptFunction*)s[1];
+		sf = (asDWORD*)s[0];
+		sp = (asDWORD*)s[3];
+		progPointer = (asDWORD*)s[2];
+	}
+
+	// Determine the highest stack position for local variables
+	// asCScriptFunction::variableSpace give this value
+	// If the stack pointer is higher than that, then there are data pushed on the stack
+	asUINT stackPos = asDWORD(sf - sp) - func->scriptData->variableSpace;
+	if (stackPos == 0)
+		return 0;
+
+	// If a function is already being called at a higher call stack position, subtract the args for that function
+	asCScriptFunction* calledFunc = 0;
+	if (stackLevel == 1)
+		calledFunc = m_currentFunction;
+	else if( stackLevel > 1 )
+	{
+		asPWORD *s = m_callStack.AddressOf() + (GetCallstackSize() - stackLevel - 2) * CALLSTACK_FRAME_SIZE;
+		calledFunc = (asCScriptFunction*)s[1];
+	}
+	if( calledFunc )
+		stackPos -= calledFunc->GetSpaceNeededForArguments() + (calledFunc->DoesReturnOnStack() ? AS_PTR_SIZE : 0) + (calledFunc->GetObjectType() ? AS_PTR_SIZE : 0);
+
+	// Cache the list of arg types by func pointer and program position
+	m_argsOnStackCacheFunc = func;
+	m_argsOnStackCacheProgPos = asUINT(progPointer - &func->scriptData->byteCode[0]);
+
+	// Iteratively search for functions that will be called until all values on the arg has been determined
+	asUINT progPos = asUINT(progPointer - &func->scriptData->byteCode[0]);
+	while( stackPos > 0 )
+	{
+		// Find the next function that will be called to determine the arg types and sizes
+		int stackDelta = 0;
+		calledFunc = func->FindNextFunctionCalled(progPos, &stackDelta, &progPos);
+
+		// Determine which args have not yet been pushed on the stack based on the stackDelta
+		if (stackDelta > 0 && calledFunc->DoesReturnOnStack())
+			stackDelta -= AS_PTR_SIZE;
+		if (stackDelta > 0 && calledFunc->GetObjectType())
+			stackDelta -= AS_PTR_SIZE;
+		int param = -1;
+		while (stackDelta > 0 && ++param < int(calledFunc->GetParamCount()))
+		{
+			int typeId;
+			asDWORD flags;
+			calledFunc->GetParam(param, &typeId, &flags);
+
+			// TODO: When enums can be of different sizes this needs to be adjusted
+			if ((flags & asTM_INOUTREF) || (typeId & asTYPEID_MASK_OBJECT))
+				stackDelta -= AS_PTR_SIZE;
+			else if (typeId == asTYPEID_UINT64 || typeId == asTYPEID_INT64 || typeId == asTYPEID_DOUBLE)
+				stackDelta -= 2;
+			else
+				stackDelta -= 1;
+		}
+
+		// Determine the args already pushed on the stack
+		while (stackPos > 0)
+		{
+			if (param >= 0 && ++param < int(calledFunc->GetParamCount()))
+			{
+				int typeId;
+				asDWORD flags;
+				calledFunc->GetParam(param, &typeId, &flags);
+
+				if ((flags & asTM_INOUTREF) || (typeId & asTYPEID_MASK_OBJECT))
+				{
+					// TODO: The value pushed on the stack here can be just the offset of the variable, not the actual pointer
+					stackPos -= AS_PTR_SIZE;
+				}
+				else if (typeId == asTYPEID_UINT64 || typeId == asTYPEID_INT64 || typeId == asTYPEID_DOUBLE)
+					stackPos -= 2;
+				else
+					stackPos -= 1;
+				m_argsOnStackCache.PushLast(typeId);
+				m_argsOnStackCache.PushLast(flags);
+				continue;
+			}
+
+			// There is no need to check for the this pointer or the pointer to the return value since the
+			// context cannot be suspended between the moment these are pushed on the stack and the call itself.
+
+			// There are no more args for this function, there is a nested call
+			break;
+		}
+	}
+
+	return m_argsOnStackCache.GetLength() / 2;
+}
+
+// interface
+int asCContext::GetArgOnStack(asUINT stackLevel, asUINT arg, int* outTypeId, asUINT* outFlags, void** outAddress)
+{
+	// Don't return anything if there is no bytecode, e.g. before calling Execute()
+	if (m_regs.programPointer == 0) return asERROR;
+
+	if (stackLevel >= GetCallstackSize()) return asINVALID_ARG;
+
+	asCScriptFunction* func;
+	asDWORD* sf;
+	asDWORD* sp;
+	asDWORD* progPointer;
+	if (stackLevel == 0)
+	{
+		func = m_currentFunction;
+		sf = m_regs.stackFramePointer;
+		sp = m_regs.stackPointer;
+		progPointer = m_regs.programPointer;
+	}
+	else
+	{
+		asPWORD* s = m_callStack.AddressOf() + (GetCallstackSize() - stackLevel - 1) * CALLSTACK_FRAME_SIZE;
+		func = (asCScriptFunction*)s[1];
+		sf = (asDWORD*)s[0];
+		sp = (asDWORD*)s[3];
+		progPointer = (asDWORD*)s[2];
+	}
+
+	// If a function is already being called at a higher call stack position, subtract the args for that function
+	asCScriptFunction* calledFunc = 0;
+	if (stackLevel == 1)
+		calledFunc = m_currentFunction;
+	else if (stackLevel > 1)
+	{
+		asPWORD* s = m_callStack.AddressOf() + (GetCallstackSize() - stackLevel - 2) * CALLSTACK_FRAME_SIZE;
+		calledFunc = (asCScriptFunction*)s[1];
+	}
+	if (calledFunc)
+		sp += calledFunc->GetSpaceNeededForArguments() + (calledFunc->DoesReturnOnStack() ? AS_PTR_SIZE : 0) + (calledFunc->GetObjectType() ? AS_PTR_SIZE : 0);
+
+	// Check that the cache for GetArgsOnStack is up-to-date
+	if (m_argsOnStackCacheFunc != func || m_argsOnStackCacheProgPos != asUINT(progPointer - &func->scriptData->byteCode[0]))
+		GetArgsOnStackCount(stackLevel);
+
+	// The arg types in the array are stored from top to bottom, so we'll go through them in the inverse order
+	// TODO: Check that arg is not too high
+	arg = m_argsOnStackCache.GetLength() / 2 - arg - 1;
+	asUINT stackDelta = 0;
+	for (asUINT n = 0; n < arg; n++)
+	{
+		int typeId = m_argsOnStackCache[n * 2];
+		asUINT flags = m_argsOnStackCache[n * 2 + 1];
+
+		if ((flags & asTM_INOUTREF) || (typeId & asTYPEID_MASK_OBJECT))
+			stackDelta += AS_PTR_SIZE;
+		else if (typeId == asTYPEID_UINT64 || typeId == asTYPEID_INT64 || typeId == asTYPEID_DOUBLE)
+			stackDelta += 2;
+		else
+			stackDelta += 1;
+	}
+
+	if (outAddress) *outAddress = sp + stackDelta;
+	if (outTypeId) *outTypeId = m_argsOnStackCache[arg * 2];
+	if (outFlags) *outFlags = m_argsOnStackCache[arg * 2 + 1];
+
+	return asSUCCESS;
+}
+
+// TODO: Move these to as_utils.cpp
+
+struct POW_INFO
+{
+	asQWORD MaxBaseu64;
+	asDWORD MaxBasei64;
+	asWORD  MaxBaseu32;
+	asWORD  MaxBasei32;
+	char    HighBit;
+};
+
+const POW_INFO pow_info[] =
+{
+	{          0ULL,          0UL,     0,     0, 0 },  // 0 is a special case
+	{          0ULL,          0UL,     0,     0, 1 },  // 1 is a special case
+	{ 3037000499ULL, 2147483647UL, 65535, 46340, 2 },  // 2
+	{    2097152ULL,    1664510UL,  1625,  1290, 2 },  // 3
+	{      55108ULL,      46340UL,   255,   215, 3 },  // 4
+	{       6208ULL,       5404UL,    84,    73, 3 },  // 5
+	{       1448ULL,       1290UL,    40,    35, 3 },  // 6
+	{        511ULL,        463UL,    23,    21, 3 },  // 7
+	{        234ULL,        215UL,    15,    14, 4 },  // 8
+	{        128ULL,        118UL,    11,    10, 4 },  // 9
+	{         78ULL,         73UL,     9,     8, 4 },  // 10
+	{         52ULL,         49UL,     7,     7, 4 },  // 11
+	{         38ULL,         35UL,     6,     5, 4 },  // 12
+	{         28ULL,         27UL,     5,     5, 4 },  // 13
+	{         22ULL,         21UL,     4,     4, 4 },  // 14
+	{         18ULL,         17UL,     4,     4, 4 },  // 15
+	{         15ULL,         14UL,     3,     3, 5 },  // 16
+	{         13ULL,         12UL,     3,     3, 5 },  // 17
+	{         11ULL,         10UL,     3,     3, 5 },  // 18
+	{          9ULL,          9UL,     3,     3, 5 },  // 19
+	{          8ULL,          8UL,     3,     2, 5 },  // 20
+	{          8ULL,          7UL,     2,     2, 5 },  // 21
+	{          7ULL,          7UL,     2,     2, 5 },  // 22
+	{          6ULL,          6UL,     2,     2, 5 },  // 23
+	{          6ULL,          5UL,     2,     2, 5 },  // 24
+	{          5ULL,          5UL,     2,     2, 5 },  // 25
+	{          5ULL,          5UL,     2,     2, 5 },  // 26
+	{          5ULL,          4UL,     2,     2, 5 },  // 27
+	{          4ULL,          4UL,     2,     2, 5 },  // 28
+	{          4ULL,          4UL,     2,     2, 5 },  // 29
+	{          4ULL,          4UL,     2,     2, 5 },  // 30
+	{          4ULL,          4UL,     2,     1, 5 },  // 31
+	{          3ULL,          3UL,     1,     1, 6 },  // 32
+	{          3ULL,          3UL,     1,     1, 6 },  // 33
+	{          3ULL,          3UL,     1,     1, 6 },  // 34
+	{          3ULL,          3UL,     1,     1, 6 },  // 35
+	{          3ULL,          3UL,     1,     1, 6 },  // 36
+	{          3ULL,          3UL,     1,     1, 6 },  // 37
+	{          3ULL,          3UL,     1,     1, 6 },  // 38
+	{          3ULL,          3UL,     1,     1, 6 },  // 39
+	{          2ULL,          2UL,     1,     1, 6 },  // 40
+	{          2ULL,          2UL,     1,     1, 6 },  // 41
+	{          2ULL,          2UL,     1,     1, 6 },  // 42
+	{          2ULL,          2UL,     1,     1, 6 },  // 43
+	{          2ULL,          2UL,     1,     1, 6 },  // 44
+	{          2ULL,          2UL,     1,     1, 6 },  // 45
+	{          2ULL,          2UL,     1,     1, 6 },  // 46
+	{          2ULL,          2UL,     1,     1, 6 },  // 47
+	{          2ULL,          2UL,     1,     1, 6 },  // 48
+	{          2ULL,          2UL,     1,     1, 6 },  // 49
+	{          2ULL,          2UL,     1,     1, 6 },  // 50
+	{          2ULL,          2UL,     1,     1, 6 },  // 51
+	{          2ULL,          2UL,     1,     1, 6 },  // 52
+	{          2ULL,          2UL,     1,     1, 6 },  // 53
+	{          2ULL,          2UL,     1,     1, 6 },  // 54
+	{          2ULL,          2UL,     1,     1, 6 },  // 55
+	{          2ULL,          2UL,     1,     1, 6 },  // 56
+	{          2ULL,          2UL,     1,     1, 6 },  // 57
+	{          2ULL,          2UL,     1,     1, 6 },  // 58
+	{          2ULL,          2UL,     1,     1, 6 },  // 59
+	{          2ULL,          2UL,     1,     1, 6 },  // 60
+	{          2ULL,          2UL,     1,     1, 6 },  // 61
+	{          2ULL,          2UL,     1,     1, 6 },  // 62
+	{          2ULL,          1UL,     1,     1, 6 },  // 63
+};
+
+int as_powi(int base, int exponent, bool& isOverflow)
+{
+	if( exponent < 0 )
+	{
+		if( base == 0 )
+			// Divide by zero
+			isOverflow = true;
+		else
+			// Result is less than 1, so it truncates to 0
+			isOverflow = false;
+
+		return 0;
+	}
+	else if( exponent == 0 && base == 0 )
+	{
+		// Domain error
+		isOverflow = true;
+		return 0;
+	}
+	else if( exponent >= 31 )
+	{
+		switch( base )
+		{
+		case -1:
+			isOverflow = false;
+			return exponent & 1 ? -1 : 1;
+		case 0:
+			isOverflow = false;
+			break;
+		case 1:
+			isOverflow = false;
+			return 1;
+		default:
+			isOverflow = true;
+			break;
+		}
+		return 0;
+	}
+	else
+	{
+		const asWORD max_base = pow_info[exponent].MaxBasei32;
+		const char high_bit = pow_info[exponent].HighBit;
+		if( max_base != 0 && max_base < (base < 0 ? -base : base) )
+		{
+			isOverflow = true;
+			return 0;  // overflow
+		}
+
+		int result = 1;
+		switch( high_bit )
+		{
+		case 5:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 4:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 3:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 2:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 1:
+			if( exponent ) result *= base;
+		default:
+			isOverflow = false;
+			return result;
+		}
+	}
+}
+
+asDWORD as_powu(asDWORD base, asDWORD exponent, bool& isOverflow)
+{
+	if( exponent == 0 && base == 0 )
+	{
+		// Domain error
+		isOverflow = true;
+		return 0;
+	}
+	else if( exponent >= 32 )
+	{
+		switch( base )
+		{
+		case 0:
+			isOverflow = false;
+			break;
+		case 1:
+			isOverflow = false;
+			return 1;
+		default:
+			isOverflow = true;
+			break;
+		}
+		return 0;
+	}
+	else
+	{
+		const asWORD max_base = pow_info[exponent].MaxBaseu32;
+		const char high_bit = pow_info[exponent].HighBit;
+		if( max_base != 0 && max_base < base )
+		{
+			isOverflow = true;
+			return 0;  // overflow
+		}
+
+		asDWORD result = 1;
+		switch( high_bit )
+		{
+		case 5:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 4:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 3:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 2:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 1:
+			if( exponent ) result *= base;
+		default:
+			isOverflow = false;
+			return result;
+		}
+	}
+}
+
+asINT64 as_powi64(asINT64 base, asINT64 exponent, bool& isOverflow)
+{
+	if( exponent < 0 )
+	{
+		if( base == 0 )
+			// Divide by zero
+			isOverflow = true;
+		else
+			// Result is less than 1, so it truncates to 0
+			isOverflow = false;
+
+		return 0;
+	}
+	else if( exponent == 0 && base == 0 )
+	{
+		// Domain error
+		isOverflow = true;
+		return 0;
+	}
+	else if( exponent >= 63 )
+	{
+		switch( base )
+		{
+		case -1:
+			isOverflow = false;
+			return exponent & 1 ? -1 : 1;
+		case 0:
+			isOverflow = false;
+			break;
+		case 1:
+			isOverflow = false;
+			return 1;
+		default:
+			isOverflow = true;
+			break;
+		}
+		return 0;
+	}
+	else
+	{
+		const asDWORD max_base = pow_info[exponent].MaxBasei64;
+		const char high_bit = pow_info[exponent].HighBit;
+		if( max_base != 0 && max_base < (base < 0 ? -base : base) )
+		{
+			isOverflow = true;
+			return 0;  // overflow
+		}
+
+		asINT64 result = 1;
+		switch( high_bit )
+		{
+		case 6:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 5:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 4:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 3:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 2:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 1:
+			if( exponent ) result *= base;
+		default:
+			isOverflow = false;
+			return result;
+		}
+	}
+}
+
+asQWORD as_powu64(asQWORD base, asQWORD exponent, bool& isOverflow)
+{
+	if( exponent == 0 && base == 0 )
+	{
+		// Domain error
+		isOverflow = true;
+		return 0;
+	}
+	else if( exponent >= 64 )
+	{
+		switch( base )
+		{
+		case 0:
+			isOverflow = false;
+			break;
+		case 1:
+			isOverflow = false;
+			return 1;
+		default:
+			isOverflow = true;
+			break;
+		}
+		return 0;
+	}
+	else
+	{
+		const asQWORD max_base = pow_info[exponent].MaxBaseu64;
+		const char high_bit = pow_info[exponent].HighBit;
+		if( max_base != 0 && max_base < base )
+		{
+			isOverflow = true;
+			return 0;  // overflow
+		}
+
+		asQWORD result = 1;
+		switch( high_bit )
+		{
+		case 6:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 5:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 4:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 3:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 2:
+			if( exponent & 1 ) result *= base;
+			exponent >>= 1;
+			base *= base;
+		case 1:
+			if( exponent ) result *= base;
+		default:
+			isOverflow = false;
+			return result;
+		}
+	}
+}
+
+END_AS_NAMESPACE
+
+
+
diff --git a/Sources/AngelScript/source/as_context.h b/Sources/AngelScript/source/as_context.h
old mode 100755
new mode 100644
index 937ca7470..c1567e46c
--- a/Sources/AngelScript/source/as_context.h
+++ b/Sources/AngelScript/source/as_context.h
@@ -1,245 +1,278 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_context.h
-//
-// This class handles the execution of the byte code
-//
-
-
-#ifndef AS_CONTEXT_H
-#define AS_CONTEXT_H
-
-#include "as_config.h"
-#include "as_atomic.h"
-#include "as_array.h"
-#include "as_string.h"
-#include "as_objecttype.h"
-#include "as_callfunc.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCScriptFunction;
-class asCScriptEngine;
-
-class asCContext : public asIScriptContext
-{
-public:
-	// Memory management
-	int  AddRef() const;
-	int  Release() const;
-
-	// Miscellaneous
-	asIScriptEngine *GetEngine() const;
-
-	// Execution
-	int             Prepare(asIScriptFunction *func);
-	int             Unprepare();
-	int             Execute();
-	int             Abort();
-	int             Suspend();
-	asEContextState GetState() const;
-	int             PushState();
-	int             PopState();
-	bool            IsNested(asUINT *nestCount = 0) const;
-
-	// Object pointer for calling class methods
-	int SetObject(void *obj);
-
-	// Arguments
-	int   SetArgByte(asUINT arg, asBYTE value);
-	int   SetArgWord(asUINT arg, asWORD value);
-	int   SetArgDWord(asUINT arg, asDWORD value);
-	int   SetArgQWord(asUINT arg, asQWORD value);
-	int   SetArgFloat(asUINT arg, float value);
-	int   SetArgDouble(asUINT arg, double value);
-	int   SetArgAddress(asUINT arg, void *addr);
-	int   SetArgObject(asUINT arg, void *obj);
-	int   SetArgVarType(asUINT arg, void *ptr, int typeId);
-	void *GetAddressOfArg(asUINT arg);
-
-	// Return value
-	asBYTE  GetReturnByte();
-	asWORD  GetReturnWord();
-	asDWORD GetReturnDWord();
-	asQWORD GetReturnQWord();
-	float   GetReturnFloat();
-	double  GetReturnDouble();
-	void   *GetReturnAddress();
-	void   *GetReturnObject();
-	void   *GetAddressOfReturnValue();
-
-	// Exception handling
-	int                SetException(const char *descr);
-	int                GetExceptionLineNumber(int *column, const char **sectionName);
-	asIScriptFunction *GetExceptionFunction();
-	const char *       GetExceptionString();
-	int                SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv);
-	void               ClearExceptionCallback();
-
-	// Debugging
-	int                SetLineCallback(asSFuncPtr callback, void *obj, int callConv);
-	void               ClearLineCallback();
-	asUINT             GetCallstackSize() const;
-	asIScriptFunction *GetFunction(asUINT stackLevel);
-	int                GetLineNumber(asUINT stackLevel, int *column, const char **sectionName);
-	int                GetVarCount(asUINT stackLevel);
-	const char        *GetVarName(asUINT varIndex, asUINT stackLevel);
-	const char        *GetVarDeclaration(asUINT varIndex, asUINT stackLevel, bool includeNamespace);
-	int                GetVarTypeId(asUINT varIndex, asUINT stackLevel);
-	void              *GetAddressOfVar(asUINT varIndex, asUINT stackLevel);
-	bool               IsVarInScope(asUINT varIndex, asUINT stackLevel);
-	int                GetThisTypeId(asUINT stackLevel);
-    void              *GetThisPointer(asUINT stackLevel);
-	asIScriptFunction *GetSystemFunction();
-
-	// User data
-	void *SetUserData(void *data, asPWORD type);
-	void *GetUserData(asPWORD type) const;
-
-public:
-	// Internal public functions
-	asCContext(asCScriptEngine *engine, bool holdRef);
-	virtual ~asCContext();
-
-//protected:
-	friend class asCScriptEngine;
-
-	void CallLineCallback();
-	void CallExceptionCallback();
-
-	int  CallGeneric(asCScriptFunction *func);
-
-	void DetachEngine();
-
-	void ExecuteNext();
-	void CleanStack();
-	void CleanStackFrame();
-	void CleanArgsOnStack();
-	void CleanReturnObject();
-	void DetermineLiveObjects(asCArray<int> &liveObjects, asUINT stackLevel);
-
-	void PushCallState();
-	void PopCallState();
-	void CallScriptFunction(asCScriptFunction *func);
-	void CallInterfaceMethod(asCScriptFunction *func);
-	void PrepareScriptFunction();
-
-	bool ReserveStackSpace(asUINT size);
-
-	void SetInternalException(const char *descr);
-
-	// Must be protected for multiple accesses
-	mutable asCAtomic m_refCount;
-
-	bool             m_holdEngineRef;
-	asCScriptEngine *m_engine;
-
-	asEContextState m_status;
-	bool            m_doSuspend;
-	bool            m_doAbort;
-	bool            m_externalSuspendRequest;
-
-	asCScriptFunction *m_currentFunction;
-	asCScriptFunction *m_callingSystemFunction;
-
-	// The call stack holds program pointer, stack pointer, etc for caller functions
-	asCArray<size_t>    m_callStack;
-
-	// Dynamically growing local stack
-	asCArray<asDWORD *> m_stackBlocks;
-	asUINT              m_stackBlockSize;
-	asUINT              m_stackIndex;
-	asDWORD            *m_originalStackPointer;
-
-	// Exception handling
-	bool      m_isStackMemoryNotAllocated;
-	bool      m_needToCleanupArgs;
-	bool      m_inExceptionHandler;
-	asCString m_exceptionString;
-	int       m_exceptionFunction;
-	int       m_exceptionSectionIdx;
-	int       m_exceptionLine;
-	int       m_exceptionColumn;
-
-	// The last prepared function, and some cached values related to it
-	asCScriptFunction *m_initialFunction;
-	int                m_returnValueSize;
-	int                m_argumentsSize;
-
-	// callbacks
-	bool                       m_lineCallback;
-	asSSystemFunctionInterface m_lineCallbackFunc;
-	void *                     m_lineCallbackObj;
-
-	bool                       m_exceptionCallback;
-	asSSystemFunctionInterface m_exceptionCallbackFunc;
-	void *                     m_exceptionCallbackObj;
-
-	asCArray<asPWORD> m_userData;
-
-	// Registers available to JIT compiler functions
-	asSVMRegisters m_regs;
-};
-
-// TODO: Move these to as_utils.h
-int     as_powi(int base, int exponent, bool& isOverflow);
-asDWORD as_powu(asDWORD base, asDWORD exponent, bool& isOverflow);
-asINT64 as_powi64(asINT64 base, asINT64 exponent, bool& isOverflow);
-asQWORD as_powu64(asQWORD base, asQWORD exponent, bool& isOverflow);
-
-// Optional template version of powi if overflow detection is not used.
-#if 0
-template <class T>
-T as_powi(T base, T exponent)
-{
-	// Test for sign bit (huge number is OK)
-	if( exponent & (T(1)<<(sizeof(T)*8-1)) )
-		return 0;
-	else
-	{
-		int result = 1;
-		while( exponent )
-		{
-			if( exponent & 1 )
-				result *= base;
-			exponent >>= 1;
-			base *= base;
-		}
-		return result;
-	}
-}
-#endif
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_context.h
+//
+// This class handles the execution of the byte code
+//
+
+
+#ifndef AS_CONTEXT_H
+#define AS_CONTEXT_H
+
+#include "as_config.h"
+#include "as_atomic.h"
+#include "as_array.h"
+#include "as_string.h"
+#include "as_objecttype.h"
+#include "as_callfunc.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCScriptFunction;
+class asCScriptEngine;
+
+class asCContext : public asIScriptContext
+{
+public:
+	// Memory management
+	int  AddRef() const;
+	int  Release() const;
+
+	// Miscellaneous
+	asIScriptEngine *GetEngine() const;
+
+	// Execution
+	int             Prepare(asIScriptFunction *func);
+	int             Unprepare();
+	int             Execute();
+	int             Abort();
+	int             Suspend();
+	asEContextState GetState() const;
+	int             PushState();
+	int             PopState();
+	bool            IsNested(asUINT *nestCount = 0) const;
+
+	// Object pointer for calling class methods
+	int SetObject(void *obj);
+
+	// Arguments
+	int   SetArgByte(asUINT arg, asBYTE value);
+	int   SetArgWord(asUINT arg, asWORD value);
+	int   SetArgDWord(asUINT arg, asDWORD value);
+	int   SetArgQWord(asUINT arg, asQWORD value);
+	int   SetArgFloat(asUINT arg, float value);
+	int   SetArgDouble(asUINT arg, double value);
+	int   SetArgAddress(asUINT arg, void *addr);
+	int   SetArgObject(asUINT arg, void *obj);
+	int   SetArgVarType(asUINT arg, void *ptr, int typeId);
+	void *GetAddressOfArg(asUINT arg);
+
+	// Return value
+	asBYTE  GetReturnByte();
+	asWORD  GetReturnWord();
+	asDWORD GetReturnDWord();
+	asQWORD GetReturnQWord();
+	float   GetReturnFloat();
+	double  GetReturnDouble();
+	void   *GetReturnAddress();
+	void   *GetReturnObject();
+	void   *GetAddressOfReturnValue();
+
+	// Exception handling
+	int                SetException(const char *descr, bool allowCatch = true);
+	int                GetExceptionLineNumber(int *column, const char **sectionName);
+	asIScriptFunction *GetExceptionFunction();
+	const char *       GetExceptionString();
+	bool               WillExceptionBeCaught();
+	int                SetExceptionCallback(asSFuncPtr callback, void *obj, int callConv);
+	void               ClearExceptionCallback();
+
+	// Debugging
+	int                SetLineCallback(asSFuncPtr callback, void *obj, int callConv);
+	void               ClearLineCallback();
+	asUINT             GetCallstackSize() const;
+	asIScriptFunction *GetFunction(asUINT stackLevel);
+	int                GetLineNumber(asUINT stackLevel, int *column, const char **sectionName);
+	int                GetVarCount(asUINT stackLevel);
+	int                GetVar(asUINT varIndex, asUINT stackLevel, const char** name, int* typeId, asETypeModifiers* typeModifiers, bool* isVarOnHeap, int* stackOffset);
+#ifdef AS_DEPRECATED
+	const char        *GetVarName(asUINT varIndex, asUINT stackLevel);
+#endif
+	const char        *GetVarDeclaration(asUINT varIndex, asUINT stackLevel, bool includeNamespace);
+#ifdef AS_DEPRECATED
+	int                GetVarTypeId(asUINT varIndex, asUINT stackLevel);
+#endif
+	void              *GetAddressOfVar(asUINT varIndex, asUINT stackLevel, bool dontDereference, bool returnAddressOfUnitializedObjects);
+	bool               IsVarInScope(asUINT varIndex, asUINT stackLevel);
+	int                GetThisTypeId(asUINT stackLevel);
+    void              *GetThisPointer(asUINT stackLevel);
+	asIScriptFunction *GetSystemFunction();
+
+	// User data
+	void *SetUserData(void *data, asPWORD type);
+	void *GetUserData(asPWORD type) const;
+
+	// Serialization
+	int StartDeserialization();
+	int FinishDeserialization();
+	int PushFunction(asIScriptFunction *func, void *obj);
+	int GetStateRegisters(asUINT stackLevel, asIScriptFunction** callingSystemFunction, asIScriptFunction** initialFunction, asDWORD* origStackPointer, asDWORD* argumentsSize, asQWORD* valueRegister, void** objectRegister, asITypeInfo** objectTypeRegister);
+	int GetCallStateRegisters(asUINT stackLevel, asDWORD* stackFramePointer, asIScriptFunction** currentFunction, asDWORD* programPointer, asDWORD* stackPointer, asDWORD* stackIndex);
+	int SetStateRegisters(asUINT stackLevel, asIScriptFunction* callingSystemFunction, asIScriptFunction* initialFunction, asDWORD origStackPointer, asDWORD argumentsSize, asQWORD valueRegister, void* objectRegister, asITypeInfo* objectTypeRegister);
+	int SetCallStateRegisters(asUINT stackLevel, asDWORD stackFramePointer, asIScriptFunction* currentFunction, asDWORD programPointer, asDWORD stackPointer, asDWORD stackIndex);
+	int GetArgsOnStackCount(asUINT stackLevel);
+	int GetArgOnStack(asUINT stackLevel, asUINT arg, int* typeId, asUINT *flags, void** address);
+
+public:
+	// Internal public functions
+	asCContext(asCScriptEngine *engine, bool holdRef);
+	virtual ~asCContext();
+	asCScriptFunction *GetRealFunc(asCScriptFunction * m_currentFunction, void ** objType);
+	int DeserializeProgramPointer(int programPointer, asCScriptFunction * currentFunction, void * object, asDWORD *& p, asCScriptFunction *& realFunc);
+
+//protected:
+	friend class asCScriptEngine;
+
+	void CallLineCallback();
+	void CallExceptionCallback();
+
+	int  CallGeneric(asCScriptFunction *func);
+#ifndef AS_NO_EXCEPTIONS
+	void HandleAppException();
+#endif
+	void DetachEngine();
+
+	void ExecuteNext();
+	void CleanStack(bool catchException = false);
+	bool CleanStackFrame(bool catchException = false);
+	void CleanArgsOnStack();
+	void CleanReturnObject();
+	void DetermineLiveObjects(asCArray<int> &liveObjects, asUINT stackLevel);
+
+	int  PushCallState();
+	void PopCallState();
+	void CallScriptFunction(asCScriptFunction *func);
+	void CallInterfaceMethod(asCScriptFunction *func);
+	void PrepareScriptFunction();
+
+	void SetProgramPointer();
+
+	bool ReserveStackSpace(asUINT size);
+
+	asDWORD *DeserializeStackPointer(asDWORD);
+	asDWORD  SerializeStackPointer(asDWORD *) const;
+
+	void SetInternalException(const char *descr, bool allowCatch = true);
+	bool FindExceptionTryCatch();
+
+	// Must be protected for multiple accesses
+	mutable asCAtomic m_refCount;
+
+	bool             m_holdEngineRef;
+	asCScriptEngine *m_engine;
+
+	asEContextState m_status;
+	bool            m_doSuspend;
+	bool            m_doAbort;
+	bool            m_externalSuspendRequest;
+
+	asCScriptFunction *m_currentFunction;
+	asCScriptFunction *m_callingSystemFunction;
+
+	// The call stack holds program pointer, stack pointer, etc for caller functions
+	asCArray<size_t>    m_callStack;
+
+	// Dynamically growing local stack
+	asCArray<asDWORD *> m_stackBlocks;
+	asUINT              m_stackBlockSize;
+	asUINT              m_stackIndex;
+	asDWORD            *m_originalStackPointer;
+
+	// Exception handling
+	bool      m_isStackMemoryNotAllocated;
+	bool      m_needToCleanupArgs;
+	bool      m_inExceptionHandler;
+	asCString m_exceptionString;
+	int       m_exceptionFunction;
+	int       m_exceptionSectionIdx;
+	int       m_exceptionLine;
+	int       m_exceptionColumn;
+	bool      m_exceptionWillBeCaught;
+
+	// The last prepared function, and some cached values related to it
+	asCScriptFunction *m_initialFunction;
+	int                m_returnValueSize;
+	int                m_argumentsSize;
+
+	// Cache for GetArgsOnStack
+	asCArray<int>      m_argsOnStackCache;
+	asUINT             m_argsOnStackCacheProgPos;
+	asCScriptFunction* m_argsOnStackCacheFunc;
+
+	// callbacks
+	bool                       m_lineCallback;
+	asSSystemFunctionInterface m_lineCallbackFunc;
+	void *                     m_lineCallbackObj;
+
+	bool                       m_exceptionCallback;
+	asSSystemFunctionInterface m_exceptionCallbackFunc;
+	void *                     m_exceptionCallbackObj;
+
+	asCArray<asPWORD> m_userData;
+
+	// Registers available to JIT compiler functions
+	asSVMRegisters m_regs;
+};
+
+// TODO: Move these to as_utils.h
+int     as_powi(int base, int exponent, bool& isOverflow);
+asDWORD as_powu(asDWORD base, asDWORD exponent, bool& isOverflow);
+asINT64 as_powi64(asINT64 base, asINT64 exponent, bool& isOverflow);
+asQWORD as_powu64(asQWORD base, asQWORD exponent, bool& isOverflow);
+
+// Optional template version of powi if overflow detection is not used.
+#if 0
+template <class T>
+T as_powi(T base, T exponent)
+{
+	// Test for sign bit (huge number is OK)
+	if( exponent & (T(1)<<(sizeof(T)*8-1)) )
+		return 0;
+	else
+	{
+		int result = 1;
+		while( exponent )
+		{
+			if( exponent & 1 )
+				result *= base;
+			exponent >>= 1;
+			base *= base;
+		}
+		return result;
+	}
+}
+#endif
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_criticalsection.h b/Sources/AngelScript/source/as_criticalsection.h
old mode 100755
new mode 100644
index 342f13849..2e15288a5
--- a/Sources/AngelScript/source/as_criticalsection.h
+++ b/Sources/AngelScript/source/as_criticalsection.h
@@ -1,187 +1,189 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_criticalsection.h
-//
-// Classes for multi threading support
-//
-
-#ifndef AS_CRITICALSECTION_H
-#define AS_CRITICALSECTION_H
-
-#include "as_config.h"
-
-BEGIN_AS_NAMESPACE
-
-#ifdef AS_NO_THREADS
-
-#define DECLARECRITICALSECTION(x) 
-#define ENTERCRITICALSECTION(x) 
-#define LEAVECRITICALSECTION(x) 
-
-inline bool tryEnter() { return true; }
-#define TRYENTERCRITICALSECTION(x) tryEnter()
-
-#define DECLAREREADWRITELOCK(x)    
-#define ACQUIREEXCLUSIVE(x)        
-#define RELEASEEXCLUSIVE(x)        
-#define ACQUIRESHARED(x)           
-#define RELEASESHARED(x)           
-
-#else
-
-#define DECLARECRITICALSECTION(x)  asCThreadCriticalSection x;
-#define ENTERCRITICALSECTION(x)    x.Enter()
-#define LEAVECRITICALSECTION(x)    x.Leave()
-#define TRYENTERCRITICALSECTION(x) x.TryEnter()
-
-#define DECLAREREADWRITELOCK(x)    asCThreadReadWriteLock x;
-#define ACQUIREEXCLUSIVE(x)        x.AcquireExclusive()
-#define RELEASEEXCLUSIVE(x)        x.ReleaseExclusive()
-#define ACQUIRESHARED(x)           x.AcquireShared()
-#define RELEASESHARED(x)           x.ReleaseShared()
-
-#ifdef AS_POSIX_THREADS
-
-END_AS_NAMESPACE
-#include <pthread.h>
-BEGIN_AS_NAMESPACE
-
-class asCThreadCriticalSection
-{
-public:
-	asCThreadCriticalSection();
-	~asCThreadCriticalSection();
-
-	void Enter();
-	void Leave();
-	bool TryEnter();
-
-protected:
-	pthread_mutex_t cs;
-};
-
-class asCThreadReadWriteLock
-{
-public:
-	asCThreadReadWriteLock();
-	~asCThreadReadWriteLock();
-
-	void AcquireExclusive();
-	void ReleaseExclusive();
-	bool TryAcquireExclusive();
-
-	void AcquireShared();
-	void ReleaseShared();
-	bool TryAcquireShared();
-
-protected:
-	pthread_rwlock_t lock;
-};
-
-#elif defined(AS_WINDOWS_THREADS)
-
-END_AS_NAMESPACE
-#ifdef AS_XBOX360
-#include <xtl.h>
-#else
-#define WIN32_LEAN_AND_MEAN
-#ifndef _WIN32_WINNT
-  #define _WIN32_WINNT 0x0600 // We need this to get the declaration for Windows Phone compatible Ex functions
-#endif
-#include <windows.h>
-#endif
-BEGIN_AS_NAMESPACE
-
-// Undefine macros that cause problems in our code
-#undef GetObject
-#undef RegisterClass
-
-class asCThreadCriticalSection
-{
-public:
-	asCThreadCriticalSection();
-	~asCThreadCriticalSection();
-
-	void Enter();
-	void Leave();
-	bool TryEnter();
-
-protected:
-	CRITICAL_SECTION cs;
-};
-
-class asCThreadReadWriteLock
-{
-public:
-	asCThreadReadWriteLock();
-	~asCThreadReadWriteLock();
-
-	void AcquireExclusive();
-	void ReleaseExclusive();
-
-	void AcquireShared();
-	void ReleaseShared();
-
-protected:
-	// The Slim Read Write Lock object, SRWLOCK, is more efficient 
-	// but it is only available from Windows Vista so we cannot use it and
-	// maintain compatibility with olders versions of Windows.
-
-	// Critical sections and semaphores are available on Windows XP and onwards. 
-	// Windows XP is oldest version we support with multithreading.
-	
-	// The implementation is based on the following article, that shows
-	// how to implement a fair read/write lock that doesn't risk starving
-	// the writers:
-
-	// http://doc.qt.nokia.com/qq/qq11-mutex.html
-
-	// TODO: Allow use of SRWLOCK through configuration in as_config.h
-
-	CRITICAL_SECTION    writeLock;
-	HANDLE              readLocks;
-};
-
-// This constant really should be a member of asCThreadReadWriteLock,
-// but it gives a compiler error on MSVC6 so I'm leaving it outside
-static const asUINT maxReaders = 10;
-
-#endif
-
-#endif
-
-END_AS_NAMESPACE
-
-#endif
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2017 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_criticalsection.h
+//
+// Classes for multi threading support
+//
+
+#ifndef AS_CRITICALSECTION_H
+#define AS_CRITICALSECTION_H
+
+#include "as_config.h"
+
+BEGIN_AS_NAMESPACE
+
+#ifdef AS_NO_THREADS
+
+#define DECLARECRITICALSECTION(x)
+#define ENTERCRITICALSECTION(x)
+#define LEAVECRITICALSECTION(x)
+
+inline bool tryEnter() { return true; }
+#define TRYENTERCRITICALSECTION(x) tryEnter()
+
+#define DECLAREREADWRITELOCK(x)
+#define ACQUIREEXCLUSIVE(x)
+#define RELEASEEXCLUSIVE(x)
+#define ACQUIRESHARED(x)
+#define RELEASESHARED(x)
+
+#else
+
+#define DECLARECRITICALSECTION(x)  asCThreadCriticalSection x;
+#define ENTERCRITICALSECTION(x)    x.Enter()
+#define LEAVECRITICALSECTION(x)    x.Leave()
+#define TRYENTERCRITICALSECTION(x) x.TryEnter()
+
+#define DECLAREREADWRITELOCK(x)    asCThreadReadWriteLock x;
+#define ACQUIREEXCLUSIVE(x)        x.AcquireExclusive()
+#define RELEASEEXCLUSIVE(x)        x.ReleaseExclusive()
+#define ACQUIRESHARED(x)           x.AcquireShared()
+#define RELEASESHARED(x)           x.ReleaseShared()
+
+#ifdef AS_POSIX_THREADS
+
+END_AS_NAMESPACE
+#include <pthread.h>
+BEGIN_AS_NAMESPACE
+
+class asCThreadCriticalSection
+{
+public:
+	asCThreadCriticalSection();
+	~asCThreadCriticalSection();
+
+	void Enter();
+	void Leave();
+	bool TryEnter();
+
+protected:
+	pthread_mutex_t cs;
+};
+
+class asCThreadReadWriteLock
+{
+public:
+	asCThreadReadWriteLock();
+	~asCThreadReadWriteLock();
+
+	void AcquireExclusive();
+	void ReleaseExclusive();
+	bool TryAcquireExclusive();
+
+	void AcquireShared();
+	void ReleaseShared();
+	bool TryAcquireShared();
+
+protected:
+	pthread_rwlock_t lock;
+};
+
+#elif defined(AS_WINDOWS_THREADS)
+
+END_AS_NAMESPACE
+#ifdef AS_XBOX360
+#include <xtl.h>
+#else
+#ifndef WIN32_LEAN_AND_MEAN
+  #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef _WIN32_WINNT
+  #define _WIN32_WINNT 0x0600 // We need this to get the declaration for Windows Phone compatible Ex functions
+#endif
+#include <windows.h>
+#endif
+BEGIN_AS_NAMESPACE
+
+// Undefine macros that cause problems in our code
+#undef GetObject
+#undef RegisterClass
+
+class asCThreadCriticalSection
+{
+public:
+	asCThreadCriticalSection();
+	~asCThreadCriticalSection();
+
+	void Enter();
+	void Leave();
+	bool TryEnter();
+
+protected:
+	CRITICAL_SECTION cs;
+};
+
+class asCThreadReadWriteLock
+{
+public:
+	asCThreadReadWriteLock();
+	~asCThreadReadWriteLock();
+
+	void AcquireExclusive();
+	void ReleaseExclusive();
+
+	void AcquireShared();
+	void ReleaseShared();
+
+protected:
+	// The Slim Read Write Lock object, SRWLOCK, is more efficient
+	// but it is only available from Windows Vista so we cannot use it and
+	// maintain compatibility with olders versions of Windows.
+
+	// Critical sections and semaphores are available on Windows XP and onwards.
+	// Windows XP is oldest version we support with multithreading.
+	
+	// The implementation is based on the following article, that shows
+	// how to implement a fair read/write lock that doesn't risk starving
+	// the writers:
+
+	// http://doc.qt.nokia.com/qq/qq11-mutex.html
+
+	// TODO: Allow use of SRWLOCK through configuration in as_config.h
+
+	CRITICAL_SECTION    writeLock;
+	HANDLE              readLocks;
+};
+
+// This constant really should be a member of asCThreadReadWriteLock,
+// but it gives a compiler error on MSVC6 so I'm leaving it outside
+static const asUINT maxReaders = 10;
+
+#endif
+
+#endif
+
+END_AS_NAMESPACE
+
+#endif
+
diff --git a/Sources/AngelScript/source/as_datatype.cpp b/Sources/AngelScript/source/as_datatype.cpp
old mode 100755
new mode 100644
index f8fc29f3e..711fbb38b
--- a/Sources/AngelScript/source/as_datatype.cpp
+++ b/Sources/AngelScript/source/as_datatype.cpp
@@ -1,688 +1,692 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_datatype.cpp
-//
-// This class describes the datatype for expressions during compilation
-//
-
-#include "as_config.h"
-#include "as_datatype.h"
-#include "as_tokendef.h"
-#include "as_typeinfo.h"
-#include "as_objecttype.h"
-#include "as_scriptengine.h"
-#include "as_tokenizer.h"
-
-BEGIN_AS_NAMESPACE
-
-asCDataType::asCDataType()
-{
-	tokenType              = ttUnrecognizedToken;
-	typeInfo               = 0;
-	isReference            = false;
-	isReadOnly             = false;
-	isAuto                 = false;
-	isObjectHandle         = false;
-	isConstHandle          = false;
-	isHandleToAsHandleType = false;
-}
-
-asCDataType::asCDataType(const asCDataType &dt)
-{
-	tokenType              = dt.tokenType;
-	typeInfo               = dt.typeInfo;
-	isReference            = dt.isReference;
-	isReadOnly             = dt.isReadOnly;
-	isAuto                 = dt.isAuto;
-	isObjectHandle         = dt.isObjectHandle;
-	isConstHandle          = dt.isConstHandle;
-	isHandleToAsHandleType = dt.isHandleToAsHandleType;
-}
-
-asCDataType::~asCDataType()
-{
-}
-
-bool asCDataType::IsValid() const
-{
-	if( tokenType == ttUnrecognizedToken &&
-		!isObjectHandle )
-		return false;
-
-	return true;
-}
-
-asCDataType asCDataType::CreateType(asCTypeInfo *ti, bool isConst)
-{
-	asCDataType dt;
-
-	dt.tokenType        = ttIdentifier;
-	dt.typeInfo         = ti;
-	dt.isReadOnly       = isConst;
-
-	return dt;
-}
-
-asCDataType asCDataType::CreateAuto(bool isConst)
-{
-	asCDataType dt;
-
-	dt.tokenType        = ttIdentifier;
-	dt.isReadOnly       = isConst;
-	dt.isAuto           = true;
-
-	return dt;
-}
-
-asCDataType asCDataType::CreateObjectHandle(asCTypeInfo *ot, bool isConst)
-{
-	asCDataType dt;
-
-	asASSERT(ot->CastToObjectType());
-
-	dt.tokenType        = ttIdentifier;
-	dt.typeInfo         = ot;
-	dt.isObjectHandle   = true;
-	dt.isConstHandle    = isConst;
-
-	return dt;
-}
-
-asCDataType asCDataType::CreatePrimitive(eTokenType tt, bool isConst)
-{
-	asCDataType dt;
-
-	dt.tokenType        = tt;
-	dt.isReadOnly       = isConst;
-
-	return dt;
-}
-
-asCDataType asCDataType::CreateNullHandle()
-{
-	asCDataType dt;
-
-	dt.tokenType = ttUnrecognizedToken;
-	dt.isReadOnly = true;
-	dt.isObjectHandle = true;
-	dt.isConstHandle = true;
-
-	return dt;
-}
-
-bool asCDataType::IsNullHandle() const
-{
-	if( tokenType == ttUnrecognizedToken &&
-		typeInfo == 0 &&
-		isObjectHandle  )
-		return true;
-
-	return false;
-}
-
-asCString asCDataType::Format(asSNameSpace *currNs, bool includeNamespace) const
-{
-	if( IsNullHandle() )
-		return "<null handle>";
-
-	asCString str;
-
-	if( isReadOnly )
-		str = "const ";
-
-	// If the type is not declared in the current namespace, then the namespace 
-	// must always be informed to guarantee that the correct type is informed
-	if (includeNamespace || (typeInfo && typeInfo->nameSpace != currNs))
-	{
-		if (typeInfo && typeInfo->nameSpace && typeInfo->nameSpace->name != "")
-			str += typeInfo->nameSpace->name + "::";
-	}
-	if (typeInfo && typeInfo->nameSpace == 0)
-	{
-		// If funcDef->nameSpace is null it means the funcDef was declared as member of 
-		// another type, in which case the scope should be built with the name of that type
-		str += typeInfo->CastToFuncdefType()->parentClass->name + "::";
-	}
-
-	if( tokenType != ttIdentifier )
-	{
-		str += asCTokenizer::GetDefinition(tokenType);
-	}
-	else if( IsArrayType() && typeInfo && !typeInfo->engine->ep.expandDefaultArrayToTemplate )
-	{
-		asCObjectType *ot = typeInfo->CastToObjectType();
-		asASSERT( ot && ot->templateSubTypes.GetLength() == 1 );
-		str += ot->templateSubTypes[0].Format(currNs, includeNamespace);
-		str += "[]";
-	}
-	else if(typeInfo)
-	{
-		str += typeInfo->name;
-		asCObjectType *ot = typeInfo->CastToObjectType();
-		if( ot && ot->templateSubTypes.GetLength() > 0 )
-		{
-			str += "<";
-			for( asUINT subtypeIndex = 0; subtypeIndex < ot->templateSubTypes.GetLength(); subtypeIndex++ )
-			{
-				str += ot->templateSubTypes[subtypeIndex].Format(currNs, includeNamespace);
-				if( subtypeIndex != ot->templateSubTypes.GetLength()-1 )
-					str += ",";
-			}
-			str += ">";
-		}
-	}
-	else if( isAuto )
-	{
-		str += "<auto>";
-	}
-	else
-	{
-		str = "<unknown>";
-	}
-
-	if( isObjectHandle )
-	{
-		str += "@";
-		if( isConstHandle )
-			str += "const";
-	}
-
-	if( isReference )
-		str += "&";
-
-	return str;
-}
-
-asCDataType &asCDataType::operator =(const asCDataType &dt)
-{
-	tokenType              = dt.tokenType;
-	isReference            = dt.isReference;
-	typeInfo               = dt.typeInfo;
-	isReadOnly             = dt.isReadOnly;
-	isObjectHandle         = dt.isObjectHandle;
-	isConstHandle          = dt.isConstHandle;
-	isAuto                 = dt.isAuto;
-	isHandleToAsHandleType = dt.isHandleToAsHandleType;
-
-	return (asCDataType &)*this;
-}
-
-int asCDataType::MakeHandle(bool b, bool acceptHandleForScope)
-{
-	if( !b )
-	{
-		isObjectHandle = false;
-		isConstHandle = false;
-		isHandleToAsHandleType = false;
-	}
-	else
-	{
-		if( isAuto )
-		{
-			isObjectHandle = true;
-		}
-		else if( !isObjectHandle )
-		{
-			// Only reference types are allowed to be handles, 
-			// but not nohandle reference types, and not scoped references 
-			// (except when returned from registered function)
-			// funcdefs are special reference types and support handles
-			// value types with asOBJ_ASHANDLE are treated as a handle
-			if( (!typeInfo ||
-				!((typeInfo->flags & asOBJ_REF) || (typeInfo->flags & asOBJ_TEMPLATE_SUBTYPE) || (typeInfo->flags & asOBJ_ASHANDLE) || (typeInfo->flags & asOBJ_FUNCDEF)) ||
-				(typeInfo->flags & asOBJ_NOHANDLE) ||
-				((typeInfo->flags & asOBJ_SCOPED) && !acceptHandleForScope)) )
-				return -1;
-
-			isObjectHandle = b;
-			isConstHandle = false;
-
-			// ASHANDLE supports being handle, but as it really is a value type it will not be marked as a handle
-			if( (typeInfo->flags & asOBJ_ASHANDLE) )
-			{
-				isObjectHandle = false;
-				isHandleToAsHandleType = true;
-			}
-		}
-	}
-
-	return 0;
-}
-
-int asCDataType::MakeArray(asCScriptEngine *engine, asCModule *module)
-{
-	if( engine->defaultArrayObjectType == 0 )
-		return asINVALID_TYPE;
-
-	bool tmpIsReadOnly = isReadOnly;
-	isReadOnly = false;
-	asCArray<asCDataType> subTypes;
-	subTypes.PushLast(*this);
-	asCObjectType *at = engine->GetTemplateInstanceType(engine->defaultArrayObjectType, subTypes, module);
-	isReadOnly = tmpIsReadOnly;
-
-	isObjectHandle = false;
-	isConstHandle = false;
-	
-	typeInfo = at;
-	tokenType = ttIdentifier;
-
-	return 0;
-}
-
-int asCDataType::MakeReference(bool b)
-{
-	isReference = b;
-
-	return 0;
-}
-
-int asCDataType::MakeReadOnly(bool b)
-{
-	if( isObjectHandle )
-	{
-		isConstHandle = b;
-		return 0;
-	}
-
-	isReadOnly = b;
-	return 0;
-}
-
-int asCDataType::MakeHandleToConst(bool b)
-{
-	if( !isObjectHandle ) return -1;
-
-	isReadOnly = b;
-	return 0;
-}
-
-bool asCDataType::SupportHandles() const
-{
-	if( typeInfo &&
-		(typeInfo->flags & (asOBJ_REF | asOBJ_ASHANDLE | asOBJ_FUNCDEF)) &&
-		!(typeInfo->flags & asOBJ_NOHANDLE) &&
-		!isObjectHandle )
-		return true;
-
-	return false;
-}
-
-bool asCDataType::CanBeInstantiated() const
-{
-	if( GetSizeOnStackDWords() == 0 ) // Void
-		return false;
-
-	if( !IsObject() && !IsFuncdef() ) // Primitives
-		return true; 
-
-	if (IsNullHandle()) // null
-		return false;
-
-	if( IsObjectHandle() && !(typeInfo->flags & asOBJ_NOHANDLE) ) // Handles
-		return true;
-
-	// Funcdefs cannot be instantiated without being handles
-	// The exception being delegates, but these can only be created as temporary objects
-	if (IsFuncdef())
-		return false;
-
-	asCObjectType *ot = typeInfo->CastToObjectType();
-	if( ot && (ot->flags & asOBJ_REF) && ot->beh.factories.GetLength() == 0 ) // ref types without factories
-		return false;
-
-	if( ot && (ot->flags & asOBJ_ABSTRACT) && !IsObjectHandle() ) // Can't instantiate abstract classes
-		return false;
-
-	return true;
-}
-
-bool asCDataType::IsAbstractClass() const
-{
-	return typeInfo && (typeInfo->flags & asOBJ_ABSTRACT) ? true : false;
-}
-
-bool asCDataType::IsInterface() const
-{
-	if (typeInfo == 0)
-		return false;
-
-	asCObjectType *ot = typeInfo->CastToObjectType();
-	return ot && ot->IsInterface();
-}
-
-bool asCDataType::CanBeCopied() const
-{
-	// All primitives can be copied
-	if( IsPrimitive() ) return true;
-
-	// Plain-old-data structures can always be copied
-	if( typeInfo->flags & asOBJ_POD ) return true;
-
-	// It must be possible to instantiate the type
-	if( !CanBeInstantiated() ) return false;
-
-	// It must have a default constructor or factory
-	asCObjectType *ot = typeInfo->CastToObjectType();
-	if( ot && ot->beh.construct == 0 &&
-		ot->beh.factory == 0 ) return false;
-
-	// It must be possible to copy the type
-	if( ot && ot->beh.copy == 0 ) return false;
-
-	return true;
-}
-
-bool asCDataType::IsReadOnly() const
-{
-	if( isObjectHandle )
-		return isConstHandle;
-
-	return isReadOnly;
-}
-
-bool asCDataType::IsHandleToConst() const
-{
-	if( !isObjectHandle ) return false;
-	return isReadOnly;
-}
-
-bool asCDataType::IsObjectConst() const
-{
-	if( IsObjectHandle() )
-		return IsHandleToConst();
-
-	return IsReadOnly();
-}
-
-// TODO: 3.0.0: This should be removed
-bool asCDataType::IsArrayType() const
-{
-	// This is only true if the type used is the default array type, i.e. the one used for the [] syntax form
-	if( typeInfo && typeInfo->engine->defaultArrayObjectType )
-		return typeInfo->name == typeInfo->engine->defaultArrayObjectType->name;
-	
-	return false;
-}
-
-bool asCDataType::IsTemplate() const
-{
-	if( typeInfo && (typeInfo->flags & asOBJ_TEMPLATE) )
-		return true;
-
-	return false;
-}
-
-bool asCDataType::IsScriptObject() const
-{
-	if( typeInfo && (typeInfo->flags & asOBJ_SCRIPT_OBJECT) )
-		return true;
-
-	return false;
-}
-
-asCDataType asCDataType::GetSubType(asUINT subtypeIndex) const
-{
-	asASSERT(typeInfo);
-	asCObjectType *ot = typeInfo->CastToObjectType();
-	return ot->templateSubTypes[subtypeIndex];
-}
-
-
-bool asCDataType::operator !=(const asCDataType &dt) const
-{
-	return !(*this == dt);
-}
-
-bool asCDataType::operator ==(const asCDataType &dt) const
-{
-	if( !IsEqualExceptRefAndConst(dt) ) return false;
-	if( isReference != dt.isReference ) return false;
-	if( isReadOnly != dt.isReadOnly ) return false;
-	if( isConstHandle != dt.isConstHandle ) return false;
-
-	return true;
-}
-
-bool asCDataType::IsEqualExceptRef(const asCDataType &dt) const
-{
-	if( !IsEqualExceptRefAndConst(dt) ) return false;
-	if( isReadOnly != dt.isReadOnly ) return false;
-	if( isConstHandle != dt.isConstHandle ) return false;
-
-	return true;
-}
-
-bool asCDataType::IsEqualExceptRefAndConst(const asCDataType &dt) const
-{
-	// Check base type
-	if( tokenType != dt.tokenType ) return false;
-	if( typeInfo != dt.typeInfo ) return false;
-	if( isObjectHandle != dt.isObjectHandle ) return false;
-	if( isObjectHandle )
-		if( isReadOnly != dt.isReadOnly ) return false;
-
-	return true;
-}
-
-bool asCDataType::IsEqualExceptConst(const asCDataType &dt) const
-{
-	if( !IsEqualExceptRefAndConst(dt) ) return false;
-	if( isReference != dt.isReference ) return false;
-
-	return true;
-}
-
-bool asCDataType::IsPrimitive() const
-{
-	// Enumerations are primitives
-	if( IsEnumType() )
-		return true;
-
-	// A registered object is never a primitive neither is a pointer nor an array
-	if( typeInfo )
-		return false;
-
-	// Null handle doesn't have a typeInfo, but it is not a primitive
-	if( tokenType == ttUnrecognizedToken )
-		return false;
-
-	return true;
-}
-
-bool asCDataType::IsMathType() const
-{
-	if( tokenType == ttInt || tokenType == ttInt8 || tokenType == ttInt16 || tokenType == ttInt64 ||
-		tokenType == ttUInt || tokenType == ttUInt8 || tokenType == ttUInt16 || tokenType == ttUInt64 ||
-		tokenType == ttFloat || tokenType == ttDouble )
-		return true;
-
-	return false;
-}
-
-bool asCDataType::IsIntegerType() const
-{
-	if( tokenType == ttInt ||
-		tokenType == ttInt8 ||
-		tokenType == ttInt16 ||
-		tokenType == ttInt64 )
-		return true;
-
-	// Enums are also integer types
-	return IsEnumType();
-}
-
-bool asCDataType::IsUnsignedType() const
-{
-	if( tokenType == ttUInt ||
-		tokenType == ttUInt8 ||
-		tokenType == ttUInt16 ||
-		tokenType == ttUInt64 )
-		return true;
-
-	return false;
-}
-
-bool asCDataType::IsFloatType() const
-{
-	if( tokenType == ttFloat )
-		return true;
-
-	return false;
-}
-
-bool asCDataType::IsDoubleType() const
-{
-	if( tokenType == ttDouble )
-		return true;
-
-	return false;
-}
-
-bool asCDataType::IsBooleanType() const
-{
-	if( tokenType == ttBool )
-		return true;
-
-	return false;
-}
-
-bool asCDataType::IsObject() const
-{
-	if( IsPrimitive() )
-		return false;
-
-	// Null handle doesn't have an object type but should still be considered an object
-	if( typeInfo == 0 )
-		return IsNullHandle();
-
-	// Template subtypes shouldn't be considered objects
-	return typeInfo->CastToObjectType() ? true : false;
-}
-
-bool asCDataType::IsFuncdef() const
-{
-	if (typeInfo && (typeInfo->flags & asOBJ_FUNCDEF))
-		return true;
-
-	return false;
-}
-
-int asCDataType::GetSizeInMemoryBytes() const
-{
-	if( typeInfo != 0 )
-		return typeInfo->size;
-
-	if( tokenType == ttVoid )
-		return 0;
-
-	if( tokenType == ttInt8 ||
-		tokenType == ttUInt8 )
-		return 1;
-
-	if( tokenType == ttInt16 ||
-		tokenType == ttUInt16 )
-		return 2;
-
-	if( tokenType == ttDouble ||
-		tokenType == ttInt64 ||
-		tokenType == ttUInt64 )
-		return 8;
-
-	if( tokenType == ttBool )
-		return AS_SIZEOF_BOOL;
-
-	// null handle
-	if( tokenType == ttUnrecognizedToken )
-		return 4*AS_PTR_SIZE;
-
-	return 4;
-}
-
-int asCDataType::GetSizeInMemoryDWords() const
-{
-	int s = GetSizeInMemoryBytes();
-	if( s == 0 ) return 0;
-	if( s <= 4 ) return 1;
-	
-	// Pad the size to 4 bytes
-	if( s & 0x3 )
-		s += 4 - (s & 0x3);
-
-	return s/4;
-}
-
-int asCDataType::GetSizeOnStackDWords() const
-{
-	// If the type is the variable type then the typeid is stored on the stack too
-	int size = tokenType == ttQuestion ? 1 : 0;
-
-	if( isReference ) return AS_PTR_SIZE + size;
-	if( typeInfo && !IsEnumType() ) return AS_PTR_SIZE + size;
-
-	return GetSizeInMemoryDWords() + size;
-}
-
-#ifdef WIP_16BYTE_ALIGN
-int  asCDataType::GetAlignment() const
-{
-	if( typeInfo == NULL )
-	{
-		// TODO: Small primitives should not be aligned to 4 byte boundaries
-		return 4; //Default alignment
-	}
-
-	return typeInfo->alignment;
-}
-#endif
-
-asSTypeBehaviour *asCDataType::GetBehaviour() const
-{
-	if (!typeInfo) return 0;
-	asCObjectType *ot = typeInfo->CastToObjectType();
-	return ot ? &ot->beh : 0; 
-}
-
-bool asCDataType::IsEnumType() const
-{
-	// Do a sanity check on the objectType, to verify that we aren't trying to access memory after it has been released
-	asASSERT(typeInfo == 0 || typeInfo->name.GetLength() < 100);
-
-	if (typeInfo && (typeInfo->flags & asOBJ_ENUM))
-		return true;
-
-	return false;
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_datatype.cpp
+//
+// This class describes the datatype for expressions during compilation
+//
+
+#include "as_config.h"
+#include "as_datatype.h"
+#include "as_tokendef.h"
+#include "as_typeinfo.h"
+#include "as_objecttype.h"
+#include "as_scriptengine.h"
+#include "as_tokenizer.h"
+
+BEGIN_AS_NAMESPACE
+
+asCDataType::asCDataType()
+{
+	tokenType              = ttUnrecognizedToken;
+	typeInfo               = 0;
+	isReference            = false;
+	isReadOnly             = false;
+	isAuto                 = false;
+	isObjectHandle         = false;
+	isConstHandle          = false;
+	isHandleToAsHandleType = false;
+	ifHandleThenConst      = false;
+}
+
+asCDataType::asCDataType(const asCDataType &dt)
+{
+	tokenType              = dt.tokenType;
+	typeInfo               = dt.typeInfo;
+	isReference            = dt.isReference;
+	isReadOnly             = dt.isReadOnly;
+	isAuto                 = dt.isAuto;
+	isObjectHandle         = dt.isObjectHandle;
+	isConstHandle          = dt.isConstHandle;
+	isHandleToAsHandleType = dt.isHandleToAsHandleType;
+	ifHandleThenConst      = dt.ifHandleThenConst;
+}
+
+asCDataType::~asCDataType()
+{
+}
+
+bool asCDataType::IsValid() const
+{
+	if( tokenType == ttUnrecognizedToken &&
+		!isObjectHandle )
+		return false;
+
+	return true;
+}
+
+asCDataType asCDataType::CreateType(asCTypeInfo *ti, bool isConst)
+{
+	asCDataType dt;
+
+	dt.tokenType        = ttIdentifier;
+	dt.typeInfo         = ti;
+	dt.isReadOnly       = isConst;
+
+	return dt;
+}
+
+asCDataType asCDataType::CreateAuto(bool isConst)
+{
+	asCDataType dt;
+
+	dt.tokenType        = ttIdentifier;
+	dt.isReadOnly       = isConst;
+	dt.isAuto           = true;
+
+	return dt;
+}
+
+asCDataType asCDataType::CreateObjectHandle(asCTypeInfo *ot, bool isConst)
+{
+	asCDataType dt;
+
+	asASSERT(CastToObjectType(ot));
+
+	dt.tokenType        = ttIdentifier;
+	dt.typeInfo         = ot;
+	dt.isObjectHandle   = true;
+	dt.isConstHandle    = isConst;
+
+	return dt;
+}
+
+asCDataType asCDataType::CreatePrimitive(eTokenType tt, bool isConst)
+{
+	asCDataType dt;
+
+	dt.tokenType        = tt;
+	dt.isReadOnly       = isConst;
+
+	return dt;
+}
+
+asCDataType asCDataType::CreateNullHandle()
+{
+	asCDataType dt;
+
+	dt.tokenType = ttUnrecognizedToken;
+	dt.isReadOnly = true;
+	dt.isObjectHandle = true;
+	dt.isConstHandle = true;
+
+	return dt;
+}
+
+bool asCDataType::IsNullHandle() const
+{
+	if( tokenType == ttUnrecognizedToken &&
+		typeInfo == 0 &&
+		isObjectHandle  )
+		return true;
+
+	return false;
+}
+
+asCString asCDataType::Format(asSNameSpace *currNs, bool includeNamespace) const
+{
+	if( IsNullHandle() )
+		return "<null handle>";
+
+	asCString str;
+
+	if( isReadOnly )
+		str = "const ";
+
+	// If the type is not declared in the current namespace, then the namespace 
+	// must always be informed to guarantee that the correct type is informed
+	if (includeNamespace || (typeInfo && typeInfo->nameSpace != currNs))
+	{
+		if (typeInfo && typeInfo->nameSpace && typeInfo->nameSpace->name != "")
+			str += typeInfo->nameSpace->name + "::";
+	}
+	if (typeInfo && typeInfo->nameSpace == 0)
+	{
+		// If funcDef->nameSpace is null it means the funcDef was declared as member of 
+		// another type, in which case the scope should be built with the name of that type
+		str += CastToFuncdefType(typeInfo)->parentClass->name + "::";
+	}
+
+	if( tokenType != ttIdentifier )
+	{
+		str += asCTokenizer::GetDefinition(tokenType);
+	}
+	else if( IsArrayType() && typeInfo && !typeInfo->engine->ep.expandDefaultArrayToTemplate )
+	{
+		asCObjectType *ot = CastToObjectType(typeInfo);
+		asASSERT( ot && ot->templateSubTypes.GetLength() == 1 );
+		str += ot->templateSubTypes[0].Format(currNs, includeNamespace);
+		str += "[]";
+	}
+	else if(typeInfo)
+	{
+		str += typeInfo->name;
+		asCObjectType *ot = CastToObjectType(typeInfo);
+		if( ot && ot->templateSubTypes.GetLength() > 0 )
+		{
+			str += "<";
+			for( asUINT subtypeIndex = 0; subtypeIndex < ot->templateSubTypes.GetLength(); subtypeIndex++ )
+			{
+				str += ot->templateSubTypes[subtypeIndex].Format(currNs, includeNamespace);
+				if( subtypeIndex != ot->templateSubTypes.GetLength()-1 )
+					str += ",";
+			}
+			str += ">";
+		}
+	}
+	else if( isAuto )
+	{
+		str += "<auto>";
+	}
+	else
+	{
+		str = "<unknown>";
+	}
+
+	if( isObjectHandle )
+	{
+		str += "@";
+		if( isConstHandle )
+			str += "const";
+	}
+
+	if( isReference )
+		str += "&";
+
+	return str;
+}
+
+asCDataType &asCDataType::operator =(const asCDataType &dt)
+{
+	tokenType              = dt.tokenType;
+	isReference            = dt.isReference;
+	typeInfo               = dt.typeInfo;
+	isReadOnly             = dt.isReadOnly;
+	isObjectHandle         = dt.isObjectHandle;
+	isConstHandle          = dt.isConstHandle;
+	isAuto                 = dt.isAuto;
+	isHandleToAsHandleType = dt.isHandleToAsHandleType;
+	ifHandleThenConst      = dt.ifHandleThenConst;
+
+	return (asCDataType &)*this;
+}
+
+int asCDataType::MakeHandle(bool b, bool acceptHandleForScope)
+{
+	if( !b )
+	{
+		isObjectHandle = false;
+		isConstHandle = false;
+		isHandleToAsHandleType = false;
+	}
+	else
+	{
+		if( isAuto )
+		{
+			isObjectHandle = true;
+		}
+		else if( !isObjectHandle )
+		{
+			// Only reference types are allowed to be handles, 
+			// but not nohandle reference types, and not scoped references 
+			// (except when returned from registered function)
+			// funcdefs are special reference types and support handles
+			// value types with asOBJ_ASHANDLE are treated as a handle
+			if( (!typeInfo ||
+				!((typeInfo->flags & asOBJ_REF) || (typeInfo->flags & asOBJ_TEMPLATE_SUBTYPE) || (typeInfo->flags & asOBJ_ASHANDLE) || (typeInfo->flags & asOBJ_FUNCDEF)) ||
+				(typeInfo->flags & asOBJ_NOHANDLE) ||
+				((typeInfo->flags & asOBJ_SCOPED) && !acceptHandleForScope)) )
+				return -1;
+
+			isObjectHandle = b;
+			isConstHandle = false;
+
+			// ASHANDLE supports being handle, but as it really is a value type it will not be marked as a handle
+			if( (typeInfo->flags & asOBJ_ASHANDLE) )
+			{
+				isObjectHandle = false;
+				isHandleToAsHandleType = true;
+			}
+		}
+	}
+
+	return 0;
+}
+
+int asCDataType::MakeArray(asCScriptEngine *engine, asCModule *module)
+{
+	if( engine->defaultArrayObjectType == 0 )
+		return asINVALID_TYPE;
+
+	bool tmpIsReadOnly = isReadOnly;
+	isReadOnly = false;
+	asCArray<asCDataType> subTypes;
+	subTypes.PushLast(*this);
+	asCObjectType *at = engine->GetTemplateInstanceType(engine->defaultArrayObjectType, subTypes, module);
+	isReadOnly = tmpIsReadOnly;
+
+	isObjectHandle = false;
+	isConstHandle = false;
+	
+	typeInfo = at;
+	tokenType = ttIdentifier;
+
+	return 0;
+}
+
+int asCDataType::MakeReference(bool b)
+{
+	isReference = b;
+
+	return 0;
+}
+
+int asCDataType::MakeReadOnly(bool b)
+{
+	if( isObjectHandle )
+	{
+		isConstHandle = b;
+		return 0;
+	}
+
+	isReadOnly = b;
+	return 0;
+}
+
+int asCDataType::MakeHandleToConst(bool b)
+{
+	if( !isObjectHandle ) return -1;
+
+	isReadOnly = b;
+	return 0;
+}
+
+bool asCDataType::SupportHandles() const
+{
+	if( typeInfo &&
+		(typeInfo->flags & (asOBJ_REF | asOBJ_ASHANDLE | asOBJ_FUNCDEF)) &&
+		!(typeInfo->flags & asOBJ_NOHANDLE) &&
+		!isObjectHandle )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::CanBeInstantiated() const
+{
+	if( GetSizeOnStackDWords() == 0 ) // Void
+		return false;
+
+	if( !IsObject() && !IsFuncdef() ) // Primitives
+		return true; 
+
+	if (IsNullHandle()) // null
+		return false;
+
+	if( IsObjectHandle() && !(typeInfo->flags & asOBJ_NOHANDLE) ) // Handles
+		return true;
+
+	// Funcdefs cannot be instantiated without being handles
+	// The exception being delegates, but these can only be created as temporary objects
+	if (IsFuncdef())
+		return false;
+
+	asCObjectType *ot = CastToObjectType(typeInfo);
+	if( ot && (ot->flags & asOBJ_REF) && ot->beh.factories.GetLength() == 0 ) // ref types without factories
+		return false;
+
+	if( ot && (ot->flags & asOBJ_ABSTRACT) && !IsObjectHandle() ) // Can't instantiate abstract classes
+		return false;
+
+	return true;
+}
+
+bool asCDataType::IsAbstractClass() const
+{
+	return typeInfo && (typeInfo->flags & asOBJ_ABSTRACT) ? true : false;
+}
+
+bool asCDataType::IsInterface() const
+{
+	if (typeInfo == 0)
+		return false;
+
+	asCObjectType *ot = CastToObjectType(typeInfo);
+	return ot && ot->IsInterface();
+}
+
+bool asCDataType::CanBeCopied() const
+{
+	// All primitives can be copied
+	if( IsPrimitive() ) return true;
+
+	// Plain-old-data structures can always be copied
+	if( typeInfo->flags & asOBJ_POD ) return true;
+
+	// It must be possible to instantiate the type
+	if( !CanBeInstantiated() ) return false;
+
+	// It must have a default constructor or factory and the opAssign
+	// Alternatively it must have the copy constructor
+	asCObjectType *ot = CastToObjectType(typeInfo);
+	if (ot && (((ot->beh.construct != 0 || ot->beh.factory != 0) && ot->beh.copy != 0) || 
+		       (ot->beh.copyconstruct != 0 || ot->beh.copyfactory != 0)) )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::IsReadOnly() const
+{
+	if( isObjectHandle )
+		return isConstHandle;
+
+	return isReadOnly;
+}
+
+bool asCDataType::IsHandleToConst() const
+{
+	if( !isObjectHandle ) return false;
+	return isReadOnly;
+}
+
+bool asCDataType::IsObjectConst() const
+{
+	if( IsObjectHandle() )
+		return IsHandleToConst();
+
+	return IsReadOnly();
+}
+
+// TODO: 3.0.0: This should be removed
+bool asCDataType::IsArrayType() const
+{
+	// This is only true if the type used is the default array type, i.e. the one used for the [] syntax form
+	if( typeInfo && typeInfo->engine->defaultArrayObjectType )
+		return typeInfo->name == typeInfo->engine->defaultArrayObjectType->name;
+	
+	return false;
+}
+
+bool asCDataType::IsTemplate() const
+{
+	if( typeInfo && (typeInfo->flags & asOBJ_TEMPLATE) )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::IsScriptObject() const
+{
+	if( typeInfo && (typeInfo->flags & asOBJ_SCRIPT_OBJECT) )
+		return true;
+
+	return false;
+}
+
+asCDataType asCDataType::GetSubType(asUINT subtypeIndex) const
+{
+	asASSERT(typeInfo);
+	asCObjectType *ot = CastToObjectType(typeInfo);
+	return ot->templateSubTypes[subtypeIndex];
+}
+
+
+bool asCDataType::operator !=(const asCDataType &dt) const
+{
+	return !(*this == dt);
+}
+
+bool asCDataType::operator ==(const asCDataType &dt) const
+{
+	if( !IsEqualExceptRefAndConst(dt) ) return false;
+	if( isReference != dt.isReference ) return false;
+	if( isReadOnly != dt.isReadOnly ) return false;
+	if( isConstHandle != dt.isConstHandle ) return false;
+
+	return true;
+}
+
+bool asCDataType::IsEqualExceptRef(const asCDataType &dt) const
+{
+	if( !IsEqualExceptRefAndConst(dt) ) return false;
+	if( isReadOnly != dt.isReadOnly ) return false;
+	if( isConstHandle != dt.isConstHandle ) return false;
+
+	return true;
+}
+
+bool asCDataType::IsEqualExceptRefAndConst(const asCDataType &dt) const
+{
+	// Check base type
+	if( tokenType != dt.tokenType ) return false;
+	if( typeInfo != dt.typeInfo ) return false;
+	if( isObjectHandle != dt.isObjectHandle ) return false;
+	if( isObjectHandle )
+		if( isReadOnly != dt.isReadOnly ) return false;
+
+	return true;
+}
+
+bool asCDataType::IsEqualExceptConst(const asCDataType &dt) const
+{
+	if( !IsEqualExceptRefAndConst(dt) ) return false;
+	if( isReference != dt.isReference ) return false;
+
+	return true;
+}
+
+bool asCDataType::IsPrimitive() const
+{
+	// Enumerations are primitives
+	if( IsEnumType() )
+		return true;
+
+	// A registered object is never a primitive neither is a pointer nor an array
+	if( typeInfo )
+		return false;
+
+	// Null handle doesn't have a typeInfo, but it is not a primitive
+	if( tokenType == ttUnrecognizedToken )
+		return false;
+
+	return true;
+}
+
+bool asCDataType::IsMathType() const
+{
+	if( tokenType == ttInt || tokenType == ttInt8 || tokenType == ttInt16 || tokenType == ttInt64 ||
+		tokenType == ttUInt || tokenType == ttUInt8 || tokenType == ttUInt16 || tokenType == ttUInt64 ||
+		tokenType == ttFloat || tokenType == ttDouble )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::IsIntegerType() const
+{
+	if( tokenType == ttInt ||
+		tokenType == ttInt8 ||
+		tokenType == ttInt16 ||
+		tokenType == ttInt64 )
+		return true;
+
+	// Enums are also integer types
+	return IsEnumType();
+}
+
+bool asCDataType::IsUnsignedType() const
+{
+	if( tokenType == ttUInt ||
+		tokenType == ttUInt8 ||
+		tokenType == ttUInt16 ||
+		tokenType == ttUInt64 )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::IsFloatType() const
+{
+	if( tokenType == ttFloat )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::IsDoubleType() const
+{
+	if( tokenType == ttDouble )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::IsBooleanType() const
+{
+	if( tokenType == ttBool )
+		return true;
+
+	return false;
+}
+
+bool asCDataType::IsObject() const
+{
+	if( IsPrimitive() )
+		return false;
+
+	// Null handle doesn't have an object type but should still be considered an object
+	if( typeInfo == 0 )
+		return IsNullHandle();
+
+	// Template subtypes shouldn't be considered objects
+	return CastToObjectType(typeInfo) ? true : false;
+}
+
+bool asCDataType::IsFuncdef() const
+{
+	if (typeInfo && (typeInfo->flags & asOBJ_FUNCDEF))
+		return true;
+
+	return false;
+}
+
+int asCDataType::GetSizeInMemoryBytes() const
+{
+	if( typeInfo != 0 )
+		return typeInfo->size;
+
+	if( tokenType == ttVoid )
+		return 0;
+
+	if( tokenType == ttInt8 ||
+		tokenType == ttUInt8 )
+		return 1;
+
+	if( tokenType == ttInt16 ||
+		tokenType == ttUInt16 )
+		return 2;
+
+	if( tokenType == ttDouble ||
+		tokenType == ttInt64 ||
+		tokenType == ttUInt64 )
+		return 8;
+
+	if( tokenType == ttBool )
+		return AS_SIZEOF_BOOL;
+
+	// null handle
+	if( tokenType == ttUnrecognizedToken )
+		return 4*AS_PTR_SIZE;
+
+	return 4;
+}
+
+int asCDataType::GetSizeInMemoryDWords() const
+{
+	int s = GetSizeInMemoryBytes();
+	if( s == 0 ) return 0;
+	if( s <= 4 ) return 1;
+	
+	// Pad the size to 4 bytes
+	if( s & 0x3 )
+		s += 4 - (s & 0x3);
+
+	return s/4;
+}
+
+int asCDataType::GetSizeOnStackDWords() const
+{
+	// If the type is the variable type then the typeid is stored on the stack too
+	int size = tokenType == ttQuestion ? 1 : 0;
+
+	if( isReference ) return AS_PTR_SIZE + size;
+
+	// TODO: bug: Registered value types are also stored on the stack. Before changing though, check how GetSizeOnStackDWords is used
+	if( typeInfo && !IsEnumType() ) return AS_PTR_SIZE + size;
+
+	return GetSizeInMemoryDWords() + size;
+}
+
+#ifdef WIP_16BYTE_ALIGN
+int  asCDataType::GetAlignment() const
+{
+	if( typeInfo == NULL )
+	{
+		// TODO: Small primitives should not be aligned to 4 byte boundaries
+		return 4; //Default alignment
+	}
+
+	return typeInfo->alignment;
+}
+#endif
+
+asSTypeBehaviour *asCDataType::GetBehaviour() const
+{
+	if (!typeInfo) return 0;
+	asCObjectType *ot = CastToObjectType(typeInfo);
+	return ot ? &ot->beh : 0; 
+}
+
+bool asCDataType::IsEnumType() const
+{
+	// Do a sanity check on the objectType, to verify that we aren't trying to access memory after it has been released
+	asASSERT(typeInfo == 0 || typeInfo->name.GetLength() < 100);
+
+	if (typeInfo && (typeInfo->flags & asOBJ_ENUM))
+		return true;
+
+	return false;
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_datatype.h b/Sources/AngelScript/source/as_datatype.h
old mode 100755
new mode 100644
index b69129217..665f83a42
--- a/Sources/AngelScript/source/as_datatype.h
+++ b/Sources/AngelScript/source/as_datatype.h
@@ -1,158 +1,161 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_datatype.h
-//
-// This class describes the datatype for expressions during compilation
-//
-
-
-
-#ifndef AS_DATATYPE_H
-#define AS_DATATYPE_H
-
-#include "as_tokendef.h"
-#include "as_string.h"
-
-BEGIN_AS_NAMESPACE
-
-struct asSTypeBehaviour;
-class asCScriptEngine;
-class asCTypeInfo;
-class asCScriptFunction;
-class asCModule;
-class asCObjectType;
-class asCEnumType;
-struct asSNameSpace;
-
-// TODO: refactor: Reference should not be part of the datatype. This should be stored separately, e.g. in asCExprValue
-//                 MakeReference, MakeReadOnly, IsReference, IsReadOnly should be removed
-
-class asCDataType
-{
-public:
-	asCDataType();
-	asCDataType(const asCDataType &);
-	~asCDataType();
-
-	bool IsValid() const;
-
-	asCString Format(asSNameSpace *currNs, bool includeNamespace = false) const;
-
-	static asCDataType CreatePrimitive(eTokenType tt, bool isConst);
-	static asCDataType CreateType(asCTypeInfo *ti, bool isConst);
-	static asCDataType CreateAuto(bool isConst);
-	static asCDataType CreateObjectHandle(asCTypeInfo *ot, bool isConst);
-	static asCDataType CreateNullHandle();
-
-	int MakeHandle(bool b, bool acceptHandleForScope = false);
-	int MakeArray(asCScriptEngine *engine, asCModule *requestingModule);
-	int MakeReference(bool b);
-	int MakeReadOnly(bool b);
-	int MakeHandleToConst(bool b);
-
-	bool IsTemplate()             const;
-	bool IsScriptObject()         const;
-	bool IsPrimitive()            const;
-	bool IsMathType()             const;
-	bool IsObject()               const;
-	bool IsReference()            const {return isReference;}
-	bool IsAuto()                 const {return isAuto;}
-	bool IsReadOnly()             const;
-	bool IsIntegerType()          const;
-	bool IsUnsignedType()         const;
-	bool IsFloatType()            const;
-	bool IsDoubleType()           const;
-	bool IsBooleanType()          const;
-	bool IsObjectHandle()         const {return isObjectHandle;}
-	bool IsHandleToAuto()         const {return isAuto && isObjectHandle;}
-	bool IsHandleToConst()        const;
-	bool IsArrayType()            const;
-	bool IsEnumType()             const;
-	bool IsAnyType()              const {return tokenType == ttQuestion;}
-	bool IsHandleToAsHandleType() const {return isHandleToAsHandleType;}
-	bool IsAbstractClass()        const;
-	bool IsInterface()            const;
-	bool IsFuncdef()              const;
-
-	bool IsObjectConst()    const;
-
-	bool IsEqualExceptRef(const asCDataType &)             const;
-	bool IsEqualExceptRefAndConst(const asCDataType &)     const;
-	bool IsEqualExceptConst(const asCDataType &)           const;
-	bool IsNullHandle()                                    const;
-
-	bool SupportHandles() const;
-	bool CanBeInstantiated() const;
-	bool CanBeCopied() const;
-
-	bool operator ==(const asCDataType &) const;
-	bool operator !=(const asCDataType &) const;
-
-	asCDataType        GetSubType(asUINT subtypeIndex = 0)    const;
-	eTokenType         GetTokenType()  const {return tokenType;}
-	asCTypeInfo       *GetTypeInfo() const { return typeInfo; }
-
-	int  GetSizeOnStackDWords()  const;
-	int  GetSizeInMemoryBytes()  const;
-	int  GetSizeInMemoryDWords() const;
-#ifdef WIP_16BYTE_ALIGN
-	int  GetAlignment()          const;
-#endif
-
-	void SetTokenType(eTokenType tt)         {tokenType = tt;}
-	void SetTypeInfo(asCTypeInfo *ti)       {typeInfo = ti;}
-
-	asCDataType &operator =(const asCDataType &);
-
-	asSTypeBehaviour *GetBehaviour() const;
-
-protected:
-	// Base object type
-	eTokenType tokenType;
-
-	// Behaviour type
-	asCTypeInfo *typeInfo;
-
-	// Top level
-	bool isReference:1;
-	bool isReadOnly:1;
-	bool isObjectHandle:1;
-	bool isConstHandle:1;
-	bool isAuto:1;
-	bool isHandleToAsHandleType:1; // Used by the compiler to know how to initialize the object
-	char dummy:2;
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2016 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_datatype.h
+//
+// This class describes the datatype for expressions during compilation
+//
+
+
+
+#ifndef AS_DATATYPE_H
+#define AS_DATATYPE_H
+
+#include "as_tokendef.h"
+#include "as_string.h"
+
+BEGIN_AS_NAMESPACE
+
+struct asSTypeBehaviour;
+class asCScriptEngine;
+class asCTypeInfo;
+class asCScriptFunction;
+class asCModule;
+class asCObjectType;
+class asCEnumType;
+struct asSNameSpace;
+
+// TODO: refactor: Reference should not be part of the datatype. This should be stored separately, e.g. in asCExprValue
+//                 MakeReference, MakeReadOnly, IsReference, IsReadOnly should be removed
+
+class asCDataType
+{
+public:
+	asCDataType();
+	asCDataType(const asCDataType &);
+	~asCDataType();
+
+	bool IsValid() const;
+
+	asCString Format(asSNameSpace *currNs, bool includeNamespace = false) const;
+
+	static asCDataType CreatePrimitive(eTokenType tt, bool isConst);
+	static asCDataType CreateType(asCTypeInfo *ti, bool isConst);
+	static asCDataType CreateAuto(bool isConst);
+	static asCDataType CreateObjectHandle(asCTypeInfo *ot, bool isConst);
+	static asCDataType CreateNullHandle();
+
+	int MakeHandle(bool b, bool acceptHandleForScope = false);
+	int MakeArray(asCScriptEngine *engine, asCModule *requestingModule);
+	int MakeReference(bool b);
+	int MakeReadOnly(bool b);
+	int MakeHandleToConst(bool b);
+	void SetIfHandleThenConst(bool b) { ifHandleThenConst = b; }
+	bool HasIfHandleThenConst() const { return ifHandleThenConst; }
+
+	bool IsTemplate()             const;
+	bool IsScriptObject()         const;
+	bool IsPrimitive()            const;
+	bool IsMathType()             const;
+	bool IsObject()               const;
+	bool IsReference()            const {return isReference;}
+	bool IsAuto()                 const {return isAuto;}
+	bool IsReadOnly()             const;
+	bool IsIntegerType()          const;
+	bool IsUnsignedType()         const;
+	bool IsFloatType()            const;
+	bool IsDoubleType()           const;
+	bool IsBooleanType()          const;
+	bool IsObjectHandle()         const {return isObjectHandle;}
+	bool IsHandleToAuto()         const {return isAuto && isObjectHandle;}
+	bool IsHandleToConst()        const;
+	bool IsArrayType()            const;
+	bool IsEnumType()             const;
+	bool IsAnyType()              const {return tokenType == ttQuestion;}
+	bool IsHandleToAsHandleType() const {return isHandleToAsHandleType;}
+	bool IsAbstractClass()        const;
+	bool IsInterface()            const;
+	bool IsFuncdef()              const;
+
+	bool IsObjectConst()    const;
+
+	bool IsEqualExceptRef(const asCDataType &)             const;
+	bool IsEqualExceptRefAndConst(const asCDataType &)     const;
+	bool IsEqualExceptConst(const asCDataType &)           const;
+	bool IsNullHandle()                                    const;
+
+	bool SupportHandles() const;
+	bool CanBeInstantiated() const;
+	bool CanBeCopied() const;
+
+	bool operator ==(const asCDataType &) const;
+	bool operator !=(const asCDataType &) const;
+
+	asCDataType        GetSubType(asUINT subtypeIndex = 0)    const;
+	eTokenType         GetTokenType()  const {return tokenType;}
+	asCTypeInfo       *GetTypeInfo() const { return typeInfo; }
+
+	int  GetSizeOnStackDWords()  const;
+	int  GetSizeInMemoryBytes()  const;
+	int  GetSizeInMemoryDWords() const;
+#ifdef WIP_16BYTE_ALIGN
+	int  GetAlignment()          const;
+#endif
+
+	void SetTokenType(eTokenType tt)         {tokenType = tt;}
+	void SetTypeInfo(asCTypeInfo *ti)       {typeInfo = ti;}
+
+	asCDataType &operator =(const asCDataType &);
+
+	asSTypeBehaviour *GetBehaviour() const;
+
+protected:
+	// Base object type
+	eTokenType tokenType;
+
+	// Behaviour type
+	asCTypeInfo *typeInfo;
+
+	// Top level
+	bool isReference:1;
+	bool isReadOnly:1;
+	bool isObjectHandle:1;
+	bool isConstHandle:1;
+	bool isAuto:1;
+	bool isHandleToAsHandleType:1; // Used by the compiler to know how to initialize the object
+	bool ifHandleThenConst:1; // Used when creating template instances to determine if a handle should be const or not
+	char dummy:1;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_debug.h b/Sources/AngelScript/source/as_debug.h
old mode 100755
new mode 100644
index 6474ec9d6..e67d8b3ae
--- a/Sources/AngelScript/source/as_debug.h
+++ b/Sources/AngelScript/source/as_debug.h
@@ -1,270 +1,270 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_debug.h
-//
-
-#ifndef AS_DEBUG_H
-#define AS_DEBUG_H
-
-#include "as_config.h"
-
-#if defined(AS_DEBUG)
-
-#ifndef AS_WII
-// The Wii SDK doesn't have these, we'll survive without AS_DEBUG
-
-#ifndef _WIN32_WCE
-// Neither does WinCE
-
-#ifndef AS_PSVITA
-// Possible on PSVita, but requires SDK access
-
-#if !defined(_MSC_VER) && (defined(__GNUC__) || defined(AS_MARMALADE))
-
-#ifdef __ghs__ 
-// WIIU defines __GNUC__ but types are not defined here in 'conventional' way 
-#include <types.h>
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-typedef float float32_t;
-typedef double float64_t;
-#else
-// Define mkdir for GNUC
-#include <sys/stat.h>
-#include <sys/types.h>
-#define _mkdir(dirname) mkdir(dirname, S_IRWXU)
-#endif
-#else
-#include <direct.h>
-#endif
-
-#endif // AS_PSVITA
-#endif // _WIN32_WCE
-#endif // AS_WII
-
-#endif // !defined(AS_DEBUG)
-
-
-
-#if defined(_MSC_VER) && defined(AS_PROFILE)
-// Currently only do profiling with MSVC++
-
-#include <mmsystem.h>
-#include <direct.h>
-#include "as_string.h"
-#include "as_map.h"
-#include "as_string_util.h"
-
-BEGIN_AS_NAMESPACE
-
-struct TimeCount
-{
-	double time;
-	int    count;
-	double max;
-	double min;
-};
-
-class CProfiler
-{
-public:
-	CProfiler()
-	{
-		// We need to know how often the clock is updated
-		__int64 tps;
-		if( !QueryPerformanceFrequency((LARGE_INTEGER *)&tps) )
-			usePerformance = false;
-		else
-		{
-			usePerformance = true;
-			ticksPerSecond = double(tps);
-		}
-
-		timeOffset = GetTime();
-	}
-
-	~CProfiler()
-	{
-		WriteSummary();
-	}
-
-	double GetTime()
-	{
-		if( usePerformance )
-		{
-			__int64 ticks;
-			QueryPerformanceCounter((LARGE_INTEGER *)&ticks);
-
-			return double(ticks)/ticksPerSecond - timeOffset;
-		}
-		
-		return double(timeGetTime())/1000.0 - timeOffset;
-	}
-
-	double Begin(const char *name)
-	{
-		double time = GetTime();
-
-		// Add the scope to the key
-		if( key.GetLength() )
-			key += "|";
-		key += name;
-
-		// Compensate for the time spent writing to the file
-		timeOffset += GetTime() - time;
-
-		return time;
-	}
-
-	void End(const char * /*name*/, double beginTime)
-	{
-		double time = GetTime();
-
-		double elapsed = time - beginTime;
-
-		// Update the profile info for this scope
-		asSMapNode<asCString, TimeCount> *cursor;
-		if( map.MoveTo(&cursor, key) )
-		{
-			cursor->value.time += elapsed;
-			cursor->value.count++;
-			if( cursor->value.max < elapsed ) 
-				cursor->value.max = elapsed;
-			if( cursor->value.min > elapsed ) 
-				cursor->value.min = elapsed;
-		}
-		else
-		{
-			TimeCount tc = {elapsed, 1, elapsed, elapsed};
-			map.Insert(key, tc);
-		}
-
-		// Remove the inner most scope from the key
-		int n = key.FindLast("|");
-		if( n > 0 )
-			key.SetLength(n);
-		else
-			key.SetLength(0);
-
-		// Compensate for the time spent writing to the file
-		timeOffset += GetTime() - time;
-	}
-	
-protected:
-	void WriteSummary()
-	{
-		// Write the analyzed info into a file for inspection
-		_mkdir("AS_DEBUG");
-		FILE *fp;
-		#if _MSC_VER >= 1500 && !defined(AS_MARMALADE)
-			fopen_s(&fp, "AS_DEBUG/profiling_summary.txt", "wt");
-		#else
-			fp = fopen("AS_DEBUG/profiling_summary.txt", "wt");
-		#endif
-		if( fp == 0 )
-			return;
-
-		fprintf(fp, "%-60s %10s %15s %15s %15s %15s\n\n", "Scope", "Count", "Tot time", "Avg time", "Max time", "Min time");
-
-		asSMapNode<asCString, TimeCount> *cursor;
-		map.MoveLast(&cursor);
-		while( cursor )
-		{
-			asCString key = cursor->key;
-			int count;
-			int n = key.FindLast("|", &count);
-			if( count )
-			{
-				key = asCString("                                               ", count) + key.SubString(n+1);
-			}
-
-			fprintf(fp, "%-60s %10d %15.6f %15.6f %15.6f %15.6f\n", key.AddressOf(), cursor->value.count, cursor->value.time, cursor->value.time / cursor->value.count, cursor->value.max, cursor->value.min);
-
-			map.MovePrev(&cursor, cursor);
-		}
-
-		fclose(fp);
-	}
-
-	double  timeOffset;
-	double  ticksPerSecond;
-	bool    usePerformance;
-
-	asCString                    key;
-	asCMap<asCString, TimeCount> map;
-};
-
-extern CProfiler g_profiler;
-
-class CProfilerScope
-{
-public:
-	CProfilerScope(const char *name)
-	{
-		this->name = name;
-		beginTime = g_profiler.Begin(name);
-	}
-
-	~CProfilerScope()
-	{
-		g_profiler.End(name, beginTime);
-	}
-
-protected:
-	const char *name;
-	double      beginTime;
-};
-
-#define TimeIt(x) CProfilerScope profilescope(x)
-
-END_AS_NAMESPACE
-
-#else // !(_MSC_VER && AS_PROFILE)
-
-// Define it so nothing is done
-#define TimeIt(x) 
-
-#endif // !(_MSC_VER && AS_PROFILE)
-
-
-
-
-#endif // defined(AS_DEBUG_H)
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2016 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_debug.h
+//
+
+#ifndef AS_DEBUG_H
+#define AS_DEBUG_H
+
+#include "as_config.h"
+
+#if defined(AS_DEBUG)
+
+#ifndef AS_WII
+// The Wii SDK doesn't have these, we'll survive without AS_DEBUG
+
+#ifndef _WIN32_WCE
+// Neither does WinCE
+
+#ifndef AS_PSVITA
+// Possible on PSVita, but requires SDK access
+
+#if !defined(_MSC_VER) && (defined(__GNUC__) || defined(AS_MARMALADE))
+
+#ifdef __ghs__ 
+// WIIU defines __GNUC__ but types are not defined here in 'conventional' way 
+#include <types.h>
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+typedef float float32_t;
+typedef double float64_t;
+#else
+// Define mkdir for GNUC
+#include <sys/stat.h>
+#include <sys/types.h>
+#define _mkdir(dirname) mkdir(dirname, S_IRWXU)
+#endif
+#else
+#include <direct.h>
+#endif
+
+#endif // AS_PSVITA
+#endif // _WIN32_WCE
+#endif // AS_WII
+
+#endif // !defined(AS_DEBUG)
+
+
+
+#if defined(_MSC_VER) && defined(AS_PROFILE)
+// Currently only do profiling with MSVC++
+
+#include <mmsystem.h>
+#include <direct.h>
+#include "as_string.h"
+#include "as_map.h"
+#include "as_string_util.h"
+
+BEGIN_AS_NAMESPACE
+
+struct TimeCount
+{
+	double time;
+	int    count;
+	double max;
+	double min;
+};
+
+class CProfiler
+{
+public:
+	CProfiler()
+	{
+		// We need to know how often the clock is updated
+		__int64 tps;
+		if( !QueryPerformanceFrequency((LARGE_INTEGER *)&tps) )
+			usePerformance = false;
+		else
+		{
+			usePerformance = true;
+			ticksPerSecond = double(tps);
+		}
+
+		timeOffset = GetTime();
+	}
+
+	~CProfiler()
+	{
+		WriteSummary();
+	}
+
+	double GetTime()
+	{
+		if( usePerformance )
+		{
+			__int64 ticks;
+			QueryPerformanceCounter((LARGE_INTEGER *)&ticks);
+
+			return double(ticks)/ticksPerSecond - timeOffset;
+		}
+		
+		return double(timeGetTime())/1000.0 - timeOffset;
+	}
+
+	double Begin(const char *name)
+	{
+		double time = GetTime();
+
+		// Add the scope to the key
+		if( key.GetLength() )
+			key += "|";
+		key += name;
+
+		// Compensate for the time spent writing to the file
+		timeOffset += GetTime() - time;
+
+		return time;
+	}
+
+	void End(const char * /*name*/, double beginTime)
+	{
+		double time = GetTime();
+
+		double elapsed = time - beginTime;
+
+		// Update the profile info for this scope
+		asSMapNode<asCString, TimeCount> *cursor;
+		if( map.MoveTo(&cursor, key) )
+		{
+			cursor->value.time += elapsed;
+			cursor->value.count++;
+			if( cursor->value.max < elapsed ) 
+				cursor->value.max = elapsed;
+			if( cursor->value.min > elapsed ) 
+				cursor->value.min = elapsed;
+		}
+		else
+		{
+			TimeCount tc = {elapsed, 1, elapsed, elapsed};
+			map.Insert(key, tc);
+		}
+
+		// Remove the inner most scope from the key
+		int n = key.FindLast("|");
+		if( n > 0 )
+			key.SetLength(n);
+		else
+			key.SetLength(0);
+
+		// Compensate for the time spent writing to the file
+		timeOffset += GetTime() - time;
+	}
+	
+protected:
+	void WriteSummary()
+	{
+		// Write the analyzed info into a file for inspection
+		_mkdir("AS_DEBUG");
+		FILE *fp;
+		#if _MSC_VER >= 1500 && !defined(AS_MARMALADE)
+			fopen_s(&fp, "AS_DEBUG/profiling_summary.txt", "wt");
+		#else
+			fp = fopen("AS_DEBUG/profiling_summary.txt", "wt");
+		#endif
+		if( fp == 0 )
+			return;
+
+		fprintf(fp, "%-60s %10s %15s %15s %15s %15s\n\n", "Scope", "Count", "Tot time", "Avg time", "Max time", "Min time");
+
+		asSMapNode<asCString, TimeCount> *cursor;
+		map.MoveLast(&cursor);
+		while( cursor )
+		{
+			asCString key = cursor->key;
+			int count;
+			int n = key.FindLast("|", &count);
+			if( count )
+			{
+				key = asCString("                                               ", count) + key.SubString(n+1);
+			}
+
+			fprintf(fp, "%-60s %10d %15.6f %15.6f %15.6f %15.6f\n", key.AddressOf(), cursor->value.count, cursor->value.time, cursor->value.time / cursor->value.count, cursor->value.max, cursor->value.min);
+
+			map.MovePrev(&cursor, cursor);
+		}
+
+		fclose(fp);
+	}
+
+	double  timeOffset;
+	double  ticksPerSecond;
+	bool    usePerformance;
+
+	asCString                    key;
+	asCMap<asCString, TimeCount> map;
+};
+
+extern CProfiler g_profiler;
+
+class CProfilerScope
+{
+public:
+	CProfilerScope(const char *name)
+	{
+		this->name = name;
+		beginTime = g_profiler.Begin(name);
+	}
+
+	~CProfilerScope()
+	{
+		g_profiler.End(name, beginTime);
+	}
+
+protected:
+	const char *name;
+	double      beginTime;
+};
+
+#define TimeIt(x) CProfilerScope profilescope(x)
+
+END_AS_NAMESPACE
+
+#else // !(_MSC_VER && AS_PROFILE)
+
+// Define it so nothing is done
+#define TimeIt(x) 
+
+#endif // !(_MSC_VER && AS_PROFILE)
+
+
+
+
+#endif // defined(AS_DEBUG_H)
+
+
diff --git a/Sources/AngelScript/source/as_gc.cpp b/Sources/AngelScript/source/as_gc.cpp
old mode 100755
new mode 100644
index 0af139ac0..d6004e384
--- a/Sources/AngelScript/source/as_gc.cpp
+++ b/Sources/AngelScript/source/as_gc.cpp
@@ -1,975 +1,997 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_gc.cpp
-//
-// The implementation of the garbage collector
-//
-
-
-#include <stdlib.h>
-
-#include "as_gc.h"
-#include "as_scriptengine.h"
-#include "as_scriptobject.h"
-#include "as_texts.h"
-
-BEGIN_AS_NAMESPACE
-
-asCGarbageCollector::asCGarbageCollector()
-{
-	engine          = 0;
-	detectState     = clearCounters_init;
-	destroyNewState = destroyGarbage_init;
-	destroyOldState = destroyGarbage_init;
-	numDestroyed    = 0;
-	numNewDestroyed = 0;
-	numDetected     = 0;
-	numAdded        = 0;
-	isProcessing    = false;
-
-	seqAtSweepStart[0] = 0;
-	seqAtSweepStart[1] = 0;
-	seqAtSweepStart[2] = 0;
-}
-
-asCGarbageCollector::~asCGarbageCollector()
-{
-	// This local typedef is done to workaround a compiler error on
-	// MSVC6 when using the typedef declared in the class definition
-	typedef asSMapNode_t node_t;
-	for( asUINT n = 0; n < freeNodes.GetLength(); n++ )
-		asDELETE(freeNodes[n], node_t);
-	freeNodes.SetLength(0);
-}
-
-int asCGarbageCollector::AddScriptObjectToGC(void *obj, asCObjectType *objType)
-{
-	if( obj == 0 || objType == 0 )
-	{
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_GC_RECEIVED_NULL_PTR);
-		return asINVALID_ARG;
-	}
-
-	engine->CallObjectMethod(obj, objType->beh.addref);
-	asSObjTypePair ot = {obj, objType, 0};
-
-	// Invoke the garbage collector to destroy a little garbage as new comes in
-	// This will maintain the number of objects in the GC at a maintainable level without
-	// halting the application, and without burdening the application with manually invoking the 
-	// garbage collector.
-	if( engine->ep.autoGarbageCollect && gcNewObjects.GetLength() )
-	{
-		// If the GC is already processing in another thread, then don't try this again
-		if( TRYENTERCRITICALSECTION(gcCollecting) )
-		{
-			// Skip this if the GC is already running in this thread
-			if( !isProcessing )
-			{
-				isProcessing = true;
-
-				// TODO: The number of iterations should be dynamic, and increase 
-				//       if the number of objects in the garbage collector grows high
-
-				// Run one step of DetectGarbage
-				if( gcOldObjects.GetLength() )
-				{
-					IdentifyGarbageWithCyclicRefs();
-					DestroyOldGarbage();
-				}
-
-				// Run a few steps of DestroyGarbage
-				int iter = (int)gcNewObjects.GetLength();
-				if( iter > 10 ) iter = 10;
-				while( iter-- > 0 )
-					DestroyNewGarbage();
-
-				isProcessing = false;
-			}
-
-			LEAVECRITICALSECTION(gcCollecting);
-		}
-	}
-
-	// Add the data to the gcObjects array in a critical section as
-	// another thread might be calling this method at the same time
-	ENTERCRITICALSECTION(gcCritical);
-	ot.seqNbr = numAdded++;
-	gcNewObjects.PushLast(ot);
-	LEAVECRITICALSECTION(gcCritical);
-
-	return ot.seqNbr;
-}
-
-int asCGarbageCollector::GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, asITypeInfo **type)
-{
-	if( seqNbr ) *seqNbr = 0;
-	if( obj )    *obj    = 0;
-	if( type )   *type   = 0;
-
-	ENTERCRITICALSECTION(gcCritical);
-	asSObjTypePair *o = 0;
-	asUINT newObjs = asUINT(gcNewObjects.GetLength());
-	if( idx < newObjs )
-		o = &gcNewObjects[idx];
-	else if( idx < gcOldObjects.GetLength() + newObjs )
-		o = &gcOldObjects[idx-newObjs];
-	else
-	{
-		LEAVECRITICALSECTION(gcCritical);
-		return asINVALID_ARG;
-	}
-	if( seqNbr ) *seqNbr = o->seqNbr;
-	if( obj )    *obj    = o->obj;
-	if( type )   *type   = o->type;
-	LEAVECRITICALSECTION(gcCritical);
-
-	return asSUCCESS;
-}
-
-// TODO: Should have a flag to tell the garbage collector to automatically determine how many iterations are needed
-//       It should then gather statistics such as how many objects has been created since last run, and how many objects
-//       are destroyed per iteration, and how many objects are detected as cyclic garbage per iteration.
-//       It should try to reach a stable number of objects, i.e. so that on average the number of objects added to 
-//       the garbage collector is the same as the number of objects destroyed. And it should try to minimize the number
-//       of iterations of detections that must be executed per cycle while still identifying the cyclic garbage
-//       These variables should also be available for inspection through the gcstatistics.
-int asCGarbageCollector::GarbageCollect(asDWORD flags, asUINT iterations)
-{
-	// If the GC is already processing in another thread, then don't enter here again
-	if( TRYENTERCRITICALSECTION(gcCollecting) )
-	{
-		// If the GC is already processing in this thread, then don't enter here again
-		if( isProcessing ) 
-		{	
-			LEAVECRITICALSECTION(gcCollecting);
-			return 1;
-		}
-
-		isProcessing = true;
-
-		bool doDetect  = (flags & asGC_DETECT_GARBAGE)  || !(flags & asGC_DESTROY_GARBAGE);
-		bool doDestroy = (flags & asGC_DESTROY_GARBAGE) || !(flags & asGC_DETECT_GARBAGE);
-
-		if( flags & asGC_FULL_CYCLE )
-		{
-			// Reset the state
-			if( doDetect )
-			{
-				// Move all new objects to the old list, so we guarantee that all is detected
-				MoveAllObjectsToOldList();
-				detectState  = clearCounters_init;
-			}
-			if( doDestroy )
-			{
-				destroyNewState = destroyGarbage_init;
-				destroyOldState = destroyGarbage_init;
-			}
-
-			// The full cycle only works with the objects in the old list so that the
-			// set of objects scanned for garbage is fixed even if new objects are added
-			// by other threads in parallel.
-			unsigned int count = (unsigned int)(gcOldObjects.GetLength());
-			for(;;)
-			{
-				// Detect all garbage with cyclic references
-				if( doDetect )
-					while( IdentifyGarbageWithCyclicRefs() == 1 ) {}
-
-				// Now destroy all known garbage
-				if( doDestroy )
-				{
-					if( !doDetect )
-						while( DestroyNewGarbage() == 1 ) {}
-					while( DestroyOldGarbage() == 1 ) {}
-				}
-
-				// Run another iteration if any garbage was destroyed
-				if( count != (unsigned int)(gcOldObjects.GetLength()) )
-					count = (unsigned int)(gcOldObjects.GetLength());
-				else
-					break;
-			}
-
-			isProcessing = false;
-			LEAVECRITICALSECTION(gcCollecting);
-			return 0;
-		}
-		else
-		{
-			while( iterations-- > 0 )
-			{
-				// Destroy the garbage that we know of
-				if( doDestroy )
-				{
-					DestroyNewGarbage();
-					DestroyOldGarbage();
-				}
-
-				// Run another incremental step of the identification of cyclic references
-				if( doDetect && gcOldObjects.GetLength() > 0 )
-					IdentifyGarbageWithCyclicRefs();
-			}
-		}
-
-		isProcessing = false;
-		LEAVECRITICALSECTION(gcCollecting);
-	}
-	
-	// Return 1 to indicate that the cycle wasn't finished
-	return 1;
-}
-
-// TODO: Additional statistics to gather
-//
-//       - How many objects are added on average between each destroyed object
-//       - How many objects are added on average between each detected object
-//       - how many iterations are needed for each destroyed object
-//       - how many iterations are needed for each detected object
-//
-//       The average must have a decay so that long running applications will not suffer
-//       from objects being created early on in the application and then never destroyed.
-//
-//       This ought to be possible to accomplish by holding two buckets.
-//       Numbers will be accumulated in one bucket while the other is held fixed.
-//       When returning the average it should use a weighted average between the two buckets using the size as weight.
-//       When a bucket is filled up, the buckets are switched, and then new bucket is emptied to gather new statistics.
-void asCGarbageCollector::GetStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const
-{
-	// It is not necessary to protect this with critical sections, however
-	// as it is not protected the variables can be filled in slightly different
-	// moments and might not match perfectly when inspected by the application
-	// afterwards.
-
-	if( currentSize )
-		*currentSize = (asUINT)(gcNewObjects.GetLength() + gcOldObjects.GetLength());
-
-	if( totalDestroyed )
-		*totalDestroyed = numDestroyed;
-
-	if( totalDetected )
-		*totalDetected = numDetected;
-
-	if( newObjects )
-		*newObjects = (asUINT)gcNewObjects.GetLength();
-
-	if( totalNewDestroyed )
-		*totalNewDestroyed = numNewDestroyed;
-}
-
-asCGarbageCollector::asSObjTypePair asCGarbageCollector::GetNewObjectAtIdx(int idx)
-{
-	// We need to protect this access with a critical section as
-	// another thread might be appending an object at the same time
-	ENTERCRITICALSECTION(gcCritical);
-	asSObjTypePair gcObj = gcNewObjects[idx];
-	LEAVECRITICALSECTION(gcCritical);
-
-	return gcObj;
-}
-
-asCGarbageCollector::asSObjTypePair asCGarbageCollector::GetOldObjectAtIdx(int idx)
-{
-	// We need to protect this access with a critical section as
-	// another thread might be appending an object at the same time
-	ENTERCRITICALSECTION(gcCritical);
-	asSObjTypePair gcObj = gcOldObjects[idx];
-	LEAVECRITICALSECTION(gcCritical);
-
-	return gcObj;
-}
-
-void asCGarbageCollector::RemoveNewObjectAtIdx(int idx)
-{
-	// We need to protect this update with a critical section as
-	// another thread might be appending an object at the same time
-	ENTERCRITICALSECTION(gcCritical);
-	if( idx == (int)gcNewObjects.GetLength() - 1)
-		gcNewObjects.PopLast();
-	else
-		gcNewObjects[idx] = gcNewObjects.PopLast();
-	LEAVECRITICALSECTION(gcCritical);
-}
-
-void asCGarbageCollector::RemoveOldObjectAtIdx(int idx)
-{
-	// We need to protect this update with a critical section as
-	// another thread might be appending an object at the same time
-	ENTERCRITICALSECTION(gcCritical);
-	if( idx == (int)gcOldObjects.GetLength() - 1)
-		gcOldObjects.PopLast();
-	else
-		gcOldObjects[idx] = gcOldObjects.PopLast();
-	LEAVECRITICALSECTION(gcCritical);
-}
-
-void asCGarbageCollector::MoveObjectToOldList(int idx)
-{
-	// We need to protect this update with a critical section as
-	// another thread might be appending an object at the same time
-	ENTERCRITICALSECTION(gcCritical);
-	gcOldObjects.PushLast(gcNewObjects[idx]);
-	if( idx == (int)gcNewObjects.GetLength() - 1)
-		gcNewObjects.PopLast();
-	else
-		gcNewObjects[idx] = gcNewObjects.PopLast();
-	LEAVECRITICALSECTION(gcCritical);
-}
-
-void asCGarbageCollector::MoveAllObjectsToOldList()
-{
-	// We need to protect this update with a critical section as
-	// another thread might be appending an object at the same time
-	ENTERCRITICALSECTION(gcCritical);
-	if( gcOldObjects.Concatenate(gcNewObjects) )
-		gcNewObjects.SetLength(0);
-	LEAVECRITICALSECTION(gcCritical);
-}
-
-int asCGarbageCollector::DestroyNewGarbage()
-{
-	// This function will only be called within the critical section gcCollecting
-	asASSERT(isProcessing);
-
-	for(;;)
-	{
-		switch( destroyNewState )
-		{
-		case destroyGarbage_init:
-		{
-			// If there are no objects to be freed then don't start
-			if( gcNewObjects.GetLength() == 0 )
-				return 0;
-
-			// Update the seqAtSweepStart which is used to determine when 
-			// to move an object from the new set to the old set
-			seqAtSweepStart[0] = seqAtSweepStart[1];
-			seqAtSweepStart[1] = seqAtSweepStart[2];
-			seqAtSweepStart[2] = numAdded;
-
-			destroyNewIdx = (asUINT)-1;
-			destroyNewState = destroyGarbage_loop;
-		}
-		break;
-
-		case destroyGarbage_loop:
-		case destroyGarbage_haveMore:
-		{
-			// If the refCount has reached 1, then only the GC still holds a
-			// reference to the object, thus we don't need to worry about the
-			// application touching the objects during collection.
-
-			// Destroy all objects that have refCount == 1. If any objects are
-			// destroyed, go over the list again, because it may have made more
-			// objects reach refCount == 1.
-			if( ++destroyNewIdx < gcNewObjects.GetLength() )
-			{
-				asSObjTypePair gcObj = GetNewObjectAtIdx(destroyNewIdx);
-				if( engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount) == 1 )
-				{
-					// Release the object immediately
-
-					// Make sure the refCount is really 0, because the
-					// destructor may have increased the refCount again.
-					bool addRef = false;
-					if( gcObj.type->flags & asOBJ_SCRIPT_OBJECT )
-					{
-						// Script objects may actually be resurrected in the destructor
-						int refCount = ((asCScriptObject*)gcObj.obj)->Release();
-						if( refCount > 0 ) addRef = true;
-					}
-					else
-						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.release);
-
-					// Was the object really destroyed?
-					if( !addRef )
-					{
-						numDestroyed++;
-						numNewDestroyed++;
-						RemoveNewObjectAtIdx(destroyNewIdx);
-						destroyNewIdx--;
-					}
-					else
-					{
-						// Since the object was resurrected in the
-						// destructor, we must add our reference again
-						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.addref);
-					}
-
-					destroyNewState = destroyGarbage_haveMore;
-				}
-				// Check if this object has been inspected 3 times already, and if so move it to the 
-				// set of old objects that are less likely to become garbage in a short time
-				// TODO: Is 3 really a good value? Should the number of times be dynamic? 
-				else if( gcObj.seqNbr < seqAtSweepStart[0] )
-				{
-					// We've already verified this object multiple times. It is likely
-					// to live for quite a long time so we'll move it to the list if old objects
-					MoveObjectToOldList(destroyNewIdx);
-					destroyNewIdx--;
-				}
-
-				// Allow the application to work a little
-				return 1;
-			}
-			else
-			{
-				if( destroyNewState == destroyGarbage_haveMore )
-				{
-					// Restart the cycle
-					destroyNewState = destroyGarbage_init;
-				}
-				else
-				{
-					// Restart the cycle
-					destroyNewState = destroyGarbage_init;
-
-					// Return 0 to tell the application that there 
-					// is no more garbage to destroy at the moment
-					return 0;
-				}
-			}
-		}
-		break;
-		}
-	}
-
-	// Shouldn't reach this point
-	UNREACHABLE_RETURN;
-}
-
-int asCGarbageCollector::ReportAndReleaseUndestroyedObjects()
-{
-	// This function will only be called as the engine is shutting down
-
-	int items = 0;
-	for( asUINT n = 0; n < gcOldObjects.GetLength(); n++ )
-	{
-		asSObjTypePair gcObj = GetOldObjectAtIdx(n);
-
-		int refCount = 0;
-		if( gcObj.type->beh.gcGetRefCount && engine->scriptFunctions[gcObj.type->beh.gcGetRefCount] )
-			refCount = engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount);
-
-		// Report the object as not being properly destroyed
-		asCString msg;
-		msg.Format(TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s_REF_COUNT_d, gcObj.seqNbr, gcObj.type->name.AddressOf(), refCount - 1);
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
-
-		// Add additional info for builtin types
-		if( gcObj.type->name == "$func" )
-		{
-			// Unfortunately we can't show the function declaration here, because the engine may have released the parameter list already so the declaration would only be misleading
-			// We need to show the function type too as for example delegates do not have a name
-			msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, reinterpret_cast<asCScriptFunction*>(gcObj.obj)->GetName(), reinterpret_cast<asCScriptFunction*>(gcObj.obj)->GetFuncType());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
-		}
-		else if( gcObj.type->name == "$obj" )
-		{
-			msg.Format(TXT_PREV_TYPE_IS_NAMED_s, reinterpret_cast<asCObjectType*>(gcObj.obj)->GetName());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
-		}
-
-		// Release the reference that the GC holds if the release functions is still available
-		if( gcObj.type->beh.release && engine->scriptFunctions[gcObj.type->beh.release] )
-			engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.release);
-
-		items++;
-	}
-	return items;
-}
-
-int asCGarbageCollector::DestroyOldGarbage()
-{
-	// This function will only be called within the critical section gcCollecting
-	asASSERT(isProcessing);
-
-	for(;;)
-	{
-		switch( destroyOldState )
-		{
-		case destroyGarbage_init:
-		{
-			// If there are no objects to be freed then don't start
-			if( gcOldObjects.GetLength() == 0 )
-				return 0;
-
-			destroyOldIdx = (asUINT)-1;
-			destroyOldState = destroyGarbage_loop;
-		}
-		break;
-
-		case destroyGarbage_loop:
-		case destroyGarbage_haveMore:
-		{
-			// If the refCount has reached 1, then only the GC still holds a
-			// reference to the object, thus we don't need to worry about the
-			// application touching the objects during collection.
-
-			// Destroy all objects that have refCount == 1. If any objects are
-			// destroyed, go over the list again, because it may have made more
-			// objects reach refCount == 1.
-			if( ++destroyOldIdx < gcOldObjects.GetLength() )
-			{
-				asSObjTypePair gcObj = GetOldObjectAtIdx(destroyOldIdx);
-
-				if( gcObj.type->beh.gcGetRefCount == 0 )
-				{
-					// If circular references are formed with registered types that hasn't 
-					// registered the GC behaviours, then the engine may be forced to free
-					// the object type before the actual object instance. In this case we
-					// will be forced to skip the destruction of the objects, so as not to 
-					// crash the application.
-					asCString msg;
-					msg.Format(TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s, gcObj.seqNbr, gcObj.type->name.AddressOf());
-					engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
-
-					// Just remove the object, as we will not bother to destroy it
-					numDestroyed++;
-					RemoveOldObjectAtIdx(destroyOldIdx);
-					destroyOldIdx--;
-				}
-				else if( engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount) == 1 )
-				{
-					// Release the object immediately
-
-					// Make sure the refCount is really 0, because the
-					// destructor may have increased the refCount again.
-					bool addRef = false;
-					if( gcObj.type->flags & asOBJ_SCRIPT_OBJECT )
-					{
-						// Script objects may actually be resurrected in the destructor
-						int refCount = ((asCScriptObject*)gcObj.obj)->Release();
-						if( refCount > 0 ) addRef = true;
-					}
-					else
-						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.release);
-
-					// Was the object really destroyed?
-					if( !addRef )
-					{
-						numDestroyed++;
-						RemoveOldObjectAtIdx(destroyOldIdx);
-						destroyOldIdx--;
-					}
-					else
-					{
-						// Since the object was resurrected in the
-						// destructor, we must add our reference again
-						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.addref);
-					}
-
-					destroyOldState = destroyGarbage_haveMore;
-				}
-
-				// Allow the application to work a little
-				return 1;
-			}
-			else
-			{
-				if( destroyOldState == destroyGarbage_haveMore )
-				{
-					// Restart the cycle
-					destroyOldState = destroyGarbage_init;
-				}
-				else
-				{
-					// Restart the cycle
-					destroyOldState = destroyGarbage_init;
-
-					// Return 0 to tell the application that there 
-					// is no more garbage to destroy at the moment
-					return 0;
-				}
-			}
-		}
-		break;
-		}
-	}
-
-	// Shouldn't reach this point
-	UNREACHABLE_RETURN;
-}
-
-int asCGarbageCollector::IdentifyGarbageWithCyclicRefs()
-{
-	// This function will only be called within the critical section gcCollecting
-	asASSERT(isProcessing);
-
-	for(;;)
-	{
-		switch( detectState )
-		{
-		case clearCounters_init:
-			detectState = clearCounters_loop;
-		break;
-
-		case clearCounters_loop:
-		{
-			// Decrease reference counter for all objects removed from the map
-			asSMapNode<void*, asSIntTypePair> *cursor = 0;
-			gcMap.MoveFirst(&cursor);
-			if( cursor )
-			{
-				void *obj = gcMap.GetKey(cursor);
-				asSIntTypePair it = gcMap.GetValue(cursor);
-
-				engine->CallObjectMethod(obj, it.type->beh.release);
-
-				ReturnNode(gcMap.Remove(cursor));
-
-				return 1;
-			}
-
-			detectState = buildMap_init;
-		}
-		break;
-
-		case buildMap_init:
-			detectIdx = 0;
-			detectState = buildMap_loop;
-		break;
-
-		case buildMap_loop:
-		{
-			// Build a map of objects that will be checked, the map will
-			// hold the object pointer as key, and the gcCount and the
-			// object's type as value. As objects are added to the map the
-			// gcFlag must be set in the objects, so we can be verify if
-			// the object is accessed during the GC cycle.
-
-			// If an object is removed from the gcObjects list during the
-			// iteration of this step, it is possible that an object won't
-			// be used during the analyzing for cyclic references. This
-			// isn't a problem, as the next time the GC cycle starts the
-			// object will be verified.
-			if( detectIdx < gcOldObjects.GetLength() )
-			{
-				// Add the gc count for this object
-				asSObjTypePair gcObj = GetOldObjectAtIdx(detectIdx);
-	
-				int refCount = 0;
-				if( gcObj.type->beh.gcGetRefCount )
-					refCount = engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount);
-
-				if( refCount > 1 )
-				{
-					asSIntTypePair it = {refCount-1, gcObj.type};
-
-					gcMap.Insert(GetNode(gcObj.obj, it));
-
-					// Increment the object's reference counter when putting it in the map
-					engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.addref);
-
-					// Mark the object so that we can
-					// see if it has changed since read
-					engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.gcSetFlag);
-				}
-
-				detectIdx++; 
-
-				// Let the application work a little
-				return 1;
-			}
-			else
-				detectState = countReferences_init;
-		}
-		break;
-
-		case countReferences_init:
-		{
-			gcMap.MoveFirst(&gcMapCursor);
-			detectState = countReferences_loop;
-		}
-		break;
-
-		case countReferences_loop:
-		{
-			// Call EnumReferences on all objects in the map to count the number
-			// of references reachable from between objects in the map. If all
-			// references for an object in the map is reachable from other objects
-			// in the map, then we know that no outside references are held for
-			// this object, thus it is a potential dead object in a circular reference.
-
-			// If the gcFlag is cleared for an object we consider the object alive
-			// and referenced from outside the GC, thus we don't enumerate its references.
-
-			// Any new objects created after this step in the GC cycle won't be
-			// in the map, and is thus automatically considered alive.
-			if( gcMapCursor )
-			{
-				void *obj = gcMap.GetKey(gcMapCursor);
-				asCObjectType *type = gcMap.GetValue(gcMapCursor).type;
-				gcMap.MoveNext(&gcMapCursor, gcMapCursor);
-
-				if( engine->CallObjectMethodRetBool(obj, type->beh.gcGetFlag) )
-				{
-					engine->CallObjectMethod(obj, engine, type->beh.gcEnumReferences);
-				}
-
-				// Allow the application to work a little
-				return 1;
-			}
-			else
-				detectState = detectGarbage_init;
-		}
-		break;
-
-		case detectGarbage_init:
-		{
-			gcMap.MoveFirst(&gcMapCursor);
-			liveObjects.SetLength(0);
-			detectState = detectGarbage_loop1;
-		}
-		break;
-
-		case detectGarbage_loop1:
-		{
-			// All objects that are known not to be dead must be removed from the map,
-			// along with all objects they reference. What remains in the map after
-			// this pass is sure to be dead objects in circular references.
-
-			// An object is considered alive if its gcFlag is cleared, or all the
-			// references were not found in the map.
-
-			// Add all alive objects from the map to the liveObjects array
-			if( gcMapCursor )
-			{
-				asSMapNode<void*, asSIntTypePair> *cursor = gcMapCursor;
-				gcMap.MoveNext(&gcMapCursor, gcMapCursor);
-
-				void *obj = gcMap.GetKey(cursor);
-				asSIntTypePair it = gcMap.GetValue(cursor);
-
-				bool gcFlag = engine->CallObjectMethodRetBool(obj, it.type->beh.gcGetFlag);
-				if( !gcFlag || it.i > 0 )
-				{
-					liveObjects.PushLast(obj);
-				}
-
-				// Allow the application to work a little
-				return 1;
-			}
-			else
-				detectState = detectGarbage_loop2;
-		}
-		break;
-
-		case detectGarbage_loop2:
-		{
-			// In this step we are actually removing the alive objects from the map.
-			// As the object is removed, all the objects it references are added to the
-			// liveObjects list, by calling EnumReferences. Only objects still in the map
-			// will be added to the liveObjects list.
-			if( liveObjects.GetLength() )
-			{
-				void *gcObj = liveObjects.PopLast();
-				asCObjectType *type = 0;
-
-				// Remove the object from the map to mark it as alive
-				asSMapNode<void*, asSIntTypePair> *cursor = 0;
-				if( gcMap.MoveTo(&cursor, gcObj) )
-				{
-					type = gcMap.GetValue(cursor).type;
-					ReturnNode(gcMap.Remove(cursor));
-
-					// We need to decrease the reference count again as we remove the object from the map
-					engine->CallObjectMethod(gcObj, type->beh.release);
-
-					// Enumerate all the object's references so that they too can be marked as alive
-					engine->CallObjectMethod(gcObj, engine, type->beh.gcEnumReferences);
-				}
-
-				// Allow the application to work a little
-				return 1;
-			}
-			else
-				detectState = verifyUnmarked_init;
-		}
-		break;
-
-		case verifyUnmarked_init:
-			gcMap.MoveFirst(&gcMapCursor);
-			detectState = verifyUnmarked_loop;
-			break;
-
-		case verifyUnmarked_loop:
-		{
-			// In this step we must make sure that none of the objects still in the map
-			// has been touched by the application. If they have then we must run the
-			// detectGarbage loop once more.
-			if( gcMapCursor )
-			{
-				void *gcObj = gcMap.GetKey(gcMapCursor);
-				asCObjectType *type = gcMap.GetValue(gcMapCursor).type;
-
-				bool gcFlag = engine->CallObjectMethodRetBool(gcObj, type->beh.gcGetFlag);
-				if( !gcFlag )
-				{
-					// The unmarked object was touched, rerun the detectGarbage loop
-					detectState = detectGarbage_init;
-				}
-				else
-					gcMap.MoveNext(&gcMapCursor, gcMapCursor);
-
-				// Allow the application to work a little
-				return 1;
-			}
-			else
-			{
-				// No unmarked object was touched, we can now be sure
-				// that objects that have gcCount == 0 really is garbage
-				detectState = breakCircles_init;
-			}
-		}
-		break;
-
-		case breakCircles_init:
-		{
-			gcMap.MoveFirst(&gcMapCursor);
-			detectState = breakCircles_loop;
-		}
-		break;
-
-		case breakCircles_loop:
-		case breakCircles_haveGarbage:
-		{
-			// All objects in the map are now known to be dead objects
-			// kept alive through circular references. To be able to free
-			// these objects we need to force the breaking of the circle
-			// by having the objects release their references.
-			if( gcMapCursor )
-			{
-				numDetected++;
-				void *gcObj = gcMap.GetKey(gcMapCursor);
-				asCObjectType *type = gcMap.GetValue(gcMapCursor).type;
-				if( type->flags & asOBJ_SCRIPT_OBJECT )
-				{
-					// For script objects we must call the class destructor before
-					// releasing the references, otherwise the destructor may not
-					// be able to perform the necessary clean-up as the handles will 
-					// be null.
-					reinterpret_cast<asCScriptObject*>(gcObj)->CallDestructor();
-				}
-				engine->CallObjectMethod(gcObj, engine, type->beh.gcReleaseAllReferences);
-
-				gcMap.MoveNext(&gcMapCursor, gcMapCursor);
-
-				detectState = breakCircles_haveGarbage;
-
-				// Allow the application to work a little
-				return 1;
-			}
-			else
-			{
-				// If no garbage was detected we can finish now
-				if( detectState != breakCircles_haveGarbage )
-				{
-					// Restart the GC
-					detectState = clearCounters_init;
-					return 0;
-				}
-				else
-				{
-					// Restart the GC
-					detectState = clearCounters_init;
-					return 1;
-				}
-			}
-		}
-		} // switch
-	}
-
-	// Shouldn't reach this point
-	UNREACHABLE_RETURN;
-}
-
-asCGarbageCollector::asSMapNode_t *asCGarbageCollector::GetNode(void *obj, asSIntTypePair it)
-{
-	// This function will only be called within the critical section gcCollecting
-	asASSERT(isProcessing);
-
-	asSMapNode_t *node;
-	if( freeNodes.GetLength() )
-		node = freeNodes.PopLast();
-	else
-	{
-		node = asNEW(asSMapNode_t);
-		if( !node )
-		{
-			// Out of memory
-			return 0;
-		}
-	}
-	
-	node->Init(obj, it);
-	return node;
-}
-
-void asCGarbageCollector::ReturnNode(asSMapNode_t *node)
-{
-	// This function will only be called within the critical section gcCollecting
-	asASSERT(isProcessing);
-
-	if( node )
-		freeNodes.PushLast(node);
-}
-
-void asCGarbageCollector::GCEnumCallback(void *reference)
-{
-	// This function will only be called within the critical section gcCollecting
-	asASSERT(isProcessing);
-
-	if( detectState == countReferences_loop )
-	{
-		// Find the reference in the map
-		asSMapNode<void*, asSIntTypePair> *cursor = 0;
-		if( gcMap.MoveTo(&cursor, reference) )
-		{
-			// Decrease the counter in the map for the reference
-			gcMap.GetValue(cursor).i--;
-		}
-	}
-	else if( detectState == detectGarbage_loop2 )
-	{
-		// Find the reference in the map
-		asSMapNode<void*, asSIntTypePair> *cursor = 0;
-		if( gcMap.MoveTo(&cursor, reference) )
-		{
-			// Add the object to the list of objects to mark as alive
-			liveObjects.PushLast(reference);
-		}
-	}
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2018 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_gc.cpp
+//
+// The implementation of the garbage collector
+//
+
+
+#include <stdlib.h>
+
+#include "as_gc.h"
+#include "as_scriptengine.h"
+#include "as_scriptobject.h"
+#include "as_texts.h"
+
+BEGIN_AS_NAMESPACE
+
+asCGarbageCollector::asCGarbageCollector()
+{
+	engine          = 0;
+	detectState     = clearCounters_init;
+	destroyNewState = destroyGarbage_init;
+	destroyOldState = destroyGarbage_init;
+	numDestroyed    = 0;
+	numNewDestroyed = 0;
+	numDetected     = 0;
+	numAdded        = 0;
+	isProcessing    = false;
+
+	seqAtSweepStart[0] = 0;
+	seqAtSweepStart[1] = 0;
+	seqAtSweepStart[2] = 0;
+
+	circularRefDetectCallbackFunc  = 0;
+	circularRefDetectCallbackParam = 0;
+}
+
+asCGarbageCollector::~asCGarbageCollector()
+{
+	// This local typedef is done to workaround a compiler error on
+	// MSVC6 when using the typedef declared in the class definition
+	typedef asSMapNode_t node_t;
+	for( asUINT n = 0; n < freeNodes.GetLength(); n++ )
+		asDELETE(freeNodes[n], node_t);
+	freeNodes.SetLength(0);
+}
+
+int asCGarbageCollector::AddScriptObjectToGC(void *obj, asCObjectType *objType)
+{
+	if( obj == 0 || objType == 0 )
+	{
+		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_GC_RECEIVED_NULL_PTR);
+		return asINVALID_ARG;
+	}
+
+	engine->CallObjectMethod(obj, objType->beh.addref);
+	asSObjTypePair ot = {obj, objType, 0};
+
+	// Invoke the garbage collector to destroy a little garbage as new comes in
+	// This will maintain the number of objects in the GC at a maintainable level without
+	// halting the application, and without burdening the application with manually invoking the 
+	// garbage collector.
+	if( engine->ep.autoGarbageCollect && gcNewObjects.GetLength() )
+	{
+		// If the GC is already processing in another thread, then don't try this again
+		if( TRYENTERCRITICALSECTION(gcCollecting) )
+		{
+			// Skip this if the GC is already running in this thread
+			if( !isProcessing )
+			{
+				isProcessing = true;
+
+				// TODO: The number of iterations should be dynamic, and increase 
+				//       if the number of objects in the garbage collector grows high
+
+				// Run one step of DetectGarbage
+				if( gcOldObjects.GetLength() )
+				{
+					IdentifyGarbageWithCyclicRefs();
+					DestroyOldGarbage();
+				}
+
+				// Run a few steps of DestroyGarbage
+				int iter = (int)gcNewObjects.GetLength();
+				if( iter > 10 ) iter = 10;
+				while( iter-- > 0 )
+					DestroyNewGarbage();
+
+				isProcessing = false;
+			}
+
+			LEAVECRITICALSECTION(gcCollecting);
+		}
+	}
+
+	// Add the data to the gcObjects array in a critical section as
+	// another thread might be calling this method at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	ot.seqNbr = numAdded++;
+	gcNewObjects.PushLast(ot);
+	LEAVECRITICALSECTION(gcCritical);
+
+	return ot.seqNbr;
+}
+
+int asCGarbageCollector::GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, asITypeInfo **type)
+{
+	if( seqNbr ) *seqNbr = 0;
+	if( obj )    *obj    = 0;
+	if( type )   *type   = 0;
+
+	ENTERCRITICALSECTION(gcCritical);
+	asSObjTypePair *o = 0;
+	asUINT newObjs = asUINT(gcNewObjects.GetLength());
+	if( idx < newObjs )
+		o = &gcNewObjects[idx];
+	else if( idx < gcOldObjects.GetLength() + newObjs )
+		o = &gcOldObjects[idx-newObjs];
+	else
+	{
+		LEAVECRITICALSECTION(gcCritical);
+		return asINVALID_ARG;
+	}
+	if( seqNbr ) *seqNbr = o->seqNbr;
+	if( obj )    *obj    = o->obj;
+	if( type )   *type   = o->type;
+	LEAVECRITICALSECTION(gcCritical);
+
+	return asSUCCESS;
+}
+
+// TODO: Should have a flag to tell the garbage collector to automatically determine how many iterations are needed
+//       It should then gather statistics such as how many objects has been created since last run, and how many objects
+//       are destroyed per iteration, and how many objects are detected as cyclic garbage per iteration.
+//       It should try to reach a stable number of objects, i.e. so that on average the number of objects added to 
+//       the garbage collector is the same as the number of objects destroyed. And it should try to minimize the number
+//       of iterations of detections that must be executed per cycle while still identifying the cyclic garbage
+//       These variables should also be available for inspection through the gcstatistics.
+int asCGarbageCollector::GarbageCollect(asDWORD flags, asUINT iterations)
+{
+	// If the GC is already processing in another thread, then don't enter here again
+	if( TRYENTERCRITICALSECTION(gcCollecting) )
+	{
+		// If the GC is already processing in this thread, then don't enter here again
+		if( isProcessing ) 
+		{	
+			LEAVECRITICALSECTION(gcCollecting);
+			return 1;
+		}
+
+		isProcessing = true;
+
+		bool doDetect  = (flags & asGC_DETECT_GARBAGE)  || !(flags & asGC_DESTROY_GARBAGE);
+		bool doDestroy = (flags & asGC_DESTROY_GARBAGE) || !(flags & asGC_DETECT_GARBAGE);
+
+		if( flags & asGC_FULL_CYCLE )
+		{
+			// Reset the state
+			if( doDetect )
+			{
+				// Move all new objects to the old list, so we guarantee that all is detected
+				MoveAllObjectsToOldList();
+				detectState  = clearCounters_init;
+			}
+			if( doDestroy )
+			{
+				destroyNewState = destroyGarbage_init;
+				destroyOldState = destroyGarbage_init;
+			}
+
+			// The full cycle only works with the objects in the old list so that the
+			// set of objects scanned for garbage is fixed even if new objects are added
+			// by other threads in parallel.
+			unsigned int count = (unsigned int)(gcOldObjects.GetLength());
+			for(;;)
+			{
+				// Detect all garbage with cyclic references
+				if( doDetect )
+					while( IdentifyGarbageWithCyclicRefs() == 1 ) {}
+
+				// Now destroy all known garbage
+				if( doDestroy )
+				{
+					if( !doDetect )
+						while( DestroyNewGarbage() == 1 ) {}
+					while( DestroyOldGarbage() == 1 ) {}
+				}
+
+				// Run another iteration if any garbage was destroyed
+				if( count != (unsigned int)(gcOldObjects.GetLength()) )
+					count = (unsigned int)(gcOldObjects.GetLength());
+				else
+					break;
+			}
+
+			isProcessing = false;
+			LEAVECRITICALSECTION(gcCollecting);
+			return 0;
+		}
+		else
+		{
+			while( iterations-- > 0 )
+			{
+				// Destroy the garbage that we know of
+				if( doDestroy )
+				{
+					DestroyNewGarbage();
+					DestroyOldGarbage();
+				}
+
+				// Run another incremental step of the identification of cyclic references
+				if( doDetect && gcOldObjects.GetLength() > 0 )
+					IdentifyGarbageWithCyclicRefs();
+			}
+		}
+
+		isProcessing = false;
+		LEAVECRITICALSECTION(gcCollecting);
+	}
+	
+	// Return 1 to indicate that the cycle wasn't finished
+	return 1;
+}
+
+// TODO: Additional statistics to gather
+//
+//       - How many objects are added on average between each destroyed object
+//       - How many objects are added on average between each detected object
+//       - how many iterations are needed for each destroyed object
+//       - how many iterations are needed for each detected object
+//
+//       The average must have a decay so that long running applications will not suffer
+//       from objects being created early on in the application and then never destroyed.
+//
+//       This ought to be possible to accomplish by holding two buckets.
+//       Numbers will be accumulated in one bucket while the other is held fixed.
+//       When returning the average it should use a weighted average between the two buckets using the size as weight.
+//       When a bucket is filled up, the buckets are switched, and then new bucket is emptied to gather new statistics.
+void asCGarbageCollector::GetStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const
+{
+	// It is not necessary to protect this with critical sections, however
+	// as it is not protected the variables can be filled in slightly different
+	// moments and might not match perfectly when inspected by the application
+	// afterwards.
+
+	if( currentSize )
+		*currentSize = (asUINT)(gcNewObjects.GetLength() + gcOldObjects.GetLength());
+
+	if( totalDestroyed )
+		*totalDestroyed = numDestroyed;
+
+	if( totalDetected )
+		*totalDetected = numDetected;
+
+	if( newObjects )
+		*newObjects = (asUINT)gcNewObjects.GetLength();
+
+	if( totalNewDestroyed )
+		*totalNewDestroyed = numNewDestroyed;
+}
+
+asCGarbageCollector::asSObjTypePair asCGarbageCollector::GetNewObjectAtIdx(int idx)
+{
+	// We need to protect this access with a critical section as
+	// another thread might be appending an object at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	asSObjTypePair gcObj = gcNewObjects[idx];
+	LEAVECRITICALSECTION(gcCritical);
+
+	return gcObj;
+}
+
+asCGarbageCollector::asSObjTypePair asCGarbageCollector::GetOldObjectAtIdx(int idx)
+{
+	// We need to protect this access with a critical section as
+	// another thread might be appending an object at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	asSObjTypePair gcObj = gcOldObjects[idx];
+	LEAVECRITICALSECTION(gcCritical);
+
+	return gcObj;
+}
+
+void asCGarbageCollector::RemoveNewObjectAtIdx(int idx)
+{
+	// We need to protect this update with a critical section as
+	// another thread might be appending an object at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	if( idx == (int)gcNewObjects.GetLength() - 1)
+		gcNewObjects.PopLast();
+	else
+		gcNewObjects[idx] = gcNewObjects.PopLast();
+	LEAVECRITICALSECTION(gcCritical);
+}
+
+void asCGarbageCollector::RemoveOldObjectAtIdx(int idx)
+{
+	// We need to protect this update with a critical section as
+	// another thread might be appending an object at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	if( idx == (int)gcOldObjects.GetLength() - 1)
+		gcOldObjects.PopLast();
+	else
+		gcOldObjects[idx] = gcOldObjects.PopLast();
+	LEAVECRITICALSECTION(gcCritical);
+}
+
+void asCGarbageCollector::MoveObjectToOldList(int idx)
+{
+	// We need to protect this update with a critical section as
+	// another thread might be appending an object at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	gcOldObjects.PushLast(gcNewObjects[idx]);
+	if( idx == (int)gcNewObjects.GetLength() - 1)
+		gcNewObjects.PopLast();
+	else
+		gcNewObjects[idx] = gcNewObjects.PopLast();
+	LEAVECRITICALSECTION(gcCritical);
+}
+
+void asCGarbageCollector::MoveAllObjectsToOldList()
+{
+	// We need to protect this update with a critical section as
+	// another thread might be appending an object at the same time
+	ENTERCRITICALSECTION(gcCritical);
+	if( gcOldObjects.Concatenate(gcNewObjects) )
+		gcNewObjects.SetLength(0);
+	LEAVECRITICALSECTION(gcCritical);
+}
+
+int asCGarbageCollector::DestroyNewGarbage()
+{
+	// This function will only be called within the critical section gcCollecting
+	asASSERT(isProcessing);
+
+	for(;;)
+	{
+		switch( destroyNewState )
+		{
+		case destroyGarbage_init:
+		{
+			// If there are no objects to be freed then don't start
+			if( gcNewObjects.GetLength() == 0 )
+				return 0;
+
+			// Update the seqAtSweepStart which is used to determine when 
+			// to move an object from the new set to the old set
+			seqAtSweepStart[0] = seqAtSweepStart[1];
+			seqAtSweepStart[1] = seqAtSweepStart[2];
+			seqAtSweepStart[2] = numAdded;
+
+			destroyNewIdx = (asUINT)-1;
+			destroyNewState = destroyGarbage_loop;
+		}
+		break;
+
+		case destroyGarbage_loop:
+		case destroyGarbage_haveMore:
+		{
+			// If the refCount has reached 1, then only the GC still holds a
+			// reference to the object, thus we don't need to worry about the
+			// application touching the objects during collection.
+
+			// Destroy all objects that have refCount == 1. If any objects are
+			// destroyed, go over the list again, because it may have made more
+			// objects reach refCount == 1.
+			if( ++destroyNewIdx < gcNewObjects.GetLength() )
+			{
+				asSObjTypePair gcObj = GetNewObjectAtIdx(destroyNewIdx);
+				if( engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount) == 1 )
+				{
+					// Release the object immediately
+
+					// Make sure the refCount is really 0, because the
+					// destructor may have increased the refCount again.
+					bool addRef = false;
+					if( gcObj.type->flags & asOBJ_SCRIPT_OBJECT )
+					{
+						// Script objects may actually be resurrected in the destructor
+						int refCount = ((asCScriptObject*)gcObj.obj)->Release();
+						if( refCount > 0 ) addRef = true;
+					}
+					else
+						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.release);
+
+					// Was the object really destroyed?
+					if( !addRef )
+					{
+						numDestroyed++;
+						numNewDestroyed++;
+						RemoveNewObjectAtIdx(destroyNewIdx);
+						destroyNewIdx--;
+					}
+					else
+					{
+						// Since the object was resurrected in the
+						// destructor, we must add our reference again
+						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.addref);
+					}
+
+					destroyNewState = destroyGarbage_haveMore;
+				}
+				// Check if this object has been inspected 3 times already, and if so move it to the 
+				// set of old objects that are less likely to become garbage in a short time
+				// TODO: Is 3 really a good value? Should the number of times be dynamic? 
+				else if( gcObj.seqNbr < seqAtSweepStart[0] )
+				{
+					// We've already verified this object multiple times. It is likely
+					// to live for quite a long time so we'll move it to the list if old objects
+					MoveObjectToOldList(destroyNewIdx);
+					destroyNewIdx--;
+				}
+
+				// Allow the application to work a little
+				return 1;
+			}
+			else
+			{
+				if( destroyNewState == destroyGarbage_haveMore )
+				{
+					// Restart the cycle
+					destroyNewState = destroyGarbage_init;
+				}
+				else
+				{
+					// Restart the cycle
+					destroyNewState = destroyGarbage_init;
+
+					// Return 0 to tell the application that there 
+					// is no more garbage to destroy at the moment
+					return 0;
+				}
+			}
+		}
+		break;
+		}
+	}
+
+	// Shouldn't reach this point
+	UNREACHABLE_RETURN;
+}
+
+int asCGarbageCollector::ReportAndReleaseUndestroyedObjects()
+{
+	// This function will only be called as the engine is shutting down
+
+	int items = 0;
+	for( asUINT n = 0; n < gcOldObjects.GetLength(); n++ )
+	{
+		asSObjTypePair gcObj = GetOldObjectAtIdx(n);
+
+		int refCount = 0;
+		if( gcObj.type->beh.gcGetRefCount && engine->scriptFunctions[gcObj.type->beh.gcGetRefCount] )
+			refCount = engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount);
+
+		// Report the object as not being properly destroyed
+		asCString msg;
+		msg.Format(TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s_REF_COUNT_d, gcObj.seqNbr, gcObj.type->name.AddressOf(), refCount - 1);
+		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
+
+		// Add additional info for builtin types
+		if( gcObj.type->name == "$func" )
+		{
+			// Unfortunately we can't show the function declaration here, because the engine may have released the parameter list already so the declaration would only be misleading
+			// We need to show the function type too as for example delegates do not have a name
+			msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, reinterpret_cast<asCScriptFunction*>(gcObj.obj)->GetName(), reinterpret_cast<asCScriptFunction*>(gcObj.obj)->GetFuncType());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+		}
+		else if( gcObj.type->name == "$obj" )
+		{
+			msg.Format(TXT_PREV_TYPE_IS_NAMED_s, reinterpret_cast<asCObjectType*>(gcObj.obj)->GetName());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+		}
+
+		// Release the reference that the GC holds if the release functions is still available
+		if( gcObj.type->beh.release && engine->scriptFunctions[gcObj.type->beh.release] )
+			engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.release);
+
+		items++;
+	}
+	return items;
+}
+
+int asCGarbageCollector::DestroyOldGarbage()
+{
+	// This function will only be called within the critical section gcCollecting
+	asASSERT(isProcessing);
+
+	for(;;)
+	{
+		switch( destroyOldState )
+		{
+		case destroyGarbage_init:
+		{
+			// If there are no objects to be freed then don't start
+			if( gcOldObjects.GetLength() == 0 )
+				return 0;
+
+			destroyOldIdx = (asUINT)-1;
+			destroyOldState = destroyGarbage_loop;
+		}
+		break;
+
+		case destroyGarbage_loop:
+		case destroyGarbage_haveMore:
+		{
+			// If the refCount has reached 1, then only the GC still holds a
+			// reference to the object, thus we don't need to worry about the
+			// application touching the objects during collection.
+
+			// Destroy all objects that have refCount == 1. If any objects are
+			// destroyed, go over the list again, because it may have made more
+			// objects reach refCount == 1.
+			if( ++destroyOldIdx < gcOldObjects.GetLength() )
+			{
+				asSObjTypePair gcObj = GetOldObjectAtIdx(destroyOldIdx);
+
+				if( gcObj.type->beh.gcGetRefCount == 0 )
+				{
+					// If circular references are formed with registered types that hasn't 
+					// registered the GC behaviours, then the engine may be forced to free
+					// the object type before the actual object instance. In this case we
+					// will be forced to skip the destruction of the objects, so as not to 
+					// crash the application.
+					asCString msg;
+					msg.Format(TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s, gcObj.seqNbr, gcObj.type->name.AddressOf());
+					engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
+
+					// Just remove the object, as we will not bother to destroy it
+					numDestroyed++;
+					RemoveOldObjectAtIdx(destroyOldIdx);
+					destroyOldIdx--;
+				}
+				else if( engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount) == 1 )
+				{
+					// Release the object immediately
+
+					// Make sure the refCount is really 0, because the
+					// destructor may have increased the refCount again.
+					bool addRef = false;
+					if( gcObj.type->flags & asOBJ_SCRIPT_OBJECT )
+					{
+						// Script objects may actually be resurrected in the destructor
+						int refCount = ((asCScriptObject*)gcObj.obj)->Release();
+						if( refCount > 0 ) addRef = true;
+					}
+					else
+						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.release);
+
+					// Was the object really destroyed?
+					if( !addRef )
+					{
+						numDestroyed++;
+						RemoveOldObjectAtIdx(destroyOldIdx);
+						destroyOldIdx--;
+					}
+					else
+					{
+						// Since the object was resurrected in the
+						// destructor, we must add our reference again
+						engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.addref);
+					}
+
+					destroyOldState = destroyGarbage_haveMore;
+				}
+
+				// Allow the application to work a little
+				return 1;
+			}
+			else
+			{
+				if( destroyOldState == destroyGarbage_haveMore )
+				{
+					// Restart the cycle
+					destroyOldState = destroyGarbage_init;
+				}
+				else
+				{
+					// Restart the cycle
+					destroyOldState = destroyGarbage_init;
+
+					// Return 0 to tell the application that there 
+					// is no more garbage to destroy at the moment
+					return 0;
+				}
+			}
+		}
+		break;
+		}
+	}
+
+	// Shouldn't reach this point
+	UNREACHABLE_RETURN;
+}
+
+int asCGarbageCollector::IdentifyGarbageWithCyclicRefs()
+{
+	// This function will only be called within the critical section gcCollecting
+	asASSERT(isProcessing);
+
+	for(;;)
+	{
+		switch( detectState )
+		{
+		case clearCounters_init:
+			detectState = clearCounters_loop;
+		break;
+
+		case clearCounters_loop:
+		{
+			// Decrease reference counter for all objects removed from the map
+			asSMapNode<void*, asSIntTypePair> *cursor = 0;
+			gcMap.MoveFirst(&cursor);
+			if( cursor )
+			{
+				void *obj = gcMap.GetKey(cursor);
+				asSIntTypePair it = gcMap.GetValue(cursor);
+
+				engine->CallObjectMethod(obj, it.type->beh.release);
+
+				ReturnNode(gcMap.Remove(cursor));
+
+				return 1;
+			}
+
+			detectState = buildMap_init;
+		}
+		break;
+
+		case buildMap_init:
+			detectIdx = 0;
+			detectState = buildMap_loop;
+		break;
+
+		case buildMap_loop:
+		{
+			// Build a map of objects that will be checked, the map will
+			// hold the object pointer as key, and the gcCount and the
+			// object's type as value. As objects are added to the map the
+			// gcFlag must be set in the objects, so we can be verify if
+			// the object is accessed during the GC cycle.
+
+			// If an object is removed from the gcObjects list during the
+			// iteration of this step, it is possible that an object won't
+			// be used during the analyzing for cyclic references. This
+			// isn't a problem, as the next time the GC cycle starts the
+			// object will be verified.
+			if( detectIdx < gcOldObjects.GetLength() )
+			{
+				// Add the gc count for this object
+				asSObjTypePair gcObj = GetOldObjectAtIdx(detectIdx);
+	
+				int refCount = 0;
+				if( gcObj.type->beh.gcGetRefCount )
+					refCount = engine->CallObjectMethodRetInt(gcObj.obj, gcObj.type->beh.gcGetRefCount);
+
+				if( refCount > 1 )
+				{
+					asSIntTypePair it = {refCount-1, gcObj.type};
+
+					gcMap.Insert(GetNode(gcObj.obj, it));
+
+					// Increment the object's reference counter when putting it in the map
+					engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.addref);
+
+					// Mark the object so that we can
+					// see if it has changed since read
+					engine->CallObjectMethod(gcObj.obj, gcObj.type->beh.gcSetFlag);
+				}
+
+				detectIdx++; 
+
+				// Let the application work a little
+				return 1;
+			}
+			else
+				detectState = countReferences_init;
+		}
+		break;
+
+		case countReferences_init:
+		{
+			gcMap.MoveFirst(&gcMapCursor);
+			detectState = countReferences_loop;
+		}
+		break;
+
+		case countReferences_loop:
+		{
+			// Call EnumReferences on all objects in the map to count the number
+			// of references reachable from between objects in the map. If all
+			// references for an object in the map is reachable from other objects
+			// in the map, then we know that no outside references are held for
+			// this object, thus it is a potential dead object in a circular reference.
+
+			// If the gcFlag is cleared for an object we consider the object alive
+			// and referenced from outside the GC, thus we don't enumerate its references.
+
+			// Any new objects created after this step in the GC cycle won't be
+			// in the map, and is thus automatically considered alive.
+			if( gcMapCursor )
+			{
+				void *obj = gcMap.GetKey(gcMapCursor);
+				asCObjectType *type = gcMap.GetValue(gcMapCursor).type;
+				gcMap.MoveNext(&gcMapCursor, gcMapCursor);
+
+				if( engine->CallObjectMethodRetBool(obj, type->beh.gcGetFlag) )
+				{
+					engine->CallObjectMethod(obj, engine, type->beh.gcEnumReferences);
+				}
+
+				// Allow the application to work a little
+				return 1;
+			}
+			else
+				detectState = detectGarbage_init;
+		}
+		break;
+
+		case detectGarbage_init:
+		{
+			gcMap.MoveFirst(&gcMapCursor);
+			liveObjects.SetLength(0);
+			detectState = detectGarbage_loop1;
+		}
+		break;
+
+		case detectGarbage_loop1:
+		{
+			// All objects that are known not to be dead must be removed from the map,
+			// along with all objects they reference. What remains in the map after
+			// this pass is sure to be dead objects in circular references.
+
+			// An object is considered alive if its gcFlag is cleared, or all the
+			// references were not found in the map.
+
+			// Add all alive objects from the map to the liveObjects array
+			if( gcMapCursor )
+			{
+				asSMapNode<void*, asSIntTypePair> *cursor = gcMapCursor;
+				gcMap.MoveNext(&gcMapCursor, gcMapCursor);
+
+				void *obj = gcMap.GetKey(cursor);
+				asSIntTypePair it = gcMap.GetValue(cursor);
+
+				bool gcFlag = engine->CallObjectMethodRetBool(obj, it.type->beh.gcGetFlag);
+				if( !gcFlag || it.i > 0 )
+				{
+					liveObjects.PushLast(obj);
+				}
+
+				// Allow the application to work a little
+				return 1;
+			}
+			else
+				detectState = detectGarbage_loop2;
+		}
+		break;
+
+		case detectGarbage_loop2:
+		{
+			// In this step we are actually removing the alive objects from the map.
+			// As the object is removed, all the objects it references are added to the
+			// liveObjects list, by calling EnumReferences. Only objects still in the map
+			// will be added to the liveObjects list.
+			if( liveObjects.GetLength() )
+			{
+				void *gcObj = liveObjects.PopLast();
+				asCObjectType *type = 0;
+
+				// Remove the object from the map to mark it as alive
+				asSMapNode<void*, asSIntTypePair> *cursor = 0;
+				if( gcMap.MoveTo(&cursor, gcObj) )
+				{
+					type = gcMap.GetValue(cursor).type;
+					ReturnNode(gcMap.Remove(cursor));
+
+					// We need to decrease the reference count again as we remove the object from the map
+					engine->CallObjectMethod(gcObj, type->beh.release);
+
+					// Enumerate all the object's references so that they too can be marked as alive
+					engine->CallObjectMethod(gcObj, engine, type->beh.gcEnumReferences);
+				}
+
+				// Allow the application to work a little
+				return 1;
+			}
+			else
+				detectState = verifyUnmarked_init;
+		}
+		break;
+
+		case verifyUnmarked_init:
+			gcMap.MoveFirst(&gcMapCursor);
+			detectState = verifyUnmarked_loop;
+			break;
+
+		case verifyUnmarked_loop:
+		{
+			// In this step we must make sure that none of the objects still in the map
+			// has been touched by the application. If they have then we must run the
+			// detectGarbage loop once more.
+			if( gcMapCursor )
+			{
+				void *gcObj = gcMap.GetKey(gcMapCursor);
+				asCObjectType *type = gcMap.GetValue(gcMapCursor).type;
+
+				bool gcFlag = engine->CallObjectMethodRetBool(gcObj, type->beh.gcGetFlag);
+				if( !gcFlag )
+				{
+					// The unmarked object was touched, rerun the detectGarbage loop
+					detectState = detectGarbage_init;
+				}
+				else
+					gcMap.MoveNext(&gcMapCursor, gcMapCursor);
+
+				// Allow the application to work a little
+				return 1;
+			}
+			else
+			{
+				// No unmarked object was touched, we can now be sure
+				// that objects that have gcCount == 0 really is garbage
+				detectState = breakCircles_init;
+			}
+		}
+		break;
+
+		case breakCircles_init:
+		{
+			gcMap.MoveFirst(&gcMapCursor);
+			detectState = breakCircles_loop;
+
+			// If the application has requested a callback for detected circular references,
+			// then make that callback now for all the objects in the list. This step is not
+			// done in incremental steps as it is only meant for debugging purposes and thus
+			// doesn't require interactivity
+			if (gcMapCursor && circularRefDetectCallbackFunc)
+			{
+				while (gcMapCursor)
+				{
+					void *gcObj = gcMap.GetKey(gcMapCursor);
+					asCObjectType *type = gcMap.GetValue(gcMapCursor).type;
+					circularRefDetectCallbackFunc(type, gcObj, circularRefDetectCallbackParam);
+
+					gcMap.MoveNext(&gcMapCursor, gcMapCursor);
+				}
+
+				// Reset iterator
+				gcMap.MoveFirst(&gcMapCursor);
+			}
+		}
+		break;
+
+		case breakCircles_loop:
+		case breakCircles_haveGarbage:
+		{
+			// All objects in the map are now known to be dead objects
+			// kept alive through circular references. To be able to free
+			// these objects we need to force the breaking of the circle
+			// by having the objects release their references.
+			if( gcMapCursor )
+			{
+				numDetected++;
+				void *gcObj = gcMap.GetKey(gcMapCursor);
+				asCObjectType *type = gcMap.GetValue(gcMapCursor).type;
+				if( type->flags & asOBJ_SCRIPT_OBJECT )
+				{
+					// For script objects we must call the class destructor before
+					// releasing the references, otherwise the destructor may not
+					// be able to perform the necessary clean-up as the handles will 
+					// be null.
+					reinterpret_cast<asCScriptObject*>(gcObj)->CallDestructor();
+				}
+				engine->CallObjectMethod(gcObj, engine, type->beh.gcReleaseAllReferences);
+
+				gcMap.MoveNext(&gcMapCursor, gcMapCursor);
+
+				detectState = breakCircles_haveGarbage;
+
+				// Allow the application to work a little
+				return 1;
+			}
+			else
+			{
+				// If no garbage was detected we can finish now
+				if( detectState != breakCircles_haveGarbage )
+				{
+					// Restart the GC
+					detectState = clearCounters_init;
+					return 0;
+				}
+				else
+				{
+					// Restart the GC
+					detectState = clearCounters_init;
+					return 1;
+				}
+			}
+		}
+		} // switch
+	}
+
+	// Shouldn't reach this point
+	UNREACHABLE_RETURN;
+}
+
+asCGarbageCollector::asSMapNode_t *asCGarbageCollector::GetNode(void *obj, asSIntTypePair it)
+{
+	// This function will only be called within the critical section gcCollecting
+	asASSERT(isProcessing);
+
+	asSMapNode_t *node;
+	if( freeNodes.GetLength() )
+		node = freeNodes.PopLast();
+	else
+	{
+		node = asNEW(asSMapNode_t);
+		if( !node )
+		{
+			// Out of memory
+			return 0;
+		}
+	}
+	
+	node->Init(obj, it);
+	return node;
+}
+
+void asCGarbageCollector::ReturnNode(asSMapNode_t *node)
+{
+	// This function will only be called within the critical section gcCollecting
+	asASSERT(isProcessing);
+
+	if( node )
+		freeNodes.PushLast(node);
+}
+
+void asCGarbageCollector::GCEnumCallback(void *reference)
+{
+	// This function will only be called within the critical section gcCollecting
+	asASSERT(isProcessing);
+
+	if( detectState == countReferences_loop )
+	{
+		// Find the reference in the map
+		asSMapNode<void*, asSIntTypePair> *cursor = 0;
+		if( gcMap.MoveTo(&cursor, reference) )
+		{
+			// Decrease the counter in the map for the reference
+			gcMap.GetValue(cursor).i--;
+		}
+	}
+	else if( detectState == detectGarbage_loop2 )
+	{
+		// Find the reference in the map
+		asSMapNode<void*, asSIntTypePair> *cursor = 0;
+		if( gcMap.MoveTo(&cursor, reference) )
+		{
+			// Add the object to the list of objects to mark as alive
+			liveObjects.PushLast(reference);
+		}
+	}
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_gc.h b/Sources/AngelScript/source/as_gc.h
old mode 100755
new mode 100644
index eddc4756c..76f27357a
--- a/Sources/AngelScript/source/as_gc.h
+++ b/Sources/AngelScript/source/as_gc.h
@@ -1,147 +1,151 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_gc.h
-//
-// The garbage collector is used to resolve cyclic references
-//
-
-
-
-#ifndef AS_GC_H
-#define AS_GC_H
-
-#include "as_config.h"
-#include "as_array.h"
-#include "as_map.h"
-#include "as_thread.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCScriptEngine;
-class asCObjectType;
-
-class asCGarbageCollector
-{
-public:
-	asCGarbageCollector();
-	~asCGarbageCollector();
-
-	int    GarbageCollect(asDWORD flags, asUINT iterations);
-	void   GetStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const;
-	void   GCEnumCallback(void *reference);
-	int    AddScriptObjectToGC(void *obj, asCObjectType *objType);
-	int    GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, asITypeInfo **type);
-
-	int    ReportAndReleaseUndestroyedObjects();
-
-	asCScriptEngine *engine;
-
-protected:
-	struct asSObjTypePair {void *obj; asCObjectType *type; asUINT seqNbr;};
-	struct asSIntTypePair {int i; asCObjectType *type;};
-	typedef asSMapNode<void*, asSIntTypePair> asSMapNode_t;
-
-	enum egcDestroyState
-	{
-		destroyGarbage_init = 0,
-		destroyGarbage_loop,
-		destroyGarbage_haveMore
-	};
-
-	enum egcDetectState
-	{
-		clearCounters_init = 0,
-		clearCounters_loop,
-		buildMap_init,
-		buildMap_loop,
-		countReferences_init,
-		countReferences_loop,
-		detectGarbage_init,
-		detectGarbage_loop1,
-		detectGarbage_loop2,
-		verifyUnmarked_init,
-		verifyUnmarked_loop,
-		breakCircles_init,
-		breakCircles_loop,
-		breakCircles_haveGarbage
-	};
-
-	int            DestroyNewGarbage();
-	int            DestroyOldGarbage();
-	int            IdentifyGarbageWithCyclicRefs();
-	asSObjTypePair GetNewObjectAtIdx(int idx);
-	asSObjTypePair GetOldObjectAtIdx(int idx);
-	void           RemoveNewObjectAtIdx(int idx);
-	void           RemoveOldObjectAtIdx(int idx);
-	void           MoveObjectToOldList(int idx);
-	void           MoveAllObjectsToOldList();
-
-	// Holds all the objects known by the garbage collector
-	asCArray<asSObjTypePair>           gcNewObjects;
-	asCArray<asSObjTypePair>           gcOldObjects;
-
-	// This array temporarily holds references to objects known to be live objects
-	asCArray<void*>                    liveObjects;
-
-	// This map holds objects currently being searched for cyclic references, it also holds a 
-	// counter that gives the number of references to the object that the GC can't reach
-	asCMap<void*, asSIntTypePair>      gcMap;
-
-	// State variables
-	egcDestroyState                    destroyNewState;
-	egcDestroyState                    destroyOldState;
-	asUINT                             destroyNewIdx;
-	asUINT                             destroyOldIdx;
-	asUINT                             numDestroyed;
-	asUINT                             numNewDestroyed;
-	egcDetectState                     detectState;
-	asUINT                             detectIdx;
-	asUINT                             numDetected;
-	asUINT                             numAdded;
-	asUINT                             seqAtSweepStart[3];
-	asSMapNode_t                      *gcMapCursor;
-	bool                               isProcessing;
-
-	// We'll keep a pool of nodes to avoid allocating memory all the time
-	asSMapNode_t            *GetNode(void *obj, asSIntTypePair it);
-	void                     ReturnNode(asSMapNode_t *node);
-	asCArray<asSMapNode_t*>  freeNodes;
-
-	// Critical section for multithreaded access
-	DECLARECRITICALSECTION(gcCritical)   // Used for adding/removing objects
-	DECLARECRITICALSECTION(gcCollecting) // Used for processing
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2018 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_gc.h
+//
+// The garbage collector is used to resolve cyclic references
+//
+
+
+
+#ifndef AS_GC_H
+#define AS_GC_H
+
+#include "as_config.h"
+#include "as_array.h"
+#include "as_map.h"
+#include "as_thread.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCScriptEngine;
+class asCObjectType;
+
+class asCGarbageCollector
+{
+public:
+	asCGarbageCollector();
+	~asCGarbageCollector();
+
+	int    GarbageCollect(asDWORD flags, asUINT iterations);
+	void   GetStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const;
+	void   GCEnumCallback(void *reference);
+	int    AddScriptObjectToGC(void *obj, asCObjectType *objType);
+	int    GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, asITypeInfo **type);
+
+	int    ReportAndReleaseUndestroyedObjects();
+
+	asCScriptEngine *engine;
+
+	// Callback for when circular reference are detected
+	asCIRCULARREFFUNC_t circularRefDetectCallbackFunc;
+	void *              circularRefDetectCallbackParam;
+
+protected:
+	struct asSObjTypePair {void *obj; asCObjectType *type; asUINT seqNbr;};
+	struct asSIntTypePair {int i; asCObjectType *type;};
+	typedef asSMapNode<void*, asSIntTypePair> asSMapNode_t;
+
+	enum egcDestroyState
+	{
+		destroyGarbage_init = 0,
+		destroyGarbage_loop,
+		destroyGarbage_haveMore
+	};
+
+	enum egcDetectState
+	{
+		clearCounters_init = 0,
+		clearCounters_loop,
+		buildMap_init,
+		buildMap_loop,
+		countReferences_init,
+		countReferences_loop,
+		detectGarbage_init,
+		detectGarbage_loop1,
+		detectGarbage_loop2,
+		verifyUnmarked_init,
+		verifyUnmarked_loop,
+		breakCircles_init,
+		breakCircles_loop,
+		breakCircles_haveGarbage
+	};
+
+	int            DestroyNewGarbage();
+	int            DestroyOldGarbage();
+	int            IdentifyGarbageWithCyclicRefs();
+	asSObjTypePair GetNewObjectAtIdx(int idx);
+	asSObjTypePair GetOldObjectAtIdx(int idx);
+	void           RemoveNewObjectAtIdx(int idx);
+	void           RemoveOldObjectAtIdx(int idx);
+	void           MoveObjectToOldList(int idx);
+	void           MoveAllObjectsToOldList();
+
+	// Holds all the objects known by the garbage collector
+	asCArray<asSObjTypePair>           gcNewObjects;
+	asCArray<asSObjTypePair>           gcOldObjects;
+
+	// This array temporarily holds references to objects known to be live objects
+	asCArray<void*>                    liveObjects;
+
+	// This map holds objects currently being searched for cyclic references, it also holds a 
+	// counter that gives the number of references to the object that the GC can't reach
+	asCMap<void*, asSIntTypePair>      gcMap;
+
+	// State variables
+	egcDestroyState                    destroyNewState;
+	egcDestroyState                    destroyOldState;
+	asUINT                             destroyNewIdx;
+	asUINT                             destroyOldIdx;
+	asUINT                             numDestroyed;
+	asUINT                             numNewDestroyed;
+	egcDetectState                     detectState;
+	asUINT                             detectIdx;
+	asUINT                             numDetected;
+	asUINT                             numAdded;
+	asUINT                             seqAtSweepStart[3];
+	asSMapNode_t                      *gcMapCursor;
+	bool                               isProcessing;
+
+	// We'll keep a pool of nodes to avoid allocating memory all the time
+	asSMapNode_t            *GetNode(void *obj, asSIntTypePair it);
+	void                     ReturnNode(asSMapNode_t *node);
+	asCArray<asSMapNode_t*>  freeNodes;
+
+	// Critical section for multithreaded access
+	DECLARECRITICALSECTION(gcCritical)   // Used for adding/removing objects
+	DECLARECRITICALSECTION(gcCollecting) // Used for processing
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_generic.cpp b/Sources/AngelScript/source/as_generic.cpp
old mode 100755
new mode 100644
index 69ee989e7..14dd9cb6f
--- a/Sources/AngelScript/source/as_generic.cpp
+++ b/Sources/AngelScript/source/as_generic.cpp
@@ -1,534 +1,534 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_generic.cpp
-//
-// This class handles the call to a function registered with asCALL_GENERIC
-//
-
-#include "as_generic.h"
-#include "as_scriptfunction.h"
-#include "as_objecttype.h"
-#include "as_scriptengine.h"
-
-BEGIN_AS_NAMESPACE
-
-// TODO: runtime optimize: The access to the arguments should be optimized so that code 
-//                         doesn't have to count the position of the argument with every call
-
-// internal
-asCGeneric::asCGeneric(asCScriptEngine *engine, asCScriptFunction *sysFunction, void *currentObject, asDWORD *stackPointer)
-{
-	this->engine = engine;
-	this->sysFunction = sysFunction;
-	this->currentObject = currentObject;
-	this->stackPointer = stackPointer;
-	
-	objectRegister = 0;
-	returnVal = 0;
-}
-
-// internal
-asCGeneric::~asCGeneric()
-{
-}
-
-// interface
-void *asCGeneric::GetAuxiliary() const
-{
-	return sysFunction->GetAuxiliary();
-}
-
-// interface
-asIScriptEngine *asCGeneric::GetEngine() const
-{
-	return (asIScriptEngine*)engine;
-}
-
-// interface
-asIScriptFunction *asCGeneric::GetFunction() const
-{
-	return sysFunction;
-}
-
-// interface
-void *asCGeneric::GetObject()
-{
-	return currentObject;
-}
-
-// interface
-int asCGeneric::GetObjectTypeId() const
-{
-	asCDataType dt = asCDataType::CreateType(sysFunction->objectType, false);
-	return engine->GetTypeIdFromDataType(dt);
-}
-
-// interface
-int asCGeneric::GetArgCount() const
-{
-	return (int)sysFunction->parameterTypes.GetLength();
-}
-
-// interface
-asBYTE asCGeneric::GetArgByte(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
-		return 0;
-
-	if( dt->GetSizeInMemoryBytes() != 1 )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return *(asBYTE*)&stackPointer[offset];
-}
-
-// interface
-asWORD asCGeneric::GetArgWord(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
-		return 0;
-
-	if( dt->GetSizeInMemoryBytes() != 2 )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return *(asWORD*)&stackPointer[offset];
-}
-
-// interface
-asDWORD asCGeneric::GetArgDWord(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
-		return 0;
-
-	if( dt->GetSizeInMemoryBytes() != 4 )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return *(asDWORD*)&stackPointer[offset];
-}
-
-// interface
-asQWORD asCGeneric::GetArgQWord(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
-		return 0;
-
-	if( dt->GetSizeInMemoryBytes() != 8 )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return *(asQWORD*)(&stackPointer[offset]);
-}
-
-// interface
-float asCGeneric::GetArgFloat(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
-		return 0;
-
-	if( dt->GetSizeInMemoryBytes() != 4 )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return *(float*)(&stackPointer[offset]);
-}
-
-// interface
-double asCGeneric::GetArgDouble(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
-		return 0;
-
-	if( dt->GetSizeInMemoryBytes() != 8 )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return *(double*)(&stackPointer[offset]);
-}
-
-// interface
-void *asCGeneric::GetArgAddress(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( !dt->IsReference() && !dt->IsObjectHandle() )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return (void*)*(asPWORD*)(&stackPointer[offset]);
-}
-
-// interface
-void *asCGeneric::GetArgObject(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Verify that the type is correct
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( !dt->IsObject() && !dt->IsFuncdef() )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// Get the value
-	return *(void**)(&stackPointer[offset]);
-}
-
-// interface
-void *asCGeneric::GetAddressOfArg(asUINT arg)
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	// Determine the position of the argument
-	int offset = 0;
-	for( asUINT n = 0; n < arg; n++ )
-		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-	// For object variables it's necessary to dereference the pointer to get the address of the value
-	if( !sysFunction->parameterTypes[arg].IsReference() && 
-		sysFunction->parameterTypes[arg].IsObject() && 
-		!sysFunction->parameterTypes[arg].IsObjectHandle() )
-		return *(void**)&stackPointer[offset];
-
-	// Get the address of the value
-	return &stackPointer[offset];
-}
-
-// interface
-int asCGeneric::GetArgTypeId(asUINT arg, asDWORD *flags) const
-{
-	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
-		return 0;
-
-	if( flags )
-	{
-		*flags = sysFunction->inOutFlags[arg];
-		*flags |= sysFunction->parameterTypes[arg].IsReadOnly() ? asTM_CONST : 0;
-	}
-
-	asCDataType *dt = &sysFunction->parameterTypes[arg];
-	if( dt->GetTokenType() != ttQuestion )
-		return engine->GetTypeIdFromDataType(*dt);
-	else
-	{
-		int offset = 0;
-		for( asUINT n = 0; n < arg; n++ )
-			offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
-
-		// Skip the actual value to get to the type id
-		offset += AS_PTR_SIZE;
-
-		// Get the value
-		return stackPointer[offset];
-	}
-}
-
-// interface
-int asCGeneric::SetReturnByte(asBYTE val)
-{
-	// Verify the type of the return value
-	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
-		return asINVALID_TYPE;
-
-	if( sysFunction->returnType.GetSizeInMemoryBytes() != 1 )
-		return asINVALID_TYPE;
-
-	// Store the value
-	*(asBYTE*)&returnVal = val;
-
-	return 0;
-}
-
-// interface
-int asCGeneric::SetReturnWord(asWORD val)
-{
-	// Verify the type of the return value
-	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
-		return asINVALID_TYPE;
-
-	if( sysFunction->returnType.GetSizeInMemoryBytes() != 2 )
-		return asINVALID_TYPE;
-
-	// Store the value
-	*(asWORD*)&returnVal = val;
-
-	return 0;
-}
-
-// interface
-int asCGeneric::SetReturnDWord(asDWORD val)
-{
-	// Verify the type of the return value
-	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
-		return asINVALID_TYPE;
-
-	if( sysFunction->returnType.GetSizeInMemoryBytes() != 4 )
-		return asINVALID_TYPE;
-
-	// Store the value
-	*(asDWORD*)&returnVal = val;
-
-	return 0;
-}
-
-// interface
-int asCGeneric::SetReturnQWord(asQWORD val)
-{
-	// Verify the type of the return value
-	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
-		return asINVALID_TYPE;
-
-	if( sysFunction->returnType.GetSizeOnStackDWords() != 2 )
-		return asINVALID_TYPE;
-
-	// Store the value
-	returnVal = val;
-
-	return 0;
-}
-
-// interface
-int asCGeneric::SetReturnFloat(float val)
-{
-	// Verify the type of the return value
-	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
-		return asINVALID_TYPE;
-
-	if( sysFunction->returnType.GetSizeOnStackDWords() != 1 )
-		return asINVALID_TYPE;
-
-	// Store the value
-	*(float*)&returnVal = val;
-
-	return 0;
-}
-
-// interface
-int asCGeneric::SetReturnDouble(double val)
-{
-	// Verify the type of the return value
-	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
-		return asINVALID_TYPE;
-
-	if( sysFunction->returnType.GetSizeOnStackDWords() != 2 )
-		return asINVALID_TYPE;
-
-	// Store the value
-	*(double*)&returnVal = val;
-
-	return 0;
-}
-
-// interface
-int asCGeneric::SetReturnAddress(void *val)
-{
-	// Verify the type of the return value
-	if( sysFunction->returnType.IsReference() )
-	{
-		// Store the value
-		*(void**)&returnVal = val;
-		return 0;
-	}
-	else if( sysFunction->returnType.IsObjectHandle() )
-	{
-		// Store the handle without increasing reference
-		objectRegister = val;
-		return 0;
-	}
-
-	return asINVALID_TYPE;
-}
-
-// interface
-int asCGeneric::SetReturnObject(void *obj)
-{
-	asCDataType *dt = &sysFunction->returnType;
-	if( !dt->IsObject() && !dt->IsFuncdef() )
-		return asINVALID_TYPE;
-
-	if( dt->IsReference() )
-	{
-		*(void**)&returnVal = obj;
-		return 0;
-	}
-
-	if( dt->IsObjectHandle() )
-	{
-		// Increase the reference counter
-		if (dt->IsFuncdef())
-		{
-			if (obj)
-				reinterpret_cast<asIScriptFunction*>(obj)->AddRef();
-		}
-		else
-		{
-			asSTypeBehaviour *beh = &dt->GetTypeInfo()->CastToObjectType()->beh;
-			if (obj && beh && beh->addref)
-				engine->CallObjectMethod(obj, beh->addref);
-		}
-	}
-	else
-	{
-		// If function returns object by value the memory is already allocated.
-		// Here we should just initialize that memory by calling the copy constructor
-		// or the default constructor followed by the assignment operator
-		void *mem = (void*)*(asPWORD*)&stackPointer[-AS_PTR_SIZE];
-		engine->ConstructScriptObjectCopy(mem, obj, dt->GetTypeInfo()->CastToObjectType());
-		return 0;
-	}
-
-	objectRegister = obj;
-
-	return 0;
-}
-
-// internal
-void *asCGeneric::GetReturnPointer()
-{
-	asCDataType &dt = sysFunction->returnType;
-
-	if( (dt.IsObject() ||dt.IsFuncdef()) && !dt.IsReference() )
-	{
-		// This function doesn't support returning on the stack but the use of 
-		// the function doesn't require it so we don't need to implement it here.
-		asASSERT( !sysFunction->DoesReturnOnStack() );
-
-		return &objectRegister;
-	}
-
-	return &returnVal;
-}
-
-// interface
-void *asCGeneric::GetAddressOfReturnLocation()
-{
-	asCDataType &dt = sysFunction->returnType;
-
-	if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsReference() )
-	{
-		if( sysFunction->DoesReturnOnStack() )
-		{
-			// The memory is already preallocated on the stack,
-			// and the pointer to the location is found before the first arg
-			return (void*)*(asPWORD*)&stackPointer[-AS_PTR_SIZE];
-		}
-
-		// Reference types store the handle in the objectReference
-		return &objectRegister;
-	}
-
-	// Primitive types and references are stored in the returnVal property
-	return &returnVal;
-}
-
-// interface
-int asCGeneric::GetReturnTypeId(asDWORD *flags) const
-{
-	return sysFunction->GetReturnTypeId(flags);
-}
-
-END_AS_NAMESPACE
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2016 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_generic.cpp
+//
+// This class handles the call to a function registered with asCALL_GENERIC
+//
+
+#include "as_generic.h"
+#include "as_scriptfunction.h"
+#include "as_objecttype.h"
+#include "as_scriptengine.h"
+
+BEGIN_AS_NAMESPACE
+
+// TODO: runtime optimize: The access to the arguments should be optimized so that code 
+//                         doesn't have to count the position of the argument with every call
+
+// internal
+asCGeneric::asCGeneric(asCScriptEngine *engine, asCScriptFunction *sysFunction, void *currentObject, asDWORD *stackPointer)
+{
+	this->engine = engine;
+	this->sysFunction = sysFunction;
+	this->currentObject = currentObject;
+	this->stackPointer = stackPointer;
+	
+	objectRegister = 0;
+	returnVal = 0;
+}
+
+// internal
+asCGeneric::~asCGeneric()
+{
+}
+
+// interface
+void *asCGeneric::GetAuxiliary() const
+{
+	return sysFunction->GetAuxiliary();
+}
+
+// interface
+asIScriptEngine *asCGeneric::GetEngine() const
+{
+	return (asIScriptEngine*)engine;
+}
+
+// interface
+asIScriptFunction *asCGeneric::GetFunction() const
+{
+	return sysFunction;
+}
+
+// interface
+void *asCGeneric::GetObject()
+{
+	return currentObject;
+}
+
+// interface
+int asCGeneric::GetObjectTypeId() const
+{
+	asCDataType dt = asCDataType::CreateType(sysFunction->objectType, false);
+	return engine->GetTypeIdFromDataType(dt);
+}
+
+// interface
+int asCGeneric::GetArgCount() const
+{
+	return (int)sysFunction->parameterTypes.GetLength();
+}
+
+// interface
+asBYTE asCGeneric::GetArgByte(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
+		return 0;
+
+	if( dt->GetSizeInMemoryBytes() != 1 )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return *(asBYTE*)&stackPointer[offset];
+}
+
+// interface
+asWORD asCGeneric::GetArgWord(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
+		return 0;
+
+	if( dt->GetSizeInMemoryBytes() != 2 )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return *(asWORD*)&stackPointer[offset];
+}
+
+// interface
+asDWORD asCGeneric::GetArgDWord(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
+		return 0;
+
+	if( dt->GetSizeInMemoryBytes() != 4 )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return *(asDWORD*)&stackPointer[offset];
+}
+
+// interface
+asQWORD asCGeneric::GetArgQWord(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
+		return 0;
+
+	if( dt->GetSizeInMemoryBytes() != 8 )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return *(asQWORD*)(&stackPointer[offset]);
+}
+
+// interface
+float asCGeneric::GetArgFloat(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
+		return 0;
+
+	if( dt->GetSizeInMemoryBytes() != 4 )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return *(float*)(&stackPointer[offset]);
+}
+
+// interface
+double asCGeneric::GetArgDouble(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( (dt->IsObject() || dt->IsFuncdef()) || dt->IsReference() )
+		return 0;
+
+	if( dt->GetSizeInMemoryBytes() != 8 )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return *(double*)(&stackPointer[offset]);
+}
+
+// interface
+void *asCGeneric::GetArgAddress(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( !dt->IsReference() && !dt->IsObjectHandle() )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return (void*)*(asPWORD*)(&stackPointer[offset]);
+}
+
+// interface
+void *asCGeneric::GetArgObject(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Verify that the type is correct
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( !dt->IsObject() && !dt->IsFuncdef() )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// Get the value
+	return *(void**)(&stackPointer[offset]);
+}
+
+// interface
+void *asCGeneric::GetAddressOfArg(asUINT arg)
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	// Determine the position of the argument
+	int offset = 0;
+	for( asUINT n = 0; n < arg; n++ )
+		offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+	// For object variables it's necessary to dereference the pointer to get the address of the value
+	if( !sysFunction->parameterTypes[arg].IsReference() && 
+		sysFunction->parameterTypes[arg].IsObject() && 
+		!sysFunction->parameterTypes[arg].IsObjectHandle() )
+		return *(void**)&stackPointer[offset];
+
+	// Get the address of the value
+	return &stackPointer[offset];
+}
+
+// interface
+int asCGeneric::GetArgTypeId(asUINT arg, asDWORD *flags) const
+{
+	if( arg >= (unsigned)sysFunction->parameterTypes.GetLength() )
+		return 0;
+
+	if( flags )
+	{
+		*flags = sysFunction->inOutFlags[arg];
+		*flags |= sysFunction->parameterTypes[arg].IsReadOnly() ? asTM_CONST : 0;
+	}
+
+	asCDataType *dt = &sysFunction->parameterTypes[arg];
+	if( dt->GetTokenType() != ttQuestion )
+		return engine->GetTypeIdFromDataType(*dt);
+	else
+	{
+		int offset = 0;
+		for( asUINT n = 0; n < arg; n++ )
+			offset += sysFunction->parameterTypes[n].GetSizeOnStackDWords();
+
+		// Skip the actual value to get to the type id
+		offset += AS_PTR_SIZE;
+
+		// Get the value
+		return stackPointer[offset];
+	}
+}
+
+// interface
+int asCGeneric::SetReturnByte(asBYTE val)
+{
+	// Verify the type of the return value
+	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
+		return asINVALID_TYPE;
+
+	if( sysFunction->returnType.GetSizeInMemoryBytes() != 1 )
+		return asINVALID_TYPE;
+
+	// Store the value
+	*(asBYTE*)&returnVal = val;
+
+	return 0;
+}
+
+// interface
+int asCGeneric::SetReturnWord(asWORD val)
+{
+	// Verify the type of the return value
+	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
+		return asINVALID_TYPE;
+
+	if( sysFunction->returnType.GetSizeInMemoryBytes() != 2 )
+		return asINVALID_TYPE;
+
+	// Store the value
+	*(asWORD*)&returnVal = val;
+
+	return 0;
+}
+
+// interface
+int asCGeneric::SetReturnDWord(asDWORD val)
+{
+	// Verify the type of the return value
+	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
+		return asINVALID_TYPE;
+
+	if( sysFunction->returnType.GetSizeInMemoryBytes() != 4 )
+		return asINVALID_TYPE;
+
+	// Store the value
+	*(asDWORD*)&returnVal = val;
+
+	return 0;
+}
+
+// interface
+int asCGeneric::SetReturnQWord(asQWORD val)
+{
+	// Verify the type of the return value
+	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
+		return asINVALID_TYPE;
+
+	if( sysFunction->returnType.GetSizeOnStackDWords() != 2 )
+		return asINVALID_TYPE;
+
+	// Store the value
+	returnVal = val;
+
+	return 0;
+}
+
+// interface
+int asCGeneric::SetReturnFloat(float val)
+{
+	// Verify the type of the return value
+	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
+		return asINVALID_TYPE;
+
+	if( sysFunction->returnType.GetSizeOnStackDWords() != 1 )
+		return asINVALID_TYPE;
+
+	// Store the value
+	*(float*)&returnVal = val;
+
+	return 0;
+}
+
+// interface
+int asCGeneric::SetReturnDouble(double val)
+{
+	// Verify the type of the return value
+	if( (sysFunction->returnType.IsObject() || sysFunction->returnType.IsFuncdef()) || sysFunction->returnType.IsReference() )
+		return asINVALID_TYPE;
+
+	if( sysFunction->returnType.GetSizeOnStackDWords() != 2 )
+		return asINVALID_TYPE;
+
+	// Store the value
+	*(double*)&returnVal = val;
+
+	return 0;
+}
+
+// interface
+int asCGeneric::SetReturnAddress(void *val)
+{
+	// Verify the type of the return value
+	if( sysFunction->returnType.IsReference() )
+	{
+		// Store the value
+		*(void**)&returnVal = val;
+		return 0;
+	}
+	else if( sysFunction->returnType.IsObjectHandle() )
+	{
+		// Store the handle without increasing reference
+		objectRegister = val;
+		return 0;
+	}
+
+	return asINVALID_TYPE;
+}
+
+// interface
+int asCGeneric::SetReturnObject(void *obj)
+{
+	asCDataType *dt = &sysFunction->returnType;
+	if( !dt->IsObject() && !dt->IsFuncdef() )
+		return asINVALID_TYPE;
+
+	if( dt->IsReference() )
+	{
+		*(void**)&returnVal = obj;
+		return 0;
+	}
+
+	if( dt->IsObjectHandle() )
+	{
+		// Increase the reference counter
+		if (dt->IsFuncdef())
+		{
+			if (obj)
+				reinterpret_cast<asIScriptFunction*>(obj)->AddRef();
+		}
+		else
+		{
+			asSTypeBehaviour *beh = &CastToObjectType(dt->GetTypeInfo())->beh;
+			if (obj && beh && beh->addref)
+				engine->CallObjectMethod(obj, beh->addref);
+		}
+	}
+	else
+	{
+		// If function returns object by value the memory is already allocated.
+		// Here we should just initialize that memory by calling the copy constructor
+		// or the default constructor followed by the assignment operator
+		void *mem = (void*)*(asPWORD*)&stackPointer[-AS_PTR_SIZE];
+		engine->ConstructScriptObjectCopy(mem, obj, CastToObjectType(dt->GetTypeInfo()));
+		return 0;
+	}
+
+	objectRegister = obj;
+
+	return 0;
+}
+
+// internal
+void *asCGeneric::GetReturnPointer()
+{
+	asCDataType &dt = sysFunction->returnType;
+
+	if( (dt.IsObject() ||dt.IsFuncdef()) && !dt.IsReference() )
+	{
+		// This function doesn't support returning on the stack but the use of 
+		// the function doesn't require it so we don't need to implement it here.
+		asASSERT( !sysFunction->DoesReturnOnStack() );
+
+		return &objectRegister;
+	}
+
+	return &returnVal;
+}
+
+// interface
+void *asCGeneric::GetAddressOfReturnLocation()
+{
+	asCDataType &dt = sysFunction->returnType;
+
+	if( (dt.IsObject() || dt.IsFuncdef()) && !dt.IsReference() )
+	{
+		if( sysFunction->DoesReturnOnStack() )
+		{
+			// The memory is already preallocated on the stack,
+			// and the pointer to the location is found before the first arg
+			return (void*)*(asPWORD*)&stackPointer[-AS_PTR_SIZE];
+		}
+
+		// Reference types store the handle in the objectReference
+		return &objectRegister;
+	}
+
+	// Primitive types and references are stored in the returnVal property
+	return &returnVal;
+}
+
+// interface
+int asCGeneric::GetReturnTypeId(asDWORD *flags) const
+{
+	return sysFunction->GetReturnTypeId(flags);
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/source/as_generic.h b/Sources/AngelScript/source/as_generic.h
old mode 100755
new mode 100644
index 11ff015b0..158d8f9c7
--- a/Sources/AngelScript/source/as_generic.h
+++ b/Sources/AngelScript/source/as_generic.h
@@ -1,108 +1,108 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_generic.h
-//
-// This class handles the call to a function registered with asCALL_GENERIC
-//
-
-
-#ifndef AS_GENERIC_H
-#define AS_GENERIC_H
-
-#include "as_config.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCScriptEngine;
-class asCScriptFunction;
-
-class asCGeneric : public asIScriptGeneric
-{
-public:
-//------------------------------
-// asIScriptGeneric
-//------------------------------
-	// Miscellaneous
-	asIScriptEngine   *GetEngine() const;
-	asIScriptFunction *GetFunction() const;
-	void              *GetAuxiliary() const;
-
-	// Object
-	void   *GetObject();
-	int     GetObjectTypeId() const;
-
-	// Arguments
-	int     GetArgCount() const;
-	int     GetArgTypeId(asUINT arg, asDWORD *flags = 0) const;
-	asBYTE  GetArgByte(asUINT arg);
-	asWORD  GetArgWord(asUINT arg);
-	asDWORD GetArgDWord(asUINT arg);
-	asQWORD GetArgQWord(asUINT arg);
-	float   GetArgFloat(asUINT arg);
-	double  GetArgDouble(asUINT arg);
-	void   *GetArgAddress(asUINT arg);
-	void   *GetArgObject(asUINT arg);
-	void   *GetAddressOfArg(asUINT arg);
-
-	// Return value
-	int     GetReturnTypeId(asDWORD *flags = 0) const;
-	int     SetReturnByte(asBYTE val);
-	int     SetReturnWord(asWORD val);
-	int     SetReturnDWord(asDWORD val);
-	int     SetReturnQWord(asQWORD val);
-	int     SetReturnFloat(float val);
-	int     SetReturnDouble(double val);
-	int     SetReturnAddress(void *addr);
-	int     SetReturnObject(void *obj);
-	void   *GetAddressOfReturnLocation();
-
-//------------------------
-// internal
-//-------------------------
-	asCGeneric(asCScriptEngine *engine, asCScriptFunction *sysFunction, void *currentObject, asDWORD *stackPointer);
-	virtual ~asCGeneric();
-
-	void *GetReturnPointer();
-
-	asCScriptEngine *engine;
-	asCScriptFunction *sysFunction;
-	void *currentObject;
-	asDWORD *stackPointer;
-	void *objectRegister;
-
-	asQWORD returnVal;
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_generic.h
+//
+// This class handles the call to a function registered with asCALL_GENERIC
+//
+
+
+#ifndef AS_GENERIC_H
+#define AS_GENERIC_H
+
+#include "as_config.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCScriptEngine;
+class asCScriptFunction;
+
+class asCGeneric : public asIScriptGeneric
+{
+public:
+//------------------------------
+// asIScriptGeneric
+//------------------------------
+	// Miscellaneous
+	asIScriptEngine   *GetEngine() const;
+	asIScriptFunction *GetFunction() const;
+	void              *GetAuxiliary() const;
+
+	// Object
+	void   *GetObject();
+	int     GetObjectTypeId() const;
+
+	// Arguments
+	int     GetArgCount() const;
+	int     GetArgTypeId(asUINT arg, asDWORD *flags = 0) const;
+	asBYTE  GetArgByte(asUINT arg);
+	asWORD  GetArgWord(asUINT arg);
+	asDWORD GetArgDWord(asUINT arg);
+	asQWORD GetArgQWord(asUINT arg);
+	float   GetArgFloat(asUINT arg);
+	double  GetArgDouble(asUINT arg);
+	void   *GetArgAddress(asUINT arg);
+	void   *GetArgObject(asUINT arg);
+	void   *GetAddressOfArg(asUINT arg);
+
+	// Return value
+	int     GetReturnTypeId(asDWORD *flags = 0) const;
+	int     SetReturnByte(asBYTE val);
+	int     SetReturnWord(asWORD val);
+	int     SetReturnDWord(asDWORD val);
+	int     SetReturnQWord(asQWORD val);
+	int     SetReturnFloat(float val);
+	int     SetReturnDouble(double val);
+	int     SetReturnAddress(void *addr);
+	int     SetReturnObject(void *obj);
+	void   *GetAddressOfReturnLocation();
+
+//------------------------
+// internal
+//-------------------------
+	asCGeneric(asCScriptEngine *engine, asCScriptFunction *sysFunction, void *currentObject, asDWORD *stackPointer);
+	virtual ~asCGeneric();
+
+	void *GetReturnPointer();
+
+	asCScriptEngine *engine;
+	asCScriptFunction *sysFunction;
+	void *currentObject;
+	asDWORD *stackPointer;
+	void *objectRegister;
+
+	asQWORD returnVal;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_globalproperty.cpp b/Sources/AngelScript/source/as_globalproperty.cpp
old mode 100755
new mode 100644
index bcfcd2d68..3fe4627fb
--- a/Sources/AngelScript/source/as_globalproperty.cpp
+++ b/Sources/AngelScript/source/as_globalproperty.cpp
@@ -1,137 +1,137 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-
-#include "as_config.h"
-#include "as_property.h"
-#include "as_scriptengine.h"
-
-BEGIN_AS_NAMESPACE
-
-asCGlobalProperty::asCGlobalProperty() 
-{ 
-	memory          = &storage; 
-	memoryAllocated = false; 
-	realAddress     = 0; 
-	initFunc        = 0;
-	accessMask      = 0xFFFFFFFF;
-
-	refCount.set(1);
-}
-
-asCGlobalProperty::~asCGlobalProperty()
-{ 
-#ifndef WIP_16BYTE_ALIGNED
-	if( memoryAllocated ) { asDELETEARRAY(memory); } 
-#else
-	if( memoryAllocated ) { asDELETEARRAYALIGNED(memory); } 
-#endif
-
-	if( initFunc )
-		initFunc->ReleaseInternal();
-}
-
-void asCGlobalProperty::AddRef()
-{
-	refCount.atomicInc();
-}
-
-void asCGlobalProperty::Release()
-{
-	if( refCount.atomicDec() == 0 )
-		asDELETE(this, asCGlobalProperty);
-}
-
-void asCGlobalProperty::DestroyInternal()
-{
-	if( initFunc )
-	{
-		initFunc->ReleaseInternal();
-		initFunc = 0;
-	}
-}
-
-void *asCGlobalProperty::GetAddressOfValue()
-{ 
-	return memory;
-}
-
-// The global property structure is responsible for allocating the storage
-// method for script declared variables. Each allocation is independent of
-// other global properties, so that variables can be added and removed at
-// any time.
-void asCGlobalProperty::AllocateMemory() 
-{ 
-	if( type.GetSizeOnStackDWords() > 2 ) 
-	{ 
-#ifndef WIP_16BYTE_ALIGNED
-		memory = asNEWARRAY(asDWORD, type.GetSizeOnStackDWords()); 
-#else
-		// TODO: Avoid aligned allocation if not needed to reduce the waste of memory for the alignment
-		memory = asNEWARRAYALIGNED(asDWORD, type.GetSizeOnStackDWords(), type.GetAlignment()); 
-#endif
-		memoryAllocated = true; 
-	} 
-}
-
-void asCGlobalProperty::SetRegisteredAddress(void *p) 
-{ 
-	realAddress = p;
-	if( type.IsObject() && !type.IsReference() && !type.IsObjectHandle() )
-	{
-		// The global property is a pointer to a pointer 
-		memory = &realAddress;
-	} 
-	else
-		memory = p; 
-}
-
-void *asCGlobalProperty::GetRegisteredAddress() const
-{
-	return realAddress;
-}
-
-void asCGlobalProperty::SetInitFunc(asCScriptFunction *in_initFunc)
-{
-	// This should only be done once
-	asASSERT( initFunc == 0 );
-
-	initFunc = in_initFunc;
-	initFunc->AddRefInternal();
-}
-
-asCScriptFunction *asCGlobalProperty::GetInitFunc()
-{
-	return initFunc;
-}
-
-END_AS_NAMESPACE
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+
+#include "as_config.h"
+#include "as_property.h"
+#include "as_scriptengine.h"
+
+BEGIN_AS_NAMESPACE
+
+asCGlobalProperty::asCGlobalProperty() 
+{ 
+	memory          = &storage; 
+	memoryAllocated = false; 
+	realAddress     = 0; 
+	initFunc        = 0;
+	accessMask      = 0xFFFFFFFF;
+
+	refCount.set(1);
+}
+
+asCGlobalProperty::~asCGlobalProperty()
+{ 
+#ifndef WIP_16BYTE_ALIGNED
+	if( memoryAllocated ) { asDELETEARRAY(memory); } 
+#else
+	if( memoryAllocated ) { asDELETEARRAYALIGNED(memory); } 
+#endif
+
+	if( initFunc )
+		initFunc->ReleaseInternal();
+}
+
+void asCGlobalProperty::AddRef()
+{
+	refCount.atomicInc();
+}
+
+void asCGlobalProperty::Release()
+{
+	if( refCount.atomicDec() == 0 )
+		asDELETE(this, asCGlobalProperty);
+}
+
+void asCGlobalProperty::DestroyInternal()
+{
+	if( initFunc )
+	{
+		initFunc->ReleaseInternal();
+		initFunc = 0;
+	}
+}
+
+void *asCGlobalProperty::GetAddressOfValue()
+{ 
+	return memory;
+}
+
+// The global property structure is responsible for allocating the storage
+// method for script declared variables. Each allocation is independent of
+// other global properties, so that variables can be added and removed at
+// any time.
+void asCGlobalProperty::AllocateMemory() 
+{ 
+	if( type.GetSizeOnStackDWords() > 2 ) 
+	{ 
+#ifndef WIP_16BYTE_ALIGNED
+		memory = asNEWARRAY(asDWORD, type.GetSizeOnStackDWords()); 
+#else
+		// TODO: Avoid aligned allocation if not needed to reduce the waste of memory for the alignment
+		memory = asNEWARRAYALIGNED(asDWORD, type.GetSizeOnStackDWords(), type.GetAlignment()); 
+#endif
+		memoryAllocated = true; 
+	} 
+}
+
+void asCGlobalProperty::SetRegisteredAddress(void *p) 
+{ 
+	realAddress = p;
+	if( type.IsObject() && !type.IsReference() && !type.IsObjectHandle() )
+	{
+		// The global property is a pointer to a pointer 
+		memory = &realAddress;
+	} 
+	else
+		memory = p; 
+}
+
+void *asCGlobalProperty::GetRegisteredAddress() const
+{
+	return realAddress;
+}
+
+void asCGlobalProperty::SetInitFunc(asCScriptFunction *in_initFunc)
+{
+	// This should only be done once
+	asASSERT( initFunc == 0 );
+
+	initFunc = in_initFunc;
+	initFunc->AddRefInternal();
+}
+
+asCScriptFunction *asCGlobalProperty::GetInitFunc()
+{
+	return initFunc;
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/source/as_map.h b/Sources/AngelScript/source/as_map.h
old mode 100755
new mode 100644
index 6a9b919e7..c21037bd1
--- a/Sources/AngelScript/source/as_map.h
+++ b/Sources/AngelScript/source/as_map.h
@@ -1,786 +1,786 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_map.h
-//
-// This class is used for mapping a value to another
-//
-
-
-#ifndef AS_MAP_H
-#define AS_MAP_H
-
-template <class KEY, class VAL> struct asSMapNode;
-
-template <class KEY, class VAL> class asCMap
-{
-public:
-	asCMap();
-	~asCMap();
-
-	int   Insert(const KEY &key, const VAL &value);
-	int   Insert(asSMapNode<KEY,VAL> *node);
-	int   GetCount() const;
-	
-	const KEY &GetKey(const asSMapNode<KEY,VAL> *cursor) const;
-	const VAL &GetValue(const asSMapNode<KEY,VAL> *cursor) const;
-	VAL       &GetValue(asSMapNode<KEY,VAL> *cursor);
-
-	void Erase(asSMapNode<KEY,VAL> *cursor);
-	asSMapNode<KEY,VAL> *Remove(asSMapNode<KEY,VAL> *cursor);
-	void EraseAll();
-
-	void SwapWith(asCMap<KEY,VAL> &other);
-
-	// Returns true as long as cursor is valid
-
-	bool MoveTo(asSMapNode<KEY,VAL> **out, const KEY &key) const;
-	bool MoveFirst(asSMapNode<KEY,VAL> **out) const;
-	bool MoveLast(asSMapNode<KEY,VAL> **out) const;
-	bool MoveNext(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const;
-	bool MovePrev(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const;
-
-	// For debugging only
-
-	int CheckIntegrity(asSMapNode<KEY,VAL> *node) const;
-
-protected:
-	// Don't allow value assignment
-	asCMap &operator=(const asCMap &) { return *this; }
-
-	void BalanceInsert(asSMapNode<KEY,VAL> *node);
-	void BalanceErase(asSMapNode<KEY,VAL> *child, asSMapNode<KEY,VAL> *parent);
-
-	int EraseAll(asSMapNode<KEY,VAL> *node);
-	int RotateLeft(asSMapNode<KEY,VAL> *node);
-	int RotateRight(asSMapNode<KEY,VAL> *node);
-
-	asSMapNode<KEY,VAL> *root;
-	asSMapNode<KEY,VAL> dummy;
-
-	int count;
-};
-
-//---------------------------------------------------------------------------
-// Implementation
-
-// Properties of a Red-Black Tree
-//
-// 1. The root is always black
-// 2. All single paths from the root to leafs
-//    contain the same amount of black nodes
-// 3. No red node can have a red node as parent
-
-#define ISRED(x) ((x != 0) && (x)->isRed)
-#define ISBLACK(x) (!ISRED(x))
-
-template <class KEY, class VAL> struct asSMapNode
-{
-	asSMapNode() {parent = 0; left = 0; right = 0; isRed = true;}
-	void Init(KEY k, VAL v) {key = k; value = v; parent = 0; left = 0; right = 0; isRed = true;}
-
-	asSMapNode *parent;
-	asSMapNode *left;
-	asSMapNode *right;
-	bool isRed;
-
-	KEY key;
-	VAL value;
-};
-
-template <class KEY, class VAL>
-asCMap<KEY, VAL>::asCMap()
-{
-	root = 0;
-	count = 0;
-}
-
-template <class KEY, class VAL>
-asCMap<KEY, VAL>::~asCMap()
-{
-	EraseAll();
-}
-
-template <class KEY, class VAL>
-void asCMap<KEY,VAL>::SwapWith(asCMap<KEY,VAL> &other)
-{
-	asSMapNode<KEY,VAL> *tmpRoot  = root;
-	int                  tmpCount = count;
-
-	root  = other.root;
-	count = other.count;
-
-	other.root  = tmpRoot;
-	other.count = tmpCount;
-}
-
-template <class KEY, class VAL>
-void asCMap<KEY, VAL>::EraseAll()
-{
-	EraseAll(root);
-	root = 0;
-}
-
-template <class KEY, class VAL>
-int asCMap<KEY, VAL>::EraseAll(asSMapNode<KEY, VAL> *p)
-{
-	if( p == 0 ) return -1;
-
-	EraseAll( p->left );
-	EraseAll( p->right );
-
-	typedef asSMapNode<KEY,VAL> node_t;
-	asDELETE(p,node_t);
-
-	count--;
-
-	return 0;
-}
-
-template <class KEY, class VAL>
-int asCMap<KEY, VAL>::GetCount() const
-{
-	return count;
-}
-
-template <class KEY, class VAL>
-int asCMap<KEY, VAL>::Insert(const KEY &key, const VAL &value)
-{
-	typedef asSMapNode<KEY,VAL> node_t;
-	asSMapNode<KEY,VAL> *nnode = asNEW(node_t);
-	if( nnode == 0 )
-	{
-		// Out of memory
-		return -1;
-	}
-
-	nnode->key   = key;
-	nnode->value = value;
-
-	return Insert(nnode);
-}
-
-template <class KEY, class VAL>
-int asCMap<KEY, VAL>::Insert(asSMapNode<KEY,VAL> *nnode)
-{
-	// Insert the node
-	if( root == 0 )
-		root = nnode;
-	else
-	{
-		asSMapNode<KEY,VAL> *p = root;
-		for(;;)
-		{
-			if( nnode->key < p->key )
-			{
-				if( p->left == 0 )
-				{
-					nnode->parent = p;
-					p->left = nnode;
-					break;
-				}
-				else
-					p = p->left;
-			}
-			else
-			{
-				if( p->right == 0 )
-				{
-					nnode->parent = p;
-					p->right = nnode;
-					break;
-				}
-				else
-					p = p->right;
-			}
-		}
-	}
-
-	BalanceInsert(nnode);
-
-	count++;
-
-	return 0;
-}
-
-template <class KEY, class VAL>
-void asCMap<KEY, VAL>::BalanceInsert(asSMapNode<KEY, VAL> *node)
-{
-	// The node, that is red, can't have a red parent
-	while( node != root && node->parent->isRed )
-	{
-		// Check color of uncle 
-		if( node->parent == node->parent->parent->left )
-		{
-			asSMapNode<KEY,VAL> *uncle = node->parent->parent->right;
-			if( ISRED(uncle) )
-			{
-				//    B
-				//   R R
-				//  N
-
-				// Change color on parent, uncle, and grand parent
-				node->parent->isRed = false;
-				uncle->isRed = false;
-				node->parent->parent->isRed = true;
-
-				// Continue balancing from grand parent
-				node = node->parent->parent;
-			}
-			else
-			{
-				//    B
-				//   R B
-				//  N
-
-				if( node == node->parent->right ) 
-				{
-					// Make the node a left child
-					node = node->parent;
-					RotateLeft(node);
-				}
-
-				// Change color on parent and grand parent
-				// Then rotate grand parent to the right
-				node->parent->isRed = false;
-				node->parent->parent->isRed = true;
-				RotateRight(node->parent->parent);
-			}
-		}
-		else
-		{
-			asSMapNode<KEY,VAL> *uncle = node->parent->parent->left;
-			if( ISRED(uncle) )
-			{
-				//   B
-				//  R R
-				//     N
-
-				// Change color on parent, uncle, and grand parent
-				// Continue balancing from grand parent
-				node->parent->isRed = false;
-				uncle->isRed = false;
-				node = node->parent->parent;
-				node->isRed = true;
-			}
-			else
-			{
-				//   B
-				//  B R
-				//     N
-
-				if( node == node->parent->left ) 
-				{
-					// Make the node a right child
-					node = node->parent;
-					RotateRight(node);
-				}
-				
-				// Change color on parent and grand parent
-				// Then rotate grand parent to the right
-				node->parent->isRed = false;
-				node->parent->parent->isRed = true;
-				RotateLeft(node->parent->parent);
-			}
-		}
-	}
-
-	root->isRed = false;
-}
-
-// For debugging purposes only
-template <class KEY, class VAL>
-int asCMap<KEY, VAL>::CheckIntegrity(asSMapNode<KEY, VAL> *node) const
-{
-	if( node == 0 ) 
-	{
-		if( root == 0 ) 
-			return 0;
-		else if( ISRED(root) )
-			return -1;
-		else
-			node = root;
-	}
-
-	int left = 0, right = 0;
-	if( node->left )
-		left = CheckIntegrity(node->left);
-	if( node->right )
-		right = CheckIntegrity(node->right);
-
-	if( left != right || left == -1 ) 
-		return -1;
-	
-	if( ISBLACK(node) )
-		return left+1;
-
-	return left;
-}
-
-// Returns true if successful
-template <class KEY, class VAL>
-bool asCMap<KEY, VAL>::MoveTo(asSMapNode<KEY,VAL> **out, const KEY &key) const
-{
-	asSMapNode<KEY,VAL> *p = root;
-	while( p )
-	{
-		if( key < p->key )
-			p = p->left;
-		else if( key == p->key )
-		{
-			if( out ) *out = p;
-			return true;
-		}
-		else 
-			p = p->right;
-	}
-
-	if( out ) *out = 0;
-	return false;
-}
-
-template <class KEY, class VAL>
-void asCMap<KEY, VAL>::Erase(asSMapNode<KEY,VAL> *cursor)
-{
-	asSMapNode<KEY,VAL> *node = Remove(cursor);
-	asASSERT( node == cursor );
-
-	typedef asSMapNode<KEY,VAL> node_t;
-	asDELETE(node,node_t);
-}
-
-template <class KEY, class VAL>
-asSMapNode<KEY,VAL> *asCMap<KEY, VAL>::Remove(asSMapNode<KEY,VAL> *cursor)
-{
-	if( cursor == 0 ) return 0;
-
-	asSMapNode<KEY,VAL> *node = cursor;
-
-	//---------------------------------------------------
-	// Choose the node that will replace the erased one
-	asSMapNode<KEY,VAL> *remove;
-	if( node->left == 0 || node->right == 0 )
-		remove = node;
-	else
-	{
-		remove = node->right;
-		while( remove->left ) remove = remove->left;
-	}
-
-	//--------------------------------------------------
-	// Remove the node
-	asSMapNode<KEY,VAL> *child;
-	if( remove->left )
-		child = remove->left;
-	else
-		child = remove->right;
-
-	if( child ) child->parent = remove->parent;
-	if( remove->parent )
-	{
-		if( remove == remove->parent->left )
-			remove->parent->left = child;
-		else
-			remove->parent->right = child;
-	}
-	else
-		root = child;
-
-	// If we remove a black node we must make sure the tree is balanced
-	if( ISBLACK(remove) )
-		BalanceErase(child, remove->parent);
-
-	//----------------------------------------
-	// Replace the erased node with the removed one
-	if( remove != node )
-	{
-		if( node->parent )
-		{
-			if( node->parent->left == node )
-				node->parent->left = remove;
-			else
-				node->parent->right = remove;
-		}
-		else
-			root = remove;
-
-		remove->isRed  = node->isRed;
-		remove->parent = node->parent;
-
-		remove->left = node->left;
-		if( remove->left ) remove->left->parent = remove;
-		remove->right = node->right;
-		if( remove->right ) remove->right->parent = remove;	
-	}
-
-	count--;
-
-	return node;
-}
-
-// Call method only if removed node was black
-// child is the child of the removed node
-template <class KEY, class VAL>
-void asCMap<KEY, VAL>::BalanceErase(asSMapNode<KEY, VAL> *child, asSMapNode<KEY, VAL> *parent)
-{
-	// If child is red
-	//   Color child black 
-	//   Terminate
-
-	// These tests assume brother is to the right.
-
-	// 1. Brother is red
-	//   Color parent red and brother black
-    //   Rotate parent left
-	//   Transforms to 2b
-	// 2a. Parent and brother is black, brother's children are black
-	//   Color brother red
-	//   Continue test with parent as child
-	// 2b. Parent is red, brother is black, brother's children are black
-	//   Color parent black and brother red
-	//   Terminate
-	// 3. Brother is black, and brother's left is red and brother's right is black
-	//   Color brother red and brother's left black
-	//   Rotate brother to right
-	//   Transforms to 4.
-	// 4. Brother is black, brother's right is red
-	//   Color brother's right black
-	//   Color brother to color of parent
-	//   Color parent black
-	//   Rotate parent left
-	//   Terminate
-
-	while( child != root && ISBLACK(child) )
-	{
-		if( child == parent->left )
-		{
-			asSMapNode<KEY,VAL> *brother = parent->right;
-
-			// Case 1
-			if( ISRED(brother) )
-			{
-				brother->isRed = false;
-				parent->isRed = true;
-				RotateLeft(parent);
-				brother = parent->right;
-			}
-
-			// Case 2
-			if( brother == 0 ) break;
-			if( ISBLACK(brother->left) && ISBLACK(brother->right) )
-			{
-				// Case 2b
-				if( ISRED(parent) )
-				{
-					parent->isRed = false;
-					brother->isRed = true;
-					break;
-				}
-
-				brother->isRed = true;
-				child = parent;
-				parent = child->parent;
-			}
-			else
-			{
-				// Case 3
-				if( ISBLACK(brother->right) )
-				{
-					brother->left->isRed = false;
-					brother->isRed = true;
-					RotateRight(brother);
-					brother = parent->right;
-				}
-
-				// Case 4
-				brother->isRed = parent->isRed;
-				parent->isRed = false;
-				brother->right->isRed = false;
-				RotateLeft(parent);
-				break;
-			}
-		}
-		else
-		{
-			asSMapNode<KEY,VAL> *brother = parent->left;
-			
-			// Case 1
-			if( ISRED(brother) )
-			{
-				brother->isRed = false;
-				parent->isRed = true;
-				RotateRight(parent);
-				brother = parent->left;
-			}
-
-			// Case 2
-			if( brother == 0 ) break;
-			if( ISBLACK(brother->left) && ISBLACK(brother->right) )
-			{
-				// Case 2b
-				if( ISRED(parent) )
-				{
-					parent->isRed = false;
-					brother->isRed = true;
-					break;
-				}
-
-				brother->isRed = true;
-				child = parent;
-				parent = child->parent;
-			}
-			else
-			{
-				// Case 3
-				if( ISBLACK(brother->left) )
-				{
-					brother->right->isRed = false;
-					brother->isRed = true;
-					RotateLeft(brother);
-					brother = parent->left;
-				}
-
-				// Case 4
-				brother->isRed = parent->isRed;
-				parent->isRed = false;
-				brother->left->isRed = false;
-				RotateRight(parent);
-				break;
-			}
-		}
-	}
-
-	if( child )
-		child->isRed = false;
-}
-
-template <class KEY, class VAL>
-int asCMap<KEY, VAL>::RotateRight(asSMapNode<KEY, VAL> *node)
-{
-	//     P             L       //
-	//    / \           / \      //
-	//   L   R    =>   Ll  P     //
-	//  / \               / \    //
-	// Ll  Lr            Lr  R   //
-
-	if( node->left == 0 ) return -1;
-
-	asSMapNode<KEY,VAL> *left = node->left;
-
-	// Update parent
-	if( node->parent )
-	{
-		asSMapNode<KEY,VAL> *parent = node->parent;
-		if( parent->left == node )
-			parent->left = left;
-		else
-			parent->right = left;
-
-		left->parent = parent;
-	}
-	else
-	{
-		root = left;
-		left->parent = 0;
-	}
-
-	// Move left's right child to node's left child
-	node->left = left->right;
-	if( node->left ) node->left->parent = node;
-
-	// Put node as left's right child
-	left->right = node;
-	node->parent = left;
-
-	return 0;
-}
-
-template <class KEY, class VAL>
-int asCMap<KEY, VAL>::RotateLeft(asSMapNode<KEY, VAL> *node)
-{
-	//     P             R      //
-	//    / \           / \     //
-	//   L   R    =>   P   Rr   //
-	//      / \       / \       //
-	//     Rl  Rr    L   Rl     //
-
-	if( node->right == 0 ) return -1;
-
-	asSMapNode<KEY,VAL> *right = node->right;
-
-	// Update parent
-	if( node->parent )
-	{
-		asSMapNode<KEY,VAL> *parent = node->parent;
-		if( parent->right == node )
-			parent->right = right;
-		else
-			parent->left = right;
-
-		right->parent = parent;
-	}
-	else
-	{
-		root = right;
-		right->parent = 0;
-	}
-
-	// Move right's left child to node's right child
-	node->right = right->left;
-	if( node->right ) node->right->parent = node;
-
-	// Put node as right's left child
-	right->left = node;
-	node->parent = right;
-
-	return 0;
-}
-
-template <class KEY, class VAL>
-const VAL &asCMap<KEY, VAL>::GetValue(const asSMapNode<KEY,VAL> *cursor) const 
-{
-	if( cursor == 0 ) 
-		return dummy.value;
-
-	return cursor->value;
-}
-
-template <class KEY, class VAL>
-VAL &asCMap<KEY, VAL>::GetValue(asSMapNode<KEY,VAL> *cursor) 
-{
-	if( cursor == 0 ) 
-		return dummy.value;
-
-	return cursor->value;
-}
-
-template <class KEY, class VAL>
-const KEY &asCMap<KEY, VAL>::GetKey(const asSMapNode<KEY,VAL> *cursor) const
-{
-	if( cursor == 0 )
-		return dummy.key;
-
-	return cursor->key;
-}
-
-template <class KEY, class VAL>
-bool asCMap<KEY, VAL>::MoveFirst(asSMapNode<KEY,VAL> **out) const
-{
-	*out = root;
-	if( root == 0 ) return false;
-
-	while( (*out)->left ) 
-		*out = (*out)->left;
-
-	return true;
-}
-
-template <class KEY, class VAL>
-bool asCMap<KEY, VAL>::MoveLast(asSMapNode<KEY,VAL> **out) const
-{
-	*out = root;
-	if( root == 0 ) return false;
-
-	while( (*out)->right ) 
-		*out = (*out)->right;
-
-	return true;
-}
-
-template <class KEY, class VAL>
-bool asCMap<KEY, VAL>::MoveNext(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const
-{
-	if( cursor == 0 )
-	{
-		*out = 0;
-		return false;
-	}
-
-	if( cursor->right == 0 ) 
-	{
-		// Move upwards until we find a parent node to the right
-		while( cursor->parent && cursor->parent->right == cursor )
-			cursor = cursor->parent;
-
-		cursor = cursor->parent;
-		*out = cursor;
-		if( cursor == 0 ) 
-			return false;
-
-		return true;
-	}
-
-	cursor = cursor->right;
-	while( cursor->left ) 
-		cursor = cursor->left;
-
-	*out = cursor;
-	return true;
-}
-
-template <class KEY, class VAL>
-bool asCMap<KEY, VAL>::MovePrev(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const
-{
-	if( cursor == 0 ) 
-	{
-		*out = 0;
-		return false;
-	}
-
-	if( cursor->left == 0 )
-	{
-		// Move upwards until we find a parent node to the left
-		while( cursor->parent && cursor->parent->left == cursor )
-			cursor = cursor->parent;
-
-		cursor = cursor->parent;
-
-		*out = cursor;
-		if( cursor == 0 )
-			return false;
-
-		return true;
-	}
-
-	cursor = cursor->left;
-	while( cursor->right )
-		cursor = cursor->right;
-
-	*out = cursor;
-	return true;
-}
-
-
-
-
-#endif
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2013 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_map.h
+//
+// This class is used for mapping a value to another
+//
+
+
+#ifndef AS_MAP_H
+#define AS_MAP_H
+
+template <class KEY, class VAL> struct asSMapNode;
+
+template <class KEY, class VAL> class asCMap
+{
+public:
+	asCMap();
+	~asCMap();
+
+	int   Insert(const KEY &key, const VAL &value);
+	int   Insert(asSMapNode<KEY,VAL> *node);
+	int   GetCount() const;
+	
+	const KEY &GetKey(const asSMapNode<KEY,VAL> *cursor) const;
+	const VAL &GetValue(const asSMapNode<KEY,VAL> *cursor) const;
+	VAL       &GetValue(asSMapNode<KEY,VAL> *cursor);
+
+	void Erase(asSMapNode<KEY,VAL> *cursor);
+	asSMapNode<KEY,VAL> *Remove(asSMapNode<KEY,VAL> *cursor);
+	void EraseAll();
+
+	void SwapWith(asCMap<KEY,VAL> &other);
+
+	// Returns true as long as cursor is valid
+
+	bool MoveTo(asSMapNode<KEY,VAL> **out, const KEY &key) const;
+	bool MoveFirst(asSMapNode<KEY,VAL> **out) const;
+	bool MoveLast(asSMapNode<KEY,VAL> **out) const;
+	bool MoveNext(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const;
+	bool MovePrev(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const;
+
+	// For debugging only
+
+	int CheckIntegrity(asSMapNode<KEY,VAL> *node) const;
+
+protected:
+	// Don't allow value assignment
+	asCMap &operator=(const asCMap &) { return *this; }
+
+	void BalanceInsert(asSMapNode<KEY,VAL> *node);
+	void BalanceErase(asSMapNode<KEY,VAL> *child, asSMapNode<KEY,VAL> *parent);
+
+	int EraseAll(asSMapNode<KEY,VAL> *node);
+	int RotateLeft(asSMapNode<KEY,VAL> *node);
+	int RotateRight(asSMapNode<KEY,VAL> *node);
+
+	asSMapNode<KEY,VAL> *root;
+	asSMapNode<KEY,VAL> dummy;
+
+	int count;
+};
+
+//---------------------------------------------------------------------------
+// Implementation
+
+// Properties of a Red-Black Tree
+//
+// 1. The root is always black
+// 2. All single paths from the root to leafs
+//    contain the same amount of black nodes
+// 3. No red node can have a red node as parent
+
+#define ISRED(x) ((x != 0) && (x)->isRed)
+#define ISBLACK(x) (!ISRED(x))
+
+template <class KEY, class VAL> struct asSMapNode
+{
+	asSMapNode() {parent = 0; left = 0; right = 0; isRed = true;}
+	void Init(KEY k, VAL v) {key = k; value = v; parent = 0; left = 0; right = 0; isRed = true;}
+
+	asSMapNode *parent;
+	asSMapNode *left;
+	asSMapNode *right;
+	bool isRed;
+
+	KEY key;
+	VAL value;
+};
+
+template <class KEY, class VAL>
+asCMap<KEY, VAL>::asCMap()
+{
+	root = 0;
+	count = 0;
+}
+
+template <class KEY, class VAL>
+asCMap<KEY, VAL>::~asCMap()
+{
+	EraseAll();
+}
+
+template <class KEY, class VAL>
+void asCMap<KEY,VAL>::SwapWith(asCMap<KEY,VAL> &other)
+{
+	asSMapNode<KEY,VAL> *tmpRoot  = root;
+	int                  tmpCount = count;
+
+	root  = other.root;
+	count = other.count;
+
+	other.root  = tmpRoot;
+	other.count = tmpCount;
+}
+
+template <class KEY, class VAL>
+void asCMap<KEY, VAL>::EraseAll()
+{
+	EraseAll(root);
+	root = 0;
+}
+
+template <class KEY, class VAL>
+int asCMap<KEY, VAL>::EraseAll(asSMapNode<KEY, VAL> *p)
+{
+	if( p == 0 ) return -1;
+
+	EraseAll( p->left );
+	EraseAll( p->right );
+
+	typedef asSMapNode<KEY,VAL> node_t;
+	asDELETE(p,node_t);
+
+	count--;
+
+	return 0;
+}
+
+template <class KEY, class VAL>
+int asCMap<KEY, VAL>::GetCount() const
+{
+	return count;
+}
+
+template <class KEY, class VAL>
+int asCMap<KEY, VAL>::Insert(const KEY &key, const VAL &value)
+{
+	typedef asSMapNode<KEY,VAL> node_t;
+	asSMapNode<KEY,VAL> *nnode = asNEW(node_t);
+	if( nnode == 0 )
+	{
+		// Out of memory
+		return -1;
+	}
+
+	nnode->key   = key;
+	nnode->value = value;
+
+	return Insert(nnode);
+}
+
+template <class KEY, class VAL>
+int asCMap<KEY, VAL>::Insert(asSMapNode<KEY,VAL> *nnode)
+{
+	// Insert the node
+	if( root == 0 )
+		root = nnode;
+	else
+	{
+		asSMapNode<KEY,VAL> *p = root;
+		for(;;)
+		{
+			if( nnode->key < p->key )
+			{
+				if( p->left == 0 )
+				{
+					nnode->parent = p;
+					p->left = nnode;
+					break;
+				}
+				else
+					p = p->left;
+			}
+			else
+			{
+				if( p->right == 0 )
+				{
+					nnode->parent = p;
+					p->right = nnode;
+					break;
+				}
+				else
+					p = p->right;
+			}
+		}
+	}
+
+	BalanceInsert(nnode);
+
+	count++;
+
+	return 0;
+}
+
+template <class KEY, class VAL>
+void asCMap<KEY, VAL>::BalanceInsert(asSMapNode<KEY, VAL> *node)
+{
+	// The node, that is red, can't have a red parent
+	while( node != root && node->parent->isRed )
+	{
+		// Check color of uncle 
+		if( node->parent == node->parent->parent->left )
+		{
+			asSMapNode<KEY,VAL> *uncle = node->parent->parent->right;
+			if( ISRED(uncle) )
+			{
+				//    B
+				//   R R
+				//  N
+
+				// Change color on parent, uncle, and grand parent
+				node->parent->isRed = false;
+				uncle->isRed = false;
+				node->parent->parent->isRed = true;
+
+				// Continue balancing from grand parent
+				node = node->parent->parent;
+			}
+			else
+			{
+				//    B
+				//   R B
+				//  N
+
+				if( node == node->parent->right ) 
+				{
+					// Make the node a left child
+					node = node->parent;
+					RotateLeft(node);
+				}
+
+				// Change color on parent and grand parent
+				// Then rotate grand parent to the right
+				node->parent->isRed = false;
+				node->parent->parent->isRed = true;
+				RotateRight(node->parent->parent);
+			}
+		}
+		else
+		{
+			asSMapNode<KEY,VAL> *uncle = node->parent->parent->left;
+			if( ISRED(uncle) )
+			{
+				//   B
+				//  R R
+				//     N
+
+				// Change color on parent, uncle, and grand parent
+				// Continue balancing from grand parent
+				node->parent->isRed = false;
+				uncle->isRed = false;
+				node = node->parent->parent;
+				node->isRed = true;
+			}
+			else
+			{
+				//   B
+				//  B R
+				//     N
+
+				if( node == node->parent->left ) 
+				{
+					// Make the node a right child
+					node = node->parent;
+					RotateRight(node);
+				}
+				
+				// Change color on parent and grand parent
+				// Then rotate grand parent to the right
+				node->parent->isRed = false;
+				node->parent->parent->isRed = true;
+				RotateLeft(node->parent->parent);
+			}
+		}
+	}
+
+	root->isRed = false;
+}
+
+// For debugging purposes only
+template <class KEY, class VAL>
+int asCMap<KEY, VAL>::CheckIntegrity(asSMapNode<KEY, VAL> *node) const
+{
+	if( node == 0 ) 
+	{
+		if( root == 0 ) 
+			return 0;
+		else if( ISRED(root) )
+			return -1;
+		else
+			node = root;
+	}
+
+	int left = 0, right = 0;
+	if( node->left )
+		left = CheckIntegrity(node->left);
+	if( node->right )
+		right = CheckIntegrity(node->right);
+
+	if( left != right || left == -1 ) 
+		return -1;
+	
+	if( ISBLACK(node) )
+		return left+1;
+
+	return left;
+}
+
+// Returns true if successful
+template <class KEY, class VAL>
+bool asCMap<KEY, VAL>::MoveTo(asSMapNode<KEY,VAL> **out, const KEY &key) const
+{
+	asSMapNode<KEY,VAL> *p = root;
+	while( p )
+	{
+		if( key < p->key )
+			p = p->left;
+		else if( key == p->key )
+		{
+			if( out ) *out = p;
+			return true;
+		}
+		else 
+			p = p->right;
+	}
+
+	if( out ) *out = 0;
+	return false;
+}
+
+template <class KEY, class VAL>
+void asCMap<KEY, VAL>::Erase(asSMapNode<KEY,VAL> *cursor)
+{
+	asSMapNode<KEY,VAL> *node = Remove(cursor);
+	asASSERT( node == cursor );
+
+	typedef asSMapNode<KEY,VAL> node_t;
+	asDELETE(node,node_t);
+}
+
+template <class KEY, class VAL>
+asSMapNode<KEY,VAL> *asCMap<KEY, VAL>::Remove(asSMapNode<KEY,VAL> *cursor)
+{
+	if( cursor == 0 ) return 0;
+
+	asSMapNode<KEY,VAL> *node = cursor;
+
+	//---------------------------------------------------
+	// Choose the node that will replace the erased one
+	asSMapNode<KEY,VAL> *remove;
+	if( node->left == 0 || node->right == 0 )
+		remove = node;
+	else
+	{
+		remove = node->right;
+		while( remove->left ) remove = remove->left;
+	}
+
+	//--------------------------------------------------
+	// Remove the node
+	asSMapNode<KEY,VAL> *child;
+	if( remove->left )
+		child = remove->left;
+	else
+		child = remove->right;
+
+	if( child ) child->parent = remove->parent;
+	if( remove->parent )
+	{
+		if( remove == remove->parent->left )
+			remove->parent->left = child;
+		else
+			remove->parent->right = child;
+	}
+	else
+		root = child;
+
+	// If we remove a black node we must make sure the tree is balanced
+	if( ISBLACK(remove) )
+		BalanceErase(child, remove->parent);
+
+	//----------------------------------------
+	// Replace the erased node with the removed one
+	if( remove != node )
+	{
+		if( node->parent )
+		{
+			if( node->parent->left == node )
+				node->parent->left = remove;
+			else
+				node->parent->right = remove;
+		}
+		else
+			root = remove;
+
+		remove->isRed  = node->isRed;
+		remove->parent = node->parent;
+
+		remove->left = node->left;
+		if( remove->left ) remove->left->parent = remove;
+		remove->right = node->right;
+		if( remove->right ) remove->right->parent = remove;	
+	}
+
+	count--;
+
+	return node;
+}
+
+// Call method only if removed node was black
+// child is the child of the removed node
+template <class KEY, class VAL>
+void asCMap<KEY, VAL>::BalanceErase(asSMapNode<KEY, VAL> *child, asSMapNode<KEY, VAL> *parent)
+{
+	// If child is red
+	//   Color child black 
+	//   Terminate
+
+	// These tests assume brother is to the right.
+
+	// 1. Brother is red
+	//   Color parent red and brother black
+    //   Rotate parent left
+	//   Transforms to 2b
+	// 2a. Parent and brother is black, brother's children are black
+	//   Color brother red
+	//   Continue test with parent as child
+	// 2b. Parent is red, brother is black, brother's children are black
+	//   Color parent black and brother red
+	//   Terminate
+	// 3. Brother is black, and brother's left is red and brother's right is black
+	//   Color brother red and brother's left black
+	//   Rotate brother to right
+	//   Transforms to 4.
+	// 4. Brother is black, brother's right is red
+	//   Color brother's right black
+	//   Color brother to color of parent
+	//   Color parent black
+	//   Rotate parent left
+	//   Terminate
+
+	while( child != root && ISBLACK(child) )
+	{
+		if( child == parent->left )
+		{
+			asSMapNode<KEY,VAL> *brother = parent->right;
+
+			// Case 1
+			if( ISRED(brother) )
+			{
+				brother->isRed = false;
+				parent->isRed = true;
+				RotateLeft(parent);
+				brother = parent->right;
+			}
+
+			// Case 2
+			if( brother == 0 ) break;
+			if( ISBLACK(brother->left) && ISBLACK(brother->right) )
+			{
+				// Case 2b
+				if( ISRED(parent) )
+				{
+					parent->isRed = false;
+					brother->isRed = true;
+					break;
+				}
+
+				brother->isRed = true;
+				child = parent;
+				parent = child->parent;
+			}
+			else
+			{
+				// Case 3
+				if( ISBLACK(brother->right) )
+				{
+					brother->left->isRed = false;
+					brother->isRed = true;
+					RotateRight(brother);
+					brother = parent->right;
+				}
+
+				// Case 4
+				brother->isRed = parent->isRed;
+				parent->isRed = false;
+				brother->right->isRed = false;
+				RotateLeft(parent);
+				break;
+			}
+		}
+		else
+		{
+			asSMapNode<KEY,VAL> *brother = parent->left;
+			
+			// Case 1
+			if( ISRED(brother) )
+			{
+				brother->isRed = false;
+				parent->isRed = true;
+				RotateRight(parent);
+				brother = parent->left;
+			}
+
+			// Case 2
+			if( brother == 0 ) break;
+			if( ISBLACK(brother->left) && ISBLACK(brother->right) )
+			{
+				// Case 2b
+				if( ISRED(parent) )
+				{
+					parent->isRed = false;
+					brother->isRed = true;
+					break;
+				}
+
+				brother->isRed = true;
+				child = parent;
+				parent = child->parent;
+			}
+			else
+			{
+				// Case 3
+				if( ISBLACK(brother->left) )
+				{
+					brother->right->isRed = false;
+					brother->isRed = true;
+					RotateLeft(brother);
+					brother = parent->left;
+				}
+
+				// Case 4
+				brother->isRed = parent->isRed;
+				parent->isRed = false;
+				brother->left->isRed = false;
+				RotateRight(parent);
+				break;
+			}
+		}
+	}
+
+	if( child )
+		child->isRed = false;
+}
+
+template <class KEY, class VAL>
+int asCMap<KEY, VAL>::RotateRight(asSMapNode<KEY, VAL> *node)
+{
+	//     P             L       //
+	//    / \           / \      //
+	//   L   R    =>   Ll  P     //
+	//  / \               / \    //
+	// Ll  Lr            Lr  R   //
+
+	if( node->left == 0 ) return -1;
+
+	asSMapNode<KEY,VAL> *left = node->left;
+
+	// Update parent
+	if( node->parent )
+	{
+		asSMapNode<KEY,VAL> *parent = node->parent;
+		if( parent->left == node )
+			parent->left = left;
+		else
+			parent->right = left;
+
+		left->parent = parent;
+	}
+	else
+	{
+		root = left;
+		left->parent = 0;
+	}
+
+	// Move left's right child to node's left child
+	node->left = left->right;
+	if( node->left ) node->left->parent = node;
+
+	// Put node as left's right child
+	left->right = node;
+	node->parent = left;
+
+	return 0;
+}
+
+template <class KEY, class VAL>
+int asCMap<KEY, VAL>::RotateLeft(asSMapNode<KEY, VAL> *node)
+{
+	//     P             R      //
+	//    / \           / \     //
+	//   L   R    =>   P   Rr   //
+	//      / \       / \       //
+	//     Rl  Rr    L   Rl     //
+
+	if( node->right == 0 ) return -1;
+
+	asSMapNode<KEY,VAL> *right = node->right;
+
+	// Update parent
+	if( node->parent )
+	{
+		asSMapNode<KEY,VAL> *parent = node->parent;
+		if( parent->right == node )
+			parent->right = right;
+		else
+			parent->left = right;
+
+		right->parent = parent;
+	}
+	else
+	{
+		root = right;
+		right->parent = 0;
+	}
+
+	// Move right's left child to node's right child
+	node->right = right->left;
+	if( node->right ) node->right->parent = node;
+
+	// Put node as right's left child
+	right->left = node;
+	node->parent = right;
+
+	return 0;
+}
+
+template <class KEY, class VAL>
+const VAL &asCMap<KEY, VAL>::GetValue(const asSMapNode<KEY,VAL> *cursor) const 
+{
+	if( cursor == 0 ) 
+		return dummy.value;
+
+	return cursor->value;
+}
+
+template <class KEY, class VAL>
+VAL &asCMap<KEY, VAL>::GetValue(asSMapNode<KEY,VAL> *cursor) 
+{
+	if( cursor == 0 ) 
+		return dummy.value;
+
+	return cursor->value;
+}
+
+template <class KEY, class VAL>
+const KEY &asCMap<KEY, VAL>::GetKey(const asSMapNode<KEY,VAL> *cursor) const
+{
+	if( cursor == 0 )
+		return dummy.key;
+
+	return cursor->key;
+}
+
+template <class KEY, class VAL>
+bool asCMap<KEY, VAL>::MoveFirst(asSMapNode<KEY,VAL> **out) const
+{
+	*out = root;
+	if( root == 0 ) return false;
+
+	while( (*out)->left ) 
+		*out = (*out)->left;
+
+	return true;
+}
+
+template <class KEY, class VAL>
+bool asCMap<KEY, VAL>::MoveLast(asSMapNode<KEY,VAL> **out) const
+{
+	*out = root;
+	if( root == 0 ) return false;
+
+	while( (*out)->right ) 
+		*out = (*out)->right;
+
+	return true;
+}
+
+template <class KEY, class VAL>
+bool asCMap<KEY, VAL>::MoveNext(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const
+{
+	if( cursor == 0 )
+	{
+		*out = 0;
+		return false;
+	}
+
+	if( cursor->right == 0 ) 
+	{
+		// Move upwards until we find a parent node to the right
+		while( cursor->parent && cursor->parent->right == cursor )
+			cursor = cursor->parent;
+
+		cursor = cursor->parent;
+		*out = cursor;
+		if( cursor == 0 ) 
+			return false;
+
+		return true;
+	}
+
+	cursor = cursor->right;
+	while( cursor->left ) 
+		cursor = cursor->left;
+
+	*out = cursor;
+	return true;
+}
+
+template <class KEY, class VAL>
+bool asCMap<KEY, VAL>::MovePrev(asSMapNode<KEY,VAL> **out, asSMapNode<KEY,VAL> *cursor) const
+{
+	if( cursor == 0 ) 
+	{
+		*out = 0;
+		return false;
+	}
+
+	if( cursor->left == 0 )
+	{
+		// Move upwards until we find a parent node to the left
+		while( cursor->parent && cursor->parent->left == cursor )
+			cursor = cursor->parent;
+
+		cursor = cursor->parent;
+
+		*out = cursor;
+		if( cursor == 0 )
+			return false;
+
+		return true;
+	}
+
+	cursor = cursor->left;
+	while( cursor->right )
+		cursor = cursor->right;
+
+	*out = cursor;
+	return true;
+}
+
+
+
+
+#endif
+
diff --git a/Sources/AngelScript/source/as_memory.cpp b/Sources/AngelScript/source/as_memory.cpp
old mode 100755
new mode 100644
index b8f2cd1b4..5914658ba
--- a/Sources/AngelScript/source/as_memory.cpp
+++ b/Sources/AngelScript/source/as_memory.cpp
@@ -1,276 +1,288 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_memory.cpp
-//
-// Overload the default memory management functions so that we
-// can let the application decide how to do it.
-//
-
-#include <stdlib.h>
-
-#if !defined(__APPLE__) && !defined(__SNC__) && !defined(__ghs__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
-#include <malloc.h>
-#endif
-
-#include "as_config.h"
-#include "as_memory.h"
-#include "as_scriptnode.h"
-#include "as_bytecode.h"
-
-BEGIN_AS_NAMESPACE
-
-#ifdef WIP_16BYTE_ALIGN
-
-// TODO: Add support for 16byte aligned application types (e.g. __m128). The following is a list of things that needs to be implemented:
-//
-//  ok  - The script context must make sure to always allocate the local stack memory buffer on 16byte aligned boundaries (asCContext::ReserveStackSpace)
-//  ok  - The engine must make sure to always allocate the memory for the script objects on 16byte aligned boundaries (asCScriptEngine::CallAlloc)
-//  ok  - The application needs to inform a new flag when registering types that require 16byte alignment, e.g. asOBJ_APP_ALIGN16 (asCScriptEngine::RegisterObjectType)
-//  ok  - The script object type must make sure to align member properties of these types correctly (asCObjectType::AddPropertyToClass)
-//  ok  - Script global properties must allocate memory on 16byte boundaries if holding these types (asCGlobalProperty::AllocateMemory)
-// TODO - The script compiler must make sure to allocate the local variables on 16byte boundaries (asCCompiler::AllocateVariable)
-// TODO - The script compiler must add pad bytes on the stack for all function calls to guarantee that the stack position is 16byte aligned on entry in the called function (asCCompiler)
-// TODO - The bytecode serializer must be capable of adjusting these pad bytes to guarantee platform independent saved bytecode. Remember that the registered type may not be 16byte aligned on all platforms (asCWriter & asCReader) 
-// TODO - The bytecode serializer must also be prepared to adjust the position of the local variables according to the need fro 16byte alignment (asCWriter & asCReader)
-// TODO - The code for the native calling conventions must be adjusted for all platforms that should support 16byte aligned types (as_callfunc...)
-//  ok  - When the context needs to grow the local stack memory it must copy the function arguments so that the stack entry position is 16byte aligned (asCContext::CallScriptFunction)
-// TODO - When the context is prepared for a new call, it must set the initial stack position so the stack entry position is 16byte aligned (asCContext::Prepare)
-//
-// http://www.gamedev.net/topic/650555-alignment-requirements/
-
-
-// TODO: Allow user to register its own aligned memory routines
-// Wrappers for aligned allocations
-void *debugAlignedMalloc(size_t size, size_t align, const char *file, int line)
-{
-	void *mem = ((asALLOCFUNCDEBUG_t)userAlloc)(size + (align-1) + sizeof(void*), file, line);
-
-	char *amem = ((char*)mem) + sizeof(void*);
-	if( (uintptr_t)amem & (align - 1) )
-		amem += align - ((uintptr_t)amem & (align - 1));
-
-	((void**)amem)[-1] = mem;
-	return amem;
-}
-
-void *alignedMalloc(size_t size, size_t align)
-{
-	void *mem = userAlloc(size + (align-1) + sizeof(void*));
-
-	char *amem = ((char*)mem) + sizeof(void*);
-	if( (uintptr_t)amem & (align - 1) )
-		amem += align - ((uintptr_t)amem & (align - 1));
-
-	((void**)amem)[-1] = mem;
-	return amem;
-}
-
-void alignedFree(void *mem)
-{
-	userFree( ((void**)mem)[-1] );
-}
-
-bool isAligned(const void* const pointer, asUINT alignment)
-{
-	return (uintptr_t(pointer) % alignment) == 0;
-}
-#endif
-
-// By default we'll use the standard memory management functions
-
-// Make sure these globals are initialized first. Otherwise the
-// library may crash in case the application initializes the engine
-// as a global variable.
-
-#ifdef _MSC_VER
-// MSVC let's us choose between a couple of different initialization orders.
-#pragma warning(disable: 4073)
-#pragma init_seg(lib)
-asALLOCFUNC_t userAlloc = malloc;
-asFREEFUNC_t  userFree  = free;
-#ifdef WIP_16BYTE_ALIGN
-#ifdef AS_DEBUG
-asALLOCALIGNEDFUNC_t userAllocAligned = (asALLOCALIGNEDFUNC_t)debugAlignedMalloc;
-#else
-asALLOCALIGNEDFUNC_t userAllocAligned = alignedMalloc;
-#endif
-asFREEALIGNEDFUNC_t  userFreeAligned  = alignedFree;
-#endif
-#else
-// Other compilers will just have to rely on luck.
-asALLOCFUNC_t userAlloc = malloc;
-asFREEFUNC_t  userFree  = free;
-#ifdef WIP_16BYTE_ALIGN
-asALLOCALIGNEDFUNC_t userAllocAligned = alignedMalloc;
-asFREEALIGNEDFUNC_t  userFreeAligned  = alignedFree;
-#endif
-#endif
-
-extern "C"
-{
-
-// interface
-int asSetGlobalMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc)
-{
-	// Clean-up thread local memory before changing the allocation routines to avoid 
-	// potential problem with trying to free memory using a different allocation
-	// routine than used when allocating it.
-	asThreadCleanup();
-
-	userAlloc = allocFunc;
-	userFree  = freeFunc;
-
-	return 0;
-}
-
-// interface
-int asResetGlobalMemoryFunctions()
-{
-	// Clean-up thread local memory before changing the allocation routines to avoid 
-	// potential problem with trying to free memory using a different allocation
-	// routine than used when allocating it.
-	asThreadCleanup();
-
-	userAlloc = malloc;
-	userFree  = free;
-
-	return 0;
-}
-
-// interface
-void *asAllocMem(size_t size)
-{
-	return asNEWARRAY(asBYTE, size);
-}
-
-// interface
-void asFreeMem(void *mem)
-{
-	asDELETEARRAY(mem);
-}
-
-} // extern "C"
-
-asCMemoryMgr::asCMemoryMgr()
-{
-}
-
-asCMemoryMgr::~asCMemoryMgr()
-{
-	FreeUnusedMemory();
-}
-
-void asCMemoryMgr::FreeUnusedMemory()
-{
-	// It's necessary to protect the scriptNodePool from multiple 
-	// simultaneous accesses, as the parser is used by several methods
-	// that can be executed simultaneously.
-	ENTERCRITICALSECTION(cs);
-
-	int n;
-	for( n = 0; n < (signed)scriptNodePool.GetLength(); n++ )
-		userFree(scriptNodePool[n]);
-	scriptNodePool.Allocate(0, false);
-
-	LEAVECRITICALSECTION(cs);
-
-	// The engine already protects against multiple threads 
-	// compiling scripts simultaneously so this pool doesn't have 
-	// to be protected again.
-	for( n = 0; n < (signed)byteInstructionPool.GetLength(); n++ )
-		userFree(byteInstructionPool[n]);
-	byteInstructionPool.Allocate(0, false);
-}
-
-void *asCMemoryMgr::AllocScriptNode()
-{
-	ENTERCRITICALSECTION(cs);
-
-	if( scriptNodePool.GetLength() )
-	{
-		void *tRet = scriptNodePool.PopLast();
-		LEAVECRITICALSECTION(cs);
-		return tRet;
-	}
-
-	LEAVECRITICALSECTION(cs);
-
-#if defined(AS_DEBUG) 
-	return ((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(asCScriptNode), __FILE__, __LINE__);
-#else
-	return userAlloc(sizeof(asCScriptNode));
-#endif
-}
-
-void asCMemoryMgr::FreeScriptNode(void *ptr)
-{
-	ENTERCRITICALSECTION(cs);
-
-	// Pre allocate memory for the array to avoid slow growth
-	if( scriptNodePool.GetLength() == 0 )
-		scriptNodePool.Allocate(100, 0);
-
-	scriptNodePool.PushLast(ptr);
-
-	LEAVECRITICALSECTION(cs);
-}
-
-#ifndef AS_NO_COMPILER
-
-void *asCMemoryMgr::AllocByteInstruction()
-{
-	if( byteInstructionPool.GetLength() )
-		return byteInstructionPool.PopLast();
-
-#if defined(AS_DEBUG) 
-	return ((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(asCByteInstruction), __FILE__, __LINE__);
-#else
-	return userAlloc(sizeof(asCByteInstruction));
-#endif
-}
-
-void asCMemoryMgr::FreeByteInstruction(void *ptr)
-{
-	// Pre allocate memory for the array to avoid slow growth
-	if( byteInstructionPool.GetLength() == 0 )
-		byteInstructionPool.Allocate(100, 0);
-
-	byteInstructionPool.PushLast(ptr);
-}
-
-#endif // AS_NO_COMPILER
-
-END_AS_NAMESPACE
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2020 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_memory.cpp
+//
+// Overload the default memory management functions so that we
+// can let the application decide how to do it.
+//
+
+#include <stdlib.h>
+
+#if !defined(__APPLE__) && !defined(__SNC__) && !defined(__ghs__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+#include <malloc.h>
+#endif
+
+#include "as_config.h"
+#include "as_memory.h"
+#include "as_scriptnode.h"
+#include "as_bytecode.h"
+
+BEGIN_AS_NAMESPACE
+
+#ifdef WIP_16BYTE_ALIGN
+
+// TODO: Add support for 16byte aligned application types (e.g. __m128). The following is a list of things that needs to be implemented:
+//
+//  ok  - The script context must make sure to always allocate the local stack memory buffer on 16byte aligned boundaries (asCContext::ReserveStackSpace)
+//  ok  - The engine must make sure to always allocate the memory for the script objects on 16byte aligned boundaries (asCScriptEngine::CallAlloc)
+//  ok  - The application needs to inform a new flag when registering types that require 16byte alignment, e.g. asOBJ_APP_ALIGN16 (asCScriptEngine::RegisterObjectType)
+//  ok  - The script object type must make sure to align member properties of these types correctly (asCObjectType::AddPropertyToClass)
+//  ok  - Script global properties must allocate memory on 16byte boundaries if holding these types (asCGlobalProperty::AllocateMemory)
+// TODO - The script compiler must make sure to allocate the local variables on 16byte boundaries (asCCompiler::AllocateVariable)
+// TODO - The script compiler must add pad bytes on the stack for all function calls to guarantee that the stack position is 16byte aligned on entry in the called function (asCCompiler)
+// TODO - The bytecode serializer must be capable of adjusting these pad bytes to guarantee platform independent saved bytecode. Remember that the registered type may not be 16byte aligned on all platforms (asCWriter & asCReader) 
+// TODO - The bytecode serializer must also be prepared to adjust the position of the local variables according to the need fro 16byte alignment (asCWriter & asCReader)
+// TODO - The code for the native calling conventions must be adjusted for all platforms that should support 16byte aligned types (as_callfunc...)
+//  ok  - When the context needs to grow the local stack memory it must copy the function arguments so that the stack entry position is 16byte aligned (asCContext::CallScriptFunction)
+// TODO - When the context is prepared for a new call, it must set the initial stack position so the stack entry position is 16byte aligned (asCContext::Prepare)
+//
+// http://www.gamedev.net/topic/650555-alignment-requirements/
+
+
+// TODO: Allow user to register its own aligned memory routines
+// Wrappers for aligned allocations
+void *debugAlignedMalloc(size_t size, size_t align, const char *file, int line)
+{
+	void *mem = ((asALLOCFUNCDEBUG_t)userAlloc)(size + (align-1) + sizeof(void*), file, line);
+
+	char *amem = ((char*)mem) + sizeof(void*);
+	if( (uintptr_t)amem & (align - 1) )
+		amem += align - ((uintptr_t)amem & (align - 1));
+
+	((void**)amem)[-1] = mem;
+	return amem;
+}
+
+void *alignedMalloc(size_t size, size_t align)
+{
+	void *mem = userAlloc(size + (align-1) + sizeof(void*));
+
+	char *amem = ((char*)mem) + sizeof(void*);
+	if( (uintptr_t)amem & (align - 1) )
+		amem += align - ((uintptr_t)amem & (align - 1));
+
+	((void**)amem)[-1] = mem;
+	return amem;
+}
+
+void alignedFree(void *mem)
+{
+	userFree( ((void**)mem)[-1] );
+}
+
+bool isAligned(const void* const pointer, asUINT alignment)
+{
+	return (uintptr_t(pointer) % alignment) == 0;
+}
+#endif
+
+// By default we'll use the standard memory management functions
+
+// Make sure these globals are initialized first. Otherwise the
+// library may crash in case the application initializes the engine
+// as a global variable.
+
+#ifdef _MSC_VER
+// MSVC let's us choose between a couple of different initialization orders.
+#pragma warning(disable: 4073)
+#pragma init_seg(lib)
+asALLOCFUNC_t userAlloc = malloc;
+asFREEFUNC_t  userFree  = free;
+#ifdef WIP_16BYTE_ALIGN
+#ifdef AS_DEBUG
+asALLOCALIGNEDFUNC_t userAllocAligned = (asALLOCALIGNEDFUNC_t)debugAlignedMalloc;
+#else
+asALLOCALIGNEDFUNC_t userAllocAligned = alignedMalloc;
+#endif
+asFREEALIGNEDFUNC_t  userFreeAligned  = alignedFree;
+#endif
+#else
+// Other compilers will just have to rely on luck.
+asALLOCFUNC_t userAlloc = malloc;
+asFREEFUNC_t  userFree  = free;
+#ifdef WIP_16BYTE_ALIGN
+asALLOCALIGNEDFUNC_t userAllocAligned = alignedMalloc;
+asFREEALIGNEDFUNC_t  userFreeAligned  = alignedFree;
+#endif
+#endif
+
+extern "C"
+{
+
+// interface
+int asSetGlobalMemoryFunctions(asALLOCFUNC_t allocFunc, asFREEFUNC_t freeFunc)
+{
+	// Clean-up thread local memory before changing the allocation routines to avoid 
+	// potential problem with trying to free memory using a different allocation
+	// routine than used when allocating it.
+	asThreadCleanup();
+
+	userAlloc = allocFunc;
+	userFree  = freeFunc;
+
+	return 0;
+}
+
+// interface
+int asResetGlobalMemoryFunctions()
+{
+	// Clean-up thread local memory before changing the allocation routines to avoid 
+	// potential problem with trying to free memory using a different allocation
+	// routine than used when allocating it.
+	asThreadCleanup();
+
+	userAlloc = malloc;
+	userFree  = free;
+
+	return 0;
+}
+
+// interface
+void *asAllocMem(size_t size)
+{
+	return asNEWARRAY(asBYTE, size);
+}
+
+// interface
+void asFreeMem(void *mem)
+{
+	asDELETEARRAY(mem);
+}
+
+} // extern "C"
+
+asCMemoryMgr::asCMemoryMgr()
+{
+}
+
+asCMemoryMgr::~asCMemoryMgr()
+{
+	FreeUnusedMemory();
+}
+
+void asCMemoryMgr::FreeUnusedMemory()
+{
+	// It's necessary to protect the scriptNodePool from multiple 
+	// simultaneous accesses, as the parser is used by several methods
+	// that can be executed simultaneously.
+	ENTERCRITICALSECTION(cs);
+
+	int n;
+	for( n = 0; n < (signed)scriptNodePool.GetLength(); n++ )
+		userFree(scriptNodePool[n]);
+	scriptNodePool.Allocate(0, false);
+
+	LEAVECRITICALSECTION(cs);
+
+	// The engine already protects against multiple threads 
+	// compiling scripts simultaneously so this pool doesn't have 
+	// to be protected again.
+	for( n = 0; n < (signed)byteInstructionPool.GetLength(); n++ )
+		userFree(byteInstructionPool[n]);
+	byteInstructionPool.Allocate(0, false);
+}
+
+void *asCMemoryMgr::AllocScriptNode()
+{
+	ENTERCRITICALSECTION(cs);
+
+	if( scriptNodePool.GetLength() )
+	{
+		void *tRet = scriptNodePool.PopLast();
+		LEAVECRITICALSECTION(cs);
+		return tRet;
+	}
+
+	LEAVECRITICALSECTION(cs);
+
+#if defined(AS_DEBUG) 
+	return ((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(asCScriptNode), __FILE__, __LINE__);
+#else
+	return userAlloc(sizeof(asCScriptNode));
+#endif
+}
+
+void asCMemoryMgr::FreeScriptNode(void *ptr)
+{
+	ENTERCRITICALSECTION(cs);
+
+	// Pre allocate memory for the array to avoid slow growth
+	if( scriptNodePool.GetLength() == 0 )
+		scriptNodePool.Allocate(100, 0);
+
+	scriptNodePool.PushLast(ptr);
+	
+#ifdef AS_DEBUG
+	// clear the memory to facilitate identification of use after free
+	memset(ptr, 0xCDCDCDCD, sizeof(asCScriptNode));
+#endif
+
+	LEAVECRITICALSECTION(cs);
+}
+
+#ifndef AS_NO_COMPILER
+
+void *asCMemoryMgr::AllocByteInstruction()
+{
+	// This doesn't need a critical section because, only one compilation is allowed at a time
+	
+	if( byteInstructionPool.GetLength() )
+		return byteInstructionPool.PopLast();
+
+#if defined(AS_DEBUG) 
+	return ((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(asCByteInstruction), __FILE__, __LINE__);
+#else
+	return userAlloc(sizeof(asCByteInstruction));
+#endif
+}
+
+void asCMemoryMgr::FreeByteInstruction(void *ptr)
+{
+	// Pre allocate memory for the array to avoid slow growth
+	if( byteInstructionPool.GetLength() == 0 )
+		byteInstructionPool.Allocate(100, 0);
+
+	byteInstructionPool.PushLast(ptr);
+	
+#ifdef AS_DEBUG
+	// clear the memory to facilitate identification of use after free
+	memset(ptr, 0xCDCDCDCD, sizeof(asCByteInstruction));
+#endif
+}
+
+#endif // AS_NO_COMPILER
+
+END_AS_NAMESPACE
+
+
+
diff --git a/Sources/AngelScript/source/as_memory.h b/Sources/AngelScript/source/as_memory.h
old mode 100755
new mode 100644
index 047408557..369af642b
--- a/Sources/AngelScript/source/as_memory.h
+++ b/Sources/AngelScript/source/as_memory.h
@@ -1,135 +1,135 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_memory.h
-//
-// Overload the default memory management functions so that we
-// can let the application decide how to do it.
-//
-
-
-
-#ifndef AS_MEMORY_H
-#define AS_MEMORY_H
-
-#include "as_config.h"
-
-BEGIN_AS_NAMESPACE
-
-extern asALLOCFUNC_t userAlloc;
-extern asFREEFUNC_t  userFree;
-
-#ifdef WIP_16BYTE_ALIGN
-
-// TODO: This declaration should be in angelscript.h
-//       when the application can register it's own
-//       aligned memory routines
-typedef void *(*asALLOCALIGNEDFUNC_t)(size_t, size_t);
-typedef void (*asFREEALIGNEDFUNC_t)(void *);
-extern asALLOCALIGNEDFUNC_t userAllocAligned;
-extern asFREEALIGNEDFUNC_t  userFreeAligned;
-typedef void *(*asALLOCALIGNEDFUNCDEBUG_t)(size_t, size_t, const char *, unsigned int);
-
-// The maximum type alignment supported.
-const int MAX_TYPE_ALIGNMENT = 16;
-
-// Utility function used for assertions.
-bool isAligned(const void* const pointer, asUINT alignment);
-
-#endif // WIP_16BYTE_ALIGN
-
-// We don't overload the new operator as that would affect the application as well
-
-#ifndef AS_DEBUG
-
-	#define asNEW(x)        new(userAlloc(sizeof(x))) x
-	#define asDELETE(ptr,x) {void *tmp = ptr; (ptr)->~x(); userFree(tmp);}
-
-	#define asNEWARRAY(x,cnt)  (x*)userAlloc(sizeof(x)*cnt)
-	#define asDELETEARRAY(ptr) userFree(ptr)
-
-#ifdef WIP_16BYTE_ALIGN
-	#define asNEWARRAYALIGNED(x,cnt, alignment)  (x*)userAllocAligned(sizeof(x)*cnt, alignment)
-	#define asDELETEARRAYALIGNED(ptr) userFreeAligned(ptr)
-#endif
-
-#else
-
-	typedef void *(*asALLOCFUNCDEBUG_t)(size_t, const char *, unsigned int);
-
-	#define asNEW(x)        new(((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(x), __FILE__, __LINE__)) x
-	#define asDELETE(ptr,x) {void *tmp = ptr; (ptr)->~x(); userFree(tmp);}
-
-	#define asNEWARRAY(x,cnt)  (x*)((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(x)*cnt, __FILE__, __LINE__)
-	#define asDELETEARRAY(ptr) userFree(ptr)
-
-#ifdef WIP_16BYTE_ALIGN
-	//TODO: Equivalent of debug allocation function with alignment?
-	#define asNEWARRAYALIGNED(x,cnt, alignment)  (x*)userAllocAligned(sizeof(x)*cnt, alignment)
-	#define asDELETEARRAYALIGNED(ptr) userFreeAligned(ptr)
-#endif
-
-#endif
-
-END_AS_NAMESPACE
-
-#include <new>
-#include "as_criticalsection.h"
-#include "as_array.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCMemoryMgr
-{
-public:
-	asCMemoryMgr();
-	~asCMemoryMgr();
-
-	void FreeUnusedMemory();
-
-	void *AllocScriptNode();
-	void FreeScriptNode(void *ptr);
-
-#ifndef AS_NO_COMPILER
-	void *AllocByteInstruction();
-	void FreeByteInstruction(void *ptr);
-#endif
-
-protected:
-	DECLARECRITICALSECTION(cs)
-	asCArray<void *> scriptNodePool;
-	asCArray<void *> byteInstructionPool;
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2014 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_memory.h
+//
+// Overload the default memory management functions so that we
+// can let the application decide how to do it.
+//
+
+
+
+#ifndef AS_MEMORY_H
+#define AS_MEMORY_H
+
+#include "as_config.h"
+
+BEGIN_AS_NAMESPACE
+
+extern asALLOCFUNC_t userAlloc;
+extern asFREEFUNC_t  userFree;
+
+#ifdef WIP_16BYTE_ALIGN
+
+// TODO: This declaration should be in angelscript.h
+//       when the application can register it's own
+//       aligned memory routines
+typedef void *(*asALLOCALIGNEDFUNC_t)(size_t, size_t);
+typedef void (*asFREEALIGNEDFUNC_t)(void *);
+extern asALLOCALIGNEDFUNC_t userAllocAligned;
+extern asFREEALIGNEDFUNC_t  userFreeAligned;
+typedef void *(*asALLOCALIGNEDFUNCDEBUG_t)(size_t, size_t, const char *, unsigned int);
+
+// The maximum type alignment supported.
+const int MAX_TYPE_ALIGNMENT = 16;
+
+// Utility function used for assertions.
+bool isAligned(const void* const pointer, asUINT alignment);
+
+#endif // WIP_16BYTE_ALIGN
+
+// We don't overload the new operator as that would affect the application as well
+
+#ifndef AS_DEBUG
+
+	#define asNEW(x)        new(userAlloc(sizeof(x))) x
+	#define asDELETE(ptr,x) {void *tmp = ptr; (ptr)->~x(); userFree(tmp);}
+
+	#define asNEWARRAY(x,cnt)  (x*)userAlloc(sizeof(x)*cnt)
+	#define asDELETEARRAY(ptr) userFree(ptr)
+
+#ifdef WIP_16BYTE_ALIGN
+	#define asNEWARRAYALIGNED(x,cnt, alignment)  (x*)userAllocAligned(sizeof(x)*cnt, alignment)
+	#define asDELETEARRAYALIGNED(ptr) userFreeAligned(ptr)
+#endif
+
+#else
+
+	typedef void *(*asALLOCFUNCDEBUG_t)(size_t, const char *, unsigned int);
+
+	#define asNEW(x)        new(((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(x), __FILE__, __LINE__)) x
+	#define asDELETE(ptr,x) {void *tmp = ptr; (ptr)->~x(); userFree(tmp);}
+
+	#define asNEWARRAY(x,cnt)  (x*)((asALLOCFUNCDEBUG_t)(userAlloc))(sizeof(x)*cnt, __FILE__, __LINE__)
+	#define asDELETEARRAY(ptr) userFree(ptr)
+
+#ifdef WIP_16BYTE_ALIGN
+	//TODO: Equivalent of debug allocation function with alignment?
+	#define asNEWARRAYALIGNED(x,cnt, alignment)  (x*)userAllocAligned(sizeof(x)*cnt, alignment)
+	#define asDELETEARRAYALIGNED(ptr) userFreeAligned(ptr)
+#endif
+
+#endif
+
+END_AS_NAMESPACE
+
+#include <new>
+#include "as_criticalsection.h"
+#include "as_array.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCMemoryMgr
+{
+public:
+	asCMemoryMgr();
+	~asCMemoryMgr();
+
+	void FreeUnusedMemory();
+
+	void *AllocScriptNode();
+	void FreeScriptNode(void *ptr);
+
+#ifndef AS_NO_COMPILER
+	void *AllocByteInstruction();
+	void FreeByteInstruction(void *ptr);
+#endif
+
+protected:
+	DECLARECRITICALSECTION(cs)
+	asCArray<void *> scriptNodePool;
+	asCArray<void *> byteInstructionPool;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_module.cpp b/Sources/AngelScript/source/as_module.cpp
old mode 100755
new mode 100644
index 56584472a..365b4b815
--- a/Sources/AngelScript/source/as_module.cpp
+++ b/Sources/AngelScript/source/as_module.cpp
@@ -1,1832 +1,1888 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_module.cpp
-//
-// A class that holds a script module
-//
-
-#include "as_config.h"
-#include "as_module.h"
-#include "as_builder.h"
-#include "as_context.h"
-#include "as_texts.h"
-#include "as_debug.h"
-#include "as_restore.h"
-
-BEGIN_AS_NAMESPACE
-
-
-// internal
-asCModule::asCModule(const char *name, asCScriptEngine *engine)
-{
-	this->name     = name;
-	this->engine   = engine;
-
-	userData = 0;
-	builder = 0;
-	isGlobalVarInitialized = false;
-
-	accessMask = 1;
-
-	defaultNamespace = engine->nameSpaces[0];
-}
-
-// internal
-asCModule::~asCModule()
-{
-	InternalReset();
-
-	// The builder is not removed by InternalReset because it holds the script 
-	// sections that will be built, so we need to explictly remove it now if it exists
-	if( builder )
-	{
-		asDELETE(builder,asCBuilder);
-		builder = 0;
-	}
-
-	if( engine )
-	{
-		// Clean the user data
-		for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-		{
-			if( userData[n+1] )
-			{
-				for( asUINT c = 0; c < engine->cleanModuleFuncs.GetLength(); c++ )
-					if( engine->cleanModuleFuncs[c].type == userData[n] )
-						engine->cleanModuleFuncs[c].cleanFunc(this);
-			}
-		}
-
-		// Remove the module from the engine
-		ACQUIREEXCLUSIVE(engine->engineRWLock);
-		// The module must have been discarded before it is deleted
-		asASSERT( !engine->scriptModules.Exists(this) );
-		engine->discardedModules.RemoveValue(this);
-		RELEASEEXCLUSIVE(engine->engineRWLock);
-	}
-}
-
-// interface
-void asCModule::Discard()
-{
-	// Reset the global variables already so that no object in the global variables keep the module alive forever.
-	// If any live object tries to access the global variables during clean up they will fail with a script exception,
-	// so the application must keep that in mind before discarding a module.
-	CallExit();
-
-	// Keep a local copy of the engine pointer, because once the module is moved do the discarded
-	// pile, it is possible that another thread might discard it while we are still in here. So no
-	// further access to members may be done after that
-	asCScriptEngine *lEngine = engine;
-
-	// Instead of deleting the module immediately, move it to the discarded pile
-	// This will turn it invisible to the application, yet keep it alive until all 
-	// external references to its entities have been released.
-	ACQUIREEXCLUSIVE(engine->engineRWLock);
-	if( lEngine->lastModule == this )
-		lEngine->lastModule = 0;
-	lEngine->scriptModules.RemoveValue(this);
-	lEngine->discardedModules.PushLast(this);
-	RELEASEEXCLUSIVE(lEngine->engineRWLock);
-
-	// Allow the engine to go over the list of discarded modules to see what can be cleaned up at this moment.
-	// Don't do this if the engine is already shutting down, as it will be done explicitly by the engine itself with error reporting
-	if( !lEngine->shuttingDown )
-	{
-		if( lEngine->ep.autoGarbageCollect )
-			lEngine->GarbageCollect();
-		else
-		{
-			// GarbageCollect calls DeleteDiscardedModules, so no need
-			// to call it again if we already called GarbageCollect
-			lEngine->DeleteDiscardedModules();
-		}
-	}
-}
-
-// interface
-void *asCModule::SetUserData(void *data, asPWORD type)
-{
-	// As a thread might add a new new user data at the same time as another
-	// it is necessary to protect both read and write access to the userData member
-	ACQUIREEXCLUSIVE(engine->engineRWLock);
-
-	// It is not intended to store a lot of different types of userdata,
-	// so a more complex structure like a associative map would just have
-	// more overhead than a simple array.
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n] == type )
-		{
-			void *oldData = reinterpret_cast<void*>(userData[n+1]);
-			userData[n+1] = reinterpret_cast<asPWORD>(data);
-
-			RELEASEEXCLUSIVE(engine->engineRWLock);
-
-			return oldData;
-		}
-	}
-
-	userData.PushLast(type);
-	userData.PushLast(reinterpret_cast<asPWORD>(data));
-
-	RELEASEEXCLUSIVE(engine->engineRWLock);
-
-	return 0;
-}
-
-// interface
-void *asCModule::GetUserData(asPWORD type) const
-{
-	// There may be multiple threads reading, but when
-	// setting the user data nobody must be reading.
-	ACQUIRESHARED(engine->engineRWLock);
-
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n] == type )
-		{
-			void *ud = reinterpret_cast<void*>(userData[n+1]);
-			RELEASESHARED(engine->engineRWLock);
-			return ud;
-		}
-	}
-
-	RELEASESHARED(engine->engineRWLock);
-
-	return 0;
-}
-
-// interface
-asIScriptEngine *asCModule::GetEngine() const
-{
-	return engine;
-}
-
-// interface
-void asCModule::SetName(const char *in_name)
-{
-	name = in_name;
-}
-
-// interface
-const char *asCModule::GetName() const
-{
-	return name.AddressOf();
-}
-
-// interface
-const char *asCModule::GetDefaultNamespace() const
-{
-	return defaultNamespace->name.AddressOf();
-}
-
-// interface
-int asCModule::SetDefaultNamespace(const char *nameSpace)
-{
-	// TODO: cleanup: This function is similar to asCScriptEngine::SetDefaultNamespace. Can we reuse the code?
-	if( nameSpace == 0 )
-		return asINVALID_ARG;
-
-	asCString ns = nameSpace;
-	if( ns != "" )
-	{
-		// Make sure the namespace is composed of alternating identifier and ::
-		size_t pos = 0;
-		bool expectIdentifier = true;
-		size_t len;
-		eTokenType t = ttIdentifier;
-
-		for( ; pos < ns.GetLength(); pos += len )
-		{
-			t = engine->tok.GetToken(ns.AddressOf() + pos, ns.GetLength() - pos, &len);
-			if( (expectIdentifier && t != ttIdentifier) || (!expectIdentifier && t != ttScope) )
-				return asINVALID_DECLARATION;
-
-			expectIdentifier = !expectIdentifier;
-		}
-
-		// If the namespace ends with :: then strip it off
-		if( t == ttScope )
-			ns.SetLength(ns.GetLength()-2);
-	}
-
-	defaultNamespace = engine->AddNameSpace(ns.AddressOf());
-
-	return 0;
-}
-
-// interface
-int asCModule::AddScriptSection(const char *in_name, const char *in_code, size_t in_codeLength, int in_lineOffset)
-{
-#ifdef AS_NO_COMPILER
-	UNUSED_VAR(in_name);
-	UNUSED_VAR(in_code);
-	UNUSED_VAR(in_codeLength);
-	UNUSED_VAR(in_lineOffset);
-	return asNOT_SUPPORTED;
-#else
-	if( !builder )
-	{
-		builder = asNEW(asCBuilder)(engine, this);
-		if( builder == 0 )
-			return asOUT_OF_MEMORY;
-	}
-
-	return builder->AddCode(in_name, in_code, (int)in_codeLength, in_lineOffset, (int)engine->GetScriptSectionNameIndex(in_name ? in_name : ""), engine->ep.copyScriptSections);
-#endif
-}
-
-// internal
-void asCModule::JITCompile()
-{
-	asIJITCompiler *jit = engine->GetJITCompiler();
-	if( !jit )
-		return;
-
-	for (unsigned int i = 0; i < scriptFunctions.GetLength(); i++)
-		scriptFunctions[i]->JITCompile();
-}
-
-// interface
-int asCModule::Build()
-{
-#ifdef AS_NO_COMPILER
-	return asNOT_SUPPORTED;
-#else
-	TimeIt("asCModule::Build");
-
-	// Don't allow the module to be rebuilt if there are still 
-	// external references that will need the previous code
-	// TODO: interface: The asIScriptModule must have a method for querying if the module is used
-	if( HasExternalReferences(false) )
-	{
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_MODULE_IS_IN_USE);
-		return asMODULE_IS_IN_USE;
-	}
-
-	// Only one thread may build at one time
-	// TODO: It should be possible to have multiple threads perform compilations
-	int r = engine->RequestBuild();
-	if( r < 0 )
-		return r;
-
-	engine->PrepareEngine();
-	if( engine->configFailed )
-	{
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_INVALID_CONFIGURATION);
-		engine->BuildCompleted();
-		return asINVALID_CONFIGURATION;
-	}
-
-	InternalReset();
-
-	if( !builder )
-	{
-		engine->BuildCompleted();
-		return asSUCCESS;
-	}
-
-	// Compile the script
-	r = builder->Build();
-	asDELETE(builder,asCBuilder);
-	builder = 0;
-	
-	if( r < 0 )
-	{
-		// Reset module again
-		InternalReset();
-
-		engine->BuildCompleted();
-		return r;
-	}
-
-	JITCompile();
-
-	engine->PrepareEngine();
-
-#ifdef AS_DEBUG
-	// Verify that there are no unwanted gaps in the scriptFunctions array.
-	for( asUINT n = 1; n < engine->scriptFunctions.GetLength(); n++ )
-	{
-		int id = n;
-		if( engine->scriptFunctions[n] == 0 && !engine->freeScriptFunctionIds.Exists(id) )
-			asASSERT( false );
-	}
-#endif
-
-	engine->BuildCompleted();
-
-	// Initialize global variables
-	if( r >= 0 && engine->ep.initGlobalVarsAfterBuild )
-		r = ResetGlobalVars(0);
-
-	return r;
-#endif
-}
-
-// interface
-int asCModule::ResetGlobalVars(asIScriptContext *ctx)
-{
-	if( isGlobalVarInitialized ) 
-		CallExit();
-
-	return CallInit(ctx);
-}
-
-// interface
-asIScriptFunction *asCModule::GetFunctionByIndex(asUINT index) const
-{
-	return const_cast<asCScriptFunction*>(globalFunctions.Get(index));
-}
-
-// internal
-int asCModule::CallInit(asIScriptContext *myCtx)
-{
-	if( isGlobalVarInitialized ) 
-		return asERROR;
-
-	// Each global variable needs to be cleared individually
-	asCSymbolTableIterator<asCGlobalProperty> it = scriptGlobals.List();
-	while( it )
-	{
-		asCGlobalProperty *desc = *it;
-		memset(desc->GetAddressOfValue(), 0, sizeof(asDWORD)*desc->type.GetSizeOnStackDWords());
-		it++;
-	}
-
-	// Call the init function for each of the global variables
-	asIScriptContext *ctx = myCtx;
-	int r = asEXECUTION_FINISHED;
-	it = scriptGlobals.List();
-	while( it && r == asEXECUTION_FINISHED )
-	{
-		asCGlobalProperty *desc = *it;
-		it++;
-		if( desc->GetInitFunc() )
-		{
-			if( ctx == 0 )
-			{
-				ctx = engine->RequestContext();
-				if( ctx == 0 )
-					break;
-			}
-
-			r = ctx->Prepare(desc->GetInitFunc());
-			if( r >= 0 )
-			{
-				r = ctx->Execute();
-				if( r != asEXECUTION_FINISHED )
-				{
-					asCString msg;
-					msg.Format(TXT_FAILED_TO_INITIALIZE_s, desc->name.AddressOf());
-					asCScriptFunction *func = desc->GetInitFunc();
-
-					engine->WriteMessage(func->scriptData->scriptSectionIdx >= 0 ? engine->scriptSectionNames[func->scriptData->scriptSectionIdx]->AddressOf() : "",
-										 func->GetLineNumber(0, 0) & 0xFFFFF, 
-										 func->GetLineNumber(0, 0) >> 20,
-										 asMSGTYPE_ERROR,
-										 msg.AddressOf());
-										 
-					if( r == asEXECUTION_EXCEPTION )
-					{
-						const asIScriptFunction *function = ctx->GetExceptionFunction();
-
-						msg.Format(TXT_EXCEPTION_s_IN_s, ctx->GetExceptionString(), function->GetDeclaration());
-
-						engine->WriteMessage(function->GetScriptSectionName(), 
-											 ctx->GetExceptionLineNumber(), 
-											 0,
-											 asMSGTYPE_INFORMATION,
-											 msg.AddressOf());
-					}
-				}
-			}
-		}
-	}
-
-	if( ctx && !myCtx )
-	{
-		engine->ReturnContext(ctx);
-		ctx = 0;
-	}
-
-	// Even if the initialization failed we need to set the 
-	// flag that the variables have been initialized, otherwise
-	// the module won't free those variables that really were 
-	// initialized.
-	isGlobalVarInitialized = true;
-
-	if( r != asEXECUTION_FINISHED )
-		return asINIT_GLOBAL_VARS_FAILED;
-
-	return asSUCCESS;
-}
-
-// internal
-void asCModule::CallExit()
-{
-	if( !isGlobalVarInitialized ) return;
-
-	asCSymbolTableIterator<asCGlobalProperty> it = scriptGlobals.List();
-	while( it )
-	{
-		if( (*it)->type.IsObject() )
-		{
-			void **obj = (void**)(*it)->GetAddressOfValue();
-			if( *obj )
-			{
-				asCObjectType *ot = (*it)->type.GetTypeInfo()->CastToObjectType();
-
-				if( ot->flags & asOBJ_REF )
-				{
-					asASSERT( (ot->flags & asOBJ_NOCOUNT) || ot->beh.release );
-					if( ot->beh.release )
-						engine->CallObjectMethod(*obj, ot->beh.release);
-				}
-				else
-				{
-					if( ot->beh.destruct )
-						engine->CallObjectMethod(*obj, ot->beh.destruct);
-
-					engine->CallFree(*obj);
-				}
-
-				// Set the address to 0 as someone might try to access the variable afterwards
-				*obj = 0;
-			}
-		}
-		else if ((*it)->type.IsFuncdef())
-		{
-			asCScriptFunction **func = (asCScriptFunction**)(*it)->GetAddressOfValue();
-			if (*func)
-			{
-				(*func)->Release();
-				*func = 0;
-			}
-		}
-		it++;
-	}
-
-	isGlobalVarInitialized = false;
-}
-
-// internal
-bool asCModule::HasExternalReferences(bool shuttingDown)
-{
-	// Check all entiteis in the module for any external references.
-	// If there are any external references the module cannot be deleted yet.
-	
-	asCSymbolTableIterator<asCGlobalProperty> it = scriptGlobals.List();
-	while (it)
-	{
-		asCGlobalProperty *desc = *it;
-		if (desc->GetInitFunc() && desc->GetInitFunc()->externalRefCount.get())
-		{
-			if( !shuttingDown )
-				return true;
-			else
-			{
-				asCString msg;
-				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
-
-				// TODO: Use a better error message
-				asCString tmpName = "init " + desc->name;
-				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, tmpName.AddressOf(), desc->GetInitFunc()->GetFuncType());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
-			}
-		}
-		it++;
-	}
-
-	for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
-		if( scriptFunctions[n] && scriptFunctions[n]->externalRefCount.get() )
-		{
-			if( !shuttingDown )
-				return true;
-			else
-			{
-				asCString msg;
-				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
-
-				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, scriptFunctions[n]->GetName(), scriptFunctions[n]->GetFuncType());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
-			}
-		}
-
-	for( asUINT n = 0; n < classTypes.GetLength(); n++ )
-		if( classTypes[n] && classTypes[n]->externalRefCount.get() )
-		{
-			if( !shuttingDown )
-				return true;
-			else
-			{
-				asCString msg;
-				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
-
-				msg.Format(TXT_PREV_TYPE_IS_NAMED_s, classTypes[n]->GetName());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
-			}
-		}
-
-	for( asUINT n = 0; n < funcDefs.GetLength(); n++ )
-		if( funcDefs[n] && funcDefs[n]->externalRefCount.get() )
-		{
-			if( !shuttingDown )
-				return true;
-			else
-			{
-				asCString msg;
-				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
-
-				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, funcDefs[n]->GetName(), funcDefs[n]->funcdef->GetFuncType());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
-			}
-		}
-
-	for( asUINT n = 0; n < templateInstances.GetLength(); n++ )
-		if( templateInstances[n] && templateInstances[n]->externalRefCount.get() )
-		{
-			if( !shuttingDown )
-				return true;
-			else
-			{
-				asCString msg;
-				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, name.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
-
-				msg.Format(TXT_PREV_TYPE_IS_NAMED_s, templateInstances[n]->GetName());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
-			}
-		}
-
-	return false;
-}
-
-// internal
-void asCModule::InternalReset()
-{
-	CallExit();
-
-	asUINT n;
-
-	// Remove all global functions
-	globalFunctions.Clear();
-
-	// Destroy the internals of the global properties here, but do not yet remove them from the 
-	// engine, because functions need the engine's varAddressMap to get to the property. If the
-	// property is removed already, it may leak as the refCount doesn't reach 0.
-	asCSymbolTableIterator<asCGlobalProperty> globIt = scriptGlobals.List();
-	while( globIt )
-	{
-		(*globIt)->DestroyInternal();
-		globIt++;
-	}
-
-	UnbindAllImportedFunctions();
-
-	// Free bind information
-	for( n = 0; n < bindInformations.GetLength(); n++ )
-	{
-		if( bindInformations[n] )
-		{
-			bindInformations[n]->importedFunctionSignature->ReleaseInternal();
-
-			asDELETE(bindInformations[n], sBindInfo);
-		}
-	}
-	bindInformations.SetLength(0);
-
-	// Free declared types, including classes, typedefs, and enums
-	for( n = 0; n < templateInstances.GetLength(); n++ )
-	{
-		asCObjectType *type = templateInstances[n];
-		if( engine->FindNewOwnerForSharedType(type, this) != this )
-		{
-			// The type is owned by another module, just release our reference
-			type->ReleaseInternal();
-			continue;
-		}
-
-		// Orphan the template instance
-		type->module = 0;
-
-		// No other module is holding the template type
-		engine->RemoveTemplateInstanceType(type);
-		type->ReleaseInternal();
-	}
-	templateInstances.SetLength(0);
-	for( n = 0; n < classTypes.GetLength(); n++ )
-	{
-		asCObjectType *type = classTypes[n];
-		if( type->IsShared() )
-		{
-			// The type is shared, so transfer ownership to another module that also uses it
-			if( engine->FindNewOwnerForSharedType(type, this) != this )
-			{
-				// The type is owned by another module, just release our reference
-				type->ReleaseInternal();
-				continue;
-			}
-		}
-
-		// The type should be destroyed now
-		type->DestroyInternal();
-
-		// Remove the type from the engine
-		if( type->IsShared() )
-		{
-			engine->sharedScriptTypes.RemoveValue(type);
-			type->ReleaseInternal();
-		}
-
-		// Release it from the module
-		type->module = 0;
-		type->ReleaseInternal();
-	}
-	classTypes.SetLength(0);
-	for( n = 0; n < enumTypes.GetLength(); n++ )
-	{
-		asCEnumType *type = enumTypes[n];
-		if( type->IsShared() )
-		{
-			// The type is shared, so transfer ownership to another module that also uses it
-			if( engine->FindNewOwnerForSharedType(type, this) != this )
-			{
-				// The type is owned by another module, just release our reference
-				type->ReleaseInternal();
-				continue;
-			}
-		}
-
-		// Remove the type from the engine
-		if( type->IsShared() )
-		{
-			engine->sharedScriptTypes.RemoveValue(type);
-			type->ReleaseInternal();
-		}
-
-		// Release it from the module
-		type->module = 0;
-		type->ReleaseInternal();
-	}
-	enumTypes.SetLength(0);
-	for( n = 0; n < typeDefs.GetLength(); n++ )
-	{
-		asCTypedefType *type = typeDefs[n];
-
-		// The type should be destroyed now
-		type->DestroyInternal();
-
-		// Release it from the module
-		type->module = 0;
-		type->ReleaseInternal();
-	}
-	typeDefs.SetLength(0);
-
-	// Free funcdefs
-	for( n = 0; n < funcDefs.GetLength(); n++ )
-	{
-		asCFuncdefType *func = funcDefs[n];
-		if( func->funcdef->IsShared() )
-		{
-			// The funcdef is shared, so transfer ownership to another module that also uses it
-			if( engine->FindNewOwnerForSharedType(func, this) != this )
-			{
-				// The funcdef is owned by another module, just release our reference
-				func->ReleaseInternal();
-				continue;
-			}
-		}
-
-		func->DestroyInternal();
-		engine->RemoveFuncdef(func);
-		func->module = 0;
-		func->ReleaseInternal();
-	}
-	funcDefs.SetLength(0);
-
-	// Then release the functions
-	for( n = 0; n < scriptFunctions.GetLength(); n++ )
-	{
-		asCScriptFunction *func = scriptFunctions[n];
-		if( func->IsShared() )
-		{
-			// The func is shared, so transfer ownership to another module that also uses it
-			if( engine->FindNewOwnerForSharedFunc(func, this) != this )
-			{
-				// The func is owned by another module, just release our reference
-				func->ReleaseInternal();
-				continue;
-			}
-		}
-
-		func->DestroyInternal();
-		func->module = 0;
-		func->ReleaseInternal();
-	}
-	scriptFunctions.SetLength(0);
-
-	// Now remove and release the global properties as there are no more references to them
-	globIt = scriptGlobals.List();
-	while( globIt )
-	{
-		engine->RemoveGlobalProperty(*globIt);
-		asASSERT( (*globIt)->refCount.get() == 1 );
-		(*globIt)->Release();
-		globIt++;
-	}
-	scriptGlobals.Clear();
-
-	asASSERT( IsEmpty() );
-}
-
-// interface
-asIScriptFunction *asCModule::GetFunctionByName(const char *in_name) const
-{
-	asSNameSpace *ns = defaultNamespace;
-	while( ns )
-	{
-		const asCArray<unsigned int> &idxs = globalFunctions.GetIndexes(ns, in_name);
-		if( idxs.GetLength() != 1 )
-			return 0;
-
-		const asIScriptFunction *func = globalFunctions.Get(idxs[0]);
-		if( func )
-			return const_cast<asIScriptFunction*>(func);
-
-		// Recursively search parent namespaces
-		ns = engine->GetParentNameSpace(ns);
-	}
-
-	return 0;
-}
-
-// interface
-asUINT asCModule::GetImportedFunctionCount() const
-{
-	return (asUINT)bindInformations.GetLength();
-}
-
-// interface
-int asCModule::GetImportedFunctionIndexByDecl(const char *decl) const
-{
-	asCBuilder bld(engine, const_cast<asCModule*>(this));
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	asCScriptFunction func(engine, const_cast<asCModule*>(this), asFUNC_DUMMY);
-	bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, defaultNamespace);
-
-	// TODO: optimize: Improve linear search
-	// Search script functions for matching interface
-	int id = -1;
-	for( asUINT n = 0; n < bindInformations.GetLength(); ++n )
-	{
-		if( func.name == bindInformations[n]->importedFunctionSignature->name && 
-			func.returnType == bindInformations[n]->importedFunctionSignature->returnType &&
-			func.parameterTypes.GetLength() == bindInformations[n]->importedFunctionSignature->parameterTypes.GetLength() )
-		{
-			bool match = true;
-			for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
-			{
-				if( func.parameterTypes[p] != bindInformations[n]->importedFunctionSignature->parameterTypes[p] )
-				{
-					match = false;
-					break;
-				}
-			}
-
-			if( match )
-			{
-				if( id == -1 )
-					id = n;
-				else
-					return asMULTIPLE_FUNCTIONS;
-			}
-		}
-	}
-
-	if( id == -1 ) return asNO_FUNCTION;
-
-	return id;
-}
-
-// interface
-asUINT asCModule::GetFunctionCount() const
-{
-	return (asUINT)globalFunctions.GetSize();
-}
-
-// interface
-asIScriptFunction *asCModule::GetFunctionByDecl(const char *decl) const
-{
-	asCBuilder bld(engine, const_cast<asCModule*>(this));
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	asCScriptFunction func(engine, const_cast<asCModule*>(this), asFUNC_DUMMY);
-	int r = bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, defaultNamespace);
-	if( r < 0 )
-	{
-		// Invalid declaration
-		// TODO: Write error to message stream
-		return 0;
-	}
-
-	// Use the defaultNamespace implicitly unless an explicit namespace has been provided
-	asSNameSpace *ns = func.nameSpace == engine->nameSpaces[0] ? defaultNamespace : func.nameSpace;
-
-	// Search script functions for matching interface
-	while( ns )
-	{
-		asIScriptFunction *f = 0;
-		const asCArray<unsigned int> &idxs = globalFunctions.GetIndexes(ns, func.name);
-		for( unsigned int n = 0; n < idxs.GetLength(); n++ )
-		{
-			const asCScriptFunction *funcPtr = globalFunctions.Get(idxs[n]);
-			if( funcPtr->objectType == 0 &&
-				func.returnType                 == funcPtr->returnType &&
-				func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
-				)
-			{
-				bool match = true;
-				for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
-				{
-					if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
-					{
-						match = false;
-						break;
-					}
-				}
-
-				if( match )
-				{
-					if( f == 0 )
-						f = const_cast<asCScriptFunction*>(funcPtr);
-					else
-						// Multiple functions
-						return 0;
-				}
-			}
-		}
-
-		if( f )
-			return f;
-		else
-		{
-			// Search for matching functions in the parent namespace
-			ns = engine->GetParentNameSpace(ns);
-		}
-	}
-
-	return 0;
-}
-
-// interface
-asUINT asCModule::GetGlobalVarCount() const
-{
-	return (asUINT)scriptGlobals.GetSize();
-}
-
-// interface
-int asCModule::GetGlobalVarIndexByName(const char *in_name) const
-{
-	asSNameSpace *ns = defaultNamespace;
-
-	// Find the global var id
-	while( ns )
-	{
-		int id = scriptGlobals.GetFirstIndex(ns, in_name);
-		if( id >= 0 ) return id;
-
-		// Recursively search parent namespaces
-		ns = engine->GetParentNameSpace(ns);
-	}
-
-	return asNO_GLOBAL_VAR;
-}
-
-// interface
-int asCModule::RemoveGlobalVar(asUINT index)
-{
-	asCGlobalProperty *prop = scriptGlobals.Get(index);
-	if( !prop )
-		return asINVALID_ARG;
-
-	// Destroy the internal of the global variable (removes the initialization function)
-	prop->DestroyInternal();
-
-	// Check if the module is the only one referring to the module, if so remove it from the engine too
-	// If the property is not removed now, it will be removed later when the module is discarded
-	if( prop->refCount.get() == 2 )
-		engine->RemoveGlobalProperty(prop);
-
-	// Remove the global variable from the module
-	scriptGlobals.Erase(index);
-	prop->Release();
-
-	return 0;
-}
-
-// interface
-int asCModule::GetGlobalVarIndexByDecl(const char *decl) const
-{
-	asCBuilder bld(engine, const_cast<asCModule*>(this));
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	asCString declName;
-	asSNameSpace *nameSpace;
-	asCDataType dt;
-	int r = bld.ParseVariableDeclaration(decl, defaultNamespace, declName, nameSpace, dt);
-	if( r < 0 )
-		return r;
-
-	// Search global variables for a match
-	while( nameSpace )
-	{
-		int id = scriptGlobals.GetFirstIndex(nameSpace, declName, asCCompGlobPropType(dt));
-		if( id != -1 )
-			return id;
-
-		// Recursively search parent namespace
-		nameSpace = engine->GetParentNameSpace(nameSpace);
-	}
-
-	return asNO_GLOBAL_VAR;
-}
-
-// interface
-void *asCModule::GetAddressOfGlobalVar(asUINT index)
-{
-	asCGlobalProperty *prop = scriptGlobals.Get(index);
-	if( !prop ) 
-		return 0;
-
-	// For object variables it's necessary to dereference the pointer to get the address of the value
-	if( prop->type.IsObject() &&
-		!prop->type.IsObjectHandle() )
-		return *(void**)(prop->GetAddressOfValue());
-
-	return (void*)(prop->GetAddressOfValue());
-}
-
-// interface
-const char *asCModule::GetGlobalVarDeclaration(asUINT index, bool includeNamespace) const
-{
-	const asCGlobalProperty *prop = scriptGlobals.Get(index);
-	if (!prop) return 0;
-
-	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = prop->type.Format(defaultNamespace);
-	*tempString += " ";
-	if( includeNamespace && prop->nameSpace->name != "" )
-		*tempString += prop->nameSpace->name + "::";
-	*tempString += prop->name;
-
-	return tempString->AddressOf();
-}
-
-// interface
-int asCModule::GetGlobalVar(asUINT index, const char **out_name, const char **out_nameSpace, int *out_typeId, bool *out_isConst) const
-{
-	const asCGlobalProperty *prop = scriptGlobals.Get(index);
-	if (!prop) return 0;
-
-	if( out_name )
-		*out_name = prop->name.AddressOf();
-	if( out_nameSpace )
-		*out_nameSpace = prop->nameSpace->name.AddressOf();
-	if( out_typeId )
-		*out_typeId = engine->GetTypeIdFromDataType(prop->type);
-	if( out_isConst )
-		*out_isConst = prop->type.IsReadOnly();
-
-	return asSUCCESS;
-}
-
-// interface
-asUINT asCModule::GetObjectTypeCount() const
-{
-	return (asUINT)classTypes.GetLength();
-}
-
-// interface 
-asITypeInfo *asCModule::GetObjectTypeByIndex(asUINT index) const
-{
-	if( index >= classTypes.GetLength() ) 
-		return 0;
-
-	return classTypes[index];
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-asITypeInfo *asCModule::GetObjectTypeByName(const char *in_name) const
-{
-	asITypeInfo *ti = GetTypeInfoByName(in_name);
-	return reinterpret_cast<asCTypeInfo*>(ti)->CastToObjectType();
-}
-#endif
-
-// interface
-asITypeInfo *asCModule::GetTypeInfoByName(const char *in_name) const
-{
-	asSNameSpace *ns = defaultNamespace;
-	while (ns)
-	{
-		for (asUINT n = 0; n < classTypes.GetLength(); n++)
-		{
-			if (classTypes[n] &&
-				classTypes[n]->name == in_name &&
-				classTypes[n]->nameSpace == ns)
-				return classTypes[n];
-		}
-
-		for (asUINT n = 0; n < enumTypes.GetLength(); n++)
-		{
-			if (enumTypes[n] &&
-				enumTypes[n]->name == in_name &&
-				enumTypes[n]->nameSpace == ns)
-				return enumTypes[n];
-		}
-
-		for (asUINT n = 0; n < typeDefs.GetLength(); n++)
-		{
-			if (typeDefs[n] &&
-				typeDefs[n]->name == in_name &&
-				typeDefs[n]->nameSpace == ns)
-				return typeDefs[n];
-		}
-
-		// Recursively search parent namespace
-		ns = engine->GetParentNameSpace(ns);
-	}
-
-	return 0;
-}
-
-// interface
-int asCModule::GetTypeIdByDecl(const char *decl) const
-{
-	asCDataType dt;
-
-	// This const cast is safe since we know the engine won't be modified
-	asCBuilder bld(engine, const_cast<asCModule*>(this));
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
-	if( r < 0 )
-		return asINVALID_TYPE;
-
-	return engine->GetTypeIdFromDataType(dt);
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-asITypeInfo *asCModule::GetObjectTypeByDecl(const char *decl) const
-{
-	asITypeInfo *ti = GetTypeInfoByDecl(decl);
-	return reinterpret_cast<asCTypeInfo*>(ti)->CastToObjectType();
-}
-#endif
-
-// interface
-asITypeInfo *asCModule::GetTypeInfoByDecl(const char *decl) const
-{
-	asCDataType dt;
-
-	// This const cast is safe since we know the engine won't be modified
-	asCBuilder bld(engine, const_cast<asCModule*>(this));
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
-	if (r < 0)
-		return 0;
-
-	return dt.GetTypeInfo();
-}
-
-// interface
-asUINT asCModule::GetEnumCount() const
-{
-	return enumTypes.GetLength();
-}
-
-// interface
-asITypeInfo *asCModule::GetEnumByIndex(asUINT index) const
-{
-	if( index >= enumTypes.GetLength() )
-		return 0;
-
-	return enumTypes[index];
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-int asCModule::GetEnumValueCount(int enumTypeId) const
-{
-	asITypeInfo *ti = engine->GetTypeInfoById(enumTypeId);
-	asCEnumType *e = reinterpret_cast<asCTypeInfo*>(ti)->CastToEnumType();
-	if (e == 0)
-		return asINVALID_TYPE;
-
-	return e->GetEnumValueCount();
-}
-#endif
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-const char *asCModule::GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const
-{
-	asITypeInfo *ti = engine->GetTypeInfoById(enumTypeId);
-	asCEnumType *e = reinterpret_cast<asCTypeInfo*>(ti)->CastToEnumType();
-	if (e == 0)
-		return 0;
-
-	return e->GetEnumValueByIndex(index, outValue);
-}
-#endif
-
-// interface
-asUINT asCModule::GetTypedefCount() const
-{
-	return (asUINT)typeDefs.GetLength();
-}
-
-// interface
-asITypeInfo *asCModule::GetTypedefByIndex(asUINT index) const
-{
-	if( index >= typeDefs.GetLength() )
-		return 0;
-
-	return typeDefs[index];
-}
-
-// internal
-int asCModule::GetNextImportedFunctionId()
-{
-	// TODO: multithread: This will break if one thread if freeing a module, while another is being compiled
-	if( engine->freeImportedFunctionIdxs.GetLength() )
-		return FUNC_IMPORTED | (asUINT)engine->freeImportedFunctionIdxs[engine->freeImportedFunctionIdxs.GetLength()-1];
-
-	return FUNC_IMPORTED | (asUINT)engine->importedFunctions.GetLength();
-}
-
-#ifndef AS_NO_COMPILER
-// internal
-int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &funcName, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asCString> &paramNames, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType, bool isConstMethod, bool isGlobalFunction, bool isPrivate, bool isProtected, bool isFinal, bool isOverride, bool isShared, asSNameSpace *ns)
-{
-	asASSERT(id >= 0);
-
-	// Store the function information
-	asCScriptFunction *func = asNEW(asCScriptFunction)(engine, this, isInterface ? asFUNC_INTERFACE : asFUNC_SCRIPT);
-	if( func == 0 )
-	{
-		// Free the default args
-		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-			if( defaultArgs[n] )
-				asDELETE(defaultArgs[n], asCString);
-
-		return asOUT_OF_MEMORY;
-	}
-
-	if( ns == 0 )
-		ns = engine->nameSpaces[0];
-
-	// All methods of shared objects are also shared
-	if( objType && objType->IsShared() )
-		isShared = true;
-
-	func->name             = funcName;
-	func->nameSpace        = ns;
-	func->id               = id;
-	func->returnType       = returnType;
-	if( func->funcType == asFUNC_SCRIPT )
-	{
-		func->scriptData->scriptSectionIdx = sectionIdx;
-		func->scriptData->declaredAt = declaredAt;
-	}
-	func->parameterTypes   = params;
-	func->parameterNames   = paramNames;
-	func->inOutFlags       = inOutFlags;
-	func->defaultArgs      = defaultArgs;
-	func->objectType       = objType;
-	if( objType )
-		objType->AddRefInternal();
-	func->isReadOnly       = isConstMethod;
-	func->isPrivate        = isPrivate;
-	func->isProtected      = isProtected;
-	func->isFinal          = isFinal;
-	func->isOverride       = isOverride;
-	func->isShared         = isShared;
-
-	asASSERT( params.GetLength() == inOutFlags.GetLength() && params.GetLength() == defaultArgs.GetLength() );
-
-	// Verify that we are not assigning either the final or override specifier(s) if we are registering a non-member function
-	asASSERT( !(!objType && isFinal) );
-	asASSERT( !(!objType && isOverride) );
-
-	// The internal ref count was already set by the constructor
-	scriptFunctions.PushLast(func);
-	engine->AddScriptFunction(func);
-
-	// Compute the signature id
-	if( objType )
-		func->ComputeSignatureId();
-
-	// Add reference
-	if( isGlobalFunction )
-		globalFunctions.Put(func);
-
-	return 0;
-}
-
-// internal 
-int asCModule::AddScriptFunction(asCScriptFunction *func)
-{
-	scriptFunctions.PushLast(func);
-	func->AddRefInternal();
-	engine->AddScriptFunction(func);
-
-	// If the function that is being added is an already compiled shared function
-	// then it is necessary to look for anonymous functions that may be declared
-	// within it and add those as well
-	if( func->isShared && func->funcType == asFUNC_SCRIPT )
-	{
-		// Loop through the byte code and check all the 
-		// asBC_FuncPtr instructions for anonymous functions
-		asDWORD *bc = func->scriptData->byteCode.AddressOf();
-		asUINT bcLength = (asUINT)func->scriptData->byteCode.GetLength();
-		for( asUINT n = 0; n < bcLength; )
-		{
-			int c = *(asBYTE*)&bc[n];
-			if( c == asBC_FuncPtr )
-			{
-				asCScriptFunction *f = reinterpret_cast<asCScriptFunction*>(asBC_PTRARG(&bc[n]));
-				// Anonymous functions start with $
-				// There are never two equal anonymous functions so it is not necessary to look for duplicates
-				if( f && f->name[0] == '$' )
-				{
-					AddScriptFunction(f);
-					globalFunctions.Put(f);
-				}
-			}
-			n += asBCTypeSize[asBCInfo[c].type];
-		}
-	}
-
-	return 0;
-}
-
-// internal
-int asCModule::AddImportedFunction(int id, const asCString &funcName, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, asSNameSpace *ns, const asCString &moduleName)
-{
-	asASSERT(id >= 0);
-
-	// Store the function information
-	asCScriptFunction *func = asNEW(asCScriptFunction)(engine, this, asFUNC_IMPORTED);
-	if( func == 0 )
-	{
-		// Free the default args
-		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
-			if( defaultArgs[n] )
-				asDELETE(defaultArgs[n], asCString);
-
-		return asOUT_OF_MEMORY;
-	}
-
-	func->name           = funcName;
-	func->id             = id;
-	func->returnType     = returnType;
-	func->nameSpace      = ns;
-	func->parameterTypes = params;
-	func->inOutFlags     = inOutFlags;
-	func->defaultArgs    = defaultArgs;
-	func->objectType     = 0;
-
-	sBindInfo *info = asNEW(sBindInfo);
-	if( info == 0 )
-	{
-		asDELETE(func, asCScriptFunction);
-		return asOUT_OF_MEMORY;
-	}
-
-	info->importedFunctionSignature = func;
-	info->boundFunctionId           = -1;
-	info->importFromModule          = moduleName;
-	bindInformations.PushLast(info);
-
-	// Add the info to the array in the engine
-	if( engine->freeImportedFunctionIdxs.GetLength() )
-		engine->importedFunctions[engine->freeImportedFunctionIdxs.PopLast()] = info;
-	else
-		engine->importedFunctions.PushLast(info);
-
-	return 0;
-}
-#endif
-
-// internal
-asCScriptFunction *asCModule::GetImportedFunction(int index) const
-{
-	return bindInformations[index]->importedFunctionSignature;
-}
-
-// interface
-int asCModule::BindImportedFunction(asUINT index, asIScriptFunction *func)
-{
-	// First unbind the old function
-	int r = UnbindImportedFunction(index);
-	if( r < 0 ) return r;
-
-	// Must verify that the interfaces are equal
-	asCScriptFunction *dst = GetImportedFunction(index);
-	if( dst == 0 ) return asNO_FUNCTION;
-
-	if( func == 0 )
-		return asINVALID_ARG;
-
-	asCScriptFunction *src = engine->GetScriptFunction(func->GetId());
-	if( src == 0 ) 
-		return asNO_FUNCTION;
-
-	// Verify return type
-	if( dst->returnType != src->returnType )
-		return asINVALID_INTERFACE;
-
-	if( dst->parameterTypes.GetLength() != src->parameterTypes.GetLength() )
-		return asINVALID_INTERFACE;
-
-	for( asUINT n = 0; n < dst->parameterTypes.GetLength(); ++n )
-	{
-		if( dst->parameterTypes[n] != src->parameterTypes[n] )
-			return asINVALID_INTERFACE;
-	}
-
-	bindInformations[index]->boundFunctionId = src->GetId();
-	src->AddRefInternal();
-
-	return asSUCCESS;
-}
-
-// interface
-int asCModule::UnbindImportedFunction(asUINT index)
-{
-	if( index >= bindInformations.GetLength() )
-		return asINVALID_ARG;
-
-	// Remove reference to old module
-	if( bindInformations[index] )
-	{
-		int oldFuncID = bindInformations[index]->boundFunctionId;
-		if( oldFuncID != -1 )
-		{
-			bindInformations[index]->boundFunctionId = -1;
-			engine->scriptFunctions[oldFuncID]->ReleaseInternal();
-		}
-	}
-
-	return asSUCCESS;
-}
-
-// interface
-const char *asCModule::GetImportedFunctionDeclaration(asUINT index) const
-{
-	asCScriptFunction *func = GetImportedFunction(index);
-	if( func == 0 ) return 0;
-
-	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = func->GetDeclarationStr();
-
-	return tempString->AddressOf();
-}
-
-// interface
-const char *asCModule::GetImportedFunctionSourceModule(asUINT index) const
-{
-	if( index >= bindInformations.GetLength() )
-		return 0;
-
-	return bindInformations[index]->importFromModule.AddressOf();
-}
-
-// inteface
-int asCModule::BindAllImportedFunctions()
-{
-	bool notAllFunctionsWereBound = false;
-
-	// Bind imported functions
-	int c = GetImportedFunctionCount();
-	for( int n = 0; n < c; ++n )
-	{
-		asCScriptFunction *importFunc = GetImportedFunction(n);
-		if( importFunc == 0 ) return asERROR;
-
-		asCString str = importFunc->GetDeclarationStr(false, true);
-
-		// Get module name from where the function should be imported
-		const char *moduleName = GetImportedFunctionSourceModule(n);
-		if( moduleName == 0 ) return asERROR;
-
-		asCModule *srcMod = engine->GetModule(moduleName, false);
-		asIScriptFunction *func = 0;
-		if( srcMod )
-			func = srcMod->GetFunctionByDecl(str.AddressOf());
-
-		if( func == 0 )
-			notAllFunctionsWereBound = true;
-		else
-		{
-			if( BindImportedFunction(n, func) < 0 )
-				notAllFunctionsWereBound = true;
-		}
-	}
-
-	if( notAllFunctionsWereBound )
-		return asCANT_BIND_ALL_FUNCTIONS;
-
-	return asSUCCESS;
-}
-
-// interface
-int asCModule::UnbindAllImportedFunctions()
-{
-	asUINT c = GetImportedFunctionCount();
-	for( asUINT n = 0; n < c; ++n )
-		UnbindImportedFunction(n);
-
-	return asSUCCESS;
-}
-
-// internal
-asCTypeInfo *asCModule::GetType(const char *type, asSNameSpace *ns)
-{
-	asUINT n;
-
-	// TODO: optimize: Improve linear search
-	for (n = 0; n < classTypes.GetLength(); n++)
-		if (classTypes[n]->name == type &&
-			classTypes[n]->nameSpace == ns)
-			return classTypes[n];
-
-	for (n = 0; n < enumTypes.GetLength(); n++)
-		if (enumTypes[n]->name == type &&
-			enumTypes[n]->nameSpace == ns)
-			return enumTypes[n];
-
-	for (n = 0; n < typeDefs.GetLength(); n++)
-		if (typeDefs[n]->name == type &&
-			typeDefs[n]->nameSpace == ns)
-			return typeDefs[n];
-
-	for (n = 0; n < funcDefs.GetLength(); n++)
-		if (funcDefs[n]->name == type &&
-			funcDefs[n]->nameSpace == ns)
-			return funcDefs[n];
-
-	return 0;
-}
-
-// internal
-asCObjectType *asCModule::GetObjectType(const char *type, asSNameSpace *ns)
-{
-	asUINT n;
-
-	// TODO: optimize: Improve linear search
-	for( n = 0; n < classTypes.GetLength(); n++ )
-		if( classTypes[n]->name == type &&
-			classTypes[n]->nameSpace == ns )
-			return classTypes[n];
-
-	return 0;
-}
-
-// internal
-asCGlobalProperty *asCModule::AllocateGlobalProperty(const char *propName, const asCDataType &dt, asSNameSpace *ns)
-{
-	asCGlobalProperty *prop = engine->AllocateGlobalProperty();
-	prop->name = propName;
-	prop->nameSpace = ns;
-
-	// Allocate the memory for this property based on its type
-	prop->type = dt;
-	prop->AllocateMemory();
-
-	// Make an entry in the address to variable map
-	engine->varAddressMap.Insert(prop->GetAddressOfValue(), prop);
-
-	// Store the variable in the module scope
-	scriptGlobals.Put(prop);
-	prop->AddRef();
-
-	return prop;
-}
-
-// internal
-bool asCModule::IsEmpty() const
-{
-	if( scriptFunctions.GetLength()  ) return false;
-	if( globalFunctions.GetSize()    ) return false;
-	if( bindInformations.GetLength() ) return false;
-	if( scriptGlobals.GetSize()      ) return false;
-	if( classTypes.GetLength()       ) return false;
-	if( enumTypes.GetLength()        ) return false;
-	if( typeDefs.GetLength()         ) return false;
-	if( funcDefs.GetLength()         ) return false;
-
-	return true;
-}
-
-// interface
-int asCModule::SaveByteCode(asIBinaryStream *out, bool stripDebugInfo) const
-{
-#ifdef AS_NO_COMPILER
-	UNUSED_VAR(out);
-	UNUSED_VAR(stripDebugInfo);
-	return asNOT_SUPPORTED;
-#else
-	if( out == 0 ) return asINVALID_ARG;
-
-	// Make sure there is actually something to save
-	if( IsEmpty() )
-		return asERROR;
-
-	asCWriter write(const_cast<asCModule*>(this), out, engine, stripDebugInfo);
-	return write.Write();
-#endif
-}
-
-// interface
-int asCModule::LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped)
-{
-	if( in == 0 ) return asINVALID_ARG;
-
-	// Don't allow the module to be rebuilt if there are still 
-	// external references that will need the previous code
-	if( HasExternalReferences(false) )
-	{
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_MODULE_IS_IN_USE);
-		return asMODULE_IS_IN_USE;
-	}
-
-	// Only permit loading bytecode if no other thread is currently compiling
-	// TODO: It should be possible to have multiple threads perform compilations
-	int r = engine->RequestBuild();
-	if( r < 0 )
-		return r;
-
-	asCReader read(this, in, engine);
-	r = read.Read(wasDebugInfoStripped);
-	if (r < 0)
-	{
-		engine->BuildCompleted();
-		return r;
-	}
-
-	JITCompile();
-
-#ifdef AS_DEBUG
-	// Verify that there are no unwanted gaps in the scriptFunctions array.
-	for( asUINT n = 1; n < engine->scriptFunctions.GetLength(); n++ )
-	{
-		int id = n;
-		if( engine->scriptFunctions[n] == 0 && !engine->freeScriptFunctionIds.Exists(id) )
-			asASSERT( false );
-	}
-#endif
-
-	engine->BuildCompleted();
-
-	return r;
-}
-
-// interface
-int asCModule::CompileGlobalVar(const char *sectionName, const char *code, int lineOffset)
-{
-#ifdef AS_NO_COMPILER
-	UNUSED_VAR(sectionName);
-	UNUSED_VAR(code);
-	UNUSED_VAR(lineOffset);
-	return asNOT_SUPPORTED;
-#else
-	// Validate arguments
-	if( code == 0 )
-		return asINVALID_ARG;
-
-	// Only one thread may build at one time
-	// TODO: It should be possible to have multiple threads perform compilations
-	int r = engine->RequestBuild();
-	if( r < 0 )
-		return r;
-
-	// Prepare the engine
-	engine->PrepareEngine();
-	if( engine->configFailed )
-	{
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_INVALID_CONFIGURATION);
-		engine->BuildCompleted();
-		return asINVALID_CONFIGURATION;
-	}
-
-	// Compile the global variable and add it to the module scope
-	asCBuilder varBuilder(engine, this);
-	asCString str = code;
-	r = varBuilder.CompileGlobalVar(sectionName, str.AddressOf(), lineOffset);
-
-	engine->BuildCompleted();
-
-	// Initialize the variable
-	if( r >= 0 && engine->ep.initGlobalVarsAfterBuild )
-	{
-		// Clear the memory 
-		asCGlobalProperty *prop = scriptGlobals.GetLast();
-		if( prop )
-		{
-			memset(prop->GetAddressOfValue(), 0, sizeof(asDWORD)*prop->type.GetSizeOnStackDWords());
-	
-			if( prop->GetInitFunc() )
-			{
-				// Call the init function for the global variable
-				asIScriptContext *ctx = 0;
-				r = engine->CreateContext(&ctx, true);
-				if( r < 0 )
-					return r;
-	
-				r = ctx->Prepare(prop->GetInitFunc());
-				if( r >= 0 )
-					r = ctx->Execute();
-	
-				ctx->Release();
-			}
-		}
-	}
-
-	return r;
-#endif
-}
-
-// interface
-int asCModule::CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD compileFlags, asIScriptFunction **outFunc)
-{
-	// Make sure the outFunc is null if the function fails, so the 
-	// application doesn't attempt to release a non-existent function
-	if( outFunc )
-		*outFunc = 0;
-
-#ifdef AS_NO_COMPILER
-	UNUSED_VAR(sectionName);
-	UNUSED_VAR(code);
-	UNUSED_VAR(lineOffset);
-	UNUSED_VAR(compileFlags);
-	return asNOT_SUPPORTED;
-#else
-	// Validate arguments
-	if( code == 0 || 
-		(compileFlags != 0 && compileFlags != asCOMP_ADD_TO_MODULE) )
-		return asINVALID_ARG;
-
-	// Only one thread may build at one time
-	// TODO: It should be possible to have multiple threads perform compilations
-	int r = engine->RequestBuild();
-	if( r < 0 )
-		return r;
-
-	// Prepare the engine
-	engine->PrepareEngine();
-	if( engine->configFailed )
-	{
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_INVALID_CONFIGURATION);
-		engine->BuildCompleted();
-		return asINVALID_CONFIGURATION;
-	}
-
-	// Compile the single function
-	asCBuilder funcBuilder(engine, this);
-	asCString str = code;
-	asCScriptFunction *func = 0;
-	r = funcBuilder.CompileFunction(sectionName, str.AddressOf(), lineOffset, compileFlags, &func);
-
-	engine->BuildCompleted();
-
-	if( r >= 0 && outFunc && func )
-	{
-		// Return the function to the caller and add an external reference
-		*outFunc = func;
-		func->AddRef();
-	}
-
-	// Release our reference to the function
-	if( func )
-		func->ReleaseInternal();
-
-	return r;
-#endif
-}
-
-// interface
-int asCModule::RemoveFunction(asIScriptFunction *func)
-{
-	// Find the global function
-	asCScriptFunction *f = static_cast<asCScriptFunction*>(func);
-	int idx = globalFunctions.GetIndex(f);
-	if( idx >= 0 )
-	{
-		globalFunctions.Erase(idx);
-		scriptFunctions.RemoveValue(f);
-		f->ReleaseInternal();
-		return 0;
-	}
-
-	return asNO_FUNCTION;
-}
-
-#ifndef AS_NO_COMPILER
-// internal
-int asCModule::AddFuncDef(const asCString &funcName, asSNameSpace *ns, asCObjectType *parent)
-{
-	// namespace and parent are mutually exclusive
-	asASSERT((ns == 0 && parent) || (ns && parent == 0));
-
-	asCScriptFunction *func = asNEW(asCScriptFunction)(engine, 0, asFUNC_FUNCDEF);
-	if (func == 0)
-		return asOUT_OF_MEMORY;
-
-	func->name      = funcName;
-	func->nameSpace = ns;
-	func->module    = this;
-
-	asCFuncdefType *fdt = asNEW(asCFuncdefType)(engine, func);
-	funcDefs.PushLast(fdt); // The constructor set the refcount to 1
-
-	engine->funcDefs.PushLast(fdt); // doesn't increase refcount
-	func->id = engine->GetNextScriptFunctionId();
-	engine->AddScriptFunction(func);
-
-	if (parent)
-	{
-		parent->childFuncDefs.PushLast(fdt);
-		fdt->parentClass = parent;
-	}
-
-	return (int)funcDefs.GetLength()-1;
-}
-#endif
-
-// interface
-asDWORD asCModule::SetAccessMask(asDWORD mask)
-{
-	asDWORD old = accessMask;
-	accessMask = mask;
-	return old;
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_module.cpp
+//
+// A class that holds a script module
+//
+
+#include "as_config.h"
+#include "as_module.h"
+#include "as_builder.h"
+#include "as_context.h"
+#include "as_texts.h"
+#include "as_debug.h"
+#include "as_restore.h"
+
+BEGIN_AS_NAMESPACE
+
+
+// internal
+asCModule::asCModule(const char *name, asCScriptEngine *engine)
+{
+	m_name     = name;
+	m_engine   = engine;
+
+	m_userData = 0;
+	m_builder = 0;
+	m_isGlobalVarInitialized = false;
+
+	m_accessMask = 1;
+
+	m_defaultNamespace = engine->nameSpaces[0];
+}
+
+// internal
+asCModule::~asCModule()
+{
+	InternalReset();
+
+	// The builder is not removed by InternalReset because it holds the script
+	// sections that will be built, so we need to explictly remove it now if it exists
+	if( m_builder )
+	{
+		asDELETE(m_builder,asCBuilder);
+		m_builder = 0;
+	}
+
+	if( m_engine )
+	{
+		// Clean the user data
+		for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+		{
+			if( m_userData[n+1] )
+			{
+				for( asUINT c = 0; c < m_engine->cleanModuleFuncs.GetLength(); c++ )
+					if( m_engine->cleanModuleFuncs[c].type == m_userData[n] )
+						m_engine->cleanModuleFuncs[c].cleanFunc(this);
+			}
+		}
+
+		// Remove the module from the engine
+		ACQUIREEXCLUSIVE(m_engine->engineRWLock);
+		// The module must have been discarded before it is deleted
+		asASSERT( !m_engine->scriptModules.Exists(this) );
+		m_engine->discardedModules.RemoveValue(this);
+		RELEASEEXCLUSIVE(m_engine->engineRWLock);
+	}
+}
+
+// interface
+void asCModule::Discard()
+{
+	// Reset the global variables already so that no object in the global variables keep the module alive forever.
+	// If any live object tries to access the global variables during clean up they will fail with a script exception,
+	// so the application must keep that in mind before discarding a module.
+	CallExit();
+
+	// Keep a local copy of the engine pointer, because once the module is moved do the discarded
+	// pile, it is possible that another thread might discard it while we are still in here. So no
+	// further access to members may be done after that
+	asCScriptEngine *engine = m_engine;
+
+	// Instead of deleting the module immediately, move it to the discarded pile
+	// This will turn it invisible to the application, yet keep it alive until all
+	// external references to its entities have been released.
+	ACQUIREEXCLUSIVE(engine->engineRWLock);
+	if( engine->lastModule == this )
+		engine->lastModule = 0;
+	engine->scriptModules.RemoveValue(this);
+	engine->discardedModules.PushLast(this);
+	RELEASEEXCLUSIVE(engine->engineRWLock);
+
+	// Allow the engine to go over the list of discarded modules to see what can be cleaned up at this moment.
+	// Don't do this if the engine is already shutting down, as it will be done explicitly by the engine itself with error reporting
+	if( !engine->shuttingDown )
+	{
+		if( engine->ep.autoGarbageCollect )
+			engine->GarbageCollect();
+		else
+		{
+			// GarbageCollect calls DeleteDiscardedModules, so no need
+			// to call it again if we already called GarbageCollect
+			engine->DeleteDiscardedModules();
+		}
+	}
+}
+
+// interface
+void *asCModule::SetUserData(void *data, asPWORD type)
+{
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(m_engine->engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(m_userData[n+1]);
+			m_userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(m_engine->engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	m_userData.PushLast(type);
+	m_userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(m_engine->engineRWLock);
+
+	return 0;
+}
+
+// interface
+void *asCModule::GetUserData(asPWORD type) const
+{
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(m_engine->engineRWLock);
+
+	for( asUINT n = 0; n < m_userData.GetLength(); n += 2 )
+	{
+		if( m_userData[n] == type )
+		{
+			void *ud = reinterpret_cast<void*>(m_userData[n+1]);
+			RELEASESHARED(m_engine->engineRWLock);
+			return ud;
+		}
+	}
+
+	RELEASESHARED(m_engine->engineRWLock);
+
+	return 0;
+}
+
+// interface
+asIScriptEngine *asCModule::GetEngine() const
+{
+	return m_engine;
+}
+
+// interface
+void asCModule::SetName(const char *in_name)
+{
+	m_name = in_name;
+}
+
+// interface
+const char *asCModule::GetName() const
+{
+	return m_name.AddressOf();
+}
+
+// interface
+const char *asCModule::GetDefaultNamespace() const
+{
+	return m_defaultNamespace->name.AddressOf();
+}
+
+// interface
+int asCModule::SetDefaultNamespace(const char *nameSpace)
+{
+	// TODO: cleanup: This function is similar to asCScriptEngine::SetDefaultNamespace. Can we reuse the code?
+	if( nameSpace == 0 )
+		return asINVALID_ARG;
+
+	asCString ns = nameSpace;
+	if( ns != "" )
+	{
+		// Make sure the namespace is composed of alternating identifier and ::
+		size_t pos = 0;
+		bool expectIdentifier = true;
+		size_t len;
+		eTokenType t = ttIdentifier;
+
+		for( ; pos < ns.GetLength(); pos += len )
+		{
+			t = m_engine->tok.GetToken(ns.AddressOf() + pos, ns.GetLength() - pos, &len);
+			if( (expectIdentifier && t != ttIdentifier) || (!expectIdentifier && t != ttScope) )
+				return asINVALID_DECLARATION;
+
+			expectIdentifier = !expectIdentifier;
+		}
+
+		// If the namespace ends with :: then strip it off
+		if( t == ttScope )
+			ns.SetLength(ns.GetLength()-2);
+	}
+
+	m_defaultNamespace = m_engine->AddNameSpace(ns.AddressOf());
+
+	return 0;
+}
+
+// interface
+int asCModule::AddScriptSection(const char *in_name, const char *in_code, size_t in_codeLength, int in_lineOffset)
+{
+#ifdef AS_NO_COMPILER
+	UNUSED_VAR(in_name);
+	UNUSED_VAR(in_code);
+	UNUSED_VAR(in_codeLength);
+	UNUSED_VAR(in_lineOffset);
+	return asNOT_SUPPORTED;
+#else
+	if( !m_builder )
+	{
+		m_builder = asNEW(asCBuilder)(m_engine, this);
+		if( m_builder == 0 )
+			return asOUT_OF_MEMORY;
+	}
+
+	return m_builder->AddCode(in_name, in_code, (int)in_codeLength, in_lineOffset, (int)m_engine->GetScriptSectionNameIndex(in_name ? in_name : ""), m_engine->ep.copyScriptSections);
+#endif
+}
+
+// internal
+void asCModule::JITCompile()
+{
+	asIJITCompiler *jit = m_engine->GetJITCompiler();
+	if( !jit )
+		return;
+
+	for (unsigned int i = 0; i < m_scriptFunctions.GetLength(); i++)
+		m_scriptFunctions[i]->JITCompile();
+}
+
+// interface
+int asCModule::Build()
+{
+#ifdef AS_NO_COMPILER
+	return asNOT_SUPPORTED;
+#else
+	TimeIt("asCModule::Build");
+
+	// Don't allow the module to be rebuilt if there are still
+	// external references that will need the previous code
+	// TODO: interface: The asIScriptModule must have a method for querying if the module is used
+	if( HasExternalReferences(false) )
+	{
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_MODULE_IS_IN_USE);
+		return asMODULE_IS_IN_USE;
+	}
+
+	// Only one thread may build at one time
+	// TODO: It should be possible to have multiple threads perform compilations
+	int r = m_engine->RequestBuild();
+	if( r < 0 )
+		return r;
+
+	m_engine->PrepareEngine();
+	if( m_engine->configFailed )
+	{
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_INVALID_CONFIGURATION);
+		m_engine->BuildCompleted();
+		return asINVALID_CONFIGURATION;
+	}
+
+	InternalReset();
+
+	if( !m_builder )
+	{
+		m_engine->BuildCompleted();
+		return asSUCCESS;
+	}
+
+	// Compile the script
+	r = m_builder->Build();
+	asDELETE(m_builder,asCBuilder);
+	m_builder = 0;
+
+	if( r < 0 )
+	{
+		// Reset module again
+		InternalReset();
+
+		m_engine->BuildCompleted();
+		return r;
+	}
+
+	JITCompile();
+
+	m_engine->PrepareEngine();
+
+#ifdef AS_DEBUG
+	// Verify that there are no unwanted gaps in the scriptFunctions array.
+	for( asUINT n = 1; n < m_engine->scriptFunctions.GetLength(); n++ )
+	{
+		int id = n;
+		if( m_engine->scriptFunctions[n] == 0 && !m_engine->freeScriptFunctionIds.Exists(id) )
+			asASSERT( false );
+	}
+#endif
+
+	m_engine->BuildCompleted();
+
+	// Initialize global variables
+	if( r >= 0 && m_engine->ep.initGlobalVarsAfterBuild )
+		r = ResetGlobalVars(0);
+
+	return r;
+#endif
+}
+
+// interface
+int asCModule::ResetGlobalVars(asIScriptContext *ctx)
+{
+	if( m_isGlobalVarInitialized )
+		CallExit();
+
+	return CallInit(ctx);
+}
+
+// interface
+asIScriptFunction *asCModule::GetFunctionByIndex(asUINT index) const
+{
+	return const_cast<asCScriptFunction*>(m_globalFunctions.Get(index));
+}
+
+// internal
+int asCModule::CallInit(asIScriptContext *myCtx)
+{
+	if( m_isGlobalVarInitialized )
+		return asERROR;
+
+	// Each global variable needs to be cleared individually
+	asCSymbolTableIterator<asCGlobalProperty> it = m_scriptGlobals.List();
+	while( it )
+	{
+		asCGlobalProperty *desc = *it;
+		memset(desc->GetAddressOfValue(), 0, sizeof(asDWORD)*desc->type.GetSizeOnStackDWords());
+		it++;
+	}
+
+	// Call the init function for each of the global variables
+	asIScriptContext *ctx = myCtx;
+	int r = asEXECUTION_FINISHED;
+	it = m_scriptGlobals.List();
+	while( it && r == asEXECUTION_FINISHED )
+	{
+		asCGlobalProperty *desc = *it;
+		it++;
+		if( desc->GetInitFunc() )
+		{
+			if( ctx == 0 )
+			{
+				ctx = m_engine->RequestContext();
+				if( ctx == 0 )
+					break;
+			}
+
+			r = InitGlobalProp(desc, ctx);
+		}
+	}
+
+	if( ctx && !myCtx )
+	{
+		m_engine->ReturnContext(ctx);
+		ctx = 0;
+	}
+
+	// Even if the initialization failed we need to set the
+	// flag that the variables have been initialized, otherwise
+	// the module won't free those variables that really were
+	// initialized.
+	m_isGlobalVarInitialized = true;
+
+	if( r != asEXECUTION_FINISHED )
+		return asINIT_GLOBAL_VARS_FAILED;
+
+	return asSUCCESS;
+}
+
+// internal
+// This function assumes the memory for the global property is already cleared
+int asCModule::InitGlobalProp(asCGlobalProperty *prop, asIScriptContext *myCtx)
+{
+	// Call the init function for each of the global variables
+	asIScriptContext *ctx = myCtx;
+	int r = asEXECUTION_FINISHED;
+	if( prop->GetInitFunc() )
+	{
+		if( ctx == 0 )
+		{
+			ctx = m_engine->RequestContext();
+			if( ctx == 0 )
+				return asERROR;
+		}
+
+		r = ctx->Prepare(prop->GetInitFunc());
+		if( r >= 0 )
+		{
+			r = ctx->Execute();
+			if( r != asEXECUTION_FINISHED )
+			{
+				asCString msg;
+				msg.Format(TXT_FAILED_TO_INITIALIZE_s, prop->name.AddressOf());
+				asCScriptFunction *func = prop->GetInitFunc();
+
+				m_engine->WriteMessage(func->scriptData->scriptSectionIdx >= 0 ? m_engine->scriptSectionNames[func->scriptData->scriptSectionIdx]->AddressOf() : "",
+									 func->GetLineNumber(0, 0) & 0xFFFFF,
+									 func->GetLineNumber(0, 0) >> 20,
+									 asMSGTYPE_ERROR,
+									 msg.AddressOf());
+
+				if( r == asEXECUTION_EXCEPTION )
+				{
+					const asIScriptFunction *function = ctx->GetExceptionFunction();
+
+					msg.Format(TXT_EXCEPTION_s_IN_s, ctx->GetExceptionString(), function->GetDeclaration());
+
+					m_engine->WriteMessage(function->GetScriptSectionName(),
+										   ctx->GetExceptionLineNumber(),
+										   0,
+										   asMSGTYPE_INFORMATION,
+										   msg.AddressOf());
+				}
+			}
+		}
+	}
+
+	if( ctx && !myCtx )
+	{
+		m_engine->ReturnContext(ctx);
+		ctx = 0;
+	}
+
+	// Even if the initialization failed we need to set the
+	// flag that the variables have been initialized, otherwise
+	// the module won't free those variables that really were
+	// initialized.
+	m_isGlobalVarInitialized = true;
+
+	if( r != asEXECUTION_FINISHED )
+		return asINIT_GLOBAL_VARS_FAILED;
+
+	return asSUCCESS;
+}
+
+// internal
+void asCModule::UninitializeGlobalProp(asCGlobalProperty *prop)
+{
+	if (prop == 0) 
+		return;
+
+	if (prop->type.IsObject())
+	{
+		void **obj = (void**)prop->GetAddressOfValue();
+		if (*obj)
+		{
+			asCObjectType *ot = CastToObjectType(prop->type.GetTypeInfo());
+
+			if (ot->flags & asOBJ_REF)
+			{
+				asASSERT((ot->flags & asOBJ_NOCOUNT) || ot->beh.release);
+				if (ot->beh.release)
+					m_engine->CallObjectMethod(*obj, ot->beh.release);
+			}
+			else
+			{
+				if (ot->beh.destruct)
+					m_engine->CallObjectMethod(*obj, ot->beh.destruct);
+
+				m_engine->CallFree(*obj);
+			}
+
+			// Set the address to 0 as someone might try to access the variable afterwards
+			*obj = 0;
+		}
+	}
+	else if (prop->type.IsFuncdef())
+	{
+		asCScriptFunction **func = (asCScriptFunction**)prop->GetAddressOfValue();
+		if (*func)
+		{
+			(*func)->Release();
+			*func = 0;
+		}
+	}
+}
+
+// internal
+void asCModule::CallExit()
+{
+	if( !m_isGlobalVarInitialized ) return;
+
+	asCSymbolTableIterator<asCGlobalProperty> it = m_scriptGlobals.List();
+	while( it )
+	{
+		UninitializeGlobalProp(*it);
+		it++;
+	}
+
+	m_isGlobalVarInitialized = false;
+}
+
+// internal
+bool asCModule::HasExternalReferences(bool shuttingDown)
+{
+	// Check all entities in the module for any external references.
+	// If there are any external references the module cannot be deleted yet.
+
+	asCSymbolTableIterator<asCGlobalProperty> it = m_scriptGlobals.List();
+	while (it)
+	{
+		asCGlobalProperty *desc = *it;
+		if (desc->GetInitFunc() && desc->GetInitFunc()->externalRefCount.get())
+		{
+			if( !shuttingDown )
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, m_name.AddressOf());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				// TODO: Use a better error message
+				asCString tmpName = "init " + desc->name;
+				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, tmpName.AddressOf(), desc->GetInitFunc()->GetFuncType());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+		it++;
+	}
+
+	for (asUINT n = 0; n < m_scriptFunctions.GetLength(); n++)
+	{
+		asCScriptFunction *func = m_scriptFunctions[n];
+		if (func && func->externalRefCount.get())
+		{
+			// If the func is shared and can be moved to another module then this is not a reason to keep the module alive
+			if (func->IsShared() && m_engine->FindNewOwnerForSharedFunc(func, this) != this)
+				continue;
+
+			if (!shuttingDown)
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, m_name.AddressOf());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, m_scriptFunctions[n]->GetName(), m_scriptFunctions[n]->GetFuncType());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+	}
+
+	for (asUINT n = 0; n < m_classTypes.GetLength(); n++)
+	{
+		asCObjectType *obj = m_classTypes[n];
+		if (obj && obj->externalRefCount.get())
+		{
+			// If the obj is shared and can be moved to another module then this is not a reason to keep the module alive
+			if (obj->IsShared() && m_engine->FindNewOwnerForSharedType(obj, this) != this)
+				continue;
+
+			if (!shuttingDown)
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, m_name.AddressOf());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_TYPE_IS_NAMED_s, m_classTypes[n]->GetName());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+	}
+
+	for (asUINT n = 0; n < m_funcDefs.GetLength(); n++)
+	{
+		asCFuncdefType *func = m_funcDefs[n];
+		if (func && func->externalRefCount.get())
+		{
+			// If the funcdef is shared and can be moved to another module then this is not a reason to keep the module alive
+			if (func->IsShared() && m_engine->FindNewOwnerForSharedType(func, this) != this)
+				continue;
+
+			if (!shuttingDown)
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, m_name.AddressOf());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d, m_funcDefs[n]->GetName(), m_funcDefs[n]->funcdef->GetFuncType());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+	}
+
+	for (asUINT n = 0; n < m_templateInstances.GetLength(); n++)
+	{
+		asCObjectType *obj = m_templateInstances[n];
+		if (obj && obj->externalRefCount.get())
+		{
+			// If the template can be moved to another module then this is not a reason to keep the module alive
+			if (obj->IsShared() && m_engine->FindNewOwnerForSharedType(obj, this) != this)
+				continue;
+
+			if (!shuttingDown)
+				return true;
+			else
+			{
+				asCString msg;
+				msg.Format(TXT_EXTRNL_REF_TO_MODULE_s, m_name.AddressOf());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+
+				msg.Format(TXT_PREV_TYPE_IS_NAMED_s, m_templateInstances[n]->GetName());
+				m_engine->WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, msg.AddressOf());
+			}
+		}
+	}
+
+	return false;
+}
+
+// internal
+void asCModule::InternalReset()
+{
+	CallExit();
+
+	asUINT n;
+
+	// Remove all global functions
+	m_globalFunctions.Clear();
+
+	// Destroy the internals of the global properties here, but do not yet remove them from the
+	// engine, because functions need the engine's varAddressMap to get to the property. If the
+	// property is removed already, it may leak as the refCount doesn't reach 0.
+	asCSymbolTableIterator<asCGlobalProperty> globIt = m_scriptGlobals.List();
+	while( globIt )
+	{
+		(*globIt)->DestroyInternal();
+		globIt++;
+	}
+
+	UnbindAllImportedFunctions();
+
+	// Free bind information
+	for( n = 0; n < m_bindInformations.GetLength(); n++ )
+	{
+		if( m_bindInformations[n] )
+		{
+			m_bindInformations[n]->importedFunctionSignature->ReleaseInternal();
+
+			asDELETE(m_bindInformations[n], sBindInfo);
+		}
+	}
+	m_bindInformations.SetLength(0);
+
+	// Free declared types, including classes, typedefs, and enums
+	for( n = 0; n < m_templateInstances.GetLength(); n++ )
+	{
+		asCObjectType *type = m_templateInstances[n];
+		if( m_engine->FindNewOwnerForSharedType(type, this) != this )
+		{
+			// The type is owned by another module, just release our reference
+			type->ReleaseInternal();
+			continue;
+		}
+
+		// Orphan the template instance
+		type->module = 0;
+
+		// No other module is holding the template type
+		m_engine->RemoveTemplateInstanceType(type);
+		type->ReleaseInternal();
+	}
+	m_templateInstances.SetLength(0);
+	for( n = 0; n < m_classTypes.GetLength(); n++ )
+	{
+		asCObjectType *type = m_classTypes[n];
+		if( type->IsShared() )
+		{
+			// The type is shared, so transfer ownership to another module that also uses it
+			if( m_engine->FindNewOwnerForSharedType(type, this) != this )
+			{
+				// The type is owned by another module, just release our reference
+				type->ReleaseInternal();
+				continue;
+			}
+		}
+
+		// The type should be destroyed now
+		type->DestroyInternal();
+
+		// Remove the type from the engine
+		if( type->IsShared() )
+		{
+			m_engine->sharedScriptTypes.RemoveValue(type);
+			type->ReleaseInternal();
+		}
+
+		// Release it from the module
+		type->module = 0;
+		type->ReleaseInternal();
+	}
+	m_classTypes.SetLength(0);
+	for( n = 0; n < m_enumTypes.GetLength(); n++ )
+	{
+		asCEnumType *type = m_enumTypes[n];
+		if( type->IsShared() )
+		{
+			// The type is shared, so transfer ownership to another module that also uses it
+			if( m_engine->FindNewOwnerForSharedType(type, this) != this )
+			{
+				// The type is owned by another module, just release our reference
+				type->ReleaseInternal();
+				continue;
+			}
+		}
+
+		// Remove the type from the engine
+		if( type->IsShared() )
+		{
+			m_engine->sharedScriptTypes.RemoveValue(type);
+			type->ReleaseInternal();
+		}
+
+		// Release it from the module
+		type->module = 0;
+		type->ReleaseInternal();
+	}
+	m_enumTypes.SetLength(0);
+	for( n = 0; n < m_typeDefs.GetLength(); n++ )
+	{
+		asCTypedefType *type = m_typeDefs[n];
+
+		// The type should be destroyed now
+		type->DestroyInternal();
+
+		// Release it from the module
+		type->module = 0;
+		type->ReleaseInternal();
+	}
+	m_typeDefs.SetLength(0);
+
+	// Free funcdefs
+	for( n = 0; n < m_funcDefs.GetLength(); n++ )
+	{
+		asCFuncdefType *func = m_funcDefs[n];
+		asASSERT(func);
+		if( func->funcdef && func->funcdef->IsShared() )
+		{
+			// The funcdef is shared, so transfer ownership to another module that also uses it
+			if( m_engine->FindNewOwnerForSharedType(func, this) != this )
+			{
+				// The funcdef is owned by another module, just release our reference
+				func->ReleaseInternal();
+				continue;
+			}
+		}
+
+		func->DestroyInternal();
+		m_engine->RemoveFuncdef(func);
+		func->module = 0;
+		func->ReleaseInternal();
+	}
+	m_funcDefs.SetLength(0);
+
+	// Then release the functions
+	for( n = 0; n < m_scriptFunctions.GetLength(); n++ )
+	{
+		asCScriptFunction *func = m_scriptFunctions[n];
+		if( func->IsShared() )
+		{
+			// The func is shared, so transfer ownership to another module that also uses it
+			if( m_engine->FindNewOwnerForSharedFunc(func, this) != this )
+			{
+				// The func is owned by another module, just release our reference
+				func->ReleaseInternal();
+				continue;
+			}
+		}
+
+		func->DestroyInternal();
+		func->module = 0;
+		func->ReleaseInternal();
+	}
+	m_scriptFunctions.SetLength(0);
+
+	// Now remove and release the global properties as there are no more references to them
+	globIt = m_scriptGlobals.List();
+	while( globIt )
+	{
+		m_engine->RemoveGlobalProperty(*globIt);
+		asASSERT( (*globIt)->refCount.get() == 1 );
+		(*globIt)->Release();
+		globIt++;
+	}
+	m_scriptGlobals.Clear();
+
+	// Clear the type lookup
+	// The references were already released as the types were removed from the respective arrays
+	m_typeLookup.EraseAll();
+
+	asASSERT( IsEmpty() );
+}
+
+// interface
+asIScriptFunction *asCModule::GetFunctionByName(const char *in_name) const
+{
+	asCString name;
+	asSNameSpace *ns = 0;
+	if( m_engine->DetermineNameAndNamespace(in_name, m_defaultNamespace, name, ns) < 0 )
+		return 0;
+	
+	// Search recursively in the given namespace, moving up to parent namespace until the function is found
+	while( ns )
+	{
+		const asCArray<unsigned int> &idxs = m_globalFunctions.GetIndexes(ns, name);
+		if( idxs.GetLength() != 1 )
+			return 0;
+
+		const asIScriptFunction *func = m_globalFunctions.Get(idxs[0]);
+		if( func )
+			return const_cast<asIScriptFunction*>(func);
+
+		// Recursively search parent namespaces
+		ns = m_engine->GetParentNameSpace(ns);
+	}
+
+	return 0;
+}
+
+// interface
+asUINT asCModule::GetImportedFunctionCount() const
+{
+	return (asUINT)m_bindInformations.GetLength();
+}
+
+// interface
+int asCModule::GetImportedFunctionIndexByDecl(const char *decl) const
+{
+	asCBuilder bld(m_engine, const_cast<asCModule*>(this));
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	asCScriptFunction func(m_engine, const_cast<asCModule*>(this), asFUNC_DUMMY);
+	bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, m_defaultNamespace);
+
+	// TODO: optimize: Improve linear search
+	// Search script functions for matching interface
+	int id = -1;
+	for( asUINT n = 0; n < m_bindInformations.GetLength(); ++n )
+	{
+		if( func.name == m_bindInformations[n]->importedFunctionSignature->name &&
+			func.returnType == m_bindInformations[n]->importedFunctionSignature->returnType &&
+			func.parameterTypes.GetLength() == m_bindInformations[n]->importedFunctionSignature->parameterTypes.GetLength() )
+		{
+			bool match = true;
+			for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
+			{
+				if( func.parameterTypes[p] != m_bindInformations[n]->importedFunctionSignature->parameterTypes[p] )
+				{
+					match = false;
+					break;
+				}
+			}
+
+			if( match )
+			{
+				if( id == -1 )
+					id = n;
+				else
+					return asMULTIPLE_FUNCTIONS;
+			}
+		}
+	}
+
+	if( id == -1 ) return asNO_FUNCTION;
+
+	return id;
+}
+
+// interface
+asUINT asCModule::GetFunctionCount() const
+{
+	return (asUINT)m_globalFunctions.GetSize();
+}
+
+// interface
+asIScriptFunction *asCModule::GetFunctionByDecl(const char *decl) const
+{
+	asCBuilder bld(m_engine, const_cast<asCModule*>(this));
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	asCScriptFunction func(m_engine, const_cast<asCModule*>(this), asFUNC_DUMMY);
+	int r = bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, m_defaultNamespace);
+	if( r < 0 )
+	{
+		// Invalid declaration
+		// TODO: Write error to message stream
+		return 0;
+	}
+
+	// Use the defaultNamespace implicitly unless an explicit namespace has been provided
+	asSNameSpace *ns = func.nameSpace == m_engine->nameSpaces[0] ? m_defaultNamespace : func.nameSpace;
+
+	// Search script functions for matching interface
+	while( ns )
+	{
+		asIScriptFunction *f = 0;
+		const asCArray<unsigned int> &idxs = m_globalFunctions.GetIndexes(ns, func.name);
+		for( unsigned int n = 0; n < idxs.GetLength(); n++ )
+		{
+			const asCScriptFunction *funcPtr = m_globalFunctions.Get(idxs[n]);
+			if( funcPtr->objectType == 0 &&
+				func.returnType                 == funcPtr->returnType &&
+				func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
+				)
+			{
+				bool match = true;
+				for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
+				{
+					if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
+					{
+						match = false;
+						break;
+					}
+				}
+
+				if( match )
+				{
+					if( f == 0 )
+						f = const_cast<asCScriptFunction*>(funcPtr);
+					else
+						// Multiple functions
+						return 0;
+				}
+			}
+		}
+
+		if( f )
+			return f;
+		else
+		{
+			// Search for matching functions in the parent namespace
+			ns = m_engine->GetParentNameSpace(ns);
+		}
+	}
+
+	return 0;
+}
+
+// interface
+asUINT asCModule::GetGlobalVarCount() const
+{
+	return (asUINT)m_scriptGlobals.GetSize();
+}
+
+// interface
+int asCModule::GetGlobalVarIndexByName(const char *in_name) const
+{
+	asCString name;
+	asSNameSpace *ns = 0;
+	if( m_engine->DetermineNameAndNamespace(in_name, m_defaultNamespace, name, ns) < 0 )
+		return asINVALID_ARG;
+	
+	// Find the global var id
+	while( ns )
+	{
+		int id = m_scriptGlobals.GetFirstIndex(ns, name);
+		if( id >= 0 ) return id;
+
+		// Recursively search parent namespaces
+		ns = m_engine->GetParentNameSpace(ns);
+	}
+
+	return asNO_GLOBAL_VAR;
+}
+
+// interface
+int asCModule::RemoveGlobalVar(asUINT index)
+{
+	asCGlobalProperty *prop = m_scriptGlobals.Get(index);
+	if( !prop )
+		return asINVALID_ARG;
+
+	// If the global variables have already been initialized 
+	// then uninitialize the variable before it is removed
+	if (m_isGlobalVarInitialized)
+		UninitializeGlobalProp(prop);
+
+	// Destroy the internal of the global variable (removes the initialization function)
+	prop->DestroyInternal();
+
+	// Check if the module is the only one referring to the property, if so remove it from the engine too
+	// If the property is not removed now, it will be removed later when the module is discarded
+	if( prop->refCount.get() == 2 )
+		m_engine->RemoveGlobalProperty(prop);
+
+	// Remove the global variable from the module
+	m_scriptGlobals.Erase(index);
+	prop->Release();
+
+	return 0;
+}
+
+// interface
+int asCModule::GetGlobalVarIndexByDecl(const char *decl) const
+{
+	asCBuilder bld(m_engine, const_cast<asCModule*>(this));
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	asCString declName;
+	asSNameSpace *nameSpace;
+	asCDataType dt;
+	int r = bld.ParseVariableDeclaration(decl, m_defaultNamespace, declName, nameSpace, dt);
+	if( r < 0 )
+		return r;
+
+	// Search global variables for a match
+	while( nameSpace )
+	{
+		int id = m_scriptGlobals.GetFirstIndex(nameSpace, declName, asCCompGlobPropType(dt));
+		if( id != -1 )
+			return id;
+
+		// Recursively search parent namespace
+		nameSpace = m_engine->GetParentNameSpace(nameSpace);
+	}
+
+	return asNO_GLOBAL_VAR;
+}
+
+// interface
+void *asCModule::GetAddressOfGlobalVar(asUINT index)
+{
+	asCGlobalProperty *prop = m_scriptGlobals.Get(index);
+	if( !prop )
+		return 0;
+
+	// For object variables it's necessary to dereference the pointer to get the address of the value
+	if( prop->type.IsObject() &&
+		!prop->type.IsObjectHandle() )
+		return *(void**)(prop->GetAddressOfValue());
+
+	return (void*)(prop->GetAddressOfValue());
+}
+
+// interface
+const char *asCModule::GetGlobalVarDeclaration(asUINT index, bool includeNamespace) const
+{
+	const asCGlobalProperty *prop = m_scriptGlobals.Get(index);
+	if (!prop) return 0;
+
+	asCString *tempString = &asCThreadManager::GetLocalData()->string;
+	*tempString = prop->type.Format(m_defaultNamespace);
+	*tempString += " ";
+	if( includeNamespace && prop->nameSpace->name != "" )
+		*tempString += prop->nameSpace->name + "::";
+	*tempString += prop->name;
+
+	return tempString->AddressOf();
+}
+
+// interface
+int asCModule::GetGlobalVar(asUINT index, const char **out_name, const char **out_nameSpace, int *out_typeId, bool *out_isConst) const
+{
+	const asCGlobalProperty *prop = m_scriptGlobals.Get(index);
+	if (!prop) return asINVALID_ARG;
+
+	if( out_name )
+		*out_name = prop->name.AddressOf();
+	if( out_nameSpace )
+		*out_nameSpace = prop->nameSpace->name.AddressOf();
+	if( out_typeId )
+		*out_typeId = m_engine->GetTypeIdFromDataType(prop->type);
+	if( out_isConst )
+		*out_isConst = prop->type.IsReadOnly();
+
+	return asSUCCESS;
+}
+
+// interface
+asUINT asCModule::GetObjectTypeCount() const
+{
+	return (asUINT)m_classTypes.GetLength();
+}
+
+// interface
+asITypeInfo *asCModule::GetObjectTypeByIndex(asUINT index) const
+{
+	if( index >= m_classTypes.GetLength() )
+		return 0;
+
+	return m_classTypes[index];
+}
+
+// interface
+asITypeInfo *asCModule::GetTypeInfoByName(const char *in_name) const
+{
+	asCString name;
+	asSNameSpace *ns = 0;
+	if( m_engine->DetermineNameAndNamespace(in_name, m_defaultNamespace, name, ns) < 0 )
+		return 0;
+		
+	while (ns)
+	{
+		asITypeInfo* info = GetType(name, ns);
+		if(info)
+		{
+			return info;
+		}
+
+		// Recursively search parent namespace
+		ns = m_engine->GetParentNameSpace(ns);
+	}
+
+	return 0;
+}
+
+// interface
+int asCModule::GetTypeIdByDecl(const char *decl) const
+{
+	asCDataType dt;
+
+	// This const cast is safe since we know the engine won't be modified
+	asCBuilder bld(m_engine, const_cast<asCModule*>(this));
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	int r = bld.ParseDataType(decl, &dt, m_defaultNamespace);
+	if( r < 0 )
+		return asINVALID_TYPE;
+
+	return m_engine->GetTypeIdFromDataType(dt);
+}
+
+// interface
+asITypeInfo *asCModule::GetTypeInfoByDecl(const char *decl) const
+{
+	asCDataType dt;
+
+	// This const cast is safe since we know the engine won't be modified
+	asCBuilder bld(m_engine, const_cast<asCModule*>(this));
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	int r = bld.ParseDataType(decl, &dt, m_defaultNamespace);
+	if (r < 0)
+		return 0;
+
+	return dt.GetTypeInfo();
+}
+
+// interface
+asUINT asCModule::GetEnumCount() const
+{
+	return m_enumTypes.GetLength();
+}
+
+// interface
+asITypeInfo *asCModule::GetEnumByIndex(asUINT index) const
+{
+	if( index >= m_enumTypes.GetLength() )
+		return 0;
+
+	return m_enumTypes[index];
+}
+
+// interface
+asUINT asCModule::GetTypedefCount() const
+{
+	return (asUINT)m_typeDefs.GetLength();
+}
+
+// interface
+asITypeInfo *asCModule::GetTypedefByIndex(asUINT index) const
+{
+	if( index >= m_typeDefs.GetLength() )
+		return 0;
+
+	return m_typeDefs[index];
+}
+
+// internal
+int asCModule::GetNextImportedFunctionId()
+{
+	// TODO: multithread: This will break if one thread if freeing a module, while another is being compiled
+	if( m_engine->freeImportedFunctionIdxs.GetLength() )
+		return FUNC_IMPORTED | (asUINT)m_engine->freeImportedFunctionIdxs[m_engine->freeImportedFunctionIdxs.GetLength()-1];
+
+	return FUNC_IMPORTED | (asUINT)m_engine->importedFunctions.GetLength();
+}
+
+#ifndef AS_NO_COMPILER
+// internal
+int asCModule::AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &funcName, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asCString> &paramNames, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType, bool isGlobalFunction, asSFunctionTraits funcTraits, asSNameSpace *ns)
+{
+	asASSERT(id >= 0);
+
+	// Store the function information
+	asCScriptFunction *func = asNEW(asCScriptFunction)(m_engine, this, isInterface ? asFUNC_INTERFACE : asFUNC_SCRIPT);
+	if( func == 0 )
+	{
+		// Free the default args
+		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+			if( defaultArgs[n] )
+				asDELETE(defaultArgs[n], asCString);
+
+		return asOUT_OF_MEMORY;
+	}
+
+	if( ns == 0 )
+		ns = m_engine->nameSpaces[0];
+
+	// All methods of shared objects are also shared
+	if( objType && objType->IsShared() )
+		funcTraits.SetTrait(asTRAIT_SHARED, true);
+
+	func->name             = funcName;
+	func->nameSpace        = ns;
+	func->id               = id;
+	func->returnType       = returnType;
+	if( func->funcType == asFUNC_SCRIPT )
+	{
+		func->scriptData->scriptSectionIdx = sectionIdx;
+		func->scriptData->declaredAt = declaredAt;
+	}
+	func->parameterTypes   = params;
+	func->parameterNames   = paramNames;
+	func->inOutFlags       = inOutFlags;
+	func->defaultArgs      = defaultArgs;
+	func->objectType       = objType;
+	if( objType )
+		objType->AddRefInternal();
+	func->traits           = funcTraits;
+
+	asASSERT( params.GetLength() == inOutFlags.GetLength() && params.GetLength() == defaultArgs.GetLength() );
+
+	// Verify that we are not assigning either the final or override specifier(s) if we are registering a non-member function
+	asASSERT( !(!objType && funcTraits.GetTrait(asTRAIT_FINAL)) );
+	asASSERT( !(!objType && funcTraits.GetTrait(asTRAIT_OVERRIDE)) );
+
+	// The internal ref count was already set by the constructor
+	m_scriptFunctions.PushLast(func);
+	m_engine->AddScriptFunction(func);
+
+	// Compute the signature id
+	if( objType )
+		func->ComputeSignatureId();
+
+	// Add reference
+	if( isGlobalFunction )
+		m_globalFunctions.Put(func);
+
+	return 0;
+}
+
+// internal
+int asCModule::AddScriptFunction(asCScriptFunction *func)
+{
+	m_scriptFunctions.PushLast(func);
+	func->AddRefInternal();
+	m_engine->AddScriptFunction(func);
+
+	// If the function that is being added is an already compiled shared function
+	// then it is necessary to look for anonymous functions that may be declared
+	// within it and add those as well
+	if( func->IsShared() && func->funcType == asFUNC_SCRIPT )
+	{
+		// Loop through the byte code and check all the
+		// asBC_FuncPtr instructions for anonymous functions
+		asDWORD *bc = func->scriptData->byteCode.AddressOf();
+		asUINT bcLength = (asUINT)func->scriptData->byteCode.GetLength();
+		for( asUINT n = 0; n < bcLength; )
+		{
+			int c = *(asBYTE*)&bc[n];
+			if( c == asBC_FuncPtr )
+			{
+				asCScriptFunction *f = reinterpret_cast<asCScriptFunction*>(asBC_PTRARG(&bc[n]));
+				// Anonymous functions start with $
+				// There are never two equal anonymous functions so it is not necessary to look for duplicates
+				if( f && f->name[0] == '$' )
+				{
+					AddScriptFunction(f);
+					m_globalFunctions.Put(f);
+				}
+			}
+			n += asBCTypeSize[asBCInfo[c].type];
+		}
+	}
+
+	return 0;
+}
+
+// internal
+int asCModule::AddImportedFunction(int id, const asCString &funcName, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, asSFunctionTraits funcTraits, asSNameSpace *ns, const asCString &moduleName)
+{
+	asASSERT(id >= 0);
+
+	// Store the function information
+	asCScriptFunction *func = asNEW(asCScriptFunction)(m_engine, this, asFUNC_IMPORTED);
+	if( func == 0 )
+	{
+		// Free the default args
+		for( asUINT n = 0; n < defaultArgs.GetLength(); n++ )
+			if( defaultArgs[n] )
+				asDELETE(defaultArgs[n], asCString);
+
+		return asOUT_OF_MEMORY;
+	}
+
+	func->name           = funcName;
+	func->id             = id;
+	func->returnType     = returnType;
+	func->nameSpace      = ns;
+	func->parameterTypes = params;
+	func->inOutFlags     = inOutFlags;
+	func->defaultArgs    = defaultArgs;
+	func->objectType     = 0;
+	func->traits         = funcTraits;
+
+	sBindInfo *info = asNEW(sBindInfo);
+	if( info == 0 )
+	{
+		asDELETE(func, asCScriptFunction);
+		return asOUT_OF_MEMORY;
+	}
+
+	info->importedFunctionSignature = func;
+	info->boundFunctionId           = -1;
+	info->importFromModule          = moduleName;
+	m_bindInformations.PushLast(info);
+
+	// Add the info to the array in the engine
+	if( m_engine->freeImportedFunctionIdxs.GetLength() )
+		m_engine->importedFunctions[m_engine->freeImportedFunctionIdxs.PopLast()] = info;
+	else
+		m_engine->importedFunctions.PushLast(info);
+
+	return 0;
+}
+#endif
+
+// internal
+asCScriptFunction *asCModule::GetImportedFunction(int index) const
+{
+	return m_bindInformations[index]->importedFunctionSignature;
+}
+
+// interface
+int asCModule::BindImportedFunction(asUINT index, asIScriptFunction *func)
+{
+	// First unbind the old function
+	int r = UnbindImportedFunction(index);
+	if( r < 0 ) return r;
+
+	// Must verify that the interfaces are equal
+	asCScriptFunction *dst = GetImportedFunction(index);
+	if( dst == 0 ) return asNO_FUNCTION;
+
+	if( func == 0 )
+		return asINVALID_ARG;
+
+	asCScriptFunction *src = m_engine->GetScriptFunction(func->GetId());
+	if( src == 0 )
+		return asNO_FUNCTION;
+
+	// Verify return type
+	if( dst->returnType != src->returnType )
+		return asINVALID_INTERFACE;
+
+	if( dst->parameterTypes.GetLength() != src->parameterTypes.GetLength() )
+		return asINVALID_INTERFACE;
+
+	for( asUINT n = 0; n < dst->parameterTypes.GetLength(); ++n )
+	{
+		if( dst->parameterTypes[n] != src->parameterTypes[n] )
+			return asINVALID_INTERFACE;
+	}
+
+	m_bindInformations[index]->boundFunctionId = src->GetId();
+	src->AddRefInternal();
+
+	return asSUCCESS;
+}
+
+// interface
+int asCModule::UnbindImportedFunction(asUINT index)
+{
+	if( index >= m_bindInformations.GetLength() )
+		return asINVALID_ARG;
+
+	// Remove reference to old module
+	if( m_bindInformations[index] )
+	{
+		int oldFuncID = m_bindInformations[index]->boundFunctionId;
+		if( oldFuncID != -1 )
+		{
+			m_bindInformations[index]->boundFunctionId = -1;
+			m_engine->scriptFunctions[oldFuncID]->ReleaseInternal();
+		}
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+const char *asCModule::GetImportedFunctionDeclaration(asUINT index) const
+{
+	asCScriptFunction *func = GetImportedFunction(index);
+	if( func == 0 ) return 0;
+
+	asCString *tempString = &asCThreadManager::GetLocalData()->string;
+	// TODO: Allow the application to decide if the parameter name should be included or not (requires change in the interface)
+	*tempString = func->GetDeclarationStr(true, true, false);
+
+	return tempString->AddressOf();
+}
+
+// interface
+const char *asCModule::GetImportedFunctionSourceModule(asUINT index) const
+{
+	if( index >= m_bindInformations.GetLength() )
+		return 0;
+
+	return m_bindInformations[index]->importFromModule.AddressOf();
+}
+
+// inteface
+int asCModule::BindAllImportedFunctions()
+{
+	bool notAllFunctionsWereBound = false;
+
+	// Bind imported functions
+	int c = GetImportedFunctionCount();
+	for( int n = 0; n < c; ++n )
+	{
+		asCScriptFunction *importFunc = GetImportedFunction(n);
+		if( importFunc == 0 ) return asERROR;
+
+		asCString str = importFunc->GetDeclarationStr(false, true);
+
+		// Get module name from where the function should be imported
+		const char *moduleName = GetImportedFunctionSourceModule(n);
+		if( moduleName == 0 ) return asERROR;
+
+		asCModule *srcMod = m_engine->GetModule(moduleName, false);
+		asIScriptFunction *func = 0;
+		if( srcMod )
+			func = srcMod->GetFunctionByDecl(str.AddressOf());
+
+		if( func == 0 )
+			notAllFunctionsWereBound = true;
+		else
+		{
+			if( BindImportedFunction(n, func) < 0 )
+				notAllFunctionsWereBound = true;
+		}
+	}
+
+	if( notAllFunctionsWereBound )
+		return asCANT_BIND_ALL_FUNCTIONS;
+
+	return asSUCCESS;
+}
+
+// interface
+int asCModule::UnbindAllImportedFunctions()
+{
+	asUINT c = GetImportedFunctionCount();
+	for( asUINT n = 0; n < c; ++n )
+		UnbindImportedFunction(n);
+
+	return asSUCCESS;
+}
+
+// internal
+void asCModule::AddClassType(asCObjectType* type)
+{
+	m_classTypes.PushLast(type);
+	m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
+}
+
+// internal
+void asCModule::AddEnumType(asCEnumType* type)
+{
+	m_enumTypes.PushLast(type);
+	m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
+}
+
+// internal
+void asCModule::AddTypeDef(asCTypedefType* type)
+{
+	m_typeDefs.PushLast(type);
+	m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
+}
+
+// internal
+void asCModule::AddFuncDef(asCFuncdefType* type)
+{
+	m_funcDefs.PushLast(type);
+	m_typeLookup.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
+}
+
+// internal
+void asCModule::ReplaceFuncDef(asCFuncdefType* type, asCFuncdefType* newType)
+{
+	int i = m_funcDefs.IndexOf(type);
+	if( i >= 0 )
+	{
+		m_funcDefs[i] = newType;
+		
+		// Replace it in the lookup map too
+		asSMapNode<asSNameSpaceNamePair, asCTypeInfo*>* result = 0;
+		if(m_typeLookup.MoveTo(&result, asSNameSpaceNamePair(type->nameSpace, type->name)))
+		{
+			asASSERT( result->value == type );
+			result->value = newType;
+		}
+	}
+}
+
+// internal
+asCTypeInfo *asCModule::GetType(const asCString &type, asSNameSpace *ns) const
+{
+	asSMapNode<asSNameSpaceNamePair, asCTypeInfo*>* result = 0;
+	if(m_typeLookup.MoveTo(&result, asSNameSpaceNamePair(ns, type)))
+	{
+		return result->value;
+	}
+	return 0;
+}
+
+// internal
+asCObjectType *asCModule::GetObjectType(const char *type, asSNameSpace *ns) const
+{
+	asSMapNode<asSNameSpaceNamePair, asCTypeInfo*>* result = 0;
+	if(m_typeLookup.MoveTo(&result, asSNameSpaceNamePair(ns, type)))
+	{
+		return CastToObjectType(result->value);
+	}
+ 
+	return 0;
+}
+
+// internal
+asCGlobalProperty *asCModule::AllocateGlobalProperty(const char *propName, const asCDataType &dt, asSNameSpace *ns)
+{
+	asCGlobalProperty *prop = m_engine->AllocateGlobalProperty();
+	prop->name = propName;
+	prop->nameSpace = ns;
+
+	// Allocate the memory for this property based on its type
+	prop->type = dt;
+	prop->AllocateMemory();
+
+	// Make an entry in the address to variable map
+	m_engine->varAddressMap.Insert(prop->GetAddressOfValue(), prop);
+
+	// Store the variable in the module scope
+	m_scriptGlobals.Put(prop);
+	prop->AddRef();
+
+	return prop;
+}
+
+// internal
+bool asCModule::IsEmpty() const
+{
+	if( m_scriptFunctions.GetLength()  ) return false;
+	if( m_globalFunctions.GetSize()    ) return false;
+	if( m_bindInformations.GetLength() ) return false;
+	if( m_scriptGlobals.GetSize()      ) return false;
+	if( m_classTypes.GetLength()       ) return false;
+	if( m_enumTypes.GetLength()        ) return false;
+	if( m_typeDefs.GetLength()         ) return false;
+	if( m_funcDefs.GetLength()         ) return false;
+
+	return true;
+}
+
+// interface
+int asCModule::SaveByteCode(asIBinaryStream *out, bool stripDebugInfo) const
+{
+#ifdef AS_NO_COMPILER
+	UNUSED_VAR(out);
+	UNUSED_VAR(stripDebugInfo);
+	return asNOT_SUPPORTED;
+#else
+	if( out == 0 ) return asINVALID_ARG;
+
+	// Make sure there is actually something to save
+	if( IsEmpty() )
+		return asERROR;
+
+	asCWriter write(const_cast<asCModule*>(this), out, m_engine, stripDebugInfo);
+	return write.Write();
+#endif
+}
+
+// interface
+int asCModule::LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped)
+{
+	if( in == 0 ) return asINVALID_ARG;
+
+	// Don't allow the module to be rebuilt if there are still
+	// external references that will need the previous code
+	if( HasExternalReferences(false) )
+	{
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_MODULE_IS_IN_USE);
+		return asMODULE_IS_IN_USE;
+	}
+
+	// Only permit loading bytecode if no other thread is currently compiling
+	// TODO: It should be possible to have multiple threads perform compilations
+	int r = m_engine->RequestBuild();
+	if( r < 0 )
+		return r;
+
+	asCReader read(this, in, m_engine);
+	r = read.Read(wasDebugInfoStripped);
+	if (r < 0)
+	{
+		m_engine->BuildCompleted();
+		return r;
+	}
+
+	JITCompile();
+
+#ifdef AS_DEBUG
+	// Verify that there are no unwanted gaps in the scriptFunctions array.
+	for( asUINT n = 1; n < m_engine->scriptFunctions.GetLength(); n++ )
+	{
+		int id = n;
+		if( m_engine->scriptFunctions[n] == 0 && !m_engine->freeScriptFunctionIds.Exists(id) )
+			asASSERT( false );
+	}
+#endif
+
+	m_engine->BuildCompleted();
+
+	return r;
+}
+
+// interface
+int asCModule::CompileGlobalVar(const char *sectionName, const char *code, int lineOffset)
+{
+#ifdef AS_NO_COMPILER
+	UNUSED_VAR(sectionName);
+	UNUSED_VAR(code);
+	UNUSED_VAR(lineOffset);
+	return asNOT_SUPPORTED;
+#else
+	// Validate arguments
+	if( code == 0 )
+		return asINVALID_ARG;
+
+	// Only one thread may build at one time
+	// TODO: It should be possible to have multiple threads perform compilations
+	int r = m_engine->RequestBuild();
+	if( r < 0 )
+		return r;
+
+	// Prepare the engine
+	m_engine->PrepareEngine();
+	if( m_engine->configFailed )
+	{
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_INVALID_CONFIGURATION);
+		m_engine->BuildCompleted();
+		return asINVALID_CONFIGURATION;
+	}
+
+	// Compile the global variable and add it to the module scope
+	asCBuilder varBuilder(m_engine, this);
+	asCString str = code;
+	r = varBuilder.CompileGlobalVar(sectionName, str.AddressOf(), lineOffset);
+
+	m_engine->BuildCompleted();
+
+	// Initialize the variable
+	if( r >= 0 )
+	{
+		// Clear the memory
+		asCGlobalProperty *prop = m_scriptGlobals.GetLast();
+		if( prop )
+		{
+			memset(prop->GetAddressOfValue(), 0, sizeof(asDWORD)*prop->type.GetSizeOnStackDWords());
+		}
+
+		if( prop && m_engine->ep.initGlobalVarsAfterBuild )
+		{
+			// Flag that there are initialized global variables
+			m_isGlobalVarInitialized = true;
+
+			r = InitGlobalProp(prop, 0);
+		}
+	}
+
+	return r;
+#endif
+}
+
+// interface
+int asCModule::CompileFunction(const char* sectionName, const char* code, int lineOffset, asDWORD compileFlags, asIScriptFunction** outFunc)
+{
+	// Make sure the outFunc is null if the function fails, so the
+	// application doesn't attempt to release a non-existent function
+	if (outFunc)
+		*outFunc = 0;
+
+#ifdef AS_NO_COMPILER
+	UNUSED_VAR(sectionName);
+	UNUSED_VAR(code);
+	UNUSED_VAR(lineOffset);
+	UNUSED_VAR(compileFlags);
+	return asNOT_SUPPORTED;
+#else
+	// Validate arguments
+	if (code == 0 ||
+		(compileFlags != 0 && compileFlags != asCOMP_ADD_TO_MODULE))
+		return asINVALID_ARG;
+
+	// Only one thread may build at one time
+	// TODO: It should be possible to have multiple threads perform compilations
+	int r = m_engine->RequestBuild();
+	if (r < 0)
+		return r;
+
+	// Prepare the engine
+	m_engine->PrepareEngine();
+	if (m_engine->configFailed)
+	{
+		m_engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_INVALID_CONFIGURATION);
+		m_engine->BuildCompleted();
+		return asINVALID_CONFIGURATION;
+	}
+
+	// Compile the single function
+	asCBuilder funcBuilder(m_engine, this);
+	asCString str = code;
+	asCScriptFunction* func = 0;
+	r = funcBuilder.CompileFunction(sectionName, str.AddressOf(), lineOffset, compileFlags, &func);
+
+	if (r >= 0)
+	{
+		// Invoke the JIT compiler if it has been set
+		asIJITCompiler* jit = m_engine->GetJITCompiler();
+		if (jit)
+		{
+			func->JITCompile();
+		}
+	}
+
+	m_engine->BuildCompleted();
+
+	if( r >= 0 && outFunc && func )
+	{
+		// Return the function to the caller and add an external reference
+		*outFunc = func;
+		func->AddRef();
+	}
+
+	// Release our reference to the function
+	if( func )
+		func->ReleaseInternal();
+
+	return r;
+#endif
+}
+
+// interface
+int asCModule::RemoveFunction(asIScriptFunction *func)
+{
+	// Find the global function
+	asCScriptFunction *f = static_cast<asCScriptFunction*>(func);
+	int idx = m_globalFunctions.GetIndex(f);
+	if( idx >= 0 )
+	{
+		m_globalFunctions.Erase(idx);
+		m_scriptFunctions.RemoveValue(f);
+		f->ReleaseInternal();
+		return 0;
+	}
+
+	return asNO_FUNCTION;
+}
+
+#ifndef AS_NO_COMPILER
+// internal
+int asCModule::AddFuncDef(const asCString &funcName, asSNameSpace *ns, asCObjectType *parent)
+{
+	// namespace and parent are mutually exclusive
+	asASSERT((ns == 0 && parent) || (ns && parent == 0));
+
+	asCScriptFunction *func = asNEW(asCScriptFunction)(m_engine, 0, asFUNC_FUNCDEF);
+	if (func == 0)
+		return asOUT_OF_MEMORY;
+
+	func->name      = funcName;
+	func->nameSpace = ns;
+	func->module    = this;
+
+	asCFuncdefType *fdt = asNEW(asCFuncdefType)(m_engine, func);
+	AddFuncDef(fdt); // The constructor set the refcount to 1
+
+	m_engine->funcDefs.PushLast(fdt); // doesn't increase refcount
+	func->id = m_engine->GetNextScriptFunctionId();
+	m_engine->AddScriptFunction(func);
+
+	if (parent)
+	{
+		parent->childFuncDefs.PushLast(fdt);
+		fdt->parentClass = parent;
+	}
+
+	return (int)m_funcDefs.GetLength()-1;
+}
+#endif
+
+// interface
+asDWORD asCModule::SetAccessMask(asDWORD mask)
+{
+	asDWORD old = m_accessMask;
+	m_accessMask = mask;
+	return old;
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_module.h b/Sources/AngelScript/source/as_module.h
old mode 100755
new mode 100644
index 41e854737..04a0af32e
--- a/Sources/AngelScript/source/as_module.h
+++ b/Sources/AngelScript/source/as_module.h
@@ -1,246 +1,257 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_module.h
-//
-// A class that holds a script module
-//
-
-#ifndef AS_MODULE_H
-#define AS_MODULE_H
-
-#include "as_config.h"
-#include "as_symboltable.h"
-#include "as_atomic.h"
-#include "as_string.h"
-#include "as_array.h"
-#include "as_datatype.h"
-#include "as_scriptfunction.h"
-#include "as_property.h"
-
-BEGIN_AS_NAMESPACE
-
-// TODO: import: Remove this when the imported functions are removed
-const int FUNC_IMPORTED = 0x40000000;
-
-class asCScriptEngine;
-class asCCompiler;
-class asCBuilder;
-class asCContext;
-class asCConfigGroup;
-class asCTypedefType;
-class asCFuncdefType;
-struct asSNameSpace;
-
-struct sBindInfo
-{
-	asCScriptFunction *importedFunctionSignature;
-	asCString		   importFromModule;
-	int                boundFunctionId;
-};
-
-struct sObjectTypePair
-{
-	asCObjectType *a;
-	asCObjectType *b;
-};
-
-
-// TODO: import: Remove function imports. When I have implemented function 
-//               pointers the function imports should be deprecated.
-
-// TODO: Need a separate interface for compiling scripts. The asIScriptCompiler
-//       will have a target module, and will allow the compilation of an entire
-//       script or just individual functions within the scope of the module
-// 
-//       With this separation it will be possible to compile the library without
-//       the compiler, thus giving a much smaller binary executable.
-
-// TODO: There should be a special compile option that will let the application
-//       recompile an already compiled script. The compiler should check if no
-//       destructive changes have been made (changing function signatures, etc)
-//       then it should simply replace the bytecode within the functions without
-//       changing the values of existing global properties, etc.
-
-class asCModule : public asIScriptModule
-{
-//-------------------------------------------
-// Public interface
-//--------------------------------------------
-public:
-	virtual asIScriptEngine *GetEngine() const;
-	virtual void             SetName(const char *name);
-	virtual const char      *GetName() const;
-	virtual void             Discard();
-
-	// Compilation
-	virtual int         AddScriptSection(const char *name, const char *code, size_t codeLength, int lineOffset);
-	virtual int         Build();
-	virtual int         CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD reserved, asIScriptFunction **outFunc);
-	virtual int         CompileGlobalVar(const char *sectionName, const char *code, int lineOffset);
-	virtual asDWORD     SetAccessMask(asDWORD accessMask);
-	virtual int         SetDefaultNamespace(const char *nameSpace);
-	virtual const char *GetDefaultNamespace() const;
-
-	// Script functions
-	virtual asUINT             GetFunctionCount() const;
-	virtual asIScriptFunction *GetFunctionByIndex(asUINT index) const;
-	virtual asIScriptFunction *GetFunctionByDecl(const char *decl) const;
-	virtual asIScriptFunction *GetFunctionByName(const char *name) const;
-	virtual int                RemoveFunction(asIScriptFunction *func);
-
-	// Script global variables
-	// TODO: interface: Should be called InitGlobalVars, and should have a bool to reset in case already initialized
-	virtual int         ResetGlobalVars(asIScriptContext *ctx);
-	virtual asUINT      GetGlobalVarCount() const;
-	virtual int         GetGlobalVarIndexByName(const char *name) const;
-	virtual int         GetGlobalVarIndexByDecl(const char *decl) const;
-	virtual const char *GetGlobalVarDeclaration(asUINT index, bool includeNamespace) const;
-	virtual int         GetGlobalVar(asUINT index, const char **name, const char **nameSpace, int *typeId, bool *isConst) const;
-	virtual void       *GetAddressOfGlobalVar(asUINT index);
-	virtual int         RemoveGlobalVar(asUINT index);
-
-	// Type identification
-	virtual asUINT         GetObjectTypeCount() const;
-	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual asITypeInfo   *GetObjectTypeByName(const char *name) const;
-	virtual asITypeInfo   *GetObjectTypeByDecl(const char *decl) const;
-#endif
-	virtual int            GetTypeIdByDecl(const char *decl) const;
-	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const;
-	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const;
-
-	// Enums
-	virtual asUINT       GetEnumCount() const;
-	virtual asITypeInfo *GetEnumByIndex(asUINT index) const;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual int          GetEnumValueCount(int enumTypeId) const;
-	virtual const char * GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const;
-#endif
-
-	// Typedefs
-	virtual asUINT       GetTypedefCount() const;
-	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const;
-
-	// Dynamic binding between modules
-	virtual asUINT      GetImportedFunctionCount() const;
-	virtual int         GetImportedFunctionIndexByDecl(const char *decl) const;
-	virtual const char *GetImportedFunctionDeclaration(asUINT importIndex) const;
-	virtual const char *GetImportedFunctionSourceModule(asUINT importIndex) const;
-	virtual int         BindImportedFunction(asUINT index, asIScriptFunction *func);
-	virtual int         UnbindImportedFunction(asUINT importIndex);
-	virtual int         BindAllImportedFunctions();
-	virtual int         UnbindAllImportedFunctions();
-
-	// Bytecode Saving/Loading
-	virtual int SaveByteCode(asIBinaryStream *out, bool stripDebugInfo) const;
-	virtual int LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped);
-
-	// User data
-	virtual void *SetUserData(void *data, asPWORD type);
-	virtual void *GetUserData(asPWORD type) const;
-
-//-----------------------------------------------
-// Internal
-//-----------------------------------------------
-	asCModule(const char *name, asCScriptEngine *engine);
-	~asCModule();
-
-//protected:
-	friend class asCScriptEngine;
-	friend class asCBuilder;
-	friend class asCCompiler;
-	friend class asCContext;
-	friend class asCRestore;
-
-	void InternalReset();
-	bool IsEmpty() const;
-	bool HasExternalReferences(bool shuttingDown);
-
-	int  CallInit(asIScriptContext *ctx);
-	void CallExit();
-
-	void JITCompile();
-
-#ifndef AS_NO_COMPILER
-	int  AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asCString> &paramNames, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType = 0, bool isConstMethod = false, bool isGlobalFunction = false, bool isPrivate = false, bool isProtected = false, bool isFinal = false, bool isOverride = false, bool isShared = false, asSNameSpace *ns = 0);
-	int  AddScriptFunction(asCScriptFunction *func);
-	int  AddImportedFunction(int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, asSNameSpace *ns, const asCString &moduleName);
-	int  AddFuncDef(const asCString &name, asSNameSpace *ns, asCObjectType *parent);
-#endif
-
-	int                GetNextImportedFunctionId();
-	asCScriptFunction *GetImportedFunction(int funcId) const;
-	asCTypeInfo       *GetType(const char *type, asSNameSpace *ns);
-	asCObjectType     *GetObjectType(const char *type, asSNameSpace *ns);
-	asCGlobalProperty *AllocateGlobalProperty(const char *name, const asCDataType &dt, asSNameSpace *ns);
-
-	asCString name;
-
-	asCScriptEngine  *engine;
-	asCBuilder       *builder;
-	asCArray<asPWORD> userData;
-	asDWORD           accessMask;
-	asSNameSpace     *defaultNamespace;
-
-	// This array holds all functions, class members, factories, etc that were compiled with the module.
-	// These references hold an internal reference to the function object.
-	asCArray<asCScriptFunction *>     scriptFunctions; // increases ref count
-	// This array holds global functions declared in the module. These references are not counted, 
-	// as the same pointer is always present in the scriptFunctions array too.
-	asCSymbolTable<asCScriptFunction> globalFunctions; // doesn't increase ref count
-	// This array holds imported functions in the module.
-	asCArray<sBindInfo *>             bindInformations; // increases ref count
-	// This array holds template instance types created for the module's object types
-	asCArray<asCObjectType*>          templateInstances; // increases ref count
-
-	// This array holds the global variables declared in the script
-	asCSymbolTable<asCGlobalProperty> scriptGlobals; // increases ref count
-	bool                              isGlobalVarInitialized;
-
-	// This array holds class and interface types
-	asCArray<asCObjectType*>       classTypes; // increases ref count
-	// This array holds enum types
-	asCArray<asCEnumType*>         enumTypes; // increases ref count
-	// This array holds typedefs
-	asCArray<asCTypedefType*>      typeDefs; // increases ref count
-	// This array holds the funcdefs declared in the module
-	asCArray<asCFuncdefType*>      funcDefs; // increases ref count
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2020 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_module.h
+//
+// A class that holds a script module
+//
+
+#ifndef AS_MODULE_H
+#define AS_MODULE_H
+
+#include "as_config.h"
+#include "as_symboltable.h"
+#include "as_atomic.h"
+#include "as_string.h"
+#include "as_array.h"
+#include "as_datatype.h"
+#include "as_scriptfunction.h"
+#include "as_property.h"
+
+BEGIN_AS_NAMESPACE
+
+// TODO: import: Remove this when the imported functions are removed
+const int FUNC_IMPORTED = 0x40000000;
+
+class asCScriptEngine;
+class asCCompiler;
+class asCBuilder;
+class asCContext;
+class asCConfigGroup;
+class asCTypedefType;
+class asCFuncdefType;
+struct asSNameSpace;
+
+struct sBindInfo
+{
+	asCScriptFunction *importedFunctionSignature;
+	asCString          importFromModule;
+	int                boundFunctionId;
+};
+
+struct sObjectTypePair
+{
+	asCObjectType *a;
+	asCObjectType *b;
+};
+
+
+// TODO: import: Remove function imports. When I have implemented function
+//               pointers the function imports should be deprecated.
+
+// TODO: Need a separate interface for compiling scripts. The asIScriptCompiler
+//       will have a target module, and will allow the compilation of an entire
+//       script or just individual functions within the scope of the module
+//
+//       With this separation it will be possible to compile the library without
+//       the compiler, thus giving a much smaller binary executable.
+
+// TODO: There should be a special compile option that will let the application
+//       recompile an already compiled script. The compiler should check if no
+//       destructive changes have been made (changing function signatures, etc)
+//       then it should simply replace the bytecode within the functions without
+//       changing the values of existing global properties, etc.
+
+class asCModule : public asIScriptModule
+{
+//-------------------------------------------
+// Public interface
+//--------------------------------------------
+public:
+	virtual asIScriptEngine *GetEngine() const;
+	virtual void             SetName(const char *name);
+	virtual const char      *GetName() const;
+	virtual void             Discard();
+
+	// Compilation
+	virtual int         AddScriptSection(const char *name, const char *code, size_t codeLength, int lineOffset);
+	virtual int         Build();
+	virtual int         CompileFunction(const char *sectionName, const char *code, int lineOffset, asDWORD reserved, asIScriptFunction **outFunc);
+	virtual int         CompileGlobalVar(const char *sectionName, const char *code, int lineOffset);
+	virtual asDWORD     SetAccessMask(asDWORD accessMask);
+	virtual int         SetDefaultNamespace(const char *nameSpace);
+	virtual const char *GetDefaultNamespace() const;
+
+	// Script functions
+	virtual asUINT             GetFunctionCount() const;
+	virtual asIScriptFunction *GetFunctionByIndex(asUINT index) const;
+	virtual asIScriptFunction *GetFunctionByDecl(const char *decl) const;
+	virtual asIScriptFunction *GetFunctionByName(const char *name) const;
+	virtual int                RemoveFunction(asIScriptFunction *func);
+
+	// Script global variables
+	// TODO: interface: Should be called InitGlobalVars, and should have a bool to reset in case already initialized
+	virtual int         ResetGlobalVars(asIScriptContext *ctx);
+	virtual asUINT      GetGlobalVarCount() const;
+	virtual int         GetGlobalVarIndexByName(const char *name) const;
+	virtual int         GetGlobalVarIndexByDecl(const char *decl) const;
+	virtual const char *GetGlobalVarDeclaration(asUINT index, bool includeNamespace) const;
+	virtual int         GetGlobalVar(asUINT index, const char **name, const char **nameSpace, int *typeId, bool *isConst) const;
+	virtual void       *GetAddressOfGlobalVar(asUINT index);
+	virtual int         RemoveGlobalVar(asUINT index);
+
+	// Type identification
+	virtual asUINT         GetObjectTypeCount() const;
+	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const;
+	virtual int            GetTypeIdByDecl(const char *decl) const;
+	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const;
+	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const;
+
+	// Enums
+	virtual asUINT       GetEnumCount() const;
+	virtual asITypeInfo *GetEnumByIndex(asUINT index) const;
+
+	// Typedefs
+	virtual asUINT       GetTypedefCount() const;
+	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const;
+
+	// Dynamic binding between modules
+	virtual asUINT      GetImportedFunctionCount() const;
+	virtual int         GetImportedFunctionIndexByDecl(const char *decl) const;
+	virtual const char *GetImportedFunctionDeclaration(asUINT importIndex) const;
+	virtual const char *GetImportedFunctionSourceModule(asUINT importIndex) const;
+	virtual int         BindImportedFunction(asUINT index, asIScriptFunction *func);
+	virtual int         UnbindImportedFunction(asUINT importIndex);
+	virtual int         BindAllImportedFunctions();
+	virtual int         UnbindAllImportedFunctions();
+
+	// Bytecode Saving/Loading
+	virtual int SaveByteCode(asIBinaryStream *out, bool stripDebugInfo) const;
+	virtual int LoadByteCode(asIBinaryStream *in, bool *wasDebugInfoStripped);
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type);
+	virtual void *GetUserData(asPWORD type) const;
+
+//-----------------------------------------------
+// Internal
+//-----------------------------------------------
+	asCModule(const char *name, asCScriptEngine *engine);
+	~asCModule();
+
+//protected:
+	friend class asCScriptEngine;
+	friend class asCBuilder;
+	friend class asCCompiler;
+	friend class asCContext;
+	friend class asCRestore;
+
+	void InternalReset();
+	bool IsEmpty() const;
+	bool HasExternalReferences(bool shuttingDown);
+
+	int  CallInit(asIScriptContext *ctx);
+	void CallExit();
+	int  InitGlobalProp(asCGlobalProperty *prop, asIScriptContext *ctx);
+
+	void JITCompile();
+
+#ifndef AS_NO_COMPILER
+	int  AddScriptFunction(int sectionIdx, int declaredAt, int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asCString> &paramNames, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, bool isInterface, asCObjectType *objType = 0, bool isGlobalFunction = false, asSFunctionTraits funcTraits = asSFunctionTraits(), asSNameSpace *ns = 0);
+	int  AddScriptFunction(asCScriptFunction *func);
+	int  AddImportedFunction(int id, const asCString &name, const asCDataType &returnType, const asCArray<asCDataType> &params, const asCArray<asETypeModifiers> &inOutFlags, const asCArray<asCString *> &defaultArgs, asSFunctionTraits funcTraits, asSNameSpace *ns, const asCString &moduleName);
+	int  AddFuncDef(const asCString &name, asSNameSpace *ns, asCObjectType *parent);
+#endif
+
+	int                GetNextImportedFunctionId();
+	asCScriptFunction *GetImportedFunction(int funcId) const;
+	asCTypeInfo       *GetType(const asCString &type, asSNameSpace *ns) const;
+	asCObjectType     *GetObjectType(const char *type, asSNameSpace *ns) const;
+	asCGlobalProperty *AllocateGlobalProperty(const char *name, const asCDataType &dt, asSNameSpace *ns);
+	void               UninitializeGlobalProp(asCGlobalProperty *prop);
+	
+	// Adds the class type to the module. The module assumes ownership of the reference without increasing it
+	void               AddClassType(asCObjectType*);
+	// Adds the enum type to the module. The module assumes ownership of the reference without increasing it
+	void               AddEnumType(asCEnumType*);
+	// Adds the typedef to the module. The module assumes ownership of the reference without increasing it
+	void               AddTypeDef(asCTypedefType*);
+	// Adds the funcdef to the module. The module assumes ownership of the reference without increasing it
+	void               AddFuncDef(asCFuncdefType*);
+	// Replaces an existing funcdef with another (used for shared funcdefs). Doesn't add or release refCounts
+	void               ReplaceFuncDef(asCFuncdefType *oldType, asCFuncdefType *newType);
+
+	asCString         m_name;
+	asCScriptEngine  *m_engine;
+	asCBuilder       *m_builder;
+	asCArray<asPWORD> m_userData;
+	asDWORD           m_accessMask;
+	asSNameSpace     *m_defaultNamespace;
+
+	// This array holds all functions, class members, factories, etc that were compiled with the module.
+	// These references hold an internal reference to the function object.
+	asCArray<asCScriptFunction *>     m_scriptFunctions; // increases ref count
+	// This array holds global functions declared in the module. These references are not counted,
+	// as the same pointer is always present in the scriptFunctions array too.
+	asCSymbolTable<asCScriptFunction> m_globalFunctions; // doesn't increase ref count
+	// This array holds imported functions in the module.
+	asCArray<sBindInfo *>             m_bindInformations; // increases ref count
+	// This array holds template instance types created for the module's object types
+	asCArray<asCObjectType*>          m_templateInstances; // increases ref count
+
+	// This array holds the global variables declared in the script
+	asCSymbolTable<asCGlobalProperty> m_scriptGlobals; // increases ref count
+	bool                              m_isGlobalVarInitialized;
+
+	// This array holds class and interface types
+	asCArray<asCObjectType*>       m_classTypes; // increases ref count
+	// This array holds enum types
+	asCArray<asCEnumType*>         m_enumTypes; // increases ref count
+	// This array holds typedefs
+	asCArray<asCTypedefType*>      m_typeDefs; // increases ref count
+	// This array holds the funcdefs declared in the module
+	asCArray<asCFuncdefType*>      m_funcDefs; // increases ref count
+
+	// This map contains all the types (also contained in the arrays above) for quick lookup
+	// TODO: memory: Can we eliminate the arrays above?
+	asCMap<asSNameSpaceNamePair, asCTypeInfo*> m_typeLookup; // doesn't increase ref count
+
+	// This array holds types that have been explicitly declared with 'external'
+	asCArray<asCTypeInfo*>       m_externalTypes; // doesn't increase ref count
+	// This array holds functions that have been explicitly declared with 'external'
+	asCArray<asCScriptFunction*> m_externalFunctions; // doesn't increase ref count
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_namespace.h b/Sources/AngelScript/source/as_namespace.h
old mode 100755
new mode 100644
index a155801e7..ae384e7aa
--- a/Sources/AngelScript/source/as_namespace.h
+++ b/Sources/AngelScript/source/as_namespace.h
@@ -1,77 +1,77 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2013-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-#ifndef AS_NAMESPACE_H
-#define AS_NAMESPACE_H
-
-#include "as_string.h"
-
-BEGIN_AS_NAMESPACE
-
-struct asSNameSpace
-{
-	asCString name;
-
-	// TODO: namespace: A namespace should have access masks. The application should be
-	//                  able to restrict specific namespaces from access to specific modules
-};
-
-
-struct asSNameSpaceNamePair
-{
-	const asSNameSpace *ns;
-	asCString           name;
-
-	asSNameSpaceNamePair() : ns(0) {}
-	asSNameSpaceNamePair(const asSNameSpace *_ns, const asCString &_name) : ns(_ns), name(_name) {}
-
-	asSNameSpaceNamePair &operator=(const asSNameSpaceNamePair &other)
-	{
-		ns   = other.ns;
-		name = other.name;
-		return *this;
-	}
-
-	bool operator==(const asSNameSpaceNamePair &other) const
-	{
-		return (ns == other.ns && name == other.name);
-	}
-
-	bool operator<(const asSNameSpaceNamePair &other) const
-	{
-		return (ns < other.ns || (ns == other.ns && name < other.name));
-	}
-};
-
-END_AS_NAMESPACE
-
-#endif
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2013-2014 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+#ifndef AS_NAMESPACE_H
+#define AS_NAMESPACE_H
+
+#include "as_string.h"
+
+BEGIN_AS_NAMESPACE
+
+struct asSNameSpace
+{
+	asCString name;
+
+	// TODO: namespace: A namespace should have access masks. The application should be
+	//                  able to restrict specific namespaces from access to specific modules
+};
+
+
+struct asSNameSpaceNamePair
+{
+	const asSNameSpace *ns;
+	asCString           name;
+
+	asSNameSpaceNamePair() : ns(0) {}
+	asSNameSpaceNamePair(const asSNameSpace *_ns, const asCString &_name) : ns(_ns), name(_name) {}
+
+	asSNameSpaceNamePair &operator=(const asSNameSpaceNamePair &other)
+	{
+		ns   = other.ns;
+		name = other.name;
+		return *this;
+	}
+
+	bool operator==(const asSNameSpaceNamePair &other) const
+	{
+		return (ns == other.ns && name == other.name);
+	}
+
+	bool operator<(const asSNameSpaceNamePair &other) const
+	{
+		return (ns < other.ns || (ns == other.ns && name < other.name));
+	}
+};
+
+END_AS_NAMESPACE
+
+#endif
+
diff --git a/Sources/AngelScript/source/as_objecttype.cpp b/Sources/AngelScript/source/as_objecttype.cpp
old mode 100755
new mode 100644
index e724e135c..626cb11b1
--- a/Sources/AngelScript/source/as_objecttype.cpp
+++ b/Sources/AngelScript/source/as_objecttype.cpp
@@ -1,686 +1,707 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_objecttype.cpp
-//
-// A class for storing object type information
-//
-
-
-#include <stdio.h>
-
-#include "as_config.h"
-#include "as_objecttype.h"
-#include "as_configgroup.h"
-#include "as_scriptengine.h"
-
-BEGIN_AS_NAMESPACE
-
-asCObjectType::asCObjectType() : asCTypeInfo()
-{
-	derivedFrom = 0;
-
-	acceptValueSubType = true;
-	acceptRefSubType   = true;
-
-#ifdef WIP_16BYTE_ALIGN
-	alignment  = 4;
-#endif
-}
-
-asCObjectType::asCObjectType(asCScriptEngine *in_engine) : asCTypeInfo(in_engine)
-{
-	derivedFrom  = 0;
-
-	acceptValueSubType = true;
-	acceptRefSubType = true;
-
-#ifdef WIP_16BYTE_ALIGN
-	alignment  = 4;
-#endif
-}
-
-// interface
-asUINT asCObjectType::GetChildFuncdefCount() const
-{
-	return childFuncDefs.GetLength();
-}
-
-// interface
-asITypeInfo *asCObjectType::GetChildFuncdef(asUINT index) const
-{
-	if (index >= childFuncDefs.GetLength())
-		return 0;
-
-	return childFuncDefs[index];
-}
-
-// internal
-void asCObjectType::DestroyInternal()
-{
-	if( engine == 0 ) return;
-
-	// Skip this for list patterns as they do not increase the references
-	if( flags & asOBJ_LIST_PATTERN )
-	{
-		// Clear the engine pointer to mark the object type as invalid
-		engine = 0;
-		return;
-	}
-
-	// Release the object types held by the templateSubTypes
-	for( asUINT subtypeIndex = 0; subtypeIndex < templateSubTypes.GetLength(); subtypeIndex++ )
-	{
-		if( templateSubTypes[subtypeIndex].GetTypeInfo() )
-			templateSubTypes[subtypeIndex].GetTypeInfo()->ReleaseInternal();
-	}
-	templateSubTypes.SetLength(0);
-
-	// Clear the child types
-	for (asUINT n = 0; n < childFuncDefs.GetLength(); n++)
-	{
-		if( childFuncDefs[n] )
-			childFuncDefs[n]->parentClass = 0;
-	}
-	childFuncDefs.SetLength(0);
-
-	if( derivedFrom )
-		derivedFrom->ReleaseInternal();
-	derivedFrom = 0;
-
-	ReleaseAllProperties();
-
-	ReleaseAllFunctions();
-
-	CleanUserData();
-
-	// Remove the type from the engine
-	if( typeId != -1 )
-		engine->RemoveFromTypeIdMap(this);
-
-	// Clear the engine pointer to mark the object type as invalid
-	engine = 0;
-}
-
-asCObjectType::~asCObjectType()
-{
-	DestroyInternal();
-}
-
-// interface
-bool asCObjectType::Implements(const asITypeInfo *objType) const
-{
-	if( this == objType )
-		return true;
-
-	for( asUINT n = 0; n < interfaces.GetLength(); n++ )
-		if( interfaces[n] == objType ) return true;
-
-	return false;
-}
-
-// interface
-bool asCObjectType::DerivesFrom(const asITypeInfo *objType) const
-{
-	if( this == objType )
-		return true;
-
-	asCObjectType *base = derivedFrom;
-	while( base )
-	{
-		if( base == objType )
-			return true;
-
-		base = base->derivedFrom;
-	}
-
-	return false;
-}
-
-// interface
-int asCObjectType::GetSubTypeId(asUINT subtypeIndex) const
-{
-	// This method is only supported for templates and template specializations
-	if( templateSubTypes.GetLength() == 0 )
-		return asERROR;
-
-	if( subtypeIndex >= templateSubTypes.GetLength() )
-		return asINVALID_ARG;
-
-	return engine->GetTypeIdFromDataType(templateSubTypes[subtypeIndex]);
-}
-
-// interface
-asITypeInfo *asCObjectType::GetSubType(asUINT subtypeIndex) const
-{
-	if( subtypeIndex >= templateSubTypes.GetLength() )
-		return 0;
-
-	return templateSubTypes[subtypeIndex].GetTypeInfo();
-}
-
-asUINT asCObjectType::GetSubTypeCount() const
-{
-	return asUINT(templateSubTypes.GetLength());
-}
-
-asUINT asCObjectType::GetInterfaceCount() const
-{
-	return asUINT(interfaces.GetLength());
-}
-
-asITypeInfo *asCObjectType::GetInterface(asUINT index) const
-{
-	return interfaces[index];
-}
-
-// internal
-bool asCObjectType::IsInterface() const
-{
-	if( (flags & asOBJ_SCRIPT_OBJECT) && size == 0 )
-		return true;
-
-	return false;
-}
-
-// interface
-asUINT asCObjectType::GetFactoryCount() const
-{
-	return (asUINT)beh.factories.GetLength();
-}
-
-// interface
-asIScriptFunction *asCObjectType::GetFactoryByIndex(asUINT index) const
-{
-	if( index >= beh.factories.GetLength() )
-		return 0;
-
-	return engine->GetFunctionById(beh.factories[index]);
-}
-
-// interface
-asIScriptFunction *asCObjectType::GetFactoryByDecl(const char *decl) const
-{
-	if( beh.factories.GetLength() == 0 )
-		return 0;
-
-	// Let the engine parse the string and find the appropriate factory function
-	return engine->GetFunctionById(engine->GetFactoryIdByDecl(this, decl));
-}
-
-// interface
-asUINT asCObjectType::GetMethodCount() const
-{
-	return (asUINT)methods.GetLength();
-}
-
-// interface
-asIScriptFunction *asCObjectType::GetMethodByIndex(asUINT index, bool getVirtual) const
-{
-	if( index >= methods.GetLength() )
-		return 0;
-
-	asCScriptFunction *func = engine->scriptFunctions[methods[index]];
-	if( !getVirtual )
-	{
-		if( func && func->funcType == asFUNC_VIRTUAL )
-			return virtualFunctionTable[func->vfTableIdx];
-	}
-
-	return func;
-}
-
-// interface
-asIScriptFunction *asCObjectType::GetMethodByName(const char *in_name, bool in_getVirtual) const
-{
-	int id = -1;
-	for( asUINT n = 0; n < methods.GetLength(); n++ )
-	{
-		if( engine->scriptFunctions[methods[n]]->name == in_name )
-		{
-			if( id == -1 )
-				id = methods[n];
-			else
-				return 0;
-		}
-	}
-
-	if( id == -1 ) return 0;
-
-	asCScriptFunction *func = engine->scriptFunctions[id];
-	if( !in_getVirtual )
-	{
-		if( func && func->funcType == asFUNC_VIRTUAL )
-			return virtualFunctionTable[func->vfTableIdx];
-	}
-
-	return func;
-}
-
-// interface
-asIScriptFunction *asCObjectType::GetMethodByDecl(const char *decl, bool getVirtual) const
-{
-	if( methods.GetLength() == 0 )
-		return 0;
-
-	// Get the module from one of the methods, but it will only be
-	// used to allow the parsing of types not already known by the object.
-	// It is possible for object types to be orphaned, e.g. by discarding 
-	// the module that created it. In this case it is still possible to 
-	// find the methods, but any type not known by the object will result in
-	// an invalid declaration.
-	asCModule *mod = engine->scriptFunctions[methods[0]]->module;
-	int id = engine->GetMethodIdByDecl(this, decl, mod);
-	if( id <= 0 )
-		return 0;
-
-	if( !getVirtual )
-	{
-		asCScriptFunction *func = engine->scriptFunctions[id];
-		if( func && func->funcType == asFUNC_VIRTUAL )
-			return virtualFunctionTable[func->vfTableIdx];
-	}
-
-	return engine->scriptFunctions[id];
-}
-
-// interface
-asUINT asCObjectType::GetPropertyCount() const
-{
-	return (asUINT)properties.GetLength();
-}
-
-// interface
-int asCObjectType::GetProperty(asUINT index, const char **out_name, int *out_typeId, bool *out_isPrivate, bool *out_isProtected, int *out_offset, bool *out_isReference, asDWORD *out_accessMask) const
-{
-	if( index >= properties.GetLength() )
-		return asINVALID_ARG;
-
-	asCObjectProperty *prop = properties[index];
-	if( out_name )
-		*out_name = prop->name.AddressOf();
-	if( out_typeId )
-		*out_typeId = engine->GetTypeIdFromDataType(prop->type);
-	if( out_isPrivate )
-		*out_isPrivate = prop->isPrivate;
-	if( out_isProtected )
-		*out_isProtected = prop->isProtected;
-	if( out_offset )
-		*out_offset = prop->byteOffset;
-	if( out_isReference )
-		*out_isReference = prop->type.IsReference();
-	if( out_accessMask )
-		*out_accessMask = prop->accessMask;
-
-	return 0;
-}
-
-// interface
-const char *asCObjectType::GetPropertyDeclaration(asUINT index, bool includeNamespace) const
-{
-	if( index >= properties.GetLength() )
-		return 0;
-
-	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	if( properties[index]->isPrivate )
-		*tempString = "private ";
-	else if( properties[index]->isProtected )
-		*tempString = "protected ";
-	else
-		*tempString = "";
-	*tempString += properties[index]->type.Format(nameSpace, includeNamespace);
-	*tempString += " ";
-	*tempString += properties[index]->name;
-
-	return tempString->AddressOf();
-}
-
-asITypeInfo *asCObjectType::GetBaseType() const
-{
-	return derivedFrom; 
-}
-
-asUINT asCObjectType::GetBehaviourCount() const
-{
-	// Count the number of behaviours (except factory functions)
-	asUINT count = 0;
-	
-	if( beh.destruct )               count++;
-	if( beh.addref )                 count++;
-	if( beh.release )                count++;
-	if( beh.gcGetRefCount )          count++;
-	if( beh.gcSetFlag )              count++;
-	if( beh.gcGetFlag )              count++;
-	if( beh.gcEnumReferences )       count++;
-	if( beh.gcReleaseAllReferences ) count++; 
-	if( beh.templateCallback )       count++;
-	if( beh.listFactory )            count++;
-	if( beh.getWeakRefFlag )         count++;
-
-	// For reference types, the factories are also stored in the constructor
-	// list, so it is sufficient to enumerate only those
-	count += (asUINT)beh.constructors.GetLength();
-
-	return count;
-}
-
-asIScriptFunction *asCObjectType::GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const
-{
-	// Find the correct behaviour
-	asUINT count = 0;
-
-	if( beh.destruct && count++ == index ) // only increase count if the behaviour is registered
-	{ 
-		if( outBehaviour ) *outBehaviour = asBEHAVE_DESTRUCT;
-		return engine->scriptFunctions[beh.destruct];
-	}
-
-	if( beh.addref && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_ADDREF;
-		return engine->scriptFunctions[beh.addref];
-	}
-
-	if( beh.release && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_RELEASE;
-		return engine->scriptFunctions[beh.release];
-	}
-
-	if( beh.gcGetRefCount && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_GETREFCOUNT;
-		return engine->scriptFunctions[beh.gcGetRefCount];
-	}
-
-	if( beh.gcSetFlag && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_SETGCFLAG;
-		return engine->scriptFunctions[beh.gcSetFlag];
-	}
-
-	if( beh.gcGetFlag && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_GETGCFLAG;
-		return engine->scriptFunctions[beh.gcGetFlag];
-	}
-
-	if( beh.gcEnumReferences && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_ENUMREFS;
-		return engine->scriptFunctions[beh.gcEnumReferences];
-	}
-
-	if( beh.gcReleaseAllReferences && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_RELEASEREFS;
-		return engine->scriptFunctions[beh.gcReleaseAllReferences];
-	}
-
-	if( beh.templateCallback && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_TEMPLATE_CALLBACK;
-		return engine->scriptFunctions[beh.templateCallback];
-	}
-
-	if( beh.listFactory && count++ == index )
-	{
-		if( outBehaviour ) 
-		{
-			if( flags & asOBJ_VALUE )
-				*outBehaviour = asBEHAVE_LIST_CONSTRUCT;
-			else
-				*outBehaviour = asBEHAVE_LIST_FACTORY;
-		}
-
-		return engine->scriptFunctions[beh.listFactory];
-	}
-
-	if( beh.getWeakRefFlag && count++ == index )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_GET_WEAKREF_FLAG;
-		return engine->scriptFunctions[beh.getWeakRefFlag];
-	}
-
-	// For reference types, the factories are also stored in the constructor
-	// list, so it is sufficient to enumerate only those
-	if( index - count < beh.constructors.GetLength() )
-	{
-		if( outBehaviour ) *outBehaviour = asBEHAVE_CONSTRUCT;
-		return engine->scriptFunctions[beh.constructors[index - count]];
-	}
-	else 
-		count += (asUINT)beh.constructors.GetLength();
-
-	return 0;
-}
-
-// internal
-asCObjectProperty *asCObjectType::AddPropertyToClass(const asCString &propName, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited)
-{
-	asASSERT( flags & asOBJ_SCRIPT_OBJECT );
-	asASSERT( dt.CanBeInstantiated() );
-	asASSERT( !IsInterface() );
-
-	// Store the properties in the object type descriptor
-	asCObjectProperty *prop = asNEW(asCObjectProperty);
-	if( prop == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-
-	prop->name        = propName;
-	prop->type        = dt;
-	prop->isPrivate   = isPrivate;
-	prop->isProtected = isProtected;
-	prop->isInherited = isInherited;
-
-	int propSize;
-	if( dt.IsObject() )
-	{
-		// Non-POD value types can't be allocated inline,
-		// because there is a risk that the script might
-		// try to access the content without knowing that
-		// it hasn't been initialized yet.
-		if( dt.GetTypeInfo()->flags & asOBJ_POD )
-			propSize = dt.GetSizeInMemoryBytes();
-		else
-		{
-			propSize = dt.GetSizeOnStackDWords()*4;
-			if( !dt.IsObjectHandle() )
-				prop->type.MakeReference(true);
-		}
-	}
-	else if (dt.IsFuncdef())
-	{
-		// Funcdefs don't have a size, as they must always be stored as handles
-		asASSERT(dt.IsObjectHandle());
-		propSize = AS_PTR_SIZE * 4;
-	}
-	else
-		propSize = dt.GetSizeInMemoryBytes();
-
-	// Add extra bytes so that the property will be properly aligned
-#ifndef WIP_16BYTE_ALIGN
-	if( propSize == 2 && (size & 1) ) size += 1;
-	if( propSize > 2 && (size & 3) ) size += 4 - (size & 3);
-#else
-	asUINT alignment = dt.GetAlignment();
-	const asUINT propSizeAlignmentDifference = size & (alignment-1);
-	if( propSizeAlignmentDifference != 0 )
-	{
-		size += (alignment - propSizeAlignmentDifference);
-	}
-
-	asASSERT((size % alignment) == 0);
-#endif
-
-	prop->byteOffset = size;
-	size += propSize;
-
-	properties.PushLast(prop);
-
-	// Make sure the struct holds a reference to the config group where the object is registered
-	asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(prop->type.GetTypeInfo());
-	if( group != 0 ) group->AddRef();
-
-	// Add reference to object types
-	asCTypeInfo *type = prop->type.GetTypeInfo();
-	if( type )
-		type->AddRefInternal();
-
-	return prop;
-}
-
-// internal
-void asCObjectType::ReleaseAllProperties()
-{
-	for( asUINT n = 0; n < properties.GetLength(); n++ )
-	{
-		if( properties[n] ) 
-		{
-			if( flags & asOBJ_SCRIPT_OBJECT )
-			{
-				// Release the config group for script classes that are being destroyed
-				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(properties[n]->type.GetTypeInfo());
-				if( group != 0 ) group->Release();
-
-				// Release references to objects types
-				asCTypeInfo *type = properties[n]->type.GetTypeInfo();
-				if( type )
-					type->ReleaseInternal();
-			}
-			else
-			{
-				// Release template instance types (ref increased by RegisterObjectProperty)
-				asCTypeInfo *type = properties[n]->type.GetTypeInfo();
-				if( type )
-					type->ReleaseInternal();
-			}
-
-			asDELETE(properties[n],asCObjectProperty);
-		}
-	}
-
-	properties.SetLength(0);
-}
-
-// internal
-void asCObjectType::ReleaseAllFunctions()
-{
-	beh.factory     = 0;
-	beh.copyfactory = 0;
-	for( asUINT a = 0; a < beh.factories.GetLength(); a++ )
-	{
-		if( engine->scriptFunctions[beh.factories[a]] ) 
-			engine->scriptFunctions[beh.factories[a]]->ReleaseInternal();
-	}
-	beh.factories.SetLength(0);
-
-	beh.construct     = 0;
-	beh.copyconstruct = 0;
-	for( asUINT b = 0; b < beh.constructors.GetLength(); b++ )
-	{
-		if( engine->scriptFunctions[beh.constructors[b]] ) 
-			engine->scriptFunctions[beh.constructors[b]]->ReleaseInternal();
-	}
-	beh.constructors.SetLength(0);
-
-	if( beh.templateCallback )
-		engine->scriptFunctions[beh.templateCallback]->ReleaseInternal();
-	beh.templateCallback = 0;
-
-	if( beh.listFactory )
-		engine->scriptFunctions[beh.listFactory]->ReleaseInternal();
-	beh.listFactory = 0;
-
-	if( beh.destruct )
-		engine->scriptFunctions[beh.destruct]->ReleaseInternal();
-	beh.destruct  = 0;
-
-	if( beh.copy )
-		engine->scriptFunctions[beh.copy]->ReleaseInternal();
-	beh.copy = 0;
-
-	for( asUINT c = 0; c < methods.GetLength(); c++ )
-	{
-		if( engine->scriptFunctions[methods[c]] ) 
-			engine->scriptFunctions[methods[c]]->ReleaseInternal();
-	}
-	methods.SetLength(0);
-
-	for( asUINT d = 0; d < virtualFunctionTable.GetLength(); d++ )
-	{
-		if( virtualFunctionTable[d] )
-			virtualFunctionTable[d]->ReleaseInternal();
-	}
-	virtualFunctionTable.SetLength(0);
-
-	// GC behaviours
-	if( beh.addref )
-		engine->scriptFunctions[beh.addref]->ReleaseInternal();
-	beh.addref = 0;
-
-	if( beh.release )
-		engine->scriptFunctions[beh.release]->ReleaseInternal();
-	beh.release = 0;
-
-	if( beh.gcEnumReferences )
-		engine->scriptFunctions[beh.gcEnumReferences]->ReleaseInternal();
-	beh.gcEnumReferences = 0;
-
-	if( beh.gcGetFlag )
-		engine->scriptFunctions[beh.gcGetFlag]->ReleaseInternal();
-	beh.gcGetFlag = 0;
-
-	if( beh.gcGetRefCount )
-		engine->scriptFunctions[beh.gcGetRefCount]->ReleaseInternal();
-	beh.gcGetRefCount = 0;
-
-	if( beh.gcReleaseAllReferences )
-		engine->scriptFunctions[beh.gcReleaseAllReferences]->ReleaseInternal();
-	beh.gcReleaseAllReferences = 0;
-
-	if( beh.gcSetFlag )
-		engine->scriptFunctions[beh.gcSetFlag]->ReleaseInternal();
-	beh.gcSetFlag = 0;
-
-	if ( beh.getWeakRefFlag )
-		engine->scriptFunctions[beh.getWeakRefFlag]->ReleaseInternal();
-	beh.getWeakRefFlag = 0;
-}
-
-END_AS_NAMESPACE
-
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2017 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_objecttype.cpp
+//
+// A class for storing object type information
+//
+
+
+#include <stdio.h>
+
+#include "as_config.h"
+#include "as_objecttype.h"
+#include "as_configgroup.h"
+#include "as_scriptengine.h"
+
+BEGIN_AS_NAMESPACE
+
+asCObjectType::asCObjectType() : asCTypeInfo()
+{
+	derivedFrom = 0;
+
+	acceptValueSubType = true;
+	acceptRefSubType   = true;
+
+#ifdef WIP_16BYTE_ALIGN
+	alignment  = 4;
+#endif
+}
+
+asCObjectType::asCObjectType(asCScriptEngine *in_engine) : asCTypeInfo(in_engine)
+{
+	derivedFrom  = 0;
+
+	acceptValueSubType = true;
+	acceptRefSubType = true;
+
+#ifdef WIP_16BYTE_ALIGN
+	alignment  = 4;
+#endif
+}
+
+// interface
+asUINT asCObjectType::GetChildFuncdefCount() const
+{
+	return childFuncDefs.GetLength();
+}
+
+// interface
+asITypeInfo *asCObjectType::GetChildFuncdef(asUINT index) const
+{
+	if (index >= childFuncDefs.GetLength())
+		return 0;
+
+	return childFuncDefs[index];
+}
+
+// internal
+void asCObjectType::DestroyInternal()
+{
+	if( engine == 0 ) return;
+
+	// Skip this for list patterns as they do not increase the references
+	if( flags & asOBJ_LIST_PATTERN )
+	{
+		// Clear the engine pointer to mark the object type as invalid
+		engine = 0;
+		return;
+	}
+
+	// Release the object types held by the templateSubTypes
+	bool isTemplateInstance = templateSubTypes.GetLength() > 0;
+	for( asUINT subtypeIndex = 0; subtypeIndex < templateSubTypes.GetLength(); subtypeIndex++ )
+	{
+		if( templateSubTypes[subtypeIndex].GetTypeInfo() )
+			templateSubTypes[subtypeIndex].GetTypeInfo()->ReleaseInternal();
+	}
+	templateSubTypes.SetLength(0);
+
+	// Clear the child types
+	for (asUINT n = 0; n < childFuncDefs.GetLength(); n++)
+	{
+		asCFuncdefType *func = childFuncDefs[n];
+		if (func)
+		{
+			func->parentClass = 0;
+			if (isTemplateInstance)
+			{
+				// Any child funcdefs that have been created as part of the template 
+				// instantiation must be destroyed too
+				// TODO: Before destroying the funcdef, make sure no external references to it is held
+				if (func->externalRefCount.get() == 0)
+				{
+					func->DestroyInternal();
+					engine->RemoveFuncdef(func);
+					func->module = 0;
+					func->ReleaseInternal();
+				}
+			}
+		}
+	}
+	childFuncDefs.SetLength(0);
+
+	if( derivedFrom )
+		derivedFrom->ReleaseInternal();
+	derivedFrom = 0;
+
+	ReleaseAllProperties();
+
+	ReleaseAllFunctions();
+
+	CleanUserData();
+
+	// Remove the type from the engine
+	if( typeId != -1 )
+		engine->RemoveFromTypeIdMap(this);
+
+	// Clear the engine pointer to mark the object type as invalid
+	engine = 0;
+}
+
+asCObjectType::~asCObjectType()
+{
+	DestroyInternal();
+}
+
+// interface
+bool asCObjectType::Implements(const asITypeInfo *objType) const
+{
+	if( this == objType )
+		return true;
+
+	for( asUINT n = 0; n < interfaces.GetLength(); n++ )
+		if( interfaces[n] == objType ) return true;
+
+	return false;
+}
+
+// interface
+bool asCObjectType::DerivesFrom(const asITypeInfo *objType) const
+{
+	if( this == objType )
+		return true;
+
+	asCObjectType *base = derivedFrom;
+	while( base )
+	{
+		if( base == objType )
+			return true;
+
+		base = base->derivedFrom;
+	}
+
+	return false;
+}
+
+// interface
+int asCObjectType::GetSubTypeId(asUINT subtypeIndex) const
+{
+	// This method is only supported for templates and template specializations
+	if( templateSubTypes.GetLength() == 0 )
+		return asERROR;
+
+	if( subtypeIndex >= templateSubTypes.GetLength() )
+		return asINVALID_ARG;
+
+	return engine->GetTypeIdFromDataType(templateSubTypes[subtypeIndex]);
+}
+
+// interface
+asITypeInfo *asCObjectType::GetSubType(asUINT subtypeIndex) const
+{
+	if( subtypeIndex >= templateSubTypes.GetLength() )
+		return 0;
+
+	return templateSubTypes[subtypeIndex].GetTypeInfo();
+}
+
+asUINT asCObjectType::GetSubTypeCount() const
+{
+	return asUINT(templateSubTypes.GetLength());
+}
+
+asUINT asCObjectType::GetInterfaceCount() const
+{
+	return asUINT(interfaces.GetLength());
+}
+
+asITypeInfo *asCObjectType::GetInterface(asUINT index) const
+{
+	return interfaces[index];
+}
+
+// internal
+bool asCObjectType::IsInterface() const
+{
+	if( (flags & asOBJ_SCRIPT_OBJECT) && size == 0 )
+		return true;
+
+	return false;
+}
+
+// interface
+asUINT asCObjectType::GetFactoryCount() const
+{
+	return (asUINT)beh.factories.GetLength();
+}
+
+// interface
+asIScriptFunction *asCObjectType::GetFactoryByIndex(asUINT index) const
+{
+	if( index >= beh.factories.GetLength() )
+		return 0;
+
+	return engine->GetFunctionById(beh.factories[index]);
+}
+
+// interface
+asIScriptFunction *asCObjectType::GetFactoryByDecl(const char *decl) const
+{
+	if( beh.factories.GetLength() == 0 )
+		return 0;
+
+	// Let the engine parse the string and find the appropriate factory function
+	return engine->GetFunctionById(engine->GetFactoryIdByDecl(this, decl));
+}
+
+// interface
+asUINT asCObjectType::GetMethodCount() const
+{
+	return (asUINT)methods.GetLength();
+}
+
+// interface
+asIScriptFunction *asCObjectType::GetMethodByIndex(asUINT index, bool getVirtual) const
+{
+	if( index >= methods.GetLength() )
+		return 0;
+
+	asCScriptFunction *func = engine->scriptFunctions[methods[index]];
+	if( !getVirtual )
+	{
+		if( func && func->funcType == asFUNC_VIRTUAL )
+			return virtualFunctionTable[func->vfTableIdx];
+	}
+
+	return func;
+}
+
+// interface
+asIScriptFunction *asCObjectType::GetMethodByName(const char *in_name, bool in_getVirtual) const
+{
+	int id = -1;
+	for( asUINT n = 0; n < methods.GetLength(); n++ )
+	{
+		if( engine->scriptFunctions[methods[n]]->name == in_name )
+		{
+			if( id == -1 )
+				id = methods[n];
+			else
+				return 0;
+		}
+	}
+
+	if( id == -1 ) return 0;
+
+	asCScriptFunction *func = engine->scriptFunctions[id];
+	if( !in_getVirtual )
+	{
+		if( func && func->funcType == asFUNC_VIRTUAL )
+			return virtualFunctionTable[func->vfTableIdx];
+	}
+
+	return func;
+}
+
+// interface
+asIScriptFunction *asCObjectType::GetMethodByDecl(const char *decl, bool getVirtual) const
+{
+	if( methods.GetLength() == 0 )
+		return 0;
+
+	// Get the module from one of the methods, but it will only be
+	// used to allow the parsing of types not already known by the object.
+	// It is possible for object types to be orphaned, e.g. by discarding 
+	// the module that created it. In this case it is still possible to 
+	// find the methods, but any type not known by the object will result in
+	// an invalid declaration.
+	asCModule *mod = engine->scriptFunctions[methods[0]]->module;
+	int id = engine->GetMethodIdByDecl(this, decl, mod);
+	if( id <= 0 )
+		return 0;
+
+	if( !getVirtual )
+	{
+		asCScriptFunction *func = engine->scriptFunctions[id];
+		if( func && func->funcType == asFUNC_VIRTUAL )
+			return virtualFunctionTable[func->vfTableIdx];
+	}
+
+	return engine->scriptFunctions[id];
+}
+
+// interface
+asUINT asCObjectType::GetPropertyCount() const
+{
+	return (asUINT)properties.GetLength();
+}
+
+// interface
+int asCObjectType::GetProperty(asUINT index, const char **out_name, int *out_typeId, bool *out_isPrivate, bool *out_isProtected, int *out_offset, bool *out_isReference, asDWORD *out_accessMask, int *out_compositeOffset, bool *out_isCompositeIndirect) const
+{
+	if( index >= properties.GetLength() )
+		return asINVALID_ARG;
+
+	asCObjectProperty *prop = properties[index];
+	if( out_name )
+		*out_name = prop->name.AddressOf();
+	if( out_typeId )
+		*out_typeId = engine->GetTypeIdFromDataType(prop->type);
+	if( out_isPrivate )
+		*out_isPrivate = prop->isPrivate;
+	if( out_isProtected )
+		*out_isProtected = prop->isProtected;
+	if( out_offset )
+		*out_offset = prop->byteOffset;
+	if( out_isReference )
+		*out_isReference = prop->type.IsReference();
+	if( out_accessMask )
+		*out_accessMask = prop->accessMask;
+	if (out_compositeOffset)
+		*out_compositeOffset = prop->compositeOffset;
+	if (out_isCompositeIndirect)
+		*out_isCompositeIndirect = prop->isCompositeIndirect;
+
+	return 0;
+}
+
+// interface
+const char *asCObjectType::GetPropertyDeclaration(asUINT index, bool includeNamespace) const
+{
+	if( index >= properties.GetLength() )
+		return 0;
+
+	asCString *tempString = &asCThreadManager::GetLocalData()->string;
+	if( properties[index]->isPrivate )
+		*tempString = "private ";
+	else if( properties[index]->isProtected )
+		*tempString = "protected ";
+	else
+		*tempString = "";
+	*tempString += properties[index]->type.Format(nameSpace, includeNamespace);
+	*tempString += " ";
+	*tempString += properties[index]->name;
+
+	return tempString->AddressOf();
+}
+
+asITypeInfo *asCObjectType::GetBaseType() const
+{
+	return derivedFrom; 
+}
+
+asUINT asCObjectType::GetBehaviourCount() const
+{
+	// Count the number of behaviours (except factory functions)
+	asUINT count = 0;
+	
+	if( beh.destruct )               count++;
+	if( beh.addref )                 count++;
+	if( beh.release )                count++;
+	if( beh.gcGetRefCount )          count++;
+	if( beh.gcSetFlag )              count++;
+	if( beh.gcGetFlag )              count++;
+	if( beh.gcEnumReferences )       count++;
+	if( beh.gcReleaseAllReferences ) count++; 
+	if( beh.templateCallback )       count++;
+	if( beh.listFactory )            count++;
+	if( beh.getWeakRefFlag )         count++;
+
+	// For reference types, the factories are also stored in the constructor
+	// list, so it is sufficient to enumerate only those
+	count += (asUINT)beh.constructors.GetLength();
+
+	return count;
+}
+
+asIScriptFunction *asCObjectType::GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const
+{
+	// Find the correct behaviour
+	asUINT count = 0;
+
+	if( beh.destruct && count++ == index ) // only increase count if the behaviour is registered
+	{ 
+		if( outBehaviour ) *outBehaviour = asBEHAVE_DESTRUCT;
+		return engine->scriptFunctions[beh.destruct];
+	}
+
+	if( beh.addref && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_ADDREF;
+		return engine->scriptFunctions[beh.addref];
+	}
+
+	if( beh.release && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_RELEASE;
+		return engine->scriptFunctions[beh.release];
+	}
+
+	if( beh.gcGetRefCount && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_GETREFCOUNT;
+		return engine->scriptFunctions[beh.gcGetRefCount];
+	}
+
+	if( beh.gcSetFlag && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_SETGCFLAG;
+		return engine->scriptFunctions[beh.gcSetFlag];
+	}
+
+	if( beh.gcGetFlag && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_GETGCFLAG;
+		return engine->scriptFunctions[beh.gcGetFlag];
+	}
+
+	if( beh.gcEnumReferences && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_ENUMREFS;
+		return engine->scriptFunctions[beh.gcEnumReferences];
+	}
+
+	if( beh.gcReleaseAllReferences && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_RELEASEREFS;
+		return engine->scriptFunctions[beh.gcReleaseAllReferences];
+	}
+
+	if( beh.templateCallback && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_TEMPLATE_CALLBACK;
+		return engine->scriptFunctions[beh.templateCallback];
+	}
+
+	if( beh.listFactory && count++ == index )
+	{
+		if( outBehaviour ) 
+		{
+			if( flags & asOBJ_VALUE )
+				*outBehaviour = asBEHAVE_LIST_CONSTRUCT;
+			else
+				*outBehaviour = asBEHAVE_LIST_FACTORY;
+		}
+
+		return engine->scriptFunctions[beh.listFactory];
+	}
+
+	if( beh.getWeakRefFlag && count++ == index )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_GET_WEAKREF_FLAG;
+		return engine->scriptFunctions[beh.getWeakRefFlag];
+	}
+
+	// For reference types, the factories are also stored in the constructor
+	// list, so it is sufficient to enumerate only those
+	if( index - count < beh.constructors.GetLength() )
+	{
+		if( outBehaviour ) *outBehaviour = asBEHAVE_CONSTRUCT;
+		return engine->scriptFunctions[beh.constructors[index - count]];
+	}
+	else 
+		count += (asUINT)beh.constructors.GetLength();
+
+	return 0;
+}
+
+// internal
+asCObjectProperty *asCObjectType::AddPropertyToClass(const asCString &propName, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited)
+{
+	asASSERT( flags & asOBJ_SCRIPT_OBJECT );
+	asASSERT( dt.CanBeInstantiated() );
+	asASSERT( !IsInterface() );
+
+	// Store the properties in the object type descriptor
+	asCObjectProperty *prop = asNEW(asCObjectProperty);
+	if( prop == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+
+	prop->name        = propName;
+	prop->type        = dt;
+	prop->isPrivate   = isPrivate;
+	prop->isProtected = isProtected;
+	prop->isInherited = isInherited;
+
+	int propSize;
+	if( dt.IsObject() )
+	{
+		// Non-POD value types can't be allocated inline,
+		// because there is a risk that the script might
+		// try to access the content without knowing that
+		// it hasn't been initialized yet.
+		if( dt.GetTypeInfo()->flags & asOBJ_POD )
+			propSize = dt.GetSizeInMemoryBytes();
+		else
+		{
+			propSize = dt.GetSizeOnStackDWords()*4;
+			if( !dt.IsObjectHandle() )
+				prop->type.MakeReference(true);
+		}
+	}
+	else if (dt.IsFuncdef())
+	{
+		// Funcdefs don't have a size, as they must always be stored as handles
+		asASSERT(dt.IsObjectHandle());
+		propSize = AS_PTR_SIZE * 4;
+	}
+	else
+		propSize = dt.GetSizeInMemoryBytes();
+
+	// Add extra bytes so that the property will be properly aligned
+#ifndef WIP_16BYTE_ALIGN
+	if( propSize == 2 && (size & 1) ) size += 1;
+	if( propSize > 2 && (size & 3) ) size += 4 - (size & 3);
+#else
+	asUINT alignment = dt.GetAlignment();
+	const asUINT propSizeAlignmentDifference = size & (alignment-1);
+	if( propSizeAlignmentDifference != 0 )
+	{
+		size += (alignment - propSizeAlignmentDifference);
+	}
+
+	asASSERT((size % alignment) == 0);
+#endif
+
+	prop->byteOffset = size;
+	size += propSize;
+
+	properties.PushLast(prop);
+
+	// Make sure the struct holds a reference to the config group where the object is registered
+	asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(prop->type.GetTypeInfo());
+	if( group != 0 ) group->AddRef();
+
+	// Add reference to object types
+	asCTypeInfo *type = prop->type.GetTypeInfo();
+	if( type )
+		type->AddRefInternal();
+
+	return prop;
+}
+
+// internal
+void asCObjectType::ReleaseAllProperties()
+{
+	for( asUINT n = 0; n < properties.GetLength(); n++ )
+	{
+		if( properties[n] ) 
+		{
+			if( flags & asOBJ_SCRIPT_OBJECT )
+			{
+				// Release the config group for script classes that are being destroyed
+				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(properties[n]->type.GetTypeInfo());
+				if( group != 0 ) group->Release();
+
+				// Release references to objects types
+				asCTypeInfo *type = properties[n]->type.GetTypeInfo();
+				if( type )
+					type->ReleaseInternal();
+			}
+			else
+			{
+				// Release template instance types (ref increased by RegisterObjectProperty)
+				asCTypeInfo *type = properties[n]->type.GetTypeInfo();
+				if( type )
+					type->ReleaseInternal();
+			}
+
+			asDELETE(properties[n],asCObjectProperty);
+		}
+	}
+
+	properties.SetLength(0);
+}
+
+// internal
+void asCObjectType::ReleaseAllFunctions()
+{
+	beh.factory     = 0;
+	beh.copyfactory = 0;
+	for( asUINT a = 0; a < beh.factories.GetLength(); a++ )
+	{
+		if( engine->scriptFunctions[beh.factories[a]] ) 
+			engine->scriptFunctions[beh.factories[a]]->ReleaseInternal();
+	}
+	beh.factories.SetLength(0);
+
+	beh.construct     = 0;
+	beh.copyconstruct = 0;
+	for( asUINT b = 0; b < beh.constructors.GetLength(); b++ )
+	{
+		if( engine->scriptFunctions[beh.constructors[b]] ) 
+			engine->scriptFunctions[beh.constructors[b]]->ReleaseInternal();
+	}
+	beh.constructors.SetLength(0);
+
+	if( beh.templateCallback )
+		engine->scriptFunctions[beh.templateCallback]->ReleaseInternal();
+	beh.templateCallback = 0;
+
+	if( beh.listFactory )
+		engine->scriptFunctions[beh.listFactory]->ReleaseInternal();
+	beh.listFactory = 0;
+
+	if( beh.destruct )
+		engine->scriptFunctions[beh.destruct]->ReleaseInternal();
+	beh.destruct  = 0;
+
+	if( beh.copy )
+		engine->scriptFunctions[beh.copy]->ReleaseInternal();
+	beh.copy = 0;
+
+	for( asUINT c = 0; c < methods.GetLength(); c++ )
+	{
+		if( engine->scriptFunctions[methods[c]] ) 
+			engine->scriptFunctions[methods[c]]->ReleaseInternal();
+	}
+	methods.SetLength(0);
+
+	for( asUINT d = 0; d < virtualFunctionTable.GetLength(); d++ )
+	{
+		if( virtualFunctionTable[d] )
+			virtualFunctionTable[d]->ReleaseInternal();
+	}
+	virtualFunctionTable.SetLength(0);
+
+	// GC behaviours
+	if( beh.addref )
+		engine->scriptFunctions[beh.addref]->ReleaseInternal();
+	beh.addref = 0;
+
+	if( beh.release )
+		engine->scriptFunctions[beh.release]->ReleaseInternal();
+	beh.release = 0;
+
+	if( beh.gcEnumReferences )
+		engine->scriptFunctions[beh.gcEnumReferences]->ReleaseInternal();
+	beh.gcEnumReferences = 0;
+
+	if( beh.gcGetFlag )
+		engine->scriptFunctions[beh.gcGetFlag]->ReleaseInternal();
+	beh.gcGetFlag = 0;
+
+	if( beh.gcGetRefCount )
+		engine->scriptFunctions[beh.gcGetRefCount]->ReleaseInternal();
+	beh.gcGetRefCount = 0;
+
+	if( beh.gcReleaseAllReferences )
+		engine->scriptFunctions[beh.gcReleaseAllReferences]->ReleaseInternal();
+	beh.gcReleaseAllReferences = 0;
+
+	if( beh.gcSetFlag )
+		engine->scriptFunctions[beh.gcSetFlag]->ReleaseInternal();
+	beh.gcSetFlag = 0;
+
+	if ( beh.getWeakRefFlag )
+		engine->scriptFunctions[beh.getWeakRefFlag]->ReleaseInternal();
+	beh.getWeakRefFlag = 0;
+}
+
+END_AS_NAMESPACE
+
+
+
diff --git a/Sources/AngelScript/source/as_objecttype.h b/Sources/AngelScript/source/as_objecttype.h
old mode 100755
new mode 100644
index ce9d2d232..4b7bd5d0f
--- a/Sources/AngelScript/source/as_objecttype.h
+++ b/Sources/AngelScript/source/as_objecttype.h
@@ -1,171 +1,171 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_objecttype.h
-//
-// A class for storing object type information
-//
-
-
-
-#ifndef AS_OBJECTTYPE_H
-#define AS_OBJECTTYPE_H
-
-#include "as_property.h"
-#include "as_array.h"
-#include "as_scriptfunction.h"
-#include "as_typeinfo.h"
-
-BEGIN_AS_NAMESPACE
-
-struct asSTypeBehaviour
-{
-	asSTypeBehaviour() 
-	{
-		factory = 0;
-		listFactory = 0;
-		copyfactory = 0;
-		construct = 0; 
-		copyconstruct = 0;
-		destruct = 0; 
-		copy = 0; 
-		addref = 0; 
-		release = 0; 
-		gcGetRefCount = 0; 
-		gcSetFlag = 0; 
-		gcGetFlag = 0; 
-		gcEnumReferences = 0; 
-		gcReleaseAllReferences = 0;
-		templateCallback = 0;
-		getWeakRefFlag = 0;
-	}
-
-	int factory;
-	int listFactory; // Used for initialization lists only
-	int copyfactory;
-	int construct;
-	int copyconstruct;
-	int destruct;
-	int copy;
-	int addref;
-	int release;
-	int templateCallback;
-
-	// GC behaviours
-	int gcGetRefCount;
-	int gcSetFlag;
-	int gcGetFlag;
-	int gcEnumReferences;
-	int gcReleaseAllReferences;
-
-	// Weakref behaviours
-	int getWeakRefFlag;
-
-	asCArray<int> factories;
-	asCArray<int> constructors;
-};
-
-class asCScriptEngine;
-struct asSNameSpace;
-
-class asCObjectType : public asCTypeInfo
-{
-public:
-	asITypeInfo       *GetBaseType() const;
-	bool               DerivesFrom(const asITypeInfo *objType) const;
-	int                GetSubTypeId(asUINT subtypeIndex = 0) const;
-	asITypeInfo       *GetSubType(asUINT subtypeIndex = 0) const;
-	asUINT             GetSubTypeCount() const;
-	asUINT             GetInterfaceCount() const;
-	asITypeInfo       *GetInterface(asUINT index) const;
-	bool               Implements(const asITypeInfo *objType) const;
-	asUINT             GetFactoryCount() const;
-	asIScriptFunction *GetFactoryByIndex(asUINT index) const;
-	asIScriptFunction *GetFactoryByDecl(const char *decl) const;
-	asUINT             GetMethodCount() const;
-	asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual) const;
-	asIScriptFunction *GetMethodByName(const char *name, bool getVirtual) const;
-	asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual) const;
-	asUINT             GetPropertyCount() const;
-	int                GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, bool *isProtected, int *offset, bool *isReference, asDWORD *accessMask) const;
-	const char        *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const;
-	asUINT             GetBehaviourCount() const;
-	asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const;
-	asUINT             GetChildFuncdefCount() const;
-	asITypeInfo       *GetChildFuncdef(asUINT index) const;
-
-public:
-	asCObjectType(asCScriptEngine *engine);
-	~asCObjectType();
-	void DestroyInternal();
-
-	void ReleaseAllFunctions();
-
-	bool IsInterface() const;
-
-	asCObjectProperty *AddPropertyToClass(const asCString &name, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited);
-	void ReleaseAllProperties();
-
-#ifdef WIP_16BYTE_ALIGN
-	int                          alignment;
-#endif
-	asCArray<asCObjectProperty*> properties;
-	asCArray<int>                methods;
-
-	// TODO: These are not used by template types. Should perhaps create a derived class to save memory on ordinary object types
-	asCArray<asCObjectType*>     interfaces;
-	asCArray<asUINT>             interfaceVFTOffsets;
-	asCObjectType *              derivedFrom;
-	asCArray<asCScriptFunction*> virtualFunctionTable;
-
-	// Used for funcdefs declared as members of class.
-	// TODO: child funcdef: Should be possible to enumerate these from application
-	asCArray<asCFuncdefType*> childFuncDefs;
-
-	asSTypeBehaviour beh;
-
-	// Used for template types
-	asCArray<asCDataType> templateSubTypes;   // increases refCount for typeinfo held in datatype
-	bool                  acceptValueSubType;
-	bool                  acceptRefSubType;
-
-protected:
-	friend class asCScriptEngine;
-	friend class asCConfigGroup;
-	friend class asCModule;
-	asCObjectType();
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2017 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_objecttype.h
+//
+// A class for storing object type information
+//
+
+
+
+#ifndef AS_OBJECTTYPE_H
+#define AS_OBJECTTYPE_H
+
+#include "as_property.h"
+#include "as_array.h"
+#include "as_scriptfunction.h"
+#include "as_typeinfo.h"
+
+BEGIN_AS_NAMESPACE
+
+struct asSTypeBehaviour
+{
+	asSTypeBehaviour() 
+	{
+		factory = 0;
+		listFactory = 0;
+		copyfactory = 0;
+		construct = 0; 
+		copyconstruct = 0;
+		destruct = 0; 
+		copy = 0; 
+		addref = 0; 
+		release = 0; 
+		gcGetRefCount = 0; 
+		gcSetFlag = 0; 
+		gcGetFlag = 0; 
+		gcEnumReferences = 0; 
+		gcReleaseAllReferences = 0;
+		templateCallback = 0;
+		getWeakRefFlag = 0;
+	}
+
+	int factory;
+	int listFactory; // Used for initialization lists only
+	int copyfactory;
+	int construct;
+	int copyconstruct;
+	int destruct;
+	int copy;
+	int addref;
+	int release;
+	int templateCallback;
+
+	// GC behaviours
+	int gcGetRefCount;
+	int gcSetFlag;
+	int gcGetFlag;
+	int gcEnumReferences;
+	int gcReleaseAllReferences;
+
+	// Weakref behaviours
+	int getWeakRefFlag;
+
+	asCArray<int> factories;
+	asCArray<int> constructors;
+};
+
+class asCScriptEngine;
+struct asSNameSpace;
+
+class asCObjectType : public asCTypeInfo
+{
+public:
+	asITypeInfo       *GetBaseType() const;
+	bool               DerivesFrom(const asITypeInfo *objType) const;
+	int                GetSubTypeId(asUINT subtypeIndex = 0) const;
+	asITypeInfo       *GetSubType(asUINT subtypeIndex = 0) const;
+	asUINT             GetSubTypeCount() const;
+	asUINT             GetInterfaceCount() const;
+	asITypeInfo       *GetInterface(asUINT index) const;
+	bool               Implements(const asITypeInfo *objType) const;
+	asUINT             GetFactoryCount() const;
+	asIScriptFunction *GetFactoryByIndex(asUINT index) const;
+	asIScriptFunction *GetFactoryByDecl(const char *decl) const;
+	asUINT             GetMethodCount() const;
+	asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual) const;
+	asIScriptFunction *GetMethodByName(const char *name, bool getVirtual) const;
+	asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual) const;
+	asUINT             GetPropertyCount() const;
+	int                GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, bool *isProtected, int *offset, bool *isReference, asDWORD *accessMask, int *compositeOffset, bool *isCompositeIndirect) const;
+	const char        *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const;
+	asUINT             GetBehaviourCount() const;
+	asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const;
+	asUINT             GetChildFuncdefCount() const;
+	asITypeInfo       *GetChildFuncdef(asUINT index) const;
+
+public:
+	asCObjectType(asCScriptEngine *engine);
+	~asCObjectType();
+	void DestroyInternal();
+
+	void ReleaseAllFunctions();
+
+	bool IsInterface() const;
+
+	asCObjectProperty *AddPropertyToClass(const asCString &name, const asCDataType &dt, bool isPrivate, bool isProtected, bool isInherited);
+	void ReleaseAllProperties();
+
+#ifdef WIP_16BYTE_ALIGN
+	int                          alignment;
+#endif
+	asCArray<asCObjectProperty*> properties;
+	asCArray<int>                methods;
+
+	// TODO: These are not used by template types. Should perhaps create a derived class to save memory on ordinary object types
+	asCArray<asCObjectType*>     interfaces;
+	asCArray<asUINT>             interfaceVFTOffsets;
+	asCObjectType *              derivedFrom;
+	asCArray<asCScriptFunction*> virtualFunctionTable;
+
+	// Used for funcdefs declared as members of class.
+	// TODO: child funcdef: Should be possible to enumerate these from application
+	asCArray<asCFuncdefType*> childFuncDefs;
+
+	asSTypeBehaviour beh;
+
+	// Used for template types
+	asCArray<asCDataType> templateSubTypes;   // increases refCount for typeinfo held in datatype
+	bool                  acceptValueSubType;
+	bool                  acceptRefSubType;
+
+protected:
+	friend class asCScriptEngine;
+	friend class asCConfigGroup;
+	friend class asCModule;
+	asCObjectType();
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_outputbuffer.cpp b/Sources/AngelScript/source/as_outputbuffer.cpp
old mode 100755
new mode 100644
index a5e09fbf7..433f820f6
--- a/Sources/AngelScript/source/as_outputbuffer.cpp
+++ b/Sources/AngelScript/source/as_outputbuffer.cpp
@@ -1,109 +1,109 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_outputbuffer.cpp
-//
-// This class appends strings to one large buffer that can later
-// be sent to the real output stream
-//
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_outputbuffer.h"
-#include "as_scriptengine.h"
-
-BEGIN_AS_NAMESPACE
-
-asCOutputBuffer::~asCOutputBuffer()
-{
-	Clear();
-}
-
-void asCOutputBuffer::Clear()
-{
-	for( asUINT n = 0; n < messages.GetLength(); n++ )
-	{
-		if( messages[n] ) 
-		{
-			asDELETE(messages[n],message_t);
-		}
-	}
-	messages.SetLength(0);
-}
-
-void asCOutputBuffer::Callback(asSMessageInfo *msg)
-{
-	message_t *msgInfo = asNEW(message_t);
-	if( msgInfo == 0 )
-		return;
-
-	msgInfo->section = msg->section;
-	msgInfo->row = msg->row;
-	msgInfo->col = msg->col;
-	msgInfo->type = msg->type;
-	msgInfo->msg = msg->message;
-
-	messages.PushLast(msgInfo);
-}
-
-void asCOutputBuffer::Append(asCOutputBuffer &in)
-{
-	for( asUINT n = 0; n < in.messages.GetLength(); n++ )
-		messages.PushLast(in.messages[n]);
-	in.messages.SetLength(0);
-}
-
-void asCOutputBuffer::SendToCallback(asCScriptEngine *engine, asSSystemFunctionInterface *func, void *obj)
-{
-	for( asUINT n = 0; n < messages.GetLength(); n++ )
-	{
-		asSMessageInfo msg;
-		msg.section = messages[n]->section.AddressOf();
-		msg.row     = messages[n]->row;
-		msg.col     = messages[n]->col;
-		msg.type    = messages[n]->type;
-		msg.message = messages[n]->msg.AddressOf();
-
-		if( func->callConv < ICC_THISCALL )
-			engine->CallGlobalFunction(&msg, obj, func, 0);
-		else
-			engine->CallObjectMethod(obj, &msg, func, 0);
-	}
-	Clear();
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2012 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_outputbuffer.cpp
+//
+// This class appends strings to one large buffer that can later
+// be sent to the real output stream
+//
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_outputbuffer.h"
+#include "as_scriptengine.h"
+
+BEGIN_AS_NAMESPACE
+
+asCOutputBuffer::~asCOutputBuffer()
+{
+	Clear();
+}
+
+void asCOutputBuffer::Clear()
+{
+	for( asUINT n = 0; n < messages.GetLength(); n++ )
+	{
+		if( messages[n] ) 
+		{
+			asDELETE(messages[n],message_t);
+		}
+	}
+	messages.SetLength(0);
+}
+
+void asCOutputBuffer::Callback(asSMessageInfo *msg)
+{
+	message_t *msgInfo = asNEW(message_t);
+	if( msgInfo == 0 )
+		return;
+
+	msgInfo->section = msg->section;
+	msgInfo->row = msg->row;
+	msgInfo->col = msg->col;
+	msgInfo->type = msg->type;
+	msgInfo->msg = msg->message;
+
+	messages.PushLast(msgInfo);
+}
+
+void asCOutputBuffer::Append(asCOutputBuffer &in)
+{
+	for( asUINT n = 0; n < in.messages.GetLength(); n++ )
+		messages.PushLast(in.messages[n]);
+	in.messages.SetLength(0);
+}
+
+void asCOutputBuffer::SendToCallback(asCScriptEngine *engine, asSSystemFunctionInterface *func, void *obj)
+{
+	for( asUINT n = 0; n < messages.GetLength(); n++ )
+	{
+		asSMessageInfo msg;
+		msg.section = messages[n]->section.AddressOf();
+		msg.row     = messages[n]->row;
+		msg.col     = messages[n]->col;
+		msg.type    = messages[n]->type;
+		msg.message = messages[n]->msg.AddressOf();
+
+		if( func->callConv < ICC_THISCALL )
+			engine->CallGlobalFunction(&msg, obj, func, 0);
+		else
+			engine->CallObjectMethod(obj, &msg, func, 0);
+	}
+	Clear();
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
diff --git a/Sources/AngelScript/source/as_outputbuffer.h b/Sources/AngelScript/source/as_outputbuffer.h
old mode 100755
new mode 100644
index 0e00f488d..500b16252
--- a/Sources/AngelScript/source/as_outputbuffer.h
+++ b/Sources/AngelScript/source/as_outputbuffer.h
@@ -1,80 +1,80 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_outputbuffer.h
-//
-// This class appends strings to one large buffer that can later
-// be sent to the real output stream
-//
-
-
-#ifndef AS_OUTPUTBUFFER_H
-#define AS_OUTPUTBUFFER_H
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_string.h"
-#include "as_array.h"
-
-BEGIN_AS_NAMESPACE
-
-struct asSSystemFunctionInterface;
-class asCScriptEngine;
-
-class asCOutputBuffer
-{
-public:
-	~asCOutputBuffer ();
-	void Clear();
-	void Callback(asSMessageInfo *msg);
-	void Append(asCOutputBuffer &in);
-	void SendToCallback(asCScriptEngine *engine, asSSystemFunctionInterface *func, void *obj);
-
-	struct message_t
-	{
-		asCString section;
-		int row;
-		int col;
-		asEMsgType type;
-		asCString msg;
-	};
-
-	asCArray<message_t*> messages;
-};
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2012 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_outputbuffer.h
+//
+// This class appends strings to one large buffer that can later
+// be sent to the real output stream
+//
+
+
+#ifndef AS_OUTPUTBUFFER_H
+#define AS_OUTPUTBUFFER_H
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_string.h"
+#include "as_array.h"
+
+BEGIN_AS_NAMESPACE
+
+struct asSSystemFunctionInterface;
+class asCScriptEngine;
+
+class asCOutputBuffer
+{
+public:
+	~asCOutputBuffer ();
+	void Clear();
+	void Callback(asSMessageInfo *msg);
+	void Append(asCOutputBuffer &in);
+	void SendToCallback(asCScriptEngine *engine, asSSystemFunctionInterface *func, void *obj);
+
+	struct message_t
+	{
+		asCString section;
+		int row;
+		int col;
+		asEMsgType type;
+		asCString msg;
+	};
+
+	asCArray<message_t*> messages;
+};
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
+#endif
diff --git a/Sources/AngelScript/source/as_parser.cpp b/Sources/AngelScript/source/as_parser.cpp
old mode 100755
new mode 100644
index 2cb2b5274..0cc5edd43
--- a/Sources/AngelScript/source/as_parser.cpp
+++ b/Sources/AngelScript/source/as_parser.cpp
@@ -1,4420 +1,4562 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_parser.cpp
-//
-// This class parses the script code and builds a tree for compilation
-//
-//
-// I've documented the syntax in Extended BNF. You'll find it by doing a search in 
-// this file by "BNF:". The starting point for the script language is SCRIPT ::=.
-//
-// Ref: http://matt.might.net/articles/grammars-bnf-ebnf/
-//
-// ( )  - used for grouping
-// { }  - 0 or more repetitions
-// [ ]  - optional
-//  |   - or
-// ' '  - token
-//
-
-
-
-#include "as_config.h"
-#include "as_parser.h"
-#include "as_tokendef.h"
-#include "as_texts.h"
-#include "as_debug.h"
-
-#ifdef _MSC_VER
-#pragma warning(disable:4702) // unreachable code
-#endif
-
-BEGIN_AS_NAMESPACE
-
-asCParser::asCParser(asCBuilder *builder)
-{
-	this->builder    = builder;
-	this->engine     = builder->engine;
-
-	script                = 0;
-	scriptNode            = 0;
-	checkValidTypes       = false;
-	isParsingAppInterface = false;
-}
-
-asCParser::~asCParser()
-{
-	Reset();
-}
-
-void asCParser::Reset()
-{
-	errorWhileParsing     = false;
-	isSyntaxError         = false;
-	checkValidTypes       = false;
-	isParsingAppInterface = false;
-
-	sourcePos = 0;
-
-	if( scriptNode )
-	{
-		scriptNode->Destroy(engine);
-	}
-
-	scriptNode = 0;
-
-	script = 0;
-
-	lastToken.pos = size_t(-1);
-}
-
-asCScriptNode *asCParser::GetScriptNode()
-{
-	return scriptNode;
-}
-
-int asCParser::ParseFunctionDefinition(asCScriptCode *in_script, bool in_expectListPattern)
-{
-	Reset();
-
-	// Set flag that permits ? as datatype for parameters
-	isParsingAppInterface = true;
-
-	this->script = in_script;
-
-	scriptNode = ParseFunctionDefinition();
-
-	if( in_expectListPattern )
-		scriptNode->AddChildLast(ParseListPattern());
-
-	// The declaration should end after the definition
-	if( !isSyntaxError )
-	{
-		sToken t;
-		GetToken(&t);
-		if( t.type != ttEnd )
-		{
-			Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
-			Error(InsteadFound(t), &t);
-			return -1;
-		}
-	}
-
-	if( errorWhileParsing )
-		return -1;
-
-	return 0;
-}
-
-asCScriptNode *asCParser::CreateNode(eScriptNode type)
-{
-	void *ptr = engine->memoryMgr.AllocScriptNode();
-	if( ptr == 0 )
-	{
-		// Out of memory
-		errorWhileParsing = true;
-		return 0;
-	}
-
-	return new(ptr) asCScriptNode(type);
-}
-
-int asCParser::ParseDataType(asCScriptCode *in_script, bool in_isReturnType)
-{
-	Reset();
-
-	this->script = in_script;
-
-	scriptNode = CreateNode(snDataType);
-	if( scriptNode == 0 ) return -1;
-		
-	scriptNode->AddChildLast(ParseType(true));
-	if( isSyntaxError ) return -1;
-
-	if( in_isReturnType )
-	{
-		scriptNode->AddChildLast(ParseTypeMod(false));
-		if( isSyntaxError ) return -1;
-	}
-
-	// The declaration should end after the type
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttEnd )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
-		Error(InsteadFound(t), &t);
-		return -1;
-	}
-
-	if( errorWhileParsing )
-		return -1;
-
-	return 0;
-}
-
-
-// Parse a template declaration: IDENTIFIER '<' 'class'? IDENTIFIER '>'
-int asCParser::ParseTemplateDecl(asCScriptCode *in_script)
-{
-	Reset();
-
-	this->script = in_script;
-	scriptNode = CreateNode(snUndefined);
-	if( scriptNode == 0 ) return -1;
-
-	scriptNode->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return -1;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttLessThan )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttLessThan)), &t);
-		Error(InsteadFound(t), &t);
-		return -1;
-	}
-
-	// The class token is optional
-	GetToken(&t);
-	if( t.type != ttClass )
-		RewindTo(&t);
-
-	scriptNode->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return -1;
-
-	// There can be multiple sub types
-	GetToken(&t);
-
-	// Parse template types by list separator
-	while(t.type == ttListSeparator)
-	{
-		GetToken(&t);
-		if( t.type != ttClass )
-			RewindTo(&t);
-		scriptNode->AddChildLast(ParseIdentifier());
-
-		if( isSyntaxError ) return -1;
-		GetToken(&t);
-	}
-
-	if( t.type != ttGreaterThan )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttGreaterThan)), &t);
-		Error(InsteadFound(t), &t);
-		return -1;
-	}
-
-	GetToken(&t);
-	if( t.type != ttEnd )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
-		Error(InsteadFound(t), &t);
-		return -1;
-	}
-
-	if( errorWhileParsing )
-		return -1;
-
-	return 0;
-}
-
-int asCParser::ParsePropertyDeclaration(asCScriptCode *in_script)
-{
-	Reset();
-
-	this->script = in_script;
-
-	scriptNode = CreateNode(snDeclaration);
-	if( scriptNode == 0 ) return -1;
-
-	scriptNode->AddChildLast(ParseType(true));
-	if( isSyntaxError ) return -1;
-
-	// Allow optional '&' to indicate that the property is indirect, i.e. stored as reference
-	sToken t;
-	GetToken(&t);
-	RewindTo(&t);
-	if( t.type == ttAmp )
-		scriptNode->AddChildLast(ParseToken(ttAmp));
-
-	// Allow optional namespace to be defined before the identifier in case
-	// the declaration is to be used for searching for an existing property
-	ParseOptionalScope(scriptNode);
-
-	scriptNode->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return -1;
-
-	// The declaration should end after the identifier
-	GetToken(&t);
-	if( t.type != ttEnd )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
-		Error(InsteadFound(t), &t);
-		return -1;
-	}
-
-	return 0;
-}
-
-// BNF: SCOPE ::= ['::'] {IDENTIFIER '::'} [IDENTIFIER ['<' TYPE {',' TYPE} '>'] '::']
-void asCParser::ParseOptionalScope(asCScriptNode *node)
-{
-	asCScriptNode *scope = CreateNode(snScope);
-
-	sToken t1, t2;
-	GetToken(&t1);
-	GetToken(&t2);
-	if( t1.type == ttScope )
-	{
-		RewindTo(&t1);
-		scope->AddChildLast(ParseToken(ttScope));
-		GetToken(&t1);
-		GetToken(&t2);
-	}
-	while( t1.type == ttIdentifier && t2.type == ttScope )
-	{
-		RewindTo(&t1);
-		scope->AddChildLast(ParseIdentifier());
-		scope->AddChildLast(ParseToken(ttScope));
-		GetToken(&t1);
-		GetToken(&t2);
-	}
-
-	// The innermost scope may be a template type
-	if( t1.type == ttIdentifier && t2.type == ttLessThan )
-	{
-		tempString.Assign(&script->code[t1.pos], t1.length);
-		if (engine->IsTemplateType(tempString.AddressOf()))
-		{
-			RewindTo(&t1);
-			asCScriptNode *restore = scope->lastChild;
-			scope->AddChildLast(ParseIdentifier());
-			if (ParseTemplTypeList(scope, false))
-			{
-				GetToken(&t2);
-				if (t2.type == ttScope)
-				{
-					// Template type is part of the scope
-					// Nothing more needs to be done
-					node->AddChildLast(scope);
-					return;
-				}
-				else
-				{
-					// The template type is not part of the scope
-					// Rewind to the template type and end the scope
-					RewindTo(&t1);
-
-					// Restore the previously parsed node
-					while (scope->lastChild != restore)
-					{
-						asCScriptNode *last = scope->lastChild;
-						last->DisconnectParent();
-						last->Destroy(engine);
-					}
-					if( scope->lastChild )
-						node->AddChildLast(scope);
-					else
-						scope->Destroy(engine);
-					return;
-				}
-			}
-		}
-	}
-
-	// The identifier is not part of the scope
-	RewindTo(&t1);
-
-	if (scope->lastChild)
-		node->AddChildLast(scope);
-	else
-		scope->Destroy(engine);
-}
-
-asCScriptNode *asCParser::ParseFunctionDefinition()
-{
-	asCScriptNode *node = CreateNode(snFunction);
-	if( node == 0 ) return 0;
-
-	node->AddChildLast(ParseType(true));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseTypeMod(false));
-	if( isSyntaxError ) return node;
-
-	ParseOptionalScope(node);
-
-	node->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseParameterList());
-	if( isSyntaxError ) return node;
-
-	// Parse an optional const after the function definition (used for object methods)
-	sToken t1;
-	GetToken(&t1);
-	RewindTo(&t1);
-	if( t1.type == ttConst )
-		node->AddChildLast(ParseToken(ttConst));
-
-	return node;
-}
-
-// BNF: TYPEMOD ::= ['&' ['in' | 'out' | 'inout']]
-asCScriptNode *asCParser::ParseTypeMod(bool isParam)
-{
-	asCScriptNode *node = CreateNode(snDataType);
-	if( node == 0 ) return 0;
-
-	sToken t;
-
-	// Parse possible & token
-	GetToken(&t);
-	RewindTo(&t);
-	if( t.type == ttAmp )
-	{
-		node->AddChildLast(ParseToken(ttAmp));
-		if( isSyntaxError ) return node;
-
-		if( isParam )
-		{
-			GetToken(&t);
-			RewindTo(&t);
-
-			if( t.type == ttIn || t.type == ttOut || t.type == ttInOut )
-			{
-				int tokens[3] = {ttIn, ttOut, ttInOut};
-				node->AddChildLast(ParseOneOf(tokens, 3));
-			}
-		}
-	}
-
-	// Parse possible + token 
-	GetToken(&t);
-	RewindTo(&t);
-	if( t.type == ttPlus )
-	{
-		node->AddChildLast(ParseToken(ttPlus));
-		if( isSyntaxError ) return node;
-	}
-
-	return node;
-}
-
-// BNF: TYPE ::= ['const'] SCOPE DATATYPE ['<' TYPE {',' TYPE} '>'] { ('[' ']') | '@' }
-asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType, bool allowAuto)
-{
-	asCScriptNode *node = CreateNode(snDataType);
-	if( node == 0 ) return 0;
-
-	sToken t;
-
-	if( allowConst )
-	{
-		GetToken(&t);
-		RewindTo(&t);
-		if( t.type == ttConst )
-		{
-			node->AddChildLast(ParseToken(ttConst));
-			if( isSyntaxError ) return node;
-		}
-	}
-
-	// Parse scope prefix
-	ParseOptionalScope(node);
-
-	// Parse the actual type
-	node->AddChildLast(ParseDataType(allowVariableType, allowAuto));
-	if( isSyntaxError ) return node;
-
-	// If the datatype is a template type, then parse the subtype within the < >
-	GetToken(&t);
-	RewindTo(&t);
-	asCScriptNode *type = node->lastChild;
-	tempString.Assign(&script->code[type->tokenPos], type->tokenLength);
-	if( engine->IsTemplateType(tempString.AddressOf()) && t.type == ttLessThan )
-	{
-		ParseTemplTypeList(node);
-		if (isSyntaxError) return node;
-	}
-
-	// Parse [] and @
-	GetToken(&t);
-	RewindTo(&t);
-	while( t.type == ttOpenBracket || t.type == ttHandle)
-	{
-		if( t.type == ttOpenBracket )
-		{
-			node->AddChildLast(ParseToken(ttOpenBracket));
-			if( isSyntaxError ) return node;
-
-			GetToken(&t);
-			if( t.type != ttCloseBracket )
-			{
-				Error(ExpectedToken("]"), &t);
-				Error(InsteadFound(t), &t);
-				return node;
-			}
-		}
-		else
-		{
-			node->AddChildLast(ParseToken(ttHandle));
-			if( isSyntaxError ) return node;
-		}
-
-		GetToken(&t);
-		RewindTo(&t);
-	}
-
-	return node;
-}
-
-// This parses a template type list, e.g. <type, type, type>
-// If 'required' is false, and the template type list is not valid,
-// then no change will be done and the function returns false. This 
-// can be used as do an optional parsing
-bool asCParser::ParseTemplTypeList(asCScriptNode *node, bool required)
-{
-	sToken t;
-	bool isValid = true;
-
-	// Remember the last child, so we can restore the state if needed
-	asCScriptNode *last = node->lastChild;
-
-	// Starts with '<'
-	GetToken(&t);
-	if (t.type != ttLessThan)
-	{
-		if (required)
-		{
-			Error(ExpectedToken(asCTokenizer::GetDefinition(ttLessThan)), &t);
-			Error(InsteadFound(t), &t);
-		}
-		return false;
-	}
-
-	// At least one type
-	// TODO: child funcdef: Make this work with !required
-	node->AddChildLast(ParseType(true, false));
-	if (isSyntaxError) return false;
-
-	GetToken(&t);
-
-	// Parse template types by list separator
-	while (t.type == ttListSeparator)
-	{
-		// TODO: child funcdef: Make this work with !required
-		node->AddChildLast(ParseType(true, false));
-		if (isSyntaxError) return false;
-		GetToken(&t);
-	}
-
-	// End with '>'
-	// Accept >> and >>> tokens too. But then force the tokenizer to move 
-	// only 1 character ahead (thus splitting the token in two).
-	if (script->code[t.pos] != '>')
-	{
-		if (required)
-		{
-			Error(ExpectedToken(asCTokenizer::GetDefinition(ttGreaterThan)), &t);
-			Error(InsteadFound(t), &t);
-		}
-		else
-			isValid = false;
-	}
-	else
-	{
-		// Break the token so that only the first > is parsed
-		SetPos(t.pos + 1);
-	}
-
-	if (!required && !isValid)
-	{
-		// Restore the original state before returning
-		while (node->lastChild != last)
-		{
-			asCScriptNode *n = node->lastChild;
-			n->DisconnectParent();
-			n->Destroy(engine);
-		}
-
-		return false;
-	}
-
-	// The template type list was parsed OK
-	return true;
-}
-
-asCScriptNode *asCParser::ParseToken(int token)
-{
-	asCScriptNode *node = CreateNode(snUndefined);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( t1.type != token )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(token)), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->SetToken(&t1);
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-asCScriptNode *asCParser::ParseOneOf(int *tokens, int count)
-{
-	asCScriptNode *node = CreateNode(snUndefined);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	int n;
-	for( n = 0; n < count; n++ )
-	{
-		if( tokens[n] == t1.type )
-			break;
-	}
-	if( n == count )
-	{
-		Error(ExpectedOneOf(tokens, count), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->SetToken(&t1);
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: DATATYPE ::= (IDENTIFIER | PRIMTYPE | '?' | 'auto')
-asCScriptNode *asCParser::ParseDataType(bool allowVariableType, bool allowAuto)
-{
-	asCScriptNode *node = CreateNode(snDataType);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( !IsDataType(t1) && !(allowVariableType && t1.type == ttQuestion) && !(allowAuto && t1.type == ttAuto) )
-	{
-		if( t1.type == ttIdentifier )
-		{
-			asCString errMsg;
-			tempString.Assign(&script->code[t1.pos], t1.length);
-			errMsg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE, tempString.AddressOf());
-			Error(errMsg, &t1);
-		}
-		else if( t1.type == ttAuto )
-		{
-			Error(TXT_AUTO_NOT_ALLOWED, &t1);
-		}
-		else
-		{
-			Error(TXT_EXPECTED_DATA_TYPE, &t1);
-			Error(InsteadFound(t1), &t1);
-		}
-		return node;
-	}
-
-	node->SetToken(&t1);
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: PRIMTYPE ::= 'void' | 'int' | 'int8' | 'int16' | 'int32' | 'int64' | 'uint' | 'uint8' | 'uint16' | 'uint32' | 'uint64' | 'float' | 'double' | 'bool'
-asCScriptNode *asCParser::ParseRealType()
-{
-	asCScriptNode *node = CreateNode(snDataType);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( !IsRealType(t1.type) )
-	{
-		Error(TXT_EXPECTED_DATA_TYPE, &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->SetToken(&t1);
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: IDENTIFIER ::= single token:  starts with letter or _, can include any letter and digit, same as in C++
-asCScriptNode *asCParser::ParseIdentifier()
-{
-	asCScriptNode *node = CreateNode(snIdentifier);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( t1.type != ttIdentifier )
-	{
-		Error(TXT_EXPECTED_IDENTIFIER, &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->SetToken(&t1);
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: PARAMLIST ::= '(' ['void' | (TYPE TYPEMOD [IDENTIFIER] ['=' EXPR] {',' TYPE TYPEMOD [IDENTIFIER] ['=' EXPR]})] ')'
-asCScriptNode *asCParser::ParseParameterList()
-{
-	asCScriptNode *node = CreateNode(snParameterList);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-	GetToken(&t1);
-	if( t1.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	GetToken(&t1);
-	if( t1.type == ttCloseParanthesis )
-	{
-		node->UpdateSourcePos(t1.pos, t1.length);
-
-		// Statement block is finished
-		return node;
-	}
-	else
-	{
-		// If the parameter list is just (void) then the void token should be ignored
-		if( t1.type == ttVoid )
-		{
-			sToken t2;
-			GetToken(&t2);
-			if( t2.type == ttCloseParanthesis )
-			{
-				node->UpdateSourcePos(t2.pos, t2.length);
-				return node;
-			}
-		}
-
-		RewindTo(&t1);
-
-		for(;;)
-		{
-			// Parse data type
-			node->AddChildLast(ParseType(true, isParsingAppInterface));
-			if( isSyntaxError ) return node;
-
-			node->AddChildLast(ParseTypeMod(true));
-			if( isSyntaxError ) return node;
-
-			// Parse optional identifier
-			GetToken(&t1);
-			if( t1.type == ttIdentifier )
-			{
-				RewindTo(&t1);
-
-				node->AddChildLast(ParseIdentifier());
-				if( isSyntaxError ) return node;
-
-				GetToken(&t1);
-			}
-
-			// Parse optional expression for the default arg
-			if( t1.type == ttAssignment )
-			{
-				// Do a superficial parsing of the default argument
-				// The actual parsing will be done when the argument is compiled for a function call
-				node->AddChildLast(SuperficiallyParseExpression());
-				if( isSyntaxError ) return node;
-
-				GetToken(&t1);
-			}
-
-			// Check if list continues
-			if( t1.type == ttCloseParanthesis )
-			{
-				node->UpdateSourcePos(t1.pos, t1.length);
-
-				return node;
-			}
-			else if( t1.type == ttListSeparator )
-				continue;
-			else
-			{
-				Error(ExpectedTokens(")", ","), &t1);
-				Error(InsteadFound(t1), &t1);
-				return node;
-			}
-		}
-	}
-	UNREACHABLE_RETURN;
-}
-
-asCScriptNode *asCParser::SuperficiallyParseExpression()
-{
-	asCScriptNode *node = CreateNode(snExpression);
-	if( node == 0 ) return 0;
-
-	// Simply parse everything until the first , or ), whichever comes first. 
-	// Keeping in mind that () and {} can group expressions.
-
-	sToken start;
-	GetToken(&start);
-	RewindTo(&start);
-
-	asCString stack;
-	sToken t;
-	for(;;)
-	{
-		GetToken(&t);
-
-		if( t.type == ttOpenParanthesis )
-			stack += "(";
-		else if( t.type == ttCloseParanthesis )
-		{
-			if( stack == "" )
-			{
-				// Expression has ended. This token is not part of expression
-				RewindTo(&t);
-				break;
-			}
-			else if( stack[stack.GetLength()-1] == '(' )
-			{
-				// Group has ended
-				stack.SetLength(stack.GetLength()-1);
-			}
-			else
-			{
-				// Wrong syntax
-				RewindTo(&t);
-				asCString str;
-				str.Format(TXT_UNEXPECTED_TOKEN_s, ")");
-				Error(str, &t);
-				return node;
-			}
-		}
-		else if( t.type == ttListSeparator )
-		{
-			if( stack == "" )
-			{
-				// Expression has ended. This token is not part of expression
-				RewindTo(&t);
-				break;
-			}
-		}
-		else if( t.type == ttStartStatementBlock )
-			stack += "{";
-		else if( t.type == ttEndStatementBlock )
-		{
-			if( stack == "" || stack[stack.GetLength()-1] != '{' )
-			{
-				// Wrong syntax
-				RewindTo(&t);
-				asCString str;
-				str.Format(TXT_UNEXPECTED_TOKEN_s, "}");
-				Error(str, &t);
-				return node;
-			}
-			else
-			{
-				// Group has ended
-				stack.SetLength(stack.GetLength()-1);
-			}
-		}
-		else if( t.type == ttEndStatement )
-		{
-			// Wrong syntax (since we're parsing a default arg expression)
-			RewindTo(&t);
-			asCString str;
-			str.Format(TXT_UNEXPECTED_TOKEN_s, ";");
-			Error(str, &t);
-			return node;
-		}
-		else if( t.type == ttNonTerminatedStringConstant )
-		{
-			RewindTo(&t);
-			Error(TXT_NONTERMINATED_STRING, &t);
-			return node;
-		}
-		else if( t.type == ttEnd )
-		{
-			// Wrong syntax
-			RewindTo(&t);
-			Error(TXT_UNEXPECTED_END_OF_FILE, &t);
-			Info(TXT_WHILE_PARSING_EXPRESSION, &start);
-			return node;
-		}
-
-		// Include the token in the node
-		node->UpdateSourcePos(t.pos, t.length);
-	}
-
-	return node;
-}
-
-void asCParser::GetToken(sToken *token)
-{
-	// Check if the token has already been parsed
-	if( lastToken.pos == sourcePos )
-	{
-		*token = lastToken;
-		sourcePos += token->length;
-
-		if( token->type == ttWhiteSpace ||
-			token->type == ttOnelineComment ||
-			token->type == ttMultilineComment )
-			GetToken(token);
-
-		return;
-	}
-
-	// Parse new token
-	size_t sourceLength = script->codeLength;
-	do
-	{
-		if( sourcePos >= sourceLength )
-		{
-			token->type = ttEnd;
-			token->length = 0;
-		}
-		else
-			token->type = engine->tok.GetToken(&script->code[sourcePos], sourceLength - sourcePos, &token->length);
-
-		token->pos = sourcePos;
-
-		// Update state
-		sourcePos += token->length;
-	}
-	// Filter out whitespace and comments
-	while( token->type == ttWhiteSpace || 
-	       token->type == ttOnelineComment ||
-	       token->type == ttMultilineComment );
-}
-
-void asCParser::SetPos(size_t pos)
-{
-	lastToken.pos = size_t(-1);
-	sourcePos = pos;
-}
-
-void asCParser::RewindTo(const sToken *token)
-{
-	// TODO: optimize: Perhaps we can optimize this further by having the parser 
-	//                 set an explicit return point, after which each token will 
-	//                 be stored. That way not just one token will be reused but
-	//                 no token will have to be tokenized more than once.
-
-	// Store the token so it doesn't have to be tokenized again
-	lastToken = *token;
-
-	sourcePos = token->pos;
-}
-
-void asCParser::Error(const asCString &text, sToken *token)
-{
-	RewindTo(token);
-
-	isSyntaxError     = true;
-	errorWhileParsing = true;
-
-	int row, col;
-	script->ConvertPosToRowCol(token->pos, &row, &col);
-
-	if( builder )
-		builder->WriteError(script->name, text, row, col);
-}
-
-void asCParser::Warning(const asCString &text, sToken *token)
-{
-	int row, col;
-	script->ConvertPosToRowCol(token->pos, &row, &col);
-
-	if( builder )
-		builder->WriteWarning(script->name, text, row, col);
-}
-
-void asCParser::Info(const asCString &text, sToken *token)
-{
-	RewindTo(token);
-
-	isSyntaxError     = true;
-	errorWhileParsing = true;
-
-	int row, col;
-	script->ConvertPosToRowCol(token->pos, &row, &col);
-
-	if( builder )
-		builder->WriteInfo(script->name, text, row, col, false);
-}
-
-bool asCParser::IsRealType(int tokenType)
-{
-	if( tokenType == ttVoid ||
-		tokenType == ttInt ||
-		tokenType == ttInt8 ||
-		tokenType == ttInt16 ||
-		tokenType == ttInt64 ||
-		tokenType == ttUInt ||
-		tokenType == ttUInt8 ||
-		tokenType == ttUInt16 ||
-		tokenType == ttUInt64 ||
-		tokenType == ttFloat ||
-		tokenType == ttBool ||
-		tokenType == ttDouble )
-		return true;
-
-	return false;
-}
-
-bool asCParser::IsDataType(const sToken &token)
-{
-	if( token.type == ttIdentifier )
-	{
-#ifndef AS_NO_COMPILER
-		if( checkValidTypes )
-		{
-			// Check if this is an existing type, regardless of namespace
-			tempString.Assign(&script->code[token.pos], token.length);
-			if( !builder->DoesTypeExist(tempString.AddressOf()) )
-				return false;
-		}
-#endif
-		return true;
-	}
-
-	if( IsRealType(token.type) )
-		return true;
-
-	return false;
-}
-
-asCString asCParser::ExpectedToken(const char *token)
-{
-	asCString str;
-
-	str.Format(TXT_EXPECTED_s, token);
-
-	return str;
-}
-
-asCString asCParser::ExpectedTokens(const char *t1, const char *t2)
-{
-	asCString str;
-
-	str.Format(TXT_EXPECTED_s_OR_s, t1, t2);
-
-	return str;
-}
-
-asCString asCParser::ExpectedOneOf(int *tokens, int count)
-{
-	asCString str;
-
-	str = TXT_EXPECTED_ONE_OF;
-	for( int n = 0; n < count; n++ )
-	{
-		str += asCTokenizer::GetDefinition(tokens[n]);
-		if( n < count-1 )
-			str += ", ";
-	}
-
-	return str;
-}
-
-asCString asCParser::ExpectedOneOf(const char **tokens, int count)
-{
-	asCString str;
-
-	str = TXT_EXPECTED_ONE_OF;
-	for( int n = 0; n < count; n++ )
-	{
-		str += tokens[n];
-		if( n < count-1 )
-			str += ", ";
-	}
-
-	return str;
-}
-
-asCString asCParser::InsteadFound(sToken &t)
-{
-	asCString str;
-	if( t.type == ttIdentifier )
-	{
-		asCString id(&script->code[t.pos], t.length);
-		str.Format(TXT_INSTEAD_FOUND_IDENTIFIER_s, id.AddressOf());
-	}
-	else if( t.type >= ttIf )
-		str.Format(TXT_INSTEAD_FOUND_KEYWORD_s, asCTokenizer::GetDefinition(t.type));
-	else
-		str.Format(TXT_INSTEAD_FOUND_s, asCTokenizer::GetDefinition(t.type));
-
-	return str;
-}
-
-asCScriptNode *asCParser::ParseListPattern()
-{
-	asCScriptNode *node = CreateNode(snListPattern);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( t1.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	sToken start = t1;
-
-	bool isBeginning = true;
-	bool afterType = false;
-	while( !isSyntaxError )
-	{
-		GetToken(&t1);
-		if( t1.type == ttEndStatementBlock )
-		{
-			if( !afterType )
-			{
-				Error(TXT_EXPECTED_DATA_TYPE, &t1);
-				Error(InsteadFound(t1), &t1);
-			}
-			break;
-		}
-		else if( t1.type == ttStartStatementBlock )
-		{
-			if( afterType )
-			{
-				Error(ExpectedTokens(",","}"), &t1);
-				Error(InsteadFound(t1), &t1);
-			}
-			RewindTo(&t1);
-			node->AddChildLast(ParseListPattern());
-			afterType = true;
-		}
-		else if( t1.type == ttIdentifier && (IdentifierIs(t1, "repeat") || IdentifierIs(t1, "repeat_same")) )
-		{
-			if( !isBeginning )
-			{
-				asCString msg;
-				asCString token(&script->code[t1.pos], t1.length);
-				msg.Format(TXT_UNEXPECTED_TOKEN_s, token.AddressOf());
-				Error(msg.AddressOf(), &t1);
-			}
-			RewindTo(&t1);
-			node->AddChildLast(ParseIdentifier());
-		}
-		else if( t1.type == ttEnd )
-		{
-			Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
-			Info(TXT_WHILE_PARSING_STATEMENT_BLOCK, &start);
-			break;
-		}
-		else if( t1.type == ttListSeparator )
-		{
-			if( !afterType )
-			{
-				Error(TXT_EXPECTED_DATA_TYPE, &t1);
-				Error(InsteadFound(t1), &t1);
-			}
-			afterType = false;
-		}
-		else
-		{
-			if( afterType )
-			{
-				Error(ExpectedTokens(",", "}"), &t1);
-				Error(InsteadFound(t1), &t1);
-			}
-			RewindTo(&t1);
-			node->AddChildLast(ParseType(true, true));
-			afterType = true;
-		}
-
-		isBeginning = false;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-bool asCParser::IdentifierIs(const sToken &t, const char *str)
-{
-	if( t.type != ttIdentifier ) 
-		return false;
-
-	return script->TokenEquals(t.pos, t.length, str);
-}
-
-#ifndef AS_NO_COMPILER
-
-// This function will return true if the current token is not a template, or if it is and 
-// the following has a valid syntax for a template type. The source position will be left 
-// at the first token after the type in case of success
-bool asCParser::CheckTemplateType(const sToken &t)
-{
-	// Is this a template type?
-	tempString.Assign(&script->code[t.pos], t.length);
-	if( engine->IsTemplateType(tempString.AddressOf()) )
-	{
-		// If the next token is a < then parse the sub-type too
-		sToken t1;
-		GetToken(&t1);
-		if( t1.type != ttLessThan )
-		{
-			RewindTo(&t1);
-			return true;
-		}
-
-		for(;;)
-		{
-			// There might optionally be a 'const'
-			GetToken(&t1);
-			if( t1.type == ttConst )
-				GetToken(&t1);
-
-			// The type may be initiated with the scope operator
-			if( t1.type == ttScope )
-				GetToken(&t1);
-
-			// There may be multiple levels of scope operators
-			sToken t2;
-			GetToken(&t2);
-			while( t1.type == ttIdentifier && t2.type == ttScope )
-			{
-				GetToken(&t1);
-				GetToken(&t2);
-			}
-			RewindTo(&t2);
-
-			// Now there must be a data type
-			if( !IsDataType(t1) )
-				return false;
-
-			if( !CheckTemplateType(t1) )
-				return false;
-
-			GetToken(&t1);
-
-			// Is it a handle or array?
-			while( t1.type == ttHandle || t1.type == ttOpenBracket )
-			{
-				if( t1.type == ttOpenBracket )
-				{
-					GetToken(&t1);
-					if( t1.type != ttCloseBracket )
-						return false;
-				}
-
-				GetToken(&t1);
-			}
-
-			// Was this the last template subtype?
-			if( t1.type != ttListSeparator )
-				break;
-		}
-
-		// Accept >> and >>> tokens too. But then force the tokenizer to move 
-		// only 1 character ahead (thus splitting the token in two).
-		if( script->code[t1.pos] != '>' )
-			return false;
-		else if( t1.length != 1 )
-		{
-			// We need to break the token, so that only the first character is parsed
-			SetPos(t1.pos + 1);
-		}
-	}
-
-	return true;
-}
-
-// BNF: CAST ::= 'cast' '<' TYPE '>' '(' ASSIGN ')'
-asCScriptNode *asCParser::ParseCast()
-{
-	asCScriptNode *node = CreateNode(snCast);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-	GetToken(&t1);
-	if( t1.type != ttCast )
-	{
-		Error(ExpectedToken("cast"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	GetToken(&t1);
-	if( t1.type != ttLessThan )
-	{
-		Error(ExpectedToken("<"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	// Parse the data type
-	node->AddChildLast(ParseType(true));
-	if( isSyntaxError ) return node;
-
-	GetToken(&t1);
-	if( t1.type != ttGreaterThan )
-	{
-		Error(ExpectedToken(">"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	GetToken(&t1);
-	if( t1.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->AddChildLast(ParseAssignment());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t1);
-	if( t1.type != ttCloseParanthesis )
-	{
-		Error(ExpectedToken(")"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: EXPRVALUE ::= 'void' | CONSTRUCTCALL | FUNCCALL | VARACCESS | CAST | LITERAL | '(' ASSIGN ')' | LAMBDA
-asCScriptNode *asCParser::ParseExprValue()
-{
-	asCScriptNode *node = CreateNode(snExprValue);
-	if( node == 0 ) return 0;
-
-	sToken t1, t2;
-	GetToken(&t1);
-	GetToken(&t2);
-	RewindTo(&t1);
-
-	// 'void' is a special expression that doesn't do anything (normally used for skipping output arguments)
-	if( t1.type == ttVoid )
-		node->AddChildLast(ParseToken(ttVoid));
-	else if( IsRealType(t1.type) )
-		node->AddChildLast(ParseConstructCall());
-	else if( t1.type == ttIdentifier || t1.type == ttScope )
-	{
-		// Check if the expression is an anonymous function
-		if( IsLambda() )
-		{
-			node->AddChildLast(ParseLambda());
-		}
-		else
-		{
-			// Determine the last identifier in order to check if it is a type
-			sToken t;
-			if( t1.type == ttScope ) t = t2; else t = t1;
-			RewindTo(&t);
-			GetToken(&t2);
-			while( t.type == ttIdentifier )
-			{
-				t2 = t;
-				GetToken(&t);
-				if( t.type == ttScope )
-					GetToken(&t);
-				else 
-					break;
-			}
-
-			bool isDataType = IsDataType(t2);
-			bool isTemplateType = false;
-			if( isDataType )
-			{
-				// Is this a template type?
-				tempString.Assign(&script->code[t2.pos], t2.length);
-				if( engine->IsTemplateType(tempString.AddressOf()) )
-					isTemplateType = true;
-			}
-
-			GetToken(&t2);
-		
-			// Rewind so the real parsing can be done, after deciding what to parse
-			RewindTo(&t1);
-
-			// Check if this is a construct call
-			if( isDataType && (t.type == ttOpenParanthesis ||  // type()
-							   (t.type == ttOpenBracket && t2.type == ttCloseBracket)) )      // type[]()
-				node->AddChildLast(ParseConstructCall());
-			else if( isTemplateType && t.type == ttLessThan )  // type<t>()
-				node->AddChildLast(ParseConstructCall());
-			else if( IsFunctionCall() )
-				node->AddChildLast(ParseFunctionCall());
-			else
-				node->AddChildLast(ParseVariableAccess());
-		}
-	}
-	else if( t1.type == ttCast )
-		node->AddChildLast(ParseCast());
-	else if( IsConstant(t1.type) )
-		node->AddChildLast(ParseConstant());
-	else if( t1.type == ttOpenParanthesis )
-	{
-		GetToken(&t1);
-		node->UpdateSourcePos(t1.pos, t1.length);
-
-		node->AddChildLast(ParseAssignment());
-		if( isSyntaxError ) return node;
-
-		GetToken(&t1);
-		if( t1.type != ttCloseParanthesis )
-		{
-			Error(ExpectedToken(")"), &t1);
-			Error(InsteadFound(t1), &t1);
-		}
-
-		node->UpdateSourcePos(t1.pos, t1.length);
-	}
-	else
-	{
-		Error(TXT_EXPECTED_EXPRESSION_VALUE, &t1);
-		Error(InsteadFound(t1), &t1);
-	}
-
-	return node;
-}
-
-// BNF: LITERAL ::= NUMBER | STRING | BITS | 'true' | 'false' | 'null'
-// BNF: NUMBER ::= single token:  includes integers and real numbers, same as C++
-// BNF: STRING ::= single token:  single quoted ', double quoted ", or heredoc multi-line string """
-// BNF: BITS ::= single token:  binary 0b or 0B, octal 0o or 0O, decimal 0d or 0D, hexadecimal 0x or 0X
-asCScriptNode *asCParser::ParseConstant()
-{
-	asCScriptNode *node = CreateNode(snConstant);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( !IsConstant(t.type) )
-	{
-		Error(TXT_EXPECTED_CONSTANT, &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	// We want to gather a list of string constants to concatenate as children
-	if( t.type == ttStringConstant || t.type == ttMultilineStringConstant || t.type == ttHeredocStringConstant )
-		RewindTo(&t);
-
-	while( t.type == ttStringConstant || t.type == ttMultilineStringConstant || t.type == ttHeredocStringConstant )
-	{
-		node->AddChildLast(ParseStringConstant());
-
-		GetToken(&t);
-		RewindTo(&t);
-	}
-
-	return node;
-}
-
-bool asCParser::IsLambda()
-{
-	bool isLambda = false;
-	sToken t;
-	GetToken(&t);
-	if( t.type == ttIdentifier && IdentifierIs(t, FUNCTION_TOKEN) )
-	{
-		sToken t2;
-		GetToken(&t2);
-		if( t2.type == ttOpenParanthesis )
-		{
-			// Skip until )
-			while( t2.type != ttCloseParanthesis && t2.type != ttEnd )
-				GetToken(&t2);
-
-			// The next token must be a {
-			GetToken(&t2);
-			if( t2.type == ttStartStatementBlock )
-				isLambda = true;
-		}
-	}
-
-	RewindTo(&t);
-	return isLambda;
-}
-
-// BNF: LAMBDA ::= 'function' '(' [IDENTIFIER {',' IDENTIFIER}] ')' STATBLOCK
-asCScriptNode *asCParser::ParseLambda()
-{
-	asCScriptNode *node = CreateNode(snFunction);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-
-	if( t.type != ttIdentifier || !IdentifierIs(t, FUNCTION_TOKEN) )
-	{
-		Error(ExpectedToken("function"), &t);
-		return node;
-	}
-
-	GetToken(&t);
-	if( t.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t);
-		return node;
-	}
-
-	GetToken(&t);
-	if( t.type == ttIdentifier )
-	{
-		RewindTo(&t);
-		node->AddChildLast(ParseIdentifier());
-
-		GetToken(&t);
-		while( t.type == ttListSeparator )
-		{
-			node->AddChildLast(ParseIdentifier());
-			if( isSyntaxError ) return node;
-
-			GetToken(&t);
-		}
-	}
-
-	if( t.type != ttCloseParanthesis )
-	{
-		Error(ExpectedToken(")"), &t);
-		return node;
-	}
-
-	// We should just find the end of the statement block here. The statements 
-	// will be parsed on request by the compiler once it starts the compilation.
-	node->AddChildLast(SuperficiallyParseStatementBlock());
-
-	return node;
-}
-
-asCScriptNode *asCParser::ParseStringConstant()
-{
-	asCScriptNode *node = CreateNode(snConstant);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttStringConstant && t.type != ttMultilineStringConstant && t.type != ttHeredocStringConstant )
-	{
-		Error(TXT_EXPECTED_STRING, &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: FUNCCALL ::= SCOPE IDENTIFIER ARGLIST
-asCScriptNode *asCParser::ParseFunctionCall()
-{
-	asCScriptNode *node = CreateNode(snFunctionCall);
-	if( node == 0 ) return 0;
-
-	// Parse scope prefix
-	ParseOptionalScope(node);
-
-	// Parse the function name followed by the argument list
-	node->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseArgList());
-
-	return node;
-}
-
-// BNF: VARACCESS ::= SCOPE IDENTIFIER
-asCScriptNode *asCParser::ParseVariableAccess()
-{
-	asCScriptNode *node = CreateNode(snVariableAccess);
-	if( node == 0 ) return 0;
-
-	// Parse scope prefix
-	ParseOptionalScope(node);
-
-	// Parse the variable name
-	node->AddChildLast(ParseIdentifier());
-
-	return node;
-}
-
-// BNF: CONSTRUCTCALL ::= TYPE ARGLIST
-asCScriptNode *asCParser::ParseConstructCall()
-{
-	asCScriptNode *node = CreateNode(snConstructCall);
-	if( node == 0 ) return 0;
-
-	node->AddChildLast(ParseType(false));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseArgList());
-
-	return node;
-}
-
-// BNF: ARGLIST ::= '(' [IDENTIFIER ':'] ASSIGN {',' [IDENTIFIER ':'] ASSIGN} ')'
-asCScriptNode *asCParser::ParseArgList(bool withParenthesis)
-{
-	asCScriptNode *node = CreateNode(snArgList);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-	if( withParenthesis )
-	{
-		GetToken(&t1);
-		if( t1.type != ttOpenParanthesis )
-		{
-			Error(ExpectedToken("("), &t1);
-			Error(InsteadFound(t1), &t1);
-			return node;
-		}
-
-		node->UpdateSourcePos(t1.pos, t1.length);
-	}
-
-	GetToken(&t1);
-	if( t1.type == ttCloseParanthesis || t1.type == ttCloseBracket )
-	{
-		if( withParenthesis )
-		{
-			if( t1.type == ttCloseParanthesis )
-				node->UpdateSourcePos(t1.pos, t1.length);
-			else
-			{
-				asCString str;
-				str.Format(TXT_UNEXPECTED_TOKEN_s, asCTokenizer::GetDefinition(ttCloseBracket));
-
-				Error(str.AddressOf(), &t1);
-			}
-		}
-		else
-			RewindTo(&t1);
-
-		// Argument list has ended
-		return node;
-	}
-	else
-	{
-		RewindTo(&t1);
-
-		for(;;)
-		{
-			// Determine if this is a named argument
-			sToken tl, t2;
-			GetToken(&tl);
-			GetToken(&t2);
-			RewindTo(&tl);
-
-			// Named arguments uses the syntax: arg : expr
-			// This avoids confusion when the argument has the same name as a local variable, i.e. var = expr
-			// It also avoids conflict with expressions to that creates anonymous objects initialized with lists, i.e. type = {...}
-			// The alternate syntax: arg = expr, is supported to provide backwards compatibility with 2.29.0
-			// TODO: 3.0.0: Remove the alternate syntax
-			if( tl.type == ttIdentifier && (t2.type == ttColon || (engine->ep.alterSyntaxNamedArgs && t2.type == ttAssignment)) )
-			{
-				asCScriptNode *named = CreateNode(snNamedArgument);
-				if( named == 0 ) return 0;
-				node->AddChildLast(named);
-
-				named->AddChildLast(ParseIdentifier());
-				GetToken(&t2);
-
-				if( engine->ep.alterSyntaxNamedArgs == 1 && t2.type == ttAssignment )
-					Warning(TXT_NAMED_ARGS_WITH_OLD_SYNTAX, &t2);
-
-				named->AddChildLast(ParseAssignment());
-			}
-			else
-				node->AddChildLast(ParseAssignment());
-
-			if( isSyntaxError ) return node;
-
-			// Check if list continues
-			GetToken(&t1);
-			if( t1.type == ttListSeparator )
-				continue;
-			else
-			{
-				if( withParenthesis )
-				{
-					if( t1.type == ttCloseParanthesis )
-						node->UpdateSourcePos(t1.pos, t1.length);
-					else
-					{
-						Error(ExpectedTokens(")", ","), &t1);
-						Error(InsteadFound(t1), &t1);
-					}
-				}
-				else 
-					RewindTo(&t1);
-
-				return node;
-			}
-		}
-	}
-}
-
-bool asCParser::IsFunctionCall()
-{
-	sToken s;
-	sToken t1, t2;
-
-	GetToken(&s);
-	t1 = s;
-
-	// A function call may be prefixed with scope resolution
-	if( t1.type == ttScope )
-		GetToken(&t1);
-	GetToken(&t2);
-
-	while( t1.type == ttIdentifier && t2.type == ttScope )
-	{
-		GetToken(&t1);
-		GetToken(&t2);
-	}
-
-	// A function call starts with an identifier followed by an argument list
-	if( t1.type != ttIdentifier || IsDataType(t1) )
-	{
-		RewindTo(&s);
-		return false;
-	}
-
-	if( t2.type == ttOpenParanthesis )
-	{
-		RewindTo(&s);
-		return true;
-	}
-
-	RewindTo(&s);
-	return false;
-}
-
-// BNF: ASSIGN ::= CONDITION [ ASSIGNOP ASSIGN ]
-asCScriptNode *asCParser::ParseAssignment()
-{
-	asCScriptNode *node = CreateNode(snAssignment);
-	if( node == 0 ) return 0;
-
-	node->AddChildLast(ParseCondition());
-	if( isSyntaxError ) return node;
-
-	sToken t;
-	GetToken(&t);
-	RewindTo(&t);
-
-	if( IsAssignOperator(t.type) )
-	{
-		node->AddChildLast(ParseAssignOperator());
-		if( isSyntaxError ) return node;
-
-		node->AddChildLast(ParseAssignment());
-		if( isSyntaxError ) return node;
-	}
-
-	return node;
-}
-
-// BNF: CONDITION ::= EXPR ['?' ASSIGN ':' ASSIGN]
-asCScriptNode *asCParser::ParseCondition()
-{
-	asCScriptNode *node = CreateNode(snCondition);
-	if( node == 0 ) return 0;
-
-	node->AddChildLast(ParseExpression());
-	if( isSyntaxError ) return node;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type == ttQuestion )
-	{
-		node->AddChildLast(ParseAssignment());
-		if( isSyntaxError ) return node;
-
-		GetToken(&t);
-		if( t.type != ttColon )
-		{
-			Error(ExpectedToken(":"), &t);
-			Error(InsteadFound(t), &t);
-			return node;
-		}
-
-		node->AddChildLast(ParseAssignment());
-		if( isSyntaxError ) return node;
-	}
-	else
-		RewindTo(&t);
-
-	return node;
-}
-
-// BNF: EXPR ::= EXPRTERM {EXPROP EXPRTERM}
-asCScriptNode *asCParser::ParseExpression()
-{
-	asCScriptNode *node = CreateNode(snExpression);
-	if( node == 0 ) return 0;
-
-	node->AddChildLast(ParseExprTerm());
-	if( isSyntaxError ) return node;
-
-	for(;;)
-	{
-		sToken t;
-		GetToken(&t);
-		RewindTo(&t);
-
-		if( !IsOperator(t.type) )
-			return node;
-
-		node->AddChildLast(ParseExprOperator());
-		if( isSyntaxError ) return node;
-
-		node->AddChildLast(ParseExprTerm());
-		if( isSyntaxError ) return node;
-	}
-	UNREACHABLE_RETURN;
-}
-
-// BNF: EXPRTERM ::= (TYPE '=' INITLIST) | ({EXPRPREOP} EXPRVALUE {EXPRPOSTOP})
-asCScriptNode *asCParser::ParseExprTerm()
-{
-	asCScriptNode *node = CreateNode(snExprTerm);
-	if( node == 0 ) return 0;
-
-	// Check if the expression term is an initialization of a temp object with init list, i.e. type = {...}
-	sToken t;
-	GetToken(&t);
-	sToken t2 = t, t3;
-	if (IsDataType(t2) && CheckTemplateType(t2))
-	{
-		// The next token must be a = followed by a {
-		GetToken(&t2);
-		GetToken(&t3);
-		if (t2.type == ttAssignment && t3.type == ttStartStatementBlock)
-		{
-			// It is an initialization, now parse it for real
-			RewindTo(&t);
-			node->AddChildLast(ParseType(false));
-			GetToken(&t2);
-			node->AddChildLast(ParseInitList());
-			return node;
-		}
-	}
-
-	// It wasn't an initialization, so it must be an ordinary expression term
-	RewindTo(&t);
-
-	for(;;)
-	{
-		GetToken(&t);
-		RewindTo(&t);
-		if( !IsPreOperator(t.type) )
-			break;
-
-		node->AddChildLast(ParseExprPreOp());
-		if( isSyntaxError ) return node;
-	}
-
-	node->AddChildLast(ParseExprValue());
-	if( isSyntaxError ) return node;
-
-	
-	for(;;)
-	{
-		GetToken(&t);
-		RewindTo(&t);
-		if( !IsPostOperator(t.type) )
-			return node;
-
-		node->AddChildLast(ParseExprPostOp());
-		if( isSyntaxError ) return node;
-	}
-	UNREACHABLE_RETURN;
-}
-
-// BNF: EXPRPREOP ::= '-' | '+' | '!' | '++' | '--' | '~' | '@'
-asCScriptNode *asCParser::ParseExprPreOp()
-{
-	asCScriptNode *node = CreateNode(snExprPreOp);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( !IsPreOperator(t.type) )
-	{
-		Error(TXT_EXPECTED_PRE_OPERATOR, &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: EXPRPOSTOP ::= ('.' (FUNCCALL | IDENTIFIER)) | ('[' [IDENTIFIER ':'] ASSIGN {',' [IDENTIFIER ':' ASSIGN} ']') | ARGLIST | '++' | '--'
-asCScriptNode *asCParser::ParseExprPostOp()
-{
-	asCScriptNode *node = CreateNode(snExprPostOp);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( !IsPostOperator(t.type) )
-	{
-		Error(TXT_EXPECTED_POST_OPERATOR, &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	if( t.type == ttDot )
-	{
-		sToken t1, t2;
-		GetToken(&t1);
-		GetToken(&t2);
-		RewindTo(&t1);
-		if( t2.type == ttOpenParanthesis )
-			node->AddChildLast(ParseFunctionCall());
-		else
-			node->AddChildLast(ParseIdentifier());
-	}
-	else if( t.type == ttOpenBracket )
-	{
-		node->AddChildLast(ParseArgList(false));
-
-		GetToken(&t);
-		if( t.type != ttCloseBracket )
-		{
-			Error(ExpectedToken("]"), &t);
-			Error(InsteadFound(t), &t);
-			return node;
-		}
-
-		node->UpdateSourcePos(t.pos, t.length);
-	}
-	else if( t.type == ttOpenParanthesis )
-	{
-		RewindTo(&t);
-		node->AddChildLast(ParseArgList());
-	}
-
-	return node;
-}
-
-// BNF: EXPROP ::= MATHOP | COMPOP | LOGICOP | BITOP
-// BNF: MATHOP ::= '+' | '-' | '*' | '/' | '%' | '**'
-// BNF: COMPOP ::= '==' | '!=' | '<' | '<=' | '>' | '>=' | 'is' | '!is'
-// BNF: LOGICOP ::= '&&' | '||' | '^^' | 'and' | 'or' | 'xor'
-// BNF: BITOP ::= '&' | '|' | '^' | '<<' | '>>' | '>>>'
-asCScriptNode *asCParser::ParseExprOperator()
-{
-	asCScriptNode *node = CreateNode(snExprOperator);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( !IsOperator(t.type) )
-	{
-		Error(TXT_EXPECTED_OPERATOR, &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: ASSIGNOP ::= '=' | '+=' | '-=' | '*=' | '/=' | '|=' | '&=' | '^=' | '%=' | '**=' | '<<=' | '>>=' | '>>>=' 
-asCScriptNode *asCParser::ParseAssignOperator()
-{
-	asCScriptNode *node = CreateNode(snExprOperator);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( !IsAssignOperator(t.type) )
-	{
-		Error(TXT_EXPECTED_OPERATOR, &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-bool asCParser::IsOperator(int tokenType)
-{
-	if( tokenType == ttPlus ||
-		tokenType == ttMinus ||
-		tokenType == ttStar ||
-		tokenType == ttSlash ||
-		tokenType == ttPercent ||
-		tokenType == ttStarStar ||
-		tokenType == ttAnd ||
-		tokenType == ttOr ||
-		tokenType == ttXor ||
-		tokenType == ttEqual ||
-		tokenType == ttNotEqual ||
-		tokenType == ttLessThan ||
-		tokenType == ttLessThanOrEqual ||
-		tokenType == ttGreaterThan ||
-		tokenType == ttGreaterThanOrEqual ||
-		tokenType == ttAmp ||
-		tokenType == ttBitOr ||
-		tokenType == ttBitXor ||
-		tokenType == ttBitShiftLeft ||
-		tokenType == ttBitShiftRight ||
-		tokenType == ttBitShiftRightArith ||
-		tokenType == ttIs ||
-		tokenType == ttNotIs )
-		return true;
-
-	return false;
-}
-
-bool asCParser::IsAssignOperator(int tokenType)
-{
-	if( tokenType == ttAssignment ||
-		tokenType == ttAddAssign ||
-		tokenType == ttSubAssign ||
-		tokenType == ttMulAssign ||
-		tokenType == ttDivAssign ||
-		tokenType == ttModAssign ||
-		tokenType == ttPowAssign ||
-		tokenType == ttAndAssign ||
-		tokenType == ttOrAssign ||
-		tokenType == ttXorAssign ||
-		tokenType == ttShiftLeftAssign ||
-		tokenType == ttShiftRightLAssign ||
-		tokenType == ttShiftRightAAssign )
-		return true;
-
-	return false;
-}
-
-bool asCParser::IsPreOperator(int tokenType)
-{
-	if( tokenType == ttMinus ||
-		tokenType == ttPlus ||
-		tokenType == ttNot ||
-		tokenType == ttInc ||
-		tokenType == ttDec ||
-		tokenType == ttBitNot ||
-		tokenType == ttHandle )
-		return true;
-	return false;
-}
-
-bool asCParser::IsPostOperator(int tokenType)
-{
-	if( tokenType == ttInc ||            // post increment
-		tokenType == ttDec ||            // post decrement
-		tokenType == ttDot ||            // member access
-		tokenType == ttOpenBracket ||    // index operator
-		tokenType == ttOpenParanthesis ) // argument list for call on function pointer
-		return true;
-	return false;
-}
-
-bool asCParser::IsConstant(int tokenType)
-{
-	if( tokenType == ttIntConstant ||
-		tokenType == ttFloatConstant ||
-		tokenType == ttDoubleConstant ||
-		tokenType == ttStringConstant ||
-		tokenType == ttMultilineStringConstant ||
-		tokenType == ttHeredocStringConstant ||
-		tokenType == ttTrue ||
-		tokenType == ttFalse ||
-		tokenType == ttBitsConstant ||
-		tokenType == ttNull )
-		return true;
-
-	return false;
-}
-
-int asCParser::ParseScript(asCScriptCode *in_script)
-{
-	Reset();
-
-	this->script = in_script;
-
-	scriptNode = ParseScript(false);
-
-	if( errorWhileParsing )
-		return -1;
-
-	// TODO: Should allow application to request this warning to be generated. 
-	//       It should be off by default, since pre-processor may remove all
-	//       code from a section while still being meant as valid code
-/*
-	// Warn in case there isn't anything in the script
-	if( scriptNode->firstChild == 0 )
-	{
-		if( builder )
-			builder->WriteWarning(script->name, TXT_SECTION_IS_EMPTY, 1, 1);
-	}
-*/
-	return 0;
-}
-
-int asCParser::ParseExpression(asCScriptCode *in_script)
-{
-	Reset();
-
-	this->script = in_script;
-
-	checkValidTypes = true;
-
-	scriptNode = ParseExpression();
-	if( errorWhileParsing )
-		return -1;
-
-	return 0;
-}
-
-// BNF: IMPORT ::= 'import' TYPE ['&'] IDENTIFIER PARAMLIST 'from' STRING ';'
-asCScriptNode *asCParser::ParseImport()
-{
-	asCScriptNode *node = CreateNode(snImport);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttImport )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttImport)), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	node->AddChildLast(ParseFunctionDefinition());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttIdentifier )
-	{
-		Error(ExpectedToken(FROM_TOKEN), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	tempString.Assign(&script->code[t.pos], t.length);
-	if( tempString != FROM_TOKEN )
-	{
-		Error(ExpectedToken(FROM_TOKEN), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttStringConstant )
-	{
-		Error(TXT_EXPECTED_STRING, &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	asCScriptNode *mod = CreateNode(snConstant);
-	if( mod == 0 ) return 0;
-
-	node->AddChildLast(mod);
-
-	mod->SetToken(&t);
-	mod->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttEndStatement )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatement)), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: SCRIPT ::= {IMPORT | ENUM | TYPEDEF | CLASS | MIXIN | INTERFACE | FUNCDEF | VIRTPROP | VAR | FUNC | NAMESPACE | ';'}
-asCScriptNode *asCParser::ParseScript(bool inBlock)
-{
-	asCScriptNode *node = CreateNode(snScript);
-	if( node == 0 ) return 0;
-
-	// Determine type of node
-	sToken t1, t2;
-
-	for(;;)
-	{
-		while( !isSyntaxError )
-		{
-			GetToken(&t1);
-			GetToken(&t2);
-			RewindTo(&t1);
-
-			if( t1.type == ttImport )
-				node->AddChildLast(ParseImport());
-			else if( t1.type == ttEnum || (IdentifierIs(t1, SHARED_TOKEN) && t2.type == ttEnum) )
-				node->AddChildLast(ParseEnumeration());	// Handle enumerations
-			else if( t1.type == ttTypedef )
-				node->AddChildLast(ParseTypedef());		// Handle primitive typedefs
-			else if( t1.type == ttClass || 
-					((IdentifierIs(t1, SHARED_TOKEN) || IdentifierIs(t1, FINAL_TOKEN) || IdentifierIs(t1, ABSTRACT_TOKEN)) && t2.type == ttClass) || 
-					 (IdentifierIs(t1, SHARED_TOKEN) && (IdentifierIs(t2, FINAL_TOKEN) || IdentifierIs(t2, ABSTRACT_TOKEN))) )
-				node->AddChildLast(ParseClass());
-			else if( t1.type == ttMixin )
-				node->AddChildLast(ParseMixin());
-			else if( t1.type == ttInterface || (t1.type == ttIdentifier && t2.type == ttInterface) )
-				node->AddChildLast(ParseInterface());
-			else if( t1.type == ttFuncDef )
-				node->AddChildLast(ParseFuncDef());
-			else if( t1.type == ttConst || t1.type == ttScope || t1.type == ttAuto || IsDataType(t1) )
-			{
-				if( IsVirtualPropertyDecl() )
-					node->AddChildLast(ParseVirtualPropertyDecl(false, false));
-				else if( IsVarDecl() )
-					node->AddChildLast(ParseDeclaration(false, true));
-				else
-					node->AddChildLast(ParseFunction());
-			}
-			else if( t1.type == ttEndStatement )
-			{
-				// Ignore a semicolon by itself
-				GetToken(&t1);
-			}
-			else if( t1.type == ttNamespace )
-				node->AddChildLast(ParseNamespace());
-			else if( t1.type == ttEnd )
-				return node;
-			else if( inBlock && t1.type == ttEndStatementBlock )
-				return node;
-			else
-			{
-				asCString str;
-				const char *t = asCTokenizer::GetDefinition(t1.type);
-				if( t == 0 ) t = "<unknown token>";
-
-				str.Format(TXT_UNEXPECTED_TOKEN_s, t);
-
-				Error(str, &t1);
-			}
-		}
-
-		if( isSyntaxError )
-		{
-			// Search for either ';' or '{' or end
-			GetToken(&t1);
-			while( t1.type != ttEndStatement && t1.type != ttEnd &&
-				   t1.type != ttStartStatementBlock )
-				GetToken(&t1);
-
-			if( t1.type == ttStartStatementBlock )
-			{
-				// Find the end of the block and skip nested blocks
-				int level = 1;
-				while( level > 0 )
-				{
-					GetToken(&t1);
-					if( t1.type == ttStartStatementBlock ) level++;
-					if( t1.type == ttEndStatementBlock ) level--;
-					if( t1.type == ttEnd ) break;
-				}
-			}
-
-			isSyntaxError = false;
-		}
-	}
-	UNREACHABLE_RETURN;
-}
-
-// BNF: NAMESPACE ::= 'namespace' IDENTIFIER '{' SCRIPT '}'
-asCScriptNode *asCParser::ParseNamespace()
-{
-	asCScriptNode *node = CreateNode(snNamespace);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( t1.type == ttNamespace )
-		node->UpdateSourcePos(t1.pos, t1.length);
-	else
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttNamespace)), &t1);
-		Error(InsteadFound(t1), &t1);
-	}
-
-	// TODO: namespace: Allow declaration of multiple nested namespace with namespace A::B::C { }
-	node->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t1);
-	if( t1.type == ttStartStatementBlock )
-		node->UpdateSourcePos(t1.pos, t1.length);
-	else
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttStartStatementBlock)), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	sToken start = t1;
-
-	node->AddChildLast(ParseScript(true));
-
-	if( !isSyntaxError )
-	{
-		GetToken(&t1);
-		if( t1.type == ttEndStatementBlock )
-			node->UpdateSourcePos(t1.pos, t1.length);
-		else
-		{
-			if( t1.type == ttEnd )
-				Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
-			else
-			{
-				Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatementBlock)), &t1);
-				Error(InsteadFound(t1), &t1);
-			}
-			Info(TXT_WHILE_PARSING_NAMESPACE, &start);
-			return node;
-		}
-	}
-
-	return node;
-}
-
-int asCParser::ParseStatementBlock(asCScriptCode *in_script, asCScriptNode *in_block)
-{
-	TimeIt("asCParser::ParseStatementBlock");
-
-	Reset();
-
-	// Tell the parser to validate the identifiers as valid types
-	checkValidTypes = true;
-
-	this->script = in_script;
-	sourcePos = in_block->tokenPos;
-
-	scriptNode = ParseStatementBlock();
-
-	if( isSyntaxError || errorWhileParsing )
-		return -1;
-
-	return 0;
-}
-
-// BNF: ENUM ::= ['shared'] 'enum' IDENTIFIER '{' IDENTIFIER ['=' EXPR] {',' IDENTIFIER ['=' EXPR]} '}'
-asCScriptNode *asCParser::ParseEnumeration()
-{
-	asCScriptNode *ident;
-	asCScriptNode *dataType;
-
-	asCScriptNode *node = CreateNode(snEnum);
-	if( node == 0 ) return 0;
-
-	sToken	token;
-
-	// Optional 'shared' token
-	GetToken(&token);
-	if( IdentifierIs(token, SHARED_TOKEN) )
-	{	
-		RewindTo(&token);
-		node->AddChildLast(ParseIdentifier());
-		if( isSyntaxError ) return node;
-
-		GetToken(&token);
-	}
-
-	// Check for enum
-	if( token.type != ttEnum )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnum)), &token);
-		Error(InsteadFound(token), &token);
-		return node;
-	}
-
-	node->SetToken(&token);
-	node->UpdateSourcePos(token.pos, token.length);
-
-	// Get the identifier
-	GetToken(&token);
-	if(ttIdentifier != token.type) 
-	{
-		Error(TXT_EXPECTED_IDENTIFIER, &token);
-		Error(InsteadFound(token), &token);
-		return node;
-	}
-
-	dataType = CreateNode(snDataType);
-	if( dataType == 0 ) return 0;
-
-	node->AddChildLast(dataType);
-
-	ident = CreateNode(snIdentifier);
-	if( ident == 0 ) return 0;
-
-	ident->SetToken(&token);
-	ident->UpdateSourcePos(token.pos, token.length);
-	dataType->AddChildLast(ident);
-
-	// check for the start of the declaration block
-	GetToken(&token);
-	if( token.type != ttStartStatementBlock ) 
-	{
-		RewindTo(&token);
-		Error(ExpectedToken(asCTokenizer::GetDefinition(token.type)), &token);
-		Error(InsteadFound(token), &token);
-		return node;
-	}
-
-	while(ttEnd != token.type) 
-	{
-		GetToken(&token);
-
-		if( ttEndStatementBlock == token.type ) 
-		{
-			RewindTo(&token);
-			break;
-		}
-
-		if(ttIdentifier != token.type) 
-		{
-			Error(TXT_EXPECTED_IDENTIFIER, &token);
-			Error(InsteadFound(token), &token);
-			return node;
-		}
-
-		//	Add the enum element
-		ident = CreateNode(snIdentifier);
-		if( ident == 0 ) return 0;
-
-		ident->SetToken(&token);
-		ident->UpdateSourcePos(token.pos, token.length);
-		node->AddChildLast(ident);
-
-		GetToken(&token);
-
-		if( token.type == ttAssignment )
-		{
-			asCScriptNode	*tmp;
-
-			RewindTo(&token);
-
-			tmp = SuperficiallyParseVarInit();
-
-			node->AddChildLast(tmp);
-			if( isSyntaxError ) return node;
-			GetToken(&token);
-		}
-
-		if(ttListSeparator != token.type) 
-		{
-			RewindTo(&token);
-			break;
-		}
-	}
-
-	//	check for the end of the declaration block
-	GetToken(&token);
-	if( token.type != ttEndStatementBlock ) 
-	{
-		RewindTo(&token);
-		Error(ExpectedToken("}"), &token);
-		Error(InsteadFound(token), &token);
-		return node;
-	}
-
-	//	Parse the declarations
-	return node;
-}
-
-bool asCParser::IsVarDecl()
-{
-	// Set start point so that we can rewind
-	sToken t;
-	GetToken(&t);
-	RewindTo(&t);
-
-	// A class property decl can be preceded by 'private' or 'protected'
-	sToken t1;
-	GetToken(&t1);
-	if( t1.type != ttPrivate && t1.type != ttProtected )
-		RewindTo(&t1);
-
-	// A variable decl can start with a const
-	GetToken(&t1);
-	if( t1.type == ttConst )
-		GetToken(&t1);
-
-	sToken t2;
-	if( t1.type != ttAuto )
-	{
-		// The type may be initiated with the scope operator
-		if( t1.type == ttScope )
-			GetToken(&t1);
-
-		// The type may be preceeded with a multilevel scope
-		GetToken(&t2);
-		while( t1.type == ttIdentifier )
-		{
-			if (t2.type == ttScope)
-			{
-				GetToken(&t1);
-				GetToken(&t2);
-				continue;
-			}
-			else if(t2.type == ttLessThan)
-			{
-				// Template types can also be used as scope identifiers
-				RewindTo(&t2);
-				if (CheckTemplateType(t1))
-				{
-					sToken t3;
-					GetToken(&t3);
-					if (t3.type == ttScope)
-					{
-						GetToken(&t1);
-						GetToken(&t2);
-						continue;
-					}
-				}
-			}
-
-			break;
-		}
-		RewindTo(&t2);
-	}
-
-	// We don't validate if the identifier is an actual declared type at this moment
-	// as it may wrongly identify the statement as a non-declaration if the user typed
-	// the name incorrectly. The real type is validated in ParseDeclaration where a
-	// proper error message can be given.
-	if( !IsRealType(t1.type) && t1.type != ttIdentifier && t1.type != ttAuto )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	if( !CheckTemplateType(t1) )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	// Object handles can be interleaved with the array brackets
-	// Even though declaring variables with & is invalid we'll accept 
-	// it here to give an appropriate error message later
-	GetToken(&t2);
-	while( t2.type == ttHandle || t2.type == ttAmp || t2.type == ttOpenBracket )
-	{
-		if( t2.type == ttOpenBracket )
-		{
-			GetToken(&t2);
-			if( t2.type != ttCloseBracket )
-			{
-				RewindTo(&t);
-				return false;
-			}
-		}
-
-		GetToken(&t2);
-	}
-
-	if( t2.type != ttIdentifier )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	GetToken(&t2);
-	if( t2.type == ttEndStatement || t2.type == ttAssignment || t2.type == ttListSeparator )
-	{
-		RewindTo(&t);
-		return true;
-	}
-	if( t2.type == ttOpenParanthesis ) 
-	{	
-		// If the closing paranthesis is followed by a statement 
-		// block or end-of-file, then treat it as a function. A
-		// function decl may have nested paranthesis so we need to
-		// check for this too.
-		int nest = 0;
-		while( t2.type != ttEnd )
-		{
-			if( t2.type == ttOpenParanthesis )
-				nest++;
-			else if( t2.type == ttCloseParanthesis )
-			{
-				nest--;
-				if( nest == 0 )
-					break;
-			}
-			GetToken(&t2);
-		}
-
-		if( t2.type == ttEnd )
-			return false;
-		else
-		{
-			GetToken(&t1);
-			RewindTo(&t);
-			if( t1.type == ttStartStatementBlock || t1.type == ttEnd )
-				return false;
-		}
-
-		RewindTo(&t);
-
-		return true;
-	}
-
-	RewindTo(&t);
-	return false;
-}
-
-bool asCParser::IsVirtualPropertyDecl()
-{
-	// Set start point so that we can rewind
-	sToken t;
-	GetToken(&t);
-	RewindTo(&t);
-
-	// A class property decl can be preceded by 'private' or 'protected'
-	sToken t1;
-	GetToken(&t1);
-	if( t1.type != ttPrivate && t1.type != ttProtected )
-		RewindTo(&t1);
-
-	// A variable decl can start with a const
-	GetToken(&t1);
-	if( t1.type == ttConst )
-		GetToken(&t1);
-
-	// We don't validate if the identifier is an actual declared type at this moment
-	// as it may wrongly identify the statement as a non-declaration if the user typed
-	// the name incorrectly. The real type is validated in ParseDeclaration where a
-	// proper error message can be given.
-	if( t1.type == ttScope )
-		GetToken(&t1);
-
-	if( t1.type == ttIdentifier )
-	{
-		sToken t2;
-		GetToken(&t2);
-		while( t1.type == ttIdentifier && t2.type == ttScope )
-		{
-			GetToken(&t1);
-			GetToken(&t2);
-		}
-
-		RewindTo(&t2);
-	}
-	else if( !IsRealType(t1.type) )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	if( !CheckTemplateType(t1) )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	// Object handles can be interleaved with the array brackets
-	sToken t2;
-	GetToken(&t2);
-	while( t2.type == ttHandle || t2.type == ttOpenBracket )
-	{
-		if( t2.type == ttOpenBracket )
-		{
-			GetToken(&t2);
-			if( t2.type != ttCloseBracket )
-			{
-				RewindTo(&t);
-				return false;
-			}
-		}
-
-		GetToken(&t2);
-	}
-
-	if( t2.type != ttIdentifier )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	GetToken(&t2);
-	if( t2.type == ttStartStatementBlock )
-	{
-		RewindTo(&t);
-		return true;
-	}
-
-	RewindTo(&t);
-	return false;
-}
-
-bool asCParser::IsFuncDecl(bool isMethod)
-{
-	// Set start point so that we can rewind
-	sToken t;
-	GetToken(&t);
-	RewindTo(&t);
-
-	if( isMethod )
-	{
-		// A class method decl can be preceded by 'private' or 'protected'
-		sToken t1, t2;
-		GetToken(&t1);
-		if( t1.type != ttPrivate && t1.type != ttProtected )
-			RewindTo(&t1);
-
-		// A class constructor starts with identifier followed by parenthesis
-		// A class destructor starts with the ~ token
-		GetToken(&t1);
-		GetToken(&t2);
-		RewindTo(&t1);
-		if( (t1.type == ttIdentifier && t2.type == ttOpenParanthesis) || t1.type == ttBitNot )
-		{
-			RewindTo(&t);
-			return true;
-		}
-	}
-
-	// A function decl can start with a const
-	sToken t1;
-	GetToken(&t1);
-	if( t1.type == ttConst )
-		GetToken(&t1);
-
-	// The return type can be optionally preceeded by a scope
-	if( t1.type == ttScope )
-		GetToken(&t1);
-	while( t1.type == ttIdentifier )
-	{
-		sToken t2;
-		GetToken(&t2);
-		if( t2.type == ttScope )
-			GetToken(&t1);
-		else
-		{
-			RewindTo(&t2);
-			break;
-		}
-	}
-
-	if( !IsDataType(t1) )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	// If the type is a template type, then skip the angle brackets holding the subtype
-	if( !CheckTemplateType(t1) )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	// Object handles can be interleaved with the array brackets
-	sToken t2;
-	GetToken(&t2);
-	while( t2.type == ttHandle || t2.type == ttOpenBracket )
-	{
-		if( t2.type == ttOpenBracket )
-		{
-			GetToken(&t2);
-			if( t2.type != ttCloseBracket )
-			{
-				RewindTo(&t);
-				return false;
-			}
-		}
-
-		GetToken(&t2);
-	}
-
-	// There can be an ampersand if the function returns a reference
-	if( t2.type == ttAmp )
-	{
-		RewindTo(&t);
-		return true;
-	}
-
-	if( t2.type != ttIdentifier )
-	{
-		RewindTo(&t);
-		return false;
-	}
-
-	GetToken(&t2);
-	if( t2.type == ttOpenParanthesis ) 
-	{	
-		// If the closing parenthesis is not followed by a  
-		// statement block then it is not a function. 
-		// It's possible that there are nested parenthesis due to default
-		// arguments so this should be checked for.
-		int nest = 0;
-		GetToken(&t2);
-		while( (nest || t2.type != ttCloseParanthesis) && t2.type != ttEnd )
-		{
-			if( t2.type == ttOpenParanthesis )
-				nest++;
-			if( t2.type == ttCloseParanthesis )
-				nest--;
-
-			GetToken(&t2);
-		}
-
-		if( t2.type == ttEnd )
-			return false;
-		else
-		{
-			if( isMethod )
-			{
-				// A class method can have a 'const' token after the parameter list
-				GetToken(&t1);
-				if( t1.type != ttConst )
-					RewindTo(&t1);
-				
-				// A class method may also have any number of additional inheritance behavior specifiers
-				for( ; ; )
-				{
-					GetToken(&t2);
-					if( !IdentifierIs(t2, FINAL_TOKEN) && !IdentifierIs(t2, OVERRIDE_TOKEN) )
-					{
-						RewindTo(&t2);
-						break;
-					}
-				}
-			}
-
-			GetToken(&t1);
-			RewindTo(&t);
-			if( t1.type == ttStartStatementBlock )
-				return true;
-		}
-
-		RewindTo(&t);
-		return false;
-	}
-
-	RewindTo(&t);
-	return false;
-}
-
-// BNF: FUNCDEF ::= 'funcdef' TYPE ['&'] IDENTIFIER PARAMLIST ';'
-asCScriptNode *asCParser::ParseFuncDef()
-{
-	asCScriptNode *node = CreateNode(snFuncDef);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-	GetToken(&t1);
-	if( t1.type != ttFuncDef )
-	{
-		Error(asCTokenizer::GetDefinition(ttFuncDef), &t1);
-		return node;
-	}
-
-	node->SetToken(&t1);
-
-	node->AddChildLast(ParseType(true));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseTypeMod(false));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseParameterList());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t1);
-	if( t1.type != ttEndStatement )
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatement)), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: FUNC ::= ['private' | 'protected' | 'shared'] [((TYPE ['&']) | '~')] IDENTIFIER PARAMLIST ['const'] {'override' | 'final'} STATBLOCK 
-asCScriptNode *asCParser::ParseFunction(bool isMethod)
-{
-	asCScriptNode *node = CreateNode(snFunction);
-	if( node == 0 ) return 0;
-
-	sToken t1,t2;
-	GetToken(&t1);
-	GetToken(&t2);
-	RewindTo(&t1);
-
-	// A class method can start with 'private' or 'protected'
-	if( isMethod && t1.type == ttPrivate )
-		node->AddChildLast(ParseToken(ttPrivate));
-	else if( isMethod && t1.type == ttProtected )
-		node->AddChildLast(ParseToken(ttProtected));
-	if( isSyntaxError ) return node;
-
-	// A global function can be marked as shared
-	if( !isMethod && IdentifierIs(t1, SHARED_TOKEN) )
-	{
-		node->AddChildLast(ParseIdentifier());
-		if( isSyntaxError ) return node;
-	}
-
-	// If it is a global function, or a method, except constructor and destructor, then the return type is parsed
-	if( !isMethod || (t1.type != ttBitNot && t2.type != ttOpenParanthesis) )
-	{
-		node->AddChildLast(ParseType(true));
-		if( isSyntaxError ) return node;
-
-		node->AddChildLast(ParseTypeMod(false));
-		if( isSyntaxError ) return node;
-	}
-
-	// If this is a class destructor then it starts with ~, and no return type is declared
-	if( isMethod && t1.type == ttBitNot )
-	{
-		node->AddChildLast(ParseToken(ttBitNot));
-		if( isSyntaxError ) return node;
-	}
-
-	node->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseParameterList());
-	if( isSyntaxError ) return node;
-
-	if( isMethod )
-	{
-		GetToken(&t1);
-		RewindTo(&t1);
-
-		// Is the method a const?
-		if( t1.type == ttConst )
-			node->AddChildLast(ParseToken(ttConst));
-
-		// TODO: Should support abstract methods, in which case no statement block should be provided
-		ParseMethodOverrideBehaviors(node);
-		if( isSyntaxError ) return node;
-	}
-
-	// We should just find the end of the statement block here. The statements 
-	// will be parsed on request by the compiler once it starts the compilation.
-	node->AddChildLast(SuperficiallyParseStatementBlock());
-
-	return node;
-}
-
-// BNF: INTFMTHD ::= TYPE ['&'] IDENTIFIER PARAMLIST ['const'] ';'
-asCScriptNode *asCParser::ParseInterfaceMethod()
-{
-	asCScriptNode *node = CreateNode(snFunction);
-	if( node == 0 ) return 0;
-
-	node->AddChildLast(ParseType(true));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseTypeMod(false));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseParameterList());
-	if( isSyntaxError ) return node;
-
-	// Parse an optional const after the method definition
-	sToken t1;
-	GetToken(&t1);
-	RewindTo(&t1);
-	if( t1.type == ttConst )
-		node->AddChildLast(ParseToken(ttConst));
-
-	GetToken(&t1);
-	if( t1.type != ttEndStatement )
-	{
-		Error(ExpectedToken(";"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: VIRTPROP ::= ['private' | 'protected'] TYPE ['&'] IDENTIFIER '{' {('get' | 'set') ['const'] [('override' | 'final')] (STATBLOCK | ';')} '}'
-asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterface)
-{
-	asCScriptNode *node = CreateNode(snVirtualProperty);
-	if( node == 0 ) return 0;
-
-	sToken t1,t2;
-	GetToken(&t1);
-	GetToken(&t2);
-	RewindTo(&t1);
-
-	// A class method can start with 'private' or 'protected'
-	if( isMethod && t1.type == ttPrivate )
-		node->AddChildLast(ParseToken(ttPrivate));
-	else if( isMethod && t1.type == ttProtected )
-		node->AddChildLast(ParseToken(ttProtected));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseType(true));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseTypeMod(false));
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseIdentifier());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t1);
-	if( t1.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	for(;;)
-	{
-		GetToken(&t1);
-		asCScriptNode *accessorNode = 0;
-
-		if( IdentifierIs(t1, GET_TOKEN) || IdentifierIs(t1, SET_TOKEN) )
-		{
-			accessorNode = CreateNode(snVirtualProperty);
-			if( accessorNode == 0 ) return 0;
-
-			node->AddChildLast(accessorNode);
-
-			RewindTo(&t1);
-			accessorNode->AddChildLast(ParseIdentifier());
-			
-			if( isMethod )
-			{
-				GetToken(&t1);
-				RewindTo(&t1);
-				if( t1.type == ttConst )
-					accessorNode->AddChildLast(ParseToken(ttConst));
-
-				if( !isInterface )
-				{
-					ParseMethodOverrideBehaviors(accessorNode);
-					if( isSyntaxError ) return node;
-				}
-			}
-
-			if( !isInterface )
-			{
-				GetToken(&t1);
-				if( t1.type == ttStartStatementBlock )
-				{
-					RewindTo(&t1);
-					accessorNode->AddChildLast(SuperficiallyParseStatementBlock());
-					if( isSyntaxError ) return node;
-				}
-				else if( t1.type != ttEndStatement )
-				{
-					Error(ExpectedTokens(";", "{"), &t1);
-					Error(InsteadFound(t1), &t1);
-					return node;
-				}
-			}
-			else
-			{
-				GetToken(&t1);
-				if( t1.type != ttEndStatement )
-				{
-					Error(ExpectedToken(";"), &t1);
-					Error(InsteadFound(t1), &t1);
-					return node;
-				}
-			}
-		}
-		else if( t1.type == ttEndStatementBlock )
-			break;
-		else
-		{
-			const char *tokens[] = { GET_TOKEN, SET_TOKEN, asCTokenizer::GetDefinition(ttEndStatementBlock) };
-			Error(ExpectedOneOf(tokens, 3), &t1);
-			Error(InsteadFound(t1), &t1);
-			return node;
-		}
-	}
-
-	return node;
-}
-
-// BNF: INTERFACE ::= ['shared'] 'interface' IDENTIFIER [':' IDENTIFIER {',' IDENTIFIER}] '{' {VIRTPROP | INTFMTHD} '}'
-asCScriptNode *asCParser::ParseInterface()
-{
-	asCScriptNode *node = CreateNode(snInterface);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-
-	// Allow keyword 'shared' before 'interface'
-	if( t.type == ttIdentifier )
-	{
-		tempString.Assign(&script->code[t.pos], t.length);
-		if( tempString != SHARED_TOKEN )
-		{
-			Error(ExpectedToken(SHARED_TOKEN), &t);
-			Error(InsteadFound(t), &t);
-			return node;
-		}
-
-		RewindTo(&t);
-		node->AddChildLast(ParseIdentifier());
-		GetToken(&t);
-	}
-
-	if( t.type != ttInterface )
-	{
-		Error(ExpectedToken("interface"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-
-	node->AddChildLast(ParseIdentifier());
-
-	// Can optionally have a list of interfaces that are inherited
-	GetToken(&t);
-	if( t.type == ttColon )
-	{
-		asCScriptNode *inherit = CreateNode(snIdentifier);
-		node->AddChildLast(inherit);
-
-		ParseOptionalScope(inherit);
-		inherit->AddChildLast(ParseIdentifier());
-		GetToken(&t);
-		while( t.type == ttListSeparator )
-		{
-			inherit = CreateNode(snIdentifier);
-			node->AddChildLast(inherit);
-
-			ParseOptionalScope(inherit);
-			inherit->AddChildLast(ParseIdentifier());
-			GetToken(&t);
-		}
-	}
-
-	if( t.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	// Parse interface methods
-	GetToken(&t);
-	RewindTo(&t);
-	while( t.type != ttEndStatementBlock && t.type != ttEnd )
-	{
-		if( IsVirtualPropertyDecl() )
-			node->AddChildLast(ParseVirtualPropertyDecl(true, true));
-		else if( t.type == ttEndStatement )
-			// Skip empty declarations
-			GetToken(&t);
-		else
-			// Parse the method signature
-			node->AddChildLast(ParseInterfaceMethod());
-
-		if( isSyntaxError ) return node;
-		
-		GetToken(&t);
-		RewindTo(&t);
-	}
-
-	GetToken(&t);
-	if( t.type != ttEndStatementBlock )
-	{
-		Error(ExpectedToken("}"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: MIXIN ::= 'mixin' CLASS
-asCScriptNode *asCParser::ParseMixin()
-{
-	asCScriptNode *node = CreateNode(snMixin);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-
-	if( t.type != ttMixin )
-	{
-		Error(ExpectedToken("mixin"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-
-	// A mixin token must be followed by a class declaration
-	node->AddChildLast(ParseClass());
-
-	return node;
-}
-
-// BNF: CLASS ::= {'shared' | 'abstract' | 'final'} 'class' IDENTIFIER [':' IDENTIFIER {',' IDENTIFIER}] '{' {VIRTPROP | FUNC | VAR | FUNCDEF} '}'
-asCScriptNode *asCParser::ParseClass()
-{
-	asCScriptNode *node = CreateNode(snClass);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-
-	// Allow the keywords 'shared', 'abstract', and 'final' before 'class'
-	while( IdentifierIs(t, SHARED_TOKEN) ||
-		   IdentifierIs(t, ABSTRACT_TOKEN) ||
-		   IdentifierIs(t, FINAL_TOKEN) )
-	{
-		RewindTo(&t);
-		node->AddChildLast(ParseIdentifier());
-		GetToken(&t);
-	}
-
-	if( t.type != ttClass )
-	{
-		Error(ExpectedToken("class"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->SetToken(&t);
-
-	if( engine->ep.allowImplicitHandleTypes )
-	{
-		// Parse 'implicit handle class' construct
-		GetToken(&t);
-		
-		if ( t.type == ttHandle )
-			node->SetToken(&t);
-		else
-			RewindTo(&t);
-	}
-
-	node->AddChildLast(ParseIdentifier());
-
-	GetToken(&t);
-
-	// Optional list of interfaces that are being implemented and classes that are being inherited
-	if( t.type == ttColon )
-	{
-		asCScriptNode *inherit = CreateNode(snIdentifier);
-		node->AddChildLast(inherit);
-
-		ParseOptionalScope(inherit);
-		inherit->AddChildLast(ParseIdentifier());
-		GetToken(&t);
-		while( t.type == ttListSeparator )
-		{
-			inherit = CreateNode(snIdentifier);
-			node->AddChildLast(inherit);
-
-			ParseOptionalScope(inherit);
-			inherit->AddChildLast(ParseIdentifier());
-			GetToken(&t);
-		}
-	}
-
-	if( t.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	// Parse properties
-	GetToken(&t);
-	RewindTo(&t);
-	while( t.type != ttEndStatementBlock && t.type != ttEnd )
-	{
-		// Is it a property or a method?
-		if (t.type == ttFuncDef)
-			node->AddChildLast(ParseFuncDef());
-		else if( IsFuncDecl(true) )
-			node->AddChildLast(ParseFunction(true));
-		else if( IsVirtualPropertyDecl() )
-			node->AddChildLast(ParseVirtualPropertyDecl(true, false));
-		else if( IsVarDecl() )
-			node->AddChildLast(ParseDeclaration(true));
-		else if( t.type == ttEndStatement )
-			// Skip empty declarations
-			GetToken(&t);
-		else 
-		{
-			Error(TXT_EXPECTED_METHOD_OR_PROPERTY, &t);
-			Error(InsteadFound(t), &t);
-			return node;
-		}
-
-		if( isSyntaxError )
-			return node;
-
-		GetToken(&t);
-		RewindTo(&t);
-	}
-
-	GetToken(&t);
-	if( t.type != ttEndStatementBlock )
-	{
-		Error(ExpectedToken("}"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-int asCParser::ParseVarInit(asCScriptCode *in_script, asCScriptNode *in_init)
-{
-	Reset();
-
-	// Tell the parser to validate the identifiers as valid types
-	checkValidTypes = true;
-
-	this->script = in_script;
-	sourcePos = in_init->tokenPos;
-
-	// If next token is assignment, parse expression
-	sToken t;
-	GetToken(&t);
-	if( t.type == ttAssignment )
-	{
-		GetToken(&t);
-		RewindTo(&t);
-		if( t.type == ttStartStatementBlock )
-			scriptNode = ParseInitList();
-		else
-			scriptNode = ParseAssignment();
-	}
-	else if( t.type == ttOpenParanthesis ) 
-	{
-		RewindTo(&t);
-		scriptNode = ParseArgList();
-	}
-	else
-	{
-		int tokens[] = {ttAssignment, ttOpenParanthesis};
-		Error(ExpectedOneOf(tokens, 2), &t);
-		Error(InsteadFound(t), &t);
-	}
-
-	// Don't allow any more tokens after the expression
-	GetToken(&t);
-	if( t.type != ttEnd && t.type != ttEndStatement && t.type != ttListSeparator && t.type != ttEndStatementBlock )
-	{
-		asCString msg;
-		msg.Format(TXT_UNEXPECTED_TOKEN_s, asCTokenizer::GetDefinition(t.type));
-		Error(msg, &t);
-	}
-
-	if( isSyntaxError || errorWhileParsing )
-		return -1;
-
-	return 0;
-}
-
-asCScriptNode *asCParser::SuperficiallyParseVarInit()
-{
-	asCScriptNode *node = CreateNode(snAssignment);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	node->UpdateSourcePos(t.pos, t.length);
-
-	if( t.type == ttAssignment )
-	{
-		GetToken(&t);
-		sToken start = t;
-
-		// Find the end of the expression
-		int indentParan = 0;
-		int indentBrace = 0;
-		while( indentParan || indentBrace || (t.type != ttListSeparator && t.type != ttEndStatement && t.type != ttEndStatementBlock) )
-		{
-			if( t.type == ttOpenParanthesis )
-				indentParan++;
-			else if( t.type == ttCloseParanthesis )
-				indentParan--;
-			else if( t.type == ttStartStatementBlock )
-				indentBrace++;
-			else if( t.type == ttEndStatementBlock )
-				indentBrace--;
-			else if( t.type == ttNonTerminatedStringConstant )
-			{
-				Error(TXT_NONTERMINATED_STRING, &t);
-				break;
-			}
-			else if( t.type == ttEnd )
-			{
-				Error(TXT_UNEXPECTED_END_OF_FILE, &t);
-				Info(TXT_WHILE_PARSING_EXPRESSION, &start);
-				break;
-			}
-			GetToken(&t);
-		}
-
-		// Rewind so that the next token read is the list separator, end statement, or end statement block
-		RewindTo(&t);
-	}
-	else if( t.type == ttOpenParanthesis )
-	{
-		sToken start = t;
-
-		// Find the end of the argument list
-		int indent = 1;
-		while( indent )
-		{
-			GetToken(&t);
-			if( t.type == ttOpenParanthesis )
-				indent++;
-			else if( t.type == ttCloseParanthesis )
-				indent--;
-			else if( t.type == ttNonTerminatedStringConstant )
-			{
-				Error(TXT_NONTERMINATED_STRING, &t);
-				break;
-			}
-			else if( t.type == ttEnd )
-			{
-				Error(TXT_UNEXPECTED_END_OF_FILE, &t);
-				Info(TXT_WHILE_PARSING_ARG_LIST, &start);
-				break;
-			}
-		}
-	}
-	else
-	{
-		int tokens[] = {ttAssignment, ttOpenParanthesis};
-		Error(ExpectedOneOf(tokens, 2), &t);
-		Error(InsteadFound(t), &t);
-	}
-
-	return node;
-}
-
-asCScriptNode *asCParser::SuperficiallyParseStatementBlock()
-{
-	asCScriptNode *node = CreateNode(snStatementBlock);
-	if( node == 0 ) return 0;
-
-	// This function will only superficially parse the statement block in order to find the end of it
-	sToken t1;
-
-	GetToken(&t1);
-	if( t1.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	sToken start = t1;
-
-	int level = 1;
-	while( level > 0 && !isSyntaxError )
-	{
-		GetToken(&t1);
-		if( t1.type == ttEndStatementBlock )
-			level--;
-		else if( t1.type == ttStartStatementBlock )
-			level++;
-		else if( t1.type == ttNonTerminatedStringConstant )
-		{
-			Error(TXT_NONTERMINATED_STRING, &t1);
-			break;
-		}
-		else if( t1.type == ttEnd )
-		{
-			Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
-			Info(TXT_WHILE_PARSING_STATEMENT_BLOCK, &start);
-			break;
-		}
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	return node;
-}
-
-// BNF: STATBLOCK ::= '{' {VAR | STATEMENT} '}'
-asCScriptNode *asCParser::ParseStatementBlock()
-{
-	asCScriptNode *node = CreateNode(snStatementBlock);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( t1.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	sToken start = t1;
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	for(;;)
-	{
-		while( !isSyntaxError )
-		{
-			GetToken(&t1);
-			if( t1.type == ttEndStatementBlock )
-			{
-				node->UpdateSourcePos(t1.pos, t1.length);
-
-				// Statement block is finished
-				return node;
-			}
-			else
-			{
-				RewindTo(&t1);
-
-				if( IsVarDecl() )
-					node->AddChildLast(ParseDeclaration());
-				else
-					node->AddChildLast(ParseStatement());
-			}
-		}
-
-		if( isSyntaxError )
-		{
-			// Search for either ';', '{', '}', or end
-			GetToken(&t1);
-			while( t1.type != ttEndStatement && t1.type != ttEnd &&
-				   t1.type != ttStartStatementBlock && t1.type != ttEndStatementBlock )
-			{
-				GetToken(&t1);
-			}
-
-			// Skip this statement block
-			if( t1.type == ttStartStatementBlock )
-			{
-				// Find the end of the block and skip nested blocks
-				int level = 1;
-				while( level > 0 )
-				{
-					GetToken(&t1);
-					if( t1.type == ttStartStatementBlock ) level++;
-					if( t1.type == ttEndStatementBlock ) level--;
-					if( t1.type == ttEnd ) break;
-				}
-			}
-			else if( t1.type == ttEndStatementBlock )
-			{
-				RewindTo(&t1);
-			}
-			else if( t1.type == ttEnd )
-			{
-				Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
-				Info(TXT_WHILE_PARSING_STATEMENT_BLOCK, &start);
-				return node;
-			}
-
-			isSyntaxError = false;
-		}
-	}
-	UNREACHABLE_RETURN;
-}
-
-// BNF: INITLIST ::= '{' [ASSIGN | INITLIST] {',' [ASSIGN | INITLIST]} '}'
-asCScriptNode *asCParser::ParseInitList()
-{
-	asCScriptNode *node = CreateNode(snInitList);
-	if( node == 0 ) return 0;
-
-	sToken t1;
-
-	GetToken(&t1);
-	if( t1.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t1);
-		Error(InsteadFound(t1), &t1);
-		return node;
-	}
-
-	node->UpdateSourcePos(t1.pos, t1.length);
-
-	GetToken(&t1);
-	if( t1.type == ttEndStatementBlock )
-	{
-		node->UpdateSourcePos(t1.pos, t1.length);
-
-		// Statement block is finished
-		return node;
-	}
-	else
-	{
-		RewindTo(&t1);
-		for(;;)
-		{
-			GetToken(&t1);
-			if( t1.type == ttListSeparator )
-			{
-				// No expression 
-				node->AddChildLast(CreateNode(snUndefined));
-				node->lastChild->UpdateSourcePos(t1.pos, 1);
-				
-				GetToken(&t1);
-				if( t1.type == ttEndStatementBlock )
-				{
-					// No expression
-					node->AddChildLast(CreateNode(snUndefined));
-					node->lastChild->UpdateSourcePos(t1.pos, 1);
-					node->UpdateSourcePos(t1.pos, t1.length);
-					return node;
-				}
-				RewindTo(&t1);
-			}
-			else if( t1.type == ttEndStatementBlock )
-			{
-				// No expression 
-				node->AddChildLast(CreateNode(snUndefined));
-				node->lastChild->UpdateSourcePos(t1.pos, 1);
-				node->UpdateSourcePos(t1.pos, t1.length);
-
-				// Statement block is finished
-				return node;
-			}
-			else if( t1.type == ttStartStatementBlock )
-			{
-				RewindTo(&t1);
-				node->AddChildLast(ParseInitList());
-				if( isSyntaxError ) return node;
-
-				GetToken(&t1);
-				if( t1.type == ttListSeparator )
-					continue;
-				else if( t1.type == ttEndStatementBlock )
-				{
-					node->UpdateSourcePos(t1.pos, t1.length);
-
-					// Statement block is finished
-					return node;
-				}
-				else
-				{
-					Error(ExpectedTokens("}", ","), &t1);
-					Error(InsteadFound(t1), &t1);
-					return node;
-				}
-			}
-			else
-			{
-				RewindTo(&t1);
-				node->AddChildLast(ParseAssignment());
-				if( isSyntaxError ) return node;
-
-
-				GetToken(&t1);
-				if( t1.type == ttListSeparator )
-					continue;
-				else if( t1.type == ttEndStatementBlock )
-				{
-					node->UpdateSourcePos(t1.pos, t1.length);
-
-					// Statement block is finished
-					return node;
-				}
-				else
-				{
-					Error(ExpectedTokens("}", ","), &t1);
-					Error(InsteadFound(t1), &t1);
-					return node;
-				}
-			}
-		}
-	}
-	UNREACHABLE_RETURN;
-}
-
-// BNF: VAR ::= ['private'|'protected'] TYPE IDENTIFIER [( '=' (INITLIST | EXPR)) | ARGLIST] {',' IDENTIFIER [( '=' (INITLIST | EXPR)) | ARGLIST]} ';'
-asCScriptNode *asCParser::ParseDeclaration(bool isClassProp, bool isGlobalVar)
-{
-	asCScriptNode *node = CreateNode(snDeclaration);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	RewindTo(&t);
-
-	// A class property can be preceeded by private
-	if( t.type == ttPrivate && isClassProp )
-		node->AddChildLast(ParseToken(ttPrivate));
-	else if( t.type == ttProtected && isClassProp )
-		node->AddChildLast(ParseToken(ttProtected));
-	
-	// Parse data type
-	node->AddChildLast(ParseType(true, false, !isClassProp));
-	if( isSyntaxError ) return node;
-
-	for(;;)
-	{
-		// Parse identifier
-		node->AddChildLast(ParseIdentifier());
-		if( isSyntaxError ) return node;
-
-		if( isClassProp || isGlobalVar )
-		{
-			// Only superficially parse the initialization info for the class property
-			GetToken(&t);
-			RewindTo(&t);
-			if( t.type == ttAssignment || t.type == ttOpenParanthesis )
-			{
-				node->AddChildLast(SuperficiallyParseVarInit());
-				if( isSyntaxError ) return node;
-			}
-		}
-		else
-		{
-			// If next token is assignment, parse expression
-			GetToken(&t);
-			if( t.type == ttOpenParanthesis )
-			{
-				RewindTo(&t);
-				node->AddChildLast(ParseArgList());
-				if( isSyntaxError ) return node;
-			}
-			else if( t.type == ttAssignment )
-			{
-				GetToken(&t);
-				RewindTo(&t);
-				if( t.type == ttStartStatementBlock )
-				{
-					node->AddChildLast(ParseInitList());
-					if( isSyntaxError ) return node;
-				}
-				else
-				{
-					node->AddChildLast(ParseAssignment());
-					if( isSyntaxError ) return node;
-				}
-			}
-			else
-				RewindTo(&t);
-		}
-
-		// continue if list separator, else terminate with end statement
-		GetToken(&t);
-		if( t.type == ttListSeparator )
-			continue;
-		else if( t.type == ttEndStatement )
-		{
-			node->UpdateSourcePos(t.pos, t.length);
-
-			return node;
-		}
-		else
-		{
-			Error(ExpectedTokens(",", ";"), &t);
-			Error(InsteadFound(t), &t);
-			return node;
-		}
-	}
-	UNREACHABLE_RETURN;
-}
-
-// BNF: STATEMENT ::= (IF | FOR | WHILE | RETURN | STATBLOCK | BREAK | CONTINUE | DOWHILE | SWITCH | EXPRSTAT)
-asCScriptNode *asCParser::ParseStatement()
-{
-	sToken t1;
-
-	GetToken(&t1);
-	RewindTo(&t1);
-
-	if( t1.type == ttIf )
-		return ParseIf();
-	else if( t1.type == ttFor )
-		return ParseFor();
-	else if( t1.type == ttWhile )
-		return ParseWhile();
-	else if( t1.type == ttReturn )
-		return ParseReturn();
-	else if( t1.type == ttStartStatementBlock )
-		return ParseStatementBlock();
-	else if( t1.type == ttBreak )
-		return ParseBreak();
-	else if( t1.type == ttContinue )
-		return ParseContinue();
-	else if( t1.type == ttDo )
-		return ParseDoWhile();
-	else if( t1.type == ttSwitch )
-		return ParseSwitch();
-	else
-	{
-		if( IsVarDecl() )
-		{
-			Error(TXT_UNEXPECTED_VAR_DECL, &t1);
-			return 0;
-		}
-		return ParseExpressionStatement();
-	}
-}
-
-// BNF: EXPRSTAT ::= [ASSIGN] ';'
-asCScriptNode *asCParser::ParseExpressionStatement()
-{
-	asCScriptNode *node = CreateNode(snExpressionStatement);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type == ttEndStatement )
-	{
-		node->UpdateSourcePos(t.pos, t.length);
-
-		return node;
-	}
-
-	RewindTo(&t);
-
-	node->AddChildLast(ParseAssignment());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttEndStatement )
-	{
-		Error(ExpectedToken(";"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: SWITCH ::= 'switch' '(' ASSIGN ')' '{' {CASE} '}'
-asCScriptNode *asCParser::ParseSwitch()
-{
-	asCScriptNode *node = CreateNode(snSwitch);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttSwitch )
-	{
-		Error(ExpectedToken("switch"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->AddChildLast(ParseAssignment());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttCloseParanthesis )
-	{
-		Error(ExpectedToken(")"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	GetToken(&t);
-	if( t.type != ttStartStatementBlock )
-	{
-		Error(ExpectedToken("{"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-	
-	while( !isSyntaxError )
-	{
-		GetToken(&t);
-		
-		if( t.type == ttEndStatementBlock )
-			break;
-
-		RewindTo(&t);
-
-		if( t.type != ttCase && t.type != ttDefault )
-		{
-			const char *tokens[] = {"case", "default"};
-			Error(ExpectedOneOf(tokens, 2), &t);
-			Error(InsteadFound(t), &t);
-			return node;
-		}
-
-		node->AddChildLast(ParseCase());
-		if( isSyntaxError ) return node;
-	}
-
-	if( t.type != ttEndStatementBlock )
-	{
-		Error(ExpectedToken("}"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	return node;
-}
-
-// BNF: CASE ::= (('case' EXPR) | 'default') ':' {STATEMENT}
-asCScriptNode *asCParser::ParseCase()
-{
-	asCScriptNode *node = CreateNode(snCase);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttCase && t.type != ttDefault )
-	{
-		Error(ExpectedTokens("case", "default"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	if(t.type == ttCase)
-	{
-		node->AddChildLast(ParseExpression());
-	}
-
-	GetToken(&t);
-	if( t.type != ttColon )
-	{
-		Error(ExpectedToken(":"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	// Parse statements until we find either of }, case, default, and break
-	GetToken(&t);
-	RewindTo(&t);
-	while( t.type != ttCase && 
-		   t.type != ttDefault && 
-		   t.type != ttEndStatementBlock && 
-		   t.type != ttBreak )
-	{
-		if( IsVarDecl() )
-			// Variable declarations are not allowed, but we parse it anyway to give a good error message
-			node->AddChildLast(ParseDeclaration());
-		else
-			node->AddChildLast(ParseStatement());
-		if( isSyntaxError ) return node;
-
-		GetToken(&t);
-		RewindTo(&t);
-	}
-
-	// If the case was ended with a break statement, add it to the node
-	if( t.type == ttBreak )
-		node->AddChildLast(ParseBreak());
-
-	return node;
-}
-
-// BNF: IF ::= 'if' '(' ASSIGN ')' STATEMENT ['else' STATEMENT]
-asCScriptNode *asCParser::ParseIf()
-{
-	asCScriptNode *node = CreateNode(snIf);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttIf )
-	{
-		Error(ExpectedToken("if"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->AddChildLast(ParseAssignment());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttCloseParanthesis )
-	{
-		Error(ExpectedToken(")"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->AddChildLast(ParseStatement());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttElse )
-	{
-		// No else statement return already
-		RewindTo(&t);
-		return node;
-	}
-
-	node->AddChildLast(ParseStatement());
-
-	return node;
-}
-
-// BNF: FOR ::= 'for' '(' (VAR | EXPRSTAT) EXPRSTAT [ASSIGN {',' ASSIGN}] ')' STATEMENT
-asCScriptNode *asCParser::ParseFor()
-{
-	asCScriptNode *node = CreateNode(snFor);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttFor )
-	{
-		Error(ExpectedToken("for"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	if( IsVarDecl() )
-		node->AddChildLast(ParseDeclaration());
-	else
-		node->AddChildLast(ParseExpressionStatement());
-	if( isSyntaxError ) return node;
-
-	node->AddChildLast(ParseExpressionStatement());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttCloseParanthesis )
-	{
-		RewindTo(&t);
-
-		// Parse N increment statements separated by ,
-		for(;;)
-		{
-			asCScriptNode *n = CreateNode(snExpressionStatement);
-			if( n == 0 ) return 0;
-			node->AddChildLast(n);
-			n->AddChildLast(ParseAssignment());
-			if( isSyntaxError ) return node;
-
-			GetToken(&t);
-			if( t.type == ttListSeparator )
-				continue;
-			else if( t.type == ttCloseParanthesis )
-				break;
-			else
-			{
-				const char *tokens[] = {",", ")"};
-				Error(ExpectedOneOf(tokens, 2), &t);
-				Error(InsteadFound(t), &t);
-				return node;
-			}
-		}
-	}
-
-	node->AddChildLast(ParseStatement());
-	
-	return node;
-}
-
-// BNF: WHILE ::= 'while' '(' ASSIGN ')' STATEMENT
-asCScriptNode *asCParser::ParseWhile()
-{
-	asCScriptNode *node = CreateNode(snWhile);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttWhile )
-	{
-		Error(ExpectedToken("while"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->AddChildLast(ParseAssignment());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttCloseParanthesis )
-	{
-		Error(ExpectedToken(")"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->AddChildLast(ParseStatement());
-
-	return node;
-}
-
-// BNF: DOWHILE ::= 'do' STATEMENT 'while' '(' ASSIGN ')' ';'
-asCScriptNode *asCParser::ParseDoWhile()
-{
-	asCScriptNode *node = CreateNode(snDoWhile);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttDo )
-	{
-		Error(ExpectedToken("do"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	node->AddChildLast(ParseStatement());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttWhile )
-	{
-		Error(ExpectedToken("while"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	GetToken(&t);
-	if( t.type != ttOpenParanthesis )
-	{
-		Error(ExpectedToken("("), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->AddChildLast(ParseAssignment());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttCloseParanthesis )
-	{
-		Error(ExpectedToken(")"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	GetToken(&t);
-	if( t.type != ttEndStatement )
-	{
-		Error(ExpectedToken(";"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: RETURN ::= 'return' [ASSIGN] ';'
-asCScriptNode *asCParser::ParseReturn()
-{
-	asCScriptNode *node = CreateNode(snReturn);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttReturn )
-	{
-		Error(ExpectedToken("return"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type == ttEndStatement )
-	{
-		node->UpdateSourcePos(t.pos, t.length);
-		return node;
-	}
-
-	RewindTo(&t);
-
-	node->AddChildLast(ParseAssignment());
-	if( isSyntaxError ) return node;
-
-	GetToken(&t);
-	if( t.type != ttEndStatement )
-	{
-		Error(ExpectedToken(";"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: BREAK ::= 'break' ';'
-asCScriptNode *asCParser::ParseBreak()
-{
-	asCScriptNode *node = CreateNode(snBreak);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttBreak )
-	{
-		Error(ExpectedToken("break"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttEndStatement )
-	{
-		Error(ExpectedToken(";"), &t);
-		Error(InsteadFound(t), &t);
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// BNF: CONTINUE ::= 'continue' ';'
-asCScriptNode *asCParser::ParseContinue()
-{
-	asCScriptNode *node = CreateNode(snContinue);
-	if( node == 0 ) return 0;
-
-	sToken t;
-	GetToken(&t);
-	if( t.type != ttContinue )
-	{
-		Error(ExpectedToken("continue"), &t);
-		Error(InsteadFound(t), &t);
-		return node;
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	GetToken(&t);
-	if( t.type != ttEndStatement )
-	{
-		Error(ExpectedToken(";"), &t);
-		Error(InsteadFound(t), &t);
-	}
-
-	node->UpdateSourcePos(t.pos, t.length);
-
-	return node;
-}
-
-// TODO: typedef: Typedefs should accept complex types as well
-// BNF: TYPEDEF ::= 'typedef' PRIMTYPE IDENTIFIER ';'
-asCScriptNode *asCParser::ParseTypedef()
-{
-	// Create the typedef node
-	asCScriptNode *node = CreateNode(snTypedef);
-	if( node == 0 ) return 0;
-
-	sToken	token;
-
-	GetToken(&token);
-	if( token.type != ttTypedef)
-	{
-		Error(ExpectedToken(asCTokenizer::GetDefinition(ttTypedef)), &token);
-		Error(InsteadFound(token), &token);
-		return node;
-	}
-	
-	node->SetToken(&token);
-	node->UpdateSourcePos(token.pos, token.length);
-
-	// Parse the base type
-	GetToken(&token);
-	RewindTo(&token);
-
-	// Make sure it is a primitive type (except ttVoid)
-	if( !IsRealType(token.type) || token.type == ttVoid )
-	{
-		asCString str;
-		str.Format(TXT_UNEXPECTED_TOKEN_s, asCTokenizer::GetDefinition(token.type));
-		Error(str, &token);
-		return node;
-	}
-
-	node->AddChildLast(ParseRealType());
-	node->AddChildLast(ParseIdentifier());
-
-	// Check for the end of the typedef
-	GetToken(&token);
-	if( token.type != ttEndStatement ) 
-	{
-		RewindTo(&token);
-		Error(ExpectedToken(asCTokenizer::GetDefinition(token.type)), &token);
-		Error(InsteadFound(token), &token);
-	}
-
-	return node;
-}
-
-void asCParser::ParseMethodOverrideBehaviors(asCScriptNode *funcNode)
-{
-	sToken t1;
-
-	for(;;)
-	{
-		GetToken(&t1);
-		RewindTo(&t1);
-
-		if( IdentifierIs(t1, FINAL_TOKEN) || IdentifierIs(t1, OVERRIDE_TOKEN) )
-			funcNode->AddChildLast(ParseIdentifier());
-		else
-			break;
-	}
-}
-#endif
-
-END_AS_NAMESPACE
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_parser.cpp
+//
+// This class parses the script code and builds a tree for compilation
+//
+//
+// I've documented the syntax in Extended BNF. You'll find it by doing a search in
+// this file by "BNF:". The starting point for the script language is SCRIPT ::=.
+//
+// Ref: http://matt.might.net/articles/grammars-bnf-ebnf/
+//
+// ( )  - used for grouping
+// { }  - 0 or more repetitions
+// [ ]  - optional
+//  |   - or
+// ' '  - token
+//
+
+
+
+#include "as_config.h"
+#include "as_parser.h"
+#include "as_tokendef.h"
+#include "as_texts.h"
+#include "as_debug.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable:4702) // unreachable code
+#endif
+
+BEGIN_AS_NAMESPACE
+
+asCParser::asCParser(asCBuilder *builder)
+{
+	this->builder    = builder;
+	this->engine     = builder->engine;
+
+	script                = 0;
+	scriptNode            = 0;
+	checkValidTypes       = false;
+	isParsingAppInterface = false;
+}
+
+asCParser::~asCParser()
+{
+	Reset();
+}
+
+void asCParser::Reset()
+{
+	errorWhileParsing     = false;
+	isSyntaxError         = false;
+	checkValidTypes       = false;
+	isParsingAppInterface = false;
+
+	sourcePos = 0;
+
+	if( scriptNode )
+	{
+		scriptNode->Destroy(engine);
+	}
+
+	scriptNode = 0;
+
+	script = 0;
+
+	lastToken.pos = size_t(-1);
+}
+
+asCScriptNode *asCParser::GetScriptNode()
+{
+	return scriptNode;
+}
+
+int asCParser::ParseFunctionDefinition(asCScriptCode *in_script, bool in_expectListPattern)
+{
+	Reset();
+
+	// Set flag that permits ? as datatype for parameters
+	isParsingAppInterface = true;
+
+	this->script = in_script;
+
+	scriptNode = ParseFunctionDefinition();
+
+	if( in_expectListPattern )
+		scriptNode->AddChildLast(ParseListPattern());
+
+	// The declaration should end after the definition
+	if( !isSyntaxError )
+	{
+		sToken t;
+		GetToken(&t);
+		if( t.type != ttEnd )
+		{
+			Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+			Error(InsteadFound(t), &t);
+			return -1;
+		}
+	}
+
+	if( errorWhileParsing )
+		return -1;
+
+	return 0;
+}
+
+asCScriptNode *asCParser::CreateNode(eScriptNode type)
+{
+	void *ptr = engine->memoryMgr.AllocScriptNode();
+	if( ptr == 0 )
+	{
+		// Out of memory
+		errorWhileParsing = true;
+		return 0;
+	}
+
+	return new(ptr) asCScriptNode(type);
+}
+
+int asCParser::ParseDataType(asCScriptCode *in_script, bool in_isReturnType)
+{
+	Reset();
+
+	this->script = in_script;
+
+	scriptNode = CreateNode(snDataType);
+	if( scriptNode == 0 ) return -1;
+
+	scriptNode->AddChildLast(ParseType(true));
+	if( isSyntaxError ) return -1;
+
+	if( in_isReturnType )
+	{
+		scriptNode->AddChildLast(ParseTypeMod(false));
+		if( isSyntaxError ) return -1;
+	}
+
+	// The declaration should end after the type
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttEnd )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+		Error(InsteadFound(t), &t);
+		return -1;
+	}
+
+	if( errorWhileParsing )
+		return -1;
+
+	return 0;
+}
+
+
+// Parse a template declaration: IDENTIFIER '<' 'class'? IDENTIFIER '>'
+int asCParser::ParseTemplateDecl(asCScriptCode *in_script)
+{
+	Reset();
+
+	this->script = in_script;
+	scriptNode = CreateNode(snUndefined);
+	if( scriptNode == 0 ) return -1;
+
+	scriptNode->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return -1;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttLessThan )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttLessThan)), &t);
+		Error(InsteadFound(t), &t);
+		return -1;
+	}
+
+	// The class token is optional
+	GetToken(&t);
+	if( t.type != ttClass )
+		RewindTo(&t);
+
+	scriptNode->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return -1;
+
+	// There can be multiple sub types
+	GetToken(&t);
+
+	// Parse template types by list separator
+	while(t.type == ttListSeparator)
+	{
+		GetToken(&t);
+		if( t.type != ttClass )
+			RewindTo(&t);
+		scriptNode->AddChildLast(ParseIdentifier());
+
+		if( isSyntaxError ) return -1;
+		GetToken(&t);
+	}
+
+	if( t.type != ttGreaterThan )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttGreaterThan)), &t);
+		Error(InsteadFound(t), &t);
+		return -1;
+	}
+
+	GetToken(&t);
+	if( t.type != ttEnd )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+		Error(InsteadFound(t), &t);
+		return -1;
+	}
+
+	if( errorWhileParsing )
+		return -1;
+
+	return 0;
+}
+
+int asCParser::ParsePropertyDeclaration(asCScriptCode *in_script)
+{
+	Reset();
+
+	this->script = in_script;
+
+	scriptNode = CreateNode(snDeclaration);
+	if( scriptNode == 0 ) return -1;
+
+	scriptNode->AddChildLast(ParseType(true));
+	if( isSyntaxError ) return -1;
+
+	// Allow optional '&' to indicate that the property is indirect, i.e. stored as reference
+	sToken t;
+	GetToken(&t);
+	RewindTo(&t);
+	if( t.type == ttAmp )
+		scriptNode->AddChildLast(ParseToken(ttAmp));
+
+	// Allow optional namespace to be defined before the identifier in case
+	// the declaration is to be used for searching for an existing property
+	ParseOptionalScope(scriptNode);
+
+	scriptNode->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return -1;
+
+	// The declaration should end after the identifier
+	GetToken(&t);
+	if( t.type != ttEnd )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnd)), &t);
+		Error(InsteadFound(t), &t);
+		return -1;
+	}
+
+	return 0;
+}
+
+// BNF:5: SCOPE         ::= ['::'] {IDENTIFIER '::'} [IDENTIFIER ['<' TYPE {',' TYPE} '>'] '::']
+void asCParser::ParseOptionalScope(asCScriptNode *node)
+{
+	asCScriptNode *scope = CreateNode(snScope);
+
+	sToken t1, t2;
+	GetToken(&t1);
+	GetToken(&t2);
+	if( t1.type == ttScope )
+	{
+		RewindTo(&t1);
+		scope->AddChildLast(ParseToken(ttScope));
+		GetToken(&t1);
+		GetToken(&t2);
+	}
+	while( t1.type == ttIdentifier && t2.type == ttScope )
+	{
+		RewindTo(&t1);
+		scope->AddChildLast(ParseIdentifier());
+		scope->AddChildLast(ParseToken(ttScope));
+		GetToken(&t1);
+		GetToken(&t2);
+	}
+
+	// The innermost scope may be a template type
+	if( t1.type == ttIdentifier && t2.type == ttLessThan )
+	{
+		tempString.Assign(&script->code[t1.pos], t1.length);
+		if (engine->IsTemplateType(tempString.AddressOf()))
+		{
+			RewindTo(&t1);
+			asCScriptNode *restore = scope->lastChild;
+			scope->AddChildLast(ParseIdentifier());
+			if (ParseTemplTypeList(scope, false))
+			{
+				GetToken(&t2);
+				if (t2.type == ttScope)
+				{
+					// Template type is part of the scope
+					// Nothing more needs to be done
+					node->AddChildLast(scope);
+					return;
+				}
+				else
+				{
+					// The template type is not part of the scope
+					// Rewind to the template type and end the scope
+					RewindTo(&t1);
+
+					// Restore the previously parsed node
+					while (scope->lastChild != restore)
+					{
+						asCScriptNode *last = scope->lastChild;
+						last->DisconnectParent();
+						last->Destroy(engine);
+					}
+					if( scope->lastChild )
+						node->AddChildLast(scope);
+					else
+						scope->Destroy(engine);
+					return;
+				}
+			}
+		}
+	}
+
+	// The identifier is not part of the scope
+	RewindTo(&t1);
+
+	if (scope->lastChild)
+		node->AddChildLast(scope);
+	else
+		scope->Destroy(engine);
+}
+
+asCScriptNode *asCParser::ParseFunctionDefinition()
+{
+	asCScriptNode *node = CreateNode(snFunction);
+	if( node == 0 ) return 0;
+
+	node->AddChildLast(ParseType(true));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseTypeMod(false));
+	if( isSyntaxError ) return node;
+
+	ParseOptionalScope(node);
+
+	node->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseParameterList());
+	if( isSyntaxError ) return node;
+
+	// Parse an optional 'const' after the function definition (used for object methods)
+	sToken t1;
+	GetToken(&t1);
+	RewindTo(&t1);
+	if( t1.type == ttConst )
+		node->AddChildLast(ParseToken(ttConst));
+
+	// Parse optional attributes
+	ParseMethodAttributes(node);
+
+	return node;
+}
+
+// BNF:4: TYPEMOD       ::= ['&' ['in' | 'out' | 'inout']]
+asCScriptNode *asCParser::ParseTypeMod(bool isParam)
+{
+	asCScriptNode *node = CreateNode(snDataType);
+	if( node == 0 ) return 0;
+
+	sToken t;
+
+	// Parse possible & token
+	GetToken(&t);
+	RewindTo(&t);
+	if( t.type == ttAmp )
+	{
+		node->AddChildLast(ParseToken(ttAmp));
+		if( isSyntaxError ) return node;
+
+		if( isParam )
+		{
+			GetToken(&t);
+			RewindTo(&t);
+
+			if( t.type == ttIn || t.type == ttOut || t.type == ttInOut )
+			{
+				int tokens[3] = {ttIn, ttOut, ttInOut};
+				node->AddChildLast(ParseOneOf(tokens, 3));
+			}
+		}
+	}
+
+	// Parse possible + token
+	GetToken(&t);
+	RewindTo(&t);
+	if( t.type == ttPlus )
+	{
+		node->AddChildLast(ParseToken(ttPlus));
+		if( isSyntaxError ) return node;
+	}
+
+	// Parse possible if_handle_then_const token
+	GetToken(&t);
+	RewindTo(&t);
+	if (IdentifierIs(t, IF_HANDLE_TOKEN))
+	{
+		node->AddChildLast(ParseToken(ttIdentifier));
+		if (isSyntaxError) return node;
+	}
+
+	return node;
+}
+
+// BNF:4: TYPE          ::= ['const'] SCOPE DATATYPE ['<' TYPE {',' TYPE} '>'] { ('[' ']') | ('@' ['const']) }
+asCScriptNode *asCParser::ParseType(bool allowConst, bool allowVariableType, bool allowAuto)
+{
+	asCScriptNode *node = CreateNode(snDataType);
+	if( node == 0 ) return 0;
+
+	sToken t;
+
+	if( allowConst )
+	{
+		GetToken(&t);
+		RewindTo(&t);
+		if( t.type == ttConst )
+		{
+			node->AddChildLast(ParseToken(ttConst));
+			if( isSyntaxError ) return node;
+		}
+	}
+
+	// Parse scope prefix
+	ParseOptionalScope(node);
+
+	// Parse the actual type
+	node->AddChildLast(ParseDataType(allowVariableType, allowAuto));
+	if( isSyntaxError ) return node;
+
+	// If the datatype is a template type, then parse the subtype within the < >
+	GetToken(&t);
+	RewindTo(&t);
+	asCScriptNode *type = node->lastChild;
+	tempString.Assign(&script->code[type->tokenPos], type->tokenLength);
+	if( engine->IsTemplateType(tempString.AddressOf()) && t.type == ttLessThan )
+	{
+		ParseTemplTypeList(node);
+		if (isSyntaxError) return node;
+	}
+
+	// Parse [] and @
+	GetToken(&t);
+	RewindTo(&t);
+	while( t.type == ttOpenBracket || t.type == ttHandle)
+	{
+		if( t.type == ttOpenBracket )
+		{
+			node->AddChildLast(ParseToken(ttOpenBracket));
+			if( isSyntaxError ) return node;
+
+			GetToken(&t);
+			if( t.type != ttCloseBracket )
+			{
+				Error(ExpectedToken("]"), &t);
+				Error(InsteadFound(t), &t);
+				return node;
+			}
+		}
+		else
+		{
+			node->AddChildLast(ParseToken(ttHandle));
+			if( isSyntaxError ) return node;
+
+			GetToken(&t);
+			RewindTo(&t);
+			if( t.type == ttConst )
+			{
+				node->AddChildLast(ParseToken(ttConst));
+				if( isSyntaxError ) return node;
+			}
+		}
+
+		GetToken(&t);
+		RewindTo(&t);
+	}
+
+	return node;
+}
+
+// This parses a template type list, e.g. <type, type, type>
+// If 'required' is false, and the template type list is not valid,
+// then no change will be done and the function returns false. This
+// can be used as do an optional parsing
+bool asCParser::ParseTemplTypeList(asCScriptNode *node, bool required)
+{
+	sToken t;
+	bool isValid = true;
+
+	// Remember the last child, so we can restore the state if needed
+	asCScriptNode *last = node->lastChild;
+
+	// Starts with '<'
+	GetToken(&t);
+	if (t.type != ttLessThan)
+	{
+		if (required)
+		{
+			Error(ExpectedToken(asCTokenizer::GetDefinition(ttLessThan)), &t);
+			Error(InsteadFound(t), &t);
+		}
+		return false;
+	}
+
+	// At least one type
+	// TODO: child funcdef: Make this work with !required
+	node->AddChildLast(ParseType(true, false));
+	if (isSyntaxError) return false;
+
+	GetToken(&t);
+
+	// Parse template types by list separator
+	while (t.type == ttListSeparator)
+	{
+		// TODO: child funcdef: Make this work with !required
+		node->AddChildLast(ParseType(true, false));
+		if (isSyntaxError) return false;
+		GetToken(&t);
+	}
+
+	// End with '>'
+	// Accept >> and >>> tokens too. But then force the tokenizer to move
+	// only 1 character ahead (thus splitting the token in two).
+	if (script->code[t.pos] != '>')
+	{
+		if (required)
+		{
+			Error(ExpectedToken(asCTokenizer::GetDefinition(ttGreaterThan)), &t);
+			Error(InsteadFound(t), &t);
+		}
+		else
+			isValid = false;
+	}
+	else
+	{
+		// Break the token so that only the first > is parsed
+		SetPos(t.pos + 1);
+	}
+
+	if (!required && !isValid)
+	{
+		// Restore the original state before returning
+		while (node->lastChild != last)
+		{
+			asCScriptNode *n = node->lastChild;
+			n->DisconnectParent();
+			n->Destroy(engine);
+		}
+
+		return false;
+	}
+
+	// The template type list was parsed OK
+	return true;
+}
+
+asCScriptNode *asCParser::ParseToken(int token)
+{
+	asCScriptNode *node = CreateNode(snUndefined);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( t1.type != token )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(token)), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->SetToken(&t1);
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+asCScriptNode *asCParser::ParseOneOf(int *tokens, int count)
+{
+	asCScriptNode *node = CreateNode(snUndefined);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	int n;
+	for( n = 0; n < count; n++ )
+	{
+		if( tokens[n] == t1.type )
+			break;
+	}
+	if( n == count )
+	{
+		Error(ExpectedOneOf(tokens, count), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->SetToken(&t1);
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:5: DATATYPE      ::= (IDENTIFIER | PRIMTYPE | '?' | 'auto')
+asCScriptNode *asCParser::ParseDataType(bool allowVariableType, bool allowAuto)
+{
+	asCScriptNode *node = CreateNode(snDataType);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( !IsDataType(t1) && !(allowVariableType && t1.type == ttQuestion) && !(allowAuto && t1.type == ttAuto) )
+	{
+		if( t1.type == ttIdentifier )
+		{
+			asCString errMsg;
+			tempString.Assign(&script->code[t1.pos], t1.length);
+			errMsg.Format(TXT_IDENTIFIER_s_NOT_DATA_TYPE, tempString.AddressOf());
+			Error(errMsg, &t1);
+		}
+		else if( t1.type == ttAuto )
+		{
+			Error(TXT_AUTO_NOT_ALLOWED, &t1);
+		}
+		else
+		{
+			Error(TXT_EXPECTED_DATA_TYPE, &t1);
+			Error(InsteadFound(t1), &t1);
+		}
+		return node;
+	}
+
+	node->SetToken(&t1);
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:6: PRIMTYPE      ::= 'void' | 'int' | 'int8' | 'int16' | 'int32' | 'int64' | 'uint' | 'uint8' | 'uint16' | 'uint32' | 'uint64' | 'float' | 'double' | 'bool'
+asCScriptNode *asCParser::ParseRealType()
+{
+	asCScriptNode *node = CreateNode(snDataType);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( !IsRealType(t1.type) )
+	{
+		Error(TXT_EXPECTED_DATA_TYPE, &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->SetToken(&t1);
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:17: IDENTIFIER    ::= single token:  starts with letter or _, can include any letter and digit, same as in C++
+asCScriptNode *asCParser::ParseIdentifier()
+{
+	asCScriptNode *node = CreateNode(snIdentifier);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( t1.type != ttIdentifier )
+	{
+		Error(TXT_EXPECTED_IDENTIFIER, &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->SetToken(&t1);
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:3: PARAMLIST     ::= '(' ['void' | (TYPE TYPEMOD [IDENTIFIER] ['=' EXPR] {',' TYPE TYPEMOD [IDENTIFIER] ['=' EXPR]})] ')'
+asCScriptNode *asCParser::ParseParameterList()
+{
+	asCScriptNode *node = CreateNode(snParameterList);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+	GetToken(&t1);
+	if( t1.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	GetToken(&t1);
+	if( t1.type == ttCloseParenthesis )
+	{
+		node->UpdateSourcePos(t1.pos, t1.length);
+
+		// Statement block is finished
+		return node;
+	}
+	else
+	{
+		// If the parameter list is just (void) then the void token should be ignored
+		if( t1.type == ttVoid )
+		{
+			sToken t2;
+			GetToken(&t2);
+			if( t2.type == ttCloseParenthesis)
+			{
+				node->UpdateSourcePos(t2.pos, t2.length);
+				return node;
+			}
+		}
+
+		RewindTo(&t1);
+
+		for(;;)
+		{
+			// Parse data type
+			node->AddChildLast(ParseType(true, isParsingAppInterface));
+			if( isSyntaxError ) return node;
+
+			node->AddChildLast(ParseTypeMod(true));
+			if( isSyntaxError ) return node;
+
+			// Parse optional identifier
+			GetToken(&t1);
+			if( t1.type == ttIdentifier )
+			{
+				RewindTo(&t1);
+
+				node->AddChildLast(ParseIdentifier());
+				if( isSyntaxError ) return node;
+
+				GetToken(&t1);
+			}
+
+			// Parse optional expression for the default arg
+			if( t1.type == ttAssignment )
+			{
+				// Do a superficial parsing of the default argument
+				// The actual parsing will be done when the argument is compiled for a function call
+				node->AddChildLast(SuperficiallyParseExpression());
+				if( isSyntaxError ) return node;
+
+				GetToken(&t1);
+			}
+
+			// Check if list continues
+			if( t1.type == ttCloseParenthesis)
+			{
+				node->UpdateSourcePos(t1.pos, t1.length);
+
+				return node;
+			}
+			else if( t1.type == ttListSeparator )
+				continue;
+			else
+			{
+				Error(ExpectedTokens(")", ","), &t1);
+				Error(InsteadFound(t1), &t1);
+				return node;
+			}
+		}
+	}
+	UNREACHABLE_RETURN;
+}
+
+asCScriptNode *asCParser::SuperficiallyParseExpression()
+{
+	asCScriptNode *node = CreateNode(snExpression);
+	if( node == 0 ) return 0;
+
+	// Simply parse everything until the first , or ), whichever comes first.
+	// Keeping in mind that () and {} can group expressions.
+
+	sToken start;
+	GetToken(&start);
+	RewindTo(&start);
+
+	asCString stack;
+	sToken t;
+	for(;;)
+	{
+		GetToken(&t);
+
+		if( t.type == ttOpenParenthesis)
+			stack += "(";
+		else if( t.type == ttCloseParenthesis)
+		{
+			if( stack == "" )
+			{
+				// Expression has ended. This token is not part of expression
+				RewindTo(&t);
+				break;
+			}
+			else if( stack[stack.GetLength()-1] == '(' )
+			{
+				// Group has ended
+				stack.SetLength(stack.GetLength()-1);
+			}
+			else
+			{
+				// Wrong syntax
+				RewindTo(&t);
+				asCString str;
+				str.Format(TXT_UNEXPECTED_TOKEN_s, ")");
+				Error(str, &t);
+				return node;
+			}
+		}
+		else if( t.type == ttListSeparator )
+		{
+			if( stack == "" )
+			{
+				// Expression has ended. This token is not part of expression
+				RewindTo(&t);
+				break;
+			}
+		}
+		else if( t.type == ttStartStatementBlock )
+			stack += "{";
+		else if( t.type == ttEndStatementBlock )
+		{
+			if( stack == "" || stack[stack.GetLength()-1] != '{' )
+			{
+				// Wrong syntax
+				RewindTo(&t);
+				asCString str;
+				str.Format(TXT_UNEXPECTED_TOKEN_s, "}");
+				Error(str, &t);
+				return node;
+			}
+			else
+			{
+				// Group has ended
+				stack.SetLength(stack.GetLength()-1);
+			}
+		}
+		else if( t.type == ttEndStatement )
+		{
+			// Wrong syntax (since we're parsing a default arg expression)
+			RewindTo(&t);
+			asCString str;
+			str.Format(TXT_UNEXPECTED_TOKEN_s, ";");
+			Error(str, &t);
+			return node;
+		}
+		else if( t.type == ttNonTerminatedStringConstant )
+		{
+			RewindTo(&t);
+			Error(TXT_NONTERMINATED_STRING, &t);
+			return node;
+		}
+		else if( t.type == ttEnd )
+		{
+			// Wrong syntax
+			RewindTo(&t);
+			Error(TXT_UNEXPECTED_END_OF_FILE, &t);
+			Info(TXT_WHILE_PARSING_EXPRESSION, &start);
+			return node;
+		}
+
+		// Include the token in the node
+		node->UpdateSourcePos(t.pos, t.length);
+	}
+
+	return node;
+}
+
+// BNF:18: COMMENT       ::= single token:  starts with // and ends with new line or starts with /* and ends with */
+// BNF:18: WHITESPACE    ::= single token:  spaces, tab, carriage return, line feed, and UTF8 byte-order-mark
+void asCParser::GetToken(sToken *token)
+{
+	// Check if the token has already been parsed
+	if( lastToken.pos == sourcePos )
+	{
+		*token = lastToken;
+		sourcePos += token->length;
+
+		if( token->type == ttWhiteSpace ||
+			token->type == ttOnelineComment ||
+			token->type == ttMultilineComment )
+			GetToken(token);
+
+		return;
+	}
+
+	// Parse new token
+	size_t sourceLength = script->codeLength;
+	do
+	{
+		if( sourcePos >= sourceLength )
+		{
+			token->type = ttEnd;
+			token->length = 0;
+		}
+		else
+			token->type = engine->tok.GetToken(&script->code[sourcePos], sourceLength - sourcePos, &token->length);
+
+		token->pos = sourcePos;
+
+		// Update state
+		sourcePos += token->length;
+	}
+	// Filter out whitespace and comments
+	while( token->type == ttWhiteSpace ||
+	       token->type == ttOnelineComment ||
+	       token->type == ttMultilineComment );
+}
+
+void asCParser::SetPos(size_t pos)
+{
+	lastToken.pos = size_t(-1);
+	sourcePos = pos;
+}
+
+void asCParser::RewindTo(const sToken *token)
+{
+	// TODO: optimize: Perhaps we can optimize this further by having the parser
+	//                 set an explicit return point, after which each token will
+	//                 be stored. That way not just one token will be reused but
+	//                 no token will have to be tokenized more than once.
+
+	// Store the token so it doesn't have to be tokenized again
+	lastToken = *token;
+
+	sourcePos = token->pos;
+}
+
+void asCParser::Error(const asCString &text, sToken *token)
+{
+	RewindTo(token);
+
+	isSyntaxError     = true;
+	errorWhileParsing = true;
+
+	int row, col;
+	script->ConvertPosToRowCol(token->pos, &row, &col);
+
+	if( builder )
+		builder->WriteError(script->name, text, row, col);
+}
+
+void asCParser::Warning(const asCString &text, sToken *token)
+{
+	int row, col;
+	script->ConvertPosToRowCol(token->pos, &row, &col);
+
+	if( builder )
+		builder->WriteWarning(script->name, text, row, col);
+}
+
+void asCParser::Info(const asCString &text, sToken *token)
+{
+	RewindTo(token);
+
+	isSyntaxError     = true;
+	errorWhileParsing = true;
+
+	int row, col;
+	script->ConvertPosToRowCol(token->pos, &row, &col);
+
+	if( builder )
+		builder->WriteInfo(script->name, text, row, col, false);
+}
+
+bool asCParser::IsRealType(int tokenType)
+{
+	if( tokenType == ttVoid ||
+		tokenType == ttInt ||
+		tokenType == ttInt8 ||
+		tokenType == ttInt16 ||
+		tokenType == ttInt64 ||
+		tokenType == ttUInt ||
+		tokenType == ttUInt8 ||
+		tokenType == ttUInt16 ||
+		tokenType == ttUInt64 ||
+		tokenType == ttFloat ||
+		tokenType == ttBool ||
+		tokenType == ttDouble )
+		return true;
+
+	return false;
+}
+
+bool asCParser::IsDataType(const sToken &token)
+{
+	if( token.type == ttIdentifier )
+	{
+#ifndef AS_NO_COMPILER
+		if( checkValidTypes )
+		{
+			// Check if this is an existing type, regardless of namespace
+			tempString.Assign(&script->code[token.pos], token.length);
+			if( !builder->DoesTypeExist(tempString.AddressOf()) )
+				return false;
+		}
+#endif
+		return true;
+	}
+
+	if( IsRealType(token.type) )
+		return true;
+
+	return false;
+}
+
+asCString asCParser::ExpectedToken(const char *token)
+{
+	asCString str;
+
+	str.Format(TXT_EXPECTED_s, token);
+
+	return str;
+}
+
+asCString asCParser::ExpectedTokens(const char *t1, const char *t2)
+{
+	asCString str;
+
+	str.Format(TXT_EXPECTED_s_OR_s, t1, t2);
+
+	return str;
+}
+
+asCString asCParser::ExpectedOneOf(int *tokens, int count)
+{
+	asCString str;
+
+	str = TXT_EXPECTED_ONE_OF;
+	for( int n = 0; n < count; n++ )
+	{
+		str += asCTokenizer::GetDefinition(tokens[n]);
+		if( n < count-1 )
+			str += ", ";
+	}
+
+	return str;
+}
+
+asCString asCParser::ExpectedOneOf(const char **tokens, int count)
+{
+	asCString str;
+
+	str = TXT_EXPECTED_ONE_OF;
+	for( int n = 0; n < count; n++ )
+	{
+		str += tokens[n];
+		if( n < count-1 )
+			str += ", ";
+	}
+
+	return str;
+}
+
+asCString asCParser::InsteadFound(sToken &t)
+{
+	asCString str;
+	if( t.type == ttIdentifier )
+	{
+		asCString id(&script->code[t.pos], t.length);
+		str.Format(TXT_INSTEAD_FOUND_IDENTIFIER_s, id.AddressOf());
+	}
+	else if( t.type >= ttIf )
+		str.Format(TXT_INSTEAD_FOUND_KEYWORD_s, asCTokenizer::GetDefinition(t.type));
+	else
+		str.Format(TXT_INSTEAD_FOUND_s, asCTokenizer::GetDefinition(t.type));
+
+	return str;
+}
+
+asCScriptNode *asCParser::ParseListPattern()
+{
+	asCScriptNode *node = CreateNode(snListPattern);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( t1.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	sToken start = t1;
+
+	bool isBeginning = true;
+	bool afterType = false;
+	while( !isSyntaxError )
+	{
+		GetToken(&t1);
+		if( t1.type == ttEndStatementBlock )
+		{
+			if( !afterType )
+			{
+				Error(TXT_EXPECTED_DATA_TYPE, &t1);
+				Error(InsteadFound(t1), &t1);
+			}
+			break;
+		}
+		else if( t1.type == ttStartStatementBlock )
+		{
+			if( afterType )
+			{
+				Error(ExpectedTokens(",","}"), &t1);
+				Error(InsteadFound(t1), &t1);
+			}
+			RewindTo(&t1);
+			node->AddChildLast(ParseListPattern());
+			afterType = true;
+		}
+		else if( t1.type == ttIdentifier && (IdentifierIs(t1, "repeat") || IdentifierIs(t1, "repeat_same")) )
+		{
+			if( !isBeginning )
+			{
+				asCString msg;
+				asCString token(&script->code[t1.pos], t1.length);
+				msg.Format(TXT_UNEXPECTED_TOKEN_s, token.AddressOf());
+				Error(msg.AddressOf(), &t1);
+			}
+			RewindTo(&t1);
+			node->AddChildLast(ParseIdentifier());
+		}
+		else if( t1.type == ttEnd )
+		{
+			Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
+			Info(TXT_WHILE_PARSING_STATEMENT_BLOCK, &start);
+			break;
+		}
+		else if( t1.type == ttListSeparator )
+		{
+			if( !afterType )
+			{
+				Error(TXT_EXPECTED_DATA_TYPE, &t1);
+				Error(InsteadFound(t1), &t1);
+			}
+			afterType = false;
+		}
+		else
+		{
+			if( afterType )
+			{
+				Error(ExpectedTokens(",", "}"), &t1);
+				Error(InsteadFound(t1), &t1);
+			}
+			RewindTo(&t1);
+			node->AddChildLast(ParseType(true, true));
+			afterType = true;
+		}
+
+		isBeginning = false;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+bool asCParser::IdentifierIs(const sToken &t, const char *str)
+{
+	if( t.type != ttIdentifier )
+		return false;
+
+	return script->TokenEquals(t.pos, t.length, str);
+}
+
+// BNF:6: FUNCATTR      ::= {'override' | 'final' | 'explicit' | 'property'}
+void asCParser::ParseMethodAttributes(asCScriptNode *funcNode)
+{
+	sToken t1;
+
+	for(;;)
+	{
+		GetToken(&t1);
+		RewindTo(&t1);
+
+		if( IdentifierIs(t1, FINAL_TOKEN) || 
+			IdentifierIs(t1, OVERRIDE_TOKEN) || 
+			IdentifierIs(t1, EXPLICIT_TOKEN) ||
+			IdentifierIs(t1, PROPERTY_TOKEN) )
+			funcNode->AddChildLast(ParseIdentifier());
+		else
+			break;
+	}
+}
+
+#ifndef AS_NO_COMPILER
+
+// nextToken is only modified if the current position can be interpreted as
+// type, in this case it is set to the next token after the type tokens
+bool asCParser::IsType(sToken &nextToken)
+{
+	// Set a rewind point
+	sToken t, t1;
+	GetToken(&t);
+
+	// A type can start with a const
+	t1 = t;
+	if (t1.type == ttConst)
+		GetToken(&t1);
+
+	sToken t2;
+	if (t1.type != ttAuto)
+	{
+		// The type may be initiated with the scope operator
+		if (t1.type == ttScope)
+			GetToken(&t1);
+
+		// The type may be preceded with a multilevel scope
+		GetToken(&t2);
+		while (t1.type == ttIdentifier)
+		{
+			if (t2.type == ttScope)
+			{
+				GetToken(&t1);
+				GetToken(&t2);
+				continue;
+			}
+			else if (t2.type == ttLessThan)
+			{
+				// Template types can also be used as scope identifiers
+				RewindTo(&t2);
+				if (CheckTemplateType(t1))
+				{
+					sToken t3;
+					GetToken(&t3);
+					if (t3.type == ttScope)
+					{
+						GetToken(&t1);
+						GetToken(&t2);
+						continue;
+					}
+				}
+			}
+
+			break;
+		}
+		RewindTo(&t2);
+	}
+
+	// We don't validate if the identifier is an actual declared type at this moment
+	// as it may wrongly identify the statement as a non-declaration if the user typed
+	// the name incorrectly. The real type is validated in ParseDeclaration where a
+	// proper error message can be given.
+	if (!IsRealType(t1.type) && t1.type != ttIdentifier && t1.type != ttAuto)
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	if (!CheckTemplateType(t1))
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	// Object handles can be interleaved with the array brackets
+	// Even though declaring variables with & is invalid we'll accept
+	// it here to give an appropriate error message later
+	GetToken(&t2);
+	while (t2.type == ttHandle || t2.type == ttAmp || t2.type == ttOpenBracket)
+	{
+		if( t2.type == ttHandle )
+		{
+			// A handle can optionally be read-only
+			sToken t3;
+			GetToken(&t3);
+			if(t3.type != ttConst )
+				RewindTo(&t3);
+		}
+		else if (t2.type == ttOpenBracket)
+		{
+			GetToken(&t2);
+			if (t2.type != ttCloseBracket)
+			{
+				RewindTo(&t);
+				return false;
+			}
+		}
+
+		GetToken(&t2);
+	}
+
+	// Return the next token so the caller can jump directly to it if desired
+	nextToken = t2;
+
+	// Rewind to start point
+	RewindTo(&t);
+
+	return true;
+}
+
+// This function will return true if the current token is not a template, or if it is and
+// the following has a valid syntax for a template type. The source position will be left
+// at the first token after the type in case of success
+bool asCParser::CheckTemplateType(const sToken &t)
+{
+	// Is this a template type?
+	tempString.Assign(&script->code[t.pos], t.length);
+	if( engine->IsTemplateType(tempString.AddressOf()) )
+	{
+		// If the next token is a < then parse the sub-type too
+		sToken t1;
+		GetToken(&t1);
+		if( t1.type != ttLessThan )
+		{
+			RewindTo(&t1);
+			return true;
+		}
+
+		for(;;)
+		{
+			// There might optionally be a 'const'
+			GetToken(&t1);
+			if( t1.type == ttConst )
+				GetToken(&t1);
+
+			// The type may be initiated with the scope operator
+			if( t1.type == ttScope )
+				GetToken(&t1);
+
+			// There may be multiple levels of scope operators
+			sToken t2;
+			GetToken(&t2);
+			while( t1.type == ttIdentifier && t2.type == ttScope )
+			{
+				GetToken(&t1);
+				GetToken(&t2);
+			}
+			RewindTo(&t2);
+
+			// Now there must be a data type
+			if( !IsDataType(t1) )
+				return false;
+
+			if( !CheckTemplateType(t1) )
+				return false;
+
+			GetToken(&t1);
+
+			// Is it a handle or array?
+			while( t1.type == ttHandle || t1.type == ttOpenBracket )
+			{
+				if( t1.type == ttOpenBracket )
+				{
+					GetToken(&t1);
+					if( t1.type != ttCloseBracket )
+						return false;
+				}
+
+				GetToken(&t1);
+			}
+
+			// Was this the last template subtype?
+			if( t1.type != ttListSeparator )
+				break;
+		}
+
+		// Accept >> and >>> tokens too. But then force the tokenizer to move
+		// only 1 character ahead (thus splitting the token in two).
+		if( script->code[t1.pos] != '>' )
+			return false;
+		else if( t1.length != 1 )
+		{
+			// We need to break the token, so that only the first character is parsed
+			SetPos(t1.pos + 1);
+		}
+	}
+
+	return true;
+}
+
+// BNF:12: CAST          ::= 'cast' '<' TYPE '>' '(' ASSIGN ')'
+asCScriptNode *asCParser::ParseCast()
+{
+	asCScriptNode *node = CreateNode(snCast);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+	GetToken(&t1);
+	if( t1.type != ttCast )
+	{
+		Error(ExpectedToken("cast"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	GetToken(&t1);
+	if( t1.type != ttLessThan )
+	{
+		Error(ExpectedToken("<"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	// Parse the data type
+	node->AddChildLast(ParseType(true));
+	if( isSyntaxError ) return node;
+
+	GetToken(&t1);
+	if( t1.type != ttGreaterThan )
+	{
+		Error(ExpectedToken(">"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	GetToken(&t1);
+	if( t1.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->AddChildLast(ParseAssignment());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t1);
+	if( t1.type != ttCloseParenthesis)
+	{
+		Error(ExpectedToken(")"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:11: EXPRVALUE     ::= 'void' | CONSTRUCTCALL | FUNCCALL | VARACCESS | CAST | LITERAL | '(' ASSIGN ')' | LAMBDA
+asCScriptNode *asCParser::ParseExprValue()
+{
+	asCScriptNode *node = CreateNode(snExprValue);
+	if( node == 0 ) return 0;
+
+	sToken t1, t2;
+	GetToken(&t1);
+	GetToken(&t2);
+	RewindTo(&t1);
+
+	// 'void' is a special expression that doesn't do anything (normally used for skipping output arguments)
+	if( t1.type == ttVoid )
+		node->AddChildLast(ParseToken(ttVoid));
+	else if( IsRealType(t1.type) )
+		node->AddChildLast(ParseConstructCall());
+	else if( t1.type == ttIdentifier || t1.type == ttScope )
+	{
+		// Check if the expression is an anonymous function
+		if( IsLambda() )
+		{
+			node->AddChildLast(ParseLambda());
+		}
+		else
+		{
+			// Determine the last identifier in order to check if it is a type
+			sToken t;
+			if( t1.type == ttScope ) t = t2; else t = t1;
+			RewindTo(&t);
+			GetToken(&t2);
+			while( t.type == ttIdentifier )
+			{
+				t2 = t;
+				GetToken(&t);
+				if( t.type == ttScope )
+					GetToken(&t);
+				else
+					break;
+			}
+
+			bool isDataType = IsDataType(t2);
+			bool isTemplateType = false;
+			if( isDataType )
+			{
+				// Is this a template type?
+				tempString.Assign(&script->code[t2.pos], t2.length);
+				if( engine->IsTemplateType(tempString.AddressOf()) )
+					isTemplateType = true;
+			}
+
+			GetToken(&t2);
+
+			// Rewind so the real parsing can be done, after deciding what to parse
+			RewindTo(&t1);
+
+			// Check if this is a construct call
+			// Just 'type()' isn't considered a construct call, because type may just be a function/method name.
+			// The compiler will have to sort this out, since the parser doesn't have enough information.
+			if( isDataType && (t.type == ttOpenBracket && t2.type == ttCloseBracket) )      // type[]()
+				node->AddChildLast(ParseConstructCall());
+			else if( isTemplateType && t.type == ttLessThan )  // type<t>()
+				node->AddChildLast(ParseConstructCall());
+			else if( IsFunctionCall() )
+				node->AddChildLast(ParseFunctionCall());
+			else
+				node->AddChildLast(ParseVariableAccess());
+		}
+	}
+	else if( t1.type == ttCast )
+		node->AddChildLast(ParseCast());
+	else if( IsConstant(t1.type) )
+		node->AddChildLast(ParseConstant());
+	else if( t1.type == ttOpenParenthesis)
+	{
+		GetToken(&t1);
+		node->UpdateSourcePos(t1.pos, t1.length);
+
+		node->AddChildLast(ParseAssignment());
+		if( isSyntaxError ) return node;
+
+		GetToken(&t1);
+		if( t1.type != ttCloseParenthesis)
+		{
+			Error(ExpectedToken(")"), &t1);
+			Error(InsteadFound(t1), &t1);
+		}
+
+		node->UpdateSourcePos(t1.pos, t1.length);
+	}
+	else
+	{
+		Error(TXT_EXPECTED_EXPRESSION_VALUE, &t1);
+		Error(InsteadFound(t1), &t1);
+	}
+
+	return node;
+}
+
+// BNF:12: LITERAL       ::= NUMBER | STRING | BITS | 'true' | 'false' | 'null'
+// BNF:17: NUMBER        ::= single token:  includes integers and real numbers, same as C++ 
+// BNF:17: STRING        ::= single token:  single quoted ', double quoted ", or heredoc multi-line string """
+// BNF:17: BITS          ::= single token:  binary 0b or 0B, octal 0o or 0O, decimal 0d or 0D, hexadecimal 0x or 0X
+asCScriptNode *asCParser::ParseConstant()
+{
+	asCScriptNode *node = CreateNode(snConstant);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( !IsConstant(t.type) )
+	{
+		Error(TXT_EXPECTED_CONSTANT, &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	// We want to gather a list of string constants to concatenate as children
+	if( t.type == ttStringConstant || t.type == ttMultilineStringConstant || t.type == ttHeredocStringConstant )
+		RewindTo(&t);
+
+	while( t.type == ttStringConstant || t.type == ttMultilineStringConstant || t.type == ttHeredocStringConstant )
+	{
+		node->AddChildLast(ParseStringConstant());
+
+		GetToken(&t);
+		RewindTo(&t);
+	}
+
+	return node;
+}
+
+bool asCParser::IsLambda()
+{
+	bool isLambda = false;
+	sToken t;
+	GetToken(&t);
+	if( t.type == ttIdentifier && IdentifierIs(t, FUNCTION_TOKEN) )
+	{
+		sToken t2;
+		GetToken(&t2);
+		if( t2.type == ttOpenParenthesis)
+		{
+			// Skip until )
+			while( t2.type != ttCloseParenthesis && t2.type != ttEnd )
+				GetToken(&t2);
+
+			// The next token must be a {
+			GetToken(&t2);
+			if( t2.type == ttStartStatementBlock )
+				isLambda = true;
+		}
+	}
+
+	RewindTo(&t);
+	return isLambda;
+}
+
+// BNF:12: LAMBDA        ::= 'function' '(' [[TYPE TYPEMOD] IDENTIFIER {',' [TYPE TYPEMOD] IDENTIFIER}] ')' STATBLOCK
+asCScriptNode *asCParser::ParseLambda()
+{
+	asCScriptNode *node = CreateNode(snFunction);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+
+	if( t.type != ttIdentifier || !IdentifierIs(t, FUNCTION_TOKEN) )
+	{
+		Error(ExpectedToken("function"), &t);
+		return node;
+	}
+
+	GetToken(&t);
+	if( t.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t);
+		return node;
+	}
+
+	// Parse optional type before parameter name
+	if( IsType(t) && (t.type == ttAmp || t.type == ttIdentifier) )
+	{
+		node->AddChildLast(ParseType(true));
+		if (isSyntaxError) return node;
+		node->AddChildLast(ParseTypeMod(true));
+		if (isSyntaxError) return node;
+	}
+
+	GetToken(&t);
+	if( t.type == ttIdentifier )
+	{
+		RewindTo(&t);
+		node->AddChildLast(ParseIdentifier());
+		if (isSyntaxError) return node;
+
+		GetToken(&t);
+		while( t.type == ttListSeparator )
+		{
+			// Parse optional type before parameter name
+			if (IsType(t) && (t.type == ttAmp || t.type == ttIdentifier)) 
+			{
+				node->AddChildLast(ParseType(true));
+				if (isSyntaxError) return node;
+				node->AddChildLast(ParseTypeMod(true));
+				if (isSyntaxError) return node;
+			}
+
+			node->AddChildLast(ParseIdentifier());
+			if( isSyntaxError ) return node;
+
+			GetToken(&t);
+		}
+	}
+
+	if( t.type != ttCloseParenthesis)
+	{
+		Error(ExpectedToken(")"), &t);
+		return node;
+	}
+
+	// We should just find the end of the statement block here. The statements
+	// will be parsed on request by the compiler once it starts the compilation.
+	node->AddChildLast(SuperficiallyParseStatementBlock());
+
+	return node;
+}
+
+asCScriptNode *asCParser::ParseStringConstant()
+{
+	asCScriptNode *node = CreateNode(snConstant);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttStringConstant && t.type != ttMultilineStringConstant && t.type != ttHeredocStringConstant )
+	{
+		Error(TXT_EXPECTED_STRING, &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:12: FUNCCALL      ::= SCOPE IDENTIFIER ARGLIST
+asCScriptNode *asCParser::ParseFunctionCall()
+{
+	asCScriptNode *node = CreateNode(snFunctionCall);
+	if( node == 0 ) return 0;
+
+	// Parse scope prefix
+	ParseOptionalScope(node);
+
+	// Parse the function name followed by the argument list
+	node->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseArgList());
+
+	return node;
+}
+
+// BNF:12: VARACCESS     ::= SCOPE IDENTIFIER
+asCScriptNode *asCParser::ParseVariableAccess()
+{
+	asCScriptNode *node = CreateNode(snVariableAccess);
+	if( node == 0 ) return 0;
+
+	// Parse scope prefix
+	ParseOptionalScope(node);
+
+	// Parse the variable name
+	node->AddChildLast(ParseIdentifier());
+
+	return node;
+}
+
+// BNF:11: CONSTRUCTCALL ::= TYPE ARGLIST
+asCScriptNode *asCParser::ParseConstructCall()
+{
+	asCScriptNode *node = CreateNode(snConstructCall);
+	if( node == 0 ) return 0;
+
+	node->AddChildLast(ParseType(false));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseArgList());
+
+	return node;
+}
+
+// BNF:13: ARGLIST       ::= '(' [IDENTIFIER ':'] ASSIGN {',' [IDENTIFIER ':'] ASSIGN} ')'
+asCScriptNode *asCParser::ParseArgList(bool withParenthesis)
+{
+	asCScriptNode *node = CreateNode(snArgList);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+	if( withParenthesis )
+	{
+		GetToken(&t1);
+		if( t1.type != ttOpenParenthesis)
+		{
+			Error(ExpectedToken("("), &t1);
+			Error(InsteadFound(t1), &t1);
+			return node;
+		}
+
+		node->UpdateSourcePos(t1.pos, t1.length);
+	}
+
+	GetToken(&t1);
+	if( t1.type == ttCloseParenthesis || t1.type == ttCloseBracket )
+	{
+		if( withParenthesis )
+		{
+			if( t1.type == ttCloseParenthesis)
+				node->UpdateSourcePos(t1.pos, t1.length);
+			else
+			{
+				asCString str;
+				str.Format(TXT_UNEXPECTED_TOKEN_s, asCTokenizer::GetDefinition(ttCloseBracket));
+
+				Error(str.AddressOf(), &t1);
+			}
+		}
+		else
+			RewindTo(&t1);
+
+		// Argument list has ended
+		return node;
+	}
+	else
+	{
+		RewindTo(&t1);
+
+		for(;;)
+		{
+			// Determine if this is a named argument
+			sToken tl, t2;
+			GetToken(&tl);
+			GetToken(&t2);
+			RewindTo(&tl);
+
+			// Named arguments uses the syntax: arg : expr
+			// This avoids confusion when the argument has the same name as a local variable, i.e. var = expr
+			// It also avoids conflict with expressions to that creates anonymous objects initialized with lists, i.e. type = {...}
+			// The alternate syntax: arg = expr, is supported to provide backwards compatibility with 2.29.0
+			// TODO: 3.0.0: Remove the alternate syntax
+			if( tl.type == ttIdentifier && (t2.type == ttColon || (engine->ep.alterSyntaxNamedArgs && t2.type == ttAssignment)) )
+			{
+				asCScriptNode *named = CreateNode(snNamedArgument);
+				if( named == 0 ) return 0;
+				node->AddChildLast(named);
+
+				named->AddChildLast(ParseIdentifier());
+				GetToken(&t2);
+
+				if( engine->ep.alterSyntaxNamedArgs == 1 && t2.type == ttAssignment )
+					Warning(TXT_NAMED_ARGS_WITH_OLD_SYNTAX, &t2);
+
+				named->AddChildLast(ParseAssignment());
+			}
+			else
+				node->AddChildLast(ParseAssignment());
+
+			if( isSyntaxError ) return node;
+
+			// Check if list continues
+			GetToken(&t1);
+			if( t1.type == ttListSeparator )
+				continue;
+			else
+			{
+				if( withParenthesis )
+				{
+					if( t1.type == ttCloseParenthesis)
+						node->UpdateSourcePos(t1.pos, t1.length);
+					else
+					{
+						Error(ExpectedTokens(")", ","), &t1);
+						Error(InsteadFound(t1), &t1);
+					}
+				}
+				else
+					RewindTo(&t1);
+
+				return node;
+			}
+		}
+	}
+}
+
+bool asCParser::IsFunctionCall()
+{
+	sToken s;
+	sToken t1, t2;
+
+	GetToken(&s);
+	t1 = s;
+
+	// A function call may be prefixed with scope resolution
+	if( t1.type == ttScope )
+		GetToken(&t1);
+	GetToken(&t2);
+
+	while( t1.type == ttIdentifier && t2.type == ttScope )
+	{
+		GetToken(&t1);
+		GetToken(&t2);
+	}
+
+	// A function call starts with an identifier followed by an argument list
+	// The parser doesn't have enough information about scope to determine if the
+	// identifier is a datatype, so even if it happens to be the parser will
+	// identify the expression as a function call rather than a construct call.
+	// The compiler will sort this out later
+	if( t1.type != ttIdentifier )
+	{
+		RewindTo(&s);
+		return false;
+	}
+
+	if( t2.type == ttOpenParenthesis)
+	{
+		RewindTo(&s);
+		return true;
+	}
+
+	RewindTo(&s);
+	return false;
+}
+
+// BNF:13: ASSIGN        ::= CONDITION [ ASSIGNOP ASSIGN ]
+asCScriptNode *asCParser::ParseAssignment()
+{
+	asCScriptNode *node = CreateNode(snAssignment);
+	if( node == 0 ) return 0;
+
+	node->AddChildLast(ParseCondition());
+	if( isSyntaxError ) return node;
+
+	sToken t;
+	GetToken(&t);
+	RewindTo(&t);
+
+	if( IsAssignOperator(t.type) )
+	{
+		node->AddChildLast(ParseAssignOperator());
+		if( isSyntaxError ) return node;
+
+		node->AddChildLast(ParseAssignment());
+		if( isSyntaxError ) return node;
+	}
+
+	return node;
+}
+
+// BNF:14: CONDITION     ::= EXPR ['?' ASSIGN ':' ASSIGN]
+asCScriptNode *asCParser::ParseCondition()
+{
+	asCScriptNode *node = CreateNode(snCondition);
+	if( node == 0 ) return 0;
+
+	node->AddChildLast(ParseExpression());
+	if( isSyntaxError ) return node;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type == ttQuestion )
+	{
+		node->AddChildLast(ParseAssignment());
+		if( isSyntaxError ) return node;
+
+		GetToken(&t);
+		if( t.type != ttColon )
+		{
+			Error(ExpectedToken(":"), &t);
+			Error(InsteadFound(t), &t);
+			return node;
+		}
+
+		node->AddChildLast(ParseAssignment());
+		if( isSyntaxError ) return node;
+	}
+	else
+		RewindTo(&t);
+
+	return node;
+}
+
+// BNF:9: EXPR          ::= EXPRTERM {EXPROP EXPRTERM}
+asCScriptNode *asCParser::ParseExpression()
+{
+	asCScriptNode *node = CreateNode(snExpression);
+	if( node == 0 ) return 0;
+
+	node->AddChildLast(ParseExprTerm());
+	if( isSyntaxError ) return node;
+
+	for(;;)
+	{
+		sToken t;
+		GetToken(&t);
+		RewindTo(&t);
+
+		if( !IsOperator(t.type) )
+			return node;
+
+		node->AddChildLast(ParseExprOperator());
+		if( isSyntaxError ) return node;
+
+		node->AddChildLast(ParseExprTerm());
+		if( isSyntaxError ) return node;
+	}
+	UNREACHABLE_RETURN;
+}
+
+// BNF:10: EXPRTERM      ::= ([TYPE '='] INITLIST) | ({EXPRPREOP} EXPRVALUE {EXPRPOSTOP})
+asCScriptNode *asCParser::ParseExprTerm()
+{
+	asCScriptNode *node = CreateNode(snExprTerm);
+	if( node == 0 ) return 0;
+
+	// Check if the expression term is an initialization of a temp object with init list, i.e. type = {...}
+	sToken t;
+	GetToken(&t);
+	sToken t2 = t, t3;
+	if (IsDataType(t2) && CheckTemplateType(t2))
+	{
+		// The next token must be a = followed by a {
+		GetToken(&t2);
+		GetToken(&t3);
+		if (t2.type == ttAssignment && t3.type == ttStartStatementBlock)
+		{
+			// It is an initialization, now parse it for real
+			RewindTo(&t);
+			node->AddChildLast(ParseType(false));
+			GetToken(&t2);
+			node->AddChildLast(ParseInitList());
+			return node;
+		}
+	}
+	// Or an anonymous init list, i.e. {...}
+	else if( t.type == ttStartStatementBlock )
+	{
+		RewindTo(&t);
+		node->AddChildLast(ParseInitList());
+		return node;
+	}
+
+	// It wasn't an initialization, so it must be an ordinary expression term
+	RewindTo(&t);
+
+	for(;;)
+	{
+		GetToken(&t);
+		RewindTo(&t);
+		if( !IsPreOperator(t.type) )
+			break;
+
+		node->AddChildLast(ParseExprPreOp());
+		if( isSyntaxError ) return node;
+	}
+
+	node->AddChildLast(ParseExprValue());
+	if( isSyntaxError ) return node;
+
+
+	for(;;)
+	{
+		GetToken(&t);
+		RewindTo(&t);
+		if( !IsPostOperator(t.type) )
+			return node;
+
+		node->AddChildLast(ParseExprPostOp());
+		if( isSyntaxError ) return node;
+	}
+	UNREACHABLE_RETURN;
+}
+
+// BNF:11: EXPRPREOP     ::= '-' | '+' | '!' | '++' | '--' | '~' | '@'
+asCScriptNode *asCParser::ParseExprPreOp()
+{
+	asCScriptNode *node = CreateNode(snExprPreOp);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( !IsPreOperator(t.type) )
+	{
+		Error(TXT_EXPECTED_PRE_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:11: EXPRPOSTOP    ::= ('.' (FUNCCALL | IDENTIFIER)) | ('[' [IDENTIFIER ':'] ASSIGN {',' [IDENTIFIER ':' ASSIGN} ']') | ARGLIST | '++' | '--'
+asCScriptNode *asCParser::ParseExprPostOp()
+{
+	asCScriptNode *node = CreateNode(snExprPostOp);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( !IsPostOperator(t.type) )
+	{
+		Error(TXT_EXPECTED_POST_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	if( t.type == ttDot )
+	{
+		sToken t1, t2;
+		GetToken(&t1);
+		GetToken(&t2);
+		RewindTo(&t1);
+		if( t2.type == ttOpenParenthesis)
+			node->AddChildLast(ParseFunctionCall());
+		else
+			node->AddChildLast(ParseIdentifier());
+	}
+	else if( t.type == ttOpenBracket )
+	{
+		node->AddChildLast(ParseArgList(false));
+
+		GetToken(&t);
+		if( t.type != ttCloseBracket )
+		{
+			Error(ExpectedToken("]"), &t);
+			Error(InsteadFound(t), &t);
+			return node;
+		}
+
+		node->UpdateSourcePos(t.pos, t.length);
+	}
+	else if( t.type == ttOpenParenthesis)
+	{
+		RewindTo(&t);
+		node->AddChildLast(ParseArgList());
+	}
+
+	return node;
+}
+
+// BNF:15: EXPROP        ::= MATHOP | COMPOP | LOGICOP | BITOP
+// BNF:16: MATHOP        ::= '+' | '-' | '*' | '/' | '\%' | '**'
+// BNF:16: COMPOP        ::= '==' | '!=' | '<' | '<=' | '>' | '>=' | 'is' | '!is'
+// BNF:16: LOGICOP       ::= '&&' | '||' | '^^' | 'and' | 'or' | 'xor'
+// BNF:16: BITOP         ::= '&' | '|' | '^' | '<<' | '>>' | '>>>'
+asCScriptNode *asCParser::ParseExprOperator()
+{
+	asCScriptNode *node = CreateNode(snExprOperator);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( !IsOperator(t.type) )
+	{
+		Error(TXT_EXPECTED_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:16: ASSIGNOP      ::= '=' | '+=' | '-=' | '*=' | '/=' | '|=' | '&=' | '^=' | '%=' | '**=' | '<<=' | '>>=' | '>>>='
+asCScriptNode *asCParser::ParseAssignOperator()
+{
+	asCScriptNode *node = CreateNode(snExprOperator);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( !IsAssignOperator(t.type) )
+	{
+		Error(TXT_EXPECTED_OPERATOR, &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+bool asCParser::IsOperator(int tokenType)
+{
+	if( tokenType == ttPlus ||
+		tokenType == ttMinus ||
+		tokenType == ttStar ||
+		tokenType == ttSlash ||
+		tokenType == ttPercent ||
+		tokenType == ttStarStar ||
+		tokenType == ttAnd ||
+		tokenType == ttOr ||
+		tokenType == ttXor ||
+		tokenType == ttEqual ||
+		tokenType == ttNotEqual ||
+		tokenType == ttLessThan ||
+		tokenType == ttLessThanOrEqual ||
+		tokenType == ttGreaterThan ||
+		tokenType == ttGreaterThanOrEqual ||
+		tokenType == ttAmp ||
+		tokenType == ttBitOr ||
+		tokenType == ttBitXor ||
+		tokenType == ttBitShiftLeft ||
+		tokenType == ttBitShiftRight ||
+		tokenType == ttBitShiftRightArith ||
+		tokenType == ttIs ||
+		tokenType == ttNotIs )
+		return true;
+
+	return false;
+}
+
+bool asCParser::IsAssignOperator(int tokenType)
+{
+	if( tokenType == ttAssignment ||
+		tokenType == ttAddAssign ||
+		tokenType == ttSubAssign ||
+		tokenType == ttMulAssign ||
+		tokenType == ttDivAssign ||
+		tokenType == ttModAssign ||
+		tokenType == ttPowAssign ||
+		tokenType == ttAndAssign ||
+		tokenType == ttOrAssign ||
+		tokenType == ttXorAssign ||
+		tokenType == ttShiftLeftAssign ||
+		tokenType == ttShiftRightLAssign ||
+		tokenType == ttShiftRightAAssign )
+		return true;
+
+	return false;
+}
+
+bool asCParser::IsPreOperator(int tokenType)
+{
+	if( tokenType == ttMinus ||
+		tokenType == ttPlus ||
+		tokenType == ttNot ||
+		tokenType == ttInc ||
+		tokenType == ttDec ||
+		tokenType == ttBitNot ||
+		tokenType == ttHandle )
+		return true;
+	return false;
+}
+
+bool asCParser::IsPostOperator(int tokenType)
+{
+	if( tokenType == ttInc ||            // post increment
+		tokenType == ttDec ||            // post decrement
+		tokenType == ttDot ||            // member access
+		tokenType == ttOpenBracket ||    // index operator
+		tokenType == ttOpenParenthesis) // argument list for call on function pointer
+		return true;
+	return false;
+}
+
+bool asCParser::IsConstant(int tokenType)
+{
+	if( tokenType == ttIntConstant ||
+		tokenType == ttFloatConstant ||
+		tokenType == ttDoubleConstant ||
+		tokenType == ttStringConstant ||
+		tokenType == ttMultilineStringConstant ||
+		tokenType == ttHeredocStringConstant ||
+		tokenType == ttTrue ||
+		tokenType == ttFalse ||
+		tokenType == ttBitsConstant ||
+		tokenType == ttNull )
+		return true;
+
+	return false;
+}
+
+int asCParser::ParseScript(asCScriptCode *in_script)
+{
+	Reset();
+
+	this->script = in_script;
+
+	scriptNode = ParseScript(false);
+
+	if( errorWhileParsing )
+		return -1;
+
+	// TODO: Should allow application to request this warning to be generated.
+	//       It should be off by default, since pre-processor may remove all
+	//       code from a section while still being meant as valid code
+/*
+	// Warn in case there isn't anything in the script
+	if( scriptNode->firstChild == 0 )
+	{
+		if( builder )
+			builder->WriteWarning(script->name, TXT_SECTION_IS_EMPTY, 1, 1);
+	}
+*/
+	return 0;
+}
+
+int asCParser::ParseExpression(asCScriptCode *in_script)
+{
+	Reset();
+
+	this->script = in_script;
+
+	checkValidTypes = true;
+
+	scriptNode = ParseExpression();
+	if( errorWhileParsing )
+		return -1;
+
+	return 0;
+}
+
+// BNF:1: IMPORT        ::= 'import' TYPE ['&'] IDENTIFIER PARAMLIST FUNCATTR 'from' STRING ';'
+asCScriptNode *asCParser::ParseImport()
+{
+	asCScriptNode *node = CreateNode(snImport);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttImport )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttImport)), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	node->AddChildLast(ParseFunctionDefinition());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttIdentifier )
+	{
+		Error(ExpectedToken(FROM_TOKEN), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	tempString.Assign(&script->code[t.pos], t.length);
+	if( tempString != FROM_TOKEN )
+	{
+		Error(ExpectedToken(FROM_TOKEN), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttStringConstant )
+	{
+		Error(TXT_EXPECTED_STRING, &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	asCScriptNode *mod = CreateNode(snConstant);
+	if( mod == 0 ) return 0;
+
+	node->AddChildLast(mod);
+
+	mod->SetToken(&t);
+	mod->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttEndStatement )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatement)), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:0: SCRIPT        ::= {IMPORT | ENUM | TYPEDEF | CLASS | MIXIN | INTERFACE | FUNCDEF | VIRTPROP | VAR | FUNC | NAMESPACE | ';'}
+asCScriptNode *asCParser::ParseScript(bool inBlock)
+{
+	asCScriptNode *node = CreateNode(snScript);
+	if( node == 0 ) return 0;
+
+	// Determine type of node
+	for(;;)
+	{
+		while( !isSyntaxError )
+		{
+			sToken tStart;
+			GetToken(&tStart);
+
+			// Optimize by skipping tokens 'shared', 'external', 'final', 'abstract' so they don't have to be checked in every condition
+			sToken t1 = tStart;
+			while (IdentifierIs(t1, SHARED_TOKEN) ||
+				IdentifierIs(t1, EXTERNAL_TOKEN) ||
+				IdentifierIs(t1, FINAL_TOKEN) ||
+				IdentifierIs(t1, ABSTRACT_TOKEN))
+				GetToken(&t1);
+			RewindTo(&tStart);
+
+			if( t1.type == ttImport )
+				node->AddChildLast(ParseImport());
+			else if( t1.type == ttEnum )
+				node->AddChildLast(ParseEnumeration());	// Handle enumerations
+			else if( t1.type == ttTypedef )
+				node->AddChildLast(ParseTypedef());		// Handle primitive typedefs
+			else if( t1.type == ttClass )
+				node->AddChildLast(ParseClass());
+			else if( t1.type == ttMixin )
+				node->AddChildLast(ParseMixin());
+			else if( t1.type == ttInterface )
+				node->AddChildLast(ParseInterface());
+			else if( t1.type == ttFuncDef )
+				node->AddChildLast(ParseFuncDef());
+			else if( t1.type == ttConst || t1.type == ttScope || t1.type == ttAuto || IsDataType(t1) )
+			{
+				if( IsVirtualPropertyDecl() )
+					node->AddChildLast(ParseVirtualPropertyDecl(false, false));
+				else if( IsVarDecl() )
+					node->AddChildLast(ParseDeclaration(false, true));
+				else
+					node->AddChildLast(ParseFunction());
+			}
+			else if( t1.type == ttEndStatement )
+			{
+				// Ignore a semicolon by itself
+				GetToken(&t1);
+			}
+			else if( t1.type == ttNamespace )
+				node->AddChildLast(ParseNamespace());
+			else if( t1.type == ttEnd )
+				return node;
+			else if( inBlock && t1.type == ttEndStatementBlock )
+				return node;
+			else
+			{
+				asCString str;
+				const char *t = asCTokenizer::GetDefinition(t1.type);
+				if( t == 0 ) t = "<unknown token>";
+
+				str.Format(TXT_UNEXPECTED_TOKEN_s, t);
+
+				Error(str, &t1);
+			}
+		}
+
+		if( isSyntaxError )
+		{
+			// Search for either ';' or '{' or end
+			sToken t1;
+			GetToken(&t1);
+			while( t1.type != ttEndStatement && t1.type != ttEnd &&
+				   t1.type != ttStartStatementBlock )
+				GetToken(&t1);
+
+			if( t1.type == ttStartStatementBlock )
+			{
+				// Find the end of the block and skip nested blocks
+				int level = 1;
+				while( level > 0 )
+				{
+					GetToken(&t1);
+					if( t1.type == ttStartStatementBlock ) level++;
+					if( t1.type == ttEndStatementBlock ) level--;
+					if( t1.type == ttEnd ) break;
+				}
+			}
+
+			isSyntaxError = false;
+		}
+	}
+	UNREACHABLE_RETURN;
+}
+
+// BNF:1: NAMESPACE     ::= 'namespace' IDENTIFIER {'::' IDENTIFIER} '{' SCRIPT '}'
+asCScriptNode *asCParser::ParseNamespace()
+{
+	asCScriptNode *node = CreateNode(snNamespace);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( t1.type == ttNamespace )
+		node->UpdateSourcePos(t1.pos, t1.length);
+	else
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttNamespace)), &t1);
+		Error(InsteadFound(t1), &t1);
+	}
+
+	node->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return node;
+
+	asCScriptNode *lowestNode = node;
+	GetToken(&t1);
+	while (t1.type == ttScope)
+	{
+		lowestNode->UpdateSourcePos(t1.pos, t1.length);
+
+		asCScriptNode *scopeNode = CreateNode(snScript);
+		if (scopeNode == 0) 
+			return 0;
+		lowestNode->AddChildLast(scopeNode);
+
+		lowestNode = CreateNode(snNamespace);
+		if (lowestNode == 0) 
+			return 0;
+
+		scopeNode->AddChildLast(lowestNode);
+		lowestNode->AddChildLast(ParseIdentifier());
+		if (isSyntaxError)
+			return node;
+
+		GetToken(&t1);
+	}
+	
+	if( t1.type == ttStartStatementBlock )
+		node->UpdateSourcePos(t1.pos, t1.length);
+	else
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttStartStatementBlock)), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	sToken start = t1;
+
+	lowestNode->AddChildLast(ParseScript(true));
+
+	if( !isSyntaxError )
+	{
+		GetToken(&t1);
+		if( t1.type == ttEndStatementBlock )
+			node->UpdateSourcePos(t1.pos, t1.length);
+		else
+		{
+			if( t1.type == ttEnd )
+				Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
+			else
+			{
+				Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatementBlock)), &t1);
+				Error(InsteadFound(t1), &t1);
+			}
+			Info(TXT_WHILE_PARSING_NAMESPACE, &start);
+			return node;
+		}
+	}
+
+	return node;
+}
+
+int asCParser::ParseStatementBlock(asCScriptCode *in_script, asCScriptNode *in_block)
+{
+	TimeIt("asCParser::ParseStatementBlock");
+
+	Reset();
+
+	// Tell the parser to validate the identifiers as valid types
+	checkValidTypes = true;
+
+	this->script = in_script;
+	sourcePos = in_block->tokenPos;
+
+	scriptNode = ParseStatementBlock();
+
+	if( isSyntaxError || errorWhileParsing )
+		return -1;
+
+	return 0;
+}
+
+// BNF:1: ENUM          ::= {'shared' | 'external'} 'enum' IDENTIFIER (';' | ('{' IDENTIFIER ['=' EXPR] {',' IDENTIFIER ['=' EXPR]} '}'))
+asCScriptNode *asCParser::ParseEnumeration()
+{
+	asCScriptNode *ident;
+	asCScriptNode *dataType;
+
+	asCScriptNode *node = CreateNode(snEnum);
+	if( node == 0 ) return 0;
+
+	sToken token;
+
+	// Optional 'shared' and 'external' token
+	GetToken(&token);
+	while( IdentifierIs(token, SHARED_TOKEN) ||
+		   IdentifierIs(token, EXTERNAL_TOKEN) )
+	{
+		RewindTo(&token);
+		node->AddChildLast(ParseIdentifier());
+		if( isSyntaxError ) return node;
+
+		GetToken(&token);
+	}
+
+	// Check for enum
+	if( token.type != ttEnum )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEnum)), &token);
+		Error(InsteadFound(token), &token);
+		return node;
+	}
+
+	node->SetToken(&token);
+	node->UpdateSourcePos(token.pos, token.length);
+
+	// Get the identifier
+	GetToken(&token);
+	if(ttIdentifier != token.type)
+	{
+		Error(TXT_EXPECTED_IDENTIFIER, &token);
+		Error(InsteadFound(token), &token);
+		return node;
+	}
+
+	dataType = CreateNode(snDataType);
+	if( dataType == 0 ) return node;
+
+	node->AddChildLast(dataType);
+
+	ident = CreateNode(snIdentifier);
+	if( ident == 0 ) return node;
+
+	ident->SetToken(&token);
+	ident->UpdateSourcePos(token.pos, token.length);
+	dataType->AddChildLast(ident);
+
+	// External shared declarations are ended with ';'
+	GetToken(&token);
+	if (token.type == ttEndStatement)
+	{
+		RewindTo(&token);
+		node->AddChildLast(ParseToken(ttEndStatement));
+		return node;
+	}
+
+	// check for the start of the declaration block
+	if( token.type != ttStartStatementBlock )
+	{
+		RewindTo(&token);
+		int tokens[] = { ttStartStatementBlock, ttEndStatement };
+		Error(ExpectedOneOf(tokens, 2), &token);
+		Error(InsteadFound(token), &token);
+		return node;
+	}
+
+	while(ttEnd != token.type)
+	{
+		GetToken(&token);
+
+		if( ttEndStatementBlock == token.type )
+		{
+			RewindTo(&token);
+			break;
+		}
+
+		if(ttIdentifier != token.type)
+		{
+			Error(TXT_EXPECTED_IDENTIFIER, &token);
+			Error(InsteadFound(token), &token);
+			return node;
+		}
+
+		// Add the enum element
+		ident = CreateNode(snIdentifier);
+		if( ident == 0 ) return node;
+
+		ident->SetToken(&token);
+		ident->UpdateSourcePos(token.pos, token.length);
+		node->AddChildLast(ident);
+
+		GetToken(&token);
+
+		if( token.type == ttAssignment )
+		{
+			asCScriptNode	*tmp;
+
+			RewindTo(&token);
+
+			tmp = SuperficiallyParseVarInit();
+
+			node->AddChildLast(tmp);
+			if( isSyntaxError ) return node;
+			GetToken(&token);
+		}
+
+		if(ttListSeparator != token.type)
+		{
+			RewindTo(&token);
+			break;
+		}
+	}
+
+	// check for the end of the declaration block
+	GetToken(&token);
+	if( token.type != ttEndStatementBlock )
+	{
+		RewindTo(&token);
+		Error(ExpectedToken("}"), &token);
+		Error(InsteadFound(token), &token);
+		return node;
+	}
+
+	return node;
+}
+
+bool asCParser::IsVarDecl()
+{
+	// Set start point so that we can rewind
+	sToken t;
+	GetToken(&t);
+	RewindTo(&t);
+
+	// A class property decl can be preceded by 'private' or 'protected'
+	sToken t1;
+	GetToken(&t1);
+	if( t1.type != ttPrivate && t1.type != ttProtected )
+		RewindTo(&t1);
+
+	// A variable decl starts with the type
+	if (!IsType(t1))
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	// Jump to the token after the type
+	RewindTo(&t1);
+	GetToken(&t1);
+	
+	// The declaration needs to have a name
+	if( t1.type != ttIdentifier )
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	// It can be followed by an initialization
+	GetToken(&t1);
+	if( t1.type == ttEndStatement || t1.type == ttAssignment || t1.type == ttListSeparator )
+	{
+		RewindTo(&t);
+		return true;
+	}
+	if( t1.type == ttOpenParenthesis)
+	{
+		// If the closing parenthesis is followed by a statement block, 
+		// function decorator, or end-of-file, then treat it as a function. 
+		// A function decl may have nested parenthesis so we need to check 
+		// for this too.
+		int nest = 0;
+		while( t1.type != ttEnd )
+		{
+			if( t1.type == ttOpenParenthesis)
+				nest++;
+			else if( t1.type == ttCloseParenthesis)
+			{
+				nest--;
+				if( nest == 0 )
+					break;
+			}
+			GetToken(&t1);
+		}
+
+		if (t1.type == ttEnd)
+		{
+			RewindTo(&t);
+			return false;
+		}
+		else
+		{
+			GetToken(&t1);
+			RewindTo(&t);
+			if( t1.type == ttStartStatementBlock || 
+				t1.type == ttIdentifier || // function decorator
+				t1.type == ttEnd )
+				return false;
+		}
+
+		RewindTo(&t);
+		return true;
+	}
+
+	RewindTo(&t);
+	return false;
+}
+
+bool asCParser::IsVirtualPropertyDecl()
+{
+	// Set start point so that we can rewind
+	sToken t;
+	GetToken(&t);
+	RewindTo(&t);
+
+	// A class property decl can be preceded by 'private' or 'protected'
+	sToken t1;
+	GetToken(&t1);
+	if( t1.type != ttPrivate && t1.type != ttProtected )
+		RewindTo(&t1);
+
+	// A variable decl starts with the type
+	if (!IsType(t1))
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	// Move to the token after the type
+	RewindTo(&t1);
+	GetToken(&t1);
+
+	// The decl must have an identifier
+	if( t1.type != ttIdentifier )
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	// To be a virtual property it must also have a block for the get/set functions
+	GetToken(&t1);
+	if( t1.type == ttStartStatementBlock )
+	{
+		RewindTo(&t);
+		return true;
+	}
+
+	RewindTo(&t);
+	return false;
+}
+
+bool asCParser::IsFuncDecl(bool isMethod)
+{
+	// Set start point so that we can rewind
+	sToken t;
+	GetToken(&t);
+	RewindTo(&t);
+
+	if( isMethod )
+	{
+		// A class method decl can be preceded by 'private' or 'protected'
+		sToken t1, t2;
+		GetToken(&t1);
+		if( t1.type != ttPrivate && t1.type != ttProtected )
+			RewindTo(&t1);
+
+		// A class constructor starts with identifier followed by parenthesis
+		// A class destructor starts with the ~ token
+		GetToken(&t1);
+		GetToken(&t2);
+		RewindTo(&t1);
+		if( (t1.type == ttIdentifier && t2.type == ttOpenParenthesis) || t1.type == ttBitNot )
+		{
+			RewindTo(&t);
+			return true;
+		}
+	}
+
+	// A function decl starts with a type
+	sToken t1;
+	if (!IsType(t1))
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	// Move to the token after the type
+	RewindTo(&t1);
+	GetToken(&t1);
+
+	// There can be an ampersand if the function returns a reference
+	if( t1.type == ttAmp )
+	{
+		RewindTo(&t);
+		return true;
+	}
+
+	if( t1.type != ttIdentifier )
+	{
+		RewindTo(&t);
+		return false;
+	}
+
+	GetToken(&t1);
+	if( t1.type == ttOpenParenthesis)
+	{
+		// If the closing parenthesis is not followed by a
+		// statement block then it is not a function.
+		// It's possible that there are nested parenthesis due to default
+		// arguments so this should be checked for.
+		int nest = 0;
+		GetToken(&t1);
+		while( (nest || t1.type != ttCloseParenthesis) && t1.type != ttEnd )
+		{
+			if( t1.type == ttOpenParenthesis)
+				nest++;
+			if( t1.type == ttCloseParenthesis)
+				nest--;
+
+			GetToken(&t1);
+		}
+
+		if( t1.type == ttEnd )
+			return false;
+		else
+		{
+			if( isMethod )
+			{
+				// A class method can have a 'const' token after the parameter list
+				GetToken(&t1);
+				if( t1.type != ttConst )
+					RewindTo(&t1);
+			}
+
+			// A function may also have any number of additional attributes
+			for( ; ; )
+			{
+				GetToken(&t1);
+				if( !IdentifierIs(t1, FINAL_TOKEN) && 
+					!IdentifierIs(t1, OVERRIDE_TOKEN) &&
+					!IdentifierIs(t1, EXPLICIT_TOKEN) &&
+					!IdentifierIs(t1, PROPERTY_TOKEN) )
+				{
+					RewindTo(&t1);
+					break;
+				}
+			}
+			
+			GetToken(&t1);
+			RewindTo(&t);
+			if( t1.type == ttStartStatementBlock )
+				return true;
+		}
+
+		RewindTo(&t);
+		return false;
+	}
+
+	RewindTo(&t);
+	return false;
+}
+
+// BNF:1: FUNCDEF       ::= {'external' | 'shared'} 'funcdef' TYPE ['&'] IDENTIFIER PARAMLIST ';'
+asCScriptNode *asCParser::ParseFuncDef()
+{
+	asCScriptNode *node = CreateNode(snFuncDef);
+	if( node == 0 ) return 0;
+
+	// Allow keywords 'external' and 'shared' before 'interface'
+	sToken t1;
+	GetToken(&t1);
+	while (IdentifierIs(t1, SHARED_TOKEN) ||
+		   IdentifierIs(t1, EXTERNAL_TOKEN))
+	{
+		RewindTo(&t1);
+		node->AddChildLast(ParseIdentifier());
+		if (isSyntaxError) return node;
+
+		GetToken(&t1);
+	}
+
+	if( t1.type != ttFuncDef )
+	{
+		Error(asCTokenizer::GetDefinition(ttFuncDef), &t1);
+		return node;
+	}
+
+	node->SetToken(&t1);
+
+	node->AddChildLast(ParseType(true));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseTypeMod(false));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseParameterList());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t1);
+	if( t1.type != ttEndStatement )
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttEndStatement)), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:1: FUNC          ::= {'shared' | 'external'} ['private' | 'protected'] [((TYPE ['&']) | '~')] IDENTIFIER PARAMLIST ['const'] FUNCATTR (';' | STATBLOCK)
+asCScriptNode *asCParser::ParseFunction(bool isMethod)
+{
+	asCScriptNode *node = CreateNode(snFunction);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+	GetToken(&t1);
+	if (!isMethod)
+	{
+		// A global function can be marked as shared and external
+		while (t1.type == ttIdentifier)
+		{
+			if (IdentifierIs(t1, SHARED_TOKEN) ||
+				IdentifierIs(t1, EXTERNAL_TOKEN))
+			{
+				RewindTo(&t1);
+				node->AddChildLast(ParseIdentifier());
+				if (isSyntaxError) return node;
+			}
+			else
+				break;
+
+			GetToken(&t1);
+		}
+	}
+
+	// A class method can start with 'private' or 'protected'
+	if (isMethod && t1.type == ttPrivate)
+	{
+		RewindTo(&t1);
+		node->AddChildLast(ParseToken(ttPrivate));
+		GetToken(&t1);
+	}
+	else if (isMethod && t1.type == ttProtected)
+	{
+		RewindTo(&t1);
+		node->AddChildLast(ParseToken(ttProtected));
+		GetToken(&t1);
+	}
+	if( isSyntaxError ) return node;
+
+	// If it is a global function, or a method, except constructor and destructor, then the return type is parsed
+	sToken t2;
+	GetToken(&t2);
+	RewindTo(&t1);
+	if( !isMethod || (t1.type != ttBitNot && t2.type != ttOpenParenthesis) )
+	{
+		node->AddChildLast(ParseType(true));
+		if( isSyntaxError ) return node;
+
+		node->AddChildLast(ParseTypeMod(false));
+		if( isSyntaxError ) return node;
+	}
+
+	// If this is a class destructor then it starts with ~, and no return type is declared
+	if( isMethod && t1.type == ttBitNot )
+	{
+		node->AddChildLast(ParseToken(ttBitNot));
+		if( isSyntaxError ) return node;
+	}
+
+	node->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseParameterList());
+	if( isSyntaxError ) return node;
+
+	if( isMethod )
+	{
+		GetToken(&t1);
+		RewindTo(&t1);
+
+		// Is the method a const?
+		if( t1.type == ttConst )
+			node->AddChildLast(ParseToken(ttConst));
+	}
+
+	// TODO: Should support abstract methods, in which case no statement block should be provided
+	ParseMethodAttributes(node);
+	if( isSyntaxError ) return node;
+
+	// External shared functions must be ended with ';'
+	GetToken(&t1);
+	RewindTo(&t1);
+	if (t1.type == ttEndStatement)
+	{
+		node->AddChildLast(ParseToken(ttEndStatement));
+		return node;
+	}
+
+	// We should just find the end of the statement block here. The statements
+	// will be parsed on request by the compiler once it starts the compilation.
+	node->AddChildLast(SuperficiallyParseStatementBlock());
+
+	return node;
+}
+
+// BNF:2: INTFMTHD      ::= TYPE ['&'] IDENTIFIER PARAMLIST ['const'] ';'
+asCScriptNode *asCParser::ParseInterfaceMethod()
+{
+	asCScriptNode *node = CreateNode(snFunction);
+	if( node == 0 ) return 0;
+
+	node->AddChildLast(ParseType(true));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseTypeMod(false));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseParameterList());
+	if( isSyntaxError ) return node;
+
+	// Parse an optional const after the method definition
+	sToken t1;
+	GetToken(&t1);
+	RewindTo(&t1);
+	if( t1.type == ttConst )
+		node->AddChildLast(ParseToken(ttConst));
+
+	GetToken(&t1);
+	if( t1.type != ttEndStatement )
+	{
+		Error(ExpectedToken(";"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:1: VIRTPROP      ::= ['private' | 'protected'] TYPE ['&'] IDENTIFIER '{' {('get' | 'set') ['const'] FUNCATTR (STATBLOCK | ';')} '}'
+asCScriptNode *asCParser::ParseVirtualPropertyDecl(bool isMethod, bool isInterface)
+{
+	asCScriptNode *node = CreateNode(snVirtualProperty);
+	if( node == 0 ) return 0;
+
+	sToken t1,t2;
+	GetToken(&t1);
+	GetToken(&t2);
+	RewindTo(&t1);
+
+	// A class method can start with 'private' or 'protected'
+	if( isMethod && t1.type == ttPrivate )
+		node->AddChildLast(ParseToken(ttPrivate));
+	else if( isMethod && t1.type == ttProtected )
+		node->AddChildLast(ParseToken(ttProtected));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseType(true));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseTypeMod(false));
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseIdentifier());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t1);
+	if( t1.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	for(;;)
+	{
+		GetToken(&t1);
+		asCScriptNode *accessorNode = 0;
+
+		if( IdentifierIs(t1, GET_TOKEN) || IdentifierIs(t1, SET_TOKEN) )
+		{
+			accessorNode = CreateNode(snVirtualProperty);
+			if( accessorNode == 0 ) return 0;
+
+			node->AddChildLast(accessorNode);
+
+			RewindTo(&t1);
+			accessorNode->AddChildLast(ParseIdentifier());
+
+			if( isMethod )
+			{
+				GetToken(&t1);
+				RewindTo(&t1);
+				if( t1.type == ttConst )
+					accessorNode->AddChildLast(ParseToken(ttConst));
+
+				if( !isInterface )
+				{
+					ParseMethodAttributes(accessorNode);
+					if( isSyntaxError ) return node;
+				}
+			}
+
+			if( !isInterface )
+			{
+				GetToken(&t1);
+				if( t1.type == ttStartStatementBlock )
+				{
+					RewindTo(&t1);
+					accessorNode->AddChildLast(SuperficiallyParseStatementBlock());
+					if( isSyntaxError ) return node;
+				}
+				else if( t1.type != ttEndStatement )
+				{
+					Error(ExpectedTokens(";", "{"), &t1);
+					Error(InsteadFound(t1), &t1);
+					return node;
+				}
+			}
+			else
+			{
+				GetToken(&t1);
+				if( t1.type != ttEndStatement )
+				{
+					Error(ExpectedToken(";"), &t1);
+					Error(InsteadFound(t1), &t1);
+					return node;
+				}
+			}
+		}
+		else if( t1.type == ttEndStatementBlock )
+			break;
+		else
+		{
+			const char *tokens[] = { GET_TOKEN, SET_TOKEN, asCTokenizer::GetDefinition(ttEndStatementBlock) };
+			Error(ExpectedOneOf(tokens, 3), &t1);
+			Error(InsteadFound(t1), &t1);
+			return node;
+		}
+	}
+
+	return node;
+}
+
+// BNF:1: INTERFACE     ::= {'external' | 'shared'} 'interface' IDENTIFIER (';' | ([':' IDENTIFIER {',' IDENTIFIER}] '{' {VIRTPROP | INTFMTHD} '}'))
+asCScriptNode *asCParser::ParseInterface()
+{
+	asCScriptNode *node = CreateNode(snInterface);
+	if( node == 0 ) return 0;
+
+	sToken t;
+
+	// Allow keywords 'external' and 'shared' before 'interface'
+	GetToken(&t);
+	while( IdentifierIs(t, SHARED_TOKEN) ||
+		   IdentifierIs(t, EXTERNAL_TOKEN) )
+	{
+		RewindTo(&t);
+		node->AddChildLast(ParseIdentifier());
+		if (isSyntaxError) return node;
+
+		GetToken(&t);
+	}
+
+	if( t.type != ttInterface )
+	{
+		Error(ExpectedToken("interface"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+	node->AddChildLast(ParseIdentifier());
+
+	// External shared declarations are ended with ';'
+	GetToken(&t);
+	if (t.type == ttEndStatement)
+	{
+		RewindTo(&t);
+		node->AddChildLast(ParseToken(ttEndStatement));
+		return node;
+	}
+
+	// Can optionally have a list of interfaces that are inherited
+	if( t.type == ttColon )
+	{
+		asCScriptNode *inherit = CreateNode(snIdentifier);
+		node->AddChildLast(inherit);
+
+		ParseOptionalScope(inherit);
+		inherit->AddChildLast(ParseIdentifier());
+		GetToken(&t);
+		while( t.type == ttListSeparator )
+		{
+			inherit = CreateNode(snIdentifier);
+			node->AddChildLast(inherit);
+
+			ParseOptionalScope(inherit);
+			inherit->AddChildLast(ParseIdentifier());
+			GetToken(&t);
+		}
+	}
+
+	if( t.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	// Parse interface methods
+	GetToken(&t);
+	RewindTo(&t);
+	while( t.type != ttEndStatementBlock && t.type != ttEnd )
+	{
+		if( IsVirtualPropertyDecl() )
+			node->AddChildLast(ParseVirtualPropertyDecl(true, true));
+		else if( t.type == ttEndStatement )
+			// Skip empty declarations
+			GetToken(&t);
+		else
+			// Parse the method signature
+			node->AddChildLast(ParseInterfaceMethod());
+
+		if( isSyntaxError ) return node;
+
+		GetToken(&t);
+		RewindTo(&t);
+	}
+
+	GetToken(&t);
+	if( t.type != ttEndStatementBlock )
+	{
+		Error(ExpectedToken("}"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:1: MIXIN         ::= 'mixin' CLASS
+asCScriptNode *asCParser::ParseMixin()
+{
+	asCScriptNode *node = CreateNode(snMixin);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+
+	if( t.type != ttMixin )
+	{
+		Error(ExpectedToken("mixin"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+
+	// A mixin token must be followed by a class declaration
+	node->AddChildLast(ParseClass());
+
+	return node;
+}
+
+// BNF:1: CLASS         ::= {'shared' | 'abstract' | 'final' | 'external'} 'class' IDENTIFIER (';' | ([':' IDENTIFIER {',' IDENTIFIER}] '{' {VIRTPROP | FUNC | VAR | FUNCDEF} '}'))
+asCScriptNode *asCParser::ParseClass()
+{
+	asCScriptNode *node = CreateNode(snClass);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+
+	// Allow the keywords 'shared', 'abstract', 'final', and 'external' before 'class'
+	while( IdentifierIs(t, SHARED_TOKEN) ||
+		   IdentifierIs(t, ABSTRACT_TOKEN) ||
+		   IdentifierIs(t, FINAL_TOKEN) ||
+		   IdentifierIs(t, EXTERNAL_TOKEN) )
+	{
+		RewindTo(&t);
+		node->AddChildLast(ParseIdentifier());
+		GetToken(&t);
+	}
+
+	if( t.type != ttClass )
+	{
+		Error(ExpectedToken("class"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->SetToken(&t);
+
+	if( engine->ep.allowImplicitHandleTypes )
+	{
+		// Parse 'implicit handle class' construct
+		GetToken(&t);
+
+		if ( t.type == ttHandle )
+			node->SetToken(&t);
+		else
+			RewindTo(&t);
+	}
+
+	node->AddChildLast(ParseIdentifier());
+
+	// External shared declarations are ended with ';'
+	GetToken(&t);
+	if (t.type == ttEndStatement)
+	{
+		RewindTo(&t);
+		node->AddChildLast(ParseToken(ttEndStatement));
+		return node;
+	}
+
+	// Optional list of interfaces that are being implemented and classes that are being inherited
+	if( t.type == ttColon )
+	{
+		asCScriptNode *inherit = CreateNode(snIdentifier);
+		node->AddChildLast(inherit);
+
+		ParseOptionalScope(inherit);
+		inherit->AddChildLast(ParseIdentifier());
+		GetToken(&t);
+		while( t.type == ttListSeparator )
+		{
+			inherit = CreateNode(snIdentifier);
+			node->AddChildLast(inherit);
+
+			ParseOptionalScope(inherit);
+			inherit->AddChildLast(ParseIdentifier());
+			GetToken(&t);
+		}
+	}
+
+	if( t.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	// Parse properties
+	GetToken(&t);
+	RewindTo(&t);
+	while( t.type != ttEndStatementBlock && t.type != ttEnd )
+	{
+		// Is it a property or a method?
+		if (t.type == ttFuncDef)
+			node->AddChildLast(ParseFuncDef());
+		else if( IsFuncDecl(true) )
+			node->AddChildLast(ParseFunction(true));
+		else if( IsVirtualPropertyDecl() )
+			node->AddChildLast(ParseVirtualPropertyDecl(true, false));
+		else if( IsVarDecl() )
+			node->AddChildLast(ParseDeclaration(true));
+		else if( t.type == ttEndStatement )
+			// Skip empty declarations
+			GetToken(&t);
+		else
+		{
+			Error(TXT_EXPECTED_METHOD_OR_PROPERTY, &t);
+			Error(InsteadFound(t), &t);
+			return node;
+		}
+
+		if( isSyntaxError )
+			return node;
+
+		GetToken(&t);
+		RewindTo(&t);
+	}
+
+	GetToken(&t);
+	if( t.type != ttEndStatementBlock )
+	{
+		Error(ExpectedToken("}"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+int asCParser::ParseVarInit(asCScriptCode *in_script, asCScriptNode *in_init)
+{
+	Reset();
+
+	// Tell the parser to validate the identifiers as valid types
+	checkValidTypes = true;
+
+	this->script = in_script;
+	sourcePos = in_init->tokenPos;
+
+	// If next token is assignment, parse expression
+	sToken t;
+	GetToken(&t);
+	if( t.type == ttAssignment )
+	{
+		GetToken(&t);
+		RewindTo(&t);
+		if( t.type == ttStartStatementBlock )
+			scriptNode = ParseInitList();
+		else
+			scriptNode = ParseAssignment();
+	}
+	else if( t.type == ttOpenParenthesis)
+	{
+		RewindTo(&t);
+		scriptNode = ParseArgList();
+	}
+	else
+	{
+		int tokens[] = {ttAssignment, ttOpenParenthesis };
+		Error(ExpectedOneOf(tokens, 2), &t);
+		Error(InsteadFound(t), &t);
+	}
+
+	// Don't allow any more tokens after the expression
+	GetToken(&t);
+	if( t.type != ttEnd && t.type != ttEndStatement && t.type != ttListSeparator && t.type != ttEndStatementBlock )
+	{
+		asCString msg;
+		msg.Format(TXT_UNEXPECTED_TOKEN_s, asCTokenizer::GetDefinition(t.type));
+		Error(msg, &t);
+	}
+
+	if( isSyntaxError || errorWhileParsing )
+		return -1;
+
+	return 0;
+}
+
+asCScriptNode *asCParser::SuperficiallyParseVarInit()
+{
+	asCScriptNode *node = CreateNode(snAssignment);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	node->UpdateSourcePos(t.pos, t.length);
+
+	if( t.type == ttAssignment )
+	{
+		GetToken(&t);
+		sToken start = t;
+
+		// Find the end of the expression
+		int indentParan = 0;
+		int indentBrace = 0;
+		while( indentParan || indentBrace || (t.type != ttListSeparator && t.type != ttEndStatement && t.type != ttEndStatementBlock) )
+		{
+			if( t.type == ttOpenParenthesis)
+				indentParan++;
+			else if( t.type == ttCloseParenthesis)
+				indentParan--;
+			else if( t.type == ttStartStatementBlock )
+				indentBrace++;
+			else if( t.type == ttEndStatementBlock )
+				indentBrace--;
+			else if( t.type == ttNonTerminatedStringConstant )
+			{
+				Error(TXT_NONTERMINATED_STRING, &t);
+				break;
+			}
+			else if( t.type == ttEnd )
+			{
+				Error(TXT_UNEXPECTED_END_OF_FILE, &t);
+				Info(TXT_WHILE_PARSING_EXPRESSION, &start);
+				break;
+			}
+			GetToken(&t);
+		}
+
+		// Rewind so that the next token read is the list separator, end statement, or end statement block
+		RewindTo(&t);
+	}
+	else if( t.type == ttOpenParenthesis)
+	{
+		sToken start = t;
+
+		// Find the end of the argument list
+		int indent = 1;
+		while( indent )
+		{
+			GetToken(&t);
+			if( t.type == ttOpenParenthesis)
+				indent++;
+			else if( t.type == ttCloseParenthesis)
+				indent--;
+			else if( t.type == ttNonTerminatedStringConstant )
+			{
+				Error(TXT_NONTERMINATED_STRING, &t);
+				break;
+			}
+			else if( t.type == ttEnd )
+			{
+				Error(TXT_UNEXPECTED_END_OF_FILE, &t);
+				Info(TXT_WHILE_PARSING_ARG_LIST, &start);
+				break;
+			}
+		}
+	}
+	else
+	{
+		int tokens[] = {ttAssignment, ttOpenParenthesis };
+		Error(ExpectedOneOf(tokens, 2), &t);
+		Error(InsteadFound(t), &t);
+	}
+
+	return node;
+}
+
+asCScriptNode *asCParser::SuperficiallyParseStatementBlock()
+{
+	asCScriptNode *node = CreateNode(snStatementBlock);
+	if( node == 0 ) return 0;
+
+	// This function will only superficially parse the statement block in order to find the end of it
+	sToken t1;
+
+	GetToken(&t1);
+	if( t1.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	sToken start = t1;
+
+	int level = 1;
+	while( level > 0 && !isSyntaxError )
+	{
+		GetToken(&t1);
+		if( t1.type == ttEndStatementBlock )
+			level--;
+		else if( t1.type == ttStartStatementBlock )
+			level++;
+		else if( t1.type == ttNonTerminatedStringConstant )
+		{
+			Error(TXT_NONTERMINATED_STRING, &t1);
+			break;
+		}
+		else if( t1.type == ttEnd )
+		{
+			Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
+			Info(TXT_WHILE_PARSING_STATEMENT_BLOCK, &start);
+			break;
+		}
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	return node;
+}
+
+// BNF:2: STATBLOCK     ::= '{' {VAR | STATEMENT} '}'
+asCScriptNode *asCParser::ParseStatementBlock()
+{
+	asCScriptNode *node = CreateNode(snStatementBlock);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( t1.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	sToken start = t1;
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	for(;;)
+	{
+		while( !isSyntaxError )
+		{
+			GetToken(&t1);
+			if( t1.type == ttEndStatementBlock )
+			{
+				node->UpdateSourcePos(t1.pos, t1.length);
+
+				// Statement block is finished
+				return node;
+			}
+			else
+			{
+				RewindTo(&t1);
+
+				if( IsVarDecl() )
+					node->AddChildLast(ParseDeclaration());
+				else
+					node->AddChildLast(ParseStatement());
+			}
+		}
+
+		if( isSyntaxError )
+		{
+			// Search for either ';', '{', '}', or end
+			GetToken(&t1);
+			while( t1.type != ttEndStatement && t1.type != ttEnd &&
+				   t1.type != ttStartStatementBlock && t1.type != ttEndStatementBlock )
+			{
+				GetToken(&t1);
+			}
+
+			// Skip this statement block
+			if( t1.type == ttStartStatementBlock )
+			{
+				// Find the end of the block and skip nested blocks
+				int level = 1;
+				while( level > 0 )
+				{
+					GetToken(&t1);
+					if( t1.type == ttStartStatementBlock ) level++;
+					if( t1.type == ttEndStatementBlock ) level--;
+					if( t1.type == ttEnd ) break;
+				}
+			}
+			else if( t1.type == ttEndStatementBlock )
+			{
+				RewindTo(&t1);
+			}
+			else if( t1.type == ttEnd )
+			{
+				Error(TXT_UNEXPECTED_END_OF_FILE, &t1);
+				Info(TXT_WHILE_PARSING_STATEMENT_BLOCK, &start);
+				return node;
+			}
+
+			isSyntaxError = false;
+		}
+	}
+	UNREACHABLE_RETURN;
+}
+
+// BNF:4: INITLIST      ::= '{' [ASSIGN | INITLIST] {',' [ASSIGN | INITLIST]} '}'
+asCScriptNode *asCParser::ParseInitList()
+{
+	asCScriptNode *node = CreateNode(snInitList);
+	if( node == 0 ) return 0;
+
+	sToken t1;
+
+	GetToken(&t1);
+	if( t1.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t1);
+		Error(InsteadFound(t1), &t1);
+		return node;
+	}
+
+	node->UpdateSourcePos(t1.pos, t1.length);
+
+	GetToken(&t1);
+	if( t1.type == ttEndStatementBlock )
+	{
+		node->UpdateSourcePos(t1.pos, t1.length);
+
+		// Statement block is finished
+		return node;
+	}
+	else
+	{
+		RewindTo(&t1);
+		for(;;)
+		{
+			GetToken(&t1);
+			if( t1.type == ttListSeparator )
+			{
+				// No expression
+				node->AddChildLast(CreateNode(snUndefined));
+				node->lastChild->UpdateSourcePos(t1.pos, 1);
+
+				GetToken(&t1);
+				if( t1.type == ttEndStatementBlock )
+				{
+					// No expression
+					node->AddChildLast(CreateNode(snUndefined));
+					node->lastChild->UpdateSourcePos(t1.pos, 1);
+					node->UpdateSourcePos(t1.pos, t1.length);
+					return node;
+				}
+				RewindTo(&t1);
+			}
+			else if( t1.type == ttEndStatementBlock )
+			{
+				// No expression
+				node->AddChildLast(CreateNode(snUndefined));
+				node->lastChild->UpdateSourcePos(t1.pos, 1);
+				node->UpdateSourcePos(t1.pos, t1.length);
+
+				// Statement block is finished
+				return node;
+			}
+			else if( t1.type == ttStartStatementBlock )
+			{
+				RewindTo(&t1);
+				node->AddChildLast(ParseInitList());
+				if( isSyntaxError ) return node;
+
+				GetToken(&t1);
+				if( t1.type == ttListSeparator )
+					continue;
+				else if( t1.type == ttEndStatementBlock )
+				{
+					node->UpdateSourcePos(t1.pos, t1.length);
+
+					// Statement block is finished
+					return node;
+				}
+				else
+				{
+					Error(ExpectedTokens("}", ","), &t1);
+					Error(InsteadFound(t1), &t1);
+					return node;
+				}
+			}
+			else
+			{
+				RewindTo(&t1);
+				node->AddChildLast(ParseAssignment());
+				if( isSyntaxError ) return node;
+
+
+				GetToken(&t1);
+				if( t1.type == ttListSeparator )
+					continue;
+				else if( t1.type == ttEndStatementBlock )
+				{
+					node->UpdateSourcePos(t1.pos, t1.length);
+
+					// Statement block is finished
+					return node;
+				}
+				else
+				{
+					Error(ExpectedTokens("}", ","), &t1);
+					Error(InsteadFound(t1), &t1);
+					return node;
+				}
+			}
+		}
+	}
+	UNREACHABLE_RETURN;
+}
+
+// BNF:1: VAR           ::= ['private'|'protected'] TYPE IDENTIFIER [( '=' (INITLIST | EXPR)) | ARGLIST] {',' IDENTIFIER [( '=' (INITLIST | EXPR)) | ARGLIST]} ';'
+asCScriptNode *asCParser::ParseDeclaration(bool isClassProp, bool isGlobalVar)
+{
+	asCScriptNode *node = CreateNode(snDeclaration);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	RewindTo(&t);
+
+	// A class property can be preceeded by private
+	if( t.type == ttPrivate && isClassProp )
+		node->AddChildLast(ParseToken(ttPrivate));
+	else if( t.type == ttProtected && isClassProp )
+		node->AddChildLast(ParseToken(ttProtected));
+
+	// Parse data type
+	node->AddChildLast(ParseType(true, false, !isClassProp));
+	if( isSyntaxError ) return node;
+
+	for(;;)
+	{
+		// Parse identifier
+		node->AddChildLast(ParseIdentifier());
+		if( isSyntaxError ) return node;
+
+		if( isClassProp || isGlobalVar )
+		{
+			// Only superficially parse the initialization info for the class property
+			GetToken(&t);
+			RewindTo(&t);
+			if( t.type == ttAssignment || t.type == ttOpenParenthesis)
+			{
+				node->AddChildLast(SuperficiallyParseVarInit());
+				if( isSyntaxError ) return node;
+			}
+		}
+		else
+		{
+			// If next token is assignment, parse expression
+			GetToken(&t);
+			if( t.type == ttOpenParenthesis)
+			{
+				RewindTo(&t);
+				node->AddChildLast(ParseArgList());
+				if( isSyntaxError ) return node;
+			}
+			else if( t.type == ttAssignment )
+			{
+				GetToken(&t);
+				RewindTo(&t);
+				if( t.type == ttStartStatementBlock )
+				{
+					node->AddChildLast(ParseInitList());
+					if( isSyntaxError ) return node;
+				}
+				else
+				{
+					node->AddChildLast(ParseAssignment());
+					if( isSyntaxError ) return node;
+				}
+			}
+			else
+				RewindTo(&t);
+		}
+
+		// continue if list separator, else terminate with end statement
+		GetToken(&t);
+		if( t.type == ttListSeparator )
+			continue;
+		else if( t.type == ttEndStatement )
+		{
+			node->UpdateSourcePos(t.pos, t.length);
+
+			return node;
+		}
+		else
+		{
+			Error(ExpectedTokens(",", ";"), &t);
+			Error(InsteadFound(t), &t);
+			return node;
+		}
+	}
+	UNREACHABLE_RETURN;
+}
+
+// BNF:7: STATEMENT     ::= (IF | FOR | WHILE | RETURN | STATBLOCK | BREAK | CONTINUE | DOWHILE | SWITCH | EXPRSTAT | TRY)
+asCScriptNode *asCParser::ParseStatement()
+{
+	sToken t1;
+
+	GetToken(&t1);
+	RewindTo(&t1);
+
+	if (t1.type == ttIf)
+		return ParseIf();
+	else if (t1.type == ttFor)
+		return ParseFor();
+	else if (t1.type == ttWhile)
+		return ParseWhile();
+	else if (t1.type == ttReturn)
+		return ParseReturn();
+	else if (t1.type == ttStartStatementBlock)
+		return ParseStatementBlock();
+	else if (t1.type == ttBreak)
+		return ParseBreak();
+	else if (t1.type == ttContinue)
+		return ParseContinue();
+	else if (t1.type == ttDo)
+		return ParseDoWhile();
+	else if (t1.type == ttSwitch)
+		return ParseSwitch();
+	else if (t1.type == ttTry)
+		return ParseTryCatch();
+	else
+	{
+		if( IsVarDecl() )
+		{
+			Error(TXT_UNEXPECTED_VAR_DECL, &t1);
+			return 0;
+		}
+		return ParseExpressionStatement();
+	}
+}
+
+// BNF:8: EXPRSTAT      ::= [ASSIGN] ';'
+asCScriptNode *asCParser::ParseExpressionStatement()
+{
+	asCScriptNode *node = CreateNode(snExpressionStatement);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type == ttEndStatement )
+	{
+		node->UpdateSourcePos(t.pos, t.length);
+
+		return node;
+	}
+
+	RewindTo(&t);
+
+	node->AddChildLast(ParseAssignment());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttEndStatement )
+	{
+		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:8: SWITCH        ::= 'switch' '(' ASSIGN ')' '{' {CASE} '}'
+asCScriptNode *asCParser::ParseSwitch()
+{
+	asCScriptNode *node = CreateNode(snSwitch);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttSwitch )
+	{
+		Error(ExpectedToken("switch"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->AddChildLast(ParseAssignment());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttCloseParenthesis)
+	{
+		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	GetToken(&t);
+	if( t.type != ttStartStatementBlock )
+	{
+		Error(ExpectedToken("{"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	while( !isSyntaxError )
+	{
+		GetToken(&t);
+
+		if( t.type == ttEndStatementBlock )
+			break;
+
+		RewindTo(&t);
+
+		if( t.type != ttCase && t.type != ttDefault )
+		{
+			const char *tokens[] = {"case", "default"};
+			Error(ExpectedOneOf(tokens, 2), &t);
+			Error(InsteadFound(t), &t);
+			return node;
+		}
+
+		node->AddChildLast(ParseCase());
+		if( isSyntaxError ) return node;
+	}
+
+	if( t.type != ttEndStatementBlock )
+	{
+		Error(ExpectedToken("}"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	return node;
+}
+
+// BNF:9: CASE          ::= (('case' EXPR) | 'default') ':' {STATEMENT}
+asCScriptNode *asCParser::ParseCase()
+{
+	asCScriptNode *node = CreateNode(snCase);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttCase && t.type != ttDefault )
+	{
+		Error(ExpectedTokens("case", "default"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	if(t.type == ttCase)
+	{
+		node->AddChildLast(ParseExpression());
+	}
+
+	GetToken(&t);
+	if( t.type != ttColon )
+	{
+		Error(ExpectedToken(":"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	// Parse statements until we find either of }, case, default, and break
+	GetToken(&t);
+	RewindTo(&t);
+	while( t.type != ttCase &&
+		   t.type != ttDefault &&
+		   t.type != ttEndStatementBlock &&
+		   t.type != ttBreak )
+	{
+		if( IsVarDecl() )
+			// Variable declarations are not allowed, but we parse it anyway to give a good error message
+			node->AddChildLast(ParseDeclaration());
+		else
+			node->AddChildLast(ParseStatement());
+		if( isSyntaxError ) return node;
+
+		GetToken(&t);
+		RewindTo(&t);
+	}
+
+	// If the case was ended with a break statement, add it to the node
+	if( t.type == ttBreak )
+		node->AddChildLast(ParseBreak());
+
+	return node;
+}
+
+// BNF:8: IF            ::= 'if' '(' ASSIGN ')' STATEMENT ['else' STATEMENT]
+asCScriptNode *asCParser::ParseIf()
+{
+	asCScriptNode *node = CreateNode(snIf);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttIf )
+	{
+		Error(ExpectedToken("if"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->AddChildLast(ParseAssignment());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttCloseParenthesis)
+	{
+		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->AddChildLast(ParseStatement());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttElse )
+	{
+		// No else statement return already
+		RewindTo(&t);
+		return node;
+	}
+
+	node->AddChildLast(ParseStatement());
+
+	return node;
+}
+
+// BNF:8: TRY           ::= 'try' STATBLOCK 'catch' STATBLOCK
+asCScriptNode *asCParser::ParseTryCatch()
+{
+	asCScriptNode *node = CreateNode(snTryCatch);
+	if (node == 0) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if (t.type != ttTry)
+	{
+		Error(ExpectedToken("try"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	node->AddChildLast(ParseStatementBlock());
+	if (isSyntaxError) return node;
+
+	GetToken(&t);
+	if (t.type != ttCatch)
+	{
+		Error(ExpectedToken("catch"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->AddChildLast(ParseStatementBlock());
+	if (isSyntaxError) return node;
+
+	return node;
+}
+
+// BNF:8: FOR           ::= 'for' '(' (VAR | EXPRSTAT) EXPRSTAT [ASSIGN {',' ASSIGN}] ')' STATEMENT
+asCScriptNode *asCParser::ParseFor()
+{
+	asCScriptNode *node = CreateNode(snFor);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttFor )
+	{
+		Error(ExpectedToken("for"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	if( IsVarDecl() )
+		node->AddChildLast(ParseDeclaration());
+	else
+		node->AddChildLast(ParseExpressionStatement());
+	if( isSyntaxError ) return node;
+
+	node->AddChildLast(ParseExpressionStatement());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttCloseParenthesis)
+	{
+		RewindTo(&t);
+
+		// Parse N increment statements separated by ,
+		for(;;)
+		{
+			asCScriptNode *n = CreateNode(snExpressionStatement);
+			if( n == 0 ) return 0;
+			node->AddChildLast(n);
+			n->AddChildLast(ParseAssignment());
+			if( isSyntaxError ) return node;
+
+			GetToken(&t);
+			if( t.type == ttListSeparator )
+				continue;
+			else if( t.type == ttCloseParenthesis)
+				break;
+			else
+			{
+				const char *tokens[] = {",", ")"};
+				Error(ExpectedOneOf(tokens, 2), &t);
+				Error(InsteadFound(t), &t);
+				return node;
+			}
+		}
+	}
+
+	node->AddChildLast(ParseStatement());
+
+	return node;
+}
+
+// BNF:8: WHILE         ::= 'while' '(' ASSIGN ')' STATEMENT
+asCScriptNode *asCParser::ParseWhile()
+{
+	asCScriptNode *node = CreateNode(snWhile);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttWhile )
+	{
+		Error(ExpectedToken("while"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->AddChildLast(ParseAssignment());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttCloseParenthesis)
+	{
+		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->AddChildLast(ParseStatement());
+
+	return node;
+}
+
+// BNF:8: DOWHILE       ::= 'do' STATEMENT 'while' '(' ASSIGN ')' ';'
+asCScriptNode *asCParser::ParseDoWhile()
+{
+	asCScriptNode *node = CreateNode(snDoWhile);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttDo )
+	{
+		Error(ExpectedToken("do"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	node->AddChildLast(ParseStatement());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttWhile )
+	{
+		Error(ExpectedToken("while"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	GetToken(&t);
+	if( t.type != ttOpenParenthesis)
+	{
+		Error(ExpectedToken("("), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->AddChildLast(ParseAssignment());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttCloseParenthesis)
+	{
+		Error(ExpectedToken(")"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	GetToken(&t);
+	if( t.type != ttEndStatement )
+	{
+		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:8: RETURN        ::= 'return' [ASSIGN] ';'
+asCScriptNode *asCParser::ParseReturn()
+{
+	asCScriptNode *node = CreateNode(snReturn);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttReturn )
+	{
+		Error(ExpectedToken("return"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type == ttEndStatement )
+	{
+		node->UpdateSourcePos(t.pos, t.length);
+		return node;
+	}
+
+	RewindTo(&t);
+
+	node->AddChildLast(ParseAssignment());
+	if( isSyntaxError ) return node;
+
+	GetToken(&t);
+	if( t.type != ttEndStatement )
+	{
+		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:8: BREAK         ::= 'break' ';'
+asCScriptNode *asCParser::ParseBreak()
+{
+	asCScriptNode *node = CreateNode(snBreak);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttBreak )
+	{
+		Error(ExpectedToken("break"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttEndStatement )
+	{
+		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// BNF:8: CONTINUE      ::= 'continue' ';'
+asCScriptNode *asCParser::ParseContinue()
+{
+	asCScriptNode *node = CreateNode(snContinue);
+	if( node == 0 ) return 0;
+
+	sToken t;
+	GetToken(&t);
+	if( t.type != ttContinue )
+	{
+		Error(ExpectedToken("continue"), &t);
+		Error(InsteadFound(t), &t);
+		return node;
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	GetToken(&t);
+	if( t.type != ttEndStatement )
+	{
+		Error(ExpectedToken(";"), &t);
+		Error(InsteadFound(t), &t);
+	}
+
+	node->UpdateSourcePos(t.pos, t.length);
+
+	return node;
+}
+
+// TODO: typedef: Typedefs should accept complex types as well
+// BNF:1: TYPEDEF       ::= 'typedef' PRIMTYPE IDENTIFIER ';'
+asCScriptNode *asCParser::ParseTypedef()
+{
+	// Create the typedef node
+	asCScriptNode *node = CreateNode(snTypedef);
+	if( node == 0 ) return 0;
+
+	sToken	token;
+
+	GetToken(&token);
+	if( token.type != ttTypedef)
+	{
+		Error(ExpectedToken(asCTokenizer::GetDefinition(ttTypedef)), &token);
+		Error(InsteadFound(token), &token);
+		return node;
+	}
+
+	node->SetToken(&token);
+	node->UpdateSourcePos(token.pos, token.length);
+
+	// Parse the base type
+	GetToken(&token);
+	RewindTo(&token);
+
+	// Make sure it is a primitive type (except ttVoid)
+	if( !IsRealType(token.type) || token.type == ttVoid )
+	{
+		asCString str;
+		str.Format(TXT_UNEXPECTED_TOKEN_s, asCTokenizer::GetDefinition(token.type));
+		Error(str, &token);
+		return node;
+	}
+
+	node->AddChildLast(ParseRealType());
+	node->AddChildLast(ParseIdentifier());
+
+	// Check for the end of the typedef
+	GetToken(&token);
+	if( token.type != ttEndStatement )
+	{
+		RewindTo(&token);
+		Error(ExpectedToken(asCTokenizer::GetDefinition(token.type)), &token);
+		Error(InsteadFound(token), &token);
+	}
+
+	return node;
+}
+
+#endif
+
+END_AS_NAMESPACE
+
+
diff --git a/Sources/AngelScript/source/as_parser.h b/Sources/AngelScript/source/as_parser.h
old mode 100755
new mode 100644
index 2fe39c37e..4aec2646c
--- a/Sources/AngelScript/source/as_parser.h
+++ b/Sources/AngelScript/source/as_parser.h
@@ -1,195 +1,197 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_parser.h
-//
-// This class parses the script code and builds a tree for compilation
-//
-
-
-
-#ifndef AS_PARSER_H
-#define AS_PARSER_H
-
-#include "as_scriptnode.h"
-#include "as_scriptcode.h"
-#include "as_builder.h"
-#include "as_tokenizer.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCParser
-{
-public:
-	asCParser(asCBuilder *builder);
-	~asCParser();
-
-	int ParseFunctionDefinition(asCScriptCode *script, bool expectListPattern);
-	int ParsePropertyDeclaration(asCScriptCode *script);
-	int ParseDataType(asCScriptCode *script, bool isReturnType);
-	int ParseTemplateDecl(asCScriptCode *script);
-
-#ifndef AS_NO_COMPILER
-	int ParseScript(asCScriptCode *script);
-
-	// Called from compiler
-	int ParseStatementBlock(asCScriptCode *script, asCScriptNode *block);
-	int ParseVarInit(asCScriptCode *script, asCScriptNode *init);
-	int ParseExpression(asCScriptCode *script);
-#endif
-	
-	asCScriptNode *GetScriptNode();
-
-protected:
-	void Reset();
-
-	void GetToken(sToken *token);
-	void RewindTo(const sToken *token);
-	void SetPos(size_t pos);
-	void Error(const asCString &text, sToken *token);
-	void Warning(const asCString &text, sToken *token);
-	void Info(const asCString &text, sToken *token);
-
-	asCScriptNode *CreateNode(eScriptNode type);
-
-	asCScriptNode *ParseFunctionDefinition();
-	asCScriptNode *ParseParameterList();
-	asCScriptNode *SuperficiallyParseExpression();
-	asCScriptNode *ParseType(bool allowConst, bool allowVariableType = false, bool allowAuto = false);
-	asCScriptNode *ParseTypeMod(bool isParam);
-	void           ParseOptionalScope(asCScriptNode *node);
-	asCScriptNode *ParseRealType();
-	asCScriptNode *ParseDataType(bool allowVariableType = false, bool allowAuto = false);
-	asCScriptNode *ParseIdentifier();
-	bool           ParseTemplTypeList(asCScriptNode *node, bool required = true);
-
-	asCScriptNode *ParseListPattern();
-
-	bool IsRealType(int tokenType);
-	bool IsDataType(const sToken &token);
-	bool IdentifierIs(const sToken &t, const char *str);
-
-#ifndef AS_NO_COMPILER
-	// Statements
-	asCScriptNode *SuperficiallyParseStatementBlock();
-	asCScriptNode *SuperficiallyParseVarInit();
-	asCScriptNode *ParseStatementBlock();
-	asCScriptNode *ParseStatement();
-	asCScriptNode *ParseExpressionStatement();
-	asCScriptNode *ParseSwitch();
-	asCScriptNode *ParseCase();
-	asCScriptNode *ParseIf();
-	asCScriptNode *ParseFor();
-	asCScriptNode *ParseWhile();
-	asCScriptNode *ParseDoWhile();
-	asCScriptNode *ParseReturn();
-	asCScriptNode *ParseBreak();
-	asCScriptNode *ParseContinue();
-
-	// Declarations
-	asCScriptNode *ParseDeclaration(bool isClassProp = false, bool isGlobalVar = false);
-	asCScriptNode *ParseImport();
-	asCScriptNode *ParseScript(bool inBlock);
-	asCScriptNode *ParseNamespace();
-	asCScriptNode *ParseFunction(bool isMethod = false);
-	asCScriptNode *ParseFuncDef();
-	asCScriptNode *ParseClass();
-	asCScriptNode *ParseMixin();
-	asCScriptNode *ParseInitList();
-	asCScriptNode *ParseInterface();
-	asCScriptNode *ParseInterfaceMethod();
-	asCScriptNode *ParseVirtualPropertyDecl(bool isMethod, bool isInterface);
-	asCScriptNode *ParseEnumeration();
-	asCScriptNode *ParseTypedef();
-	void ParseMethodOverrideBehaviors(asCScriptNode *funcNode);
-	bool IsVarDecl();
-	bool IsVirtualPropertyDecl();
-	bool IsFuncDecl(bool isMethod);
-	bool IsLambda();
-	bool IsFunctionCall();
-
-	// Expressions
-	asCScriptNode *ParseAssignment();
-	asCScriptNode *ParseAssignOperator();
-	asCScriptNode *ParseCondition();
-	asCScriptNode *ParseExpression();
-	asCScriptNode *ParseExprTerm();
-	asCScriptNode *ParseExprOperator();
-	asCScriptNode *ParseExprPreOp();
-	asCScriptNode *ParseExprPostOp();
-	asCScriptNode *ParseExprValue();
-	asCScriptNode *ParseArgList(bool withParenthesis = true);
-	asCScriptNode *ParseFunctionCall();
-	asCScriptNode *ParseVariableAccess();
-	asCScriptNode *ParseConstructCall();
-	asCScriptNode *ParseCast();
-	asCScriptNode *ParseConstant();
-	asCScriptNode *ParseStringConstant();
-	asCScriptNode *ParseLambda();
-
-	bool IsConstant(int tokenType);
-	bool IsOperator(int tokenType);
-	bool IsPreOperator(int tokenType);
-	bool IsPostOperator(int tokenType);
-	bool IsAssignOperator(int tokenType);
-
-	bool CheckTemplateType(const sToken &t);
-#endif
-
-	asCScriptNode *ParseToken(int token);
-	asCScriptNode *ParseOneOf(int *tokens, int num);
-
-	asCString ExpectedToken(const char *token);
-	asCString ExpectedTokens(const char *token1, const char *token2);
-	asCString ExpectedOneOf(int *tokens, int count);
-	asCString ExpectedOneOf(const char **tokens, int count);
-	asCString InsteadFound(sToken &t);
-
-	bool errorWhileParsing;
-	bool isSyntaxError;
-	bool checkValidTypes;
-	bool isParsingAppInterface;
-
-	asCScriptEngine *engine;
-	asCBuilder      *builder;
-	asCScriptCode   *script;
-	asCScriptNode   *scriptNode;
-
-	asCString tempString; // Used for reduzing amount of dynamic allocations
-
-	sToken       lastToken;
-	size_t       sourcePos;
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2018 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_parser.h
+//
+// This class parses the script code and builds a tree for compilation
+//
+
+
+
+#ifndef AS_PARSER_H
+#define AS_PARSER_H
+
+#include "as_scriptnode.h"
+#include "as_scriptcode.h"
+#include "as_builder.h"
+#include "as_tokenizer.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCParser
+{
+public:
+	asCParser(asCBuilder *builder);
+	~asCParser();
+
+	int ParseFunctionDefinition(asCScriptCode *script, bool expectListPattern);
+	int ParsePropertyDeclaration(asCScriptCode *script);
+	int ParseDataType(asCScriptCode *script, bool isReturnType);
+	int ParseTemplateDecl(asCScriptCode *script);
+
+#ifndef AS_NO_COMPILER
+	int ParseScript(asCScriptCode *script);
+
+	// Called from compiler
+	int ParseStatementBlock(asCScriptCode *script, asCScriptNode *block);
+	int ParseVarInit(asCScriptCode *script, asCScriptNode *init);
+	int ParseExpression(asCScriptCode *script);
+#endif
+
+	asCScriptNode *GetScriptNode();
+
+protected:
+	void Reset();
+
+	void GetToken(sToken *token);
+	void RewindTo(const sToken *token);
+	void SetPos(size_t pos);
+	void Error(const asCString &text, sToken *token);
+	void Warning(const asCString &text, sToken *token);
+	void Info(const asCString &text, sToken *token);
+
+	asCScriptNode *CreateNode(eScriptNode type);
+
+	asCScriptNode *ParseFunctionDefinition();
+	asCScriptNode *ParseParameterList();
+	asCScriptNode *SuperficiallyParseExpression();
+	asCScriptNode *ParseType(bool allowConst, bool allowVariableType = false, bool allowAuto = false);
+	asCScriptNode *ParseTypeMod(bool isParam);
+	void           ParseOptionalScope(asCScriptNode *node);
+	asCScriptNode *ParseRealType();
+	asCScriptNode *ParseDataType(bool allowVariableType = false, bool allowAuto = false);
+	asCScriptNode *ParseIdentifier();
+	bool           ParseTemplTypeList(asCScriptNode *node, bool required = true);
+	void           ParseMethodAttributes(asCScriptNode *funcNode);
+
+	asCScriptNode *ParseListPattern();
+
+	bool IsRealType(int tokenType);
+	bool IsDataType(const sToken &token);
+	bool IdentifierIs(const sToken &t, const char *str);
+
+#ifndef AS_NO_COMPILER
+	// Statements
+	asCScriptNode *SuperficiallyParseStatementBlock();
+	asCScriptNode *SuperficiallyParseVarInit();
+	asCScriptNode *ParseStatementBlock();
+	asCScriptNode *ParseStatement();
+	asCScriptNode *ParseExpressionStatement();
+	asCScriptNode *ParseSwitch();
+	asCScriptNode *ParseCase();
+	asCScriptNode *ParseIf();
+	asCScriptNode *ParseFor();
+	asCScriptNode *ParseWhile();
+	asCScriptNode *ParseDoWhile();
+	asCScriptNode *ParseReturn();
+	asCScriptNode *ParseBreak();
+	asCScriptNode *ParseContinue();
+	asCScriptNode *ParseTryCatch();
+
+	// Declarations
+	asCScriptNode *ParseDeclaration(bool isClassProp = false, bool isGlobalVar = false);
+	asCScriptNode *ParseImport();
+	asCScriptNode *ParseScript(bool inBlock);
+	asCScriptNode *ParseNamespace();
+	asCScriptNode *ParseFunction(bool isMethod = false);
+	asCScriptNode *ParseFuncDef();
+	asCScriptNode *ParseClass();
+	asCScriptNode *ParseMixin();
+	asCScriptNode *ParseInitList();
+	asCScriptNode *ParseInterface();
+	asCScriptNode *ParseInterfaceMethod();
+	asCScriptNode *ParseVirtualPropertyDecl(bool isMethod, bool isInterface);
+	asCScriptNode *ParseEnumeration();
+	asCScriptNode *ParseTypedef();
+	bool IsVarDecl();
+	bool IsVirtualPropertyDecl();
+	bool IsFuncDecl(bool isMethod);
+	bool IsLambda();
+	bool IsFunctionCall();
+
+	// Expressions
+	asCScriptNode *ParseAssignment();
+	asCScriptNode *ParseAssignOperator();
+	asCScriptNode *ParseCondition();
+	asCScriptNode *ParseExpression();
+	asCScriptNode *ParseExprTerm();
+	asCScriptNode *ParseExprOperator();
+	asCScriptNode *ParseExprPreOp();
+	asCScriptNode *ParseExprPostOp();
+	asCScriptNode *ParseExprValue();
+	asCScriptNode *ParseArgList(bool withParenthesis = true);
+	asCScriptNode *ParseFunctionCall();
+	asCScriptNode *ParseVariableAccess();
+	asCScriptNode *ParseConstructCall();
+	asCScriptNode *ParseCast();
+	asCScriptNode *ParseConstant();
+	asCScriptNode *ParseStringConstant();
+	asCScriptNode *ParseLambda();
+
+	bool IsType(sToken &nextToken);
+	bool IsConstant(int tokenType);
+	bool IsOperator(int tokenType);
+	bool IsPreOperator(int tokenType);
+	bool IsPostOperator(int tokenType);
+	bool IsAssignOperator(int tokenType);
+
+	bool CheckTemplateType(const sToken &t);
+#endif
+
+	asCScriptNode *ParseToken(int token);
+	asCScriptNode *ParseOneOf(int *tokens, int num);
+
+	asCString ExpectedToken(const char *token);
+	asCString ExpectedTokens(const char *token1, const char *token2);
+	asCString ExpectedOneOf(int *tokens, int count);
+	asCString ExpectedOneOf(const char **tokens, int count);
+	asCString InsteadFound(sToken &t);
+
+	bool errorWhileParsing;
+	bool isSyntaxError;
+	bool checkValidTypes;
+	bool isParsingAppInterface;
+
+	asCScriptEngine *engine;
+	asCBuilder      *builder;
+	asCScriptCode   *script;
+	asCScriptNode   *scriptNode;
+
+	asCString tempString; // Used for reduzing amount of dynamic allocations
+
+	sToken       lastToken;
+	size_t       sourcePos;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_property.h b/Sources/AngelScript/source/as_property.h
old mode 100755
new mode 100644
index 983ee644f..c318ec4a3
--- a/Sources/AngelScript/source/as_property.h
+++ b/Sources/AngelScript/source/as_property.h
@@ -1,24 +1,24 @@
 /*
    AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
+   Copyright (c) 2003-2017 Andreas Jonsson
 
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
    damages arising from the use of this software.
 
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
    redistribute it freely, subject to the following restrictions:
 
-   1. The origin of this software must not be misrepresented; you 
+   1. The origin of this software must not be misrepresented; you
       must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
+      this software in a product, an acknowledgment in the product
       documentation would be appreciated but is not required.
 
-   2. Altered source versions must be plainly marked as such, and 
+   2. Altered source versions must be plainly marked as such, and
       must not be misrepresented as being the original software.
 
-   3. This notice may not be removed or altered from any source 
+   3. This notice may not be removed or altered from any source
       distribution.
 
    The original version of this library can be located at:
@@ -53,12 +53,14 @@ struct asSNameSpace;
 class asCObjectProperty
 {
 public:
-	asCObjectProperty() {accessMask = 0xFFFFFFFF;}
-	asCObjectProperty(const asCObjectProperty &o) : name(o.name), type(o.type), byteOffset(o.byteOffset), accessMask(o.accessMask), isPrivate(o.isPrivate), isProtected(o.isProtected), isInherited(o.isInherited) {}
+	asCObjectProperty() : byteOffset(0), accessMask(0xFFFFFFFF), compositeOffset(0), isCompositeIndirect(false), isPrivate(false), isProtected(false), isInherited(false) {}
+	asCObjectProperty(const asCObjectProperty &o) : name(o.name), type(o.type), byteOffset(o.byteOffset), accessMask(o.accessMask), compositeOffset(o.compositeOffset), isCompositeIndirect(o.isCompositeIndirect), isPrivate(o.isPrivate), isProtected(o.isProtected), isInherited(o.isInherited) {}
 	asCString   name;
 	asCDataType type;
 	int         byteOffset;
 	asDWORD     accessMask;
+	int         compositeOffset;
+	bool        isCompositeIndirect;
 	bool        isPrivate;
 	bool        isProtected;
 	bool        isInherited;
diff --git a/Sources/AngelScript/source/as_restore.cpp b/Sources/AngelScript/source/as_restore.cpp
old mode 100755
new mode 100644
index 3e9efe55a..5cec56540
--- a/Sources/AngelScript/source/as_restore.cpp
+++ b/Sources/AngelScript/source/as_restore.cpp
@@ -1,5285 +1,5771 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_restore.cpp
-//
-// Functions for saving and restoring module bytecode
-// asCRestore was originally written by Dennis Bollyn, dennis@gyrbo.be
-
-#include "as_config.h"
-#include "as_restore.h"
-#include "as_bytecode.h"
-#include "as_scriptobject.h"
-#include "as_texts.h"
-#include "as_debug.h"
-
-BEGIN_AS_NAMESPACE
-
-// Macros for doing endianess agnostic bitmask serialization
-#define SAVE_TO_BIT(dst, val, bit) ((dst) |= ((val) << (bit)))
-#define LOAD_FROM_BIT(dst, val, bit) ((dst) = ((val) >> (bit)) & 1)
-
-asCReader::asCReader(asCModule* _module, asIBinaryStream* _stream, asCScriptEngine* _engine)
- : module(_module), stream(_stream), engine(_engine)
-{
-	error = false;
-	bytesRead = 0;
-}
-
-void asCReader::ReadData(void *data, asUINT size)
-{
-	asASSERT(size == 1 || size == 2 || size == 4 || size == 8);
-#if defined(AS_BIG_ENDIAN)
-	for( asUINT n = 0; n < size; n++ )
-		stream->Read(((asBYTE*)data)+n, 1);
-#else
-	for( int n = size-1; n >= 0; n-- )
-		stream->Read(((asBYTE*)data)+n, 1);
-#endif
-	bytesRead += size;
-}
-
-int asCReader::Read(bool *wasDebugInfoStripped)
-{
-	TimeIt("asCReader::Read");
-
-	// Before starting the load, make sure that 
-	// any existing resources have been freed
-	module->InternalReset();
-
-	// Call the inner method to do the actual loading
-	int r = ReadInner();
-	if( r < 0 )
-	{
-		// Something went wrong while loading the bytecode, so we need
-		// to clean-up whatever has been created during the process.
-
-		// Make sure none of the loaded functions attempt to release
-		// references that have not yet been increased
-		asUINT i;
-		for( i = 0; i < module->scriptFunctions.GetLength(); i++ )
-			if( !dontTranslate.MoveTo(0, module->scriptFunctions[i]) )
-				if( module->scriptFunctions[i]->scriptData )
-					module->scriptFunctions[i]->scriptData->byteCode.SetLength(0);
-
-		asCSymbolTable<asCGlobalProperty>::iterator it = module->scriptGlobals.List();
-		for( ; it; it++ )
-			if( (*it)->GetInitFunc() )
-				if( (*it)->GetInitFunc()->scriptData )
-					(*it)->GetInitFunc()->scriptData->byteCode.SetLength(0);
-
-		module->InternalReset();
-	}
-	else
-	{
-		// Init system functions properly
-		engine->PrepareEngine();
-
-		// Initialize the global variables (unless requested not to)
-		if( engine->ep.initGlobalVarsAfterBuild )
-			r = module->ResetGlobalVars(0);
-
-		if( wasDebugInfoStripped )
-			*wasDebugInfoStripped = noDebugInfo;
-	}
-
-	return r;
-}
-
-int asCReader::Error(const char *msg)
-{
-	// Don't write if it has already been reported an error earlier
-	if( !error )
-	{
-		asCString str;
-		str.Format(msg, bytesRead);
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-		error = true;
-	}
-
-	return asERROR;
-}
-
-int asCReader::ReadInner() 
-{
-	TimeIt("asCReader::ReadInner");
-
-	// This function will load each entity one by one from the stream.
-	// If any error occurs, it will return to the caller who is 
-	// responsible for cleaning up the partially loaded entities.
-
-	engine->deferValidationOfTemplateTypes = true;
-
-	unsigned long i, count;
-	asCScriptFunction* func;
-
-	ReadData(&noDebugInfo, 1);
-
-	// Read enums
-	count = ReadEncodedUInt();
-	module->enumTypes.Allocate(static_cast<asUINT>(count), false);
-	for( i = 0; i < count && !error; i++ )
-	{
-		asCEnumType *et = asNEW(asCEnumType)(engine);
-		if( et == 0 )
-		{
-			error = true;
-			return asOUT_OF_MEMORY;
-		}
-
-		ReadTypeDeclaration(et, 1);
-
-		// If the type is shared then we should use the original if it exists
-		bool sharedExists = false;
-		if( et->IsShared() )
-		{
-			for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
-			{
-				asCTypeInfo *t = engine->sharedScriptTypes[n];
-				if( t && 
-					t->IsShared() &&
-					t->name == et->name &&
-					t->nameSpace == et->nameSpace &&
-					(t->flags & asOBJ_ENUM) )
-				{
-					asDELETE(et, asCEnumType);
-					et = t->CastToEnumType();
-					sharedExists = true;
-					break;
-				}
-			}
-		}
-
-		if( sharedExists )
-		{
-			existingShared.Insert(et, true);
-			et->AddRefInternal();
-		}
-		else
-		{
-			if( et->IsShared() )
-			{
-				engine->sharedScriptTypes.PushLast(et);
-				et->AddRefInternal();
-			}
-
-			// Set this module as the owner
-			et->module = module;
-		}
-		module->enumTypes.PushLast(et);
-		ReadTypeDeclaration(et, 2);
-	}
-
-	if( error ) return asERROR;
-
-	// classTypes[]
-	// First restore the structure names, then the properties
-	count = ReadEncodedUInt();
-	module->classTypes.Allocate(static_cast<asUINT>(count), false);
-	for( i = 0; i < count && !error; ++i )
-	{
-		asCObjectType *ot = asNEW(asCObjectType)(engine);
-		if( ot == 0 )
-		{
-			error = true;
-			return asOUT_OF_MEMORY;
-		}
-
-		ReadTypeDeclaration(ot, 1);
-
-		// If the type is shared, then we should use the original if it exists
-		bool sharedExists = false;
-		if( ot->IsShared() )
-		{
-			for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
-			{
-				asCTypeInfo *ti = engine->sharedScriptTypes[n];
-				asCObjectType *t = ti ? ti->CastToObjectType() : 0;
-				if( t &&
-					t->IsShared() &&
-					t->name == ot->name &&
-					t->nameSpace == ot->nameSpace &&
-					t->IsInterface() == ot->IsInterface() )
-				{
-					asDELETE(ot, asCObjectType);
-					ot = t->CastToObjectType();
-					sharedExists = true;
-					break;
-				}
-			}
-		}
-
-		if( sharedExists )
-		{
-			existingShared.Insert(ot, true);
-			ot->AddRefInternal();
-		}
-		else
-		{
-			if( ot->IsShared() )
-			{
-				engine->sharedScriptTypes.PushLast(ot);
-				ot->AddRefInternal();
-			}
-
-			// Set this module as the owner
-			ot->module = module;
-		}
-		module->classTypes.PushLast(ot);
-	}
-
-	if( error ) return asERROR;
-
-	// Read func defs
-	count = ReadEncodedUInt();
-	module->funcDefs.Allocate(static_cast<asUINT> (count), false);
-	for( i = 0; i < count && !error; i++ )
-	{
-		bool isNew;
-		asCScriptFunction *funcDef = ReadFunction(isNew, false, true);
-		if(funcDef)
-		{
-			funcDef->module = module;
-
-			asCFuncdefType *fdt = funcDef->funcdefType;
-			fdt->module = module;
-
-			module->funcDefs.PushLast(fdt);
-			engine->funcDefs.PushLast(fdt);
-
-			// TODO: clean up: This is also done by the builder. It should probably be moved to a method in the module
-			// Check if there is another identical funcdef from another module and if so reuse that instead
-			if(funcDef->isShared)
-			{
-				for( asUINT n = 0; n < engine->funcDefs.GetLength(); n++ )
-				{
-					asCFuncdefType *f2 = engine->funcDefs[n];
-					if( f2 == 0 || fdt == f2 )
-						continue;
-
-					if( !f2->funcdef->isShared )
-						continue;
-
-					if( f2->name == fdt->name &&
-						f2->nameSpace == fdt->nameSpace &&
-						f2->parentClass == fdt->parentClass &&
-						f2->funcdef->IsSignatureExceptNameEqual(funcDef) )
-					{
-						// Replace our funcdef for the existing one
-						module->funcDefs[module->funcDefs.IndexOf(fdt)] = f2;
-						f2->AddRefInternal();
-
-						engine->funcDefs.RemoveValue(fdt);
-
-						savedFunctions[savedFunctions.IndexOf(funcDef)] = f2->funcdef;
-
-						if (fdt->parentClass)
-						{
-							// The real funcdef should already be in the object
-							asASSERT(fdt->parentClass->childFuncDefs.IndexOf(f2) >= 0);
-
-							fdt->parentClass = 0;
-						}
-
-						fdt->ReleaseInternal();
-						funcDef = 0;
-						break;
-					}
-				}
-			}
-
-			// Add the funcdef to the parentClass if this is a child funcdef
-			if (funcDef && fdt->parentClass)
-				fdt->parentClass->childFuncDefs.PushLast(fdt);
-		}
-		else
-			Error(TXT_INVALID_BYTECODE_d);
-	}
-
-	// Read interface methods
-	for( asUINT i = 0; i < module->classTypes.GetLength() && !error; i++ )
-	{
-		if( module->classTypes[i]->IsInterface() )
-			ReadTypeDeclaration(module->classTypes[i], 2);
-	}
-
-	// Read class methods and behaviours
-	for( asUINT i = 0; i < module->classTypes.GetLength() && !error; ++i )
-	{
-		if( !module->classTypes[i]->IsInterface() )
-			ReadTypeDeclaration(module->classTypes[i], 2);
-	}
-
-	// Read class properties
-	for( asUINT i = 0; i < module->classTypes.GetLength() && !error; ++i )
-	{
-		if( !module->classTypes[i]->IsInterface() )
-			ReadTypeDeclaration(module->classTypes[i], 3);
-	}
-
-	if( error ) return asERROR;
-
-	// Read typedefs
-	count = ReadEncodedUInt();
-	module->typeDefs.Allocate(static_cast<asUINT> (count), false);
-	for( i = 0; i < count && !error; i++ )
-	{
-		asCTypedefType *td = asNEW(asCTypedefType)(engine);
-		if( td == 0 )
-		{
-			error = true;
-			return asOUT_OF_MEMORY;
-		}
-
-		ReadTypeDeclaration(td, 1);
-		td->module = module;
-		module->typeDefs.PushLast(td);
-		ReadTypeDeclaration(td, 2);
-	}
-
-	if( error ) return asERROR;
-
-	// scriptGlobals[]
-	count = ReadEncodedUInt();
-	if( count && engine->ep.disallowGlobalVars )
-	{
-		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_GLOBAL_VARS_NOT_ALLOWED);
-		Error(TXT_INVALID_BYTECODE_d);
-	}
-	module->scriptGlobals.Allocate(static_cast<asUINT> (count), false);
-	for( i = 0; i < count && !error; ++i ) 
-	{
-		ReadGlobalProperty();
-	}
-
-	// scriptFunctions[]
-	count = ReadEncodedUInt();
-	for( i = 0; i < count && !error; ++i ) 
-	{
-		size_t len = module->scriptFunctions.GetLength();
-		bool isNew;
-		func = ReadFunction(isNew);
-		if( func == 0 )
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			break;
-		}
-		
-		// Is the function shared and was it created now?
-		if( func->isShared && len != module->scriptFunctions.GetLength() )
-		{
-			// If the function already existed in another module, then
-			// we need to replace it with previously existing one
-			for( asUINT n = 0; n < engine->scriptFunctions.GetLength() && !error; n++ )
-			{
-				asCScriptFunction *realFunc = engine->scriptFunctions[n];
-				if( realFunc &&
-					realFunc != func &&
-					realFunc->IsShared() &&
-					realFunc->IsSignatureEqual(func) )
-				{
-					// Replace the recently created function with the pre-existing function
-					module->scriptFunctions[module->scriptFunctions.GetLength()-1] = realFunc;
-					realFunc->AddRefInternal();
-					savedFunctions[savedFunctions.GetLength()-1] = realFunc;
-					engine->RemoveScriptFunction(func);
-
-					// Insert the function in the dontTranslate array
-					dontTranslate.Insert(realFunc, true);
-
-					// Release the function, but make sure nothing else is released
-					func->id = 0;
-					func->scriptData->byteCode.SetLength(0);
-					func->ReleaseInternal();
-					break;
-				}
-			}
-		}
-	}
-
-	// globalFunctions[]
-	count = ReadEncodedUInt();
-	for( i = 0; i < count && !error; ++i )
-	{
-		bool isNew;
-		func = ReadFunction(isNew, false, false);
-		if( func )
-		{
-			// All the global functions were already loaded while loading the scriptFunctions, here
-			// we're just re-reading the references to know which goes into the globalFunctions array
-			asASSERT( !isNew );
-
-			module->globalFunctions.Put(func);
-		}
-		else
-			Error(TXT_INVALID_BYTECODE_d);
-	}
-
-	if( error ) return asERROR;
-
-	// bindInformations[]
-	count = ReadEncodedUInt();
-	module->bindInformations.Allocate(static_cast<asUINT> (count), false);
-	for( i = 0; i < count && !error; ++i )
-	{
-		sBindInfo *info = asNEW(sBindInfo);
-		if( info == 0 )
-		{
-			error = true;
-			return asOUT_OF_MEMORY;
-		}
-
-		bool isNew;
-		info->importedFunctionSignature = ReadFunction(isNew, false, false);
-		if( info->importedFunctionSignature == 0 )
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			break;
-		}
-
-		if( engine->freeImportedFunctionIdxs.GetLength() )
-		{
-			int id = engine->freeImportedFunctionIdxs.PopLast();
-			info->importedFunctionSignature->id = int(FUNC_IMPORTED + id);
-			engine->importedFunctions[id] = info;
-		}
-		else
-		{
-			info->importedFunctionSignature->id = int(FUNC_IMPORTED + engine->importedFunctions.GetLength());
-			engine->importedFunctions.PushLast(info);
-		}
-		ReadString(&info->importFromModule);
-		info->boundFunctionId = -1;
-		module->bindInformations.PushLast(info);
-	}
-
-	if( error ) return asERROR;
-
-	// usedTypes[]
-	count = ReadEncodedUInt();
-	usedTypes.Allocate(static_cast<asUINT> (count), false);
-	for( i = 0; i < count && !error; ++i )
-	{
-		asCTypeInfo *ti = ReadTypeInfo();
-		usedTypes.PushLast(ti);
-	}
-
-	// usedTypeIds[]
-	if( !error )
-		ReadUsedTypeIds();
-
-	// usedFunctions[]
-	if( !error )
-		ReadUsedFunctions();
-
-	// usedGlobalProperties[]
-	if( !error )
-		ReadUsedGlobalProps();
-
-	// usedStringConstants[]
-	if( !error ) 
-		ReadUsedStringConstants();
-
-	// usedObjectProperties
-	if( !error )
-		ReadUsedObjectProps();
-
-	// Validate the template types
-	if( !error )
-	{
-		for( asUINT i = 0; i < usedTypes.GetLength() && !error; i++ )
-		{
-			asCObjectType *ot = usedTypes[i]->CastToObjectType();
-			if( !ot ||
-				!(ot->flags & asOBJ_TEMPLATE) || 
-				!ot->beh.templateCallback )
-				continue;
-			
-			bool dontGarbageCollect = false;
-			asCScriptFunction *callback = engine->scriptFunctions[ot->beh.templateCallback];
-			if( !engine->CallGlobalFunctionRetBool(ot, &dontGarbageCollect, callback->sysFuncIntf, callback) )
-			{
-				asCString sub = ot->templateSubTypes[0].Format(ot->nameSpace);
-				for( asUINT n = 1; n < ot->templateSubTypes.GetLength(); n++ )
-				{
-					sub += ",";
-					sub += ot->templateSubTypes[n].Format(ot->nameSpace);
-				}
-				asCString str;
-				str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, ot->name.AddressOf(), sub.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-				Error(TXT_INVALID_BYTECODE_d);
-			}
-			else
-			{
-				// If the callback said this template instance won't be garbage collected then remove the flag
-				if( dontGarbageCollect )
-					ot->flags &= ~asOBJ_GC;
-			}
-		}
-	}
-	engine->deferValidationOfTemplateTypes = false;
-
-	if( error ) return asERROR;
-
-	// Update the loaded bytecode to point to the correct types, property offsets,
-	// function ids, etc. This is basically a linking stage.
-	for( asUINT i = 0; i < module->scriptFunctions.GetLength() && !error; i++ )
-		if( module->scriptFunctions[i]->funcType == asFUNC_SCRIPT )
-			TranslateFunction(module->scriptFunctions[i]);
-
-	asCSymbolTable<asCGlobalProperty>::iterator globIt = module->scriptGlobals.List();
-	while( globIt && !error )
-	{
-		asCScriptFunction *initFunc = (*globIt)->GetInitFunc();
-		if( initFunc )
-			TranslateFunction(initFunc);
-		globIt++;
-	}
-
-	if( error ) return asERROR;
-
-	// Add references for all functions (except for the pre-existing shared code)
-	for( asUINT i = 0; i < module->scriptFunctions.GetLength(); i++ )
-		if( !dontTranslate.MoveTo(0, module->scriptFunctions[i]) )
-			module->scriptFunctions[i]->AddReferences();
-
-	globIt = module->scriptGlobals.List();
-	while( globIt )
-	{
-		asCScriptFunction *initFunc = (*globIt)->GetInitFunc();
-		if( initFunc )
-			initFunc->AddReferences();
-		globIt++;
-	}
-	return error ? asERROR : asSUCCESS;
-}
-
-void asCReader::ReadUsedStringConstants()
-{
-	TimeIt("asCReader::ReadUsedStringConstants");
-
-	asCString str;
-
-	asUINT count;
-	count = ReadEncodedUInt();
-	usedStringConstants.Allocate(count, false);
-	for( asUINT i = 0; i < count; ++i ) 
-	{
-		ReadString(&str);
-		usedStringConstants.PushLast(engine->AddConstantString(str.AddressOf(), str.GetLength()));
-	}
-}
-
-void asCReader::ReadUsedFunctions()
-{
-	TimeIt("asCReader::ReadUsedFunctions");
-
-	asUINT count;
-	count = ReadEncodedUInt();
-	usedFunctions.SetLength(count);
-	if( usedFunctions.GetLength() != count )
-	{
-		// Out of memory
-		error = true;
-		return;
-	}
-	memset(usedFunctions.AddressOf(), 0, sizeof(asCScriptFunction *)*count);
-
-	for( asUINT n = 0; n < usedFunctions.GetLength(); n++ )
-	{
-		char c;
-
-		// Read the data to be able to uniquely identify the function
-
-		// Is the function from the module or the application?
-		ReadData(&c, 1);
-
-		if( c == 'n' )
-		{
-			// Null function pointer
-			usedFunctions[n] = 0;
-		}
-		else
-		{
-			asCScriptFunction func(engine, c == 'm' ? module : 0, asFUNC_DUMMY);
-			asCObjectType *parentClass = 0;
-			ReadFunctionSignature(&func, &parentClass);
-			if( error )
-			{
-				func.funcType = asFUNC_DUMMY;
-				return;
-			}
-
-			// Find the correct function
-			if( c == 'm' )
-			{
-				if( func.funcType == asFUNC_IMPORTED )
-				{
-					for( asUINT i = 0; i < module->bindInformations.GetLength(); i++ )
-					{
-						asCScriptFunction *f = module->bindInformations[i]->importedFunctionSignature;
-						if( func.objectType != f->objectType ||
-							func.funcType != f->funcType || 
-							func.nameSpace != f->nameSpace ||
-							!func.IsSignatureEqual(f) )
-							continue;
-
-						usedFunctions[n] = f;
-						break;
-					}
-				}
-				else if( func.funcType == asFUNC_FUNCDEF )
-				{
-					const asCArray<asCFuncdefType *> &funcs = module->funcDefs;
-					for( asUINT i = 0; i < funcs.GetLength(); i++ )
-					{
-						asCScriptFunction *f = funcs[i]->funcdef;
-						if( f == 0 || func.name != f->name || !func.IsSignatureExceptNameAndObjectTypeEqual(f) || funcs[i]->parentClass != parentClass )
-							continue;
-
-						asASSERT( f->objectType == 0 );
-
-						usedFunctions[n] = f;
-						break;
-					}
-				}
-				else
-				{
-					// TODO: optimize: Global functions should be searched for in module->globalFunctions
-					// TODO: optimize: funcdefs should be searched for in module->funcDefs
-					// TODO: optimize: object methods should be searched for directly in the object type
-					for( asUINT i = 0; i < module->scriptFunctions.GetLength(); i++ )
-					{
-						asCScriptFunction *f = module->scriptFunctions[i];
-						if( func.objectType != f->objectType ||
-							func.funcType != f->funcType || 
-							func.nameSpace != f->nameSpace ||
-							!func.IsSignatureEqual(f) )
-							continue;
-
-						usedFunctions[n] = f;
-						break;
-					}
-				}
-			}
-			else
-			{
-				if( func.funcType == asFUNC_FUNCDEF )
-				{
-					// This is a funcdef (registered or shared)
-					const asCArray<asCFuncdefType *> &funcs = engine->funcDefs;
-					for( asUINT i = 0; i < funcs.GetLength(); i++ )
-					{
-						asCScriptFunction *f = funcs[i]->funcdef;
-						if( f == 0 || func.name != f->name || !func.IsSignatureExceptNameAndObjectTypeEqual(f) || funcs[i]->parentClass != parentClass )
-							continue;
-
-						asASSERT( f->objectType == 0 );
-
-						usedFunctions[n] = f;
-						break;
-					}
-				}
-				else if( func.name[0] == '$' )
-				{
-					// This is a special function
-
-					// Check for string factory
-					if( func.name == "$str" && engine->stringFactory &&
-						func.IsSignatureExceptNameAndObjectTypeEqual(engine->stringFactory) )
-						usedFunctions[n] = engine->stringFactory;
-					else if( func.name == "$beh0" && func.objectType )
-					{
-						// This is a class constructor, so we can search directly in the object type's constructors
-						for( asUINT i = 0; i < func.objectType->beh.constructors.GetLength(); i++ )
-						{
-							asCScriptFunction *f = engine->scriptFunctions[func.objectType->beh.constructors[i]];
-							if( f == 0 ||
-								!func.IsSignatureExceptNameAndObjectTypeEqual(f) )
-								continue;
-
-							usedFunctions[n] = f;
-							break;
-						}
-					}
-					else if( func.name == "$fact" || func.name == "$beh3" )
-					{
-						// This is a factory (or stub), so look for the function in the return type's factories
-						asCObjectType *objType = func.returnType.GetTypeInfo()->CastToObjectType();
-						if( objType )
-						{
-							for( asUINT i = 0; i < objType->beh.factories.GetLength(); i++ )
-							{
-								asCScriptFunction *f = engine->scriptFunctions[objType->beh.factories[i]];
-								if( f == 0 ||
-									!func.IsSignatureExceptNameAndObjectTypeEqual(f) )
-									continue;
-
-								usedFunctions[n] = f;
-								break;
-							}
-						}
-					}
-					else if( func.name == "$list" )
-					{
-						// listFactory is used for both factory is global and returns a handle and constructor that is a method
-						asCObjectType *objType = func.objectType ? func.objectType : func.returnType.GetTypeInfo()->CastToObjectType();
-						if( objType )
-						{
-							asCScriptFunction *f = engine->scriptFunctions[objType->beh.listFactory];
-							if( f && func.IsSignatureExceptNameAndObjectTypeEqual(f) )
-								usedFunctions[n] = f;
-						}
-					}
-					else if( func.name == "$beh2" )
-					{
-						// This is a destructor, so check the object type's destructor
-						asCObjectType *objType = func.objectType;
-						if( objType )
-						{
-							asCScriptFunction *f = engine->scriptFunctions[objType->beh.destruct];
-							if( f && func.IsSignatureExceptNameAndObjectTypeEqual(f) )
-								usedFunctions[n] = f;
-						}
-					}
-					else if( func.name == "$beh4" )
-					{
-						// This is a list factory, so check the return type's list factory
-						asCObjectType *objType = func.returnType.GetTypeInfo()->CastToObjectType();
-						if( objType )
-						{
-							asCScriptFunction *f = engine->scriptFunctions[objType->beh.listFactory];
-							if( f && func.IsSignatureExceptNameAndObjectTypeEqual(f) )
-								usedFunctions[n] = f;
-						}
-					}
-					else if( func.name == "$dlgte" )
-					{
-						// This is the delegate factory
-						asCScriptFunction *f = engine->registeredGlobalFuncs.GetFirst(engine->nameSpaces[0], DELEGATE_FACTORY);
-						asASSERT( f && func.IsSignatureEqual(f) );
-						usedFunctions[n] = f;
-					}
-				}
-				else if( func.objectType == 0 )
-				{
-					// This is a global function
-					const asCArray<asUINT> &funcs = engine->registeredGlobalFuncs.GetIndexes(func.nameSpace, func.name);
-					for( asUINT i = 0; i < funcs.GetLength(); i++ )
-					{
-						asCScriptFunction *f = engine->registeredGlobalFuncs.Get(funcs[i]);
-						if( f == 0 ||
-							!func.IsSignatureExceptNameAndObjectTypeEqual(f) )
-							continue;
-
-						usedFunctions[n] = f;
-						break;
-					}
-				}
-				else if( func.objectType )
-				{
-					// It is a class member, so we can search directly in the object type's members
-					// TODO: virtual function is different that implemented method
-					for( asUINT i = 0; i < func.objectType->methods.GetLength(); i++ )
-					{
-						asCScriptFunction *f = engine->scriptFunctions[func.objectType->methods[i]];
-						if( f == 0 ||
-							!func.IsSignatureEqual(f) )
-							continue;
-
-						usedFunctions[n] = f;
-						break;
-					}
-				}
-
-				if( usedFunctions[n] == 0 )
-				{
-					// TODO: clean up: This part of the code should never happen. All functions should 
-					//                 be found in the above logic. The only valid reason to come here 
-					//                 is if the bytecode is wrong and the function doesn't exist anyway.
-					//                 This loop is kept temporarily until we can be certain all scenarios 
-					//                 are covered.
-					for( asUINT i = 0; i < engine->scriptFunctions.GetLength(); i++ )
-					{
-						asCScriptFunction *f = engine->scriptFunctions[i];
-						if( f == 0 ||
-							func.objectType != f->objectType ||
-							func.nameSpace != f->nameSpace ||
-							!func.IsSignatureEqual(f) )
-							continue;
-
-						usedFunctions[n] = f;
-						break;
-					}
-
-					// No function is expected to be found
-					asASSERT(usedFunctions[n] == 0);
-				}
-			}
-
-			// Set the type to dummy so it won't try to release the id
-			func.funcType = asFUNC_DUMMY;
-
-			if( usedFunctions[n] == 0 )
-			{
-				Error(TXT_INVALID_BYTECODE_d);
-				return;
-			}
-		}
-	}
-}
-
-void asCReader::ReadFunctionSignature(asCScriptFunction *func, asCObjectType **parentClass)
-{
-	asUINT i, count;
-	asCDataType dt;
-	int num;
-
-	ReadString(&func->name);
-	if( func->name == DELEGATE_FACTORY )
-	{
-		// It's not necessary to read anymore, everything is known 
-		asCScriptFunction *f = engine->registeredGlobalFuncs.GetFirst(engine->nameSpaces[0], DELEGATE_FACTORY);
-		asASSERT( f );
-		func->returnType     = f->returnType;
-		func->parameterTypes = f->parameterTypes;
-		func->inOutFlags     = f->inOutFlags;
-		func->funcType       = f->funcType;
-		func->defaultArgs    = f->defaultArgs;
-		func->nameSpace      = f->nameSpace;
-		return;
-	}
-
-	ReadDataType(&func->returnType);
-
-	count = ReadEncodedUInt();
-	if( count > 256 )
-	{
-		// Too many arguments, must be something wrong in the file
-		Error(TXT_INVALID_BYTECODE_d);
-		return;
-	}
-	func->parameterTypes.Allocate(count, false);
-	for( i = 0; i < count; ++i ) 
-	{
-		ReadDataType(&dt);
-		func->parameterTypes.PushLast(dt);
-	}
-
-	func->inOutFlags.SetLength(func->parameterTypes.GetLength());
-	if( func->inOutFlags.GetLength() != func->parameterTypes.GetLength() )
-	{
-		// Out of memory
-		error = true;
-		return;
-	}
-	memset(func->inOutFlags.AddressOf(), 0, sizeof(asETypeModifiers)*func->inOutFlags.GetLength());
-	count = ReadEncodedUInt();
-	if( count > func->parameterTypes.GetLength() )
-	{
-		// Cannot be more than the number of arguments
-		Error(TXT_INVALID_BYTECODE_d);
-		return;
-	}
-	for( i = 0; i < count; ++i )
-	{
-		num = ReadEncodedUInt();
-		func->inOutFlags[i] = static_cast<asETypeModifiers>(num);
-	}
-
-	func->funcType = (asEFuncType)ReadEncodedUInt();
-
-	// Read the default args, from last to first
-	count = ReadEncodedUInt();
-	if( count > func->parameterTypes.GetLength() )
-	{
-		// Cannot be more than the number of arguments
-		Error(TXT_INVALID_BYTECODE_d);
-		return;
-	}
-	if( count )
-	{
-		func->defaultArgs.SetLength(func->parameterTypes.GetLength());
-		if( func->defaultArgs.GetLength() != func->parameterTypes.GetLength() )
-		{
-			// Out of memory
-			error = true;
-			return;
-		}
-		memset(func->defaultArgs.AddressOf(), 0, sizeof(asCString*)*func->defaultArgs.GetLength());
-		for( i = 0; i < count; i++ )
-		{
-			asCString *str = asNEW(asCString);
-			if( str == 0 )
-			{
-				// Out of memory
-				error = true;
-				return;
-			}
-			func->defaultArgs[func->defaultArgs.GetLength()-1-i] = str;
-			ReadString(str);
-		}
-	}
-	
-	func->objectType = ReadTypeInfo()->CastToObjectType();
-	if( func->objectType )
-	{
-		func->objectType->AddRefInternal();
-
-		asBYTE b;
-		ReadData(&b, 1);
-		func->isReadOnly = (b & 1) ? true : false;
-		func->isPrivate  = (b & 2) ? true : false;
-		func->isProtected = (b & 4) ? true : false;
-		func->nameSpace = engine->nameSpaces[0];
-	}
-	else
-	{
-		if (func->funcType == asFUNC_FUNCDEF)
-		{
-			asBYTE b;
-			ReadData(&b, 1);
-			if (b == 'n')
-			{
-				asCString ns;
-				ReadString(&ns);
-				func->nameSpace = engine->AddNameSpace(ns.AddressOf());
-			}
-			else if (b == 'o')
-			{
-				func->nameSpace = 0;
-				if (parentClass)
-					*parentClass = ReadTypeInfo()->CastToObjectType();
-				else
-					error = true;
-			}
-			else
-				error = true;
-		}
-		else
-		{
-			asCString ns;
-			ReadString(&ns);
-			func->nameSpace = engine->AddNameSpace(ns.AddressOf());
-		}
-	}
-}
-
-asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool addToEngine, bool addToGC) 
-{
-	isNew = false;
-	if( error ) return 0;
-
-	char c;
-	ReadData(&c, 1);
-
-	if( c == '\0' )
-	{
-		// There is no function, so return a null pointer
-		return 0;
-	}
-
-	if( c == 'r' )
-	{
-		// This is a reference to a previously saved function
-		asUINT index = ReadEncodedUInt();
-		if( index < savedFunctions.GetLength() )
-			return savedFunctions[index];
-		else
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-	}
-
-	// Load the new function
-	isNew = true;
-	asCScriptFunction *func = asNEW(asCScriptFunction)(engine,0,asFUNC_DUMMY);
-	if( func == 0 )
-	{
-		// Out of memory
-		error = true;
-		return 0;
-	}
-	savedFunctions.PushLast(func);
-
-	int i, count;
-	asCDataType dt;
-	int num;
-
-	asCObjectType *parentClass = 0;
-	ReadFunctionSignature(func, &parentClass);
-	if( error )
-	{
-		func->DestroyHalfCreated();
-		return 0;
-	}
-
-	if( func->funcType == asFUNC_SCRIPT )
-	{
-		func->AllocateScriptFunctionData();
-		if( func->scriptData == 0 )
-		{
-			// Out of memory
-			error = true;
-			func->DestroyHalfCreated();
-			return 0;
-		}
-
-		if( addToGC && !addToModule )
-			engine->gc.AddScriptObjectToGC(func, &engine->functionBehaviours);
-		
-		ReadByteCode(func);
-
-		func->scriptData->variableSpace = ReadEncodedUInt();
-
-		count = ReadEncodedUInt();
-		func->scriptData->objVariablePos.Allocate(count, false);
-		func->scriptData->objVariableTypes.Allocate(count, false);
-		for( i = 0; i < count; ++i )
-		{
-			func->scriptData->objVariableTypes.PushLast(ReadTypeInfo());
-			num = ReadEncodedUInt();
-			func->scriptData->objVariablePos.PushLast(num);
-
-			if( error )
-			{
-				// No need to continue (the error has already been reported before)
-				func->DestroyHalfCreated();
-				return 0;
-			}
-		}
-		if( count > 0 )
-			func->scriptData->objVariablesOnHeap = ReadEncodedUInt();
-		else
-			func->scriptData->objVariablesOnHeap = 0;
-
-		int length = ReadEncodedUInt();
-		func->scriptData->objVariableInfo.SetLength(length);
-		for( i = 0; i < length; ++i )
-		{
-			func->scriptData->objVariableInfo[i].programPos     = ReadEncodedUInt();
-			func->scriptData->objVariableInfo[i].variableOffset = ReadEncodedUInt();
-			asEObjVarInfoOption option = (asEObjVarInfoOption)ReadEncodedUInt();
-			func->scriptData->objVariableInfo[i].option         = option;
-			if (option != asOBJ_INIT && option != asOBJ_UNINIT && option != asBLOCK_BEGIN && option != asBLOCK_END)
-			{
-				error = true;
-				func->DestroyHalfCreated();
-				return 0;
-			}
-		}
-
-		if( !noDebugInfo )
-		{
-			length = ReadEncodedUInt();
-			func->scriptData->lineNumbers.SetLength(length);
-			if( int(func->scriptData->lineNumbers.GetLength()) != length )
-			{
-				// Out of memory
-				error = true;
-				func->DestroyHalfCreated();
-				return 0;
-			}
-			for( i = 0; i < length; ++i )
-				func->scriptData->lineNumbers[i] = ReadEncodedUInt();
-
-			// Read the array of script sections 
-			length = ReadEncodedUInt();
-			func->scriptData->sectionIdxs.SetLength(length);
-			if( int(func->scriptData->sectionIdxs.GetLength()) != length )
-			{
-				// Out of memory
-				error = true;
-				func->DestroyHalfCreated();
-				return 0;
-			}
-			for( i = 0; i < length; ++i )
-			{
-				if( (i & 1) == 0 )
-					func->scriptData->sectionIdxs[i] = ReadEncodedUInt();
-				else
-				{
-					asCString str;
-					ReadString(&str);
-					func->scriptData->sectionIdxs[i] = engine->GetScriptSectionNameIndex(str.AddressOf());
-				}
-			}
-		}
-
-		// Read the variable information
-		if( !noDebugInfo )
-		{
-			length = ReadEncodedUInt();
-			func->scriptData->variables.Allocate(length, false);
-			for( i = 0; i < length; i++ )
-			{
-				asSScriptVariable *var = asNEW(asSScriptVariable);
-				if( var == 0 )
-				{
-					// Out of memory
-					error = true;
-					func->DestroyHalfCreated();
-					return 0;
-				}
-				func->scriptData->variables.PushLast(var);
-
-				var->declaredAtProgramPos = ReadEncodedUInt();
-				var->stackOffset = ReadEncodedUInt();
-				ReadString(&var->name);
-				ReadDataType(&var->type);
-
-				if( error )
-				{
-					// No need to continue (the error has already been reported before)
-					func->DestroyHalfCreated();
-					return 0;
-				}
-			}
-		}
-
-		char bits;
-		ReadData(&bits, 1);
-		func->isShared               = bits & 1 ? true : false;
-		func->dontCleanUpOnException = bits & 2 ? true : false;
-
-		// Read script section name
-		if( !noDebugInfo )
-		{
-			asCString name;
-			ReadString(&name);
-			func->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(name.AddressOf());
-			func->scriptData->declaredAt = ReadEncodedUInt();
-		}
-
-		// Read parameter names
-		if( !noDebugInfo )
-		{
-			asUINT countParam = asUINT(ReadEncodedUInt64());
-			if( countParam > func->parameterTypes.GetLength() )
-			{
-				error = true;
-				func->DestroyHalfCreated();
-				return 0;
-			}
-			func->parameterNames.SetLength(countParam);
-			for( asUINT n = 0; n < countParam; n++ )
-				ReadString(&func->parameterNames[n]);
-		}
-	}
-	else if( func->funcType == asFUNC_VIRTUAL || func->funcType == asFUNC_INTERFACE )
-	{
-		func->vfTableIdx = ReadEncodedUInt();
-	}
-	else if( func->funcType == asFUNC_FUNCDEF )
-	{
-		asBYTE bits;
-		ReadData(&bits, 1);
-		if( bits )
-			func->isShared = true;
-
-		// The asCFuncdefType constructor adds itself to the func->funcdefType member
-		asCFuncdefType *fdt = asNEW(asCFuncdefType)(engine, func);
-		fdt->parentClass = parentClass;
-	}
-
-	if( addToModule )
-	{
-		// The refCount is already 1
-		module->scriptFunctions.PushLast(func);
-		func->module = module;
-	}
-	if( addToEngine )
-	{
-		func->id = engine->GetNextScriptFunctionId();
-		engine->AddScriptFunction(func);
-	}
-	if( func->objectType )
-		func->ComputeSignatureId();
-
-	return func;
-}
-
-void asCReader::ReadTypeDeclaration(asCTypeInfo *type, int phase)
-{
-	if( phase == 1 )
-	{
-		// Read the initial attributes
-		ReadString(&type->name);
-		ReadData(&type->flags, 4);
-		type->size = ReadEncodedUInt();
-		asCString ns;
-		ReadString(&ns);
-		type->nameSpace = engine->AddNameSpace(ns.AddressOf());
-
-		// Verify that the flags match the asCTypeInfo
-		if ((type->CastToEnumType() && !(type->flags & asOBJ_ENUM)) ||
-			(type->CastToFuncdefType() && !(type->flags & asOBJ_FUNCDEF)) ||
-			(type->CastToObjectType() && !(type->flags & (asOBJ_REF | asOBJ_VALUE))))
-		{
-			error = true;
-			return;
-		}
-
-		// Reset the size of script classes, since it will be recalculated as properties are added
-		if( (type->flags & asOBJ_SCRIPT_OBJECT) && type->size != 0 )
-			type->size = sizeof(asCScriptObject);
-
-		asCObjectType *ot = type->CastToObjectType();
-		if (ot)
-		{
-			// Use the default script class behaviours
-			ot->beh = engine->scriptTypeBehaviours.beh;
-			ot->beh.construct = 0;
-			ot->beh.factory = 0;
-			ot->beh.constructors.PopLast(); // These will be read from the file
-			ot->beh.factories.PopLast(); // These will be read from the file
-			engine->scriptFunctions[ot->beh.addref]->AddRefInternal();
-			engine->scriptFunctions[ot->beh.release]->AddRefInternal();
-			engine->scriptFunctions[ot->beh.gcEnumReferences]->AddRefInternal();
-			engine->scriptFunctions[ot->beh.gcGetFlag]->AddRefInternal();
-			engine->scriptFunctions[ot->beh.gcGetRefCount]->AddRefInternal();
-			engine->scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRefInternal();
-			engine->scriptFunctions[ot->beh.gcSetFlag]->AddRefInternal();
-			engine->scriptFunctions[ot->beh.copy]->AddRefInternal();
-			// TODO: weak: Should not do this if the class has been declared with 'noweak'
-			engine->scriptFunctions[ot->beh.getWeakRefFlag]->AddRefInternal();
-		}
-	}
-	else if( phase == 2 )
-	{
-		if( type->flags & asOBJ_ENUM )
-		{
-			asCEnumType *t = type->CastToEnumType();
-			int count = ReadEncodedUInt();
-			bool sharedExists = existingShared.MoveTo(0, type);
-			if( !sharedExists )
-			{
-				t->enumValues.Allocate(count, false);
-				for( int n = 0; n < count; n++ )
-				{
-					asSEnumValue *e = asNEW(asSEnumValue);
-					if( e == 0 )
-					{
-						// Out of memory
-						error = true;
-						return;
-					}
-					ReadString(&e->name);
-					ReadData(&e->value, 4); // TODO: Should be encoded
-					t->enumValues.PushLast(e);
-				}
-			}
-			else
-			{
-				// Verify that the enum values exists in the original
-				asCString name;
-				int value;
-				for( int n = 0; n < count; n++ )
-				{
-					ReadString(&name);
-					ReadData(&value, 4); // TODO: Should be encoded
-					bool found = false;
-					for( asUINT e = 0; e < t->enumValues.GetLength(); e++ )
-					{
-						if( t->enumValues[e]->name == name &&
-							t->enumValues[e]->value == value )
-						{
-							found = true;
-							break;
-						}
-					}
-					if( !found )
-					{
-						asCString str;
-						str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-						engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-						Error(TXT_INVALID_BYTECODE_d);
-					}
-				}
-			}
-		}
-		else if( type->flags & asOBJ_TYPEDEF )
-		{
-			asCTypedefType *td = type->CastToTypedefType();
-			asASSERT(td);
-			eTokenType t = (eTokenType)ReadEncodedUInt();
-			td->aliasForType = asCDataType::CreatePrimitive(t, false);
-		}
-		else
-		{
-			asCObjectType *ot = type->CastToObjectType();
-			asASSERT(ot);
-
-			// If the type is shared and pre-existing, we should just 
-			// validate that the loaded methods match the original 
-			bool sharedExists = existingShared.MoveTo(0, type);
-			if( sharedExists )
-			{
-				asCObjectType *dt = ReadTypeInfo()->CastToObjectType();
-				if( ot->derivedFrom != dt )
-				{
-					asCString str;
-					str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-					engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-					Error(TXT_INVALID_BYTECODE_d);
-				}
-			}
-			else
-			{
-				ot->derivedFrom = ReadTypeInfo()->CastToObjectType();
-				if( ot->derivedFrom )
-					ot->derivedFrom->AddRefInternal();
-			}
-
-			// interfaces[] / interfaceVFTOffsets[]
-			int size = ReadEncodedUInt();
-			if( sharedExists )
-			{
-				for( int n = 0; n < size; n++ )
-				{
-					asCObjectType *intf = ReadTypeInfo()->CastToObjectType();
-					ReadEncodedUInt();
-
-					if( !type->Implements(intf) )
-					{
-						asCString str;
-						str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-						engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-						Error(TXT_INVALID_BYTECODE_d);
-					}
-				}
-			}
-			else
-			{
-				ot->interfaces.Allocate(size, false);
-				ot->interfaceVFTOffsets.Allocate(size, false);
-				for( int n = 0; n < size; n++ )
-				{
-					asCObjectType *intf = ReadTypeInfo()->CastToObjectType();
-					ot->interfaces.PushLast(intf);
-
-					asUINT offset = ReadEncodedUInt();
-					ot->interfaceVFTOffsets.PushLast(offset);
-				}
-			}
-
-			// behaviours
-			if( !ot->IsInterface() && type->flags != asOBJ_TYPEDEF && type->flags != asOBJ_ENUM )
-			{
-				bool isNew;
-				asCScriptFunction *func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
-				if( sharedExists )
-				{
-					// Find the real function in the object, and update the savedFunctions array
-					asCScriptFunction *realFunc = engine->GetScriptFunction(ot->beh.destruct);
-					if( (realFunc == 0 && func == 0) || realFunc->IsSignatureEqual(func) )
-					{
-						// If the function is not the last, then the substitution has already occurred before
-						if( func && savedFunctions[savedFunctions.GetLength()-1] == func )
-							savedFunctions[savedFunctions.GetLength()-1] = realFunc;
-					}
-					else
-					{
-						asCString str;
-						str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-						engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-						Error(TXT_INVALID_BYTECODE_d);
-					}
-					if( func )
-					{
-						if( isNew )
-						{
-							// Destroy the function without releasing any references
-							func->id = 0;
-							func->scriptData->byteCode.SetLength(0);
-							func->ReleaseInternal();
-						}
-						module->scriptFunctions.PushLast(realFunc);
-						realFunc->AddRefInternal();
-						dontTranslate.Insert(realFunc, true);
-					}
-				}
-				else
-				{
-					if( func )
-					{
-						ot->beh.destruct = func->id;
-						func->AddRefInternal();
-					}
-					else
-						ot->beh.destruct = 0;
-				}
-
-				size = ReadEncodedUInt();
-				for( int n = 0; n < size; n++ )
-				{
-					func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
-					if( func )
-					{
-						if( sharedExists )
-						{
-							// Find the real function in the object, and update the savedFunctions array
-							bool found = false;
-							for( asUINT f = 0; f < ot->beh.constructors.GetLength(); f++ )
-							{
-								asCScriptFunction *realFunc = engine->GetScriptFunction(ot->beh.constructors[f]);
-								if( realFunc->IsSignatureEqual(func) )
-								{
-									// If the function is not the last, then the substitution has already occurred before
-									if( savedFunctions[savedFunctions.GetLength()-1] == func )
-										savedFunctions[savedFunctions.GetLength()-1] = realFunc;
-									found = true;
-									module->scriptFunctions.PushLast(realFunc);
-									realFunc->AddRefInternal();
-									dontTranslate.Insert(realFunc, true);
-									break;
-								}
-							}
-							if( !found )
-							{
-								asCString str;
-								str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-								engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-								Error(TXT_INVALID_BYTECODE_d);
-							}
-							if( isNew )
-							{
-								// Destroy the function without releasing any references
-								func->id = 0;
-								func->scriptData->byteCode.SetLength(0);
-								func->ReleaseInternal();
-							}
-						}
-						else
-						{
-							ot->beh.constructors.PushLast(func->id);
-							func->AddRefInternal();
-
-							if( func->parameterTypes.GetLength() == 0 )
-								ot->beh.construct = func->id;
-						}
-					}
-					else
-					{
-						Error(TXT_INVALID_BYTECODE_d);
-					}
-
-					func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
-					if( func )
-					{
-						if( sharedExists )
-						{
-							// Find the real function in the object, and update the savedFunctions array
-							bool found = false;
-							for( asUINT f = 0; f < ot->beh.factories.GetLength(); f++ )
-							{
-								asCScriptFunction *realFunc = engine->GetScriptFunction(ot->beh.factories[f]);
-								if( realFunc->IsSignatureEqual(func) )
-								{
-									// If the function is not the last, then the substitution has already occurred before
-									if( savedFunctions[savedFunctions.GetLength()-1] == func )
-										savedFunctions[savedFunctions.GetLength()-1] = realFunc;
-									found = true;
-									module->scriptFunctions.PushLast(realFunc);
-									realFunc->AddRefInternal();
-									dontTranslate.Insert(realFunc, true);
-									break;
-								}
-							}
-							if( !found )
-							{
-								asCString str;
-								str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-								engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-								Error(TXT_INVALID_BYTECODE_d);
-							}
-							if( isNew )
-							{
-								// Destroy the function without releasing any references
-								func->id = 0;
-								func->scriptData->byteCode.SetLength(0);
-								func->ReleaseInternal();
-							}
-						}
-						else
-						{
-							ot->beh.factories.PushLast(func->id);
-							func->AddRefInternal();
-
-							if( func->parameterTypes.GetLength() == 0 )
-								ot->beh.factory = func->id;
-						}
-					}
-					else
-					{
-						Error(TXT_INVALID_BYTECODE_d);
-					}
-				}
-			}
-
-			// methods[]
-			size = ReadEncodedUInt();
-			int n;
-			for( n = 0; n < size; n++ ) 
-			{
-				bool isNew;
-				asCScriptFunction *func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
-				if( func )
-				{
-					if( sharedExists )
-					{
-						// Find the real function in the object, and update the savedFunctions array
-						bool found = false;
-						for( asUINT f = 0; f < ot->methods.GetLength(); f++ )
-						{
-							asCScriptFunction *realFunc = engine->GetScriptFunction(ot->methods[f]);
-							if( realFunc->IsSignatureEqual(func) )
-							{
-								// If the function is not the last, then the substitution has already occurred before
-								if( savedFunctions[savedFunctions.GetLength()-1] == func )
-									savedFunctions[savedFunctions.GetLength()-1] = realFunc;
-								found = true;
-								module->scriptFunctions.PushLast(realFunc);
-								realFunc->AddRefInternal();
-								dontTranslate.Insert(realFunc, true);
-								break;
-							}
-						}
-						if( !found )
-						{
-							asCString str;
-							str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-							engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-							Error(TXT_INVALID_BYTECODE_d);
-						}
-						if( isNew )
-						{
-							// Destroy the function without releasing any references
-							func->id = 0;
-							if( func->scriptData )
-								func->scriptData->byteCode.SetLength(0);
-							func->ReleaseInternal();
-						}
-					}
-					else
-					{
-						// If the method is the assignment operator we need to replace the default implementation
-						if( func->name == "opAssign" && func->parameterTypes.GetLength() == 1 &&
-							func->parameterTypes[0].GetTypeInfo() == func->objectType &&
-							(func->inOutFlags[0] & asTM_INREF) )
-						{
-							engine->scriptFunctions[ot->beh.copy]->ReleaseInternal();
-							ot->beh.copy = func->id;
-							func->AddRefInternal();
-						}
-						
-						ot->methods.PushLast(func->id);
-						func->AddRefInternal();
-					}
-				}
-				else
-				{
-					Error(TXT_INVALID_BYTECODE_d);
-				}
-			}
-
-			// virtualFunctionTable[]
-			size = ReadEncodedUInt();
-			for( n = 0; n < size; n++ )
-			{
-				bool isNew;
-				asCScriptFunction *func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
-				if( func )
-				{
-					if( sharedExists )
-					{
-						// Find the real function in the object, and update the savedFunctions array
-						bool found = false;
-						for( asUINT f = 0; f < ot->virtualFunctionTable.GetLength(); f++ )
-						{
-							asCScriptFunction *realFunc = ot->virtualFunctionTable[f];
-							if( realFunc->IsSignatureEqual(func) )
-							{
-								// If the function is not the last, then the substitution has already occurred before
-								if( savedFunctions[savedFunctions.GetLength()-1] == func )
-									savedFunctions[savedFunctions.GetLength()-1] = realFunc;
-								found = true;
-								module->scriptFunctions.PushLast(realFunc);
-								realFunc->AddRefInternal();
-								dontTranslate.Insert(realFunc, true);
-								break;
-							}
-						}
-						if( !found )
-						{
-							asCString str;
-							str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
-							engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-							Error(TXT_INVALID_BYTECODE_d);
-						}
-						if( isNew )
-						{
-							// Destroy the function without releasing any references
-							func->id = 0;
-							if( func->scriptData )
-								func->scriptData->byteCode.SetLength(0);
-							func->ReleaseInternal();
-						}
-					}
-					else
-					{
-						ot->virtualFunctionTable.PushLast(func);
-						func->AddRefInternal();
-					}
-				}
-				else
-				{
-					Error(TXT_INVALID_BYTECODE_d);
-				}
-			}
-		}
-	}
-	else if( phase == 3 )
-	{
-		asCObjectType *ot = type->CastToObjectType();
-
-		// This is only done for object types
-		asASSERT(ot);
-
-		// properties[]
-		asUINT size = ReadEncodedUInt();
-		for( asUINT n = 0; n < size; n++ )
-			ReadObjectProperty(ot);
-	}
-}
-
-asWORD asCReader::ReadEncodedUInt16()
-{
-	asDWORD dw = ReadEncodedUInt();
-	if( (dw>>16) != 0 && (dw>>16) != 0xFFFF )
-	{
-		Error(TXT_INVALID_BYTECODE_d);
-	}
-
-	return asWORD(dw & 0xFFFF);
-}
-
-asUINT asCReader::ReadEncodedUInt()
-{
-	asQWORD qw = ReadEncodedUInt64();
-	if( (qw>>32) != 0 && (qw>>32) != 0xFFFFFFFF )
-	{
-		Error(TXT_INVALID_BYTECODE_d);
-	}
-
-	return asUINT(qw & 0xFFFFFFFFu);
-}
-
-asQWORD asCReader::ReadEncodedUInt64()
-{
-	asQWORD i = 0;
-	asBYTE b;
-	ReadData(&b, 1);
-	bool isNegative = ( b & 0x80 ) ? true : false;
-	b &= 0x7F;
-	
-	if( (b & 0x7F) == 0x7F )
-	{
-		ReadData(&b, 1); i = asQWORD(b) << 56;
-		ReadData(&b, 1); i += asQWORD(b) << 48;
-		ReadData(&b, 1); i += asQWORD(b) << 40;
-		ReadData(&b, 1); i += asQWORD(b) << 32;
-		ReadData(&b, 1); i += asUINT(b) << 24;
-		ReadData(&b, 1); i += asUINT(b) << 16;
-		ReadData(&b, 1); i += asUINT(b) << 8;
-		ReadData(&b, 1); i += b;
-	}
-	else if( (b & 0x7E) == 0x7E )
-	{
-		i = asQWORD(b & 0x01) << 48;
-		ReadData(&b, 1); i += asQWORD(b) << 40;
-		ReadData(&b, 1); i += asQWORD(b) << 32;
-		ReadData(&b, 1); i += asUINT(b) << 24;
-		ReadData(&b, 1); i += asUINT(b) << 16;
-		ReadData(&b, 1); i += asUINT(b) << 8;
-		ReadData(&b, 1); i += b;
-	}	
-	else if( (b & 0x7C) == 0x7C )
-	{
-		i = asQWORD(b & 0x03) << 40;
-		ReadData(&b, 1); i += asQWORD(b) << 32;
-		ReadData(&b, 1); i += asUINT(b) << 24;
-		ReadData(&b, 1); i += asUINT(b) << 16;
-		ReadData(&b, 1); i += asUINT(b) << 8;
-		ReadData(&b, 1); i += b;
-	}	
-	else if( (b & 0x78) == 0x78 )
-	{
-		i = asQWORD(b & 0x07) << 32;
-		ReadData(&b, 1); i += asUINT(b) << 24;
-		ReadData(&b, 1); i += asUINT(b) << 16;
-		ReadData(&b, 1); i += asUINT(b) << 8;
-		ReadData(&b, 1); i += b;
-	}	
-	else if( (b & 0x70) == 0x70 )
-	{
-		i = asUINT(b & 0x0F) << 24;
-		ReadData(&b, 1); i += asUINT(b) << 16;
-		ReadData(&b, 1); i += asUINT(b) << 8;
-		ReadData(&b, 1); i += b;
-	}
-	else if( (b & 0x60) == 0x60 )
-	{
-		i = asUINT(b & 0x1F) << 16;
-		ReadData(&b, 1); i += asUINT(b) << 8;
-		ReadData(&b, 1); i += b;
-	}
-	else if( (b & 0x40) == 0x40 )
-	{
-		i = asUINT(b & 0x3F) << 8;
-		ReadData(&b, 1); i += b;
-	}
-	else
-	{
-		i = b;
-	}
-	if( isNegative )
-		i = (asQWORD)(-asINT64(i));
-
-	return i;
-}
-
-void asCReader::ReadString(asCString* str) 
-{
-	asUINT len = ReadEncodedUInt();
-	if( len & 1 )
-	{
-		asUINT idx = len/2;
-		if( idx < savedStrings.GetLength() )
-			*str = savedStrings[idx];
-		else
-			Error(TXT_INVALID_BYTECODE_d);
-	}
-	else if( len > 0 )
-	{
-		len /= 2;
-		str->SetLength(len);
-		stream->Read(str->AddressOf(), len);
-
-		savedStrings.PushLast(*str);
-	}
-	else
-		str->SetLength(0);
-}
-
-void asCReader::ReadGlobalProperty() 
-{
-	asCString name;
-	asCDataType type;
-
-	ReadString(&name);
-
-	asCString ns;
-	ReadString(&ns);
-	asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
-
-	ReadDataType(&type);
-
-	asCGlobalProperty *prop = module->AllocateGlobalProperty(name.AddressOf(), type, nameSpace);
-
-	// Read the initialization function
-	bool isNew;
-	// Do not add the function to the GC at this time. It will 
-	// only be added to the GC when the module releases the property
-	asCScriptFunction *func = ReadFunction(isNew, false, true, false);
-	if( func )
-	{
-		// Make sure the function knows it is owned by the module
-		func->module = module;
-
-		prop->SetInitFunc(func);
-		func->ReleaseInternal();
-	}
-}
-
-void asCReader::ReadObjectProperty(asCObjectType *ot) 
-{
-	asCString name;
-	ReadString(&name);
-	asCDataType dt;
-	ReadDataType(&dt);
-	int flags = ReadEncodedUInt();
-	bool isPrivate = (flags & 1) ? true : false;
-	bool isProtected = (flags & 2) ? true : false;
-	bool isInherited = (flags & 4) ? true : false;
-
-	// TODO: shared: If the type is shared and pre-existing, we should just 
-	//               validate that the loaded methods match the original 
-	if( !existingShared.MoveTo(0, ot) )
-		ot->AddPropertyToClass(name, dt, isPrivate, isProtected, isInherited);
-}
-
-void asCReader::ReadDataType(asCDataType *dt) 
-{
-	// Check if this is a previously used type
-	asUINT idx = ReadEncodedUInt();
-	if( idx != 0 )
-	{
-		// Get the datatype from the cache
-		*dt = savedDataTypes[idx-1];
-		return;
-	}
-
-	// Read the type definition
-	eTokenType tokenType = (eTokenType)ReadEncodedUInt();
-
-	// Reserve a spot in the savedDataTypes
-	asUINT saveSlot = savedDataTypes.GetLength();
-	savedDataTypes.PushLast(asCDataType());
-
-	// Read the datatype for the first time
-	asCTypeInfo *ti = 0;
-	if( tokenType == ttIdentifier )
-		ti = ReadTypeInfo();
-
-	// Read type flags as a bitmask
-	// Endian-safe code
-	bool isObjectHandle, isHandleToConst, isReference, isReadOnly;
-	char b = 0;
-	ReadData(&b, 1);
-	LOAD_FROM_BIT(isObjectHandle, b, 0);
-	LOAD_FROM_BIT(isHandleToConst, b, 1);
-	LOAD_FROM_BIT(isReference, b, 2);
-	LOAD_FROM_BIT(isReadOnly, b, 3);
-
-	if( tokenType == ttIdentifier )
-		*dt = asCDataType::CreateType(ti, false);
-	else
-		*dt = asCDataType::CreatePrimitive(tokenType, false);
-	if( isObjectHandle )
-	{
-		dt->MakeReadOnly(isHandleToConst ? true : false);
-		
-		// Here we must allow a scoped type to be a handle 
-		// e.g. if the datatype is for a system function
-		dt->MakeHandle(true, true);
-	}
-	dt->MakeReadOnly(isReadOnly ? true : false);
-	dt->MakeReference(isReference ? true : false);
-
-	// Update the previously saved slot
-	savedDataTypes[saveSlot] = *dt;
-}
-
-asCTypeInfo* asCReader::ReadTypeInfo() 
-{
-	asCTypeInfo *ot = 0;
-	char ch;
-	ReadData(&ch, 1);
-	if( ch == 'a' )
-	{
-		// Read the name of the template type
-		asCString typeName, ns;
-		ReadString(&typeName);
-		ReadString(&ns);
-		asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
-
-		asCTypeInfo *tmp = engine->GetRegisteredType(typeName.AddressOf(), nameSpace);
-		asCObjectType *tmpl = tmp ? tmp->CastToObjectType() : 0;
-		if( tmpl == 0 )
-		{
-			asCString str;
-			str.Format(TXT_TEMPLATE_TYPE_s_DOESNT_EXIST, typeName.AddressOf());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-			Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-
-		asUINT numSubTypes = ReadEncodedUInt();
-		asCArray<asCDataType> subTypes;
-		for( asUINT n = 0; n < numSubTypes; n++ )
-		{
-			ReadData(&ch, 1);
-			if( ch == 's' )
-			{
-				asCDataType dt;
-				ReadDataType(&dt);
-				subTypes.PushLast(dt);
-			}
-			else
-			{
-				eTokenType tokenType = (eTokenType)ReadEncodedUInt();
-				asCDataType dt = asCDataType::CreatePrimitive(tokenType, false);
-				subTypes.PushLast(dt);
-			}
-		}
-
-		// Return the actual template if the subtypes are the template's dummy types
-		if( tmpl->templateSubTypes == subTypes )
-			ot = tmpl;
-		else
-		{
-			// Get the template instance type based on the loaded subtypes
-			ot = engine->GetTemplateInstanceType(tmpl, subTypes, module);
-		}
-
-		if( ot == 0 )
-		{
-			// Show all subtypes in error message
-			asCString sub = subTypes[0].Format(nameSpace);
-			for( asUINT n = 1; n < subTypes.GetLength(); n++ )
-			{
-				sub += ",";
-				sub += subTypes[n].Format(nameSpace);
-			}
-			asCString str;
-			str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, typeName.AddressOf(), sub.AddressOf());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-			Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-	}
-	else if( ch == 'l' )
-	{
-		asCObjectType *st = ReadTypeInfo()->CastToObjectType();
-		if( st == 0 || st->beh.listFactory == 0 )
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-		ot = engine->GetListPatternType(st->beh.listFactory);
-	}
-	else if( ch == 's' )
-	{
-		// Read the name of the template subtype
-		asCString typeName;
-		ReadString(&typeName);
-
-		// Find the template subtype
-		ot = 0;
-		for( asUINT n = 0; n < engine->templateSubTypes.GetLength(); n++ )
-		{
-			if( engine->templateSubTypes[n] && engine->templateSubTypes[n]->name == typeName )
-			{
-				ot = engine->templateSubTypes[n];
-				break;
-			}
-		}
-
-		if( ot == 0 )
-		{
-			asCString str;
-			str.Format(TXT_TEMPLATE_SUBTYPE_s_DOESNT_EXIST, typeName.AddressOf());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-			Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-	}
-	else if( ch == 'o' )
-	{
-		// Read the object type name
-		asCString typeName, ns;
-		ReadString(&typeName);
-		ReadString(&ns);
-		asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
-
-		if( typeName.GetLength() && typeName != "$obj" && typeName != "$func" )
-		{
-			// Find the object type
-			ot = module->GetType(typeName.AddressOf(), nameSpace);
-			if (!ot)
-				ot = engine->GetRegisteredType(typeName.AddressOf(), nameSpace);
-			
-			if( ot == 0 )
-			{
-				asCString str;
-				str.Format(TXT_OBJECT_TYPE_s_DOESNT_EXIST, typeName.AddressOf());
-				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-				Error(TXT_INVALID_BYTECODE_d);
-				return 0;
-			}
-		}
-		else if( typeName == "$obj" )
-		{
-			ot = &engine->scriptTypeBehaviours;
-		}
-		else if( typeName == "$func" )
-		{
-			ot = &engine->functionBehaviours;
-		}
-		else
-			asASSERT( false );
-	}
-	else if (ch == 'c')
-	{
-		// Read the object type name
-		asCString typeName, ns;
-		ReadString(&typeName);
-
-		// Read the parent class
-		asCObjectType *parentClass = ReadTypeInfo()->CastToObjectType();
-		if (parentClass == 0)
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-
-		// Find the child type in the parentClass
-		for (asUINT n = 0; n < parentClass->childFuncDefs.GetLength(); n++)
-		{
-			if (parentClass->childFuncDefs[n]->name == typeName)
-				ot = parentClass->childFuncDefs[n];
-		}
-
-		if (ot == 0)
-		{
-			asCString str;
-			str.Format(TXT_OBJECT_TYPE_s_DOESNT_EXIST, typeName.AddressOf());
-			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-			Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-	}
-	else
-	{
-		// No object type
-		asASSERT( ch == '\0' || error );
-		ot = 0;
-	}
-
-	return ot;
-}
-
-void asCReader::ReadByteCode(asCScriptFunction *func)
-{
-	asASSERT( func->scriptData );
-
-	// Read number of instructions
-	asUINT total, numInstructions;
-	total = numInstructions = ReadEncodedUInt();
-
-	// Reserve some space for the instructions
-	func->scriptData->byteCode.AllocateNoConstruct(numInstructions, false);
-
-	asUINT pos = 0;
-	while( numInstructions )
-	{
-		asBYTE b;
-		ReadData(&b, 1);
-
-		// Allocate the space for the instruction
-		asUINT len = asBCTypeSize[asBCInfo[b].type];
-		asUINT newSize = asUINT(func->scriptData->byteCode.GetLength()) + len;
-		if( func->scriptData->byteCode.GetCapacity() < newSize )
-		{
-			// Determine the average size of the loaded instructions and re-estimate the final size
-			asUINT size = asUINT(float(newSize) / (total - numInstructions) * total) + 1;
-			func->scriptData->byteCode.AllocateNoConstruct(size, true);
-		}
-		if( !func->scriptData->byteCode.SetLengthNoConstruct(newSize) )
-		{
-			// Out of memory
-			error = true;
-			return;
-		}
-
-		asDWORD *bc = func->scriptData->byteCode.AddressOf() + pos;
-		pos += len;
-
-		switch( asBCInfo[b].type )
-		{
-		case asBCTYPE_NO_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-				bc++;
-			}
-			break;
-		case asBCTYPE_W_ARG:
-		case asBCTYPE_wW_ARG:
-		case asBCTYPE_rW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-
-				// Read the argument
-				asWORD w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-
-				bc++;
-			}
-			break;
-		case asBCTYPE_rW_DW_ARG:
-		case asBCTYPE_wW_DW_ARG:
-		case asBCTYPE_W_DW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-
-				// Read the word argument
-				asWORD w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-				bc++;
-
-				// Read the dword argument
-				*bc++ = ReadEncodedUInt();
-			}
-			break;
-		case asBCTYPE_DW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-				bc++;
-
-				// Read the argument
-				*bc++ = ReadEncodedUInt();
-			}
-			break;
-		case asBCTYPE_DW_DW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-				bc++;
-
-				// Read the first argument
-				*bc++ = ReadEncodedUInt();
-
-				// Read the second argument
-				*bc++ = ReadEncodedUInt();
-			}
-			break;
-		case asBCTYPE_wW_rW_rW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-
-				// Read the first argument
-				asWORD w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-				bc++;
-
-				// Read the second argument
-				w = ReadEncodedUInt16();
-				*(asWORD*)bc = w;
-
-				// Read the third argument
-				w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-
-				bc++;
-			}
-			break;
-		case asBCTYPE_wW_rW_ARG:
-		case asBCTYPE_rW_rW_ARG:
-		case asBCTYPE_wW_W_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-
-				// Read the first argument
-				asWORD w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-				bc++;
-
-				// Read the second argument
-				w = ReadEncodedUInt16();
-				*(asWORD*)bc = w;
-
-				bc++;
-			}
-			break;
-		case asBCTYPE_wW_rW_DW_ARG:
-		case asBCTYPE_rW_W_DW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-
-				// Read the first argument
-				asWORD w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-				bc++;
-
-				// Read the second argument
-				w = ReadEncodedUInt16();
-				*(asWORD*)bc = w;
-				bc++;
-	
-				// Read the third argument
-				asDWORD dw = ReadEncodedUInt();
-				*bc++ = dw;
-			}
-			break;
-		case asBCTYPE_QW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-				bc++;
-
-				// Read the argument
-				asQWORD qw = ReadEncodedUInt64();
-				*(asQWORD*)bc = qw;
-				bc += 2;
-			}
-			break;
-		case asBCTYPE_QW_DW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-				bc++;
-
-				// Read the first argument
-				asQWORD qw = ReadEncodedUInt64();
-				*(asQWORD*)bc = qw;
-				bc += 2;
-
-				// Read the second argument
-				asDWORD dw = ReadEncodedUInt();
-				*bc++ = dw;
-			}
-			break;
-		case asBCTYPE_rW_QW_ARG:
-		case asBCTYPE_wW_QW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-
-				// Read the first argument
-				asWORD w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-				bc++;
-
-				// Read the argument
-				asQWORD qw = ReadEncodedUInt64();
-				*(asQWORD*)bc = qw;
-				bc += 2;
-			}
-			break;
-		case asBCTYPE_rW_DW_DW_ARG:
-			{
-				*(asBYTE*)(bc) = b;
-
-				// Read the 1st argument
-				asWORD w = ReadEncodedUInt16();
-				*(((asWORD*)bc)+1) = w;
-				bc++;
-
-				// Read the 2nd argument
-				*bc++ = ReadEncodedUInt();
-
-				// Read the 3rd argument
-				*bc++ = ReadEncodedUInt();
-			}
-			break;
-		default:
-			{
-				// This should never happen
-				asASSERT(false);
-
-				// Read the next 3 bytes
-				asDWORD c; asBYTE t;
-#if defined(AS_BIG_ENDIAN)
-				c = b << 24;
-				ReadData(&t, 1); c += t << 16;
-				ReadData(&t, 1); c += t << 8;
-				ReadData(&t, 1); c += t;
-#else
-				c = b;
-				ReadData(&t, 1); c += t << 8;
-				ReadData(&t, 1); c += t << 16;
-				ReadData(&t, 1); c += t << 24;
-#endif
-
-				*bc++ = c;
-				c = *(asBYTE*)&c;
-
-				// Read the bc as is
-				for( int n = 1; n < asBCTypeSize[asBCInfo[c].type]; n++ )
-					ReadData(&*bc++, 4);
-			}
-		}
-
-		numInstructions--;
-	}
-
-	// Correct the final size in case we over-estimated it
-	func->scriptData->byteCode.SetLengthNoConstruct(pos);
-}
-
-void asCReader::ReadUsedTypeIds()
-{
-	TimeIt("asCReader::ReadUsedTypeIds");
-
-	asUINT count = ReadEncodedUInt();
-	usedTypeIds.Allocate(count, false);
-	for( asUINT n = 0; n < count; n++ )
-	{
-		asCDataType dt;
-		ReadDataType(&dt);
-		usedTypeIds.PushLast(engine->GetTypeIdFromDataType(dt));
-	}
-}
-
-void asCReader::ReadUsedGlobalProps()
-{
-	TimeIt("asCReader::ReadUsedGlobalProps");
-
-	int c = ReadEncodedUInt();
-
-	usedGlobalProperties.Allocate(c, false);
-
-	for( int n = 0; n < c; n++ )
-	{
-		asCString name, ns;
-		asCDataType type;
-		char moduleProp;
-
-		ReadString(&name);
-		ReadString(&ns);
-		ReadDataType(&type);
-		ReadData(&moduleProp, 1);
-
-		asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
-
-		// Find the real property
-		asCGlobalProperty *globProp = 0;
-		if( moduleProp )
-			globProp = module->scriptGlobals.GetFirst(nameSpace, name);
-		else
-			globProp = engine->registeredGlobalProps.GetFirst(nameSpace, name);
-
-		void *prop = 0;
-		if( globProp && globProp->type == type )
-			prop = globProp->GetAddressOfValue();
-
-		usedGlobalProperties.PushLast(prop);
-
-		if( prop == 0 )
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-		}
-	}
-}
-
-void asCReader::ReadUsedObjectProps()
-{
-	TimeIt("asCReader::ReadUsedObjectProps");
-
-	asUINT c = ReadEncodedUInt();
-
-	usedObjectProperties.SetLength(c);
-	for( asUINT n = 0; n < c; n++ )
-	{
-		asCObjectType *objType = ReadTypeInfo()->CastToObjectType();
-		if( objType == 0 )
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			break;
-		}
-
-		asCString name;
-		ReadString(&name);
-
-		// Find the property offset
-		bool found = false;
-		for( asUINT p = 0; p < objType->properties.GetLength(); p++ )
-		{
-			if( objType->properties[p]->name == name )
-			{
-				usedObjectProperties[n].objType = objType;
-				usedObjectProperties[n].offset = objType->properties[p]->byteOffset;
-				found = true;
-				break;
-			}
-		}
-
-		if( !found )
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			return;
-		}
-	}
-}
-
-short asCReader::FindObjectPropOffset(asWORD index)
-{
-	if( index >= usedObjectProperties.GetLength() )
-	{
-		Error(TXT_INVALID_BYTECODE_d);
-		return 0;
-	}
-
-	return (short)usedObjectProperties[index].offset;
-}
-
-asCScriptFunction *asCReader::FindFunction(int idx)
-{
-	if( idx >= 0 && idx < (int)usedFunctions.GetLength() )
-		return usedFunctions[idx];
-	else
-	{
-		Error(TXT_INVALID_BYTECODE_d);
-		return 0;
-	}
-}
-
-void asCReader::TranslateFunction(asCScriptFunction *func)
-{
-	// Skip this if the function is part of an pre-existing shared object
-	if( dontTranslate.MoveTo(0, func) ) return;
-
-	asASSERT( func->scriptData );
-
-	// Pre-compute the size of each instruction in order to translate jump offsets
-	asUINT n;
-	asDWORD *bc = func->scriptData->byteCode.AddressOf();
-	asUINT bcLength = (asUINT)func->scriptData->byteCode.GetLength();
-	asCArray<asUINT> bcSizes(bcLength);
-	asCArray<asUINT> instructionNbrToPos(bcLength);
-	for( n = 0; n < bcLength; )
-	{
-		int c = *(asBYTE*)&bc[n];
-		asUINT size = asBCTypeSize[asBCInfo[c].type];
-		if( size == 0 )
-		{
-			Error(TXT_INVALID_BYTECODE_d);
-			return;
-		}
-		bcSizes.PushLast(size);
-		instructionNbrToPos.PushLast(n);
-		n += size;
-	}
-
-	asUINT bcNum = 0;
-	for( n = 0; n < bcLength; bcNum++ )
-	{
-		int c = *(asBYTE*)&bc[n];
-		if( c == asBC_REFCPY || 
-			c == asBC_RefCpyV ||
-			c == asBC_OBJTYPE )
-		{
-			// Translate the index to the true object type
-			asPWORD *ot = (asPWORD*)&bc[n+1];
-			*(asCObjectType**)ot = FindType(int(*ot))->CastToObjectType();
-		}
-		else if( c == asBC_TYPEID ||
-			     c == asBC_Cast )
-		{
-			// Translate the index to the type id
-			int *tid = (int*)&bc[n+1];
-			*tid = FindTypeId(*tid);
-		}
-		else if( c == asBC_ADDSi ||
-			     c == asBC_LoadThisR )
-		{
-			// Translate the index to the type id
-			int *tid = (int*)&bc[n+1];
-			*tid = FindTypeId(*tid);
-
-			// Translate the prop index into the property offset
-			*(((short*)&bc[n])+1) = FindObjectPropOffset(*(((short*)&bc[n])+1));
-		}
-		else if( c == asBC_LoadRObjR ||
-			     c == asBC_LoadVObjR )
-		{
-			// Translate the index to the type id
-			int *tid = (int*)&bc[n+2];
-			*tid = FindTypeId(*tid);
-
-			asCObjectType *ot = engine->GetObjectTypeFromTypeId(*tid);
-			if( ot && (ot->flags & asOBJ_LIST_PATTERN) )
-			{
-				// List patterns have a different way of adjusting the offsets
-				SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-				*(((short*)&bc[n])+2) = (short)listAdj->AdjustOffset(*(((short*)&bc[n])+2));
-			}
-			else
-			{
-				// Translate the prop index into the property offset
-				*(((short*)&bc[n])+2) = FindObjectPropOffset(*(((short*)&bc[n])+2));
-			}
-		}
-		else if( c == asBC_COPY )
-		{
-			// Translate the index to the type id
-			int *tid = (int*)&bc[n+1];
-			*tid = FindTypeId(*tid);
-
-			// COPY is used to copy POD types that don't have the opAssign method. It is 
-			// also used to copy references to scoped types during variable initializations.
-			// Update the number of dwords to copy as it may be different on the target platform
-			if( (*tid) & asTYPEID_OBJHANDLE )
-			{
-				// It is the actual reference that is being copied, not the object itself
-				asBC_SWORDARG0(&bc[n]) = AS_PTR_SIZE;
-			}
-			else
-			{
-				asCDataType dt = engine->GetDataTypeFromTypeId(*tid);
-				if( !dt.IsValid() )
-				{
-					Error(TXT_INVALID_BYTECODE_d);
-				}
-				else
-					asBC_SWORDARG0(&bc[n]) = (short)dt.GetSizeInMemoryDWords();
-			}
-		}
-		else if( c == asBC_RET )
-		{
-			// Determine the correct amount of DWORDs to pop
-			asWORD dw = (asWORD)func->GetSpaceNeededForArguments();
-			if( func->DoesReturnOnStack() ) dw += AS_PTR_SIZE;
-			if( func->objectType ) dw += AS_PTR_SIZE;
-			asBC_WORDARG0(&bc[n]) = dw;
-		}
-		else if( c == asBC_CALL ||
-				 c == asBC_CALLINTF ||
-				 c == asBC_CALLSYS ||
-				 c == asBC_Thiscall1 )
-		{
-			// Translate the index to the func id
-			int *fid = (int*)&bc[n+1];
-			asCScriptFunction *f = FindFunction(*fid);
-			if( f )
-				*fid = f->id;
-			else
-			{
-				Error(TXT_INVALID_BYTECODE_d);
-				return;
-			}
-		}
-		else if( c == asBC_FuncPtr )
-		{
-			// Translate the index to the func pointer
-			asPWORD *fid = (asPWORD*)&bc[n+1];
-			*fid = (asPWORD)FindFunction(int(*fid));
-		}
-		else if( c == asBC_ALLOC )
-		{
-			// Translate the index to the true object type
-			asPWORD *arg = (asPWORD*)&bc[n+1];
-			*(asCObjectType**)arg = FindType(int(*arg))->CastToObjectType();
-
-			// The constructor function id must be translated, unless it is zero
-			int *fid = (int*)&bc[n+1+AS_PTR_SIZE];
-			if( *fid != 0 )
-			{
-				// Subtract 1 from the id, as it was incremented during the writing
-				asCScriptFunction *f = FindFunction(*fid-1);
-				if( f )
-					*fid = f->id;
-				else
-				{
-					Error(TXT_INVALID_BYTECODE_d);
-					return;
-				}
-			}
-		}
-		else if( c == asBC_STR )
-		{
-			// Translate the index to the true string id
-			asWORD *arg = ((asWORD*)&bc[n])+1;
-
-			if( *arg < usedStringConstants.GetLength() )	
-				*arg = (asWORD)usedStringConstants[*arg];
-			else
-			{
-				Error(TXT_INVALID_BYTECODE_d);
-				return;
-			}
-		}
-		else if( c == asBC_CALLBND )
-		{
-			// Translate the function id
-			asUINT *fid = (asUINT*)&bc[n+1];
-			if( *fid < module->bindInformations.GetLength() )
-			{
-				sBindInfo *bi = module->bindInformations[*fid];
-				if( bi )
-					*fid = bi->importedFunctionSignature->id;
-				else
-				{
-					Error(TXT_INVALID_BYTECODE_d);
-					return;
-				}
-			}
-			else
-			{
-				Error(TXT_INVALID_BYTECODE_d);
-				return;
-			}
-		}
-		else if( c == asBC_PGA      ||
-			     c == asBC_PshGPtr  ||
-			     c == asBC_LDG      ||
-				 c == asBC_PshG4    ||
-				 c == asBC_LdGRdR4  ||
-				 c == asBC_CpyGtoV4 ||
-				 c == asBC_CpyVtoG4 ||
-				 c == asBC_SetG4    )
-		{
-			// Translate the global var index to pointer
-			asPWORD *index = (asPWORD*)&bc[n+1];
-			if( asUINT(*index) < usedGlobalProperties.GetLength() )
-				*(void**)index = usedGlobalProperties[asUINT(*index)];
-			else
-			{
-				Error(TXT_INVALID_BYTECODE_d);
-				return;
-			}
-		}
-		else if( c == asBC_JMP    ||
-			     c == asBC_JZ     ||
-				 c == asBC_JNZ    ||
-			     c == asBC_JLowZ  ||
-				 c == asBC_JLowNZ ||
-				 c == asBC_JS     ||
-				 c == asBC_JNS    ||
-				 c == asBC_JP     ||
-				 c == asBC_JNP    ) // The JMPP instruction doesn't need modification
-		{
-			// Get the offset 
-			int offset = int(bc[n+1]);
-
-			// Count the instruction sizes to the destination instruction
-			int size = 0;
-			if( offset >= 0 )
-				// If moving ahead, then start from next instruction
-				for( asUINT num = bcNum+1; offset-- > 0; num++ )
-					size += bcSizes[num];
-			else
-				// If moving backwards, then start at current instruction
-				for( asUINT num = bcNum; offset++ < 0; num-- )
-					size -= bcSizes[num];
-
-			// The size is dword offset 
-			bc[n+1] = size;
-		}
-		else if( c == asBC_AllocMem )
-		{
-			// The size of the allocated memory is only known after all the elements has been seen.
-			// This helper class will collect this information and adjust the size when the 
-			// corresponding asBC_FREE is encountered
-
-			// The adjuster also needs to know the list type so it can know the type of the elements
-			asCObjectType *ot = func->GetTypeInfoOfLocalVar(asBC_SWORDARG0(&bc[n]))->CastToObjectType();
-			listAdjusters.PushLast(asNEW(SListAdjuster)(this, &bc[n], ot));
-		}
-		else if( c == asBC_FREE )
-		{
-			// Translate the index to the true object type
-			asPWORD *pot = (asPWORD*)&bc[n+1];
-			*(asCObjectType**)pot = FindType(int(*pot))->CastToObjectType();
-
-			asCObjectType *ot = *(asCObjectType**)pot;
-			if( ot && (ot->flags & asOBJ_LIST_PATTERN) )
-			{
-				if( listAdjusters.GetLength() == 0 )
-				{
-					Error(TXT_INVALID_BYTECODE_d);
-					return;
-				}
-
-				// Finalize the adjustment of the list buffer that was initiated with asBC_AllocMem
-				SListAdjuster *list = listAdjusters.PopLast();
-				list->AdjustAllocMem();
-				asDELETE(list, SListAdjuster);
-			}
-		}
-		else if( c == asBC_SetListSize )
-		{
-			// Adjust the offset in the list where the size is informed
-			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
-
-			// Inform the list adjuster how many values will be repeated
-			listAdj->SetRepeatCount(bc[n+2]);
-		}
-		else if( c == asBC_PshListElmnt )
-		{
-			// Adjust the offset in the list where the size is informed
-			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
-		}
-		else if( c == asBC_SetListType )
-		{
-			// Adjust the offset in the list where the typeid is informed
-			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
-
-			// Translate the type id
-			bc[n+2] = FindTypeId(bc[n+2]);
-
-			// Inform the list adjuster the type id of the next element
-			listAdj->SetNextType(bc[n+2]);
-		}
-
-		n += asBCTypeSize[asBCInfo[c].type];
-	}
-
-	// Calculate the stack adjustments
-	CalculateAdjustmentByPos(func);
-
-	// Adjust all variable positions in the bytecode
-	bc = func->scriptData->byteCode.AddressOf();
-	for( n = 0; n < bcLength; )
-	{
-		int c = *(asBYTE*)&bc[n];
-		switch( asBCInfo[c].type )
-		{
-		case asBCTYPE_wW_ARG:
-		case asBCTYPE_rW_DW_ARG:
-		case asBCTYPE_wW_QW_ARG:
-		case asBCTYPE_rW_ARG:
-		case asBCTYPE_wW_DW_ARG:
-		case asBCTYPE_wW_W_ARG:
-		case asBCTYPE_rW_QW_ARG:
-		case asBCTYPE_rW_W_DW_ARG:
-		case asBCTYPE_rW_DW_DW_ARG:
-			{
-				asBC_SWORDARG0(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG0(&bc[n]));
-			}
-			break;
-
-		case asBCTYPE_wW_rW_ARG:
-		case asBCTYPE_wW_rW_DW_ARG:
-		case asBCTYPE_rW_rW_ARG:
-			{
-				asBC_SWORDARG0(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG0(&bc[n]));
-				asBC_SWORDARG1(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG1(&bc[n]));
-			}
-			break;
-
-		case asBCTYPE_wW_rW_rW_ARG:
-			{
-				asBC_SWORDARG0(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG0(&bc[n]));
-				asBC_SWORDARG1(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG1(&bc[n]));
-				asBC_SWORDARG2(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG2(&bc[n]));
-			}
-			break;
-
-		default:
-			// The other types don't treat variables so won't be modified
-			break;
-		}
-
-		n += asBCTypeSize[asBCInfo[c].type];
-	}
-
-	// Adjust the space needed for local variables
-	func->scriptData->variableSpace = AdjustStackPosition(func->scriptData->variableSpace);
-
-	// Adjust the variable information. This will be used during the adjustment below
-	for( n = 0; n < func->scriptData->variables.GetLength(); n++ )
-	{
-		func->scriptData->variables[n]->declaredAtProgramPos = instructionNbrToPos[func->scriptData->variables[n]->declaredAtProgramPos];
-		func->scriptData->variables[n]->stackOffset = AdjustStackPosition(func->scriptData->variables[n]->stackOffset);
-	}
-
-	// objVariablePos
-	for( n = 0; n < func->scriptData->objVariablePos.GetLength(); n++ )
-		func->scriptData->objVariablePos[n] = AdjustStackPosition(func->scriptData->objVariablePos[n]);
-
-	// Adjust the get offsets. This must be done in the second iteration because
-	// it relies on the function ids and variable position already being correct in the 
-	// bytecodes that come after the GET instructions.
-	// TODO: optimize: Instead of doing a full extra loop. We can push the GET instructions
-	//                 on a stack, and then when a call instruction is found update all of them.
-	//                 This will also make the AdjustGetOffset() function quicker as it can 
-	//                 receive the called function directly instead of having to search for it.
-	bc = func->scriptData->byteCode.AddressOf();
-	for( n = 0; n < bcLength; )
-	{
-		int c = *(asBYTE*)&bc[n];
-
-		if( c == asBC_GETREF ||
-		    c == asBC_GETOBJ ||
-		    c == asBC_GETOBJREF )
-		{
-			asBC_WORDARG0(&bc[n]) = (asWORD)AdjustGetOffset(asBC_WORDARG0(&bc[n]), func, n);
-		}
-
-		n += asBCTypeSize[asBCInfo[c].type];
-	}
-
-	for( n = 0; n < func->scriptData->objVariableInfo.GetLength(); n++ )
-	{
-		// The program position must be adjusted as it is stored in number of instructions
-		func->scriptData->objVariableInfo[n].programPos = instructionNbrToPos[func->scriptData->objVariableInfo[n].programPos];
-		func->scriptData->objVariableInfo[n].variableOffset = AdjustStackPosition(func->scriptData->objVariableInfo[n].variableOffset);
-	}
-
-	// The program position (every even number) needs to be adjusted
-	// for the line numbers to be in number of dwords instead of number of instructions 
-	for( n = 0; n < func->scriptData->lineNumbers.GetLength(); n += 2 )
-		func->scriptData->lineNumbers[n] = instructionNbrToPos[func->scriptData->lineNumbers[n]];
-	for( n = 0; n < func->scriptData->sectionIdxs.GetLength(); n += 2 )
-		func->scriptData->sectionIdxs[n] = instructionNbrToPos[func->scriptData->sectionIdxs[n]];
-
-	CalculateStackNeeded(func);
-}
-
-asCReader::SListAdjuster::SListAdjuster(asCReader *rd, asDWORD *bc, asCObjectType *listType) : 
-	reader(rd), allocMemBC(bc), maxOffset(0), patternType(listType), repeatCount(0), lastOffset(-1), nextOffset(0), nextTypeId(-1)
-{
-	asASSERT( patternType && (patternType->flags & asOBJ_LIST_PATTERN) );
-
-	// Find the first expected value in the list
-	asSListPatternNode *node = patternType->engine->scriptFunctions[patternType->templateSubTypes[0].GetBehaviour()->listFactory]->listPattern;
-	asASSERT( node && node->type == asLPT_START );
-	patternNode = node->next;
-}
-
-int asCReader::SListAdjuster::AdjustOffset(int offset)
-{
-	if( offset < lastOffset )
-	{
-		reader->Error(TXT_INVALID_BYTECODE_d);
-		return 0;
-	}
-
-	// If it is the same offset being accessed again, just return the same adjusted value
-	if( lastOffset == offset )
-		return lastAdjustedOffset;
-
-	lastOffset = offset;
-	lastAdjustedOffset = maxOffset;
-
-	// What is being expected at this position?
-	if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
-	{
-		// Align the offset to 4 bytes boundary
-		if( maxOffset & 0x3 )
-		{
-			maxOffset += 4 - (maxOffset & 0x3);
-			lastAdjustedOffset = maxOffset;
-		}
-
-		// Don't move the patternNode yet because the caller must make a call to SetRepeatCount too
-		maxOffset += 4;
-		nextOffset = offset+1;
-		return lastAdjustedOffset;
-	}
-	else if( patternNode->type == asLPT_TYPE )
-	{
-		const asCDataType &dt = reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType;
-		if( dt.GetTokenType() == ttQuestion )
-		{
-			if( nextTypeId != -1 )
-			{
-				if( repeatCount > 0 )
-					repeatCount--;
-
-				asCDataType nextdt = patternType->engine->GetDataTypeFromTypeId(nextTypeId);
-				asUINT size;
-				if(nextdt.IsObjectHandle() || (nextdt.GetTypeInfo() && (nextdt.GetTypeInfo()->flags & asOBJ_REF)) )
-					size = AS_PTR_SIZE*4;
-				else
-					size = nextdt.GetSizeInMemoryBytes();
-
-				// Align the offset to 4 bytes boundary
-				if( size >= 4 && (maxOffset & 0x3) )
-				{
-					maxOffset += 4 - (maxOffset & 0x3);
-					lastAdjustedOffset = maxOffset;
-				}
-
-				// Only move the patternNode if we're not expecting any more repeated entries
-				if( repeatCount == 0 )
-					patternNode = patternNode->next;
-
-				nextTypeId = -1;
-
-				maxOffset += size;
-				nextOffset = offset+1;
-				return lastAdjustedOffset;
-			}
-			else
-			{
-				// Align the offset to 4 bytes boundary
-				if( maxOffset & 0x3 )
-				{
-					maxOffset += 4 - (maxOffset & 0x3);
-					lastAdjustedOffset = maxOffset;
-				}
-
-				// The first adjustment is for the typeId
-				maxOffset += 4;
-				nextOffset = offset+1;
-				return lastAdjustedOffset;
-			}
-		}
-		else
-		{
-			// Determine the size of the element
-			asUINT size;
-			if( dt.IsObjectHandle() || (dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_REF)) )
-				size = AS_PTR_SIZE*4;
-			else
-				size = dt.GetSizeInMemoryBytes();
-
-			// If values are skipped, the offset needs to be incremented
-			while( nextOffset <= offset )
-			{
-				if( repeatCount > 0 )
-					repeatCount--;
-
-				// Align the offset to 4 bytes boundary
-				if( size >= 4 && (maxOffset & 0x3) )
-					maxOffset += 4 - (maxOffset & 0x3);
-
-				lastAdjustedOffset = maxOffset;
-				nextOffset += 1;
-				maxOffset += size;
-			}
-
-			// Only move the patternNode if we're not expecting any more repeated entries
-			if( repeatCount == 0 )
-				patternNode = patternNode->next;
-
-			nextOffset = offset+1;
-			return lastAdjustedOffset;
-		}
-	}
-	else if( patternNode->type == asLPT_START )
-	{
-		if( repeatCount > 0 )
-			repeatCount--;
-		SInfo info = {repeatCount, patternNode};
-		stack.PushLast(info);
-
-		repeatCount = 0;
-		patternNode = patternNode->next;
-
-		lastOffset--;
-		return AdjustOffset(offset);
-	}
-	else if( patternNode->type == asLPT_END )
-	{
-		if( stack.GetLength() == 0 )
-		{
-			reader->Error(TXT_INVALID_BYTECODE_d);
-			return 0;
-		}
-
-		SInfo info = stack.PopLast();
-		repeatCount = info.repeatCount;
-		if( repeatCount )
-			patternNode = info.startNode;
-		else
-			patternNode = patternNode->next;
-
-		lastOffset--;
-		return AdjustOffset(offset);
-	}
-	else
-	{
-		// Something is wrong with the pattern list declaration
-		reader->Error(TXT_INVALID_BYTECODE_d);
-		return 0;
-	}
-
-	UNREACHABLE_RETURN;
-}
-
-void asCReader::SListAdjuster::SetRepeatCount(asUINT rc)
-{
-	// Make sure the list is expecting a repeat at this location
-	asASSERT( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME );
-
-	// Now move to the next patternNode
-	patternNode = patternNode->next;
-
-	repeatCount = rc;
-}
-
-void asCReader::SListAdjuster::AdjustAllocMem()
-{
-	allocMemBC[1] = maxOffset;
-}
-
-void asCReader::SListAdjuster::SetNextType(int typeId)
-{
-	asASSERT( nextTypeId == -1 );
-
-	nextTypeId = typeId;
-}
-
-void asCReader::CalculateStackNeeded(asCScriptFunction *func)
-{
-	asASSERT( func->scriptData );
-
-	int largestStackUsed = 0;
-
-	// Clear the known stack size for each bytecode
-	asCArray<int> stackSize;
-	stackSize.SetLength(func->scriptData->byteCode.GetLength());
-	memset(&stackSize[0], -1, stackSize.GetLength()*4);
-
-	// Add the first instruction to the list of unchecked code 
-	// paths and set the stack size at that instruction to variableSpace
-	asCArray<asUINT> paths;
-	paths.PushLast(0);
-	stackSize[0] = func->scriptData->variableSpace;
-
-	// Go through each of the code paths
-	for( asUINT p = 0; p < paths.GetLength(); ++p )
-	{
-		asUINT pos = paths[p];
-		int currStackSize = stackSize[pos];
-		
-		asBYTE bc = *(asBYTE*)&func->scriptData->byteCode[pos];
-		if( bc == asBC_RET )
-			continue;
-
-		// Determine the change in stack size for this instruction
-		int stackInc = asBCInfo[bc].stackInc;
-		if( stackInc == 0xFFFF )
-		{
-			// Determine the true delta from the instruction arguments
-			if( bc == asBC_CALL ||
-				bc == asBC_CALLSYS ||
-				bc == asBC_Thiscall1 ||
-				bc == asBC_CALLBND ||
-				bc == asBC_ALLOC ||
-				bc == asBC_CALLINTF ||
-				bc == asBC_CallPtr )
-			{
-				asCScriptFunction *called = GetCalledFunction(func, pos);
-				if( called )
-				{
-					stackInc = -called->GetSpaceNeededForArguments();
-					if( called->objectType )
-						stackInc -= AS_PTR_SIZE;
-					if( called->DoesReturnOnStack() )
-						stackInc -= AS_PTR_SIZE;
-				}
-				else
-				{
-					// It is an allocation for an object without a constructor
-					asASSERT( bc == asBC_ALLOC );
-					stackInc = -AS_PTR_SIZE;
-				}
-			}
-		}
-		
-		currStackSize += stackInc;
-		asASSERT( currStackSize >= 0 );
-
-		if( currStackSize > largestStackUsed )
-			largestStackUsed = currStackSize;
-
-		if( bc == asBC_JMP )
-		{
-			// Find the label that we should jump to
-			int offset = asBC_INTARG(&func->scriptData->byteCode[pos]);
-			pos += 2 + offset;
-
-			// Add the destination as a new path
-			if( stackSize[pos] == -1 )
-			{
-				stackSize[pos] = currStackSize;
-				paths.PushLast(pos);
-			}
-			else
-				asASSERT(stackSize[pos] == currStackSize);
-			continue;
-		}
-		else if( bc == asBC_JZ    || bc == asBC_JNZ    ||
-				 bc == asBC_JLowZ || bc == asBC_JLowNZ ||
-				 bc == asBC_JS    || bc == asBC_JNS    ||
-				 bc == asBC_JP    || bc == asBC_JNP )
-		{
-			// Find the label that is being jumped to
-			int offset = asBC_INTARG(&func->scriptData->byteCode[pos]);
-			
-			// Add both paths to the code paths
-			pos += 2;
-			if( stackSize[pos] == -1 )
-			{
-				stackSize[pos] = currStackSize;
-				paths.PushLast(pos);
-			}
-			else
-				asASSERT(stackSize[pos] == currStackSize);
-
-			pos += offset;
-			if( stackSize[pos] == -1 )
-			{
-				stackSize[pos] = currStackSize;
-				paths.PushLast(pos);
-			}
-			else
-				asASSERT(stackSize[pos] == currStackSize);
-
-			continue;
-		}
-		else if( bc == asBC_JMPP )
-		{
-			pos++;
-			
-			// Add all subsequent JMP instructions to the path
-			while( *(asBYTE*)&func->scriptData->byteCode[pos] == asBC_JMP )
-			{
-				if( stackSize[pos] == -1 )
-				{
-					stackSize[pos] = currStackSize;
-					paths.PushLast(pos);
-				}
-				else
-					asASSERT(stackSize[pos] == currStackSize);
-				pos += 2;
-			}			
-			continue;				
-		}
-		else
-		{
-			// Add next instruction to the paths
-			pos += asBCTypeSize[asBCInfo[bc].type];
-			if( stackSize[pos] == -1 )
-			{
-				stackSize[pos] = currStackSize;
-				paths.PushLast(pos);
-			}
-			else
-				asASSERT(stackSize[pos] == currStackSize);
-
-			continue;
-		}
-	}
-
-	func->scriptData->stackNeeded = largestStackUsed;
-}
-
-void asCReader::CalculateAdjustmentByPos(asCScriptFunction *func)
-{
-	// Adjust the offset of all negative variables (parameters) as  
-	// all pointers have been stored as having a size of 1 dword
-	asUINT n;
-	asCArray<int> adjustments;
-	asUINT offset = 0;
-	if( func->objectType )
-	{
-		adjustments.PushLast(offset);
-		adjustments.PushLast(1-AS_PTR_SIZE);
-		offset += 1;
-	}
-	if( func->DoesReturnOnStack() )
-	{
-		adjustments.PushLast(offset);
-		adjustments.PushLast(1-AS_PTR_SIZE);
-		offset += 1;
-	}
-	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( !func->parameterTypes[n].IsPrimitive() ||
-			func->parameterTypes[n].IsReference() )
-		{
-			adjustments.PushLast(offset);
-			adjustments.PushLast(1-AS_PTR_SIZE);
-			offset += 1;
-		}
-		else
-		{
-			asASSERT( func->parameterTypes[n].IsPrimitive() );
-			offset += func->parameterTypes[n].GetSizeOnStackDWords();
-		}
-	}
-
-	// Build look-up table with the adjustments for each stack position
-	adjustNegativeStackByPos.SetLength(offset);
-	memset(adjustNegativeStackByPos.AddressOf(), 0, adjustNegativeStackByPos.GetLength()*sizeof(int));
-	for( n = 0; n < adjustments.GetLength(); n+=2 )
-	{
-		int pos    = adjustments[n];
-		int adjust = adjustments[n+1];
-
-		for( asUINT i = pos+1; i < adjustNegativeStackByPos.GetLength(); i++ )
-			adjustNegativeStackByPos[i] += adjust;
-	}
-
-	// The bytecode has been stored as if all object variables take up only 1 dword. 
-	// It is necessary to adjust to the size according to the current platform.
-	adjustments.SetLength(0);
-	int highestPos = 0;
-	for( n = 0; n < func->scriptData->objVariableTypes.GetLength(); n++ )
-	{
-		// Determine the size the variable currently occupies on the stack
-		int size = AS_PTR_SIZE;
-
-		// objVariableTypes is null if the type is a null pointer
-		if( func->scriptData->objVariableTypes[n] &&
-			(func->scriptData->objVariableTypes[n]->GetFlags() & asOBJ_VALUE) &&
-			n >= func->scriptData->objVariablesOnHeap )
-		{
-			size = func->scriptData->objVariableTypes[n]->GetSize();
-			if( size < 4 ) 
-				size = 1; 
-			else 
-				size /= 4;
-		}
-
-		// Check if type has a different size than stored
-		if( size > 1 )
-		{
-			if( func->scriptData->objVariablePos[n] > highestPos )
-				highestPos = func->scriptData->objVariablePos[n];
-
-			adjustments.PushLast(func->scriptData->objVariablePos[n]);
-			adjustments.PushLast(size-1);
-		}
-	}
-
-	// Count position 0 too
-	adjustByPos.SetLength(highestPos+1);
-	memset(adjustByPos.AddressOf(), 0, adjustByPos.GetLength()*sizeof(int));
-
-	// Build look-up table with the adjustments for each stack position
-	for( n = 0; n < adjustments.GetLength(); n+=2 )
-	{
-		int pos    = adjustments[n];
-		int adjust = adjustments[n+1];
-
-		for( asUINT i = pos; i < adjustByPos.GetLength(); i++ )
-			adjustByPos[i] += adjust;
-	}
-}
-
-int asCReader::AdjustStackPosition(int pos)
-{
-	if( pos >= (int)adjustByPos.GetLength() )
-	{
-		// It can be higher for primitives allocated on top of highest object variable
-		if( adjustByPos.GetLength() )
-			pos += (short)adjustByPos[adjustByPos.GetLength()-1];
-	}
-	else if( pos >= 0 ) 
-		pos += (short)adjustByPos[pos];
-	else if( -pos >= (int)adjustNegativeStackByPos.GetLength() )
-		Error(TXT_INVALID_BYTECODE_d);
-	else
-		pos += (short)adjustNegativeStackByPos[-pos];
-
-	return pos;
-}
-
-asCScriptFunction *asCReader::GetCalledFunction(asCScriptFunction *func, asDWORD programPos)
-{
-	asBYTE bc = *(asBYTE*)&func->scriptData->byteCode[programPos];
-
-	if( bc == asBC_CALL ||
-		bc == asBC_CALLSYS ||
-		bc == asBC_Thiscall1 ||
-		bc == asBC_CALLINTF )
-	{
-		// Find the function from the function id in bytecode
-		int funcId = asBC_INTARG(&func->scriptData->byteCode[programPos]);
-		return engine->scriptFunctions[funcId];
-	}
-	else if( bc == asBC_ALLOC )
-	{
-		// Find the function from the function id in the bytecode
-		int funcId = asBC_INTARG(&func->scriptData->byteCode[programPos+AS_PTR_SIZE]);
-		return engine->scriptFunctions[funcId];
-	}
-	else if( bc == asBC_CALLBND )
-	{
-		// Find the function from the engine's bind array
-		int funcId = asBC_INTARG(&func->scriptData->byteCode[programPos]);
-		return engine->importedFunctions[funcId & ~FUNC_IMPORTED]->importedFunctionSignature;
-	}
-	else if( bc == asBC_CallPtr )
-	{
-		asUINT v;
-		int var = asBC_SWORDARG0(&func->scriptData->byteCode[programPos]);
-
-		// Find the funcdef from the local variable
-		for( v = 0; v < func->scriptData->objVariablePos.GetLength(); v++ )
-			if( func->scriptData->objVariablePos[v] == var )
-				return func->scriptData->objVariableTypes[v]->CastToFuncdefType()->funcdef;
-
-		// Look in parameters
-		int paramPos = 0;
-		if( func->objectType )
-			paramPos -= AS_PTR_SIZE;
-		if( func->DoesReturnOnStack() )
-			paramPos -= AS_PTR_SIZE;
-		for( v = 0; v < func->parameterTypes.GetLength(); v++ )
-		{
-			if (var == paramPos)
-			{
-				if (func->parameterTypes[v].IsFuncdef())
-					return func->parameterTypes[v].GetTypeInfo()->CastToFuncdefType()->funcdef;
-				else
-				{
-					error = true;
-					return 0;
-				}
-			}
-			paramPos -= func->parameterTypes[v].GetSizeOnStackDWords();
-		}
-	}
-
-	return 0;
-}
-
-int asCReader::AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos)
-{
-	// TODO: optimize: multiple instructions for the same function doesn't need to look for the function everytime
-	//                 the function can remember where it found the function and check if the programPos is still valid
-
-	// Get offset 0 doesn't need adjustment
-	if( offset == 0 ) return 0;
-
-	// Find out which function that will be called
-	asCScriptFunction *calledFunc = 0;
-	int stackDelta = 0;
-	for( asUINT n = programPos; func->scriptData->byteCode.GetLength(); )
-	{
-		asBYTE bc = *(asBYTE*)&func->scriptData->byteCode[n];
-		if( bc == asBC_CALL ||
-			bc == asBC_CALLSYS ||
-			bc == asBC_Thiscall1 ||
-			bc == asBC_CALLINTF || 
-			bc == asBC_ALLOC ||
-			bc == asBC_CALLBND ||
-			bc == asBC_CallPtr )
-		{
-			calledFunc = GetCalledFunction(func, n);
-			break;
-		}
-		else if( bc == asBC_REFCPY ||
-				 bc == asBC_COPY )
-		{
-			// In this case we know there is only 1 pointer on the stack above
-			asASSERT( offset == 1 );
-			return offset - (1 - AS_PTR_SIZE);
-		}
-
-		// Keep track of the stack size between the 
-		// instruction that needs to be adjusted and the call
-		stackDelta += asBCInfo[bc].stackInc;
-
-		n += asBCTypeSize[asBCInfo[bc].type];
-	}
-
-	if( calledFunc == 0 )
-	{
-		Error(TXT_INVALID_BYTECODE_d);
-		return offset;
-	}
-
-	// Count the number of pointers pushed on the stack above the 
-	// current offset, and then adjust the offset accordingly
-	asUINT numPtrs = 0;
-	int currOffset = -stackDelta;
-	if( offset > currOffset && calledFunc->GetObjectType() )
-	{
-		currOffset++;
-		if( currOffset > 0 )
-			numPtrs++;
-#if AS_PTR_SIZE == 2
-		// For 64bit platforms it is necessary to increment the currOffset by one more 
-		// DWORD since the stackDelta was counting the full 64bit size of the pointer
-		else if( stackDelta )
-			currOffset++;
-#endif
-	}
-	if( offset > currOffset && calledFunc->DoesReturnOnStack() )
-	{
-		currOffset++;
-		if( currOffset > 0 )
-			numPtrs++;
-#if AS_PTR_SIZE == 2
-		// For 64bit platforms it is necessary to increment the currOffset by one more 
-		// DWORD since the stackDelta was counting the full 64bit size of the pointer
-		else if( stackDelta )
-			currOffset++;
-#endif
-	}
-	for( asUINT p = 0; p < calledFunc->parameterTypes.GetLength(); p++ )
-	{
-		if( offset <= currOffset ) break;
-
-		if( !calledFunc->parameterTypes[p].IsPrimitive() ||
-			calledFunc->parameterTypes[p].IsReference() )
-		{
-			currOffset++;
-			if( currOffset > 0 )
-				numPtrs++;
-#if AS_PTR_SIZE == 2
-			// For 64bit platforms it is necessary to increment the currOffset by one more 
-			// DWORD since the stackDelta was counting the full 64bit size of the pointer
-			else if( stackDelta )
-				currOffset++;
-#endif
-
-			// The variable arg ? has an additiona 32bit integer with the typeid
-			if( calledFunc->parameterTypes[p].IsAnyType() )
-				currOffset += 1;
-		}
-		else
-		{
-			// Enums or built-in primitives are passed by value
-			asASSERT( calledFunc->parameterTypes[p].IsPrimitive() );
-			currOffset += calledFunc->parameterTypes[p].GetSizeOnStackDWords();
-		}
-	}
-
-	return offset - numPtrs * (1 - AS_PTR_SIZE);
-}
-
-int asCReader::FindTypeId(int idx)
-{
-	if( idx >= 0 && idx < (int)usedTypeIds.GetLength() )
-		return usedTypeIds[idx];
-	else
-	{
-		Error(TXT_INVALID_BYTECODE_d);
-		return 0;
-	}
-}
-
-asCTypeInfo *asCReader::FindType(int idx)
-{
-	if( idx < 0 || idx >= (int)usedTypes.GetLength() )
-	{
-		Error(TXT_INVALID_BYTECODE_d);
-		return 0;
-	}
-
-	return usedTypes[idx];
-}
-
-#ifndef AS_NO_COMPILER
-
-asCWriter::asCWriter(asCModule* _module, asIBinaryStream* _stream, asCScriptEngine* _engine, bool _stripDebug)
- : module(_module), stream(_stream), engine(_engine), stripDebugInfo(_stripDebug)
-{
-}
-
-void asCWriter::WriteData(const void *data, asUINT size)
-{
-	asASSERT(size == 1 || size == 2 || size == 4 || size == 8);
-#if defined(AS_BIG_ENDIAN)
-	for( asUINT n = 0; n < size; n++ )
-		stream->Write(((asBYTE*)data)+n, 1);
-#else
-	for( int n = size-1; n >= 0; n-- )
-		stream->Write(((asBYTE*)data)+n, 1);
-#endif
-}
-
-int asCWriter::Write() 
-{
-	TimeIt("asCWriter::Write");
-
-	asUINT i, count;
-
-	// Store everything in the same order that the builder parses scripts
-
-	// TODO: Should be possible to skip saving the enum values. They are usually not needed after the script is compiled anyway
-	// TODO: Should be possible to skip saving the typedefs. They are usually not needed after the script is compiled anyway
-	// TODO: Should be possible to skip saving constants. They are usually not needed after the script is compiled anyway
-	WriteData(&stripDebugInfo, sizeof(stripDebugInfo));
-
-	// Store enums
-	{
-		TimeIt("store enums");
-
-		count = (asUINT)module->enumTypes.GetLength();
-		WriteEncodedInt64(count);
-		for( i = 0; i < count; i++ )
-		{
-			WriteTypeDeclaration(module->enumTypes[i], 1);
-			WriteTypeDeclaration(module->enumTypes[i], 2);
-		}
-	}
-
-	// Store type declarations first
-	{
-		TimeIt("type declarations");
-
-		count = (asUINT)module->classTypes.GetLength();
-		WriteEncodedInt64(count);
-		for( i = 0; i < count; i++ )
-		{
-			// Store only the name of the class/interface types
-			WriteTypeDeclaration(module->classTypes[i], 1);
-		}
-	}
-
-	// Store func defs
-	{
-		TimeIt("func defs");
-
-		count = (asUINT)module->funcDefs.GetLength();
-		WriteEncodedInt64(count);
-		for( i = 0; i < count; i++ )
-			WriteFunction(module->funcDefs[i]->funcdef);
-	}
-
-	// Now store all interface methods
-	{
-		TimeIt("interface methods");
-
-		count = (asUINT)module->classTypes.GetLength();
-		for( i = 0; i < count; i++ )
-		{
-			if( module->classTypes[i]->IsInterface() )
-				WriteTypeDeclaration(module->classTypes[i], 2);
-		}
-	}
-
-	// Then store the class methods and behaviours
-	{
-		TimeIt("class methods and behaviours");
-
-		for( i = 0; i < count; ++i )
-		{
-			if( !module->classTypes[i]->IsInterface() )
-				WriteTypeDeclaration(module->classTypes[i], 2);
-		}
-	}
-
-	// Then store the class properties
-	{
-		TimeIt("class properties");
-
-		for( i = 0; i < count; ++i )
-		{
-			if( !module->classTypes[i]->IsInterface() )
-				WriteTypeDeclaration(module->classTypes[i], 3);
-		}
-	}
-
-	// Store typedefs
-	{
-		TimeIt("type defs");
-
-		count = (asUINT)module->typeDefs.GetLength();
-		WriteEncodedInt64(count);
-		for( i = 0; i < count; i++ )
-		{
-			WriteTypeDeclaration(module->typeDefs[i], 1);
-			WriteTypeDeclaration(module->typeDefs[i], 2);
-		}
-	}
-
-	// scriptGlobals[]
-	{
-		TimeIt("script globals");
-
-		count = (asUINT)module->scriptGlobals.GetSize();
-		WriteEncodedInt64(count);
-		asCSymbolTable<asCGlobalProperty>::iterator it = module->scriptGlobals.List();
-		for( ; it; it++ )
-			WriteGlobalProperty(*it);
-	}
-
-	// scriptFunctions[]
-	{
-		TimeIt("scriptFunctions");
-
-		count = 0;
-		for( i = 0; i < module->scriptFunctions.GetLength(); i++ )
-			if( module->scriptFunctions[i]->objectType == 0 )
-				count++;
-		WriteEncodedInt64(count);
-		for( i = 0; i < module->scriptFunctions.GetLength(); ++i )
-			if( module->scriptFunctions[i]->objectType == 0 )
-				WriteFunction(module->scriptFunctions[i]);
-	}
-
-	// globalFunctions[]
-	{
-		TimeIt("globalFunctions");
-
-		count = (int)module->globalFunctions.GetSize();
-		asCSymbolTable<asCScriptFunction>::iterator funcIt = module->globalFunctions.List();
-		WriteEncodedInt64(count);
-		while( funcIt )
-		{
-			WriteFunction(*funcIt);
-			funcIt++;
-		}
-	}
-
-	// bindInformations[]
-	{
-		TimeIt("bindInformations");
-
-		count = (asUINT)module->bindInformations.GetLength();
-		WriteEncodedInt64(count);
-		for( i = 0; i < count; ++i )
-		{
-			WriteFunction(module->bindInformations[i]->importedFunctionSignature);
-			WriteString(&module->bindInformations[i]->importFromModule);
-		}
-	}
-
-	// usedTypes[]
-	{
-		TimeIt("usedTypes");
-
-		count = (asUINT)usedTypes.GetLength();
-		WriteEncodedInt64(count);
-		for( i = 0; i < count; ++i )
-			WriteTypeInfo(usedTypes[i]);
-	}
-
-	// usedTypeIds[]
-	WriteUsedTypeIds();
-
-	// usedFunctions[]
-	WriteUsedFunctions();
-
-	// usedGlobalProperties[]
-	WriteUsedGlobalProps();
-
-	// usedStringConstants[]
-	WriteUsedStringConstants();
-
-	// usedObjectProperties[]
-	WriteUsedObjectProps();
-
-	return asSUCCESS;
-}
-
-int asCWriter::FindStringConstantIndex(int id)
-{
-	asSMapNode<int,int> *cursor = 0;
-	if (stringIdToIndexMap.MoveTo(&cursor, id))
-		return cursor->value;
-
-	usedStringConstants.PushLast(id);
-	int index = int(usedStringConstants.GetLength() - 1);
-	stringIdToIndexMap.Insert(id, index);
-	return index;
-}
-
-void asCWriter::WriteUsedStringConstants()
-{
-	TimeIt("asCWriter::WriteUsedStringConstants");
-
-	asUINT count = (asUINT)usedStringConstants.GetLength();
-	WriteEncodedInt64(count);
-	for( asUINT i = 0; i < count; ++i )
-		WriteString(engine->stringConstants[usedStringConstants[i]]);
-}
-
-void asCWriter::WriteUsedFunctions()
-{
-	TimeIt("asCWriter::WriteUsedFunctions");
-
-	asUINT count = (asUINT)usedFunctions.GetLength();
-	WriteEncodedInt64(count);
-
-	for( asUINT n = 0; n < usedFunctions.GetLength(); n++ )
-	{
-		char c;
-
-		// Write enough data to be able to uniquely identify the function upon load
-
-		if( usedFunctions[n] )
-		{
-			// Is the function from the module or the application?
-			c = usedFunctions[n]->module ? 'm' : 'a';
-			WriteData(&c, 1);
-			WriteFunctionSignature(usedFunctions[n]);
-		}
-		else
-		{
-			// null function pointer
-			c = 'n'; 
-			WriteData(&c, 1);
-		}
-	}
-}
-
-void asCWriter::WriteFunctionSignature(asCScriptFunction *func)
-{
-	asUINT i, count;
-
-	WriteString(&func->name);
-	if( func->name == DELEGATE_FACTORY )
-	{
-		// It's not necessary to write anything else
-		return;
-	}
-
-	WriteDataType(&func->returnType);
-
-	count = (asUINT)func->parameterTypes.GetLength();
-	WriteEncodedInt64(count);
-	for( i = 0; i < count; ++i ) 
-		WriteDataType(&func->parameterTypes[i]);
-	
-	// Only write the inout flags if any of them are set
-	count = 0;
-	for( i = asUINT(func->inOutFlags.GetLength()); i > 0; i-- )
-		if( func->inOutFlags[i-1] != asTM_NONE )
-		{
-			count = i;
-			break;
-		}
-	WriteEncodedInt64(count);
-	for( i = 0; i < count; ++i )
-		WriteEncodedInt64(func->inOutFlags[i]);
-
-	WriteEncodedInt64(func->funcType);
-
-	// Write the default args, from last to first
-	count = 0;
-	for( i = (asUINT)func->defaultArgs.GetLength(); i-- > 0; )
-		if( func->defaultArgs[i] )
-			count++;
-	WriteEncodedInt64(count);
-	for( i = (asUINT)func->defaultArgs.GetLength(); i-- > 0; )
-		if( func->defaultArgs[i] )
-			WriteString(func->defaultArgs[i]);
-
-	WriteTypeInfo(func->objectType);
-
-	if( func->objectType )
-	{
-		asBYTE b = 0;
-		b += func->isReadOnly ? 1 : 0;
-		b += func->isPrivate  ? 2 : 0;
-		b += func->isProtected ? 4 : 0;
-		WriteData(&b, 1);
-	}
-	else
-	{
-		if (func->funcType == asFUNC_FUNCDEF)
-		{
-			if (func->nameSpace)
-			{
-				// This funcdef was declared as global entity
-				asBYTE b = 'n';
-				WriteData(&b, 1);
-				WriteString(&func->nameSpace->name);
-			}
-			else
-			{
-				// This funcdef was declared as class member
-				asBYTE b = 'o';
-				WriteData(&b, 1);
-				WriteTypeInfo(func->funcdefType->parentClass);
-			}
-		}
-		else
-			WriteString(&func->nameSpace->name);
-	}
-}
-
-void asCWriter::WriteFunction(asCScriptFunction* func) 
-{
-	char c;
-
-	// If there is no function, then store a null char
-	if( func == 0 )
-	{
-		c = '\0';
-		WriteData(&c, 1);
-		return;
-	}
-
-	// First check if the function has been saved already
-	for( asUINT f = 0; f < savedFunctions.GetLength(); f++ )
-	{
-		if( savedFunctions[f] == func )
-		{
-			c = 'r';
-			WriteData(&c, 1);
-			WriteEncodedInt64(f);
-			return;
-		}
-	}
-
-	// Keep a reference to the function in the list
-	savedFunctions.PushLast(func);
-
-	c = 'f';
-	WriteData(&c, 1);
-
-	asUINT i, count;
-
-	WriteFunctionSignature(func);
-
-	if( func->funcType == asFUNC_SCRIPT )
-	{
-		// Calculate the adjustment by position lookup table
-		CalculateAdjustmentByPos(func);
-
-		WriteByteCode(func);
-
-		asDWORD varSpace = AdjustStackPosition(func->scriptData->variableSpace);
-		WriteEncodedInt64(varSpace);
-
-		count = (asUINT)func->scriptData->objVariablePos.GetLength();
-		WriteEncodedInt64(count);
-		for( i = 0; i < count; ++i )
-		{
-			WriteTypeInfo(func->scriptData->objVariableTypes[i]);
-			WriteEncodedInt64(AdjustStackPosition(func->scriptData->objVariablePos[i]));
-		}
-		if( count > 0 )
-			WriteEncodedInt64(func->scriptData->objVariablesOnHeap);
-
-		WriteEncodedInt64((asUINT)func->scriptData->objVariableInfo.GetLength());
-		for( i = 0; i < func->scriptData->objVariableInfo.GetLength(); ++i )
-		{
-			// The program position must be adjusted to be in number of instructions
-			WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->objVariableInfo[i].programPos]);
-			WriteEncodedInt64(AdjustStackPosition(func->scriptData->objVariableInfo[i].variableOffset));
-			WriteEncodedInt64(func->scriptData->objVariableInfo[i].option);
-		}
-
-		// The program position (every even number) needs to be adjusted
-		// to be in number of instructions instead of DWORD offset
-		if( !stripDebugInfo )
-		{
-			asUINT length = (asUINT)func->scriptData->lineNumbers.GetLength();
-			WriteEncodedInt64(length);
-			for( i = 0; i < length; ++i )
-			{
-				if( (i & 1) == 0 )
-					WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->lineNumbers[i]]);
-				else
-					WriteEncodedInt64(func->scriptData->lineNumbers[i]);
-			}
-
-			// Write the array of script sections
-			length = (asUINT)func->scriptData->sectionIdxs.GetLength();
-			WriteEncodedInt64(length);
-			for( i = 0; i < length; ++i )
-			{
-				if( (i & 1) == 0 )
-					WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->sectionIdxs[i]]);
-				else
-				{
-					if( func->scriptData->sectionIdxs[i] >= 0 )
-						WriteString(engine->scriptSectionNames[func->scriptData->sectionIdxs[i]]);
-					else
-					{
-						c = 0;
-						WriteData(&c, 1);
-					}
-				}
-			}
-		}
-
-		// Write the variable information
-		if( !stripDebugInfo )
-		{
-			WriteEncodedInt64((asUINT)func->scriptData->variables.GetLength());
-			for( i = 0; i < func->scriptData->variables.GetLength(); i++ )
-			{
-				// The program position must be adjusted to be in number of instructions
-				WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->variables[i]->declaredAtProgramPos]);
-				// The stack position must be adjusted according to the pointer sizes
-				WriteEncodedInt64(AdjustStackPosition(func->scriptData->variables[i]->stackOffset));
-				WriteString(&func->scriptData->variables[i]->name);
-				WriteDataType(&func->scriptData->variables[i]->type);
-			}
-		}
-
-		char bits = 0;
-		bits += func->isShared ? 1 : 0;
-		bits += func->dontCleanUpOnException ? 2 : 0;
-		WriteData(&bits,1);
-
-		// Store script section name
-		if( !stripDebugInfo )
-		{
-			if( func->scriptData->scriptSectionIdx >= 0 )
-				WriteString(engine->scriptSectionNames[func->scriptData->scriptSectionIdx]);
-			else
-			{
-				c = 0;
-				WriteData(&c, 1);
-			}
-			WriteEncodedInt64(func->scriptData->declaredAt);
-		}
-
-		// Store the parameter names
-		if( !stripDebugInfo )
-		{
-			count = asUINT(func->parameterNames.GetLength());
-			WriteEncodedInt64(count);
-			for( asUINT n = 0; n < count; n++ )
-				WriteString(&func->parameterNames[n]);
-		}
-	}
-	else if( func->funcType == asFUNC_VIRTUAL || func->funcType == asFUNC_INTERFACE )
-	{
-		// TODO: Do we really need to store this? It can probably be reconstructed by the reader
-		WriteEncodedInt64(func->vfTableIdx);
-	}
-	else if( func->funcType == asFUNC_FUNCDEF )
-	{
-		char bits = 0;
-		bits += func->isShared ? 1 : 0;
-		WriteData(&bits,1);
-	}
-}
-
-void asCWriter::WriteTypeDeclaration(asCTypeInfo *type, int phase)
-{
-	if( phase == 1 )
-	{
-		// name
-		WriteString(&type->name);
-		// flags
-		WriteData(&type->flags, 4);
-
-		// size
-		// TODO: Do we really need to store this? The reader should be able to 
-		//       determine the correct size from the object type's flags
-		if( (type->flags & asOBJ_SCRIPT_OBJECT) && type->size > 0 )
-		{
-			// The size for script objects may vary from platform to platform so 
-			// only store 1 to diferentiate from interfaces that have size 0.
-			WriteEncodedInt64(1); 
-		}
-		else
-		{
-			// Enums, typedefs, and interfaces have fixed sizes independently
-			// of platform so it is safe to serialize the size directly.
-			WriteEncodedInt64(type->size);
-		}
-
-		// namespace
-		WriteString(&type->nameSpace->name);
-	}
-	else if( phase == 2 )
-	{
-		if(type->flags & asOBJ_ENUM )
-		{
-			// enumValues[]
-			asCEnumType *t = type->CastToEnumType();
-			int size = (int)t->enumValues.GetLength();
-			WriteEncodedInt64(size);
-
-			for( int n = 0; n < size; n++ )
-			{
-				WriteString(&t->enumValues[n]->name);
-				WriteData(&t->enumValues[n]->value, 4);
-			}
-		}
-		else if(type->flags & asOBJ_TYPEDEF )
-		{
-			asCTypedefType *td = type->CastToTypedefType();
-			eTokenType t = td->aliasForType.GetTokenType();
-			WriteEncodedInt64(t);
-		}
-		else
-		{
-			asCObjectType *t = type->CastToObjectType();
-			WriteTypeInfo(t->derivedFrom);
-
-			// interfaces[] / interfaceVFTOffsets[]
-			// TOOD: Is it really necessary to store the VFTOffsets? Can't the reader calculate those?
-			int size = (asUINT)t->interfaces.GetLength();
-			WriteEncodedInt64(size);
-			asUINT n;
-			asASSERT( t->interfaces.GetLength() == t->interfaceVFTOffsets.GetLength() );
-			for( n = 0; n < t->interfaces.GetLength(); n++ )
-			{
-				WriteTypeInfo(t->interfaces[n]);
-				WriteEncodedInt64(t->interfaceVFTOffsets[n]);
-			}
-
-			// behaviours
-			// TODO: Default behaviours should just be stored as a indicator  
-			//       to avoid storing the actual function object
-			if( !t->IsInterface() && type->flags != asOBJ_TYPEDEF && type->flags != asOBJ_ENUM )
-			{
-				WriteFunction(engine->scriptFunctions[t->beh.destruct]);
-				size = (int)t->beh.constructors.GetLength();
-				WriteEncodedInt64(size);
-				for( n = 0; n < t->beh.constructors.GetLength(); n++ )
-				{
-					WriteFunction(engine->scriptFunctions[t->beh.constructors[n]]);
-					WriteFunction(engine->scriptFunctions[t->beh.factories[n]]);
-				}
-			}
-
-			// methods[]
-			// TODO: Avoid storing inherited methods in interfaces, as the reader
-			//       can add those directly from the base interface
-			size = (int)t->methods.GetLength();
-			WriteEncodedInt64(size);
-			for( n = 0; n < t->methods.GetLength(); n++ )
-			{
-				WriteFunction(engine->scriptFunctions[t->methods[n]]);
-			}
-
-			// virtualFunctionTable[]
-			// TODO: Is it really necessary to store this? Can't it be easily rebuilt by the reader
-			size = (int)t->virtualFunctionTable.GetLength();
-			WriteEncodedInt64(size);
-			for( n = 0; n < (asUINT)size; n++ )
-			{
-				WriteFunction(t->virtualFunctionTable[n]);
-			}
-		}
-	}
-	else if( phase == 3 )
-	{
-		// properties[]
-		asCObjectType *t = type->CastToObjectType();
-
-		// This is only done for object types
-		asASSERT(t);
-
-		asUINT size = (asUINT)t->properties.GetLength();
-		WriteEncodedInt64(size);
-		for (asUINT n = 0; n < t->properties.GetLength(); n++)
-		{
-			WriteObjectProperty(t->properties[n]);
-		}
-	}
-}
-
-void asCWriter::WriteEncodedInt64(asINT64 i)
-{
-	asBYTE signBit = ( i & asINT64(1)<<63 ) ? 0x80 : 0;
-	if( signBit ) i = -i;
-
-	asBYTE b;
-	if( i < (1<<6) )
-	{
-		b = (asBYTE)(signBit + i); WriteData(&b, 1);
-	}
-	else if( i < (1<<13) )
-	{
-		b = asBYTE(0x40 + signBit + (i >> 8)); WriteData(&b, 1);
-		b = asBYTE(i & 0xFF);                  WriteData(&b, 1);
-	}
-	else if( i < (1<<20) )
-	{
-		b = asBYTE(0x60 + signBit + (i >> 16)); WriteData(&b, 1);
-		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
-		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
-	}
-	else if( i < (1<<27) )
-	{
-		b = asBYTE(0x70 + signBit + (i >> 24)); WriteData(&b, 1);
-		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
-		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
-	}
-	else if( i < (asINT64(1)<<34) )
-	{
-		b = asBYTE(0x78 + signBit + (i >> 32)); WriteData(&b, 1);
-		b = asBYTE((i >> 24) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
-		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
-	}
-	else if( i < (asINT64(1)<<41) )
-	{
-		b = asBYTE(0x7C + signBit + (i >> 40)); WriteData(&b, 1);
-		b = asBYTE((i >> 32) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 24) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
-		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
-	}
-	else if( i < (asINT64(1)<<48) )
-	{
-		b = asBYTE(0x7E + signBit + (i >> 48)); WriteData(&b, 1);
-		b = asBYTE((i >> 40) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 32) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 24) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
-		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
-		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
-	}
-	else 
-	{
-		b = asBYTE(0x7F + signBit);   WriteData(&b, 1);
-		b = asBYTE((i >> 56) & 0xFF); WriteData(&b, 1);
-		b = asBYTE((i >> 48) & 0xFF); WriteData(&b, 1);
-		b = asBYTE((i >> 40) & 0xFF); WriteData(&b, 1);
-		b = asBYTE((i >> 32) & 0xFF); WriteData(&b, 1);
-		b = asBYTE((i >> 24) & 0xFF); WriteData(&b, 1);
-		b = asBYTE((i >> 16) & 0xFF); WriteData(&b, 1);
-		b = asBYTE((i >> 8) & 0xFF);  WriteData(&b, 1);
-		b = asBYTE(i & 0xFF);         WriteData(&b, 1);
-	}
-}
-
-void asCWriter::WriteString(asCString* str) 
-{
-	// First check if the string hasn't been saved already
-	asSMapNode<asCStringPointer, int> *cursor = 0;
-	if (stringToIdMap.MoveTo(&cursor, asCStringPointer(str)))
-	{
-		// Save a reference to the existing string
-		// The lowest bit is set to 1 to indicate a reference
-		WriteEncodedInt64(cursor->value*2+1);
-		return;
-	}
-
-	// Save a new string
-	// The lowest bit is set to 0 to indicate a new string
-	asUINT len = (asUINT)str->GetLength();
-	WriteEncodedInt64(len*2);
-
-	if( len > 0 )
-	{
-		stream->Write(str->AddressOf(), (asUINT)len);
-
-		savedStrings.PushLast(*str);
-		stringToIdMap.Insert(asCStringPointer(str), int(savedStrings.GetLength()) - 1);
-	}
-}
-
-void asCWriter::WriteGlobalProperty(asCGlobalProperty* prop) 
-{
-	// TODO: We might be able to avoid storing the name and type of the global 
-	//       properties twice if we merge this with the WriteUsedGlobalProperties. 
-	WriteString(&prop->name);
-	WriteString(&prop->nameSpace->name);
-	WriteDataType(&prop->type);
-
-	// Store the initialization function
-	WriteFunction(prop->GetInitFunc());
-}
-
-void asCWriter::WriteObjectProperty(asCObjectProperty* prop) 
-{
-	WriteString(&prop->name);
-	WriteDataType(&prop->type);
-	int flags = 0;
-	if( prop->isPrivate ) flags |= 1;
-	if( prop->isProtected ) flags |= 2;
-	if( prop->isInherited ) flags |= 4;
-	WriteEncodedInt64(flags);
-}
-
-void asCWriter::WriteDataType(const asCDataType *dt) 
-{
-	// First check if the datatype has already been saved
-	for( asUINT n = 0; n < savedDataTypes.GetLength(); n++ )
-	{
-		if( *dt == savedDataTypes[n] )
-		{
-			WriteEncodedInt64(n+1);
-			return;
-		}
-	}
-
-	// Indicate a new type with a null byte
-	asUINT c = 0;
-	WriteEncodedInt64(c);
-
-	// Save the new datatype
-	savedDataTypes.PushLast(*dt);
-
-	int t = dt->GetTokenType();
-	WriteEncodedInt64(t);
-	if( t == ttIdentifier )
-		WriteTypeInfo(dt->GetTypeInfo());
-
-	// Endianess safe bitmask 
-	char bits = 0;
-	SAVE_TO_BIT(bits, dt->IsObjectHandle(), 0);
-	SAVE_TO_BIT(bits, dt->IsHandleToConst(), 1);
-	SAVE_TO_BIT(bits, dt->IsReference(), 2);
-	SAVE_TO_BIT(bits, dt->IsReadOnly(), 3);
-	WriteData(&bits, 1);
-}
-
-void asCWriter::WriteTypeInfo(asCTypeInfo* ti) 
-{
-	char ch;
-
-	if( ti )
-	{
-		// Check for template instances/specializations
-		asCObjectType *ot = ti->CastToObjectType();
-		if( ot && ot->templateSubTypes.GetLength() )
-		{
-			// Check for list pattern type or template type
-			if( ot->flags & asOBJ_LIST_PATTERN )
-			{
-				ch = 'l'; // list
-				WriteData(&ch, 1);
-				WriteTypeInfo(ot->templateSubTypes[0].GetTypeInfo());
-			}
-			else
-			{
-				ch = 'a'; // array
-				WriteData(&ch, 1);
-				WriteString(&ot->name);
-				WriteString(&ot->nameSpace->name);
-
-				WriteEncodedInt64(ot->templateSubTypes.GetLength());
-				for( asUINT n = 0; n < ot->templateSubTypes.GetLength(); n++ )
-				{
-					if( !ot->templateSubTypes[n].IsPrimitive() || ot->templateSubTypes[n].IsEnumType() )
-					{
-						ch = 's'; // sub type
-						WriteData(&ch, 1);
-						WriteDataType(&ot->templateSubTypes[n]);
-					}
-					else
-					{
-						ch = 't'; // token
-						WriteData(&ch, 1);
-						eTokenType t = ot->templateSubTypes[n].GetTokenType();
-						WriteEncodedInt64(t);
-					}
-				}
-			}
-		}
-		else if( ti->flags & asOBJ_TEMPLATE_SUBTYPE )
-		{
-			ch = 's'; // sub type
-			WriteData(&ch, 1);
-			WriteString(&ti->name);
-		}
-		else if( ti->nameSpace )
-		{
-			ch = 'o'; // object
-			WriteData(&ch, 1);
-			WriteString(&ti->name);
-			WriteString(&ti->nameSpace->name);
-		}
-		else
-		{
-			asASSERT(ti->flags & asOBJ_FUNCDEF);
-
-			ch = 'c'; // child type
-			WriteData(&ch, 1);
-			WriteString(&ti->name);
-			WriteTypeInfo(ti->CastToFuncdefType()->parentClass);
-		}
-	}
-	else
-	{
-		ch = '\0';
-		WriteData(&ch, 1);
-	}
-}
-
-void asCWriter::CalculateAdjustmentByPos(asCScriptFunction *func)
-{
-	// Adjust the offset of all negative variables (parameters) so all pointers will have a size of 1 dword
-	asUINT n;
-	asCArray<int> adjustments;
-	asUINT offset = 0;
-	if( func->objectType )
-	{
-		adjustments.PushLast(offset);
-		adjustments.PushLast(1-AS_PTR_SIZE);
-		offset += AS_PTR_SIZE;
-	}
-	if( func->DoesReturnOnStack() )
-	{
-		adjustments.PushLast(offset);
-		adjustments.PushLast(1-AS_PTR_SIZE);
-		offset += AS_PTR_SIZE;
-	}
-	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
-	{
-		if( !func->parameterTypes[n].IsPrimitive() ||
-			func->parameterTypes[n].IsReference() )
-		{
-			adjustments.PushLast(offset);
-			adjustments.PushLast(1-AS_PTR_SIZE);
-			offset += AS_PTR_SIZE;
-		}
-		else
-		{
-			asASSERT( func->parameterTypes[n].IsPrimitive() );
-			offset += func->parameterTypes[n].GetSizeOnStackDWords();
-		}
-	}
-
-	// Build look-up table with the adjustments for each stack position
-	adjustNegativeStackByPos.SetLength(offset);
-	memset(adjustNegativeStackByPos.AddressOf(), 0, adjustNegativeStackByPos.GetLength()*sizeof(int));
-	for( n = 0; n < adjustments.GetLength(); n+=2 )
-	{
-		int pos    = adjustments[n];
-		int adjust = adjustments[n+1];
-
-		for( asUINT i = pos+1; i < adjustNegativeStackByPos.GetLength(); i++ )
-			adjustNegativeStackByPos[i] += adjust;
-	}
-
-	// Adjust the offset of all positive variables so that all object types and handles have a size of 1 dword
-	// This is similar to how the adjustment is done in the asCReader::TranslateFunction, only the reverse
-	adjustments.SetLength(0);
-	for( n = 0; n < func->scriptData->objVariableTypes.GetLength(); n++ )
-	{
-		// Determine the size the variable currently occupies on the stack
-		int size = AS_PTR_SIZE;
-
-		// objVariableTypes is null if the variable type is a null pointer
-		if( func->scriptData->objVariableTypes[n] &&
-			(func->scriptData->objVariableTypes[n]->GetFlags() & asOBJ_VALUE) &&
-			n >= func->scriptData->objVariablesOnHeap )
-		{
-			size = func->scriptData->objVariableTypes[n]->GetSize();
-			if( size < 4 ) 
-				size = 1; 
-			else 
-				size /= 4;
-		}
-
-		// If larger than 1 dword, adjust the offsets accordingly
-		if (size > 1)
-		{
-			// How much needs to be adjusted?
-			adjustments.PushLast(func->scriptData->objVariablePos[n]);
-			adjustments.PushLast(-(size - 1));
-		}
-	}
-
-	// Build look-up table with the adjustments for each stack position
-	adjustStackByPos.SetLength(func->scriptData->stackNeeded);
-	memset(adjustStackByPos.AddressOf(), 0, adjustStackByPos.GetLength()*sizeof(int));
-	for( n = 0; n < adjustments.GetLength(); n+=2 )
-	{
-		int pos    = adjustments[n];
-		int adjust = adjustments[n+1];
-
-		for( asUINT i = pos; i < adjustStackByPos.GetLength(); i++ )
-			adjustStackByPos[i] += adjust;
-	}
-
-	// Compute the sequence number of each bytecode instruction in order to update the jump offsets
-	asUINT length = func->scriptData->byteCode.GetLength();
-	asDWORD *bc = func->scriptData->byteCode.AddressOf();
-	bytecodeNbrByPos.SetLength(length);
-	asUINT num;
-	for( offset = 0, num = 0; offset < length; )
-	{
-		bytecodeNbrByPos[offset] = num;
-		offset += asBCTypeSize[asBCInfo[*(asBYTE*)(bc+offset)].type];
-		num++;
-	}
-	// The last instruction is always a BC_RET. This make it possible to query 
-	// the number of instructions by checking the last entry in bytecodeNbrByPos
-	asASSERT(*(asBYTE*)(bc+length-1) == asBC_RET);
-}
-
-int asCWriter::AdjustStackPosition(int pos)
-{
-	if( pos >= (int)adjustStackByPos.GetLength() )
-	{
-		// This happens for example if the function only have temporary variables
-		// The adjustByPos can also be empty if the function doesn't have any variables at all, but receive a handle by parameter
-		if( adjustStackByPos.GetLength() > 0 )
-			pos += adjustStackByPos[adjustStackByPos.GetLength()-1];
-	}
-	else if( pos >= 0 )
-		pos += adjustStackByPos[pos];
-	else
-	{
-		asASSERT( -pos < (int)adjustNegativeStackByPos.GetLength() );
-		pos -= (short)adjustNegativeStackByPos[-pos];
-	}
-
-	return pos;
-}
-
-int asCWriter::AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos)
-{
-	// TODO: optimize: multiple instructions for the same function doesn't need to look for the function everytime
-	//                 the function can remember where it found the function and check if the programPos is still valid
-
-	// Get offset 0 doesn't need adjustment
-	if( offset == 0 ) return 0;
-
-	// Find out which function that will be called
-	asCScriptFunction *calledFunc = 0;
-	int stackDelta = 0;
-	for( asUINT n = programPos; n < func->scriptData->byteCode.GetLength(); )
-	{
-		asBYTE bc = *(asBYTE*)&func->scriptData->byteCode[n];
-		if( bc == asBC_CALL ||
-			bc == asBC_CALLSYS ||
-			bc == asBC_Thiscall1 ||
-			bc == asBC_CALLINTF )
-		{
-			// Find the function from the function id in bytecode
-			int funcId = asBC_INTARG(&func->scriptData->byteCode[n]);
-			calledFunc = engine->scriptFunctions[funcId];
-			break;
-		}
-		else if( bc == asBC_ALLOC )
-		{
-			// Find the function from the function id in the bytecode
-			int funcId = asBC_INTARG(&func->scriptData->byteCode[n+AS_PTR_SIZE]);
-			calledFunc = engine->scriptFunctions[funcId];
-			break;
-		}
-		else if( bc == asBC_CALLBND )
-		{
-			// Find the function from the engine's bind array
-			int funcId = asBC_INTARG(&func->scriptData->byteCode[n]);
-			calledFunc = engine->importedFunctions[funcId & ~FUNC_IMPORTED]->importedFunctionSignature;
-			break;
-		}
-		else if( bc == asBC_CallPtr )
-		{
-			int var = asBC_SWORDARG0(&func->scriptData->byteCode[n]);
-			asUINT v;
-			// Find the funcdef from the local variable
-			for( v = 0; v < func->scriptData->objVariablePos.GetLength(); v++ )
-			{
-				if( func->scriptData->objVariablePos[v] == var )
-				{
-					calledFunc = func->scriptData->objVariableTypes[v]->CastToFuncdefType()->funcdef;
-					break;
-				}
-			}
-			if( !calledFunc )
-			{
-				// Look in parameters
-				int paramPos = 0;
-				if( func->objectType )
-					paramPos -= AS_PTR_SIZE;
-				if( func->DoesReturnOnStack() )
-					paramPos -= AS_PTR_SIZE;
-				for( v = 0; v < func->parameterTypes.GetLength(); v++ )
-				{
-					if( var == paramPos )
-					{
-						calledFunc = func->parameterTypes[v].GetTypeInfo()->CastToFuncdefType()->funcdef;
-						break;
-					}
-					paramPos -= func->parameterTypes[v].GetSizeOnStackDWords();
-				}
-			}
-			break;
-		}
-		else if( bc == asBC_REFCPY ||
-				 bc == asBC_COPY )
-		{
-			// In this case we know there is only 1 pointer on the stack above
-			asASSERT( offset == AS_PTR_SIZE );
-			return offset + (1 - AS_PTR_SIZE);
-		}
-
-		// Keep track of the stack size between the 
-		// instruction that needs to be adjusted and the call
-		stackDelta += asBCInfo[bc].stackInc;
-
-		n += asBCTypeSize[asBCInfo[bc].type];
-	}
-
-	asASSERT( calledFunc );
-
-	// Count the number of pointers pushed on the stack above the 
-	// current offset, and then adjust the offset accordingly
-	asUINT numPtrs = 0;
-	int currOffset = -stackDelta;
-	if( offset > currOffset && calledFunc->GetObjectType() )
-	{
-		currOffset += AS_PTR_SIZE;
-		if( currOffset > 0 )
-			numPtrs++;
-	}
-	if( offset > currOffset && calledFunc->DoesReturnOnStack() )
-	{
-		currOffset += AS_PTR_SIZE;
-		if( currOffset > 0 )
-			numPtrs++;
-	}
-	for( asUINT p = 0; p < calledFunc->parameterTypes.GetLength(); p++ )
-	{
-		if( offset <= currOffset ) break;
-
-		if( !calledFunc->parameterTypes[p].IsPrimitive() ||
-			calledFunc->parameterTypes[p].IsReference() )
-		{
-			// objects and references are passed by pointer
-			currOffset += AS_PTR_SIZE;
-			if( currOffset > 0 )
-				numPtrs++;
-
-			// The variable arg ? has an additional 32bit int with the typeid
-			if( calledFunc->parameterTypes[p].IsAnyType() )
-				currOffset += 1;
-		}
-		else
-		{
-			// built-in primitives or enums are passed by value
-			asASSERT( calledFunc->parameterTypes[p].IsPrimitive() );
-			currOffset += calledFunc->parameterTypes[p].GetSizeOnStackDWords();
-		}
-	}
-
-	// The get offset must match one of the parameter offsets
-	asASSERT( offset == currOffset );
-	
-	return offset + numPtrs * (1 - AS_PTR_SIZE);
-}
-
-void asCWriter::WriteByteCode(asCScriptFunction *func)
-{
-	asDWORD *bc   = func->scriptData->byteCode.AddressOf();
-	size_t length = func->scriptData->byteCode.GetLength();
-
-	// The length cannot be stored, because it is platform dependent, 
-	// instead we store the number of instructions
-	asUINT count = bytecodeNbrByPos[bytecodeNbrByPos.GetLength()-1] + 1;
-	WriteEncodedInt64(count);
-
-	asDWORD *startBC = bc;
-	while( length )
-	{
-		asDWORD tmpBC[4]; // The biggest instructions take up 4 DWORDs
-		asDWORD c = *(asBYTE*)bc;
-
-		// Copy the instruction to a temp buffer so we can work on it before saving
-		memcpy(tmpBC, bc, asBCTypeSize[asBCInfo[c].type]*sizeof(asDWORD));
-
-		if( c == asBC_ALLOC ) // PTR_DW_ARG
-		{
-			// Translate the object type 
-			asCObjectType *ot = *(asCObjectType**)(tmpBC+1);
-			*(asPWORD*)(tmpBC+1) = FindTypeInfoIdx(ot);
-
-			// Translate the constructor func id, unless it is 0
-			if( *(int*)&tmpBC[1+AS_PTR_SIZE] != 0 )
-			{
-				// Increment 1 to the translated function id, as 0 will be reserved for no function
-				*(int*)&tmpBC[1+AS_PTR_SIZE] = 1+FindFunctionIndex(engine->scriptFunctions[*(int*)&tmpBC[1+AS_PTR_SIZE]]);
-			}
-		}
-		else if( c == asBC_REFCPY  || // PTR_ARG
-				 c == asBC_RefCpyV || // wW_PTR_ARG
-				 c == asBC_OBJTYPE )  // PTR_ARG
-		{
-			// Translate object type pointers into indices
-			*(asPWORD*)(tmpBC+1) = FindTypeInfoIdx(*(asCObjectType**)(tmpBC+1));
-		}
-		else if( c == asBC_JitEntry ) // PTR_ARG
-		{
-			// We don't store the JIT argument
-			*(asPWORD*)(tmpBC+1) = 0;
-		}
-		else if( c == asBC_TYPEID || // DW_ARG
-			     c == asBC_Cast )    // DW_ARG
-		{
-			// Translate type ids into indices
-			*(int*)(tmpBC+1) = FindTypeIdIdx(*(int*)(tmpBC+1));
-		}
-		else if( c == asBC_ADDSi ||      // W_DW_ARG
-			     c == asBC_LoadThisR )   // W_DW_ARG
-		{
-			// Translate property offsets into indices
-			*(((short*)tmpBC)+1) = (short)FindObjectPropIndex(*(((short*)tmpBC)+1), *(int*)(tmpBC+1));
-
-			// Translate type ids into indices
-			*(int*)(tmpBC+1) = FindTypeIdIdx(*(int*)(tmpBC+1));
-		}
-		else if( c == asBC_LoadRObjR ||    // rW_W_DW_ARG
-			     c == asBC_LoadVObjR )     // rW_W_DW_ARG
-		{
-			asCObjectType *ot = engine->GetObjectTypeFromTypeId(*(int*)(tmpBC+2));
-			if( ot->flags & asOBJ_LIST_PATTERN )
-			{
-				// List patterns have a different way of translating the offsets
-				SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-				*(((short*)tmpBC)+2) = (short)listAdj->AdjustOffset(*(((short*)tmpBC)+2), ot);
-			}
-			else
-			{
-				// Translate property offsets into indices
-				// TODO: optimize: Pass the object type directly to the method instead of the type id
-				*(((short*)tmpBC)+2) = (short)FindObjectPropIndex(*(((short*)tmpBC)+2), *(int*)(tmpBC+2));
-			}
-
-			// Translate type ids into indices
-			*(int*)(tmpBC+2) = FindTypeIdIdx(*(int*)(tmpBC+2));
-		}
-		else if( c == asBC_COPY )        // W_DW_ARG
-		{
-			// Translate type ids into indices
-			*(int*)(tmpBC+1) = FindTypeIdIdx(*(int*)(tmpBC+1));
-
-			// Update the WORDARG0 to 0, as this will be recalculated on the target platform
-			asBC_WORDARG0(tmpBC) = 0;
-		}
-		else if( c == asBC_RET ) // W_ARG
-		{
-			// Save with arg 0, as this will be recalculated on the target platform
-			asBC_WORDARG0(tmpBC) = 0;
-		}
-		else if( c == asBC_CALL ||     // DW_ARG
-				 c == asBC_CALLINTF || // DW_ARG
-				 c == asBC_CALLSYS ||  // DW_ARG
-				 c == asBC_Thiscall1 ) // DW_ARG
-		{
-			// Translate the function id
-			*(int*)(tmpBC+1) = FindFunctionIndex(engine->scriptFunctions[*(int*)(tmpBC+1)]);
-		}
-		else if( c == asBC_FuncPtr ) // PTR_ARG
-		{
-			// Translate the function pointer
-			*(asPWORD*)(tmpBC+1) = FindFunctionIndex(*(asCScriptFunction**)(tmpBC+1));
-		}
-		else if( c == asBC_STR ) // W_ARG
-		{
-			// Translate the string constant id
-			asWORD *arg = ((asWORD*)tmpBC)+1;
-			*arg = (asWORD)FindStringConstantIndex(*arg);
-		}
-		else if( c == asBC_CALLBND ) // DW_ARG
-		{
-			// Translate the function id
-			int funcId = tmpBC[1];
-			for( asUINT n = 0; n < module->bindInformations.GetLength(); n++ )
-				if( module->bindInformations[n]->importedFunctionSignature->id == funcId )
-				{
-					funcId = n;
-					break;
-				}
-
-			tmpBC[1] = funcId;
-		}
-		else if( c == asBC_PGA      || // PTR_ARG
-			     c == asBC_PshGPtr  || // PTR_ARG 
-			     c == asBC_LDG      || // PTR_ARG
-				 c == asBC_PshG4    || // PTR_ARG
-				 c == asBC_LdGRdR4  || // wW_PTR_ARG
-				 c == asBC_CpyGtoV4 || // wW_PTR_ARG
-				 c == asBC_CpyVtoG4 || // rW_PTR_ARG
-				 c == asBC_SetG4    )  // PTR_DW_ARG
-		{
-			// Translate global variable pointers into indices
-			*(asPWORD*)(tmpBC+1) = FindGlobalPropPtrIndex(*(void**)(tmpBC+1));
-		}
-		else if( c == asBC_JMP    ||	// DW_ARG
-			     c == asBC_JZ     ||
-				 c == asBC_JNZ    ||
-				 c == asBC_JLowZ  ||
-				 c == asBC_JLowNZ ||
-				 c == asBC_JS     ||
-				 c == asBC_JNS    ||
-				 c == asBC_JP     ||
-				 c == asBC_JNP    ) // The JMPP instruction doesn't need modification
-		{
-			// Get the DWORD offset from arg
-			int offset = *(int*)(tmpBC+1);
-
-			// Determine instruction number for next instruction and destination
-			int bcSeqNum = bytecodeNbrByPos[asUINT(bc - startBC)] + 1;
-			asDWORD *targetBC = bc + 2 + offset;
-			int targetBcSeqNum = bytecodeNbrByPos[asUINT(targetBC - startBC)];
-
-			// Set the offset in number of instructions
-			*(int*)(tmpBC+1) = targetBcSeqNum - bcSeqNum;
-		}
-		else if( c == asBC_GETOBJ ||    // W_ARG
-			     c == asBC_GETOBJREF ||
-				 c == asBC_GETREF )
-		{
-			// Adjust the offset according to the function call that comes after
-			asBC_WORDARG0(tmpBC) = (asWORD)AdjustGetOffset(asBC_WORDARG0(tmpBC), func, asDWORD(bc - startBC));
-		}
-		else if( c == asBC_AllocMem )
-		{
-			// It's not necessary to store the size of the list buffer, as it will be recalculated in the reader
-			asBC_DWORDARG(tmpBC) = 0;
-
-			// Determine the type of the list pattern from the variable
-			short var = asBC_WORDARG0(tmpBC);
-			asCObjectType *ot = func->GetTypeInfoOfLocalVar(var)->CastToObjectType();
-
-			// Create this helper object to adjust the offset of the elements accessed in the buffer
-			listAdjusters.PushLast(asNEW(SListAdjuster)(ot));
-		}
-		else if( c == asBC_FREE ) // wW_PTR_ARG
-		{
-			// Translate object type pointers into indices
-			asCObjectType *ot = *(asCObjectType**)(tmpBC+1);
-			*(asPWORD*)(tmpBC+1) = FindTypeInfoIdx(ot);
-
-			// Pop and destroy the list adjuster helper that was created with asBC_AllocMem
-			if( ot && (ot->flags & asOBJ_LIST_PATTERN) )
-			{
-				SListAdjuster *list = listAdjusters.PopLast();
-				asDELETE(list, SListAdjuster);
-			}
-		}
-		else if( c == asBC_SetListSize )
-		{
-			// Adjust the offset in the initialization list
-			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			tmpBC[1] = listAdj->AdjustOffset(tmpBC[1], listAdj->patternType);
-
-			// Tell the adjuster how many repeated values there are
-			listAdj->SetRepeatCount(tmpBC[2]);
-		}
-		else if( c == asBC_PshListElmnt )   // W_DW_ARG
-		{
-			// Adjust the offset in the initialization list
-			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			tmpBC[1] = listAdj->AdjustOffset(tmpBC[1], listAdj->patternType);
-		}
-		else if( c == asBC_SetListType )
-		{
-			// Adjust the offset in the initialization list
-			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
-			tmpBC[1] = listAdj->AdjustOffset(tmpBC[1], listAdj->patternType);
-
-			// Inform the adjuster of the type id of the next element
-			listAdj->SetNextType(tmpBC[2]);
-
-			// Translate the type id
-			tmpBC[2] = FindTypeIdIdx(tmpBC[2]);
-		}
-		// Adjust the variable offsets
-		switch( asBCInfo[c].type )
-		{
-		case asBCTYPE_wW_ARG:
-		case asBCTYPE_rW_DW_ARG:
-		case asBCTYPE_wW_QW_ARG:
-		case asBCTYPE_rW_ARG:
-		case asBCTYPE_wW_DW_ARG:
-		case asBCTYPE_wW_W_ARG:
-		case asBCTYPE_rW_QW_ARG:
-		case asBCTYPE_rW_W_DW_ARG:
-		case asBCTYPE_rW_DW_DW_ARG:
-			{
-				asBC_SWORDARG0(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG0(tmpBC));
-			}
-			break;
-
-		case asBCTYPE_wW_rW_ARG:
-		case asBCTYPE_wW_rW_DW_ARG:
-		case asBCTYPE_rW_rW_ARG:
-			{
-				asBC_SWORDARG0(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG0(tmpBC));
-				asBC_SWORDARG1(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG1(tmpBC));
-			}
-			break;
-
-		case asBCTYPE_wW_rW_rW_ARG:
-			{
-				asBC_SWORDARG0(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG0(tmpBC));
-				asBC_SWORDARG1(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG1(tmpBC));
-				asBC_SWORDARG2(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG2(tmpBC));
-			}
-			break;
-
-		default:
-			// The other types don't treat variables so won't be modified
-			break;
-		}
-
-		// TODO: bytecode: Must make sure that floats and doubles are always stored the same way regardless of platform. 
-		//                 Some platforms may not use the IEEE 754 standard, in which case it is necessary to encode the values
-		
-		// Now store the instruction in the smallest possible way
-		switch( asBCInfo[c].type )
-		{
-		case asBCTYPE_NO_ARG:
-			{
-				// Just write 1 byte
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-			}
-			break;
-		case asBCTYPE_W_ARG:
-		case asBCTYPE_wW_ARG:
-		case asBCTYPE_rW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-				
-				// Write the argument
-				short w = *(((short*)tmpBC)+1);
-				WriteEncodedInt64(w);
-			}
-			break;
-		case asBCTYPE_rW_DW_ARG:
-		case asBCTYPE_wW_DW_ARG:
-		case asBCTYPE_W_DW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the word argument
-				short w = *(((short*)tmpBC)+1);
-				WriteEncodedInt64(w);
-
-				// Write the dword argument
-				WriteEncodedInt64((int)tmpBC[1]);
-			}
-			break;
-		case asBCTYPE_DW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the argument
-				WriteEncodedInt64((int)tmpBC[1]);
-			}
-			break;
-		case asBCTYPE_DW_DW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the dword argument
-				WriteEncodedInt64((int)tmpBC[1]);
-
-				// Write the dword argument
-				WriteEncodedInt64((int)tmpBC[2]);
-			}
-			break;
-		case asBCTYPE_wW_rW_rW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the first argument
-				short w = *(((short*)tmpBC)+1);
-				WriteEncodedInt64(w);
-
-				// Write the second argument
-				w = *(((short*)tmpBC)+2);
-				WriteEncodedInt64(w);
-
-				// Write the third argument
-				w = *(((short*)tmpBC)+3);
-				WriteEncodedInt64(w);
-			}
-			break;
-		case asBCTYPE_wW_rW_ARG:
-		case asBCTYPE_rW_rW_ARG:
-		case asBCTYPE_wW_W_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the first argument
-				short w = *(((short*)tmpBC)+1);
-				WriteEncodedInt64(w);
-
-				// Write the second argument
-				w = *(((short*)tmpBC)+2);
-				WriteEncodedInt64(w);
-			}
-			break;
-		case asBCTYPE_wW_rW_DW_ARG:
-		case asBCTYPE_rW_W_DW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the first argument
-				short w = *(((short*)tmpBC)+1);
-				WriteEncodedInt64(w);
-
-				// Write the second argument
-				w = *(((short*)tmpBC)+2);
-				WriteEncodedInt64(w);
-
-				// Write the third argument
-				int dw = tmpBC[2];
-				WriteEncodedInt64(dw);
-			}
-			break;
-		case asBCTYPE_QW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the argument
-				asQWORD qw = *(asQWORD*)&tmpBC[1];
-				WriteEncodedInt64(qw);
-			}
-			break;
-		case asBCTYPE_QW_DW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the argument
-				asQWORD qw = *(asQWORD*)&tmpBC[1];
-				WriteEncodedInt64(qw);
-
-				// Write the second argument
-				int dw = tmpBC[3];
-				WriteEncodedInt64(dw);
-			}
-			break;
-		case asBCTYPE_rW_QW_ARG:
-		case asBCTYPE_wW_QW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the first argument
-				short w = *(((short*)tmpBC)+1);
-				WriteEncodedInt64(w);
-
-				// Write the argument
-				asQWORD qw = *(asQWORD*)&tmpBC[1];
-				WriteEncodedInt64(qw);
-			}
-			break;
-		case asBCTYPE_rW_DW_DW_ARG:
-			{
-				// Write the instruction code
-				asBYTE b = (asBYTE)c;
-				WriteData(&b, 1);
-
-				// Write the short argument
-				short w = *(((short*)tmpBC)+1);
-				WriteEncodedInt64(w);
-
-				// Write the dword argument
-				WriteEncodedInt64((int)tmpBC[1]);
-
-				// Write the dword argument
-				WriteEncodedInt64((int)tmpBC[2]);
-			}
-			break;
-		default:
-			{
-				// This should never happen
-				asASSERT(false);
-
-				// Store the bc as is
-				for( int n = 0; n < asBCTypeSize[asBCInfo[c].type]; n++ )
-					WriteData(&tmpBC[n], 4);
-			}
-		}
-
-		// Move to the next instruction
-		bc += asBCTypeSize[asBCInfo[c].type];
-		length -= asBCTypeSize[asBCInfo[c].type];
-	}
-}
-
-asCWriter::SListAdjuster::SListAdjuster(asCObjectType *ot) : patternType(ot), repeatCount(0), entries(0), lastOffset(-1), nextOffset(0), nextTypeId(-1)
-{ 
-	asASSERT( ot && (ot->flags & asOBJ_LIST_PATTERN) ); 
-
-	// Find the first expected value in the list
-	asSListPatternNode *node = ot->engine->scriptFunctions[patternType->templateSubTypes[0].GetBehaviour()->listFactory]->listPattern;
-	asASSERT( node && node->type == asLPT_START );
-	patternNode = node->next;
-}
-
-int asCWriter::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatternType)
-{
-	// TODO: cleanup: The listPatternType parameter is not needed
-	asASSERT( patternType == listPatternType );
-	UNUSED_VAR(listPatternType);
-	
-	asASSERT( offset >= lastOffset );
-
-	// If it is the same offset being accessed again, just return the same adjusted value
-	if( offset == lastOffset )
-		return entries-1;
-
-	asASSERT( offset >= nextOffset );
-
-	// Update last offset for next call
-	lastOffset = offset;
-
-	// What is being expected at this position?
-	if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
-	{
-		// Don't move the patternNode yet because the caller must make a call to SetRepeatCount too
-		nextOffset = offset + 4;
-		return entries++;
-	}
-	else if( patternNode->type == asLPT_TYPE )
-	{
-		const asCDataType &dt = reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType;
-		if( dt.GetTokenType() == ttQuestion )
-		{
-			// The bytecode need to inform the type that will 
-			// come next and then adjust that position too before 
-			// we can move to the next node
-			if( nextTypeId != -1 )
-			{
-				nextOffset = offset + 4;
-
-				if( repeatCount > 0 )
-					repeatCount--;
-
-				// Only move the patternNode if we're not expecting any more repeated entries
-				if( repeatCount == 0 )
-					patternNode = patternNode->next;
-
-				nextTypeId = -1;
-			}
-		}
-		else 
-		{
-			if( repeatCount > 0 )
-			{
-				// Was any value skipped?
-				asUINT size;
-				if( dt.IsObjectHandle() || (dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_REF)) )
-					size = AS_PTR_SIZE*4;
-				else
-					size = dt.GetSizeInMemoryBytes();
-
-				int count = 0;
-				while( nextOffset <= offset )
-				{
-					count++;
-					nextOffset += size;
-
-					// Align the offset on 4 byte boundaries
-					if( size >= 4 && (nextOffset & 0x3) )
-						nextOffset += 4 - (nextOffset & 0x3);
-				}
-
-				if( --count > 0 )
-				{
-					// Skip these values
-					repeatCount -= count;
-					entries += count;
-				}
-
-				nextOffset = offset + size;
-				repeatCount--;
-			}
-
-			// Only move the patternNode if we're not expecting any more repeated entries
-			if( repeatCount == 0 )
-				patternNode = patternNode->next;
-		}
-
-		return entries++;
-	}
-	else if( patternNode->type == asLPT_START )
-	{
-		if( repeatCount > 0 )
-			repeatCount--;
-		SInfo info = {repeatCount, patternNode};
-		stack.PushLast(info);
-
-		repeatCount = 0;
-		patternNode = patternNode->next;
-
-		lastOffset--;
-		return AdjustOffset(offset, listPatternType);
-	}
-	else if( patternNode->type == asLPT_END )
-	{
-		SInfo info = stack.PopLast();
-		repeatCount = info.repeatCount;
-		if( repeatCount )
-			patternNode = info.startNode;
-		else
-			patternNode = patternNode->next;
-
-		lastOffset--;
-		return AdjustOffset(offset, listPatternType);
-	}
-	else
-	{
-		// Something is wrong with the pattern list declaration
-		asASSERT( false );
-	}
-
-	return 0;
-}
-
-void asCWriter::SListAdjuster::SetRepeatCount(asUINT rc)
-{
-	// Make sure the list is expecting a repeat at this location
-	asASSERT( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME );
-
-	// Now move to the next patternNode
-	patternNode = patternNode->next;
-
-	repeatCount = rc;
-}
-
-void asCWriter::SListAdjuster::SetNextType(int typeId)
-{
-	// Make sure the list is expecting a type at this location
-	asASSERT( patternNode->type == asLPT_TYPE && 
-	          reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType.GetTokenType() == ttQuestion );
-
-	// Inform the type id for the next adjustment 
-	nextTypeId = typeId;
-}
-
-void asCWriter::WriteUsedTypeIds()
-{
-	TimeIt("asCWriter::WriteUsedTypeIds");
-
-	asUINT count = (asUINT)usedTypeIds.GetLength();
-	WriteEncodedInt64(count);
-	for( asUINT n = 0; n < count; n++ )
-	{
-		asCDataType dt = engine->GetDataTypeFromTypeId(usedTypeIds[n]);
-		WriteDataType(&dt);
-	}
-}
-
-int asCWriter::FindGlobalPropPtrIndex(void *ptr)
-{
-	int i = usedGlobalProperties.IndexOf(ptr);
-	if( i >= 0 ) return i;
-
-	usedGlobalProperties.PushLast(ptr);
-	return (int)usedGlobalProperties.GetLength()-1;
-}
-
-void asCWriter::WriteUsedGlobalProps()
-{
-	TimeIt("asCWriter::WriteUsedGlobalProps");
-	
-	int c = (int)usedGlobalProperties.GetLength();
-	WriteEncodedInt64(c);
-
-	for( int n = 0; n < c; n++ )
-	{
-		asPWORD *p = (asPWORD*)usedGlobalProperties[n];
-		
-		// Find the property descriptor from the address
-		asCGlobalProperty *prop = 0;
-		asSMapNode<void*, asCGlobalProperty*> *cursor;
-		if( engine->varAddressMap.MoveTo(&cursor, p) )
-		{
-			prop = engine->varAddressMap.GetValue(cursor);
-		}
-
-		asASSERT(prop);
-
-		// Store the name and type of the property so we can find it again on loading
-		WriteString(&prop->name);
-		WriteString(&prop->nameSpace->name);
-		WriteDataType(&prop->type);
-
-		// Also store whether the property is a module property or a registered property
-		char moduleProp = 0;
-		if( prop->realAddress == 0 )
-			moduleProp = 1;
-		WriteData(&moduleProp, 1);
-	}
-}
-
-void asCWriter::WriteUsedObjectProps()
-{
-	TimeIt("asCWriter::WriteUsedObjectProps");
-
-	int c = (int)usedObjectProperties.GetLength();
-	WriteEncodedInt64(c);
-
-	for( asUINT n = 0; n < usedObjectProperties.GetLength(); n++ )
-	{
-		asCObjectType *objType = usedObjectProperties[n].objType;
-		WriteTypeInfo(objType);
-
-		// Find the property name
-		for( asUINT p = 0; p < objType->properties.GetLength(); p++ )
-		{
-			if( objType->properties[p]->byteOffset == usedObjectProperties[n].offset )
-			{
-				WriteString(&objType->properties[p]->name);
-				break;
-			}
-		}
-	}
-}
-
-int asCWriter::FindObjectPropIndex(short offset, int typeId)
-{
-	asCObjectType *objType = engine->GetObjectTypeFromTypeId(typeId);
-	for( asUINT n = 0; n < usedObjectProperties.GetLength(); n++ )
-	{
-		if( usedObjectProperties[n].objType == objType &&
-			usedObjectProperties[n].offset  == offset )
-			return n;
-	}
-
-	SObjProp prop = {objType, offset};
-	usedObjectProperties.PushLast(prop);
-	return (int)usedObjectProperties.GetLength() - 1;
-}
-
-int asCWriter::FindFunctionIndex(asCScriptFunction *func)
-{
-	for( asUINT n = 0; n < usedFunctions.GetLength(); n++ )
-	{
-		if( usedFunctions[n] == func )
-			return n;
-	}
-
-	usedFunctions.PushLast(func);
-	return (int)usedFunctions.GetLength() - 1;
-}
-
-int asCWriter::FindTypeIdIdx(int typeId)
-{
-	asUINT n;
-	for( n = 0; n < usedTypeIds.GetLength(); n++ )
-	{
-		if( usedTypeIds[n] == typeId )
-			return n;
-	}
-
-	usedTypeIds.PushLast(typeId);
-	return (int)usedTypeIds.GetLength() - 1;
-}
-
-int asCWriter::FindTypeInfoIdx(asCTypeInfo *obj)
-{
-	asUINT n;
-	for( n = 0; n < usedTypes.GetLength(); n++ )
-	{
-		if( usedTypes[n] == obj )
-			return n;
-	}
-
-	usedTypes.PushLast(obj);
-	return (int)usedTypes.GetLength() - 1;
-}
-
-#endif // AS_NO_COMPILER
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_restore.cpp
+//
+// Functions for saving and restoring module bytecode
+// asCRestore was originally written by Dennis Bollyn, dennis@gyrbo.be
+
+#include "as_config.h"
+#include "as_restore.h"
+#include "as_bytecode.h"
+#include "as_scriptobject.h"
+#include "as_texts.h"
+#include "as_debug.h"
+
+BEGIN_AS_NAMESPACE
+
+// Macros for doing endianess agnostic bitmask serialization
+#define SAVE_TO_BIT(dst, val, bit) ((dst) |= ((val) << (bit)))
+#define LOAD_FROM_BIT(dst, val, bit) ((dst) = ((val) >> (bit)) & 1)
+
+asCReader::asCReader(asCModule* _module, asIBinaryStream* _stream, asCScriptEngine* _engine)
+ : module(_module), stream(_stream), engine(_engine)
+{
+	error = false;
+	bytesRead = 0;
+}
+
+int asCReader::ReadData(void *data, asUINT size)
+{
+	asASSERT(size == 1 || size == 2 || size == 4 || size == 8);
+	int ret = 0;
+#if defined(AS_BIG_ENDIAN)
+	for( asUINT n = 0; ret >= 0 && n < size; n++ )
+		ret = stream->Read(((asBYTE*)data)+n, 1);
+#else
+	for( int n = size-1; ret >= 0 && n >= 0; n-- )
+		ret = stream->Read(((asBYTE*)data)+n, 1);
+#endif
+	if (ret < 0)
+		Error(TXT_UNEXPECTED_END_OF_FILE);
+	bytesRead += size;
+	return ret;
+}
+
+int asCReader::Read(bool *wasDebugInfoStripped)
+{
+	TimeIt("asCReader::Read");
+
+	// Before starting the load, make sure that
+	// any existing resources have been freed
+	module->InternalReset();
+
+	// Call the inner method to do the actual loading
+	int r = ReadInner();
+	if( r < 0 )
+	{
+		// Something went wrong while loading the bytecode, so we need
+		// to clean-up whatever has been created during the process.
+
+		// Make sure none of the loaded functions attempt to release
+		// references that have not yet been increased
+		asUINT i;
+		for( i = 0; i < module->m_scriptFunctions.GetLength(); i++ )
+			if( !dontTranslate.MoveTo(0, module->m_scriptFunctions[i]) )
+				if( module->m_scriptFunctions[i]->scriptData )
+					module->m_scriptFunctions[i]->scriptData->byteCode.SetLength(0);
+
+		asCSymbolTable<asCGlobalProperty>::iterator it = module->m_scriptGlobals.List();
+		for( ; it; it++ )
+			if( (*it)->GetInitFunc() )
+				if( (*it)->GetInitFunc()->scriptData )
+					(*it)->GetInitFunc()->scriptData->byteCode.SetLength(0);
+
+		module->InternalReset();
+	}
+	else
+	{
+		// Init system functions properly
+		engine->PrepareEngine();
+
+		// Initialize the global variables (unless requested not to)
+		if( engine->ep.initGlobalVarsAfterBuild )
+			r = module->ResetGlobalVars(0);
+
+		if( wasDebugInfoStripped )
+			*wasDebugInfoStripped = noDebugInfo;
+	}
+
+	// Clean up the loaded string constants
+	for (asUINT n = 0; n < usedStringConstants.GetLength(); n++)
+		engine->stringFactory->ReleaseStringConstant(usedStringConstants[n]);
+	usedStringConstants.SetLength(0);
+
+	return r;
+}
+
+int asCReader::Error(const char *msg)
+{
+	// Don't write if it has already been reported an error earlier
+	if( !error )
+	{
+		asCString str;
+		str.Format(msg, bytesRead);
+		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		error = true;
+	}
+
+	return asERROR;
+}
+
+int asCReader::ReadInner()
+{
+	TimeIt("asCReader::ReadInner");
+
+	// This function will load each entity one by one from the stream.
+	// If any error occurs, it will return to the caller who is
+	// responsible for cleaning up the partially loaded entities.
+
+	engine->deferValidationOfTemplateTypes = true;
+
+	unsigned long i, count;
+	asCScriptFunction* func;
+
+	// Read the flag as 1 byte even on platforms with 4byte booleans
+	noDebugInfo = ReadEncodedUInt() ? VALUE_OF_BOOLEAN_TRUE : 0;
+
+	// Read enums
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	module->m_enumTypes.Allocate(count, false);
+	for( i = 0; i < count && !error; i++ )
+	{
+		asCEnumType *et = asNEW(asCEnumType)(engine);
+		if( et == 0 )
+		{
+			error = true;
+			return asOUT_OF_MEMORY;
+		}
+
+		bool isExternal = false;
+		ReadTypeDeclaration(et, 1, &isExternal);
+
+		// If the type is shared then we should use the original if it exists
+		bool sharedExists = false;
+		if( et->IsShared() )
+		{
+			for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
+			{
+				asCTypeInfo *t = engine->sharedScriptTypes[n];
+				if( t &&
+					t->IsShared() &&
+					t->name == et->name &&
+					t->nameSpace == et->nameSpace &&
+					(t->flags & asOBJ_ENUM) )
+				{
+					asDELETE(et, asCEnumType);
+					et = CastToEnumType(t);
+					sharedExists = true;
+					break;
+				}
+			}
+		}
+
+		if (isExternal && !sharedExists)
+		{
+			asCString msg;
+			msg.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, et->name.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
+			asDELETE(et, asCEnumType);
+			error = true;
+			return asERROR;
+		}
+
+		if( sharedExists )
+		{
+			existingShared.Insert(et, true);
+			et->AddRefInternal();
+		}
+		else
+		{
+			if( et->IsShared() )
+			{
+				engine->sharedScriptTypes.PushLast(et);
+				et->AddRefInternal();
+			}
+
+			// Set this module as the owner
+			et->module = module;
+		}
+		module->AddEnumType(et);
+
+		if (isExternal)
+			module->m_externalTypes.PushLast(et);
+
+		ReadTypeDeclaration(et, 2);
+	}
+
+	if( error ) return asERROR;
+
+	// classTypes[]
+	// First restore the structure names, then the properties
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	module->m_classTypes.Allocate(count, false);
+	for( i = 0; i < count && !error; ++i )
+	{
+		asCObjectType *ot = asNEW(asCObjectType)(engine);
+		if( ot == 0 )
+		{
+			error = true;
+			return asOUT_OF_MEMORY;
+		}
+
+		bool isExternal = false;
+		ReadTypeDeclaration(ot, 1, &isExternal);
+
+		// If the type is shared, then we should use the original if it exists
+		bool sharedExists = false;
+		if( ot->IsShared() )
+		{
+			for( asUINT n = 0; n < engine->sharedScriptTypes.GetLength(); n++ )
+			{
+				asCTypeInfo *ti = engine->sharedScriptTypes[n];
+				asCObjectType *t = CastToObjectType(ti);
+				if( t &&
+					t->IsShared() &&
+					t->name == ot->name &&
+					t->nameSpace == ot->nameSpace &&
+					t->IsInterface() == ot->IsInterface() )
+				{
+					asDELETE(ot, asCObjectType);
+					ot = CastToObjectType(t);
+					sharedExists = true;
+					break;
+				}
+			}
+		}
+
+		if (isExternal && !sharedExists)
+		{
+			asCString msg;
+			msg.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, ot->name.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
+			asDELETE(ot, asCObjectType);
+			error = true;
+			return asERROR;
+		}
+
+		if( sharedExists )
+		{
+			existingShared.Insert(ot, true);
+			ot->AddRefInternal();
+		}
+		else
+		{
+			if( ot->IsShared() )
+			{
+				engine->sharedScriptTypes.PushLast(ot);
+				ot->AddRefInternal();
+			}
+
+			// Set this module as the owner
+			ot->module = module;
+		}
+		module->AddClassType(ot);
+
+		if (isExternal)
+			module->m_externalTypes.PushLast(ot);
+	}
+
+	if( error ) return asERROR;
+
+	// Read func defs
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	module->m_funcDefs.Allocate(count, false);
+	for( i = 0; i < count && !error; i++ )
+	{
+		bool isNew, isExternal;
+		asCScriptFunction *funcDef = ReadFunction(isNew, false, true, true, &isExternal);
+		if(funcDef)
+		{
+			funcDef->module = module;
+
+			asCFuncdefType *fdt = funcDef->funcdefType;
+			fdt->module = module;
+
+			module->AddFuncDef(fdt);
+			engine->funcDefs.PushLast(fdt);
+
+			// TODO: clean up: This is also done by the builder. It should probably be moved to a method in the module
+			// Check if there is another identical funcdef from another module and if so reuse that instead
+			if(funcDef->IsShared())
+			{
+				for( asUINT n = 0; n < engine->funcDefs.GetLength(); n++ )
+				{
+					asCFuncdefType *f2 = engine->funcDefs[n];
+					if( f2 == 0 || fdt == f2 )
+						continue;
+
+					if( !f2->funcdef->IsShared() )
+						continue;
+
+					if( f2->name == fdt->name &&
+						f2->nameSpace == fdt->nameSpace &&
+						f2->parentClass == fdt->parentClass &&
+						f2->funcdef->IsSignatureExceptNameEqual(funcDef) )
+					{
+						// Replace our funcdef for the existing one
+						module->ReplaceFuncDef(fdt, f2);
+						f2->AddRefInternal();
+
+						if (isExternal)
+							module->m_externalTypes.PushLast(f2);
+
+						engine->funcDefs.RemoveValue(fdt);
+
+						savedFunctions[savedFunctions.IndexOf(funcDef)] = f2->funcdef;
+
+						if (fdt->parentClass)
+						{
+							// The real funcdef should already be in the object
+							asASSERT(fdt->parentClass->childFuncDefs.IndexOf(f2) >= 0);
+
+							fdt->parentClass = 0;
+						}
+
+						fdt->ReleaseInternal();
+						funcDef = 0;
+						break;
+					}
+				}
+			}
+
+			// Add the funcdef to the parentClass if this is a child funcdef
+			if (funcDef && fdt->parentClass)
+				fdt->parentClass->childFuncDefs.PushLast(fdt);
+
+			// Check if an external shared funcdef was really found
+			if (isExternal && funcDef)
+			{
+				asCString msg;
+				msg.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, funcDef->name.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
+				error = true;
+				return asERROR;
+			}
+		}
+		else
+			Error(TXT_INVALID_BYTECODE_d);
+	}
+
+	// Read interface methods
+	for( i = 0; i < module->m_classTypes.GetLength() && !error; i++ )
+	{
+		if( module->m_classTypes[i]->IsInterface() )
+			ReadTypeDeclaration(module->m_classTypes[i], 2);
+	}
+
+	// Read class methods and behaviours
+	for( i = 0; i < module->m_classTypes.GetLength() && !error; ++i )
+	{
+		if( !module->m_classTypes[i]->IsInterface() )
+			ReadTypeDeclaration(module->m_classTypes[i], 2);
+	}
+
+	// Read class properties
+	for( i = 0; i < module->m_classTypes.GetLength() && !error; ++i )
+	{
+		if( !module->m_classTypes[i]->IsInterface() )
+			ReadTypeDeclaration(module->m_classTypes[i], 3);
+	}
+
+	if( error ) return asERROR;
+
+	// Read typedefs
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	module->m_typeDefs.Allocate(count, false);
+	for( i = 0; i < count && !error; i++ )
+	{
+		asCTypedefType *td = asNEW(asCTypedefType)(engine);
+		if( td == 0 )
+		{
+			error = true;
+			return asOUT_OF_MEMORY;
+		}
+
+		bool isExternal = false;
+		ReadTypeDeclaration(td, 1, &isExternal);
+		td->module = module;
+		module->AddTypeDef(td);
+		ReadTypeDeclaration(td, 2);
+	}
+
+	if( error ) return asERROR;
+
+	// scriptGlobals[]
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	if( count && engine->ep.disallowGlobalVars )
+	{
+		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_GLOBAL_VARS_NOT_ALLOWED);
+		Error(TXT_INVALID_BYTECODE_d);
+	}
+	module->m_scriptGlobals.Allocate(count, false);
+	for( i = 0; i < count && !error; ++i )
+	{
+		ReadGlobalProperty();
+	}
+
+	// scriptFunctions[]
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	for( i = 0; i < count && !error; ++i )
+	{
+		size_t len = module->m_scriptFunctions.GetLength();
+		bool isNew, isExternal;
+		func = ReadFunction(isNew, true, true, true, &isExternal);
+		if( func == 0 )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			break;
+		}
+
+		// Is the function shared and was it created now?
+		if( func->IsShared() && len != module->m_scriptFunctions.GetLength() )
+		{
+			// If the function already existed in another module, then
+			// we need to replace it with previously existing one
+			for( asUINT n = 0; n < engine->scriptFunctions.GetLength() && !error; n++ )
+			{
+				asCScriptFunction *realFunc = engine->scriptFunctions[n];
+				if( realFunc &&
+					realFunc != func &&
+					realFunc->IsShared() &&
+					realFunc->nameSpace == func->nameSpace &&
+					realFunc->IsSignatureEqual(func) )
+				{
+					// Replace the recently created function with the pre-existing function
+					module->m_scriptFunctions[module->m_scriptFunctions.GetLength()-1] = realFunc;
+					realFunc->AddRefInternal();
+					savedFunctions[savedFunctions.GetLength()-1] = realFunc;
+					engine->RemoveScriptFunction(func);
+
+					// Insert the function in the dontTranslate array
+					dontTranslate.Insert(realFunc, true);
+
+					if (isExternal)
+						module->m_externalFunctions.PushLast(realFunc);
+
+					// Release the function, but make sure nothing else is released
+					func->id = 0;
+					if( func->scriptData )
+						func->scriptData->byteCode.SetLength(0);
+					func->ReleaseInternal();
+					func = 0;
+					break;
+				}
+			}
+		}
+
+		// Check if an external shared func was really found
+		if (isExternal && func)
+		{
+			asCString msg;
+			msg.Format(TXT_EXTERNAL_SHARED_s_NOT_FOUND, func->name.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
+			error = true;
+			return asERROR;
+		}
+	}
+
+	// globalFunctions[]
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	for( i = 0; i < count && !error; ++i )
+	{
+		bool isNew;
+		func = ReadFunction(isNew, false, false);
+		if( func )
+		{
+			// All the global functions were already loaded while loading the scriptFunctions, here
+			// we're just re-reading the references to know which goes into the globalFunctions array
+			asASSERT( !isNew );
+
+			module->m_globalFunctions.Put(func);
+		}
+		else
+			Error(TXT_INVALID_BYTECODE_d);
+	}
+
+	if( error ) return asERROR;
+
+	// bindInformations[]
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	module->m_bindInformations.Allocate(count, false);
+	for( i = 0; i < count && !error; ++i )
+	{
+		sBindInfo *info = asNEW(sBindInfo);
+		if( info == 0 )
+		{
+			error = true;
+			return asOUT_OF_MEMORY;
+		}
+
+		bool isNew;
+		info->importedFunctionSignature = ReadFunction(isNew, false, false);
+		if( info->importedFunctionSignature == 0 )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			break;
+		}
+
+		if( engine->freeImportedFunctionIdxs.GetLength() )
+		{
+			int id = engine->freeImportedFunctionIdxs.PopLast();
+			info->importedFunctionSignature->id = int(FUNC_IMPORTED + id);
+			engine->importedFunctions[id] = info;
+		}
+		else
+		{
+			info->importedFunctionSignature->id = int(FUNC_IMPORTED + engine->importedFunctions.GetLength());
+			engine->importedFunctions.PushLast(info);
+		}
+		ReadString(&info->importFromModule);
+		info->boundFunctionId = -1;
+		module->m_bindInformations.PushLast(info);
+	}
+
+	if( error ) return asERROR;
+
+	// usedTypes[]
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	usedTypes.Allocate(count, false);
+	for( i = 0; i < count && !error; ++i )
+	{
+		asCTypeInfo *ti = ReadTypeInfo();
+		usedTypes.PushLast(ti);
+	}
+
+	// usedTypeIds[]
+	if( !error )
+		ReadUsedTypeIds();
+
+	// usedFunctions[]
+	if( !error )
+		ReadUsedFunctions();
+
+	// usedGlobalProperties[]
+	if( !error )
+		ReadUsedGlobalProps();
+
+	// usedStringConstants[]
+	if( !error )
+		ReadUsedStringConstants();
+
+	// usedObjectProperties
+	if( !error )
+		ReadUsedObjectProps();
+
+	// Validate the template types
+	if( !error )
+	{
+		for( i = 0; i < usedTypes.GetLength() && !error; i++ )
+		{
+			asCObjectType *ot = CastToObjectType(usedTypes[i]);
+			if( !ot ||
+				!(ot->flags & asOBJ_TEMPLATE) ||
+				!ot->beh.templateCallback )
+				continue;
+
+			bool dontGarbageCollect = false;
+			asCScriptFunction *callback = engine->scriptFunctions[ot->beh.templateCallback];
+			if( !engine->CallGlobalFunctionRetBool(ot, &dontGarbageCollect, callback->sysFuncIntf, callback) )
+			{
+				asCString sub = ot->templateSubTypes[0].Format(ot->nameSpace);
+				for( asUINT n = 1; n < ot->templateSubTypes.GetLength(); n++ )
+				{
+					sub += ",";
+					sub += ot->templateSubTypes[n].Format(ot->nameSpace);
+				}
+				asCString str;
+				str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, ot->name.AddressOf(), sub.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+				Error(TXT_INVALID_BYTECODE_d);
+			}
+			else
+			{
+				// If the callback said this template instance won't be garbage collected then remove the flag
+				if( dontGarbageCollect )
+					ot->flags &= ~asOBJ_GC;
+			}
+		}
+	}
+	engine->deferValidationOfTemplateTypes = false;
+
+	if( error ) return asERROR;
+
+	// Update the loaded bytecode to point to the correct types, property offsets,
+	// function ids, etc. This is basically a linking stage.
+	for( i = 0; i < module->m_scriptFunctions.GetLength() && !error; i++ )
+		if( module->m_scriptFunctions[i]->funcType == asFUNC_SCRIPT )
+			TranslateFunction(module->m_scriptFunctions[i]);
+
+	asCSymbolTable<asCGlobalProperty>::iterator globIt = module->m_scriptGlobals.List();
+	while( globIt && !error )
+	{
+		asCScriptFunction *initFunc = (*globIt)->GetInitFunc();
+		if( initFunc )
+			TranslateFunction(initFunc);
+		globIt++;
+	}
+
+	if( error ) return asERROR;
+
+	// Add references for all functions (except for the pre-existing shared code)
+	for( i = 0; i < module->m_scriptFunctions.GetLength(); i++ )
+		if( !dontTranslate.MoveTo(0, module->m_scriptFunctions[i]) )
+			module->m_scriptFunctions[i]->AddReferences();
+
+	globIt = module->m_scriptGlobals.List();
+	while( globIt )
+	{
+		asCScriptFunction *initFunc = (*globIt)->GetInitFunc();
+		if( initFunc )
+			initFunc->AddReferences();
+		globIt++;
+	}
+	return error ? asERROR : asSUCCESS;
+}
+
+void asCReader::ReadUsedStringConstants()
+{
+	TimeIt("asCReader::ReadUsedStringConstants");
+
+	asCString str;
+
+	asUINT count;
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+
+	if (count > 0 && engine->stringFactory == 0)
+	{
+		Error(TXT_STRINGS_NOT_RECOGNIZED);
+		return;
+	}
+
+	usedStringConstants.Allocate(count, false);
+	for( asUINT i = 0; i < count; ++i )
+	{
+		ReadString(&str);
+		usedStringConstants.PushLast(const_cast<void*>(engine->stringFactory->GetStringConstant(str.AddressOf(), (asUINT)str.GetLength())));
+	}
+}
+
+void asCReader::ReadUsedFunctions()
+{
+	TimeIt("asCReader::ReadUsedFunctions");
+
+	asUINT count;
+	count = SanityCheck(ReadEncodedUInt(), 1000000);
+	usedFunctions.SetLength(count);
+	if( usedFunctions.GetLength() != count )
+	{
+		// Out of memory
+		error = true;
+		return;
+	}
+	memset(usedFunctions.AddressOf(), 0, sizeof(asCScriptFunction *)*count);
+
+	for( asUINT n = 0; n < usedFunctions.GetLength(); n++ )
+	{
+		char c;
+
+		// Read the data to be able to uniquely identify the function
+
+		// Is the function from the module or the application?
+		ReadData(&c, 1);
+
+		if( c == 'n' )
+		{
+			// Null function pointer
+			usedFunctions[n] = 0;
+		}
+		else
+		{
+			asCScriptFunction func(engine, c == 'm' ? module : 0, asFUNC_DUMMY);
+			asCObjectType *parentClass = 0;
+			ReadFunctionSignature(&func, &parentClass);
+			if( error )
+			{
+				func.funcType = asFUNC_DUMMY;
+				return;
+			}
+
+			// Find the correct function
+			if( c == 'm' )
+			{
+				if( func.funcType == asFUNC_IMPORTED )
+				{
+					for( asUINT i = 0; i < module->m_bindInformations.GetLength(); i++ )
+					{
+						asCScriptFunction *f = module->m_bindInformations[i]->importedFunctionSignature;
+						if( func.objectType != f->objectType ||
+							func.funcType != f->funcType ||
+							func.nameSpace != f->nameSpace ||
+							!func.IsSignatureEqual(f) )
+							continue;
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+				else if( func.funcType == asFUNC_FUNCDEF )
+				{
+					const asCArray<asCFuncdefType *> &funcs = module->m_funcDefs;
+					for( asUINT i = 0; i < funcs.GetLength(); i++ )
+					{
+						asCScriptFunction *f = funcs[i]->funcdef;
+						if( f == 0 ||
+							func.name != f->name ||
+							!func.IsSignatureExceptNameAndObjectTypeEqual(f) ||
+							funcs[i]->parentClass != parentClass )
+							continue;
+
+						asASSERT( f->objectType == 0 );
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+				else
+				{
+					// TODO: optimize: Global functions should be searched for in module->globalFunctions
+					// TODO: optimize: funcdefs should be searched for in module->funcDefs
+					// TODO: optimize: object methods should be searched for directly in the object type
+					for( asUINT i = 0; i < module->m_scriptFunctions.GetLength(); i++ )
+					{
+						asCScriptFunction *f = module->m_scriptFunctions[i];
+						if( func.objectType != f->objectType ||
+							func.funcType != f->funcType ||
+							func.nameSpace != f->nameSpace ||
+							!func.IsSignatureEqual(f) )
+							continue;
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+			}
+			else if (c == 's')
+			{
+				// Look for shared entities in the engine, as they may not necessarily be part
+				// of the scope of the module if they have been inhereted from other modules.
+				if (func.funcType == asFUNC_FUNCDEF)
+				{
+					const asCArray<asCFuncdefType *> &funcs = engine->funcDefs;
+					for (asUINT i = 0; i < funcs.GetLength(); i++)
+					{
+						asCScriptFunction *f = funcs[i]->funcdef;
+						if (f == 0 ||
+							func.name != f->name ||
+							!func.IsSignatureExceptNameAndObjectTypeEqual(f) ||
+							funcs[i]->parentClass != parentClass)
+							continue;
+
+						asASSERT(f->objectType == 0);
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+				else
+				{
+					for (asUINT i = 0; i < engine->scriptFunctions.GetLength(); i++)
+					{
+						asCScriptFunction *f = engine->scriptFunctions[i];
+						if (f == 0 || !f->IsShared() ||
+							func.objectType != f->objectType ||
+							func.funcType != f->funcType ||
+							func.nameSpace != f->nameSpace ||
+							!func.IsSignatureEqual(f))
+							continue;
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+			}
+			else
+			{
+				asASSERT(c == 'a');
+
+				if( func.funcType == asFUNC_FUNCDEF )
+				{
+					// This is a funcdef (registered or shared)
+					const asCArray<asCFuncdefType *> &funcs = engine->funcDefs;
+					for( asUINT i = 0; i < funcs.GetLength(); i++ )
+					{
+						asCScriptFunction *f = funcs[i]->funcdef;
+						if( f == 0 || func.name != f->name || !func.IsSignatureExceptNameAndObjectTypeEqual(f) || funcs[i]->parentClass != parentClass )
+							continue;
+
+						asASSERT( f->objectType == 0 );
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+				else if( func.name[0] == '$' )
+				{
+					// This is a special function
+
+					if( func.name == "$beh0" && func.objectType )
+					{
+						if (func.objectType->flags & asOBJ_TEMPLATE)
+						{
+							// Look for the matching constructor inside the factory stubs generated for the template instance
+							// See asCCompiler::PerformFunctionCall
+							for (asUINT i = 0; i < func.objectType->beh.constructors.GetLength(); i++)
+							{
+								asCScriptFunction *f = engine->scriptFunctions[func.objectType->beh.constructors[i]];
+								
+								// Find the id of the real constructor and not the generated stub
+								asUINT id = 0;
+								asDWORD *bc = f->scriptData->byteCode.AddressOf();
+								while (bc)
+								{
+									if ((*(asBYTE*)bc) == asBC_CALLSYS)
+									{
+										id = asBC_INTARG(bc);
+										break;
+									}
+									bc += asBCTypeSize[asBCInfo[*(asBYTE*)bc].type];
+								}
+
+								f = engine->scriptFunctions[id];
+								if (f == 0 ||
+									!func.IsSignatureExceptNameAndObjectTypeEqual(f))
+									continue;
+
+								usedFunctions[n] = f;
+								break;
+							}
+						}
+
+						if( usedFunctions[n] == 0 )
+						{
+							// This is a class constructor, so we can search directly in the object type's constructors
+							for (asUINT i = 0; i < func.objectType->beh.constructors.GetLength(); i++)
+							{
+								asCScriptFunction *f = engine->scriptFunctions[func.objectType->beh.constructors[i]];
+								if (f == 0 ||
+									!func.IsSignatureExceptNameAndObjectTypeEqual(f))
+									continue;
+
+								usedFunctions[n] = f;
+								break;
+							}
+						}
+					}
+					else if( func.name == "$fact" || func.name == "$beh3" )
+					{
+						// This is a factory (or stub), so look for the function in the return type's factories
+						asCObjectType *objType = CastToObjectType(func.returnType.GetTypeInfo());
+						if( objType )
+						{
+							for( asUINT i = 0; i < objType->beh.factories.GetLength(); i++ )
+							{
+								asCScriptFunction *f = engine->scriptFunctions[objType->beh.factories[i]];
+								if( f == 0 ||
+									!func.IsSignatureExceptNameAndObjectTypeEqual(f) )
+									continue;
+
+								usedFunctions[n] = f;
+								break;
+							}
+						}
+					}
+					else if( func.name == "$list" )
+					{
+						// listFactory is used for both factory is global and returns a handle and constructor that is a method
+						asCObjectType *objType = func.objectType ? func.objectType : CastToObjectType(func.returnType.GetTypeInfo());
+						if( objType )
+						{
+							asCScriptFunction *f = engine->scriptFunctions[objType->beh.listFactory];
+							if( f && func.IsSignatureExceptNameAndObjectTypeEqual(f) )
+								usedFunctions[n] = f;
+						}
+					}
+					else if( func.name == "$beh2" )
+					{
+						// This is a destructor, so check the object type's destructor
+						asCObjectType *objType = func.objectType;
+						if( objType )
+						{
+							asCScriptFunction *f = engine->scriptFunctions[objType->beh.destruct];
+							if( f && func.IsSignatureExceptNameAndObjectTypeEqual(f) )
+								usedFunctions[n] = f;
+						}
+					}
+					else if( func.name == "$dlgte" )
+					{
+						// This is the delegate factory
+						asCScriptFunction *f = engine->registeredGlobalFuncs.GetFirst(engine->nameSpaces[0], DELEGATE_FACTORY);
+						asASSERT( f && func.IsSignatureEqual(f) );
+						usedFunctions[n] = f;
+					}
+					else
+					{
+						// Must match one of the above cases
+						asASSERT(false);
+					}
+				}
+				else if( func.objectType == 0 )
+				{
+					// This is a global function
+					const asCArray<asUINT> &funcs = engine->registeredGlobalFuncs.GetIndexes(func.nameSpace, func.name);
+					for( asUINT i = 0; i < funcs.GetLength(); i++ )
+					{
+						asCScriptFunction *f = engine->registeredGlobalFuncs.Get(funcs[i]);
+						if( f == 0 ||
+							!func.IsSignatureExceptNameAndObjectTypeEqual(f) )
+							continue;
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+				else if( func.objectType )
+				{
+					// It is a class member, so we can search directly in the object type's members
+					// TODO: virtual function is different that implemented method
+					for( asUINT i = 0; i < func.objectType->methods.GetLength(); i++ )
+					{
+						asCScriptFunction *f = engine->scriptFunctions[func.objectType->methods[i]];
+						if( f == 0 ||
+							!func.IsSignatureEqual(f) )
+							continue;
+
+						usedFunctions[n] = f;
+						break;
+					}
+				}
+
+				if( usedFunctions[n] == 0 )
+				{
+					// TODO: clean up: This part of the code should never happen. All functions should
+					//                 be found in the above logic. The only valid reason to come here
+					//                 is if the bytecode is wrong and the function doesn't exist anyway.
+					//                 This loop is kept temporarily until we can be certain all scenarios
+					//                 are covered.
+					for( asUINT i = 0; i < engine->scriptFunctions.GetLength(); i++ )
+					{
+						asCScriptFunction *f = engine->scriptFunctions[i];
+						if( f == 0 ||
+							func.objectType != f->objectType ||
+							func.nameSpace != f->nameSpace ||
+							!func.IsSignatureEqual(f) )
+							continue;
+
+						usedFunctions[n] = f;
+						break;
+					}
+
+					// No function is expected to be found
+					asASSERT(usedFunctions[n] == 0);
+				}
+			}
+
+			// Set the type to dummy so it won't try to release the id
+			func.funcType = asFUNC_DUMMY;
+
+			if( usedFunctions[n] == 0 )
+			{
+				Error(TXT_INVALID_BYTECODE_d);
+				return;
+			}
+		}
+	}
+}
+
+void asCReader::ReadFunctionSignature(asCScriptFunction *func, asCObjectType **parentClass)
+{
+	asUINT i, count;
+	asCDataType dt;
+	int num;
+
+	ReadString(&func->name);
+	if( func->name == DELEGATE_FACTORY )
+	{
+		// It's not necessary to read anymore, everything is known
+		asCScriptFunction *f = engine->registeredGlobalFuncs.GetFirst(engine->nameSpaces[0], DELEGATE_FACTORY);
+		asASSERT( f );
+		func->returnType     = f->returnType;
+		func->parameterTypes = f->parameterTypes;
+		func->inOutFlags     = f->inOutFlags;
+		func->funcType       = f->funcType;
+		func->defaultArgs    = f->defaultArgs;
+		func->nameSpace      = f->nameSpace;
+		return;
+	}
+
+	ReadDataType(&func->returnType);
+
+	count = SanityCheck(ReadEncodedUInt(), 256);
+	func->parameterTypes.Allocate(count, false);
+	for( i = 0; i < count; ++i )
+	{
+		ReadDataType(&dt);
+		func->parameterTypes.PushLast(dt);
+	}
+
+	func->inOutFlags.SetLength(func->parameterTypes.GetLength());
+	if( func->inOutFlags.GetLength() != func->parameterTypes.GetLength() )
+	{
+		// Out of memory
+		error = true;
+		return;
+	}
+	memset(func->inOutFlags.AddressOf(), 0, sizeof(asETypeModifiers)*func->inOutFlags.GetLength());
+	if (func->parameterTypes.GetLength() > 0)
+	{
+		count = ReadEncodedUInt();
+		if (count > func->parameterTypes.GetLength())
+		{
+			// Cannot be more than the number of arguments
+			Error(TXT_INVALID_BYTECODE_d);
+			return;
+		}
+		for (i = 0; i < count; ++i)
+		{
+			num = ReadEncodedUInt();
+			func->inOutFlags[i] = static_cast<asETypeModifiers>(num);
+		}
+	}
+
+	func->funcType = (asEFuncType)ReadEncodedUInt();
+
+	// Read the default args, from last to first
+	if (func->parameterTypes.GetLength() > 0)
+	{
+		count = ReadEncodedUInt();
+		if (count > func->parameterTypes.GetLength())
+		{
+			// Cannot be more than the number of arguments
+			Error(TXT_INVALID_BYTECODE_d);
+			return;
+		}
+		if (count)
+		{
+			func->defaultArgs.SetLength(func->parameterTypes.GetLength());
+			if (func->defaultArgs.GetLength() != func->parameterTypes.GetLength())
+			{
+				// Out of memory
+				error = true;
+				return;
+			}
+			memset(func->defaultArgs.AddressOf(), 0, sizeof(asCString*)*func->defaultArgs.GetLength());
+			for (i = 0; i < count; i++)
+			{
+				asCString *str = asNEW(asCString);
+				if (str == 0)
+				{
+					// Out of memory
+					error = true;
+					return;
+				}
+				func->defaultArgs[func->defaultArgs.GetLength() - 1 - i] = str;
+				ReadString(str);
+			}
+		}
+	}
+
+	func->objectType = CastToObjectType(ReadTypeInfo());
+	if( func->objectType )
+	{
+		func->objectType->AddRefInternal();
+
+		asBYTE b;
+		ReadData(&b, 1);
+		func->SetReadOnly((b & 1) ? true : false);
+		func->SetPrivate((b & 2) ? true : false);
+		func->SetProtected((b & 4) ? true : false);
+		func->nameSpace = func->objectType->nameSpace;
+	}
+	else
+	{
+		if (func->funcType == asFUNC_FUNCDEF)
+		{
+			asBYTE b;
+			ReadData(&b, 1);
+			if (b == 'n')
+			{
+				asCString ns;
+				ReadString(&ns);
+				func->nameSpace = engine->AddNameSpace(ns.AddressOf());
+			}
+			else if (b == 'o')
+			{
+				func->nameSpace = 0;
+				if (parentClass)
+					*parentClass = CastToObjectType(ReadTypeInfo());
+				else
+					error = true;
+			}
+			else
+				error = true;
+		}
+		else
+		{
+			asCString ns;
+			ReadString(&ns);
+			func->nameSpace = engine->AddNameSpace(ns.AddressOf());
+		}
+	}
+}
+
+asCScriptFunction *asCReader::ReadFunction(bool &isNew, bool addToModule, bool addToEngine, bool addToGC, bool *isExternal)
+{
+	isNew = false;
+	if (isExternal) *isExternal = false;
+	if( error ) return 0;
+
+	char c;
+	ReadData(&c, 1);
+
+	if( c == '\0' )
+	{
+		// There is no function, so return a null pointer
+		return 0;
+	}
+
+	if( c == 'r' )
+	{
+		// This is a reference to a previously saved function
+		asUINT index = ReadEncodedUInt();
+		if( index < savedFunctions.GetLength() )
+			return savedFunctions[index];
+		else
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+	}
+
+	// Load the new function
+	isNew = true;
+	asCScriptFunction *func = asNEW(asCScriptFunction)(engine,0,asFUNC_DUMMY);
+	if( func == 0 )
+	{
+		// Out of memory
+		error = true;
+		return 0;
+	}
+	savedFunctions.PushLast(func);
+
+	int i;
+	asCDataType dt;
+
+	asCObjectType *parentClass = 0;
+	ReadFunctionSignature(func, &parentClass);
+	if( error )
+	{
+		func->DestroyHalfCreated();
+		return 0;
+	}
+
+	if( func->funcType == asFUNC_SCRIPT )
+	{
+		// Skip this for external shared entities
+		if (module->m_externalTypes.IndexOf(func->objectType) >= 0)
+		{
+			// Replace with the real function from the existing entity
+			isNew = false;
+
+			asCObjectType *ot = func->objectType;
+			for (asUINT n = 0; n < ot->methods.GetLength(); n++)
+			{
+				asCScriptFunction *func2 = engine->scriptFunctions[ot->methods[n]];
+				if (func2->funcType == asFUNC_VIRTUAL)
+					func2 = ot->virtualFunctionTable[func2->vfTableIdx];
+
+				if (func->IsSignatureEqual(func2))
+				{
+					func->DestroyHalfCreated();
+
+					// as this is an existing function it shouldn't be translated as if just loaded
+					dontTranslate.Insert(func2, true);
+
+					// update the saved functions for future references
+					savedFunctions[savedFunctions.GetLength() - 1] = func2;
+
+					// As it is an existing function it shouldn't be added to the module or the engine
+					return func2;
+				}
+			}
+		}
+		else
+		{
+			char bits;
+			ReadData(&bits, 1);
+			func->SetShared((bits & 1) ? true : false);
+			func->SetExplicit((bits & 32) ? true : false);
+			func->dontCleanUpOnException = (bits & 2) ? true : false;
+			if ((bits & 4) && isExternal)
+				*isExternal = true;
+
+			// for external shared functions the rest is not needed
+			if (!(bits & 4))
+			{
+				func->AllocateScriptFunctionData();
+				if (func->scriptData == 0)
+				{
+					// Out of memory
+					error = true;
+					func->DestroyHalfCreated();
+					return 0;
+				}
+
+				if (addToGC && !addToModule)
+					engine->gc.AddScriptObjectToGC(func, &engine->functionBehaviours);
+
+				ReadByteCode(func);
+
+				func->scriptData->variableSpace = SanityCheck(ReadEncodedUInt(), 1000000);
+
+				if (bits & 8)
+				{
+					int length = SanityCheck(ReadEncodedUInt(), 1000000);
+					func->scriptData->objVariableInfo.SetLength(length);
+					for (i = 0; i < length; ++i)
+					{
+						func->scriptData->objVariableInfo[i].programPos = SanityCheck(ReadEncodedUInt(), 1000000);
+						func->scriptData->objVariableInfo[i].variableOffset = SanityCheck(ReadEncodedInt(), 10000);
+						asEObjVarInfoOption option = (asEObjVarInfoOption)ReadEncodedUInt();
+						func->scriptData->objVariableInfo[i].option = option;
+						if (option != asOBJ_INIT && 
+							option != asOBJ_UNINIT && 
+							option != asBLOCK_BEGIN && 
+							option != asBLOCK_END && 
+							option != asOBJ_VARDECL)
+						{
+							error = true;
+							func->DestroyHalfCreated();
+							return 0;
+						}
+					}
+				}
+
+				if (bits & 16)
+				{
+					// Read info on try/catch blocks
+					int length = SanityCheck(ReadEncodedUInt(), 1000000);
+					func->scriptData->tryCatchInfo.SetLength(length);
+					for (i = 0; i < length; ++i)
+					{
+						// The program position must be adjusted to be in number of instructions
+						func->scriptData->tryCatchInfo[i].tryPos = SanityCheck(ReadEncodedUInt(), 1000000);
+						func->scriptData->tryCatchInfo[i].catchPos = SanityCheck(ReadEncodedUInt(), 1000000);
+					}
+				}
+
+				if (!noDebugInfo)
+				{
+					int length = SanityCheck(ReadEncodedUInt(), 1000000);
+					func->scriptData->lineNumbers.SetLength(length);
+					if (int(func->scriptData->lineNumbers.GetLength()) != length)
+					{
+						// Out of memory
+						error = true;
+						func->DestroyHalfCreated();
+						return 0;
+					}
+					for (i = 0; i < length; ++i)
+						func->scriptData->lineNumbers[i] = ReadEncodedUInt();
+
+					// Read the array of script sections
+					length = SanityCheck(ReadEncodedUInt(), 1000000);
+					func->scriptData->sectionIdxs.SetLength(length);
+					if (int(func->scriptData->sectionIdxs.GetLength()) != length)
+					{
+						// Out of memory
+						error = true;
+						func->DestroyHalfCreated();
+						return 0;
+					}
+					for (i = 0; i < length; ++i)
+					{
+						if ((i & 1) == 0)
+							func->scriptData->sectionIdxs[i] = ReadEncodedUInt();
+						else
+						{
+							asCString str;
+							ReadString(&str);
+							func->scriptData->sectionIdxs[i] = engine->GetScriptSectionNameIndex(str.AddressOf());
+						}
+					}
+				}
+
+				// Read the variable information
+				int length = SanityCheck(ReadEncodedUInt(), 1000000);
+				func->scriptData->variables.Allocate(length, false);
+				for (i = 0; i < length; i++)
+				{
+					asSScriptVariable *var = asNEW(asSScriptVariable);
+					if (var == 0)
+					{
+						// Out of memory
+						error = true;
+						func->DestroyHalfCreated();
+						return 0;
+					}
+					func->scriptData->variables.PushLast(var);
+
+					if (!noDebugInfo)
+					{
+						var->declaredAtProgramPos = ReadEncodedUInt();
+						ReadString(&var->name);
+					}
+					else
+						var->declaredAtProgramPos = 0;
+
+					var->stackOffset = SanityCheck(ReadEncodedInt(),10000);
+					var->onHeap = var->stackOffset & 1;
+					var->stackOffset >>= 1;
+					ReadDataType(&var->type);
+
+					if (error)
+					{
+						// No need to continue (the error has already been reported before)
+						func->DestroyHalfCreated();
+						return 0;
+					}
+				}
+
+				// Read script section name
+				if (!noDebugInfo)
+				{
+					asCString name;
+					ReadString(&name);
+					func->scriptData->scriptSectionIdx = engine->GetScriptSectionNameIndex(name.AddressOf());
+					func->scriptData->declaredAt = ReadEncodedUInt();
+				}
+
+				// Read parameter names
+				if (!noDebugInfo)
+				{
+					asUINT countParam = asUINT(ReadEncodedUInt64());
+					if (countParam > func->parameterTypes.GetLength())
+					{
+						error = true;
+						func->DestroyHalfCreated();
+						return 0;
+					}
+					func->parameterNames.SetLength(countParam);
+					for (asUINT n = 0; n < countParam; n++)
+						ReadString(&func->parameterNames[n]);
+				}
+			}
+		}
+	}
+	else if( func->funcType == asFUNC_VIRTUAL || func->funcType == asFUNC_INTERFACE )
+	{
+		func->vfTableIdx = ReadEncodedUInt();
+	}
+	else if( func->funcType == asFUNC_FUNCDEF )
+	{
+		asBYTE bits;
+		ReadData(&bits, 1);
+		if( bits & 1 )
+			func->SetShared(true);
+		if ((bits & 2) && isExternal)
+			*isExternal = true;
+
+		// The asCFuncdefType constructor adds itself to the func->funcdefType member
+		asCFuncdefType *fdt = asNEW(asCFuncdefType)(engine, func);
+		fdt->parentClass = parentClass;
+	}
+
+	// Methods loaded for shared objects, owned by other modules should not be created as new functions
+	if( func->objectType && func->objectType->module != module )
+	{
+		// Return the real function from the object
+		asCScriptFunction *realFunc = 0;
+		bool found = false;
+		if( func->funcType == asFUNC_SCRIPT )
+		{
+			realFunc = engine->scriptFunctions[func->objectType->beh.destruct];
+			if( realFunc && realFunc->funcType != asFUNC_VIRTUAL && func->IsSignatureEqual(realFunc) )
+			{
+				found = true;
+			}
+			for( asUINT n = 0; !found && n < func->objectType->beh.constructors.GetLength(); n++ )
+			{
+				realFunc = engine->scriptFunctions[func->objectType->beh.constructors[n]];
+				if( realFunc && realFunc->funcType != asFUNC_VIRTUAL && func->IsSignatureEqual(realFunc) )
+				{
+					found = true;
+					break;
+				}
+			}	
+			for( asUINT n = 0; !found && n < func->objectType->beh.factories.GetLength(); n++ )
+			{
+				realFunc = engine->scriptFunctions[func->objectType->beh.factories[n]];
+				if( realFunc && realFunc->funcType != asFUNC_VIRTUAL && func->IsSignatureEqual(realFunc) )
+				{
+					found = true;
+					break;
+				}
+			}	
+			for( asUINT n = 0; !found && n < func->objectType->methods.GetLength(); n++ )
+			{
+				realFunc = engine->scriptFunctions[func->objectType->methods[n]];
+				if( realFunc && realFunc->funcType == func->funcType && func->IsSignatureEqual(realFunc) )
+				{
+					found = true;
+					break;
+				}
+			}
+			for( asUINT n = 0; !found && n < func->objectType->virtualFunctionTable.GetLength(); n++ )
+			{
+				realFunc = func->objectType->virtualFunctionTable[n];
+				if( realFunc && realFunc->funcType == func->funcType && func->IsSignatureEqual(realFunc) )
+				{
+					found = true;
+					break;
+				}
+			}
+		}
+		else if( func->funcType == asFUNC_VIRTUAL || func->funcType == asFUNC_INTERFACE )
+		{
+			// If the loaded function is a virtual function, then look for the identical virtual function in the methods array
+			for( asUINT n = 0; n < func->objectType->methods.GetLength(); n++ )
+			{
+				realFunc = engine->scriptFunctions[func->objectType->methods[n]];
+				if( realFunc && realFunc->funcType == func->funcType && func->IsSignatureEqual(realFunc) )
+				{
+					asASSERT( func->vfTableIdx == realFunc->vfTableIdx );
+					found = true;
+					break;
+				}
+			}
+		}
+
+		if( found )
+		{
+			// as this is an existing function it shouldn't be translated as if just loaded
+			dontTranslate.Insert(realFunc, true);
+
+			// update the saved functions for future references
+			savedFunctions[savedFunctions.GetLength() - 1] = realFunc;
+
+			if( realFunc->funcType == asFUNC_VIRTUAL && addToModule )
+			{
+				// Virtual methods must be added to the module's script functions array, 
+				// even if they are not owned by the module
+				module->m_scriptFunctions.PushLast(realFunc);
+				realFunc->AddRefInternal();		
+			}				
+		}
+		else
+		{
+			asCString str;
+			str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, func->objectType->GetName());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			
+			Error(TXT_INVALID_BYTECODE_d);
+			savedFunctions.PopLast();
+			realFunc = 0;
+		}
+
+		// Destroy the newly created function instance since it has been replaced by an existing function
+		isNew = false;
+		func->DestroyHalfCreated();
+		
+		// As it is an existing function it shouldn't be added to the module or the engine
+		return realFunc;
+	}	
+
+	if( addToModule )
+	{
+		// The refCount is already 1
+		module->m_scriptFunctions.PushLast(func);
+		func->module = module;
+	}
+	if( addToEngine )
+	{
+		func->id = engine->GetNextScriptFunctionId();
+		engine->AddScriptFunction(func);
+	}
+	if( func->objectType )
+		func->ComputeSignatureId();
+
+	return func;
+}
+
+void asCReader::ReadTypeDeclaration(asCTypeInfo *type, int phase, bool *isExternal)
+{
+	if( phase == 1 )
+	{
+		asASSERT(isExternal);
+		if (isExternal)
+			*isExternal = false;
+
+		// Read the initial attributes
+		ReadString(&type->name);
+		ReadData(&type->flags, 4);
+		type->size = SanityCheck(ReadEncodedUInt(), 1000000);
+		asCString ns;
+		ReadString(&ns);
+		type->nameSpace = engine->AddNameSpace(ns.AddressOf());
+
+		// Verify that the flags match the asCTypeInfo
+		if ((CastToEnumType(type) && !(type->flags & asOBJ_ENUM)) ||
+			(CastToFuncdefType(type) && !(type->flags & asOBJ_FUNCDEF)) ||
+			(CastToObjectType(type) && !(type->flags & (asOBJ_REF | asOBJ_VALUE))))
+		{
+			error = true;
+			return;
+		}
+
+		// Reset the size of script classes, since it will be recalculated as properties are added
+		if( (type->flags & asOBJ_SCRIPT_OBJECT) && type->size != 0 )
+			type->size = sizeof(asCScriptObject);
+
+		asCObjectType *ot = CastToObjectType(type);
+		if (ot)
+		{
+			// Use the default script class behaviours
+			ot->beh = engine->scriptTypeBehaviours.beh;
+			ot->beh.construct = 0;
+			ot->beh.factory = 0;
+			ot->beh.constructors.PopLast(); // These will be read from the file
+			ot->beh.factories.PopLast(); // These will be read from the file
+			engine->scriptFunctions[ot->beh.addref]->AddRefInternal();
+			engine->scriptFunctions[ot->beh.release]->AddRefInternal();
+			engine->scriptFunctions[ot->beh.gcEnumReferences]->AddRefInternal();
+			engine->scriptFunctions[ot->beh.gcGetFlag]->AddRefInternal();
+			engine->scriptFunctions[ot->beh.gcGetRefCount]->AddRefInternal();
+			engine->scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRefInternal();
+			engine->scriptFunctions[ot->beh.gcSetFlag]->AddRefInternal();
+			engine->scriptFunctions[ot->beh.copy]->AddRefInternal();
+			// TODO: weak: Should not do this if the class has been declared with 'noweak'
+			engine->scriptFunctions[ot->beh.getWeakRefFlag]->AddRefInternal();
+		}
+
+		// external shared flag
+		if (type->flags & asOBJ_SHARED)
+		{
+			char c;
+			ReadData(&c, 1);
+			if (c == 'e')
+				*isExternal = true;
+			else if (c != ' ')
+			{
+				error = true;
+				return;
+			}
+		}
+	}
+	else if( phase == 2 )
+	{
+		// external shared types doesn't store this
+		if ((type->flags & asOBJ_SHARED) && module->m_externalTypes.IndexOf(type) >= 0)
+			return;
+
+		if( type->flags & asOBJ_ENUM )
+		{
+			asCEnumType *t = CastToEnumType(type);
+			int count = SanityCheck(ReadEncodedUInt(), 1000000);
+			bool sharedExists = existingShared.MoveTo(0, type);
+			if( !sharedExists )
+			{
+				t->enumValues.Allocate(count, false);
+				for( int n = 0; n < count; n++ )
+				{
+					asSEnumValue *e = asNEW(asSEnumValue);
+					if( e == 0 )
+					{
+						// Out of memory
+						error = true;
+						return;
+					}
+					ReadString(&e->name);
+					ReadData(&e->value, 4); // TODO: Should be encoded
+					t->enumValues.PushLast(e);
+				}
+			}
+			else
+			{
+				// Verify that the enum values exists in the original
+				asCString name;
+				int value;
+				for( int n = 0; n < count; n++ )
+				{
+					ReadString(&name);
+					ReadData(&value, 4); // TODO: Should be encoded
+					bool found = false;
+					for( asUINT e = 0; e < t->enumValues.GetLength(); e++ )
+					{
+						if( t->enumValues[e]->name == name &&
+							t->enumValues[e]->value == value )
+						{
+							found = true;
+							break;
+						}
+					}
+					if( !found )
+					{
+						asCString str;
+						str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+						engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+						Error(TXT_INVALID_BYTECODE_d);
+					}
+				}
+			}
+		}
+		else if( type->flags & asOBJ_TYPEDEF )
+		{
+			asCTypedefType *td = CastToTypedefType(type);
+			asASSERT(td);
+			eTokenType t = (eTokenType)ReadEncodedUInt();
+			td->aliasForType = asCDataType::CreatePrimitive(t, false);
+		}
+		else
+		{
+			asCObjectType *ot = CastToObjectType(type);
+			asASSERT(ot);
+
+			// If the type is shared and pre-existing, we should just
+			// validate that the loaded methods match the original
+			bool sharedExists = existingShared.MoveTo(0, type);
+			if( sharedExists )
+			{
+				asCObjectType *dt = CastToObjectType(ReadTypeInfo());
+				if( ot->derivedFrom != dt )
+				{
+					asCString str;
+					str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+					engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+					Error(TXT_INVALID_BYTECODE_d);
+				}
+			}
+			else
+			{
+				ot->derivedFrom = CastToObjectType(ReadTypeInfo());
+				if( ot->derivedFrom )
+					ot->derivedFrom->AddRefInternal();
+			}
+
+			// interfaces[] / interfaceVFTOffsets[]
+			int size = SanityCheck(ReadEncodedUInt(), 1000000);
+			if( sharedExists )
+			{
+				for( int n = 0; n < size; n++ )
+				{
+					asCObjectType *intf = CastToObjectType(ReadTypeInfo());
+					if (!ot->IsInterface())
+						ReadEncodedUInt();
+
+					if( !type->Implements(intf) )
+					{
+						asCString str;
+						str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+						engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+						Error(TXT_INVALID_BYTECODE_d);
+					}
+				}
+			}
+			else
+			{
+				ot->interfaces.Allocate(size, false);
+				if( !ot->IsInterface() )
+					ot->interfaceVFTOffsets.Allocate(size, false);
+				for( int n = 0; n < size; n++ )
+				{
+					asCObjectType *intf = CastToObjectType(ReadTypeInfo());
+					ot->interfaces.PushLast(intf);
+
+					if (!ot->IsInterface())
+					{
+						asUINT offset = SanityCheck(ReadEncodedUInt(), 1000000);
+						ot->interfaceVFTOffsets.PushLast(offset);
+					}
+				}
+			}
+
+			// behaviours
+			if( !ot->IsInterface() && type->flags != asOBJ_TYPEDEF && type->flags != asOBJ_ENUM )
+			{
+				bool isNew;
+				asCScriptFunction *func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
+				if( sharedExists )
+				{
+					// Find the real function in the object, and update the savedFunctions array
+					asCScriptFunction *realFunc = engine->GetScriptFunction(ot->beh.destruct);
+					if( (realFunc == 0 && func == 0) || realFunc->IsSignatureEqual(func) )
+					{
+						// If the function is not the last, then the substitution has already occurred before
+						if( func && savedFunctions[savedFunctions.GetLength()-1] == func )
+							savedFunctions[savedFunctions.GetLength()-1] = realFunc;
+					}
+					else
+					{
+						asCString str;
+						str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+						engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+						Error(TXT_INVALID_BYTECODE_d);
+					}
+					if( func )
+					{
+						if( isNew )
+						{
+							// Destroy the function without releasing any references
+							func->id = 0;
+							func->scriptData->byteCode.SetLength(0);
+							func->ReleaseInternal();
+						}
+						dontTranslate.Insert(realFunc, true);
+					}
+				}
+				else
+				{
+					if( func )
+					{
+						ot->beh.destruct = func->id;
+						func->AddRefInternal();
+					}
+					else
+						ot->beh.destruct = 0;
+				}
+
+				size = SanityCheck(ReadEncodedUInt(), 1000000);
+				for( int n = 0; n < size; n++ )
+				{
+					func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
+					if( func )
+					{
+						if( sharedExists )
+						{
+							// Find the real function in the object, and update the savedFunctions array
+							bool found = false;
+							for( asUINT f = 0; f < ot->beh.constructors.GetLength(); f++ )
+							{
+								asCScriptFunction *realFunc = engine->GetScriptFunction(ot->beh.constructors[f]);
+								if( realFunc->IsSignatureEqual(func) )
+								{
+									// If the function is not the last, then the substitution has already occurred before
+									if( savedFunctions[savedFunctions.GetLength()-1] == func )
+										savedFunctions[savedFunctions.GetLength()-1] = realFunc;
+									found = true;
+									dontTranslate.Insert(realFunc, true);
+									break;
+								}
+							}
+							if( !found )
+							{
+								asCString str;
+								str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+								engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+								Error(TXT_INVALID_BYTECODE_d);
+							}
+							if( isNew )
+							{
+								// Destroy the function without releasing any references
+								func->id = 0;
+								func->scriptData->byteCode.SetLength(0);
+								func->ReleaseInternal();
+							}
+						}
+						else
+						{
+							ot->beh.constructors.PushLast(func->id);
+							func->AddRefInternal();
+
+							if( func->parameterTypes.GetLength() == 0 )
+								ot->beh.construct = func->id;
+						}
+					}
+					else
+					{
+						Error(TXT_INVALID_BYTECODE_d);
+					}
+
+					func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
+					if( func )
+					{
+						if( sharedExists )
+						{
+							// Find the real function in the object, and update the savedFunctions array
+							bool found = false;
+							for( asUINT f = 0; f < ot->beh.factories.GetLength(); f++ )
+							{
+								asCScriptFunction *realFunc = engine->GetScriptFunction(ot->beh.factories[f]);
+								if( realFunc->IsSignatureEqual(func) )
+								{
+									// If the function is not the last, then the substitution has already occurred before
+									if( savedFunctions[savedFunctions.GetLength()-1] == func )
+										savedFunctions[savedFunctions.GetLength()-1] = realFunc;
+									found = true;
+									dontTranslate.Insert(realFunc, true);
+									break;
+								}
+							}
+							if( !found )
+							{
+								asCString str;
+								str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+								engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+								Error(TXT_INVALID_BYTECODE_d);
+							}
+							if( isNew )
+							{
+								// Destroy the function without releasing any references
+								func->id = 0;
+								func->scriptData->byteCode.SetLength(0);
+								func->ReleaseInternal();
+							}
+						}
+						else
+						{
+							ot->beh.factories.PushLast(func->id);
+							func->AddRefInternal();
+
+							if( func->parameterTypes.GetLength() == 0 )
+								ot->beh.factory = func->id;
+						}
+					}
+					else
+					{
+						Error(TXT_INVALID_BYTECODE_d);
+					}
+				}
+			}
+
+			// methods[]
+			size = SanityCheck(ReadEncodedUInt(), 1000000);
+			int n;
+			for( n = 0; n < size; n++ )
+			{
+				bool isNew;
+				asCScriptFunction *func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
+				if( func )
+				{
+					if( sharedExists )
+					{
+						// Find the real function in the object, and update the savedFunctions array
+						bool found = false;
+						for( asUINT f = 0; f < ot->methods.GetLength(); f++ )
+						{
+							asCScriptFunction *realFunc = engine->GetScriptFunction(ot->methods[f]);
+							if( realFunc->IsSignatureEqual(func) )
+							{
+								// If the function is not the last, then the substitution has already occurred before
+								if( savedFunctions[savedFunctions.GetLength()-1] == func )
+									savedFunctions[savedFunctions.GetLength()-1] = realFunc;
+								found = true;
+								dontTranslate.Insert(realFunc, true);
+								break;
+							}
+						}
+						if( !found )
+						{
+							asCString str;
+							str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+							engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+							Error(TXT_INVALID_BYTECODE_d);
+						}
+						if( isNew )
+						{
+							// Destroy the function without releasing any references
+							if( func->id == func->signatureId )
+								engine->signatureIds.RemoveValue(func);
+							func->id = 0;
+							if( func->scriptData )
+								func->scriptData->byteCode.SetLength(0);
+							func->ReleaseInternal();
+						}
+					}
+					else
+					{
+						// If the method is the assignment operator we need to replace the default implementation
+						if( func->name == "opAssign" && func->parameterTypes.GetLength() == 1 &&
+							func->parameterTypes[0].GetTypeInfo() == func->objectType &&
+							(func->inOutFlags[0] & asTM_INREF) )
+						{
+							engine->scriptFunctions[ot->beh.copy]->ReleaseInternal();
+							ot->beh.copy = func->id;
+							func->AddRefInternal();
+						}
+
+						ot->methods.PushLast(func->id);
+						func->AddRefInternal();
+					}
+				}
+				else
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+				}
+			}
+
+			// virtualFunctionTable[]
+			size = SanityCheck(ReadEncodedUInt(), 1000000);
+			for( n = 0; n < size; n++ )
+			{
+				bool isNew;
+				asCScriptFunction *func = ReadFunction(isNew, !sharedExists, !sharedExists, !sharedExists);
+				if( func )
+				{
+					if( sharedExists )
+					{
+						// Find the real function in the object, and update the savedFunctions array
+						bool found = false;
+						for( asUINT f = 0; f < ot->virtualFunctionTable.GetLength(); f++ )
+						{
+							asCScriptFunction *realFunc = ot->virtualFunctionTable[f];
+							if( realFunc->IsSignatureEqual(func) )
+							{
+								// If the function is not the last, then the substitution has already occurred before
+								if( savedFunctions[savedFunctions.GetLength()-1] == func )
+									savedFunctions[savedFunctions.GetLength()-1] = realFunc;
+								found = true;
+								dontTranslate.Insert(realFunc, true);
+								break;
+							}
+						}
+						if( !found )
+						{
+							asCString str;
+							str.Format(TXT_SHARED_s_DOESNT_MATCH_ORIGINAL, type->GetName());
+							engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+							Error(TXT_INVALID_BYTECODE_d);
+						}
+						if( isNew )
+						{
+							// Destroy the function without releasing any references
+							func->id = 0;
+							if( func->scriptData )
+								func->scriptData->byteCode.SetLength(0);
+							func->ReleaseInternal();
+						}
+					}
+					else
+					{
+						ot->virtualFunctionTable.PushLast(func);
+						func->AddRefInternal();
+					}
+				}
+				else
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+				}
+			}
+		}
+	}
+	else if( phase == 3 )
+	{
+		// external shared types doesn't store this
+		if ((type->flags & asOBJ_SHARED) && module->m_externalTypes.IndexOf(type) >= 0)
+			return;
+
+		asCObjectType *ot = CastToObjectType(type);
+
+		// This is only done for object types
+		asASSERT(ot);
+
+		// properties[]
+		asUINT size = SanityCheck(ReadEncodedUInt(), 1000000);
+		for( asUINT n = 0; n < size; n++ )
+			ReadObjectProperty(ot);
+	}
+}
+
+asWORD asCReader::ReadEncodedUInt16()
+{
+	asDWORD dw = ReadEncodedUInt();
+	if( (dw>>16) != 0 && (dw>>16) != 0xFFFF )
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+	}
+
+	return asWORD(dw & 0xFFFF);
+}
+
+asUINT asCReader::ReadEncodedUInt()
+{
+	asQWORD qw = ReadEncodedUInt64();
+	if( (qw>>32) != 0 && (qw>>32) != 0xFFFFFFFF )
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+	}
+
+	return asUINT(qw & 0xFFFFFFFFu);
+}
+
+int asCReader::ReadEncodedInt()
+{
+	return int(ReadEncodedUInt());
+}
+
+asQWORD asCReader::ReadEncodedUInt64()
+{
+	asQWORD i = 0;
+	asBYTE b = 0xFF; // set to 0xFF to better catch if the stream doesn't update the value
+	ReadData(&b, 1);
+	bool isNegative = ( b & 0x80 ) ? true : false;
+	b &= 0x7F;
+
+	if( (b & 0x7F) == 0x7F )
+	{
+		ReadData(&b, 1); i = asQWORD(b) << 56;
+		ReadData(&b, 1); i += asQWORD(b) << 48;
+		ReadData(&b, 1); i += asQWORD(b) << 40;
+		ReadData(&b, 1); i += asQWORD(b) << 32;
+		ReadData(&b, 1); i += asUINT(b) << 24;
+		ReadData(&b, 1); i += asUINT(b) << 16;
+		ReadData(&b, 1); i += asUINT(b) << 8;
+		ReadData(&b, 1); i += b;
+	}
+	else if( (b & 0x7E) == 0x7E )
+	{
+		i = asQWORD(b & 0x01) << 48;
+		ReadData(&b, 1); i += asQWORD(b) << 40;
+		ReadData(&b, 1); i += asQWORD(b) << 32;
+		ReadData(&b, 1); i += asUINT(b) << 24;
+		ReadData(&b, 1); i += asUINT(b) << 16;
+		ReadData(&b, 1); i += asUINT(b) << 8;
+		ReadData(&b, 1); i += b;
+	}
+	else if( (b & 0x7C) == 0x7C )
+	{
+		i = asQWORD(b & 0x03) << 40;
+		ReadData(&b, 1); i += asQWORD(b) << 32;
+		ReadData(&b, 1); i += asUINT(b) << 24;
+		ReadData(&b, 1); i += asUINT(b) << 16;
+		ReadData(&b, 1); i += asUINT(b) << 8;
+		ReadData(&b, 1); i += b;
+	}
+	else if( (b & 0x78) == 0x78 )
+	{
+		i = asQWORD(b & 0x07) << 32;
+		ReadData(&b, 1); i += asUINT(b) << 24;
+		ReadData(&b, 1); i += asUINT(b) << 16;
+		ReadData(&b, 1); i += asUINT(b) << 8;
+		ReadData(&b, 1); i += b;
+	}
+	else if( (b & 0x70) == 0x70 )
+	{
+		i = asUINT(b & 0x0F) << 24;
+		ReadData(&b, 1); i += asUINT(b) << 16;
+		ReadData(&b, 1); i += asUINT(b) << 8;
+		ReadData(&b, 1); i += b;
+	}
+	else if( (b & 0x60) == 0x60 )
+	{
+		i = asUINT(b & 0x1F) << 16;
+		ReadData(&b, 1); i += asUINT(b) << 8;
+		ReadData(&b, 1); i += b;
+	}
+	else if( (b & 0x40) == 0x40 )
+	{
+		i = asUINT(b & 0x3F) << 8;
+		ReadData(&b, 1); i += b;
+	}
+	else
+	{
+		i = b;
+	}
+	if( isNegative )
+		i = (asQWORD)(-asINT64(i));
+
+	return i;
+}
+
+asUINT asCReader::SanityCheck(asUINT val, asUINT max)
+{
+	if (val > max)
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+
+		// Return 0 as default value
+		return 0;
+	}
+
+	return val;
+}
+
+int asCReader::SanityCheck(int val, asUINT max)
+{
+	if (val > int(max) || val < -int(max))
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+
+		// Return 0 as default value
+		return 0;
+	}
+
+	return val;
+}
+
+void asCReader::ReadString(asCString* str)
+{
+	asUINT len = SanityCheck(ReadEncodedUInt(), 1000000);
+	if( len & 1 )
+	{
+		asUINT idx = len/2;
+		if( idx < savedStrings.GetLength() )
+			*str = savedStrings[idx];
+		else
+			Error(TXT_INVALID_BYTECODE_d);
+	}
+	else if( len > 0 )
+	{
+		len /= 2;
+		str->SetLength(len);
+		int r = stream->Read(str->AddressOf(), len);
+		if (r < 0)
+			Error(TXT_UNEXPECTED_END_OF_FILE);
+
+		savedStrings.PushLast(*str);
+	}
+	else
+		str->SetLength(0);
+}
+
+void asCReader::ReadGlobalProperty()
+{
+	asCString name;
+	asCDataType type;
+
+	ReadString(&name);
+
+	asCString ns;
+	ReadString(&ns);
+	asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
+
+	ReadDataType(&type);
+
+	asCGlobalProperty *prop = module->AllocateGlobalProperty(name.AddressOf(), type, nameSpace);
+
+	// Read the initialization function
+	bool isNew;
+	// Do not add the function to the GC at this time. It will
+	// only be added to the GC when the module releases the property
+	asCScriptFunction *func = ReadFunction(isNew, false, true, false);
+	if( func )
+	{
+		// Make sure the function knows it is owned by the module
+		func->module = module;
+
+		prop->SetInitFunc(func);
+		func->ReleaseInternal();
+	}
+}
+
+void asCReader::ReadObjectProperty(asCObjectType *ot)
+{
+	asCString name;
+	ReadString(&name);
+	asCDataType dt;
+	ReadDataType(&dt);
+	int flags = ReadEncodedUInt();
+	bool isPrivate = (flags & 1) ? true : false;
+	bool isProtected = (flags & 2) ? true : false;
+	bool isInherited = (flags & 4) ? true : false;
+
+	// TODO: shared: If the type is shared and pre-existing, we should just
+	//               validate that the loaded methods match the original
+	if( !existingShared.MoveTo(0, ot) )
+		ot->AddPropertyToClass(name, dt, isPrivate, isProtected, isInherited);
+}
+
+void asCReader::ReadDataType(asCDataType *dt)
+{
+	// Check if this is a previously used type
+	asUINT idx = ReadEncodedUInt();
+	if( idx != 0 )
+	{
+		// Get the datatype from the cache
+		*dt = savedDataTypes[idx-1];
+		return;
+	}
+
+	// Read the type definition
+	eTokenType tokenType = (eTokenType)ReadEncodedUInt();
+
+	// Reserve a spot in the savedDataTypes
+	asUINT saveSlot = savedDataTypes.GetLength();
+	savedDataTypes.PushLast(asCDataType());
+
+	// Read the datatype for the first time
+	asCTypeInfo *ti = 0;
+	if( tokenType == ttIdentifier )
+		ti = ReadTypeInfo();
+
+	// Read type flags as a bitmask
+	// Endian-safe code
+	bool isObjectHandle, isHandleToConst, isReference, isReadOnly;
+	char b = 0;
+	ReadData(&b, 1);
+	LOAD_FROM_BIT(isObjectHandle, b, 0);
+	LOAD_FROM_BIT(isHandleToConst, b, 1);
+	LOAD_FROM_BIT(isReference, b, 2);
+	LOAD_FROM_BIT(isReadOnly, b, 3);
+
+	if( tokenType == ttIdentifier )
+		*dt = asCDataType::CreateType(ti, false);
+	else
+		*dt = asCDataType::CreatePrimitive(tokenType, false);
+	if( isObjectHandle )
+	{
+		dt->MakeReadOnly(isHandleToConst ? true : false);
+
+		// Here we must allow a scoped type to be a handle
+		// e.g. if the datatype is for a system function
+		dt->MakeHandle(true, true);
+	}
+	dt->MakeReadOnly(isReadOnly ? true : false);
+	dt->MakeReference(isReference ? true : false);
+
+	if (tokenType == ttUnrecognizedToken && isObjectHandle && ti == 0)
+		*dt = asCDataType::CreateNullHandle();
+
+	// Update the previously saved slot
+	savedDataTypes[saveSlot] = *dt;
+}
+
+asCTypeInfo* asCReader::ReadTypeInfo()
+{
+	asCTypeInfo *ot = 0;
+	char ch;
+	ReadData(&ch, 1);
+	if( ch == 'a' )
+	{
+		// Read the name of the template type
+		asCString typeName, ns;
+		ReadString(&typeName);
+		ReadString(&ns);
+		asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
+
+		asCTypeInfo *tmp = engine->GetRegisteredType(typeName.AddressOf(), nameSpace);
+		asCObjectType *tmpl = CastToObjectType(tmp);
+		if( tmpl == 0 )
+		{
+			asCString str;
+			str.Format(TXT_TEMPLATE_TYPE_s_DOESNT_EXIST, typeName.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+
+		asUINT numSubTypes = SanityCheck(ReadEncodedUInt(), 100);
+		asCArray<asCDataType> subTypes;
+		for( asUINT n = 0; n < numSubTypes; n++ )
+		{
+			ReadData(&ch, 1);
+			if( ch == 's' )
+			{
+				asCDataType dt;
+				ReadDataType(&dt);
+				subTypes.PushLast(dt);
+			}
+			else
+			{
+				eTokenType tokenType = (eTokenType)ReadEncodedUInt();
+				asCDataType dt = asCDataType::CreatePrimitive(tokenType, false);
+				subTypes.PushLast(dt);
+			}
+		}
+
+		// Return the actual template if the subtypes are the template's dummy types
+		if( tmpl->templateSubTypes == subTypes )
+			ot = tmpl;
+		else
+		{
+			// Get the template instance type based on the loaded subtypes
+			ot = engine->GetTemplateInstanceType(tmpl, subTypes, module);
+		}
+
+		if( ot == 0 )
+		{
+			// Show all subtypes in error message
+			asCString sub = subTypes[0].Format(nameSpace);
+			for( asUINT n = 1; n < subTypes.GetLength(); n++ )
+			{
+				sub += ",";
+				sub += subTypes[n].Format(nameSpace);
+			}
+			asCString str;
+			str.Format(TXT_INSTANCING_INVLD_TMPL_TYPE_s_s, typeName.AddressOf(), sub.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+	}
+	else if( ch == 'l' )
+	{
+		asCObjectType *st = CastToObjectType(ReadTypeInfo());
+		if( st == 0 || st->beh.listFactory == 0 )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+		ot = engine->GetListPatternType(st->beh.listFactory);
+	}
+	else if( ch == 's' )
+	{
+		// Read the name of the template subtype
+		asCString typeName;
+		ReadString(&typeName);
+
+		// Find the template subtype
+		ot = 0;
+		for( asUINT n = 0; n < engine->templateSubTypes.GetLength(); n++ )
+		{
+			if( engine->templateSubTypes[n] && engine->templateSubTypes[n]->name == typeName )
+			{
+				ot = engine->templateSubTypes[n];
+				break;
+			}
+		}
+
+		if( ot == 0 )
+		{
+			asCString str;
+			str.Format(TXT_TEMPLATE_SUBTYPE_s_DOESNT_EXIST, typeName.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+	}
+	else if( ch == 'o' )
+	{
+		// Read the object type name
+		asCString typeName, ns;
+		ReadString(&typeName);
+		ReadString(&ns);
+		asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
+
+		if( typeName.GetLength() && typeName != "$obj" && typeName != "$func" )
+		{
+			// Find the object type
+			ot = module->GetType(typeName.AddressOf(), nameSpace);
+			if (!ot)
+				ot = engine->GetRegisteredType(typeName.AddressOf(), nameSpace);
+
+			if( ot == 0 )
+			{
+				asCString str;
+				str.Format(TXT_OBJECT_TYPE_s_DOESNT_EXIST, typeName.AddressOf());
+				engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+				Error(TXT_INVALID_BYTECODE_d);
+				return 0;
+			}
+		}
+		else if( typeName == "$obj" )
+		{
+			ot = &engine->scriptTypeBehaviours;
+		}
+		else if( typeName == "$func" )
+		{
+			ot = &engine->functionBehaviours;
+		}
+		else
+			asASSERT( false );
+	}
+	else if (ch == 'c')
+	{
+		// Read the object type name
+		asCString typeName, ns;
+		ReadString(&typeName);
+
+		// Read the parent class
+		asCObjectType *parentClass = CastToObjectType(ReadTypeInfo());
+		if (parentClass == 0)
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+
+		// Find the child type in the parentClass
+		for (asUINT n = 0; n < parentClass->childFuncDefs.GetLength(); n++)
+		{
+			if (parentClass->childFuncDefs[n]->name == typeName)
+				ot = parentClass->childFuncDefs[n];
+		}
+
+		if (ot == 0)
+		{
+			asCString str;
+			str.Format(TXT_OBJECT_TYPE_s_DOESNT_EXIST, typeName.AddressOf());
+			engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+	}
+	else
+	{
+		// No object type
+		asASSERT( ch == '\0' || error );
+		ot = 0;
+	}
+
+	return ot;
+}
+
+void asCReader::ReadByteCode(asCScriptFunction *func)
+{
+	asASSERT( func->scriptData );
+
+	// Read number of instructions
+	asUINT total, numInstructions;
+	total = numInstructions = SanityCheck(ReadEncodedUInt(), 1000000);
+
+	// Reserve some space for the instructions
+	func->scriptData->byteCode.AllocateNoConstruct(numInstructions, false);
+
+	asUINT pos = 0;
+	while( numInstructions )
+	{
+		asBYTE b;
+		ReadData(&b, 1);
+
+		// Allocate the space for the instruction
+		asUINT len = asBCTypeSize[asBCInfo[b].type];
+		asUINT newSize = asUINT(func->scriptData->byteCode.GetLength()) + len;
+		if( func->scriptData->byteCode.GetCapacity() < newSize )
+		{
+			// Determine the average size of the loaded instructions and re-estimate the final size
+			asUINT size = asUINT(float(newSize) / (total - numInstructions) * total) + 1;
+			func->scriptData->byteCode.AllocateNoConstruct(size, true);
+		}
+		if( !func->scriptData->byteCode.SetLengthNoConstruct(newSize) )
+		{
+			// Out of memory
+			error = true;
+			return;
+		}
+
+		asDWORD *bc = func->scriptData->byteCode.AddressOf() + pos;
+		pos += len;
+
+		switch( asBCInfo[b].type )
+		{
+		case asBCTYPE_NO_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+				bc++;
+			}
+			break;
+		case asBCTYPE_W_ARG:
+		case asBCTYPE_wW_ARG:
+		case asBCTYPE_rW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+
+				// Read the argument
+				asWORD w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+
+				bc++;
+			}
+			break;
+		case asBCTYPE_rW_DW_ARG:
+		case asBCTYPE_wW_DW_ARG:
+		case asBCTYPE_W_DW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+
+				// Read the word argument
+				asWORD w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+				bc++;
+
+				// Read the dword argument
+				*bc++ = ReadEncodedUInt();
+			}
+			break;
+		case asBCTYPE_DW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+				bc++;
+
+				// Read the argument
+				*bc++ = ReadEncodedUInt();
+			}
+			break;
+		case asBCTYPE_DW_DW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+				bc++;
+
+				// Read the first argument
+				*bc++ = ReadEncodedUInt();
+
+				// Read the second argument
+				*bc++ = ReadEncodedUInt();
+			}
+			break;
+		case asBCTYPE_wW_rW_rW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+
+				// Read the first argument
+				asWORD w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+				bc++;
+
+				// Read the second argument
+				w = ReadEncodedUInt16();
+				*(asWORD*)bc = w;
+
+				// Read the third argument
+				w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+
+				bc++;
+			}
+			break;
+		case asBCTYPE_wW_rW_ARG:
+		case asBCTYPE_rW_rW_ARG:
+		case asBCTYPE_wW_W_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+
+				// Read the first argument
+				asWORD w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+				bc++;
+
+				// Read the second argument
+				w = ReadEncodedUInt16();
+				*(asWORD*)bc = w;
+
+				bc++;
+			}
+			break;
+		case asBCTYPE_wW_rW_DW_ARG:
+		case asBCTYPE_rW_W_DW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+
+				// Read the first argument
+				asWORD w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+				bc++;
+
+				// Read the second argument
+				w = ReadEncodedUInt16();
+				*(asWORD*)bc = w;
+				bc++;
+
+				// Read the third argument
+				asDWORD dw = ReadEncodedUInt();
+				*bc++ = dw;
+			}
+			break;
+		case asBCTYPE_QW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+				bc++;
+
+				// Read the argument
+				asQWORD qw = ReadEncodedUInt64();
+				*(asQWORD*)bc = qw;
+				bc += 2;
+			}
+			break;
+		case asBCTYPE_QW_DW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+				bc++;
+
+				// Read the first argument
+				asQWORD qw = ReadEncodedUInt64();
+				*(asQWORD*)bc = qw;
+				bc += 2;
+
+				// Read the second argument
+				asDWORD dw = ReadEncodedUInt();
+				*bc++ = dw;
+			}
+			break;
+		case asBCTYPE_rW_QW_ARG:
+		case asBCTYPE_wW_QW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+
+				// Read the first argument
+				asWORD w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+				bc++;
+
+				// Read the argument
+				asQWORD qw = ReadEncodedUInt64();
+				*(asQWORD*)bc = qw;
+				bc += 2;
+			}
+			break;
+		case asBCTYPE_rW_DW_DW_ARG:
+			{
+				*(asBYTE*)(bc) = b;
+
+				// Read the 1st argument
+				asWORD w = ReadEncodedUInt16();
+				*(((asWORD*)bc)+1) = w;
+				bc++;
+
+				// Read the 2nd argument
+				*bc++ = ReadEncodedUInt();
+
+				// Read the 3rd argument
+				*bc++ = ReadEncodedUInt();
+			}
+			break;
+		default:
+			{
+				// This should never happen
+				asASSERT(false);
+
+				// Read the next 3 bytes
+				asDWORD c; asBYTE t;
+#if defined(AS_BIG_ENDIAN)
+				c = b << 24;
+				ReadData(&t, 1); c += t << 16;
+				ReadData(&t, 1); c += t << 8;
+				ReadData(&t, 1); c += t;
+#else
+				c = b;
+				ReadData(&t, 1); c += t << 8;
+				ReadData(&t, 1); c += t << 16;
+				ReadData(&t, 1); c += t << 24;
+#endif
+
+				*bc++ = c;
+				c = *(asBYTE*)&c;
+
+				// Read the bc as is
+				for( int n = 1; n < asBCTypeSize[asBCInfo[c].type]; n++ )
+					ReadData(&*bc++, 4);
+			}
+		}
+
+		numInstructions--;
+	}
+
+	// Correct the final size in case we over-estimated it
+	func->scriptData->byteCode.SetLengthNoConstruct(pos);
+}
+
+void asCReader::ReadUsedTypeIds()
+{
+	TimeIt("asCReader::ReadUsedTypeIds");
+
+	asUINT count = SanityCheck(ReadEncodedUInt(), 1000000);
+	usedTypeIds.Allocate(count, false);
+	for( asUINT n = 0; n < count; n++ )
+	{
+		asCDataType dt;
+		ReadDataType(&dt);
+		usedTypeIds.PushLast(engine->GetTypeIdFromDataType(dt));
+	}
+}
+
+void asCReader::ReadUsedGlobalProps()
+{
+	TimeIt("asCReader::ReadUsedGlobalProps");
+
+	int c = SanityCheck(ReadEncodedUInt(), 1000000);
+
+	usedGlobalProperties.Allocate(c, false);
+
+	for( int n = 0; n < c; n++ )
+	{
+		asCString name, ns;
+		asCDataType type;
+		char moduleProp;
+
+		ReadString(&name);
+		ReadString(&ns);
+		ReadDataType(&type);
+		ReadData(&moduleProp, 1);
+
+		asSNameSpace *nameSpace = engine->AddNameSpace(ns.AddressOf());
+
+		// Find the real property
+		asCGlobalProperty *globProp = 0;
+		if( moduleProp )
+			globProp = module->m_scriptGlobals.GetFirst(nameSpace, name);
+		else
+			globProp = engine->registeredGlobalProps.GetFirst(nameSpace, name);
+
+		void *prop = 0;
+		if( globProp && globProp->type == type )
+			prop = globProp->GetAddressOfValue();
+
+		usedGlobalProperties.PushLast(prop);
+
+		if( prop == 0 )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+		}
+	}
+}
+
+void asCReader::ReadUsedObjectProps()
+{
+	TimeIt("asCReader::ReadUsedObjectProps");
+
+	asUINT c = SanityCheck(ReadEncodedUInt(), 1000000);
+
+	usedObjectProperties.SetLength(c);
+	for( asUINT n = 0; n < c; n++ )
+	{
+		asCObjectType *objType = CastToObjectType(ReadTypeInfo());
+		if( objType == 0 )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			break;
+		}
+
+		asCString name;
+		ReadString(&name);
+
+		// Find the property
+		bool found = false;
+		for( asUINT p = 0; p < objType->properties.GetLength(); p++ )
+		{
+			if( objType->properties[p]->name == name )
+			{
+				usedObjectProperties[n].objType = objType;
+				usedObjectProperties[n].prop = objType->properties[p];
+				found = true;
+				break;
+			}
+		}
+
+		if( !found )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			return;
+		}
+	}
+}
+
+short asCReader::FindObjectPropOffset(asWORD index)
+{
+	static asCObjectProperty *lastCompositeProp = 0;
+	if (lastCompositeProp)
+	{
+		if (index != 0)
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+
+		short offset = (short)lastCompositeProp->byteOffset;
+		lastCompositeProp = 0;
+		return offset;
+	}
+
+	if( index >= usedObjectProperties.GetLength() )
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+		return 0;
+	}
+
+	if (usedObjectProperties[index].prop->compositeOffset || usedObjectProperties[index].prop->isCompositeIndirect)
+	{
+		lastCompositeProp = usedObjectProperties[index].prop;
+		return (short)lastCompositeProp->compositeOffset;
+	}
+	return (short)usedObjectProperties[index].prop->byteOffset;
+}
+
+asCScriptFunction *asCReader::FindFunction(int idx)
+{
+	if( idx >= 0 && idx < (int)usedFunctions.GetLength() )
+		return usedFunctions[idx];
+	else
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+		return 0;
+	}
+}
+
+void asCReader::TranslateFunction(asCScriptFunction *func)
+{
+	// Skip this if the function is part of an pre-existing shared object
+	if( dontTranslate.MoveTo(0, func) ) return;
+
+	asASSERT( func->scriptData );
+
+	// Pre-compute the size of each instruction in order to translate jump offsets
+	asUINT n;
+	asDWORD *bc = func->scriptData->byteCode.AddressOf();
+	asUINT bcLength = (asUINT)func->scriptData->byteCode.GetLength();
+	asCArray<asUINT> bcSizes(bcLength);
+	asCArray<asUINT> instructionNbrToPos(bcLength);
+	for( n = 0; n < bcLength; )
+	{
+		int c = *(asBYTE*)&bc[n];
+		asUINT size = asBCTypeSize[asBCInfo[c].type];
+		if( size == 0 )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			return;
+		}
+		bcSizes.PushLast(size);
+		instructionNbrToPos.PushLast(n);
+		n += size;
+	}
+
+	asUINT bcNum = 0;
+	for( n = 0; n < bcLength; bcNum++ )
+	{
+		int c = *(asBYTE*)&bc[n];
+		if( c == asBC_REFCPY ||
+			c == asBC_RefCpyV ||
+			c == asBC_OBJTYPE )
+		{
+			// Translate the index to the true object type
+			asPWORD *ot = (asPWORD*)&bc[n+1];
+			*(asCObjectType**)ot = CastToObjectType(FindType(int(*ot)));
+		}
+		else if( c == asBC_TYPEID ||
+			     c == asBC_Cast )
+		{
+			// Translate the index to the type id
+			int *tid = (int*)&bc[n+1];
+			*tid = FindTypeId(*tid);
+		}
+		else if( c == asBC_ADDSi ||
+			     c == asBC_LoadThisR )
+		{
+			// Translate the index to the type id
+			int *tid = (int*)&bc[n+1];
+			*tid = FindTypeId(*tid);
+
+			// Translate the prop index into the property offset
+			*(((short*)&bc[n])+1) = FindObjectPropOffset(*(((short*)&bc[n])+1));
+		}
+		else if( c == asBC_LoadRObjR ||
+			     c == asBC_LoadVObjR )
+		{
+			// Translate the index to the type id
+			int *tid = (int*)&bc[n+2];
+			*tid = FindTypeId(*tid);
+
+			asCObjectType *ot = engine->GetObjectTypeFromTypeId(*tid);
+			if( ot && (ot->flags & asOBJ_LIST_PATTERN) )
+			{
+				// List patterns have a different way of adjusting the offsets
+				SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+				*(((short*)&bc[n])+2) = (short)listAdj->AdjustOffset(*(((short*)&bc[n])+2));
+			}
+			else
+			{
+				// Translate the prop index into the property offset
+				*(((short*)&bc[n])+2) = FindObjectPropOffset(*(((short*)&bc[n])+2));
+			}
+		}
+		else if( c == asBC_COPY )
+		{
+			// Translate the index to the type id
+			int *tid = (int*)&bc[n+1];
+			*tid = FindTypeId(*tid);
+
+			// COPY is used to copy POD types that don't have the opAssign method. It is
+			// also used to copy references to scoped types during variable initializations.
+			// Update the number of dwords to copy as it may be different on the target platform
+			if( (*tid) & asTYPEID_OBJHANDLE )
+			{
+				// It is the actual reference that is being copied, not the object itself
+				asBC_SWORDARG0(&bc[n]) = AS_PTR_SIZE;
+			}
+			else
+			{
+				asCDataType dt = engine->GetDataTypeFromTypeId(*tid);
+				if( !dt.IsValid() )
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+				}
+				else
+					asBC_SWORDARG0(&bc[n]) = (short)dt.GetSizeInMemoryDWords();
+			}
+		}
+		else if( c == asBC_RET )
+		{
+			// Determine the correct amount of DWORDs to pop
+			asWORD dw = (asWORD)func->GetSpaceNeededForArguments();
+			if( func->DoesReturnOnStack() ) dw += AS_PTR_SIZE;
+			if( func->objectType ) dw += AS_PTR_SIZE;
+			asBC_WORDARG0(&bc[n]) = dw;
+		}
+		else if( c == asBC_CALL ||
+				 c == asBC_CALLINTF ||
+				 c == asBC_CALLSYS ||
+				 c == asBC_Thiscall1 )
+		{
+			// Translate the index to the func id
+			int *fid = (int*)&bc[n+1];
+			asCScriptFunction *f = FindFunction(*fid);
+			if( f )
+				*fid = f->id;
+			else
+			{
+				Error(TXT_INVALID_BYTECODE_d);
+				return;
+			}
+		}
+		else if( c == asBC_FuncPtr )
+		{
+			// Translate the index to the func pointer
+			asPWORD *fid = (asPWORD*)&bc[n+1];
+			*fid = (asPWORD)FindFunction(int(*fid));
+		}
+		else if( c == asBC_ALLOC )
+		{
+			// Translate the index to the true object type
+			asPWORD *arg = (asPWORD*)&bc[n+1];
+			*(asCObjectType**)arg = CastToObjectType(FindType(int(*arg)));
+
+			// The constructor function id must be translated, unless it is zero
+			int *fid = (int*)&bc[n+1+AS_PTR_SIZE];
+			if( *fid != 0 )
+			{
+				// Subtract 1 from the id, as it was incremented during the writing
+				asCScriptFunction *f = FindFunction(*fid-1);
+				if( f )
+					*fid = f->id;
+				else
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+					return;
+				}
+			}
+		}
+		else if( c == asBC_STR )
+		{
+			Error(TXT_INVALID_BYTECODE_d);
+			return;
+		}
+		else if( c == asBC_CALLBND )
+		{
+			// Translate the function id
+			asUINT *fid = (asUINT*)&bc[n+1];
+			if( *fid < module->m_bindInformations.GetLength() )
+			{
+				sBindInfo *bi = module->m_bindInformations[*fid];
+				if( bi )
+					*fid = bi->importedFunctionSignature->id;
+				else
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+					return;
+				}
+			}
+			else
+			{
+				Error(TXT_INVALID_BYTECODE_d);
+				return;
+			}
+		}
+		else if( c == asBC_PGA      ||
+			     c == asBC_PshGPtr  ||
+			     c == asBC_LDG      ||
+				 c == asBC_PshG4    ||
+				 c == asBC_LdGRdR4  ||
+				 c == asBC_CpyGtoV4 ||
+				 c == asBC_CpyVtoG4 ||
+				 c == asBC_SetG4    )
+		{
+			// Translate the index to pointer
+			asPWORD *index = (asPWORD*)&bc[n + 1];
+			if ((*index & 1))
+			{
+				if ((asUINT(*index)>>1) < usedGlobalProperties.GetLength())
+					*(void**)index = usedGlobalProperties[asUINT(*index)>>1];
+				else
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+					return;
+				}
+			}
+			else
+			{
+				// Only PGA and PshGPtr can hold string constants
+				asASSERT(c == asBC_PGA || c == asBC_PshGPtr);
+
+				if ((asUINT(*index)>>1) < usedStringConstants.GetLength())
+					*(void**)index = usedStringConstants[asUINT(*index)>>1];
+				else
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+					return;
+				}
+			}
+		}
+		else if( c == asBC_JMP    ||
+			     c == asBC_JZ     ||
+				 c == asBC_JNZ    ||
+			     c == asBC_JLowZ  ||
+				 c == asBC_JLowNZ ||
+				 c == asBC_JS     ||
+				 c == asBC_JNS    ||
+				 c == asBC_JP     ||
+				 c == asBC_JNP    ) // The JMPP instruction doesn't need modification
+		{
+			// Get the offset
+			int offset = int(bc[n+1]);
+
+			// Count the instruction sizes to the destination instruction
+			int size = 0;
+			if( offset >= 0 )
+				// If moving ahead, then start from next instruction
+				for( asUINT num = bcNum+1; offset-- > 0; num++ )
+					size += bcSizes[num];
+			else
+				// If moving backwards, then start at current instruction
+				for( asUINT num = bcNum; offset++ < 0; num-- )
+					size -= bcSizes[num];
+
+			// The size is dword offset
+			bc[n+1] = size;
+		}
+		else if( c == asBC_AllocMem )
+		{
+			// The size of the allocated memory is only known after all the elements has been seen.
+			// This helper class will collect this information and adjust the size when the
+			// corresponding asBC_FREE is encountered
+
+			// The adjuster also needs to know the list type so it can know the type of the elements
+			asCObjectType *ot = CastToObjectType(func->GetTypeInfoOfLocalVar(asBC_SWORDARG0(&bc[n])));
+			listAdjusters.PushLast(asNEW(SListAdjuster)(this, &bc[n], ot));
+		}
+		else if( c == asBC_FREE )
+		{
+			// Translate the index to the true object type
+			asPWORD *pot = (asPWORD*)&bc[n+1];
+			*(asCObjectType**)pot = CastToObjectType(FindType(int(*pot)));
+
+			asCObjectType *ot = *(asCObjectType**)pot;
+			if( ot && (ot->flags & asOBJ_LIST_PATTERN) )
+			{
+				if( listAdjusters.GetLength() == 0 )
+				{
+					Error(TXT_INVALID_BYTECODE_d);
+					return;
+				}
+
+				// Finalize the adjustment of the list buffer that was initiated with asBC_AllocMem
+				SListAdjuster *list = listAdjusters.PopLast();
+				list->AdjustAllocMem();
+				asDELETE(list, SListAdjuster);
+			}
+		}
+		else if( c == asBC_SetListSize )
+		{
+			// Adjust the offset in the list where the size is informed
+			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
+
+			// Inform the list adjuster how many values will be repeated
+			listAdj->SetRepeatCount(bc[n+2]);
+		}
+		else if( c == asBC_PshListElmnt )
+		{
+			// Adjust the offset in the list where the size is informed
+			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
+		}
+		else if( c == asBC_SetListType )
+		{
+			// Adjust the offset in the list where the typeid is informed
+			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+			bc[n+1] = listAdj->AdjustOffset(bc[n+1]);
+
+			// Translate the type id
+			bc[n+2] = FindTypeId(bc[n+2]);
+
+			// Inform the list adjuster the type id of the next element
+			listAdj->SetNextType(bc[n+2]);
+		}
+
+		n += asBCTypeSize[asBCInfo[c].type];
+	}
+
+	// Calculate the stack adjustments
+	CalculateAdjustmentByPos(func);
+
+	// Adjust all variable positions in the bytecode
+	bc = func->scriptData->byteCode.AddressOf();
+	for( n = 0; n < bcLength; )
+	{
+		int c = *(asBYTE*)&bc[n];
+		switch( asBCInfo[c].type )
+		{
+		case asBCTYPE_wW_ARG:
+		case asBCTYPE_rW_DW_ARG:
+		case asBCTYPE_wW_QW_ARG:
+		case asBCTYPE_rW_ARG:
+		case asBCTYPE_wW_DW_ARG:
+		case asBCTYPE_wW_W_ARG:
+		case asBCTYPE_rW_QW_ARG:
+		case asBCTYPE_rW_W_DW_ARG:
+		case asBCTYPE_rW_DW_DW_ARG:
+			{
+				asBC_SWORDARG0(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG0(&bc[n]));
+			}
+			break;
+
+		case asBCTYPE_wW_rW_ARG:
+		case asBCTYPE_wW_rW_DW_ARG:
+		case asBCTYPE_rW_rW_ARG:
+			{
+				asBC_SWORDARG0(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG0(&bc[n]));
+				asBC_SWORDARG1(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG1(&bc[n]));
+			}
+			break;
+
+		case asBCTYPE_wW_rW_rW_ARG:
+			{
+				asBC_SWORDARG0(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG0(&bc[n]));
+				asBC_SWORDARG1(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG1(&bc[n]));
+				asBC_SWORDARG2(&bc[n]) = (short)AdjustStackPosition(asBC_SWORDARG2(&bc[n]));
+			}
+			break;
+
+		default:
+			// The other types don't treat variables so won't be modified
+			break;
+		}
+
+		n += asBCTypeSize[asBCInfo[c].type];
+	}
+
+	// Adjust the space needed for local variables
+	func->scriptData->variableSpace = AdjustStackPosition(func->scriptData->variableSpace);
+
+	// Adjust the variable information. This will be used during the adjustment below
+	for( n = 0; n < func->scriptData->variables.GetLength(); n++ )
+	{
+		func->scriptData->variables[n]->declaredAtProgramPos = instructionNbrToPos[func->scriptData->variables[n]->declaredAtProgramPos];
+		func->scriptData->variables[n]->stackOffset = AdjustStackPosition(func->scriptData->variables[n]->stackOffset);
+	}
+
+	// Adjust the get offsets. This must be done in the second iteration because
+	// it relies on the function ids and variable position already being correct in the
+	// bytecodes that come after the GET instructions.
+	// TODO: optimize: Instead of doing a full extra loop. We can push the GET instructions
+	//                 on a stack, and then when a call instruction is found update all of them.
+	//                 This will also make the AdjustGetOffset() function quicker as it can
+	//                 receive the called function directly instead of having to search for it.
+	bc = func->scriptData->byteCode.AddressOf();
+	for( n = 0; n < bcLength; )
+	{
+		int c = *(asBYTE*)&bc[n];
+
+		if( c == asBC_GETREF ||
+		    c == asBC_GETOBJ ||
+		    c == asBC_GETOBJREF ||
+		    c == asBC_ChkNullS )
+		{
+			asBC_WORDARG0(&bc[n]) = (asWORD)AdjustGetOffset(asBC_WORDARG0(&bc[n]), func, n);
+		}
+
+		n += asBCTypeSize[asBCInfo[c].type];
+	}
+
+	for( n = 0; n < func->scriptData->objVariableInfo.GetLength(); n++ )
+	{
+		// The program position must be adjusted as it is stored in number of instructions
+		func->scriptData->objVariableInfo[n].programPos = instructionNbrToPos[func->scriptData->objVariableInfo[n].programPos];
+		func->scriptData->objVariableInfo[n].variableOffset = AdjustStackPosition(func->scriptData->objVariableInfo[n].variableOffset);
+	}
+
+	for (n = 0; n < func->scriptData->tryCatchInfo.GetLength(); n++)
+	{
+		func->scriptData->tryCatchInfo[n].tryPos = instructionNbrToPos[func->scriptData->tryCatchInfo[n].tryPos];
+		func->scriptData->tryCatchInfo[n].catchPos = instructionNbrToPos[func->scriptData->tryCatchInfo[n].catchPos];
+	}
+
+	// The program position (every even number) needs to be adjusted
+	// for the line numbers to be in number of dwords instead of number of instructions
+	for( n = 0; n < func->scriptData->lineNumbers.GetLength(); n += 2 )
+		func->scriptData->lineNumbers[n] = instructionNbrToPos[func->scriptData->lineNumbers[n]];
+	for( n = 0; n < func->scriptData->sectionIdxs.GetLength(); n += 2 )
+		func->scriptData->sectionIdxs[n] = instructionNbrToPos[func->scriptData->sectionIdxs[n]];
+
+	CalculateStackNeeded(func);
+}
+
+asCReader::SListAdjuster::SListAdjuster(asCReader *rd, asDWORD *bc, asCObjectType *listType) :
+	reader(rd), allocMemBC(bc), maxOffset(0), patternType(listType), repeatCount(0), lastOffset(-1), nextOffset(0), nextTypeId(-1)
+{
+	asASSERT( patternType && (patternType->flags & asOBJ_LIST_PATTERN) );
+
+	// Find the first expected value in the list
+	asSListPatternNode *node = patternType->engine->scriptFunctions[patternType->templateSubTypes[0].GetBehaviour()->listFactory]->listPattern;
+	asASSERT( node && node->type == asLPT_START );
+	patternNode = node->next;
+}
+
+int asCReader::SListAdjuster::AdjustOffset(int offset)
+{
+	if( offset < lastOffset )
+	{
+		reader->Error(TXT_INVALID_BYTECODE_d);
+		return 0;
+	}
+
+	// If it is the same offset being accessed again, just return the same adjusted value
+	if( lastOffset == offset )
+		return lastAdjustedOffset;
+
+	lastOffset = offset;
+	lastAdjustedOffset = maxOffset;
+
+	// What is being expected at this position?
+	if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
+	{
+		// Align the offset to 4 bytes boundary
+		if( maxOffset & 0x3 )
+		{
+			maxOffset += 4 - (maxOffset & 0x3);
+			lastAdjustedOffset = maxOffset;
+		}
+
+		// Don't move the patternNode yet because the caller must make a call to SetRepeatCount too
+		maxOffset += 4;
+		nextOffset = offset+1;
+		return lastAdjustedOffset;
+	}
+	else if( patternNode->type == asLPT_TYPE )
+	{
+		const asCDataType &dt = reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType;
+		if( dt.GetTokenType() == ttQuestion )
+		{
+			if( nextTypeId != -1 )
+			{
+				if( repeatCount > 0 )
+					repeatCount--;
+
+				asCDataType nextdt = patternType->engine->GetDataTypeFromTypeId(nextTypeId);
+				asUINT size;
+				if(nextdt.IsObjectHandle() || (nextdt.GetTypeInfo() && (nextdt.GetTypeInfo()->flags & asOBJ_REF)) )
+					size = AS_PTR_SIZE*4;
+				else
+					size = nextdt.GetSizeInMemoryBytes();
+
+				// Align the offset to 4 bytes boundary
+				if( size >= 4 && (maxOffset & 0x3) )
+				{
+					maxOffset += 4 - (maxOffset & 0x3);
+					lastAdjustedOffset = maxOffset;
+				}
+
+				// Only move the patternNode if we're not expecting any more repeated entries
+				if( repeatCount == 0 )
+					patternNode = patternNode->next;
+
+				nextTypeId = -1;
+
+				maxOffset += size;
+				nextOffset = offset+1;
+				return lastAdjustedOffset;
+			}
+			else
+			{
+				// Align the offset to 4 bytes boundary
+				if( maxOffset & 0x3 )
+				{
+					maxOffset += 4 - (maxOffset & 0x3);
+					lastAdjustedOffset = maxOffset;
+				}
+
+				// The first adjustment is for the typeId
+				maxOffset += 4;
+				nextOffset = offset+1;
+				return lastAdjustedOffset;
+			}
+		}
+		else
+		{
+			// Determine the size of the element
+			asUINT size;
+			if( dt.IsObjectHandle() || (dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_REF)) )
+				size = AS_PTR_SIZE*4;
+			else
+				size = dt.GetSizeInMemoryBytes();
+
+			// If values are skipped, the offset needs to be incremented
+			while( nextOffset <= offset )
+			{
+				if( repeatCount > 0 )
+					repeatCount--;
+
+				// Align the offset to 4 bytes boundary
+				if( size >= 4 && (maxOffset & 0x3) )
+					maxOffset += 4 - (maxOffset & 0x3);
+
+				lastAdjustedOffset = maxOffset;
+				nextOffset += 1;
+				maxOffset += size;
+			}
+
+			// Only move the patternNode if we're not expecting any more repeated entries
+			if( repeatCount == 0 )
+				patternNode = patternNode->next;
+
+			nextOffset = offset+1;
+			return lastAdjustedOffset;
+		}
+	}
+	else if( patternNode->type == asLPT_START )
+	{
+		if( repeatCount > 0 )
+			repeatCount--;
+		SInfo info = {repeatCount, patternNode};
+		stack.PushLast(info);
+
+		repeatCount = 0;
+		patternNode = patternNode->next;
+
+		lastOffset--;
+		return AdjustOffset(offset);
+	}
+	else if( patternNode->type == asLPT_END )
+	{
+		if( stack.GetLength() == 0 )
+		{
+			reader->Error(TXT_INVALID_BYTECODE_d);
+			return 0;
+		}
+
+		SInfo info = stack.PopLast();
+		repeatCount = info.repeatCount;
+		if( repeatCount )
+			patternNode = info.startNode;
+		else
+			patternNode = patternNode->next;
+
+		lastOffset--;
+		return AdjustOffset(offset);
+	}
+	else
+	{
+		// Something is wrong with the pattern list declaration
+		reader->Error(TXT_INVALID_BYTECODE_d);
+		return 0;
+	}
+
+	UNREACHABLE_RETURN;
+}
+
+void asCReader::SListAdjuster::SetRepeatCount(asUINT rc)
+{
+	// Make sure the list is expecting a repeat at this location
+	asASSERT( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME );
+
+	// Now move to the next patternNode
+	patternNode = patternNode->next;
+
+	repeatCount = rc;
+}
+
+void asCReader::SListAdjuster::AdjustAllocMem()
+{
+	allocMemBC[1] = maxOffset;
+}
+
+void asCReader::SListAdjuster::SetNextType(int typeId)
+{
+	asASSERT( nextTypeId == -1 );
+
+	nextTypeId = typeId;
+}
+
+void asCReader::CalculateStackNeeded(asCScriptFunction *func)
+{
+	asASSERT( func->scriptData );
+
+	int largestStackUsed = 0;
+
+	// Clear the known stack size for each bytecode
+	asCArray<int> stackSize;
+	stackSize.SetLength(func->scriptData->byteCode.GetLength());
+	memset(&stackSize[0], -1, stackSize.GetLength()*4);
+
+	// Add the first instruction to the list of unchecked code
+	// paths and set the stack size at that instruction to variableSpace
+	asCArray<asUINT> paths;
+	paths.PushLast(0);
+	stackSize[0] = func->scriptData->variableSpace;
+
+	// Go through each of the code paths
+	for( asUINT p = 0; p < paths.GetLength(); ++p )
+	{
+		asUINT pos = paths[p];
+		int currStackSize = stackSize[pos];
+
+		asBYTE bc = *(asBYTE*)&func->scriptData->byteCode[pos];
+		if( bc == asBC_RET )
+			continue;
+
+		// Determine the change in stack size for this instruction
+		int stackInc = asBCInfo[bc].stackInc;
+		if( stackInc == 0xFFFF )
+		{
+			// Determine the true delta from the instruction arguments
+			if( bc == asBC_CALL ||
+				bc == asBC_CALLSYS ||
+				bc == asBC_Thiscall1 ||
+				bc == asBC_CALLBND ||
+				bc == asBC_ALLOC ||
+				bc == asBC_CALLINTF ||
+				bc == asBC_CallPtr )
+			{
+				asCScriptFunction *called = func->GetCalledFunction(pos);
+				if( called )
+				{
+					stackInc = -called->GetSpaceNeededForArguments();
+					if( called->objectType )
+						stackInc -= AS_PTR_SIZE;
+					if( called->DoesReturnOnStack() )
+						stackInc -= AS_PTR_SIZE;
+				}
+				else
+				{
+					// It is an allocation for an object without a constructor
+					asASSERT( bc == asBC_ALLOC );
+					stackInc = -AS_PTR_SIZE;
+				}
+			}
+		}
+
+		currStackSize += stackInc;
+		asASSERT( currStackSize >= 0 );
+
+		if( currStackSize > largestStackUsed )
+			largestStackUsed = currStackSize;
+
+		if( bc == asBC_JMP )
+		{
+			// Find the label that we should jump to
+			int offset = asBC_INTARG(&func->scriptData->byteCode[pos]);
+			pos += 2 + offset;
+
+			// Add the destination as a new path
+			if( stackSize[pos] == -1 )
+			{
+				stackSize[pos] = currStackSize;
+				paths.PushLast(pos);
+			}
+			else
+				asASSERT(stackSize[pos] == currStackSize);
+			continue;
+		}
+		else if( bc == asBC_JZ    || bc == asBC_JNZ    ||
+				 bc == asBC_JLowZ || bc == asBC_JLowNZ ||
+				 bc == asBC_JS    || bc == asBC_JNS    ||
+				 bc == asBC_JP    || bc == asBC_JNP )
+		{
+			// Find the label that is being jumped to
+			int offset = asBC_INTARG(&func->scriptData->byteCode[pos]);
+
+			// Add both paths to the code paths
+			pos += 2;
+			if( stackSize[pos] == -1 )
+			{
+				stackSize[pos] = currStackSize;
+				paths.PushLast(pos);
+			}
+			else
+				asASSERT(stackSize[pos] == currStackSize);
+
+			pos += offset;
+			if( stackSize[pos] == -1 )
+			{
+				stackSize[pos] = currStackSize;
+				paths.PushLast(pos);
+			}
+			else
+				asASSERT(stackSize[pos] == currStackSize);
+
+			continue;
+		}
+		else if( bc == asBC_JMPP )
+		{
+			pos++;
+
+			// Add all subsequent JMP instructions to the path
+			while( *(asBYTE*)&func->scriptData->byteCode[pos] == asBC_JMP )
+			{
+				if( stackSize[pos] == -1 )
+				{
+					stackSize[pos] = currStackSize;
+					paths.PushLast(pos);
+				}
+				else
+					asASSERT(stackSize[pos] == currStackSize);
+				pos += 2;
+			}
+			continue;
+		}
+		else
+		{
+			// Add next instruction to the paths
+			pos += asBCTypeSize[asBCInfo[bc].type];
+			if( stackSize[pos] == -1 )
+			{
+				stackSize[pos] = currStackSize;
+				paths.PushLast(pos);
+			}
+			else
+				asASSERT(stackSize[pos] == currStackSize);
+
+			continue;
+		}
+	}
+
+	func->scriptData->stackNeeded = largestStackUsed;
+}
+
+void asCReader::CalculateAdjustmentByPos(asCScriptFunction *func)
+{
+	// Adjust the offset of all negative variables (parameters) as
+	// all pointers have been stored as having a size of 1 dword
+	asUINT n;
+	asCArray<int> adjustments;
+	asUINT offset = 0;
+	if( func->objectType )
+	{
+		adjustments.PushLast(offset);
+		adjustments.PushLast(1-AS_PTR_SIZE);
+		offset += 1;
+	}
+	if( func->DoesReturnOnStack() )
+	{
+		adjustments.PushLast(offset);
+		adjustments.PushLast(1-AS_PTR_SIZE);
+		offset += 1;
+	}
+	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
+	{
+		if( !func->parameterTypes[n].IsPrimitive() ||
+			func->parameterTypes[n].IsReference() )
+		{
+			adjustments.PushLast(offset);
+			adjustments.PushLast(1-AS_PTR_SIZE);
+			offset += 1;
+		}
+		else
+		{
+			asASSERT( func->parameterTypes[n].IsPrimitive() );
+			offset += func->parameterTypes[n].GetSizeOnStackDWords();
+		}
+	}
+
+	// Build look-up table with the adjustments for each stack position
+	adjustNegativeStackByPos.SetLength(offset);
+	memset(adjustNegativeStackByPos.AddressOf(), 0, adjustNegativeStackByPos.GetLength()*sizeof(int));
+	for( n = 0; n < adjustments.GetLength(); n+=2 )
+	{
+		int pos    = adjustments[n];
+		int adjust = adjustments[n+1];
+
+		for( asUINT i = pos+1; i < adjustNegativeStackByPos.GetLength(); i++ )
+			adjustNegativeStackByPos[i] += adjust;
+	}
+
+	// The bytecode has been stored as if all object variables take up only 1 dword.
+	// It is necessary to adjust to the size according to the current platform.
+	adjustments.SetLength(0);
+	int highestPos = 0;
+	for (n = 0; n < func->scriptData->variables.GetLength(); n++)
+	{
+		// Skip function parameters as these are adjusted by adjustNegativeStackByPos
+		if (func->scriptData->variables[n]->stackOffset <= 0)
+			continue;
+
+		asCDataType t = func->scriptData->variables[n]->type;
+		if (!t.IsObject() && !t.IsObjectHandle())
+			continue;
+
+		// Determing the size of the variable currently occupies on the stack
+		int size = AS_PTR_SIZE;
+		if (t.GetTypeInfo() && (t.GetTypeInfo()->GetFlags() & asOBJ_VALUE) && !func->scriptData->variables[n]->onHeap)
+			size = t.GetSizeInMemoryDWords();
+
+		// Check if type has a different size than stored
+		if (size > 1)
+		{
+			if (func->scriptData->variables[n]->stackOffset > highestPos)
+				highestPos = func->scriptData->variables[n]->stackOffset;
+
+			adjustments.PushLast(func->scriptData->variables[n]->stackOffset);
+			adjustments.PushLast(size - 1);
+		}
+	}
+
+	// Count position 0 too
+	adjustByPos.SetLength(highestPos+1);
+	memset(adjustByPos.AddressOf(), 0, adjustByPos.GetLength()*sizeof(int));
+
+	// Build look-up table with the adjustments for each stack position
+	for( n = 0; n < adjustments.GetLength(); n+=2 )
+	{
+		int pos    = adjustments[n];
+		int adjust = adjustments[n+1];
+
+		for( asUINT i = pos; i < adjustByPos.GetLength(); i++ )
+			adjustByPos[i] += adjust;
+	}
+}
+
+int asCReader::AdjustStackPosition(int pos)
+{
+	if( pos >= (int)adjustByPos.GetLength() )
+	{
+		// It can be higher for primitives allocated on top of highest object variable
+		if( adjustByPos.GetLength() )
+			pos += (short)adjustByPos[adjustByPos.GetLength()-1];
+	}
+	else if( pos >= 0 )
+		pos += (short)adjustByPos[pos];
+	else if( -pos >= (int)adjustNegativeStackByPos.GetLength() )
+		Error(TXT_INVALID_BYTECODE_d);
+	else
+		pos += (short)adjustNegativeStackByPos[-pos];
+
+	return pos;
+}
+
+int asCReader::AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos)
+{
+	// TODO: optimize: multiple instructions for the same function doesn't need to look for the function everytime
+	//                 the function can remember where it found the function and check if the programPos is still valid
+
+	// Get offset 0 doesn't need adjustment
+	if( offset == 0 ) return 0;
+
+	bool bcAlloc = false;
+
+	// Find out which function that will be called
+	// TODO: Can the asCScriptFunction::FindNextFunctionCalled be adapted so it can be reused here (support for asBC_ALLOC, asBC_REFCPY and asBC_COPY)?
+	asCScriptFunction *calledFunc = 0;
+	int stackDelta = 0;
+	for( asUINT n = programPos; func->scriptData->byteCode.GetLength(); )
+	{
+		asBYTE bc = *(asBYTE*)&func->scriptData->byteCode[n];
+		if( bc == asBC_CALL ||
+			bc == asBC_CALLSYS ||
+			bc == asBC_Thiscall1 ||
+			bc == asBC_CALLINTF ||
+			bc == asBC_ALLOC ||
+			bc == asBC_CALLBND ||
+			bc == asBC_CallPtr )
+		{
+			// The alloc instruction allocates the object memory
+			// so it doesn't take the this pointer as input
+			if (bc == asBC_ALLOC)
+				bcAlloc = true;
+
+			calledFunc = func->GetCalledFunction(n);
+			break;
+		}
+		else if( bc == asBC_REFCPY ||
+				 bc == asBC_COPY )
+		{
+			// In this case we know there is only 1 pointer on the stack above
+			asASSERT( offset == 1 );
+			return offset - (1 - AS_PTR_SIZE);
+		}
+
+		// Keep track of the stack size between the
+		// instruction that needs to be adjusted and the call
+		stackDelta += asBCInfo[bc].stackInc;
+
+		n += asBCTypeSize[asBCInfo[bc].type];
+	}
+
+	if( calledFunc == 0 )
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+		return offset;
+	}
+
+	// Count the number of pointers pushed on the stack above the
+	// current offset, and then adjust the offset accordingly
+	asUINT numPtrs = 0;
+	int currOffset = -stackDelta;
+	if( offset > currOffset && calledFunc->GetObjectType() && !bcAlloc )
+	{
+		currOffset++;
+		if( currOffset > 0 )
+			numPtrs++;
+#if AS_PTR_SIZE == 2
+		// For 64bit platforms it is necessary to increment the currOffset by one more
+		// DWORD since the stackDelta was counting the full 64bit size of the pointer
+		else if( stackDelta )
+			currOffset++;
+#endif
+	}
+	if( offset > currOffset && calledFunc->DoesReturnOnStack() )
+	{
+		currOffset++;
+		if( currOffset > 0 )
+			numPtrs++;
+#if AS_PTR_SIZE == 2
+		// For 64bit platforms it is necessary to increment the currOffset by one more
+		// DWORD since the stackDelta was counting the full 64bit size of the pointer
+		else if( stackDelta )
+			currOffset++;
+#endif
+	}
+	for( asUINT p = 0; p < calledFunc->parameterTypes.GetLength(); p++ )
+	{
+		if( offset <= currOffset ) break;
+
+		if( !calledFunc->parameterTypes[p].IsPrimitive() ||
+			calledFunc->parameterTypes[p].IsReference() )
+		{
+			currOffset++;
+			if( currOffset > 0 )
+				numPtrs++;
+#if AS_PTR_SIZE == 2
+			// For 64bit platforms it is necessary to increment the currOffset by one more
+			// DWORD since the stackDelta was counting the full 64bit size of the pointer
+			else if( stackDelta )
+				currOffset++;
+#endif
+
+			// The variable arg ? has an additiona 32bit integer with the typeid
+			if( calledFunc->parameterTypes[p].IsAnyType() )
+				currOffset += 1;
+		}
+		else
+		{
+			// Enums or built-in primitives are passed by value
+			asASSERT( calledFunc->parameterTypes[p].IsPrimitive() );
+			currOffset += calledFunc->parameterTypes[p].GetSizeOnStackDWords();
+		}
+	}
+
+	return offset - numPtrs * (1 - AS_PTR_SIZE);
+}
+
+int asCReader::FindTypeId(int idx)
+{
+	if( idx >= 0 && idx < (int)usedTypeIds.GetLength() )
+		return usedTypeIds[idx];
+	else
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+		return 0;
+	}
+}
+
+asCTypeInfo *asCReader::FindType(int idx)
+{
+	if( idx < 0 || idx >= (int)usedTypes.GetLength() )
+	{
+		Error(TXT_INVALID_BYTECODE_d);
+		return 0;
+	}
+
+	return usedTypes[idx];
+}
+
+#ifndef AS_NO_COMPILER
+
+asCWriter::asCWriter(asCModule* _module, asIBinaryStream* _stream, asCScriptEngine* _engine, bool _stripDebug)
+	: module(_module), stream(_stream), engine(_engine), stripDebugInfo(_stripDebug), error(false), bytesWritten(0)
+{
+}
+
+int asCWriter::Error(const char *msg)
+{
+	// Don't write if it has already been reported an error earlier
+	if (!error)
+	{
+		asCString str;
+		str.Format(msg, bytesWritten);
+		engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		error = true;
+	}
+
+	return asERROR;
+}
+
+int asCWriter::WriteData(const void *data, asUINT size)
+{
+	asASSERT(size == 1 || size == 2 || size == 4 || size == 8);
+	int ret = 0;
+#if defined(AS_BIG_ENDIAN)
+	for( asUINT n = 0; ret >= 0 && n < size; n++ )
+		ret = stream->Write(((asBYTE*)data)+n, 1);
+#else
+	for( int n = size-1; ret >= 0 && n >= 0; n-- )
+		ret = stream->Write(((asBYTE*)data)+n, 1);
+#endif
+	if (ret < 0)
+		Error(TXT_UNEXPECTED_END_OF_FILE);
+	bytesWritten += size;
+	return ret;
+}
+
+int asCWriter::Write()
+{
+	TimeIt("asCWriter::Write");
+
+	unsigned long i, count;
+
+	// Store everything in the same order that the builder parses scripts
+
+	// TODO: Should be possible to skip saving the enum values. They are usually not needed after the script is compiled anyway
+	// TODO: Should be possible to skip saving the typedefs. They are usually not needed after the script is compiled anyway
+	// TODO: Should be possible to skip saving constants. They are usually not needed after the script is compiled anyway
+
+	// Write the flag as 1byte even on platforms with 4byte booleans
+	WriteEncodedInt64(stripDebugInfo ? 1 : 0);
+
+	// Store enums
+	{
+		TimeIt("store enums");
+
+		count = (asUINT)module->m_enumTypes.GetLength();
+		WriteEncodedInt64(count);
+		for( i = 0; i < count; i++ )
+		{
+			WriteTypeDeclaration(module->m_enumTypes[i], 1);
+			WriteTypeDeclaration(module->m_enumTypes[i], 2);
+		}
+	}
+
+	// Store type declarations first
+	{
+		TimeIt("type declarations");
+
+		count = (asUINT)module->m_classTypes.GetLength();
+		WriteEncodedInt64(count);
+		for( i = 0; i < count; i++ )
+		{
+			// Store only the name of the class/interface types
+			WriteTypeDeclaration(module->m_classTypes[i], 1);
+		}
+	}
+
+	// Store func defs
+	{
+		TimeIt("func defs");
+
+		count = (asUINT)module->m_funcDefs.GetLength();
+		WriteEncodedInt64(count);
+		for( i = 0; i < count; i++ )
+			WriteFunction(module->m_funcDefs[i]->funcdef);
+	}
+
+	// Now store all interface methods
+	{
+		TimeIt("interface methods");
+
+		count = (asUINT)module->m_classTypes.GetLength();
+		for( i = 0; i < count; i++ )
+		{
+			if( module->m_classTypes[i]->IsInterface() )
+				WriteTypeDeclaration(module->m_classTypes[i], 2);
+		}
+	}
+
+	// Then store the class methods and behaviours
+	{
+		TimeIt("class methods and behaviours");
+
+		for( i = 0; i < count; ++i )
+		{
+			if( !module->m_classTypes[i]->IsInterface() )
+				WriteTypeDeclaration(module->m_classTypes[i], 2);
+		}
+	}
+
+	// Then store the class properties
+	{
+		TimeIt("class properties");
+
+		for( i = 0; i < count; ++i )
+		{
+			if( !module->m_classTypes[i]->IsInterface() )
+				WriteTypeDeclaration(module->m_classTypes[i], 3);
+		}
+	}
+
+	// Store typedefs
+	{
+		TimeIt("type defs");
+
+		count = (asUINT)module->m_typeDefs.GetLength();
+		WriteEncodedInt64(count);
+		for( i = 0; i < count; i++ )
+		{
+			WriteTypeDeclaration(module->m_typeDefs[i], 1);
+			WriteTypeDeclaration(module->m_typeDefs[i], 2);
+		}
+	}
+
+	// scriptGlobals[]
+	{
+		TimeIt("script globals");
+
+		count = (asUINT)module->m_scriptGlobals.GetSize();
+		WriteEncodedInt64(count);
+		asCSymbolTable<asCGlobalProperty>::iterator it = module->m_scriptGlobals.List();
+		for( ; it; it++ )
+			WriteGlobalProperty(*it);
+	}
+
+	// scriptFunctions[]
+	{
+		TimeIt("scriptFunctions");
+
+		count = 0;
+		for( i = 0; i < module->m_scriptFunctions.GetLength(); i++ )
+			if( module->m_scriptFunctions[i]->objectType == 0 )
+				count++;
+		WriteEncodedInt64(count);
+		for( i = 0; i < module->m_scriptFunctions.GetLength(); ++i )
+			if( module->m_scriptFunctions[i]->objectType == 0 )
+				WriteFunction(module->m_scriptFunctions[i]);
+	}
+
+	// globalFunctions[]
+	{
+		TimeIt("globalFunctions");
+
+		count = (int)module->m_globalFunctions.GetSize();
+		asCSymbolTable<asCScriptFunction>::iterator funcIt = module->m_globalFunctions.List();
+		WriteEncodedInt64(count);
+		while( funcIt )
+		{
+			WriteFunction(*funcIt);
+			funcIt++;
+		}
+	}
+
+	// bindInformations[]
+	{
+		TimeIt("bindInformations");
+
+		count = (asUINT)module->m_bindInformations.GetLength();
+		WriteEncodedInt64(count);
+		for( i = 0; i < count; ++i )
+		{
+			WriteFunction(module->m_bindInformations[i]->importedFunctionSignature);
+			WriteString(&module->m_bindInformations[i]->importFromModule);
+		}
+	}
+
+	// usedTypes[]
+	{
+		TimeIt("usedTypes");
+
+		count = (asUINT)usedTypes.GetLength();
+		WriteEncodedInt64(count);
+		for( i = 0; i < count; ++i )
+			WriteTypeInfo(usedTypes[i]);
+	}
+
+	// usedTypeIds[]
+	WriteUsedTypeIds();
+
+	// usedFunctions[]
+	WriteUsedFunctions();
+
+	// usedGlobalProperties[]
+	WriteUsedGlobalProps();
+
+	// usedStringConstants[]
+	WriteUsedStringConstants();
+
+	// usedObjectProperties[]
+	WriteUsedObjectProps();
+
+	return error ? asERROR : asSUCCESS;
+}
+
+int asCWriter::FindStringConstantIndex(void *str)
+{
+	asSMapNode<void*, int> *cursor = 0;
+	if (stringToIndexMap.MoveTo(&cursor, str))
+		return cursor->value;
+
+	usedStringConstants.PushLast(str);
+	int index = int(usedStringConstants.GetLength() - 1);
+	stringToIndexMap.Insert(str, index);
+	return index;
+}
+
+void asCWriter::WriteUsedStringConstants()
+{
+	TimeIt("asCWriter::WriteUsedStringConstants");
+
+	asUINT count = (asUINT)usedStringConstants.GetLength();
+	WriteEncodedInt64(count);
+
+	asCString str;
+	for (asUINT i = 0; i < count; ++i)
+	{
+		asUINT length;
+		engine->stringFactory->GetRawStringData(usedStringConstants[i], 0, &length);
+		str.SetLength(length);
+		engine->stringFactory->GetRawStringData(usedStringConstants[i], str.AddressOf(), &length);
+		WriteString(&str);
+	}
+}
+
+void asCWriter::WriteUsedFunctions()
+{
+	TimeIt("asCWriter::WriteUsedFunctions");
+
+	asUINT count = (asUINT)usedFunctions.GetLength();
+	WriteEncodedInt64(count);
+
+	for( asUINT n = 0; n < usedFunctions.GetLength(); n++ )
+	{
+		char c;
+
+		// Write enough data to be able to uniquely identify the function upon load
+		asCScriptFunction *func = usedFunctions[n];
+		if(func)
+		{
+			// Is the function from the module or the application?
+			c = func->module ? 'm' : 'a';
+
+			// Functions and methods that are shared should be stored as 's' as the bytecode
+			// may be imported from other modules (even if the current module have received ownership)
+			if (c == 'm' && func->IsShared() )
+				c = 's';
+
+			WriteData(&c, 1);
+			WriteFunctionSignature(func);
+		}
+		else
+		{
+			// null function pointer
+			c = 'n';
+			WriteData(&c, 1);
+		}
+	}
+}
+
+void asCWriter::WriteFunctionSignature(asCScriptFunction *func)
+{
+	asUINT i, count;
+
+	WriteString(&func->name);
+	if( func->name == DELEGATE_FACTORY )
+	{
+		// It's not necessary to write anything else
+		return;
+	}
+
+	WriteDataType(&func->returnType);
+
+	count = (asUINT)func->parameterTypes.GetLength();
+	WriteEncodedInt64(count);
+	for( i = 0; i < count; ++i )
+		WriteDataType(&func->parameterTypes[i]);
+
+	// Only write the inout flags if any of them are set
+	// If the number of parameters is 0, then no need to save this
+	if (func->parameterTypes.GetLength() > 0)
+	{
+		count = 0;
+		for (i = asUINT(func->inOutFlags.GetLength()); i > 0; i--)
+			if (func->inOutFlags[i - 1] != asTM_NONE)
+			{
+				count = i;
+				break;
+			}
+		WriteEncodedInt64(count);
+		for (i = 0; i < count; ++i)
+			WriteEncodedInt64(func->inOutFlags[i]);
+	}
+
+	WriteEncodedInt64(func->funcType);
+
+	// Write the default args, from last to first
+	// If the number of parameters is 0, then no need to save this
+	if (func->parameterTypes.GetLength() > 0)
+	{
+		count = 0;
+		for (i = (asUINT)func->defaultArgs.GetLength(); i-- > 0; )
+			if (func->defaultArgs[i])
+				count++;
+		WriteEncodedInt64(count);
+		for (i = (asUINT)func->defaultArgs.GetLength(); i-- > 0; )
+			if (func->defaultArgs[i])
+				WriteString(func->defaultArgs[i]);
+	}
+
+	WriteTypeInfo(func->objectType);
+
+	if( func->objectType )
+	{
+		asBYTE b = 0;
+		b += func->IsReadOnly() ? 1 : 0;
+		b += func->IsPrivate() ? 2 : 0;
+		b += func->IsProtected() ? 4 : 0;
+		WriteData(&b, 1);
+	}
+	else
+	{
+		if (func->funcType == asFUNC_FUNCDEF)
+		{
+			if (func->nameSpace)
+			{
+				// This funcdef was declared as global entity
+				asBYTE b = 'n';
+				WriteData(&b, 1);
+				WriteString(&func->nameSpace->name);
+			}
+			else
+			{
+				// This funcdef was declared as class member
+				asBYTE b = 'o';
+				WriteData(&b, 1);
+				WriteTypeInfo(func->funcdefType->parentClass);
+			}
+		}
+		else
+			WriteString(&func->nameSpace->name);
+	}
+}
+
+void asCWriter::WriteFunction(asCScriptFunction* func)
+{
+	char c;
+
+	// If there is no function, then store a null char
+	if( func == 0 )
+	{
+		c = '\0';
+		WriteData(&c, 1);
+		return;
+	}
+
+	// First check if the function has been saved already
+	for( asUINT f = 0; f < savedFunctions.GetLength(); f++ )
+	{
+		if( savedFunctions[f] == func )
+		{
+			c = 'r';
+			WriteData(&c, 1);
+			WriteEncodedInt64(f);
+			return;
+		}
+	}
+
+	// Keep a reference to the function in the list
+	savedFunctions.PushLast(func);
+
+	c = 'f';
+	WriteData(&c, 1);
+
+	asUINT i, count;
+
+	WriteFunctionSignature(func);
+
+	if( func->funcType == asFUNC_SCRIPT )
+	{
+		// Skip this for external shared entities
+		if (module->m_externalTypes.IndexOf(func->objectType) >= 0)
+			return;
+
+		char bits = 0;
+		bits += func->IsShared() ? 1 : 0;
+		bits += func->dontCleanUpOnException ? 2 : 0;
+		if (module->m_externalFunctions.IndexOf(func) >= 0)
+			bits += 4;
+		if (func->scriptData->objVariableInfo.GetLength())
+			bits += 8;
+		if (func->scriptData->tryCatchInfo.GetLength())
+			bits += 16;
+		bits += func->IsExplicit() ? 32 : 0;
+		WriteData(&bits, 1);
+
+		// For external shared functions the rest is not needed
+		if (bits & 4)
+			return;
+
+		// Calculate the adjustment by position lookup table
+		CalculateAdjustmentByPos(func);
+
+		WriteByteCode(func);
+
+		asDWORD varSpace = AdjustStackPosition(func->scriptData->variableSpace);
+		WriteEncodedInt64(varSpace);
+
+		if (bits & 8)
+		{
+			WriteEncodedInt64((asUINT)func->scriptData->objVariableInfo.GetLength());
+			for (i = 0; i < func->scriptData->objVariableInfo.GetLength(); ++i)
+			{
+				// The program position must be adjusted to be in number of instructions
+				WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->objVariableInfo[i].programPos]);
+				WriteEncodedInt64(AdjustStackPosition(func->scriptData->objVariableInfo[i].variableOffset));
+				WriteEncodedInt64(func->scriptData->objVariableInfo[i].option);
+			}
+		}
+
+		if (bits & 16)
+		{
+			// Write info on try/catch blocks
+			WriteEncodedInt64((asUINT)func->scriptData->tryCatchInfo.GetLength());
+			for (i = 0; i < func->scriptData->tryCatchInfo.GetLength(); ++i)
+			{
+				// The program position must be adjusted to be in number of instructions
+				WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->tryCatchInfo[i].tryPos]);
+				WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->tryCatchInfo[i].catchPos]);
+			}
+		}
+
+		// The program position (every even number) needs to be adjusted
+		// to be in number of instructions instead of DWORD offset
+		if( !stripDebugInfo )
+		{
+			asUINT length = (asUINT)func->scriptData->lineNumbers.GetLength();
+			WriteEncodedInt64(length);
+			for( i = 0; i < length; ++i )
+			{
+				if( (i & 1) == 0 )
+					WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->lineNumbers[i]]);
+				else
+					WriteEncodedInt64(func->scriptData->lineNumbers[i]);
+			}
+
+			// Write the array of script sections
+			length = (asUINT)func->scriptData->sectionIdxs.GetLength();
+			WriteEncodedInt64(length);
+			for( i = 0; i < length; ++i )
+			{
+				if( (i & 1) == 0 )
+					WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->sectionIdxs[i]]);
+				else
+				{
+					if( func->scriptData->sectionIdxs[i] >= 0 )
+						WriteString(engine->scriptSectionNames[func->scriptData->sectionIdxs[i]]);
+					else
+					{
+						c = 0;
+						WriteData(&c, 1);
+					}
+				}
+			}
+		}
+
+		// Write the variable information
+		// Even without the debug info the type and position of the variables
+		// must be stored, as this is used for serializing contexts
+		// TODO: Store the type info/position in an intelligent way to avoid duplicating info in objVariablePos & objVariableTypes.
+		// TODO: Perhaps objVariablePos & objVariableTypes should be retired now that all variable types must be stored anyway
+		WriteEncodedInt64((asUINT)func->scriptData->variables.GetLength());
+		for( i = 0; i < func->scriptData->variables.GetLength(); i++ )
+		{
+			if (!stripDebugInfo)
+			{
+				// The program position must be adjusted to be in number of instructions
+				WriteEncodedInt64(bytecodeNbrByPos[func->scriptData->variables[i]->declaredAtProgramPos]);
+				WriteString(&func->scriptData->variables[i]->name);
+			}
+
+			// The stack position must be adjusted according to the pointer sizes
+			asUINT data = AdjustStackPosition(func->scriptData->variables[i]->stackOffset) << 1;
+			// Encode the onHeap flag in the stackOffset to avoid 1 byte increase
+			data |= func->scriptData->variables[i]->onHeap & 1;
+			WriteEncodedInt64(data);
+			WriteDataType(&func->scriptData->variables[i]->type);
+		}
+
+		// Store script section name
+		if( !stripDebugInfo )
+		{
+			if( func->scriptData->scriptSectionIdx >= 0 )
+				WriteString(engine->scriptSectionNames[func->scriptData->scriptSectionIdx]);
+			else
+			{
+				c = 0;
+				WriteData(&c, 1);
+			}
+			WriteEncodedInt64(func->scriptData->declaredAt);
+		}
+
+		// Store the parameter names
+		if( !stripDebugInfo )
+		{
+			count = asUINT(func->parameterNames.GetLength());
+			WriteEncodedInt64(count);
+			for( asUINT n = 0; n < count; n++ )
+				WriteString(&func->parameterNames[n]);
+		}
+	}
+	else if( func->funcType == asFUNC_VIRTUAL || func->funcType == asFUNC_INTERFACE )
+	{
+		// TODO: Do we really need to store this? It can probably be reconstructed by the reader
+		WriteEncodedInt64(func->vfTableIdx);
+	}
+	else if( func->funcType == asFUNC_FUNCDEF )
+	{
+		char bits = 0;
+		bits += func->IsShared() ? 1 : 0;
+		if (module->m_externalTypes.IndexOf(func->funcdefType) >= 0)
+			bits += 2;
+		WriteData(&bits,1);
+	}
+}
+
+void asCWriter::WriteTypeDeclaration(asCTypeInfo *type, int phase)
+{
+	if( phase == 1 )
+	{
+		// name
+		WriteString(&type->name);
+		// flags
+		WriteData(&type->flags, 4);
+
+		// size
+		// TODO: Do we really need to store this? The reader should be able to
+		//       determine the correct size from the object type's flags
+		if( (type->flags & asOBJ_SCRIPT_OBJECT) && type->size > 0 )
+		{
+			// The size for script objects may vary from platform to platform so
+			// only store 1 to diferentiate from interfaces that have size 0.
+			WriteEncodedInt64(1);
+		}
+		else
+		{
+			// Enums, typedefs, and interfaces have fixed sizes independently
+			// of platform so it is safe to serialize the size directly.
+			WriteEncodedInt64(type->size);
+		}
+
+		// namespace
+		WriteString(&type->nameSpace->name);
+
+		// external shared flag
+		if ((type->flags & asOBJ_SHARED))
+		{
+			char c = ' ';
+			if (module->m_externalTypes.IndexOf(type) >= 0)
+				c = 'e';
+			WriteData(&c, 1);
+		}
+	}
+	else if( phase == 2 )
+	{
+		// external shared types doesn't need to save this
+		if ((type->flags & asOBJ_SHARED) && module->m_externalTypes.IndexOf(type) >= 0)
+			return;
+
+		if(type->flags & asOBJ_ENUM )
+		{
+			// enumValues[]
+			asCEnumType *t = CastToEnumType(type);
+			int size = (int)t->enumValues.GetLength();
+			WriteEncodedInt64(size);
+
+			for( int n = 0; n < size; n++ )
+			{
+				WriteString(&t->enumValues[n]->name);
+				WriteData(&t->enumValues[n]->value, 4);
+			}
+		}
+		else if(type->flags & asOBJ_TYPEDEF )
+		{
+			asCTypedefType *td = CastToTypedefType(type);
+			eTokenType t = td->aliasForType.GetTokenType();
+			WriteEncodedInt64(t);
+		}
+		else
+		{
+			asCObjectType *t = CastToObjectType(type);
+			WriteTypeInfo(t->derivedFrom);
+
+			// interfaces[] / interfaceVFTOffsets[]
+			// TOOD: Is it really necessary to store the VFTOffsets? Can't the reader calculate those?
+			int size = (asUINT)t->interfaces.GetLength();
+			WriteEncodedInt64(size);
+			asUINT n;
+			asASSERT( t->IsInterface() || t->interfaces.GetLength() == t->interfaceVFTOffsets.GetLength() );
+			for( n = 0; n < t->interfaces.GetLength(); n++ )
+			{
+				WriteTypeInfo(t->interfaces[n]);
+				if( !t->IsInterface() )
+					WriteEncodedInt64(t->interfaceVFTOffsets[n]);
+			}
+
+			// behaviours
+			// TODO: Default behaviours should just be stored as a indicator
+			//       to avoid storing the actual function object
+			if( !t->IsInterface() && type->flags != asOBJ_TYPEDEF && type->flags != asOBJ_ENUM )
+			{
+				WriteFunction(engine->scriptFunctions[t->beh.destruct]);
+				size = (int)t->beh.constructors.GetLength();
+				WriteEncodedInt64(size);
+				for( n = 0; n < t->beh.constructors.GetLength(); n++ )
+				{
+					WriteFunction(engine->scriptFunctions[t->beh.constructors[n]]);
+					WriteFunction(engine->scriptFunctions[t->beh.factories[n]]);
+				}
+			}
+
+			// methods[]
+			// TODO: Avoid storing inherited methods in interfaces, as the reader
+			//       can add those directly from the base interface
+			size = (int)t->methods.GetLength();
+			WriteEncodedInt64(size);
+			for( n = 0; n < t->methods.GetLength(); n++ )
+			{
+				WriteFunction(engine->scriptFunctions[t->methods[n]]);
+			}
+
+			// virtualFunctionTable[]
+			// TODO: Is it really necessary to store this? Can't it be easily rebuilt by the reader
+			size = (int)t->virtualFunctionTable.GetLength();
+			WriteEncodedInt64(size);
+			for( n = 0; n < (asUINT)size; n++ )
+			{
+				WriteFunction(t->virtualFunctionTable[n]);
+			}
+		}
+	}
+	else if( phase == 3 )
+	{
+		// external shared types doesn't need to save this
+		if ((type->flags & asOBJ_SHARED) && module->m_externalTypes.IndexOf(type) >= 0)
+			return;
+
+		// properties[]
+		asCObjectType *t = CastToObjectType(type);
+
+		// This is only done for object types
+		asASSERT(t);
+
+		asUINT size = (asUINT)t->properties.GetLength();
+		WriteEncodedInt64(size);
+		for (asUINT n = 0; n < t->properties.GetLength(); n++)
+		{
+			WriteObjectProperty(t->properties[n]);
+		}
+	}
+}
+
+void asCWriter::WriteEncodedInt64(asINT64 i)
+{
+	asBYTE signBit = ( i & asINT64(1)<<63 ) ? 0x80 : 0;
+	if( signBit ) i = -i;
+
+	asBYTE b;
+	if( i < (1<<6) )
+	{
+		b = (asBYTE)(signBit + i); WriteData(&b, 1);
+	}
+	else if( i < (1<<13) )
+	{
+		b = asBYTE(0x40 + signBit + (i >> 8)); WriteData(&b, 1);
+		b = asBYTE(i & 0xFF);                  WriteData(&b, 1);
+	}
+	else if( i < (1<<20) )
+	{
+		b = asBYTE(0x60 + signBit + (i >> 16)); WriteData(&b, 1);
+		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
+		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
+	}
+	else if( i < (1<<27) )
+	{
+		b = asBYTE(0x70 + signBit + (i >> 24)); WriteData(&b, 1);
+		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
+		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
+	}
+	else if( i < (asINT64(1)<<34) )
+	{
+		b = asBYTE(0x78 + signBit + (i >> 32)); WriteData(&b, 1);
+		b = asBYTE((i >> 24) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
+		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
+	}
+	else if( i < (asINT64(1)<<41) )
+	{
+		b = asBYTE(0x7C + signBit + (i >> 40)); WriteData(&b, 1);
+		b = asBYTE((i >> 32) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 24) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
+		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
+	}
+	else if( i < (asINT64(1)<<48) )
+	{
+		b = asBYTE(0x7E + signBit + (i >> 48)); WriteData(&b, 1);
+		b = asBYTE((i >> 40) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 32) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 24) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 16) & 0xFF);           WriteData(&b, 1);
+		b = asBYTE((i >> 8) & 0xFF);            WriteData(&b, 1);
+		b = asBYTE(i & 0xFF);                   WriteData(&b, 1);
+	}
+	else
+	{
+		b = asBYTE(0x7F + signBit);   WriteData(&b, 1);
+		b = asBYTE((i >> 56) & 0xFF); WriteData(&b, 1);
+		b = asBYTE((i >> 48) & 0xFF); WriteData(&b, 1);
+		b = asBYTE((i >> 40) & 0xFF); WriteData(&b, 1);
+		b = asBYTE((i >> 32) & 0xFF); WriteData(&b, 1);
+		b = asBYTE((i >> 24) & 0xFF); WriteData(&b, 1);
+		b = asBYTE((i >> 16) & 0xFF); WriteData(&b, 1);
+		b = asBYTE((i >> 8) & 0xFF);  WriteData(&b, 1);
+		b = asBYTE(i & 0xFF);         WriteData(&b, 1);
+	}
+}
+
+void asCWriter::WriteString(asCString* str)
+{
+	// First check if the string hasn't been saved already
+	asSMapNode<asCString, int> *cursor = 0;
+	if (stringToIdMap.MoveTo(&cursor, *str))
+	{
+		// Save a reference to the existing string
+		// The lowest bit is set to 1 to indicate a reference
+		WriteEncodedInt64(cursor->value*2+1);
+		return;
+	}
+
+	// Save a new string
+	// The lowest bit is set to 0 to indicate a new string
+	asUINT len = (asUINT)str->GetLength();
+	WriteEncodedInt64(len*2);
+
+	if( len > 0 )
+	{
+		stream->Write(str->AddressOf(), (asUINT)len);
+		bytesWritten += len;
+
+		savedStrings.PushLast(*str);
+		stringToIdMap.Insert(*str, int(savedStrings.GetLength()) - 1);
+	}
+}
+
+void asCWriter::WriteGlobalProperty(asCGlobalProperty* prop)
+{
+	// TODO: We might be able to avoid storing the name and type of the global
+	//       properties twice if we merge this with the WriteUsedGlobalProperties.
+	WriteString(&prop->name);
+	WriteString(&prop->nameSpace->name);
+	WriteDataType(&prop->type);
+
+	// Store the initialization function
+	WriteFunction(prop->GetInitFunc());
+}
+
+void asCWriter::WriteObjectProperty(asCObjectProperty* prop)
+{
+	WriteString(&prop->name);
+	WriteDataType(&prop->type);
+	int flags = 0;
+	if( prop->isPrivate ) flags |= 1;
+	if( prop->isProtected ) flags |= 2;
+	if( prop->isInherited ) flags |= 4;
+	WriteEncodedInt64(flags);
+}
+
+void asCWriter::WriteDataType(const asCDataType *dt)
+{
+	// First check if the datatype has already been saved
+	for( asUINT n = 0; n < savedDataTypes.GetLength(); n++ )
+	{
+		if( *dt == savedDataTypes[n] )
+		{
+			WriteEncodedInt64(n+1);
+			return;
+		}
+	}
+
+	// Indicate a new type with a null byte
+	asUINT c = 0;
+	WriteEncodedInt64(c);
+
+	// Save the new datatype
+	savedDataTypes.PushLast(*dt);
+
+	int t = dt->GetTokenType();
+	WriteEncodedInt64(t);
+	if( t == ttIdentifier )
+		WriteTypeInfo(dt->GetTypeInfo());
+
+	// Endianess safe bitmask
+	char bits = 0;
+	SAVE_TO_BIT(bits, dt->IsObjectHandle(), 0);
+	SAVE_TO_BIT(bits, dt->IsHandleToConst(), 1);
+	SAVE_TO_BIT(bits, dt->IsReference(), 2);
+	SAVE_TO_BIT(bits, dt->IsReadOnly(), 3);
+	WriteData(&bits, 1);
+}
+
+void asCWriter::WriteTypeInfo(asCTypeInfo* ti)
+{
+	char ch;
+
+	if( ti )
+	{
+		// Check for template instances/specializations
+		asCObjectType *ot = CastToObjectType(ti);
+		if( ot && ot->templateSubTypes.GetLength() )
+		{
+			// Check for list pattern type or template type
+			if( ot->flags & asOBJ_LIST_PATTERN )
+			{
+				ch = 'l'; // list
+				WriteData(&ch, 1);
+				WriteTypeInfo(ot->templateSubTypes[0].GetTypeInfo());
+			}
+			else
+			{
+				ch = 'a'; // array
+				WriteData(&ch, 1);
+				WriteString(&ot->name);
+				WriteString(&ot->nameSpace->name);
+
+				WriteEncodedInt64(ot->templateSubTypes.GetLength());
+				for( asUINT n = 0; n < ot->templateSubTypes.GetLength(); n++ )
+				{
+					if( !ot->templateSubTypes[n].IsPrimitive() || ot->templateSubTypes[n].IsEnumType() )
+					{
+						ch = 's'; // sub type
+						WriteData(&ch, 1);
+						WriteDataType(&ot->templateSubTypes[n]);
+					}
+					else
+					{
+						ch = 't'; // token
+						WriteData(&ch, 1);
+						eTokenType t = ot->templateSubTypes[n].GetTokenType();
+						WriteEncodedInt64(t);
+					}
+				}
+			}
+		}
+		else if( ti->flags & asOBJ_TEMPLATE_SUBTYPE )
+		{
+			ch = 's'; // sub type
+			WriteData(&ch, 1);
+			WriteString(&ti->name);
+		}
+		else if( !ti->GetParentType() )
+		{
+			ch = 'o'; // object
+			WriteData(&ch, 1);
+			WriteString(&ti->name);
+			WriteString(&ti->nameSpace->name);
+		}
+		else
+		{
+			asASSERT(ti->flags & asOBJ_FUNCDEF);
+
+			ch = 'c'; // child type
+			WriteData(&ch, 1);
+			WriteString(&ti->name);
+			WriteTypeInfo(CastToFuncdefType(ti)->parentClass);
+		}
+	}
+	else
+	{
+		ch = '\0';
+		WriteData(&ch, 1);
+	}
+}
+
+void asCWriter::CalculateAdjustmentByPos(asCScriptFunction *func)
+{
+	// Adjust the offset of all negative variables (parameters) so all pointers will have a size of 1 dword
+	asUINT n;
+	asCArray<int> adjustments;
+	asUINT offset = 0;
+	if( func->objectType )
+	{
+		adjustments.PushLast(offset);
+		adjustments.PushLast(1-AS_PTR_SIZE);
+		offset += AS_PTR_SIZE;
+	}
+	if( func->DoesReturnOnStack() )
+	{
+		adjustments.PushLast(offset);
+		adjustments.PushLast(1-AS_PTR_SIZE);
+		offset += AS_PTR_SIZE;
+	}
+	for( n = 0; n < func->parameterTypes.GetLength(); n++ )
+	{
+		if( !func->parameterTypes[n].IsPrimitive() ||
+			func->parameterTypes[n].IsReference() )
+		{
+			adjustments.PushLast(offset);
+			adjustments.PushLast(1-AS_PTR_SIZE);
+			offset += AS_PTR_SIZE;
+		}
+		else
+		{
+			asASSERT( func->parameterTypes[n].IsPrimitive() );
+			offset += func->parameterTypes[n].GetSizeOnStackDWords();
+		}
+	}
+
+	// Build look-up table with the adjustments for each stack position
+	adjustNegativeStackByPos.SetLength(offset);
+	memset(adjustNegativeStackByPos.AddressOf(), 0, adjustNegativeStackByPos.GetLength()*sizeof(int));
+	for( n = 0; n < adjustments.GetLength(); n+=2 )
+	{
+		int pos    = adjustments[n];
+		int adjust = adjustments[n+1];
+
+		for( asUINT i = pos+1; i < adjustNegativeStackByPos.GetLength(); i++ )
+			adjustNegativeStackByPos[i] += adjust;
+	}
+
+	// Adjust the offset of all positive variables so that all object types and handles have a size of 1 dword
+	// This is similar to how the adjustment is done in the asCReader::TranslateFunction, only the reverse
+	adjustments.SetLength(0);
+	for (n = 0; n < func->scriptData->variables.GetLength(); n++)
+	{
+		// Skip function parameters as these are adjusted by adjustNegativeStackByPos
+		if (func->scriptData->variables[n]->stackOffset <= 0)
+			continue;
+
+		asCDataType t = func->scriptData->variables[n]->type;
+		if (!t.IsObject() && !t.IsObjectHandle())
+			continue;
+
+		// Determing the size of the variable currently occupies on the stack
+		int size = AS_PTR_SIZE;
+		if (t.GetTypeInfo() && (t.GetTypeInfo()->GetFlags() & asOBJ_VALUE) && !func->scriptData->variables[n]->onHeap)
+			size = t.GetSizeInMemoryDWords();
+
+		// If larger than 1 dword, adjust the offsets accordingly
+		if (size > 1)
+		{
+			// How much needs to be adjusted?
+			adjustments.PushLast(func->scriptData->variables[n]->stackOffset);
+			adjustments.PushLast(-(size - 1));
+		}
+	}
+
+	// Build look-up table with the adjustments for each stack position
+	adjustStackByPos.SetLength(func->scriptData->stackNeeded+AS_PTR_SIZE); // Add space for a pointer stored in a temporary variable
+	memset(adjustStackByPos.AddressOf(), 0, adjustStackByPos.GetLength()*sizeof(int));
+	for( n = 0; n < adjustments.GetLength(); n+=2 )
+	{
+		int pos    = adjustments[n];
+		int adjust = adjustments[n+1];
+
+		for( asUINT i = pos; i < adjustStackByPos.GetLength(); i++ )
+			adjustStackByPos[i] += adjust;
+	}
+
+	// Compute the sequence number of each bytecode instruction in order to update the jump offsets
+	asUINT length = func->scriptData->byteCode.GetLength();
+	asDWORD *bc = func->scriptData->byteCode.AddressOf();
+	bytecodeNbrByPos.SetLength(length);
+	asUINT num;
+	for( offset = 0, num = 0; offset < length; )
+	{
+		bytecodeNbrByPos[offset] = num;
+		offset += asBCTypeSize[asBCInfo[*(asBYTE*)(bc+offset)].type];
+		num++;
+	}
+
+	// Store the number of instructions in the last position of bytecodeNbrByPos, 
+	// so this can be easily queried in SaveBytecode. Normally this is already done
+	// as most functions end with BC_RET, but in some cases the last instruction in 
+	// the function is not a BC_RET, e.g. when a function has a never ending loop.
+	bytecodeNbrByPos[length - 1] = num - 1;
+}
+
+int asCWriter::AdjustStackPosition(int pos)
+{
+	if( pos >= (int)adjustStackByPos.GetLength() )
+	{
+		// This happens for example if the function only have temporary variables
+		// The adjustByPos can also be empty if the function doesn't have any variables at all, but receive a handle by parameter
+		if( adjustStackByPos.GetLength() > 0 )
+			pos += adjustStackByPos[adjustStackByPos.GetLength()-1];
+	}
+	else if( pos >= 0 )
+		pos += adjustStackByPos[pos];
+	else
+	{
+		asASSERT( -pos < (int)adjustNegativeStackByPos.GetLength() );
+		pos -= (short)adjustNegativeStackByPos[-pos];
+	}
+
+	return pos;
+}
+
+int asCWriter::AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos)
+{
+	// TODO: optimize: multiple instructions for the same function doesn't need to look for the function everytime
+	//                 the function can remember where it found the function and check if the programPos is still valid
+
+	// Get offset 0 doesn't need adjustment
+	if( offset == 0 ) return 0;
+
+	bool bcAlloc = false;
+
+	// Find out which function that will be called
+	asCScriptFunction *calledFunc = 0;
+	int stackDelta = 0;
+	for( asUINT n = programPos; n < func->scriptData->byteCode.GetLength(); )
+	{
+		asBYTE bc = *(asBYTE*)&func->scriptData->byteCode[n];
+		if( bc == asBC_CALL ||
+			bc == asBC_CALLSYS ||
+			bc == asBC_Thiscall1 ||
+			bc == asBC_CALLINTF )
+		{
+			// Find the function from the function id in bytecode
+			int funcId = asBC_INTARG(&func->scriptData->byteCode[n]);
+			calledFunc = engine->scriptFunctions[funcId];
+			break;
+		}
+		else if( bc == asBC_ALLOC )
+		{
+			// The alloc instruction doesn't take the object pointer on the stack,
+			// as the memory will be allocated by the instruction itself
+			bcAlloc = true;
+
+			// Find the function from the function id in the bytecode
+			int funcId = asBC_INTARG(&func->scriptData->byteCode[n+AS_PTR_SIZE]);
+			calledFunc = engine->scriptFunctions[funcId];
+			break;
+		}
+		else if( bc == asBC_CALLBND )
+		{
+			// Find the function from the engine's bind array
+			int funcId = asBC_INTARG(&func->scriptData->byteCode[n]);
+			calledFunc = engine->importedFunctions[funcId & ~FUNC_IMPORTED]->importedFunctionSignature;
+			break;
+		}
+		else if( bc == asBC_CallPtr )
+		{
+			int var = asBC_SWORDARG0(&func->scriptData->byteCode[n]);
+			asUINT v;
+			// Find the funcdef from the local variable
+			for (v = 0; v < func->scriptData->variables.GetLength(); v++)
+			{
+				if (func->scriptData->variables[v]->stackOffset == var)
+				{
+					asASSERT(func->scriptData->variables[v]->type.GetTypeInfo());
+					calledFunc = CastToFuncdefType(func->scriptData->variables[v]->type.GetTypeInfo())->funcdef;
+					break;
+				}
+			}
+			if( !calledFunc )
+			{
+				// Look in parameters
+				int paramPos = 0;
+				if( func->objectType )
+					paramPos -= AS_PTR_SIZE;
+				if( func->DoesReturnOnStack() )
+					paramPos -= AS_PTR_SIZE;
+				for( v = 0; v < func->parameterTypes.GetLength(); v++ )
+				{
+					if( var == paramPos )
+					{
+						calledFunc = CastToFuncdefType(func->parameterTypes[v].GetTypeInfo())->funcdef;
+						break;
+					}
+					paramPos -= func->parameterTypes[v].GetSizeOnStackDWords();
+				}
+			}
+			break;
+		}
+		else if( bc == asBC_REFCPY ||
+				 bc == asBC_COPY )
+		{
+			// In this case we know there is only 1 pointer on the stack above
+			asASSERT( offset == AS_PTR_SIZE );
+			return offset + (1 - AS_PTR_SIZE);
+		}
+
+		// Keep track of the stack size between the
+		// instruction that needs to be adjusted and the call
+		stackDelta += asBCInfo[bc].stackInc;
+
+		n += asBCTypeSize[asBCInfo[bc].type];
+	}
+
+	asASSERT( calledFunc );
+
+	// Count the number of pointers pushed on the stack above the
+	// current offset, and then adjust the offset accordingly
+	asUINT numPtrs = 0;
+	int currOffset = -stackDelta;
+	if( offset > currOffset && calledFunc->GetObjectType() && !bcAlloc )
+	{
+		currOffset += AS_PTR_SIZE;
+		if( currOffset > 0 )
+			numPtrs++;
+	}
+	if( offset > currOffset && calledFunc->DoesReturnOnStack() )
+	{
+		currOffset += AS_PTR_SIZE;
+		if( currOffset > 0 )
+			numPtrs++;
+	}
+	for( asUINT p = 0; p < calledFunc->parameterTypes.GetLength(); p++ )
+	{
+		if( offset <= currOffset ) break;
+
+		if( !calledFunc->parameterTypes[p].IsPrimitive() ||
+			calledFunc->parameterTypes[p].IsReference() )
+		{
+			// objects and references are passed by pointer
+			currOffset += AS_PTR_SIZE;
+			if( currOffset > 0 )
+				numPtrs++;
+
+			// The variable arg ? has an additional 32bit int with the typeid
+			if( calledFunc->parameterTypes[p].IsAnyType() )
+				currOffset += 1;
+		}
+		else
+		{
+			// built-in primitives or enums are passed by value
+			asASSERT( calledFunc->parameterTypes[p].IsPrimitive() );
+			currOffset += calledFunc->parameterTypes[p].GetSizeOnStackDWords();
+		}
+	}
+
+	// The get offset must match one of the parameter offsets
+	asASSERT( offset == currOffset );
+
+	return offset + numPtrs * (1 - AS_PTR_SIZE);
+}
+
+void asCWriter::WriteByteCode(asCScriptFunction *func)
+{
+	asDWORD *bc   = func->scriptData->byteCode.AddressOf();
+	size_t length = func->scriptData->byteCode.GetLength();
+
+	// The length cannot be stored, because it is platform dependent,
+	// instead we store the number of instructions
+	asUINT count = bytecodeNbrByPos[bytecodeNbrByPos.GetLength()-1] + 1;
+	WriteEncodedInt64(count);
+
+	asDWORD *startBC = bc;
+	while( length )
+	{
+		asDWORD tmpBC[4]; // The biggest instructions take up 4 DWORDs
+		asDWORD c = *(asBYTE*)bc;
+
+		// Copy the instruction to a temp buffer so we can work on it before saving
+		memcpy(tmpBC, bc, asBCTypeSize[asBCInfo[c].type]*sizeof(asDWORD));
+
+		if( c == asBC_ALLOC ) // PTR_DW_ARG
+		{
+			// Translate the object type
+			asCObjectType *ot = *(asCObjectType**)(tmpBC+1);
+			*(asPWORD*)(tmpBC+1) = FindTypeInfoIdx(ot);
+
+			// Translate the constructor func id, unless it is 0
+			if( *(int*)&tmpBC[1+AS_PTR_SIZE] != 0 )
+			{
+				// Increment 1 to the translated function id, as 0 will be reserved for no function
+				*(int*)&tmpBC[1+AS_PTR_SIZE] = 1+FindFunctionIndex(engine->scriptFunctions[*(int*)&tmpBC[1+AS_PTR_SIZE]]);
+			}
+		}
+		else if( c == asBC_REFCPY  || // PTR_ARG
+				 c == asBC_RefCpyV || // wW_PTR_ARG
+				 c == asBC_OBJTYPE )  // PTR_ARG
+		{
+			// Translate object type pointers into indices
+			*(asPWORD*)(tmpBC+1) = FindTypeInfoIdx(*(asCObjectType**)(tmpBC+1));
+		}
+		else if( c == asBC_JitEntry ) // PTR_ARG
+		{
+			// We don't store the JIT argument
+			*(asPWORD*)(tmpBC+1) = 0;
+		}
+		else if( c == asBC_TYPEID || // DW_ARG
+			     c == asBC_Cast )    // DW_ARG
+		{
+			// Translate type ids into indices
+			*(int*)(tmpBC+1) = FindTypeIdIdx(*(int*)(tmpBC+1));
+		}
+		else if( c == asBC_ADDSi ||      // W_DW_ARG
+			     c == asBC_LoadThisR )   // W_DW_ARG
+		{
+			// Translate property offsets into indices
+			*(((short*)tmpBC)+1) = (short)FindObjectPropIndex(*(((short*)tmpBC)+1), *(int*)(tmpBC+1), bc);
+
+			// Translate type ids into indices
+			*(int*)(tmpBC+1) = FindTypeIdIdx(*(int*)(tmpBC+1));
+		}
+		else if( c == asBC_LoadRObjR ||    // rW_W_DW_ARG
+			     c == asBC_LoadVObjR )     // rW_W_DW_ARG
+		{
+			asCObjectType *ot = engine->GetObjectTypeFromTypeId(*(int*)(tmpBC+2));
+			if( ot->flags & asOBJ_LIST_PATTERN )
+			{
+				// List patterns have a different way of translating the offsets
+				SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+				*(((short*)tmpBC)+2) = (short)listAdj->AdjustOffset(*(((short*)tmpBC)+2), ot);
+			}
+			else
+			{
+				// Translate property offsets into indices
+				*(((short*)tmpBC)+2) = (short)FindObjectPropIndex(*(((short*)tmpBC)+2), *(int*)(tmpBC+2), bc);
+			}
+
+			// Translate type ids into indices
+			*(int*)(tmpBC+2) = FindTypeIdIdx(*(int*)(tmpBC+2));
+		}
+		else if( c == asBC_COPY )        // W_DW_ARG
+		{
+			// Translate type ids into indices
+			*(int*)(tmpBC+1) = FindTypeIdIdx(*(int*)(tmpBC+1));
+
+			// Update the WORDARG0 to 0, as this will be recalculated on the target platform
+			asBC_WORDARG0(tmpBC) = 0;
+		}
+		else if( c == asBC_RET ) // W_ARG
+		{
+			// Save with arg 0, as this will be recalculated on the target platform
+			asBC_WORDARG0(tmpBC) = 0;
+		}
+		else if( c == asBC_CALL ||     // DW_ARG
+				 c == asBC_CALLINTF || // DW_ARG
+				 c == asBC_CALLSYS ||  // DW_ARG
+				 c == asBC_Thiscall1 ) // DW_ARG
+		{
+			// Translate the function id
+			*(int*)(tmpBC+1) = FindFunctionIndex(engine->scriptFunctions[*(int*)(tmpBC+1)]);
+		}
+		else if( c == asBC_FuncPtr ) // PTR_ARG
+		{
+			// Translate the function pointer
+			*(asPWORD*)(tmpBC+1) = FindFunctionIndex(*(asCScriptFunction**)(tmpBC+1));
+		}
+		else if( c == asBC_CALLBND ) // DW_ARG
+		{
+			// Translate the function id
+			int funcId = tmpBC[1];
+			for( asUINT n = 0; n < module->m_bindInformations.GetLength(); n++ )
+				if( module->m_bindInformations[n]->importedFunctionSignature->id == funcId )
+				{
+					funcId = n;
+					break;
+				}
+
+			tmpBC[1] = funcId;
+		}
+		else if( c == asBC_PGA      || // PTR_ARG
+			     c == asBC_PshGPtr  || // PTR_ARG
+			     c == asBC_LDG      || // PTR_ARG
+				 c == asBC_PshG4    || // PTR_ARG
+				 c == asBC_LdGRdR4  || // wW_PTR_ARG
+				 c == asBC_CpyGtoV4 || // wW_PTR_ARG
+				 c == asBC_CpyVtoG4 || // rW_PTR_ARG
+				 c == asBC_SetG4    )  // PTR_DW_ARG
+		{
+			// Check if the address is a global property or a string constant
+			void *ptr = *(void**)(tmpBC + 1);
+			if (engine->varAddressMap.MoveTo(0, ptr))
+			{
+				// Translate global variable pointers into indices
+				// Flag the first bit to signal global property
+				*(asPWORD*)(tmpBC + 1) = (FindGlobalPropPtrIndex(*(void**)(tmpBC + 1)) << 1) + 1;
+			}
+			else
+			{
+				// Only PGA and PshGPtr can hold string constants
+				asASSERT(c == asBC_PGA || c == asBC_PshGPtr);
+
+				// Translate string constants into indices
+				// Leave the first bit clear to signal string constant
+				*(asPWORD*)(tmpBC + 1) = FindStringConstantIndex(*(void**)(tmpBC + 1)) << 1;
+			}
+		}
+		else if( c == asBC_JMP    ||	// DW_ARG
+			     c == asBC_JZ     ||
+				 c == asBC_JNZ    ||
+				 c == asBC_JLowZ  ||
+				 c == asBC_JLowNZ ||
+				 c == asBC_JS     ||
+				 c == asBC_JNS    ||
+				 c == asBC_JP     ||
+				 c == asBC_JNP    ) // The JMPP instruction doesn't need modification
+		{
+			// Get the DWORD offset from arg
+			int offset = *(int*)(tmpBC+1);
+
+			// Determine instruction number for next instruction and destination
+			int bcSeqNum = bytecodeNbrByPos[asUINT(bc - startBC)] + 1;
+			asDWORD *targetBC = bc + 2 + offset;
+			int targetBcSeqNum = bytecodeNbrByPos[asUINT(targetBC - startBC)];
+
+			// Set the offset in number of instructions
+			*(int*)(tmpBC+1) = targetBcSeqNum - bcSeqNum;
+		}
+		else if( c == asBC_GETOBJ ||    // W_ARG
+			     c == asBC_GETOBJREF ||
+			     c == asBC_GETREF ||
+			     c == asBC_ChkNullS )
+		{
+			// Adjust the offset according to the function call that comes after
+			asBC_WORDARG0(tmpBC) = (asWORD)AdjustGetOffset(asBC_WORDARG0(tmpBC), func, asDWORD(bc - startBC));
+		}
+		else if( c == asBC_AllocMem )
+		{
+			// It's not necessary to store the size of the list buffer, as it will be recalculated in the reader
+			asBC_DWORDARG(tmpBC) = 0;
+
+			// Determine the type of the list pattern from the variable
+			short var = asBC_WORDARG0(tmpBC);
+			asCObjectType *ot = CastToObjectType(func->GetTypeInfoOfLocalVar(var));
+
+			// Create this helper object to adjust the offset of the elements accessed in the buffer
+			listAdjusters.PushLast(asNEW(SListAdjuster)(ot));
+		}
+		else if( c == asBC_FREE ) // wW_PTR_ARG
+		{
+			// Translate object type pointers into indices
+			asCObjectType *ot = *(asCObjectType**)(tmpBC+1);
+			*(asPWORD*)(tmpBC+1) = FindTypeInfoIdx(ot);
+
+			// Pop and destroy the list adjuster helper that was created with asBC_AllocMem
+			if( ot && (ot->flags & asOBJ_LIST_PATTERN) )
+			{
+				SListAdjuster *list = listAdjusters.PopLast();
+				asDELETE(list, SListAdjuster);
+			}
+		}
+		else if( c == asBC_SetListSize )
+		{
+			// Adjust the offset in the initialization list
+			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+			tmpBC[1] = listAdj->AdjustOffset(tmpBC[1], listAdj->patternType);
+
+			// Tell the adjuster how many repeated values there are
+			listAdj->SetRepeatCount(tmpBC[2]);
+		}
+		else if( c == asBC_PshListElmnt )   // W_DW_ARG
+		{
+			// Adjust the offset in the initialization list
+			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+			tmpBC[1] = listAdj->AdjustOffset(tmpBC[1], listAdj->patternType);
+		}
+		else if( c == asBC_SetListType )
+		{
+			// Adjust the offset in the initialization list
+			SListAdjuster *listAdj = listAdjusters[listAdjusters.GetLength()-1];
+			tmpBC[1] = listAdj->AdjustOffset(tmpBC[1], listAdj->patternType);
+
+			// Inform the adjuster of the type id of the next element
+			listAdj->SetNextType(tmpBC[2]);
+
+			// Translate the type id
+			tmpBC[2] = FindTypeIdIdx(tmpBC[2]);
+		}
+		// Adjust the variable offsets
+		switch( asBCInfo[c].type )
+		{
+		case asBCTYPE_wW_ARG:
+		case asBCTYPE_rW_DW_ARG:
+		case asBCTYPE_wW_QW_ARG:
+		case asBCTYPE_rW_ARG:
+		case asBCTYPE_wW_DW_ARG:
+		case asBCTYPE_wW_W_ARG:
+		case asBCTYPE_rW_QW_ARG:
+		case asBCTYPE_rW_W_DW_ARG:
+		case asBCTYPE_rW_DW_DW_ARG:
+			{
+				asBC_SWORDARG0(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG0(tmpBC));
+			}
+			break;
+
+		case asBCTYPE_wW_rW_ARG:
+		case asBCTYPE_wW_rW_DW_ARG:
+		case asBCTYPE_rW_rW_ARG:
+			{
+				asBC_SWORDARG0(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG0(tmpBC));
+				asBC_SWORDARG1(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG1(tmpBC));
+			}
+			break;
+
+		case asBCTYPE_wW_rW_rW_ARG:
+			{
+				asBC_SWORDARG0(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG0(tmpBC));
+				asBC_SWORDARG1(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG1(tmpBC));
+				asBC_SWORDARG2(tmpBC) = (short)AdjustStackPosition(asBC_SWORDARG2(tmpBC));
+			}
+			break;
+
+		default:
+			// The other types don't treat variables so won't be modified
+			break;
+		}
+
+		// TODO: bytecode: Must make sure that floats and doubles are always stored the same way regardless of platform.
+		//                 Some platforms may not use the IEEE 754 standard, in which case it is necessary to encode the values
+
+		// Now store the instruction in the smallest possible way
+		switch( asBCInfo[c].type )
+		{
+		case asBCTYPE_NO_ARG:
+			{
+				// Just write 1 byte
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+			}
+			break;
+		case asBCTYPE_W_ARG:
+		case asBCTYPE_wW_ARG:
+		case asBCTYPE_rW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the argument
+				short w = *(((short*)tmpBC)+1);
+				WriteEncodedInt64(w);
+			}
+			break;
+		case asBCTYPE_rW_DW_ARG:
+		case asBCTYPE_wW_DW_ARG:
+		case asBCTYPE_W_DW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the word argument
+				short w = *(((short*)tmpBC)+1);
+				WriteEncodedInt64(w);
+
+				// Write the dword argument
+				WriteEncodedInt64((int)tmpBC[1]);
+			}
+			break;
+		case asBCTYPE_DW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the argument
+				WriteEncodedInt64((int)tmpBC[1]);
+			}
+			break;
+		case asBCTYPE_DW_DW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the dword argument
+				WriteEncodedInt64((int)tmpBC[1]);
+
+				// Write the dword argument
+				WriteEncodedInt64((int)tmpBC[2]);
+			}
+			break;
+		case asBCTYPE_wW_rW_rW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the first argument
+				short w = *(((short*)tmpBC)+1);
+				WriteEncodedInt64(w);
+
+				// Write the second argument
+				w = *(((short*)tmpBC)+2);
+				WriteEncodedInt64(w);
+
+				// Write the third argument
+				w = *(((short*)tmpBC)+3);
+				WriteEncodedInt64(w);
+			}
+			break;
+		case asBCTYPE_wW_rW_ARG:
+		case asBCTYPE_rW_rW_ARG:
+		case asBCTYPE_wW_W_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the first argument
+				short w = *(((short*)tmpBC)+1);
+				WriteEncodedInt64(w);
+
+				// Write the second argument
+				w = *(((short*)tmpBC)+2);
+				WriteEncodedInt64(w);
+			}
+			break;
+		case asBCTYPE_wW_rW_DW_ARG:
+		case asBCTYPE_rW_W_DW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the first argument
+				short w = *(((short*)tmpBC)+1);
+				WriteEncodedInt64(w);
+
+				// Write the second argument
+				w = *(((short*)tmpBC)+2);
+				WriteEncodedInt64(w);
+
+				// Write the third argument
+				int dw = tmpBC[2];
+				WriteEncodedInt64(dw);
+			}
+			break;
+		case asBCTYPE_QW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the argument
+				asQWORD qw = *(asQWORD*)&tmpBC[1];
+				WriteEncodedInt64(qw);
+			}
+			break;
+		case asBCTYPE_QW_DW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the argument
+				asQWORD qw = *(asQWORD*)&tmpBC[1];
+				WriteEncodedInt64(qw);
+
+				// Write the second argument
+				int dw = tmpBC[3];
+				WriteEncodedInt64(dw);
+			}
+			break;
+		case asBCTYPE_rW_QW_ARG:
+		case asBCTYPE_wW_QW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the first argument
+				short w = *(((short*)tmpBC)+1);
+				WriteEncodedInt64(w);
+
+				// Write the argument
+				asQWORD qw = *(asQWORD*)&tmpBC[1];
+				WriteEncodedInt64(qw);
+			}
+			break;
+		case asBCTYPE_rW_DW_DW_ARG:
+			{
+				// Write the instruction code
+				asBYTE b = (asBYTE)c;
+				WriteData(&b, 1);
+
+				// Write the short argument
+				short w = *(((short*)tmpBC)+1);
+				WriteEncodedInt64(w);
+
+				// Write the dword argument
+				WriteEncodedInt64((int)tmpBC[1]);
+
+				// Write the dword argument
+				WriteEncodedInt64((int)tmpBC[2]);
+			}
+			break;
+		default:
+			{
+				// This should never happen
+				asASSERT(false);
+
+				// Store the bc as is
+				for( int n = 0; n < asBCTypeSize[asBCInfo[c].type]; n++ )
+					WriteData(&tmpBC[n], 4);
+			}
+		}
+
+		// Move to the next instruction
+		bc += asBCTypeSize[asBCInfo[c].type];
+		length -= asBCTypeSize[asBCInfo[c].type];
+	}
+}
+
+asCWriter::SListAdjuster::SListAdjuster(asCObjectType *ot) : patternType(ot), repeatCount(0), entries(0), lastOffset(-1), nextOffset(0), nextTypeId(-1)
+{
+	asASSERT( ot && (ot->flags & asOBJ_LIST_PATTERN) );
+
+	// Find the first expected value in the list
+	asSListPatternNode *node = ot->engine->scriptFunctions[patternType->templateSubTypes[0].GetBehaviour()->listFactory]->listPattern;
+	asASSERT( node && node->type == asLPT_START );
+	patternNode = node->next;
+}
+
+int asCWriter::SListAdjuster::AdjustOffset(int offset, asCObjectType *listPatternType)
+{
+	// TODO: cleanup: The listPatternType parameter is not needed
+	asASSERT( patternType == listPatternType );
+	UNUSED_VAR(listPatternType);
+
+	asASSERT( offset >= lastOffset );
+
+	// If it is the same offset being accessed again, just return the same adjusted value
+	if( offset == lastOffset )
+		return entries-1;
+
+	asASSERT( offset >= nextOffset );
+
+	// Update last offset for next call
+	lastOffset = offset;
+
+	// What is being expected at this position?
+	if( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME )
+	{
+		// Don't move the patternNode yet because the caller must make a call to SetRepeatCount too
+		nextOffset = offset + 4;
+		return entries++;
+	}
+	else if( patternNode->type == asLPT_TYPE )
+	{
+		const asCDataType &dt = reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType;
+		if( dt.GetTokenType() == ttQuestion )
+		{
+			// The bytecode need to inform the type that will
+			// come next and then adjust that position too before
+			// we can move to the next node
+			if( nextTypeId != -1 )
+			{
+				nextOffset = offset + 4;
+
+				if( repeatCount > 0 )
+					repeatCount--;
+
+				// Only move the patternNode if we're not expecting any more repeated entries
+				if( repeatCount == 0 )
+					patternNode = patternNode->next;
+
+				nextTypeId = -1;
+			}
+		}
+		else
+		{
+			if( repeatCount > 0 )
+			{
+				// Was any value skipped?
+				asUINT size;
+				if( dt.IsObjectHandle() || (dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_REF)) )
+					size = AS_PTR_SIZE*4;
+				else
+					size = dt.GetSizeInMemoryBytes();
+
+				int count = 0;
+				while( nextOffset <= offset )
+				{
+					count++;
+					nextOffset += size;
+
+					// Align the offset on 4 byte boundaries
+					if( size >= 4 && (nextOffset & 0x3) )
+						nextOffset += 4 - (nextOffset & 0x3);
+				}
+
+				if( --count > 0 )
+				{
+					// Skip these values
+					repeatCount -= count;
+					entries += count;
+				}
+
+				nextOffset = offset + size;
+				repeatCount--;
+			}
+
+			// Only move the patternNode if we're not expecting any more repeated entries
+			if( repeatCount == 0 )
+				patternNode = patternNode->next;
+		}
+
+		return entries++;
+	}
+	else if( patternNode->type == asLPT_START )
+	{
+		if( repeatCount > 0 )
+			repeatCount--;
+		SInfo info = {repeatCount, patternNode};
+		stack.PushLast(info);
+
+		repeatCount = 0;
+		patternNode = patternNode->next;
+
+		lastOffset--;
+		return AdjustOffset(offset, listPatternType);
+	}
+	else if( patternNode->type == asLPT_END )
+	{
+		SInfo info = stack.PopLast();
+		repeatCount = info.repeatCount;
+		if( repeatCount )
+			patternNode = info.startNode;
+		else
+			patternNode = patternNode->next;
+
+		lastOffset--;
+		return AdjustOffset(offset, listPatternType);
+	}
+	else
+	{
+		// Something is wrong with the pattern list declaration
+		asASSERT( false );
+	}
+
+	return 0;
+}
+
+void asCWriter::SListAdjuster::SetRepeatCount(asUINT rc)
+{
+	// Make sure the list is expecting a repeat at this location
+	asASSERT( patternNode->type == asLPT_REPEAT || patternNode->type == asLPT_REPEAT_SAME );
+
+	// Now move to the next patternNode
+	patternNode = patternNode->next;
+
+	repeatCount = rc;
+}
+
+void asCWriter::SListAdjuster::SetNextType(int typeId)
+{
+	// Make sure the list is expecting a type at this location
+	asASSERT( patternNode->type == asLPT_TYPE &&
+	          reinterpret_cast<asSListPatternDataTypeNode*>(patternNode)->dataType.GetTokenType() == ttQuestion );
+
+	// Inform the type id for the next adjustment
+	nextTypeId = typeId;
+}
+
+void asCWriter::WriteUsedTypeIds()
+{
+	TimeIt("asCWriter::WriteUsedTypeIds");
+
+	asUINT count = (asUINT)usedTypeIds.GetLength();
+	WriteEncodedInt64(count);
+	for( asUINT n = 0; n < count; n++ )
+	{
+		asCDataType dt = engine->GetDataTypeFromTypeId(usedTypeIds[n]);
+		WriteDataType(&dt);
+	}
+}
+
+int asCWriter::FindGlobalPropPtrIndex(void *ptr)
+{
+	int i = usedGlobalProperties.IndexOf(ptr);
+	if( i >= 0 ) return i;
+
+	usedGlobalProperties.PushLast(ptr);
+	return (int)usedGlobalProperties.GetLength()-1;
+}
+
+void asCWriter::WriteUsedGlobalProps()
+{
+	TimeIt("asCWriter::WriteUsedGlobalProps");
+
+	int c = (int)usedGlobalProperties.GetLength();
+	WriteEncodedInt64(c);
+
+	for( int n = 0; n < c; n++ )
+	{
+		asPWORD *p = (asPWORD*)usedGlobalProperties[n];
+
+		// Find the property descriptor from the address
+		asCGlobalProperty *prop = 0;
+		asSMapNode<void*, asCGlobalProperty*> *cursor;
+		if( engine->varAddressMap.MoveTo(&cursor, p) )
+		{
+			prop = engine->varAddressMap.GetValue(cursor);
+		}
+
+		asASSERT(prop);
+
+		// Store the name and type of the property so we can find it again on loading
+		WriteString(&prop->name);
+		WriteString(&prop->nameSpace->name);
+		WriteDataType(&prop->type);
+
+		// Also store whether the property is a module property or a registered property
+		char moduleProp = 0;
+		if( prop->realAddress == 0 )
+			moduleProp = 1;
+		WriteData(&moduleProp, 1);
+	}
+}
+
+void asCWriter::WriteUsedObjectProps()
+{
+	TimeIt("asCWriter::WriteUsedObjectProps");
+
+	int c = (int)usedObjectProperties.GetLength();
+	WriteEncodedInt64(c);
+
+	for( asUINT n = 0; n < usedObjectProperties.GetLength(); n++ )
+	{
+		WriteTypeInfo(usedObjectProperties[n].objType);
+		WriteString(&usedObjectProperties[n].prop->name);
+	}
+}
+
+int asCWriter::FindObjectPropIndex(short offset, int typeId, asDWORD *bc)
+{
+	// If the last property was a composite property, then just return 0, because it won't be translated
+	static bool lastWasComposite = false;
+	if (lastWasComposite)
+	{
+		lastWasComposite = false;
+		return 0;
+	}
+	
+	asCObjectType *objType = engine->GetObjectTypeFromTypeId(typeId);
+	asCObjectProperty *objProp = 0;
+
+	// Look for composite properties first
+	for (asUINT n = 0; objProp == 0 && n < objType->properties.GetLength(); n++)
+	{
+		// TODO: Composite: Perhaps it would be better to add metadata to the bytecode instruction to give the exact property. 
+		//                  That would also allow me to remove the typeId from the bytecode instruction itself
+		//                  Or perhaps a new bytecode instruction all together for accessing composite properties
+		//                  One that would do both offsets and indirection in a single go.
+		// TODO: Composite: Need to be able to handle instructions replaced in bytecode optimizations too
+		if (objType->properties[n]->compositeOffset == offset)
+		{
+			// This is a potential composite property. Need to check the following instructions to be sure
+			objProp = objType->properties[n];
+			asDWORD *bcTemp = bc;
+			bcTemp += asBCTypeSize[asBCInfo[*(asBYTE*)bcTemp].type];
+			if (objProp->isCompositeIndirect)
+			{
+				// The next instruction would be a asBC_RDSPtr
+				if ((*(asBYTE*)bcTemp) != asBC_RDSPtr)
+				{
+					objProp = 0;
+					continue;
+				}
+				bcTemp += asBCTypeSize[asBCInfo[*(asBYTE*)bcTemp].type];
+			}
+			// The next instruction would be asBC_ADDSi
+			if ((*(asBYTE*)bcTemp) != asBC_ADDSi)
+			{
+				objProp = 0;
+				continue;
+			}
+			// Make sure the offset is the expected one
+			if (*(((short*)bcTemp) + 1) != objProp->byteOffset)
+			{
+				objProp = 0;
+				continue;
+			}
+		}
+	}
+
+	// If none of the composite properties matched, then look for ordinary property
+	for (asUINT n = 0; objProp == 0 && n < objType->properties.GetLength(); n++)
+	{
+		if (objType->properties[n]->byteOffset == offset && !(objType->properties[n]->compositeOffset || objType->properties[n]->isCompositeIndirect))
+			objProp = objType->properties[n];
+	}
+
+	asASSERT(objProp);
+
+	// Remember if this is a composite property as the next call will then be for the same property
+	if (objProp->compositeOffset || objProp->isCompositeIndirect)
+		lastWasComposite = true;
+
+	// Now check if the same property has already been accessed
+	for( asUINT n = 0; n < usedObjectProperties.GetLength(); n++ )
+	{
+		if( usedObjectProperties[n].objType == objType &&
+			usedObjectProperties[n].prop  == objProp )
+			return n;
+	}
+
+	// Insert the new property
+	SObjProp prop = {objType, objProp};
+	usedObjectProperties.PushLast(prop);
+	return (int)usedObjectProperties.GetLength() - 1;
+}
+
+int asCWriter::FindFunctionIndex(asCScriptFunction *func)
+{
+	for( asUINT n = 0; n < usedFunctions.GetLength(); n++ )
+	{
+		if( usedFunctions[n] == func )
+			return n;
+	}
+
+	usedFunctions.PushLast(func);
+	return (int)usedFunctions.GetLength() - 1;
+}
+
+int asCWriter::FindTypeIdIdx(int typeId)
+{
+	asUINT n;
+	for( n = 0; n < usedTypeIds.GetLength(); n++ )
+	{
+		if( usedTypeIds[n] == typeId )
+			return n;
+	}
+
+	usedTypeIds.PushLast(typeId);
+	return (int)usedTypeIds.GetLength() - 1;
+}
+
+int asCWriter::FindTypeInfoIdx(asCTypeInfo *obj)
+{
+	asUINT n;
+	for( n = 0; n < usedTypes.GetLength(); n++ )
+	{
+		if( usedTypes[n] == obj )
+			return n;
+	}
+
+	usedTypes.PushLast(obj);
+	return (int)usedTypes.GetLength() - 1;
+}
+
+#endif // AS_NO_COMPILER
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_restore.h b/Sources/AngelScript/source/as_restore.h
old mode 100755
new mode 100644
index ec04853de..26c5e99b5
--- a/Sources/AngelScript/source/as_restore.h
+++ b/Sources/AngelScript/source/as_restore.h
@@ -1,255 +1,261 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_restore.h
-//
-// Functions for saving and restoring module bytecode
-// asCRestore was originally written by Dennis Bollyn, dennis@gyrbo.be
-// It was later split in two classes asCReader and asCWriter by me
-
-#ifndef AS_RESTORE_H
-#define AS_RESTORE_H
-
-#include "as_scriptengine.h"
-#include "as_context.h"
-#include "as_map.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCReader
-{
-public:
-	asCReader(asCModule *module, asIBinaryStream *stream, asCScriptEngine *engine);
-
-	int Read(bool *wasDebugInfoStripped);
-
-protected:
-	asCModule       *module;
-	asIBinaryStream *stream;
-	asCScriptEngine *engine;
-	bool             noDebugInfo;
-	bool             error;
-	asUINT           bytesRead;
-
-	int                Error(const char *msg);
-
-	int                ReadInner();
-
-	void               ReadData(void *data, asUINT size);
-	void               ReadString(asCString *str);
-	asCScriptFunction *ReadFunction(bool &isNew, bool addToModule = true, bool addToEngine = true, bool addToGC = true);
-	void               ReadFunctionSignature(asCScriptFunction *func, asCObjectType **parentClass = 0);
-	void               ReadGlobalProperty();
-	void               ReadObjectProperty(asCObjectType *ot);
-	void               ReadDataType(asCDataType *dt);
-	asCTypeInfo       *ReadTypeInfo();
-	void               ReadTypeDeclaration(asCTypeInfo *ot, int phase);
-	void               ReadByteCode(asCScriptFunction *func);
-	asWORD             ReadEncodedUInt16();
-	asUINT             ReadEncodedUInt();
-	asQWORD            ReadEncodedUInt64();
-
-	void ReadUsedTypeIds();
-	void ReadUsedFunctions();
-	void ReadUsedGlobalProps();
-	void ReadUsedStringConstants();
-	void ReadUsedObjectProps();
-
-	asCTypeInfo *      FindType(int idx);
-	int                FindTypeId(int idx);
-	short              FindObjectPropOffset(asWORD index);
-	asCScriptFunction *FindFunction(int idx);
-
-	// After loading, each function needs to be translated to update pointers, function ids, etc
-	void TranslateFunction(asCScriptFunction *func);
-	void CalculateAdjustmentByPos(asCScriptFunction *func);
-	int  AdjustStackPosition(int pos);
-	int  AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos);
-	void CalculateStackNeeded(asCScriptFunction *func);
-	asCScriptFunction *GetCalledFunction(asCScriptFunction *func, asDWORD programPos);
-
-	// Temporary storage for persisting variable data
-	asCArray<int>                usedTypeIds;
-	asCArray<asCTypeInfo*>       usedTypes;
-	asCArray<asCScriptFunction*> usedFunctions;
-	asCArray<void*>              usedGlobalProperties;
-	asCArray<int>                usedStringConstants;
-
-	asCArray<asCScriptFunction*>  savedFunctions;
-	asCArray<asCDataType>         savedDataTypes;
-	asCArray<asCString>           savedStrings;
-
-	asCArray<int>                 adjustByPos;
-	asCArray<int>                 adjustNegativeStackByPos;
-
-	struct SObjProp
-	{
-		asCObjectType *objType;
-		int            offset;
-	};
-	asCArray<SObjProp> usedObjectProperties;
-
-	asCMap<void*,bool>              existingShared;
-	asCMap<asCScriptFunction*,bool> dontTranslate;
-
-	// Helper class for adjusting offsets within initialization list buffers
-	struct SListAdjuster
-	{
-		SListAdjuster(asCReader *rd, asDWORD *bc, asCObjectType *ot);
-		void AdjustAllocMem();
-		int  AdjustOffset(int offset);
-		void SetRepeatCount(asUINT rc);
-		void SetNextType(int typeId);
-
-		struct SInfo
-		{
-			asUINT              repeatCount;
-			asSListPatternNode *startNode;
-		};
-		asCArray<SInfo> stack;
-
-		asCReader          *reader;
-		asDWORD            *allocMemBC;
-		asUINT              maxOffset;
-		asCObjectType      *patternType;
-		asUINT              repeatCount;
-		int                 lastOffset;
-		int                 nextOffset;
-		asUINT              lastAdjustedOffset;
-		asSListPatternNode *patternNode;
-		int                 nextTypeId;
-	};
-	asCArray<SListAdjuster*> listAdjusters;
-};
-
-#ifndef AS_NO_COMPILER
-
-class asCWriter
-{
-public:
-	asCWriter(asCModule *module, asIBinaryStream *stream, asCScriptEngine *engine, bool stripDebugInfo);
-
-	int Write();
-
-protected:
-	asCModule       *module;
-	asIBinaryStream *stream;
-	asCScriptEngine *engine;
-	bool             stripDebugInfo;
-
-	void WriteData(const void *data, asUINT size);
-
-	void WriteString(asCString *str);
-	void WriteFunction(asCScriptFunction *func);
-	void WriteFunctionSignature(asCScriptFunction *func);
-	void WriteGlobalProperty(asCGlobalProperty *prop);
-	void WriteObjectProperty(asCObjectProperty *prop);
-	void WriteDataType(const asCDataType *dt);
-	void WriteTypeInfo(asCTypeInfo *ot);
-	void WriteTypeDeclaration(asCTypeInfo *ot, int phase);
-	void WriteByteCode(asCScriptFunction *func);
-	void WriteEncodedInt64(asINT64 i);
-
-	// Helper functions for storing variable data
-	int FindTypeInfoIdx(asCTypeInfo *ti);
-	int FindTypeIdIdx(int typeId);
-	int FindFunctionIndex(asCScriptFunction *func);
-	int FindGlobalPropPtrIndex(void *);
-	int FindStringConstantIndex(int id);
-	int FindObjectPropIndex(short offset, int typeId);
-
-	void CalculateAdjustmentByPos(asCScriptFunction *func);
-	int  AdjustStackPosition(int pos);
-	int  AdjustProgramPosition(int pos);
-	int  AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos);
-
-	// Intermediate data used for storing that which isn't constant, function id's, pointers, etc
-	void WriteUsedTypeIds();
-	void WriteUsedFunctions();
-	void WriteUsedGlobalProps();
-	void WriteUsedStringConstants();
-	void WriteUsedObjectProps();
-
-	// Temporary storage for persisting variable data
-	asCArray<int>                usedTypeIds;
-	asCArray<asCTypeInfo*>       usedTypes;
-	asCArray<asCScriptFunction*> usedFunctions;
-	asCArray<void*>              usedGlobalProperties;
-	asCArray<int>                usedStringConstants;
-	asCMap<int, int>             stringIdToIndexMap;
-
-	asCArray<asCScriptFunction*>  savedFunctions;
-	asCArray<asCDataType>         savedDataTypes;
-	asCArray<asCString>           savedStrings;
-	asCMap<asCStringPointer, int> stringToIdMap;
-	asCArray<int>                 adjustStackByPos;
-	asCArray<int>                 adjustNegativeStackByPos;
-	asCArray<int>                 bytecodeNbrByPos;
-
-	struct SObjProp
-	{
-		asCObjectType *objType;
-		int            offset;
-	};
-	asCArray<SObjProp>           usedObjectProperties;
-
-	// Helper class for adjusting offsets within initialization list buffers
-	struct SListAdjuster
-	{
-		SListAdjuster(asCObjectType *ot);
-		int  AdjustOffset(int offset, asCObjectType *listPatternType);
-		void SetRepeatCount(asUINT rc);
-		void SetNextType(int typeId);
-
-		struct SInfo
-		{
-			asUINT              repeatCount;
-			asSListPatternNode *startNode;
-		};
-		asCArray<SInfo> stack;
-
-		asCObjectType      *patternType;
-		asUINT              repeatCount;
-		asSListPatternNode *patternNode;
-		asUINT              entries;
-		int                 lastOffset;  // Last offset adjusted
-		int                 nextOffset;  // next expected offset to be adjusted
-		int                 nextTypeId;
-	};
-	asCArray<SListAdjuster*> listAdjusters;
-};
-
-#endif
-
-END_AS_NAMESPACE
-
-#endif // AS_RESTORE_H
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_restore.h
+//
+// Functions for saving and restoring module bytecode
+// asCRestore was originally written by Dennis Bollyn, dennis@gyrbo.be
+// It was later split in two classes asCReader and asCWriter by me
+
+#ifndef AS_RESTORE_H
+#define AS_RESTORE_H
+
+#include "as_scriptengine.h"
+#include "as_context.h"
+#include "as_map.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCReader
+{
+public:
+	asCReader(asCModule *module, asIBinaryStream *stream, asCScriptEngine *engine);
+
+	int Read(bool *wasDebugInfoStripped);
+
+protected:
+	asCModule       *module;
+	asIBinaryStream *stream;
+	asCScriptEngine *engine;
+	bool             noDebugInfo;
+	bool             error;
+	asUINT           bytesRead;
+
+	int                Error(const char *msg);
+
+	int                ReadInner();
+
+	int                ReadData(void *data, asUINT size);
+	void               ReadString(asCString *str);
+	asCScriptFunction *ReadFunction(bool &isNew, bool addToModule = true, bool addToEngine = true, bool addToGC = true, bool *isExternal = 0);
+	void               ReadFunctionSignature(asCScriptFunction *func, asCObjectType **parentClass = 0);
+	void               ReadGlobalProperty();
+	void               ReadObjectProperty(asCObjectType *ot);
+	void               ReadDataType(asCDataType *dt);
+	asCTypeInfo       *ReadTypeInfo();
+	void               ReadTypeDeclaration(asCTypeInfo *ot, int phase, bool *isExternal = 0);
+	void               ReadByteCode(asCScriptFunction *func);
+	asWORD             ReadEncodedUInt16();
+	asUINT             ReadEncodedUInt();
+	int                ReadEncodedInt();
+	asQWORD            ReadEncodedUInt64();
+	asUINT             SanityCheck(asUINT val, asUINT max);
+	int                SanityCheck(int val, asUINT max);
+
+	void ReadUsedTypeIds();
+	void ReadUsedFunctions();
+	void ReadUsedGlobalProps();
+	void ReadUsedStringConstants();
+	void ReadUsedObjectProps();
+
+	asCTypeInfo *      FindType(int idx);
+	int                FindTypeId(int idx);
+	short              FindObjectPropOffset(asWORD index);
+	asCScriptFunction *FindFunction(int idx);
+
+	// After loading, each function needs to be translated to update pointers, function ids, etc
+	void TranslateFunction(asCScriptFunction *func);
+	void CalculateAdjustmentByPos(asCScriptFunction *func);
+	int  AdjustStackPosition(int pos);
+	int  AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos);
+	void CalculateStackNeeded(asCScriptFunction *func);
+
+	// Temporary storage for persisting variable data
+	asCArray<int>                usedTypeIds;
+	asCArray<asCTypeInfo*>       usedTypes;
+	asCArray<asCScriptFunction*> usedFunctions;
+	asCArray<void*>              usedGlobalProperties;
+	asCArray<void*>              usedStringConstants;
+
+	asCArray<asCScriptFunction*>  savedFunctions;
+	asCArray<asCDataType>         savedDataTypes;
+	asCArray<asCString>           savedStrings;
+
+	asCArray<int>                 adjustByPos;
+	asCArray<int>                 adjustNegativeStackByPos;
+
+	struct SObjProp
+	{
+		asCObjectType     *objType;
+		asCObjectProperty *prop;
+	};
+	asCArray<SObjProp> usedObjectProperties;
+
+	asCMap<void*,bool>              existingShared;
+	asCMap<asCScriptFunction*,bool> dontTranslate;
+
+	// Helper class for adjusting offsets within initialization list buffers
+	struct SListAdjuster
+	{
+		SListAdjuster(asCReader *rd, asDWORD *bc, asCObjectType *ot);
+		void AdjustAllocMem();
+		int  AdjustOffset(int offset);
+		void SetRepeatCount(asUINT rc);
+		void SetNextType(int typeId);
+
+		struct SInfo
+		{
+			asUINT              repeatCount;
+			asSListPatternNode *startNode;
+		};
+		asCArray<SInfo> stack;
+
+		asCReader          *reader;
+		asDWORD            *allocMemBC;
+		asUINT              maxOffset;
+		asCObjectType      *patternType;
+		asUINT              repeatCount;
+		int                 lastOffset;
+		int                 nextOffset;
+		asUINT              lastAdjustedOffset;
+		asSListPatternNode *patternNode;
+		int                 nextTypeId;
+	};
+	asCArray<SListAdjuster*> listAdjusters;
+};
+
+#ifndef AS_NO_COMPILER
+
+class asCWriter
+{
+public:
+	asCWriter(asCModule *module, asIBinaryStream *stream, asCScriptEngine *engine, bool stripDebugInfo);
+
+	int Write();
+
+protected:
+	asCModule       *module;
+	asIBinaryStream *stream;
+	asCScriptEngine *engine;
+	bool             stripDebugInfo;
+	bool             error;
+	asUINT           bytesWritten;
+
+	int              Error(const char *msg);
+
+	int  WriteData(const void *data, asUINT size);
+
+	void WriteString(asCString *str);
+	void WriteFunction(asCScriptFunction *func);
+	void WriteFunctionSignature(asCScriptFunction *func);
+	void WriteGlobalProperty(asCGlobalProperty *prop);
+	void WriteObjectProperty(asCObjectProperty *prop);
+	void WriteDataType(const asCDataType *dt);
+	void WriteTypeInfo(asCTypeInfo *ot);
+	void WriteTypeDeclaration(asCTypeInfo *ot, int phase);
+	void WriteByteCode(asCScriptFunction *func);
+	void WriteEncodedInt64(asINT64 i);
+
+	// Helper functions for storing variable data
+	int FindTypeInfoIdx(asCTypeInfo *ti);
+	int FindTypeIdIdx(int typeId);
+	int FindFunctionIndex(asCScriptFunction *func);
+	int FindGlobalPropPtrIndex(void *);
+	int FindStringConstantIndex(void *str);
+	int FindObjectPropIndex(short offset, int typeId, asDWORD *bc);
+
+	void CalculateAdjustmentByPos(asCScriptFunction *func);
+	int  AdjustStackPosition(int pos);
+	int  AdjustProgramPosition(int pos);
+	int  AdjustGetOffset(int offset, asCScriptFunction *func, asDWORD programPos);
+
+	// Intermediate data used for storing that which isn't constant, function id's, pointers, etc
+	void WriteUsedTypeIds();
+	void WriteUsedFunctions();
+	void WriteUsedGlobalProps();
+	void WriteUsedStringConstants();
+	void WriteUsedObjectProps();
+
+	// Temporary storage for persisting variable data
+	asCArray<int>                usedTypeIds;
+	asCArray<asCTypeInfo*>       usedTypes;
+	asCArray<asCScriptFunction*> usedFunctions;
+	asCArray<void*>              usedGlobalProperties;
+	asCArray<void*>              usedStringConstants;
+	asCMap<void*, int>           stringToIndexMap;
+
+	asCArray<asCScriptFunction*>  savedFunctions;
+	asCArray<asCDataType>         savedDataTypes;
+	asCArray<asCString>           savedStrings;
+	asCMap<asCString, int>        stringToIdMap;
+	asCArray<int>                 adjustStackByPos;
+	asCArray<int>                 adjustNegativeStackByPos;
+	asCArray<int>                 bytecodeNbrByPos;
+
+	struct SObjProp
+	{
+		asCObjectType     *objType;
+		asCObjectProperty *prop;
+	};
+	asCArray<SObjProp>           usedObjectProperties;
+
+	// Helper class for adjusting offsets within initialization list buffers
+	struct SListAdjuster
+	{
+		SListAdjuster(asCObjectType *ot);
+		int  AdjustOffset(int offset, asCObjectType *listPatternType);
+		void SetRepeatCount(asUINT rc);
+		void SetNextType(int typeId);
+
+		struct SInfo
+		{
+			asUINT              repeatCount;
+			asSListPatternNode *startNode;
+		};
+		asCArray<SInfo> stack;
+
+		asCObjectType      *patternType;
+		asUINT              repeatCount;
+		asSListPatternNode *patternNode;
+		asUINT              entries;
+		int                 lastOffset;  // Last offset adjusted
+		int                 nextOffset;  // next expected offset to be adjusted
+		int                 nextTypeId;
+	};
+	asCArray<SListAdjuster*> listAdjusters;
+};
+
+#endif
+
+END_AS_NAMESPACE
+
+#endif // AS_RESTORE_H
diff --git a/Sources/AngelScript/source/as_scriptcode.cpp b/Sources/AngelScript/source/as_scriptcode.cpp
old mode 100755
new mode 100644
index 90b6fc26d..833b401b6
--- a/Sources/AngelScript/source/as_scriptcode.cpp
+++ b/Sources/AngelScript/source/as_scriptcode.cpp
@@ -1,151 +1,151 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptcode.cpp
-//
-// A container class for the script code to be compiled
-//
-
-
-
-#include "as_config.h"
-#include "as_scriptcode.h"
-
-BEGIN_AS_NAMESPACE
-
-asCScriptCode::asCScriptCode()
-{
-	lineOffset = 0;
-	code = 0;
-	codeLength = 0;
-	sharedCode = false;
-}
-
-asCScriptCode::~asCScriptCode()
-{
-	if( !sharedCode && code ) 
-	{
-		asDELETEARRAY(code);
-	}
-}
-
-int asCScriptCode::SetCode(const char *in_name, const char *in_code, bool in_makeCopy)
-{
-	return SetCode(in_name, in_code, 0, in_makeCopy);
-}
-
-int asCScriptCode::SetCode(const char *in_name, const char *in_code, size_t in_length, bool in_makeCopy)
-{
-	if( !in_code) return asINVALID_ARG;
-	this->name = in_name ? in_name : "";
-	if( !sharedCode && code ) 
-		asDELETEARRAY(code);
-
-	if( in_length == 0 )
-		in_length = strlen(in_code);
-	if( in_makeCopy )
-	{
-		codeLength = in_length;
-		sharedCode = false;
-		code = asNEWARRAY(char, in_length);
-		if( code == 0 )
-			return asOUT_OF_MEMORY;
-		memcpy(code, in_code, in_length);
-	}
-	else
-	{
-		codeLength = in_length;
-		code = const_cast<char*>(in_code);
-		sharedCode = true;
-	}
-
-	// Find the positions of each line
-	linePositions.PushLast(0);
-	for( size_t n = 0; n < in_length; n++ )
-		if( in_code[n] == '\n' ) linePositions.PushLast(n+1);
-	linePositions.PushLast(in_length);
-
-	return asSUCCESS;
-}
-
-void asCScriptCode::ConvertPosToRowCol(size_t pos, int *row, int *col)
-{
-	if( linePositions.GetLength() == 0 ) 
-	{
-		if( row ) *row = lineOffset;
-		if( col ) *col = 1;
-		return;
-	}
-
-	// Do a binary search in the buffer
-	int max = (int)linePositions.GetLength() - 1;
-	int min = 0;
-	int i = max/2;
-
-	for(;;)
-	{
-		if( linePositions[i] < pos )
-		{
-			// Have we found the largest number < programPosition?
-			if( min == i ) break;
-
-			min = i;
-			i = (max + min)/2;
-		}
-		else if( linePositions[i] > pos )
-		{
-			// Have we found the smallest number > programPoisition?
-			if( max == i ) break;
-
-			max = i;
-			i = (max + min)/2;
-		}
-		else
-		{
-			// We found the exact position
-			break;
-		}
-	}
-
-	if( row ) *row = i + 1 + lineOffset;
-	if( col ) *col = (int)(pos - linePositions[i]) + 1;
-}
-
-bool asCScriptCode::TokenEquals(size_t pos, size_t len, const char *str)
-{
-	if( pos + len > codeLength ) return false;
-	if( strncmp(code + pos, str, len) == 0 && strlen(str) == len )
-		return true;
-	return false;
-}
-
-END_AS_NAMESPACE
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptcode.cpp
+//
+// A container class for the script code to be compiled
+//
+
+
+
+#include "as_config.h"
+#include "as_scriptcode.h"
+
+BEGIN_AS_NAMESPACE
+
+asCScriptCode::asCScriptCode()
+{
+	lineOffset = 0;
+	code = 0;
+	codeLength = 0;
+	sharedCode = false;
+}
+
+asCScriptCode::~asCScriptCode()
+{
+	if( !sharedCode && code ) 
+	{
+		asDELETEARRAY(code);
+	}
+}
+
+int asCScriptCode::SetCode(const char *in_name, const char *in_code, bool in_makeCopy)
+{
+	return SetCode(in_name, in_code, 0, in_makeCopy);
+}
+
+int asCScriptCode::SetCode(const char *in_name, const char *in_code, size_t in_length, bool in_makeCopy)
+{
+	if( !in_code) return asINVALID_ARG;
+	this->name = in_name ? in_name : "";
+	if( !sharedCode && code ) 
+		asDELETEARRAY(code);
+
+	if( in_length == 0 )
+		in_length = strlen(in_code);
+	if( in_makeCopy )
+	{
+		codeLength = in_length;
+		sharedCode = false;
+		code = asNEWARRAY(char, in_length);
+		if( code == 0 )
+			return asOUT_OF_MEMORY;
+		memcpy(code, in_code, in_length);
+	}
+	else
+	{
+		codeLength = in_length;
+		code = const_cast<char*>(in_code);
+		sharedCode = true;
+	}
+
+	// Find the positions of each line
+	linePositions.PushLast(0);
+	for( size_t n = 0; n < in_length; n++ )
+		if( in_code[n] == '\n' ) linePositions.PushLast(n+1);
+	linePositions.PushLast(in_length);
+
+	return asSUCCESS;
+}
+
+void asCScriptCode::ConvertPosToRowCol(size_t pos, int *row, int *col)
+{
+	if( linePositions.GetLength() == 0 ) 
+	{
+		if( row ) *row = lineOffset;
+		if( col ) *col = 1;
+		return;
+	}
+
+	// Do a binary search in the buffer
+	int max = (int)linePositions.GetLength() - 1;
+	int min = 0;
+	int i = max/2;
+
+	for(;;)
+	{
+		if( linePositions[i] < pos )
+		{
+			// Have we found the largest number < programPosition?
+			if( min == i ) break;
+
+			min = i;
+			i = (max + min)/2;
+		}
+		else if( linePositions[i] > pos )
+		{
+			// Have we found the smallest number > programPoisition?
+			if( max == i ) break;
+
+			max = i;
+			i = (max + min)/2;
+		}
+		else
+		{
+			// We found the exact position
+			break;
+		}
+	}
+
+	if( row ) *row = i + 1 + lineOffset;
+	if( col ) *col = (int)(pos - linePositions[i]) + 1;
+}
+
+bool asCScriptCode::TokenEquals(size_t pos, size_t len, const char *str)
+{
+	if( pos + len > codeLength ) return false;
+	if( strncmp(code + pos, str, len) == 0 && strlen(str) == len )
+		return true;
+	return false;
+}
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/source/as_scriptcode.h b/Sources/AngelScript/source/as_scriptcode.h
old mode 100755
new mode 100644
index 3e31cc473..be1af3be6
--- a/Sources/AngelScript/source/as_scriptcode.h
+++ b/Sources/AngelScript/source/as_scriptcode.h
@@ -1,72 +1,72 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2011 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptcode.h
-//
-// A container class for the script code to be compiled
-//
-
-
-
-#ifndef AS_SCRIPTCODE_H
-#define AS_SCRIPTCODE_H
-
-#include "as_array.h"
-#include "as_string.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCScriptCode
-{
-public:
-	asCScriptCode();
-	~asCScriptCode();
-
-	int SetCode(const char *name, const char *code, bool makeCopy);
-	int SetCode(const char *name, const char *code, size_t length, bool makeCopy);
-
-	void ConvertPosToRowCol(size_t pos, int *row, int *col);
-
-	bool TokenEquals(size_t pos, size_t len, const char *str);
-
-	asCString        name;
-	char            *code;
-	size_t           codeLength;
-	bool             sharedCode;
-	int              idx;
-	int              lineOffset;
-	asCArray<size_t> linePositions;
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2011 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptcode.h
+//
+// A container class for the script code to be compiled
+//
+
+
+
+#ifndef AS_SCRIPTCODE_H
+#define AS_SCRIPTCODE_H
+
+#include "as_array.h"
+#include "as_string.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCScriptCode
+{
+public:
+	asCScriptCode();
+	~asCScriptCode();
+
+	int SetCode(const char *name, const char *code, bool makeCopy);
+	int SetCode(const char *name, const char *code, size_t length, bool makeCopy);
+
+	void ConvertPosToRowCol(size_t pos, int *row, int *col);
+
+	bool TokenEquals(size_t pos, size_t len, const char *str);
+
+	asCString        name;
+	char            *code;
+	size_t           codeLength;
+	bool             sharedCode;
+	int              idx;
+	int              lineOffset;
+	asCArray<size_t> linePositions;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_scriptengine.cpp b/Sources/AngelScript/source/as_scriptengine.cpp
old mode 100755
new mode 100644
index 023ef7059..e0db90e5e
--- a/Sources/AngelScript/source/as_scriptengine.cpp
+++ b/Sources/AngelScript/source/as_scriptengine.cpp
@@ -1,6396 +1,6671 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptengine.cpp
-//
-// The implementation of the script engine interface
-//
-
-
-#include <stdlib.h>
-
-#include "as_config.h"
-#include "as_scriptengine.h"
-#include "as_builder.h"
-#include "as_context.h"
-#include "as_string_util.h"
-#include "as_tokenizer.h"
-#include "as_texts.h"
-#include "as_module.h"
-#include "as_callfunc.h"
-#include "as_generic.h"
-#include "as_scriptobject.h"
-#include "as_compiler.h"
-#include "as_bytecode.h"
-#include "as_debug.h"
-
-BEGIN_AS_NAMESPACE
-
-
-
-#ifdef AS_PROFILE
-// Instantiate the profiler once
-CProfiler g_profiler;
-#endif
-
-
-
-
-extern "C"
-{
-
-AS_API const char * asGetLibraryVersion()
-{
-#ifdef _DEBUG
-	return ANGELSCRIPT_VERSION_STRING " DEBUG";
-#else
-	return ANGELSCRIPT_VERSION_STRING;
-#endif
-}
-
-AS_API const char * asGetLibraryOptions()
-{
-	const char *string = " "
-
-	// Options
-#ifdef AS_MAX_PORTABILITY
-		"AS_MAX_PORTABILITY "
-#endif
-#ifdef AS_DEBUG
-		"AS_DEBUG "
-#endif
-#ifdef AS_NO_CLASS_METHODS
-		"AS_NO_CLASS_METHODS "
-#endif
-#ifdef AS_USE_DOUBLE_AS_FLOAT
-		"AS_USE_DOUBLE_AS_FLOAT "
-#endif
-#ifdef AS_64BIT_PTR
-		"AS_64BIT_PTR "
-#endif
-#ifdef AS_NO_THREADS
-		"AS_NO_THREADS "
-#endif
-#ifdef AS_NO_ATOMIC
-		"AS_NO_ATOMIC "
-#endif
-#ifdef AS_NO_COMPILER
-		"AS_NO_COMPILER "
-#endif
-#ifdef AS_NO_MEMBER_INIT
-		"AS_NO_MEMBER_INIT "
-#endif
-#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
-		"AS_NO_THISCALL_FUNCTOR_METHOD "
-#endif
-#ifdef AS_NO_EXCEPTIONS
-		"AS_NO_EXCEPTIONS "
-#endif
-#ifdef WIP_16BYTE_ALIGN
-		"WIP_16BYTE_ALIGN "
-#endif
-#ifdef AS_BIG_ENDIAN
-		"AS_BIG_ENDIAN "
-#endif
-
-	// Target system
-#ifdef AS_WIN
-		"AS_WIN "
-#endif
-#ifdef AS_LINUX
-		"AS_LINUX "
-#endif
-#ifdef AS_MAC
-		"AS_MAC "
-#endif
-#ifdef AS_SUN
-		"AS_SUN "
-#endif
-#ifdef AS_BSD
-		"AS_BSD "
-#endif
-#ifdef AS_XBOX
-		"AS_XBOX "
-#endif
-#ifdef AS_XBOX360
-		"AS_XBOX360 "
-#endif
-#ifdef AS_PSP
-		"AS_PSP "
-#endif
-#ifdef AS_PS2
-		"AS_PS2 "
-#endif
-#ifdef AS_PS3
-		"AS_PS3 "
-#endif
-#ifdef AS_PSVITA
-		"AS_PSVITA "
-#endif
-#ifdef AS_DC
-		"AS_DC "
-#endif
-#ifdef AS_GC
-		"AS_GC "
-#endif
-#ifdef AS_WII
-		"AS_WII "
-#endif
-#ifdef AS_WIIU
-		"AS_WIIU "
-#endif
-#ifdef AS_IPHONE
-		"AS_IPHONE "
-#endif
-#ifdef AS_ANDROID
-		"AS_ANDROID "
-#endif
-#ifdef AS_HAIKU
-		"AS_HAIKU "
-#endif
-#ifdef AS_ILLUMOS
-		"AS_ILLUMOS "
-#endif
-#ifdef AS_MARMALADE
-		"AS_MARMALADE "
-#endif
-
-
-	// CPU family
-#ifdef AS_PPC
-		"AS_PPC "
-#endif
-#ifdef AS_PPC_64
-		"AS_PPC_64 "
-#endif
-#ifdef AS_X86
-		"AS_X86 "
-#endif
-#ifdef AS_MIPS
-		"AS_MIPS "
-#endif
-#ifdef AS_SH4
-		"AS_SH4 "
-#endif
-#ifdef AS_XENON
-		"AS_XENON "
-#endif
-#ifdef AS_ARM
-		"AS_ARM "
-#endif
-#ifdef AS_SOFTFP
-		"AS_SOFTFP "
-#endif
-#ifdef AS_X64_GCC
-		"AS_X64_GCC "
-#endif
-#ifdef AS_X64_MSVC
-		"AS_X64_MSVC "
-#endif
-#ifdef AS_SPARC
-		"AS_SPARC "
-#endif
-	;
-
-	return string;
-}
-
-AS_API asIScriptEngine *asCreateScriptEngine(asDWORD version)
-{
-	// Verify the version that the application expects
-	if( (version/10000) != (ANGELSCRIPT_VERSION/10000) )
-		return 0;
-
-	if( (version/100)%100 != (ANGELSCRIPT_VERSION/100)%100 )
-		return 0;
-
-	if( (version%100) > (ANGELSCRIPT_VERSION%100) )
-		return 0;
-
-	// Verify the size of the types
-	asASSERT( sizeof(asBYTE)  == 1 );
-	asASSERT( sizeof(asWORD)  == 2 );
-	asASSERT( sizeof(asDWORD) == 4 );
-	asASSERT( sizeof(asQWORD) == 8 );
-	asASSERT( sizeof(asPWORD) == sizeof(void*) );
-
-	// Verify the boolean type
-	asASSERT( sizeof(bool) == AS_SIZEOF_BOOL );
-	asASSERT( true == VALUE_OF_BOOLEAN_TRUE );
-
-	// Verify endianess
-#ifdef AS_BIG_ENDIAN
-	asDWORD dw = 0x00010203;
-	asQWORD qw = ((asQWORD(0x00010203)<<32)|asQWORD(0x04050607));
-#else
-	asDWORD dw = 0x03020100;
-	// C++ didn't have a standard way of declaring 64bit literal constants until C++11, so
-	// I'm forced to do it like this to avoid compilers warnings when compiling with the full
-	// C++ compliance.
-	asQWORD qw = ((asQWORD(0x07060504)<<32)|asQWORD(0x03020100));
-#endif
-	asASSERT( memcmp("\x00\x01\x02\x03", &dw, 4) == 0 );
-	asASSERT( memcmp("\x00\x01\x02\x03\x04\x05\x06\x07", &qw, 8) == 0 );
-	UNUSED_VAR(dw);
-	UNUSED_VAR(qw);
-
-	return asNEW(asCScriptEngine)();
-}
-
-} // extern "C"
-
-
-// interface
-int asCScriptEngine::SetEngineProperty(asEEngineProp property, asPWORD value)
-{
-	switch( property )
-	{
-	case asEP_ALLOW_UNSAFE_REFERENCES:
-		ep.allowUnsafeReferences = value ? true : false;
-		break;
-
-	case asEP_OPTIMIZE_BYTECODE:
-		ep.optimizeByteCode = value ? true : false;
-		break;
-
-	case asEP_COPY_SCRIPT_SECTIONS:
-		ep.copyScriptSections = value ? true : false;
-		break;
-
-	case asEP_MAX_STACK_SIZE:
-		if( value == 0 )
-		{
-			// Restore default: no limit and initially size 4KB
-			ep.maximumContextStackSize = 0;
-			initialContextStackSize    = 1024;
-		}
-		else
-		{
-			// The size is given in bytes, but we only store dwords
-			ep.maximumContextStackSize = (asUINT)value/4;
-			if( initialContextStackSize > ep.maximumContextStackSize )
-			{
-				initialContextStackSize = ep.maximumContextStackSize;
-				if( initialContextStackSize == 0 )
-					initialContextStackSize = 1;
-			}
-		}
-		break;
-
-	case asEP_USE_CHARACTER_LITERALS:
-		ep.useCharacterLiterals = value ? true : false;
-		break;
-
-	case asEP_ALLOW_MULTILINE_STRINGS:
-		ep.allowMultilineStrings = value ? true : false;
-		break;
-
-	case asEP_ALLOW_IMPLICIT_HANDLE_TYPES:
-		ep.allowImplicitHandleTypes = value ? true : false;
-		break;
-
-	case asEP_BUILD_WITHOUT_LINE_CUES:
-		ep.buildWithoutLineCues = value ? true : false;
-		break;
-
-	case asEP_INIT_GLOBAL_VARS_AFTER_BUILD:
-		ep.initGlobalVarsAfterBuild = value ? true : false;
-		break;
-
-	case asEP_REQUIRE_ENUM_SCOPE:
-		ep.requireEnumScope = value ? true : false;
-		break;
-
-	case asEP_SCRIPT_SCANNER:
-		if( value <= 1 )
-			ep.scanner = (int)value;
-		else
-			return asINVALID_ARG;
-		break;
-
-	case asEP_INCLUDE_JIT_INSTRUCTIONS:
-		ep.includeJitInstructions = value ? true : false;
-		break;
-
-	case asEP_STRING_ENCODING:
-		if( value <= 1 )
-			ep.stringEncoding = (int)value;
-		else
-			return asINVALID_ARG;
-		break;
-
-	case asEP_PROPERTY_ACCESSOR_MODE:
-		if( value <= 2 )
-			ep.propertyAccessorMode = (int)value;
-		else
-			return asINVALID_ARG;
-		break;
-
-	case asEP_EXPAND_DEF_ARRAY_TO_TMPL:
-		ep.expandDefaultArrayToTemplate = value ? true : false;
-		break;
-
-	case asEP_AUTO_GARBAGE_COLLECT:
-		ep.autoGarbageCollect = value ? true : false;
-		break;
-
-	case asEP_DISALLOW_GLOBAL_VARS:
-		ep.disallowGlobalVars = value ? true : false;
-		break;
-
-	case asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT:
-		ep.alwaysImplDefaultConstruct = value ? true : false;
-		break;
-
-	case asEP_COMPILER_WARNINGS:
-		if( value <= 2 )
-			ep.compilerWarnings = (int)value;
-		else
-			return asINVALID_ARG;
-		break;
-
-	case asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE:
-		ep.disallowValueAssignForRefType = value ? true : false;
-		break;
-
-	case asEP_ALTER_SYNTAX_NAMED_ARGS:
-		if( value <= 2 )
-			ep.alterSyntaxNamedArgs = (int)value;
-		else
-			return asINVALID_ARG;
-		break;
-
-	case asEP_DISABLE_INTEGER_DIVISION:
-		ep.disableIntegerDivision = value ? true : false;
-		break;
-
-	case asEP_DISALLOW_EMPTY_LIST_ELEMENTS:
-		ep.disallowEmptyListElements = value ? true : false;
-		break;
-
-	case asEP_PRIVATE_PROP_AS_PROTECTED:
-		ep.privatePropAsProtected = value ? true : false;
-		break;
-
-	case asEP_ALLOW_UNICODE_IDENTIFIERS:
-		ep.allowUnicodeIdentifiers = value ? true : false;
-		break;
-
-	case asEP_HEREDOC_TRIM_MODE:
-		if (value <= 2)
-			ep.heredocTrimMode = (int)value;
-		else
-			return asINVALID_ARG;
-		break;
-
-	default:
-		return asINVALID_ARG;
-	}
-
-	return asSUCCESS;
-}
-
-// interface
-asPWORD asCScriptEngine::GetEngineProperty(asEEngineProp property) const
-{
-	switch( property )
-	{
-	case asEP_ALLOW_UNSAFE_REFERENCES:
-		return ep.allowUnsafeReferences;
-
-	case asEP_OPTIMIZE_BYTECODE:
-		return ep.optimizeByteCode;
-
-	case asEP_COPY_SCRIPT_SECTIONS:
-		return ep.copyScriptSections;
-
-	case asEP_MAX_STACK_SIZE:
-		return ep.maximumContextStackSize*4;
-
-	case asEP_USE_CHARACTER_LITERALS:
-		return ep.useCharacterLiterals;
-
-	case asEP_ALLOW_MULTILINE_STRINGS:
-		return ep.allowMultilineStrings;
-
-	case asEP_ALLOW_IMPLICIT_HANDLE_TYPES:
-		return ep.allowImplicitHandleTypes;
-
-	case asEP_BUILD_WITHOUT_LINE_CUES:
-		return ep.buildWithoutLineCues;
-
-	case asEP_INIT_GLOBAL_VARS_AFTER_BUILD:
-		return ep.initGlobalVarsAfterBuild;
-
-	case asEP_REQUIRE_ENUM_SCOPE:
-		return ep.requireEnumScope;
-
-	case asEP_SCRIPT_SCANNER:
-		return ep.scanner;
-
-	case asEP_INCLUDE_JIT_INSTRUCTIONS:
-		return ep.includeJitInstructions;
-
-	case asEP_STRING_ENCODING:
-		return ep.stringEncoding;
-
-	case asEP_PROPERTY_ACCESSOR_MODE:
-		return ep.propertyAccessorMode;
-
-	case asEP_EXPAND_DEF_ARRAY_TO_TMPL:
-		return ep.expandDefaultArrayToTemplate;
-
-	case asEP_AUTO_GARBAGE_COLLECT:
-		return ep.autoGarbageCollect;
-
-	case asEP_DISALLOW_GLOBAL_VARS:
-		return ep.disallowGlobalVars;
-
-	case asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT:
-		return ep.alwaysImplDefaultConstruct;
-
-	case asEP_COMPILER_WARNINGS:
-		return ep.compilerWarnings;
-
-	case asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE:
-		return ep.disallowValueAssignForRefType;
-
-	case asEP_ALTER_SYNTAX_NAMED_ARGS:
-		return ep.alterSyntaxNamedArgs;
-
-	case asEP_DISABLE_INTEGER_DIVISION:
-		return ep.disableIntegerDivision;
-
-	case asEP_DISALLOW_EMPTY_LIST_ELEMENTS:
-		return ep.disallowEmptyListElements;
-
-	case asEP_PRIVATE_PROP_AS_PROTECTED:
-		return ep.privatePropAsProtected;
-
-	case asEP_ALLOW_UNICODE_IDENTIFIERS:
-		return ep.allowUnicodeIdentifiers;
-
-	case asEP_HEREDOC_TRIM_MODE:
-		return ep.heredocTrimMode;
-
-	default:
-		return 0;
-	}
-
-	UNREACHABLE_RETURN;
-}
-
-// interface
-asIScriptFunction *asCScriptEngine::CreateDelegate(asIScriptFunction *func, void *obj)
-{
-	if( func == 0 || obj == 0 )
-		return 0;
-
-	// The function must be a class method
-	asITypeInfo *type = func->GetObjectType();
-	if( type == 0 )
-		return 0;
-
-	// The object type must allow handles
-	if( (type->GetFlags() & asOBJ_REF) == 0 || (type->GetFlags() & (asOBJ_SCOPED | asOBJ_NOHANDLE)) )
-		return 0;
-
-	// Create the delegate the same way it would be created by the scripts
-	return AS_NAMESPACE_QUALIFIER CreateDelegate(reinterpret_cast<asCScriptFunction*>(func), obj);
-}
-
-asCScriptEngine::asCScriptEngine()
-{
-	asCThreadManager::Prepare(0);
-
-	shuttingDown = false;
-	inDestructor = false;
-
-	// Engine properties
-	{
-		ep.allowUnsafeReferences         = false;
-		ep.optimizeByteCode              = true;
-		ep.copyScriptSections            = true;
-		ep.maximumContextStackSize       = 0;         // no limit
-		ep.useCharacterLiterals          = false;
-		ep.allowMultilineStrings         = false;
-		ep.allowImplicitHandleTypes      = false;
-		// TODO: optimize: Maybe this should be turned off by default? If a debugger is not used
-		//                 then this is just slowing down the execution.
-		ep.buildWithoutLineCues          = false;
-		ep.initGlobalVarsAfterBuild      = true;
-		ep.requireEnumScope              = false;
-		ep.scanner                       = 1;         // utf8. 0 = ascii
-		ep.includeJitInstructions        = false;
-		ep.stringEncoding                = 0;         // utf8. 1 = utf16
-		ep.propertyAccessorMode          = 2;         // 0 = disable, 1 = app registered only, 2 = app and script created
-		ep.expandDefaultArrayToTemplate  = false;
-		ep.autoGarbageCollect            = true;
-		ep.disallowGlobalVars            = false;
-		ep.alwaysImplDefaultConstruct    = false;
-		ep.compilerWarnings              = 1;         // 0 = no warnings, 1 = warning, 2 = treat as error
-		// TODO: 3.0.0: disallowValueAssignForRefType should be true by default
-		ep.disallowValueAssignForRefType = false;
-		ep.alterSyntaxNamedArgs          = 0;         // 0 = no alternate syntax, 1 = accept alternate syntax but warn, 2 = accept without warning
-		ep.disableIntegerDivision        = false;
-		ep.disallowEmptyListElements     = false;
-		ep.privatePropAsProtected        = false;
-		ep.allowUnicodeIdentifiers       = false;
-		ep.heredocTrimMode               = 1;         // 0 = never trim, 1 = don't trim on single line, 2 = trim initial and final empty line
-	}
-
-	gc.engine = this;
-	tok.engine = this;
-
-	refCount.set(1);
-	stringFactory = 0;
-	configFailed = false;
-	isPrepared = false;
-	isBuilding = false;
-	deferValidationOfTemplateTypes = false;
-	lastModule = 0;
-
-
-	initialContextStackSize = 1024;      // 4 KB (1024 * sizeof(asDWORD)
-
-
-	typeIdSeqNbr      = 0;
-	currentGroup      = &defaultGroup;
-	defaultAccessMask = 0xFFFFFFFF; // All bits set so that built-in functions/types will be available to all modules
-
-	msgCallback = 0;
-	jitCompiler = 0;
-
-	// Create the global namespace
-	defaultNamespace = AddNameSpace("");
-
-	requestCtxFunc   = 0;
-	returnCtxFunc    = 0;
-	ctxCallbackParam = 0;
-
-	// We must set the namespace in the built-in types explicitly as
-	// this wasn't done by the default constructor. If we do not do
-	// this we will get null pointer access in other parts of the code
-	scriptTypeBehaviours.nameSpace     = defaultNamespace;
-	functionBehaviours.nameSpace       = defaultNamespace;
-
-	// Reserve function id 0 for no function
-	scriptFunctions.PushLast(0);
-
-	// Reserve the first typeIds for the primitive types
-	typeIdSeqNbr = asTYPEID_DOUBLE + 1;
-
-	// Make sure typeId for the built-in primitives are defined according to asETypeIdFlags
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttVoid,   false)) == asTYPEID_VOID   );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttBool,   false)) == asTYPEID_BOOL   );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt8,   false)) == asTYPEID_INT8   );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt16,  false)) == asTYPEID_INT16  );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt,    false)) == asTYPEID_INT32  );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt64,  false)) == asTYPEID_INT64  );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt8,  false)) == asTYPEID_UINT8  );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt16, false)) == asTYPEID_UINT16 );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt,   false)) == asTYPEID_UINT32 );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt64, false)) == asTYPEID_UINT64 );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttFloat,  false)) == asTYPEID_FLOAT  );
-	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttDouble, false)) == asTYPEID_DOUBLE );
-
-	defaultArrayObjectType = 0;
-
-	RegisterScriptObject(this);
-	RegisterScriptFunction(this);
-}
-
-void asCScriptEngine::DeleteDiscardedModules()
-{
-	// TODO: redesign: Prevent more than one thread from entering this function at the same time. 
-	//                 If a thread is already doing the work for the clean-up the other thread should
-	//                 simply return, as the first thread will continue.
-
-	ACQUIRESHARED(engineRWLock);
-	asUINT maxCount = discardedModules.GetLength();
-	RELEASESHARED(engineRWLock);
-
-	for( asUINT n = 0; n < maxCount; n++ )
-	{
-		ACQUIRESHARED(engineRWLock);
-		asCModule *mod = discardedModules[n];
-		RELEASESHARED(engineRWLock);
-
-		if( !mod->HasExternalReferences(shuttingDown) )
-		{
-			asDELETE(mod, asCModule);
-			n--;
-		}
-
-		ACQUIRESHARED(engineRWLock);
-		// Determine the max count again, since another module may have been discarded during the processing
-		maxCount = discardedModules.GetLength();
-		RELEASESHARED(engineRWLock);
-	}
-
-	// Go over the list of global properties, to see if it is possible to clean
-	// up some variables that are no longer referred to by any functions
-	for( asUINT n = 0; n < globalProperties.GetLength(); n++ )
-	{
-		asCGlobalProperty *prop = globalProperties[n];
-		if( prop && prop->refCount.get() == 1 )
-			RemoveGlobalProperty(prop);
-	}
-}
-
-asCScriptEngine::~asCScriptEngine()
-{
-	// TODO: clean-up: Clean up redundant code
-
-	inDestructor = true;
-
-	asASSERT(refCount.get() == 0);
-
-	// If ShutDown hasn't been called yet do it now
-	if( !shuttingDown )
-	{
-		AddRef();
-		ShutDownAndRelease();
-	}
-
-	// Unravel the registered interface
-	if( defaultArrayObjectType )
-	{
-		defaultArrayObjectType->ReleaseInternal();
-		defaultArrayObjectType = 0;
-	}
-
-	// Delete the functions for generated template types that may references object types
-	for( asUINT n = 0; n < templateInstanceTypes.GetLength(); n++ )
-	{
-		asCObjectType *templateType = templateInstanceTypes[n];
-		if( templateInstanceTypes[n] )
-			templateType->DestroyInternal();
-	}
-	for( asUINT n = 0; n < listPatternTypes.GetLength(); n++ )
-	{
-		asCObjectType *type = listPatternTypes[n];
-		if( type )
-			type->ReleaseInternal();
-	}
-	listPatternTypes.SetLength(0);
-
-	// No script types must have survived
-	asASSERT( sharedScriptTypes.GetLength() == 0 );
-
-	// It is allowed to create new references to the engine temporarily while destroying objects
-	// but these references must be release immediately or else something is can go wrong later on
-	if( refCount.get() > 0 )
-		WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ENGINE_REF_COUNT_ERROR_DURING_SHUTDOWN);
-
-	mapTypeIdToTypeInfo.EraseAll();
-
-	// First remove what is not used, so that other groups can be deleted safely
-	defaultGroup.RemoveConfiguration(this, true);
-	while( configGroups.GetLength() )
-	{
-		// Delete config groups in the right order
-		asCConfigGroup *grp = configGroups.PopLast();
-		if( grp )
-		{
-			grp->RemoveConfiguration(this);
-			asDELETE(grp,asCConfigGroup);
-		}
-	}
-	// Remove what is remaining
-	defaultGroup.RemoveConfiguration(this);
-
-	// Any remaining objects in templateInstanceTypes is from generated template instances
-	for( asUINT n = 0; n < templateInstanceTypes.GetLength(); n++ )
-	{
-		asCObjectType *templateType = templateInstanceTypes[n];
-		if( templateInstanceTypes[n] )
-			templateType->ReleaseInternal();
-	}
-	templateInstanceTypes.SetLength(0);
-
-	asCSymbolTable<asCGlobalProperty>::iterator it = registeredGlobalProps.List();
-	for( ; it; it++ )
-	{
-		RemoveGlobalProperty(*it);
-		(*it)->Release();
-	}
-	registeredGlobalProps.Clear();
-
-	for( asUINT n = 0; n < templateSubTypes.GetLength(); n++ )
-	{
-		if( templateSubTypes[n] )
-		{
-			templateSubTypes[n]->DestroyInternal();
-			templateSubTypes[n]->ReleaseInternal();
-		}
-	}
-	templateSubTypes.SetLength(0);
-	registeredTypeDefs.SetLength(0);
-	registeredEnums.SetLength(0);
-	registeredObjTypes.SetLength(0);
-
-	asCSymbolTable<asCScriptFunction>::iterator funcIt = registeredGlobalFuncs.List();
-	for( ; funcIt; funcIt++ )
-		(*funcIt)->ReleaseInternal();
-	registeredGlobalFuncs.Clear();
-
-	scriptTypeBehaviours.ReleaseAllFunctions();
-	functionBehaviours.ReleaseAllFunctions();
-
-	for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
-		if( scriptFunctions[n] )
-		{
-			scriptFunctions[n]->DestroyInternal();
-
-			// Set the engine pointer to null to signal that the function is no longer part of the engine
-			scriptFunctions[n]->engine = 0;
-		}
-	scriptFunctions.SetLength(0);
-
-	// Increase the internal ref count for these builtin object types, so the destructor is not called incorrectly
-	scriptTypeBehaviours.AddRefInternal();
-	functionBehaviours.AddRefInternal();
-
-	// Destroy the funcdefs
-	// As funcdefs are shared between modules it shouldn't be a problem to keep the objects until the engine is released
-	for( asUINT n = 0; n < funcDefs.GetLength(); n++ )
-		if( funcDefs[n] )
-		{
-			funcDefs[n]->DestroyInternal();
-			funcDefs[n]->ReleaseInternal();
-		}
-	funcDefs.SetLength(0);
-
-	// Free the global properties
-	for( asUINT n = 0; n < globalProperties.GetLength(); n++ )
-	{
-		asCGlobalProperty *prop = globalProperties[n];
-		if( prop )
-		{
-			asASSERT( prop->refCount.get() == 1 );
-			RemoveGlobalProperty(prop);
-		}
-	}
-
-	// Free string constants
-	for( asUINT n = 0; n < stringConstants.GetLength(); n++ )
-		asDELETE(stringConstants[n],asCString);
-	stringConstants.SetLength(0);
-	stringToIdMap.EraseAll();
-
-	// Free the script section names
-	for( asUINT n = 0; n < scriptSectionNames.GetLength(); n++ )
-		asDELETE(scriptSectionNames[n],asCString);
-	scriptSectionNames.SetLength(0);
-
-	// Clean the user data
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n+1] )
-		{
-			for( asUINT c = 0; c < cleanEngineFuncs.GetLength(); c++ )
-				if( cleanEngineFuncs[c].type == userData[n] )
-					cleanEngineFuncs[c].cleanFunc(this);
-		}
-	}
-
-	// Free namespaces
-	for( asUINT n = 0; n < nameSpaces.GetLength(); n++ )
-		asDELETE(nameSpaces[n], asSNameSpace);
-	nameSpaces.SetLength(0);
-
-	asCThreadManager::Unprepare();
-}
-
-// interface
-int asCScriptEngine::SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param)
-{
-	// Both callbacks or neither must be set
-	if( (requestCtx == 0 && returnCtx != 0) || (requestCtx != 0 && returnCtx == 0) )
-		return asINVALID_ARG;
-
-	requestCtxFunc   = requestCtx;
-	returnCtxFunc    = returnCtx;
-	ctxCallbackParam = param;
-
-	return 0;
-}
-
-// interface
-asIScriptContext *asCScriptEngine::RequestContext()
-{
-	if( requestCtxFunc )
-	{
-		// The return callback must also exist
-		asASSERT( returnCtxFunc );
-
-		asIScriptContext *ctx = requestCtxFunc(this, ctxCallbackParam);
-		return ctx;
-	}
-
-	// As fallback we create a new context
-	return CreateContext();
-}
-
-// internal
-asCModule *asCScriptEngine::FindNewOwnerForSharedType(asCTypeInfo *in_type, asCModule *in_mod)
-{
-	asASSERT( in_type->IsShared() );
-
-	if( in_type->module != in_mod)
-		return in_type->module;
-
-	for( asUINT n = 0; n < scriptModules.GetLength(); n++ )
-	{
-		// TODO: optimize: If the modules already stored the shared types separately, this would be quicker
-		int foundIdx = -1;
-		asCModule *mod = scriptModules[n];
-		if( mod == in_type->module ) continue;
-		if( in_type->flags & asOBJ_ENUM )
-			foundIdx = mod->enumTypes.IndexOf(in_type->CastToEnumType());
-		else if (in_type->flags & asOBJ_TYPEDEF)
-			foundIdx = mod->typeDefs.IndexOf(in_type->CastToTypedefType());
-		else if (in_type->flags & asOBJ_FUNCDEF)
-			foundIdx = mod->funcDefs.IndexOf(in_type->CastToFuncdefType());
-		else
-			foundIdx = mod->classTypes.IndexOf(in_type->CastToObjectType());
-		
-		if( foundIdx >= 0 )
-		{
-			in_type->module = mod;
-			break;
-		}
-	}
-
-	return in_type->module;
-}
-
-// internal
-asCModule *asCScriptEngine::FindNewOwnerForSharedFunc(asCScriptFunction *in_func, asCModule *in_mod)
-{
-	asASSERT( in_func->IsShared() );
-	asASSERT(!(in_func->funcType & asFUNC_FUNCDEF));
-
-	if( in_func->module != in_mod)
-		return in_func->module;
-
-	for( asUINT n = 0; n < scriptModules.GetLength(); n++ )
-	{
-		// TODO: optimize: If the modules already stored the shared types separately, this would be quicker
-		int foundIdx = -1;
-		asCModule *mod = scriptModules[n];
-		if( mod == in_func->module ) continue;
-		foundIdx = mod->scriptFunctions.IndexOf(in_func);
-		
-		if( foundIdx >= 0 )
-		{
-			in_func->module = mod;
-			break;
-		}
-	}
-
-	return in_func->module;
-}
-
-// interface
-void asCScriptEngine::ReturnContext(asIScriptContext *ctx)
-{
-	if( returnCtxFunc )
-	{
-		returnCtxFunc(this, ctx, ctxCallbackParam);
-		return;
-	}
-
-	// As fallback we just release the context
-	if( ctx )
-		ctx->Release();
-}
-
-// interface
-int asCScriptEngine::AddRef() const
-{
-	asASSERT( refCount.get() > 0 || inDestructor );
-	return refCount.atomicInc();
-}
-
-// interface
-int asCScriptEngine::Release() const
-{
-	int r = refCount.atomicDec();
-
-	if( r == 0 )
-	{
-		// It is possible that some function will temporarily increment the engine ref count
-		// during clean-up for example while destroying the objects in the garbage collector.
-		if( !inDestructor )
-			asDELETE(const_cast<asCScriptEngine*>(this),asCScriptEngine);
-		return 0;
-	}
-
-	return r;
-}
-
-// interface
-int asCScriptEngine::ShutDownAndRelease()
-{
-	// Do a full garbage collection cycle to clean up any object that may still hold on to the engine
-	GarbageCollect();
-
-	// Set the flag that the engine is being shutdown now. This will speed up
-	// the process, and will also allow the engine to warn about invalid calls
-	shuttingDown = true;
-
-	// Clear the context callbacks. If new context's are needed for the clean-up the engine will take care of this itself.
-	// Context callbacks are normally used for pooling contexts, and if we allow new contexts to be created without being
-	// immediately destroyed afterwards it means the engine's refcount will increase. This is turn may cause memory access
-	// violations later on when the pool releases its contexts.
-	SetContextCallbacks(0, 0, 0);
-
-	// The modules must be deleted first, as they may use
-	// object types from the config groups
-	for( asUINT n = (asUINT)scriptModules.GetLength(); n-- > 0; )
-		if( scriptModules[n] )
-			scriptModules[n]->Discard();
-	scriptModules.SetLength(0);
-
-	// Do another full garbage collection to destroy the object types/functions
-	// that may have been placed in the gc when destroying the modules
-	GarbageCollect();
-
-	// Do another sweep to delete discarded modules, that may not have
-	// been deleted earlier due to still having external references
-	DeleteDiscardedModules();
-
-	// If the application hasn't registered GC behaviours for all types
-	// that can form circular references with script types, then there
-	// may still be objects in the GC.
-	gc.ReportAndReleaseUndestroyedObjects();
-
-	// Release the engine reference
-	return Release();
-}
-
-// internal
-asSNameSpace *asCScriptEngine::AddNameSpace(const char *name)
-{
-	// First check if it doesn't exist already
-	asSNameSpace *ns = FindNameSpace(name);
-	if( ns ) return ns;
-
-	ns = asNEW(asSNameSpace);
-	if( ns == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-	ns->name = name;
-
-	nameSpaces.PushLast(ns);
-
-	return ns;
-}
-
-// internal
-asSNameSpace *asCScriptEngine::FindNameSpace(const char *name) const
-{
-	// TODO: optimize: Improve linear search
-	for( asUINT n = 0; n < nameSpaces.GetLength(); n++ )
-		if( nameSpaces[n]->name == name )
-			return nameSpaces[n];
-
-	return 0;
-}
-
-// interface
-const char *asCScriptEngine::GetDefaultNamespace() const
-{
-	return defaultNamespace->name.AddressOf();
-}
-
-// interface
-int asCScriptEngine::SetDefaultNamespace(const char *nameSpace)
-{
-	if( nameSpace == 0 )
-		return ConfigError(asINVALID_ARG, "SetDefaultNamespace", nameSpace, 0);
-
-	asCString ns = nameSpace;
-	if( ns != "" )
-	{
-		// Make sure the namespace is composed of alternating identifier and ::
-		size_t pos = 0;
-		bool expectIdentifier = true;
-		size_t len;
-		eTokenType t = ttIdentifier;
-
-		for( ; pos < ns.GetLength(); pos += len)
-		{
-			t = tok.GetToken(ns.AddressOf() + pos, ns.GetLength() - pos, &len);
-			if( (expectIdentifier && t != ttIdentifier) || (!expectIdentifier && t != ttScope) )
-				return ConfigError(asINVALID_DECLARATION, "SetDefaultNamespace", nameSpace, 0);
-
-			expectIdentifier = !expectIdentifier;
-		}
-
-		// If the namespace ends with :: then strip it off
-		if( t == ttScope )
-			ns.SetLength(ns.GetLength()-2);
-	}
-
-	defaultNamespace = AddNameSpace(ns.AddressOf());
-
-	return 0;
-}
-
-// interface
-void *asCScriptEngine::SetUserData(void *data, asPWORD type)
-{
-	// As a thread might add a new new user data at the same time as another
-	// it is necessary to protect both read and write access to the userData member
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	// It is not intended to store a lot of different types of userdata,
-	// so a more complex structure like a associative map would just have
-	// more overhead than a simple array.
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n] == type )
-		{
-			void *oldData = reinterpret_cast<void*>(userData[n+1]);
-			userData[n+1] = reinterpret_cast<asPWORD>(data);
-
-			RELEASEEXCLUSIVE(engineRWLock);
-
-			return oldData;
-		}
-	}
-
-	userData.PushLast(type);
-	userData.PushLast(reinterpret_cast<asPWORD>(data));
-
-	RELEASEEXCLUSIVE(engineRWLock);
-
-	return 0;
-}
-
-// interface
-void *asCScriptEngine::GetUserData(asPWORD type) const
-{
-	// There may be multiple threads reading, but when
-	// setting the user data nobody must be reading.
-	ACQUIRESHARED(engineRWLock);
-
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n] == type )
-		{
-			RELEASESHARED(engineRWLock);
-			return reinterpret_cast<void*>(userData[n+1]);
-		}
-	}
-
-	RELEASESHARED(engineRWLock);
-
-	return 0;
-}
-
-// interface
-int asCScriptEngine::SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv)
-{
-	msgCallback = true;
-	msgCallbackObj = obj;
-	bool isObj = false;
-	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
-	{
-		msgCallback = false;
-		return asNOT_SUPPORTED;
-	}
-	if( (unsigned)callConv >= asCALL_THISCALL )
-	{
-		isObj = true;
-		if( obj == 0 )
-		{
-			msgCallback = false;
-			return asINVALID_ARG;
-		}
-	}
-	int r = DetectCallingConvention(isObj, callback, callConv, 0, &msgCallbackFunc);
-	if( r < 0 ) msgCallback = false;
-	return r;
-}
-
-// interface
-int asCScriptEngine::ClearMessageCallback()
-{
-	msgCallback = false;
-	return 0;
-}
-
-// interface
-int asCScriptEngine::WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message)
-{
-	// Validate input parameters
-	if( section == 0 ||
-		message == 0 )
-		return asINVALID_ARG;
-
-	// If there is no callback then there's nothing to do
-	if( !msgCallback )
-		return 0;
-
-	// If a pre-message has been set, then write that first
-	if( preMessage.isSet )
-	{
-		asSMessageInfo msg;
-		msg.section = preMessage.scriptname.AddressOf();
-		msg.row     = preMessage.r;
-		msg.col     = preMessage.c;
-		msg.type    = asMSGTYPE_INFORMATION;
-		msg.message = preMessage.message.AddressOf();
-
-		if( msgCallbackFunc.callConv < ICC_THISCALL )
-			CallGlobalFunction(&msg, msgCallbackObj, &msgCallbackFunc, 0);
-		else
-			CallObjectMethod(msgCallbackObj, &msg, &msgCallbackFunc, 0);
-
-		preMessage.isSet = false;
-	}
-
-	// Write the message to the callback
-	asSMessageInfo msg;
-	msg.section = section;
-	msg.row     = row;
-	msg.col     = col;
-	msg.type    = type;
-	msg.message = message;
-
-	if( msgCallbackFunc.callConv < ICC_THISCALL )
-		CallGlobalFunction(&msg, msgCallbackObj, &msgCallbackFunc, 0);
-	else
-		CallObjectMethod(msgCallbackObj, &msg, &msgCallbackFunc, 0);
-
-	return 0;
-}
-
-int asCScriptEngine::SetJITCompiler(asIJITCompiler *compiler)
-{
-	jitCompiler = compiler;
-	return asSUCCESS;
-}
-
-asIJITCompiler *asCScriptEngine::GetJITCompiler() const
-{
-	return jitCompiler;
-}
-
-// interface
-asETokenClass asCScriptEngine::ParseToken(const char *string, size_t stringLength, asUINT *tokenLength) const
-{
-	if( stringLength == 0 )
-		stringLength = strlen(string);
-
-	size_t len;
-	asETokenClass tc;
-	tok.GetToken(string, stringLength, &len, &tc);
-
-	if( tokenLength )
-		*tokenLength = (asUINT)len;
-
-	return tc;
-}
-
-// interface
-asIScriptModule *asCScriptEngine::GetModule(const char *module, asEGMFlags flag)
-{
-	asCModule *mod = GetModule(module, false);
-
-	if( flag == asGM_ALWAYS_CREATE )
-	{
-		if( mod != 0 )
-			mod->Discard();
-
-		return GetModule(module, true);
-	}
-
-	if( mod == 0 && flag == asGM_CREATE_IF_NOT_EXISTS )
-		return GetModule(module, true);
-
-	return mod;
-}
-
-// interface
-int asCScriptEngine::DiscardModule(const char *module)
-{
-	asCModule *mod = GetModule(module, false);
-	if( mod == 0 ) return asNO_MODULE;
-
-	mod->Discard();
-
-	return 0;
-}
-
-// interface
-asUINT asCScriptEngine::GetModuleCount() const
-{
-	ACQUIRESHARED(engineRWLock);
-	asUINT length = asUINT(scriptModules.GetLength());
-	RELEASESHARED(engineRWLock);
-	return length;
-}
-
-// interface
-asIScriptModule *asCScriptEngine::GetModuleByIndex(asUINT index) const
-{
-	asIScriptModule *mod = 0;
-	ACQUIRESHARED(engineRWLock);
-	if( index < scriptModules.GetLength() )
-		mod = scriptModules[index];
-	RELEASESHARED(engineRWLock);
-	return mod;
-}
-
-// internal
-int asCScriptEngine::GetFactoryIdByDecl(const asCObjectType *ot, const char *decl)
-{
-	asCModule *mod = 0;
-
-	// Is this a script class?
-	if( (ot->flags & asOBJ_SCRIPT_OBJECT) && ot->size > 0 )
-		mod = scriptFunctions[ot->beh.factories[0]]->module;
-
-	asCBuilder bld(this, mod);
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	asCScriptFunction func(this, mod, asFUNC_DUMMY);
-	int r = bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, defaultNamespace);
-	if( r < 0 )
-		return asINVALID_DECLARATION;
-
-	// Search for matching factory function
-	int id = -1;
-	for( asUINT n = 0; n < ot->beh.factories.GetLength(); n++ )
-	{
-		asCScriptFunction *f = scriptFunctions[ot->beh.factories[n]];
-		if( f->IsSignatureEqual(&func) )
-		{
-			id = ot->beh.factories[n];
-			break;
-		}
-	}
-
-	if( id == -1 ) return asNO_FUNCTION;
-
-	return id;
-}
-
-
-// internal
-int asCScriptEngine::GetMethodIdByDecl(const asCObjectType *ot, const char *decl, asCModule *mod)
-{
-	asCBuilder bld(this, mod);
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	asCScriptFunction func(this, mod, asFUNC_DUMMY);
-
-	// Set the object type so that the signature can be properly compared
-	// This cast is OK, it will only be used for comparison
-	func.objectType = const_cast<asCObjectType*>(ot);
-	func.objectType->AddRefInternal();
-
-	int r = bld.ParseFunctionDeclaration(func.objectType, decl, &func, false);
-	if( r < 0 )
-		return asINVALID_DECLARATION;
-
-	// Search script functions for matching interface
-	int id = -1;
-	for( asUINT n = 0; n < ot->methods.GetLength(); ++n )
-	{
-		if( func.IsSignatureEqual(scriptFunctions[ot->methods[n]]) )
-		{
-			if( id == -1 )
-				id = ot->methods[n];
-			else
-				return asMULTIPLE_FUNCTIONS;
-		}
-	}
-
-	if( id == -1 ) return asNO_FUNCTION;
-
-	return id;
-}
-
-
-// internal
-asCString asCScriptEngine::GetFunctionDeclaration(int funcId)
-{
-	asCString str;
-	asCScriptFunction *func = GetScriptFunction(funcId);
-	if( func )
-		str = func->GetDeclarationStr();
-
-	return str;
-}
-
-// internal
-asCScriptFunction *asCScriptEngine::GetScriptFunction(int funcId) const
-{
-	if( funcId < 0 || funcId >= (int)scriptFunctions.GetLength() )
-		return 0;
-
-	return scriptFunctions[funcId];
-}
-
-
-// interface
-asIScriptContext *asCScriptEngine::CreateContext()
-{
-	asIScriptContext *ctx = 0;
-	CreateContext(&ctx, false);
-	return ctx;
-}
-
-// internal
-int asCScriptEngine::CreateContext(asIScriptContext **context, bool isInternal)
-{
-	*context = asNEW(asCContext)(this, !isInternal);
-	if( *context == 0 )
-		return asOUT_OF_MEMORY;
-
-	// We need to make sure the engine has been
-	// prepared before any context is executed
-	PrepareEngine();
-
-	return 0;
-}
-
-// interface
-int asCScriptEngine::RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset)
-{
-	int r;
-	asCDataType dt;
-	asCBuilder bld(this, 0);
-	r = bld.ParseDataType(obj, &dt, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(r, "RegisterObjectProperty", obj, declaration);
-
-	// Don't allow modifying generated template instances
-	if( dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(dt.GetTypeInfo()->CastToObjectType()) )
-		return ConfigError(asINVALID_TYPE, "RegisterObjectProperty", obj, declaration);
-
-	// Verify that the correct config group is used
-	if( currentGroup->FindType(dt.GetTypeInfo()->name.AddressOf()) == 0 )
-		return ConfigError(asWRONG_CONFIG_GROUP, "RegisterObjectProperty", obj, declaration);
-
-	asCDataType type;
-	asCString name;
-
-	if( (r = bld.VerifyProperty(&dt, declaration, name, type, 0)) < 0 )
-		return ConfigError(r, "RegisterObjectProperty", obj, declaration);
-
-	// Store the property info
-	if( dt.GetTypeInfo() == 0 || dt.IsObjectHandle() )
-		return ConfigError(asINVALID_OBJECT, "RegisterObjectProperty", obj, declaration);
-
-	// The VM currently only supports 16bit offsets
-	// TODO: The VM needs to have support for 32bit offsets. Probably with a second ADDSi instruction
-	//       However, when implementing this it is necessary for the bytecode serialization to support
-	//       the switch between the instructions upon loading bytecode as the offset may not be the
-	//       same on all platforms
-	if( byteOffset > 32767 || byteOffset < -32768 )
-		return ConfigError(asINVALID_ARG, "RegisterObjectProperty", obj, declaration);
-
-	asCObjectProperty *prop = asNEW(asCObjectProperty);
-	if( prop == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterObjectProperty", obj, declaration);
-
-	prop->name        = name;
-	prop->type        = type;
-	prop->byteOffset  = byteOffset;
-	prop->isPrivate   = false;
-	prop->isProtected = false;
-	prop->accessMask  = defaultAccessMask;
-
-	dt.GetTypeInfo()->CastToObjectType()->properties.PushLast(prop);
-
-	// Add references to types so they are not released too early
-	if( type.GetTypeInfo() )
-	{
-		type.GetTypeInfo()->AddRefInternal();
-
-		// Add template instances to the config group
-		if( (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) && !currentGroup->types.Exists(type.GetTypeInfo()) )
-			currentGroup->types.PushLast(type.GetTypeInfo());
-	}
-
-	currentGroup->AddReferencesForType(this, type.GetTypeInfo());
-
-	return asSUCCESS;
-}
-
-// interface
-int asCScriptEngine::RegisterInterface(const char *name)
-{
-	if( name == 0 ) return ConfigError(asINVALID_NAME, "RegisterInterface", 0, 0);
-
-	// Verify if the name has been registered as a type already
-	if( GetRegisteredType(name, defaultNamespace) )
-		return asALREADY_REGISTERED;
-
-	// Use builder to parse the datatype
-	asCDataType dt;
-	asCBuilder bld(this, 0);
-	bool oldMsgCallback = msgCallback; msgCallback = false;
-	int r = bld.ParseDataType(name, &dt, defaultNamespace);
-	msgCallback = oldMsgCallback;
-	if( r >= 0 )
-	{
-		// If it is not in the defaultNamespace then the type was successfully parsed because
-		// it is declared in a parent namespace which shouldn't be treated as an error
-		if( dt.GetTypeInfo() && dt.GetTypeInfo()->nameSpace == defaultNamespace )
-			return ConfigError(asERROR, "RegisterInterface", name, 0);
-	}
-
-	// Make sure the name is not a reserved keyword
-	size_t tokenLen;
-	int token = tok.GetToken(name, strlen(name), &tokenLen);
-	if( token != ttIdentifier || strlen(name) != tokenLen )
-		return ConfigError(asINVALID_NAME, "RegisterInterface", name, 0);
-
-	r = bld.CheckNameConflict(name, 0, 0, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(asNAME_TAKEN, "RegisterInterface", name, 0);
-
-	// Don't have to check against members of object
-	// types as they are allowed to use the names
-
-	// Register the object type for the interface
-	asCObjectType *st = asNEW(asCObjectType)(this);
-	if( st == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterInterface", name, 0);
-
-	st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT | asOBJ_SHARED;
-	st->size = 0; // Cannot be instantiated
-	st->name = name;
-	st->nameSpace = defaultNamespace;
-
-	// Use the default script class behaviours
-	st->beh.factory = 0;
-	st->beh.addref = scriptTypeBehaviours.beh.addref;
-	scriptFunctions[st->beh.addref]->AddRefInternal();
-	st->beh.release = scriptTypeBehaviours.beh.release;
-	scriptFunctions[st->beh.release]->AddRefInternal();
-	st->beh.copy = 0;
-
-	allRegisteredTypes.Insert(asSNameSpaceNamePair(st->nameSpace, st->name), st);
-	registeredObjTypes.PushLast(st);
-
-	currentGroup->types.PushLast(st);
-
-	return asSUCCESS;
-}
-
-// interface
-int asCScriptEngine::RegisterInterfaceMethod(const char *intf, const char *declaration)
-{
-	// Verify that the correct config group is set.
-	if( currentGroup->FindType(intf) == 0 )
-		return ConfigError(asWRONG_CONFIG_GROUP, "RegisterInterfaceMethod", intf, declaration);
-
-	asCDataType dt;
-	asCBuilder bld(this, 0);
-	int r = bld.ParseDataType(intf, &dt, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(r, "RegisterInterfaceMethod", intf, declaration);
-
-	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_INTERFACE);
-	if( func == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterInterfaceMethod", intf, declaration);
-
-	func->objectType = dt.GetTypeInfo()->CastToObjectType();
-	func->objectType->AddRefInternal();
-
-	r = bld.ParseFunctionDeclaration(func->objectType, declaration, func, false);
-	if( r < 0 )
-	{
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asINVALID_DECLARATION, "RegisterInterfaceMethod", intf, declaration);
-	}
-
-	// Check name conflicts
-	r = bld.CheckNameConflictMember(dt.GetTypeInfo(), func->name.AddressOf(), 0, 0, false);
-	if( r < 0 )
-	{
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asNAME_TAKEN, "RegisterInterfaceMethod", intf, declaration);
-	}
-
-	func->id = GetNextScriptFunctionId();
-	AddScriptFunction(func);
-
-	// The index into the interface's vftable chunk should be
-	// its index in the methods array.
-	func->vfTableIdx = int(func->objectType->methods.GetLength());
-
-	func->objectType->methods.PushLast(func->id);
-
-	func->ComputeSignatureId();
-
-	currentGroup->AddReferencesForFunc(this, func);
-
-	// Return function id as success
-	return func->id;
-}
-
-int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD flags)
-{
-	int r;
-
-	isPrepared = false;
-
-	// Verify flags
-	// Must have either asOBJ_REF or asOBJ_VALUE
-	if( flags & asOBJ_REF )
-	{
-		// Can optionally have the asOBJ_GC, asOBJ_NOHANDLE, asOBJ_SCOPED, or asOBJ_TEMPLATE flag set, but nothing else
-		if( flags & ~(asOBJ_REF | asOBJ_GC | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_TEMPLATE | asOBJ_NOCOUNT | asOBJ_IMPLICIT_HANDLE) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-
-		// flags are exclusive
-		if( (flags & asOBJ_GC) && (flags & (asOBJ_NOHANDLE|asOBJ_SCOPED|asOBJ_NOCOUNT)) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		if( (flags & asOBJ_NOHANDLE) && (flags & (asOBJ_GC|asOBJ_SCOPED|asOBJ_NOCOUNT|asOBJ_IMPLICIT_HANDLE)) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		if( (flags & asOBJ_SCOPED) && (flags & (asOBJ_GC|asOBJ_NOHANDLE|asOBJ_NOCOUNT|asOBJ_IMPLICIT_HANDLE)) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		if( (flags & asOBJ_NOCOUNT) && (flags & (asOBJ_GC|asOBJ_NOHANDLE|asOBJ_SCOPED)) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-
-		// Implicit handle is only allowed if the engine property for this is turned on
-		if( !ep.allowImplicitHandleTypes && (flags & asOBJ_IMPLICIT_HANDLE) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-	}
-	else if( flags & asOBJ_VALUE )
-	{
-		// Cannot use reference flags
-		if( flags & (asOBJ_REF | asOBJ_GC | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_NOCOUNT | asOBJ_IMPLICIT_HANDLE) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-
-		// Flags are exclusive
-		if( (flags & asOBJ_POD) && (flags & (asOBJ_ASHANDLE | asOBJ_TEMPLATE)) )
-			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-
-		// If the app type is given, we must validate the flags
-		if( flags & asOBJ_APP_CLASS )
-		{
-			// Must not set the primitive or float flag
-			if( flags & (asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY) )
-				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		}
-		else
-		{
-			// Must not set the class properties, without the class flag
-			if( flags & (asOBJ_APP_CLASS_CONSTRUCTOR      |
-						 asOBJ_APP_CLASS_DESTRUCTOR       |
-						 asOBJ_APP_CLASS_ASSIGNMENT       |
-						 asOBJ_APP_CLASS_COPY_CONSTRUCTOR |
-						 asOBJ_APP_CLASS_ALLINTS          |
-						 asOBJ_APP_CLASS_ALLFLOATS) )
-			{
-				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-			}
-		}
-
-		if( flags & asOBJ_APP_PRIMITIVE )
-		{
-			if( flags & (asOBJ_APP_CLASS |
-						 asOBJ_APP_FLOAT |
-						 asOBJ_APP_ARRAY) )
-				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		}
-		else if( flags & asOBJ_APP_FLOAT )
-		{
-			if( flags & (asOBJ_APP_CLASS     |
-						 asOBJ_APP_PRIMITIVE |
-						 asOBJ_APP_ARRAY) )
-				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		}
-		else if( flags & asOBJ_APP_ARRAY )
-		{
-			if( flags & (asOBJ_APP_CLASS     |
-						 asOBJ_APP_PRIMITIVE |
-						 asOBJ_APP_FLOAT) )
-				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-		}
-	}
-	else
-		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-
-	// Don't allow anything else than the defined flags
-#ifndef WIP_16BYTE_ALIGN
-	if( flags - (flags & asOBJ_MASK_VALID_FLAGS) )
-#else
-	if( flags - (flags & (asOBJ_MASK_VALID_FLAGS | asOBJ_APP_ALIGN16)) )
-#endif
-		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-
-	// Value types must have a defined size
-	if( (flags & asOBJ_VALUE) && byteSize == 0 )
-	{
-		WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_VALUE_TYPE_MUST_HAVE_SIZE);
-		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
-	}
-
-	// Verify type name
-	if( name == 0 )
-		return ConfigError(asINVALID_NAME, "RegisterObjectType", name, 0);
-
-	asCString typeName;
-	asCBuilder bld(this, 0);
-	if( flags & asOBJ_TEMPLATE )
-	{
-		asCArray<asCString> subtypeNames;
-		r = bld.ParseTemplateDecl(name, &typeName, subtypeNames);
-		if( r < 0 )
-			return ConfigError(r, "RegisterObjectType", name, 0);
-
-		// Verify that the template name hasn't been registered as a type already
-		if( GetRegisteredType(typeName, defaultNamespace) )
-			// This is not an irrepairable error, as it may just be that the same type is registered twice
-			return asALREADY_REGISTERED;
-
-		asCObjectType *type = asNEW(asCObjectType)(this);
-		if( type == 0 )
-			return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
-
-		type->name       = typeName;
-		type->nameSpace  = defaultNamespace;
-		type->size       = byteSize;
-#ifdef WIP_16BYTE_ALIGN
-		// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
-		type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
-#endif
-		type->flags      = flags;
-		type->accessMask = defaultAccessMask;
-
-		// Store it in the object types
-		allRegisteredTypes.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
-		currentGroup->types.PushLast(type);
-		registeredObjTypes.PushLast(type);
-		registeredTemplateTypes.PushLast(type);
-
-		// Define the template subtypes
-		for( asUINT subTypeIdx = 0; subTypeIdx < subtypeNames.GetLength(); subTypeIdx++ )
-		{
-			asCTypeInfo *subtype = 0;
-			for( asUINT n = 0; n < templateSubTypes.GetLength(); n++ )
-			{
-				if( templateSubTypes[n]->name == subtypeNames[subTypeIdx] )
-				{
-					subtype = templateSubTypes[n];
-					break;
-				}
-			}
-			if( subtype == 0 )
-			{
-				// Create the new subtype if not already existing
-				subtype = asNEW(asCTypeInfo)(this);
-				if( subtype == 0 )
-					return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
-
-				subtype->name      = subtypeNames[subTypeIdx];
-				subtype->size      = 0;
-				subtype->flags     = asOBJ_TEMPLATE_SUBTYPE;
-				templateSubTypes.PushLast(subtype);
-			}
-			type->templateSubTypes.PushLast(asCDataType::CreateType(subtype, false));
-			subtype->AddRefInternal();
-		}
-	}
-	else
-	{
-		typeName = name;
-
-		// Verify if the name has been registered as a type already
-		if( GetRegisteredType(typeName, defaultNamespace) )
-			// This is not an irrepairable error, as it may just be that the same type is registered twice
-			return asALREADY_REGISTERED;
-
-		// TODO: clean up: Is it really necessary to check here?
-		for( asUINT n = 0; n < templateInstanceTypes.GetLength(); n++ )
-		{
-			if( templateInstanceTypes[n] &&
-				templateInstanceTypes[n]->name == typeName &&
-				templateInstanceTypes[n]->nameSpace == defaultNamespace )
-				// This is not an irrepairable error, as it may just be that the same type is registered twice
-				return asALREADY_REGISTERED;
-		}
-
-		// Keep the most recent template generated instance type, so we know what it was before parsing the datatype
-		asCObjectType *mostRecentTemplateInstanceType = 0;
-		asUINT originalSizeOfGeneratedTemplateTypes = (asUINT)generatedTemplateTypes.GetLength();
-		if( originalSizeOfGeneratedTemplateTypes )
-			mostRecentTemplateInstanceType = generatedTemplateTypes[originalSizeOfGeneratedTemplateTypes-1];
-
-		// Use builder to parse the datatype
-		asCDataType dt;
-		bool oldMsgCallback = msgCallback; msgCallback = false;
-		r = bld.ParseDataType(name, &dt, defaultNamespace);
-		msgCallback = oldMsgCallback;
-
-		// If the builder fails or the namespace is different than the default
-		// namespace, then the type name is new and it should be registered
-		if( r < 0 || dt.GetTypeInfo()->nameSpace != defaultNamespace )
-		{
-			// Make sure the name is not a reserved keyword
-			size_t tokenLen;
-			int token = tok.GetToken(name, typeName.GetLength(), &tokenLen);
-			if( token != ttIdentifier || typeName.GetLength() != tokenLen )
-				return ConfigError(asINVALID_NAME, "RegisterObjectType", name, 0);
-
-			r = bld.CheckNameConflict(name, 0, 0, defaultNamespace);
-			if( r < 0 )
-				return ConfigError(asNAME_TAKEN, "RegisterObjectType", name, 0);
-
-			// Don't have to check against members of object
-			// types as they are allowed to use the names
-
-			// Put the data type in the list
-			asCObjectType *type = asNEW(asCObjectType)(this);
-			if( type == 0 )
-				return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
-
-			type->name       = typeName;
-			type->nameSpace  = defaultNamespace;
-			type->size       = byteSize;
-#ifdef WIP_16BYTE_ALIGN
-			// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
-			type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
-#endif
-			type->flags      = flags;
-			type->accessMask = defaultAccessMask;
-
-			allRegisteredTypes.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
-			registeredObjTypes.PushLast(type);
-
-			currentGroup->types.PushLast(type);
-		}
-		else
-		{
-			// The application is registering a template specialization so we
-			// need to replace the template instance type with the new type.
-
-			// TODO: Template: We don't require the lower dimensions to be registered first for registered template types
-			// int[][] must not be allowed to be registered
-			// if int[] hasn't been registered first
-			if( dt.GetSubType().IsTemplate() )
-				return ConfigError(asLOWER_ARRAY_DIMENSION_NOT_REGISTERED, "RegisterObjectType", name, 0);
-
-			if( dt.IsReadOnly() ||
-				dt.IsReference() )
-				return ConfigError(asINVALID_TYPE, "RegisterObjectType", name, 0);
-
-			// Was the template instance type generated before?
-			if( generatedTemplateTypes.Exists(dt.GetTypeInfo()->CastToObjectType()) &&
-				generatedTemplateTypes[generatedTemplateTypes.GetLength()-1] == mostRecentTemplateInstanceType )
-			{
-				asCString str;
-				str.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, typeName.AddressOf());
-				WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-				return ConfigError(asNOT_SUPPORTED, "RegisterObjectType", name, 0);
-			}
-
-			// If this is not a generated template instance type, then it means it is an
-			// already registered template specialization
-			if( !generatedTemplateTypes.Exists(dt.GetTypeInfo()->CastToObjectType()) )
-				return ConfigError(asALREADY_REGISTERED, "RegisterObjectType", name, 0);
-
-			// TODO: Add this again. The type is used by the factory stubs so we need to discount that
-			// Is the template instance type already being used?
-//			if( dt.GetTypeInfo()->GetRefCount() > 1 )
-//				return ConfigError(asNOT_SUPPORTED, "RegisterObjectType", name, 0);
-
-			// Put the data type in the list
-			asCObjectType *type = asNEW(asCObjectType)(this);
-			if( type == 0 )
-				return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
-
-			type->name       = dt.GetTypeInfo()->name;
-			// The namespace will be the same as the original template type
-			type->nameSpace  = dt.GetTypeInfo()->nameSpace;
-			type->templateSubTypes.PushLast(dt.GetSubType());
-			for( asUINT s = 0; s < type->templateSubTypes.GetLength(); s++ )
-				if( type->templateSubTypes[s].GetTypeInfo() )
-					type->templateSubTypes[s].GetTypeInfo()->AddRefInternal();
-			type->size       = byteSize;
-#ifdef WIP_16BYTE_ALIGN
-			// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
-			type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
-#endif
-			type->flags      = flags;
-			type->accessMask = defaultAccessMask;
-
-			templateInstanceTypes.PushLast(type);
-
-			currentGroup->types.PushLast(type);
-
-			// Remove the template instance type, which will no longer be used.
-			// It is possible that multiple template instances are generated if
-			// they have any relationship, so all of them must be removed
-			while( generatedTemplateTypes.GetLength() > originalSizeOfGeneratedTemplateTypes )
-				RemoveTemplateInstanceType(generatedTemplateTypes[generatedTemplateTypes.GetLength()-1]);
-		}
-	}
-
-	// Return the type id as the success (except for template types)
-	if( flags & asOBJ_TEMPLATE )
-		return asSUCCESS;
-
-	return GetTypeIdByDecl(name);
-}
-
-// interface
-int asCScriptEngine::RegisterObjectBehaviour(const char *datatype, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary)
-{
-	if( datatype == 0 ) return ConfigError(asINVALID_ARG, "RegisterObjectBehaviour", datatype, decl);
-
-	// Determine the object type
-	asCBuilder bld(this, 0);
-	asCDataType type;
-	int r = bld.ParseDataType(datatype, &type, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(r, "RegisterObjectBehaviour", datatype, decl);
-
-	if( type.GetTypeInfo() == 0 || type.IsObjectHandle()  )
-		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
-
-	// Don't allow application to modify built-in types
-	if( type.GetTypeInfo() == &functionBehaviours ||
-		type.GetTypeInfo() == &scriptTypeBehaviours )
-		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
-
-	if( type.IsReadOnly() || type.IsReference() )
-		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
-
-	// Don't allow modifying generated template instances
-	if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(type.GetTypeInfo()->CastToObjectType()) )
-		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
-
-	return RegisterBehaviourToObjectType(type.GetTypeInfo()->CastToObjectType(), behaviour, decl, funcPointer, callConv, auxiliary);
-}
-
-// internal
-int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary)
-{
-#ifdef AS_MAX_PORTABILITY
-	if( callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-#endif
-
-	asSSystemFunctionInterface internal;
-	bool isMethod = !(behaviour == asBEHAVE_FACTORY ||
-		              behaviour == asBEHAVE_LIST_FACTORY ||
-		              behaviour == asBEHAVE_TEMPLATE_CALLBACK);
-	int r = DetectCallingConvention(isMethod, funcPointer, callConv, auxiliary, &internal);
-	if( r < 0 )
-		return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-	// TODO: cleanup: This is identical to what is in RegisterMethodToObjectType
-	// If the object type is a template, make sure there are no generated instances already
-	if( objectType->flags & asOBJ_TEMPLATE )
-	{
-		for( asUINT n = 0; n < generatedTemplateTypes.GetLength(); n++ )
-		{
-			asCObjectType *tmpl = generatedTemplateTypes[n];
-			if( tmpl->name == objectType->name &&
-				tmpl->nameSpace == objectType->nameSpace &&
-				!(tmpl->templateSubTypes[0].GetTypeInfo() && (tmpl->templateSubTypes[0].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE)) )
-			{
-				asCString msg;
-				msg.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, asCDataType::CreateType(tmpl, false).Format(tmpl->nameSpace).AddressOf());
-				WriteMessage("",0,0, asMSGTYPE_ERROR, msg.AddressOf());
-				return ConfigError(asERROR, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-			}
-		}
-	}
-
-	isPrepared = false;
-
-	asSTypeBehaviour *beh = &objectType->beh;
-
-	// Verify function declaration
-	asCScriptFunction func(this, 0, asFUNC_DUMMY);
-
-	bool expectListPattern = behaviour == asBEHAVE_LIST_FACTORY || behaviour == asBEHAVE_LIST_CONSTRUCT;
-	asCScriptNode *listPattern = 0;
-	asCBuilder bld(this, 0);
-	r = bld.ParseFunctionDeclaration(objectType, decl, &func, true, &internal.paramAutoHandles, &internal.returnAutoHandle, 0, expectListPattern ? &listPattern : 0);
-	if( r < 0 )
-	{
-		if( listPattern )
-			listPattern->Destroy(this);
-		return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-	}
-	func.name.Format("$beh%d", behaviour);
-
-	if( behaviour != asBEHAVE_FACTORY && behaviour != asBEHAVE_LIST_FACTORY )
-	{
-		func.objectType = objectType;
-		func.objectType->AddRefInternal();
-	}
-
-	// Check if the method restricts that use of the template to value types or reference types
-	if( objectType->flags & asOBJ_TEMPLATE )
-	{
-		r = SetTemplateRestrictions(objectType, &func, "RegisterObjectBehaviour", decl);
-		if (r < 0)
-			return r;
-	}
-
-	if( behaviour == asBEHAVE_CONSTRUCT )
-	{
-		// Verify that the return type is void
-		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		if( objectType->flags & asOBJ_SCRIPT_OBJECT )
-		{
-			// The script object is a special case
-			asASSERT(func.parameterTypes.GetLength() == 1);
-
-			beh->construct = AddBehaviourFunction(func, internal);
-			beh->factory   = beh->construct;
-			scriptFunctions[beh->factory]->AddRefInternal();
-			beh->constructors.PushLast(beh->construct);
-			beh->factories.PushLast(beh->factory);
-			func.id = beh->construct;
-		}
-		else
-		{
-			// Verify that it is a value type
-			if( !(func.objectType->flags & asOBJ_VALUE) )
-			{
-				WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-				return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-			}
-
-			// The templates take a hidden parameter with the object type
-			if( (objectType->flags & asOBJ_TEMPLATE) &&
-				(func.parameterTypes.GetLength() == 0 ||
-				 !func.parameterTypes[0].IsReference()) )
-			{
-				WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_FIRST_PARAM_MUST_BE_REF_FOR_TEMPLATE_FACTORY);
-				return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-			}
-
-			// TODO: Verify that the same constructor hasn't been registered already
-
-			// Store all constructors in a list
-			func.id = AddBehaviourFunction(func, internal);
-			beh->constructors.PushLast(func.id);
-			if( func.parameterTypes.GetLength() == 0 ||
-				(func.parameterTypes.GetLength() == 1 && (objectType->flags & asOBJ_TEMPLATE)) )
-			{
-				beh->construct = func.id;
-			}
-			else if( func.parameterTypes.GetLength() == 1 )
-			{
-				// Is this the copy constructor?
-				asCDataType paramType = func.parameterTypes[0];
-
-				// If the parameter is object, and const reference for input or inout,
-				// and same type as this class, then this is a copy constructor.
-				if( paramType.IsObject() && paramType.IsReference() && paramType.IsReadOnly() &&
-					(func.inOutFlags[0] & asTM_INREF) && paramType.GetTypeInfo() == objectType )
-					beh->copyconstruct = func.id;
-			}
-		}
-	}
-	else if( behaviour == asBEHAVE_DESTRUCT )
-	{
-		// Must be a value type
-		if( !(func.objectType->flags & asOBJ_VALUE) )
-		{
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		if( beh->destruct )
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that the return type is void
-		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that there are no parameters
-		if( func.parameterTypes.GetLength() > 0 )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		func.id = beh->destruct = AddBehaviourFunction(func, internal);
-	}
-	else if( behaviour == asBEHAVE_LIST_CONSTRUCT )
-	{
-		// Verify that the return type is void
-		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Verify that it is a value type
-		if( !(func.objectType->flags & asOBJ_VALUE) )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Verify the parameters
-		if( func.parameterTypes.GetLength() != 1 || !func.parameterTypes[0].IsReference() )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM);
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Don't accept duplicates
-		if( beh->listFactory )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Add the function
-		func.id = AddBehaviourFunction(func, internal);
-
-		// Re-use the listFactory member, as it is not possible to have both anyway
-		beh->listFactory = func.id;
-
-		// Store the list pattern for this function
-		r = scriptFunctions[func.id]->RegisterListPattern(decl, listPattern);
-
-		if( listPattern )
-			listPattern->Destroy(this);
-
-		if( r < 0 )
-			return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-	}
-	else if( behaviour == asBEHAVE_FACTORY || behaviour == asBEHAVE_LIST_FACTORY )
-	{
-		// Must be a ref type and must not have asOBJ_NOHANDLE
-		if( !(objectType->flags & asOBJ_REF) || (objectType->flags & asOBJ_NOHANDLE) )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Verify that the return type is a handle to the type
-		if( func.returnType != asCDataType::CreateObjectHandle(objectType, false) )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// The templates take a hidden parameter with the object type
-		if( (objectType->flags & asOBJ_TEMPLATE) &&
-			(func.parameterTypes.GetLength() == 0 ||
-			 !func.parameterTypes[0].IsReference()) )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_FIRST_PARAM_MUST_BE_REF_FOR_TEMPLATE_FACTORY);
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		if( behaviour == asBEHAVE_LIST_FACTORY )
-		{
-			// Make sure the factory takes a reference as its last parameter
-			if( objectType->flags & asOBJ_TEMPLATE )
-			{
-				if( func.parameterTypes.GetLength() != 2 || !func.parameterTypes[1].IsReference() )
-				{
-					if( listPattern )
-						listPattern->Destroy(this);
-
-					WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_TEMPLATE_LIST_FACTORY_EXPECTS_2_REF_PARAMS);
-					return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-				}
-			}
-			else
-			{
-				if( func.parameterTypes.GetLength() != 1 || !func.parameterTypes[0].IsReference() )
-				{
-					if( listPattern )
-						listPattern->Destroy(this);
-
-					WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM);
-					return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-				}
-			}
-		}
-
-		// TODO: Verify that the same factory function hasn't been registered already
-
-		// Don't accept duplicates
-		if( behaviour == asBEHAVE_LIST_FACTORY && beh->listFactory )
-		{
-			if( listPattern )
-				listPattern->Destroy(this);
-
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Store all factory functions in a list
-		func.id = AddBehaviourFunction(func, internal);
-
-		// The list factory is a special factory and isn't stored together with the rest
-		if( behaviour != asBEHAVE_LIST_FACTORY )
-			beh->factories.PushLast(func.id);
-
-		if( (func.parameterTypes.GetLength() == 0) ||
-			(func.parameterTypes.GetLength() == 1 && (objectType->flags & asOBJ_TEMPLATE)) )
-		{
-			beh->factory = func.id;
-		}
-		else if( (func.parameterTypes.GetLength() == 1) ||
-				 (func.parameterTypes.GetLength() == 2 && (objectType->flags & asOBJ_TEMPLATE)) )
-		{
-			if( behaviour == asBEHAVE_LIST_FACTORY )
-			{
-				beh->listFactory = func.id;
-
-				// Store the list pattern for this function
-				r = scriptFunctions[func.id]->RegisterListPattern(decl, listPattern);
-
-				if( listPattern )
-					listPattern->Destroy(this);
-
-				if( r < 0 )
-					return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-			}
-			else
-			{
-				// Is this the copy factory?
-				asCDataType paramType = func.parameterTypes[func.parameterTypes.GetLength()-1];
-
-				// If the parameter is object, and const reference for input,
-				// and same type as this class, then this is a copy constructor.
-				if( paramType.IsObject() && paramType.IsReference() && paramType.IsReadOnly() && func.inOutFlags[func.parameterTypes.GetLength()-1] == asTM_INREF && paramType.GetTypeInfo() == objectType )
-					beh->copyfactory = func.id;
-			}
-		}
-	}
-	else if( behaviour == asBEHAVE_ADDREF )
-	{
-		// Must be a ref type and must not have asOBJ_NOHANDLE, nor asOBJ_SCOPED
-		if( !(func.objectType->flags & asOBJ_REF) ||
-			(func.objectType->flags & asOBJ_NOHANDLE) ||
-			(func.objectType->flags & asOBJ_SCOPED) ||
-			(func.objectType->flags & asOBJ_NOCOUNT) )
-		{
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		if( beh->addref )
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that the return type is void
-		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that there are no parameters
-		if( func.parameterTypes.GetLength() > 0 )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		func.id = beh->addref = AddBehaviourFunction(func, internal);
-	}
-	else if( behaviour == asBEHAVE_RELEASE )
-	{
-		// Must be a ref type and must not have asOBJ_NOHANDLE
-		if( !(func.objectType->flags & asOBJ_REF) ||
-			(func.objectType->flags & asOBJ_NOHANDLE) ||
-			(func.objectType->flags & asOBJ_NOCOUNT) )
-		{
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		if( beh->release )
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that the return type is void
-		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that there are no parameters
-		if( func.parameterTypes.GetLength() > 0 )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		func.id = beh->release = AddBehaviourFunction(func, internal);
-	}
-	else if( behaviour == asBEHAVE_TEMPLATE_CALLBACK )
-	{
-		// Must be a template type
-		if( !(func.objectType->flags & asOBJ_TEMPLATE) )
-		{
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		if( beh->templateCallback )
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that the return type is bool
-		if( func.returnType != asCDataType::CreatePrimitive(ttBool, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that there are two parameters
-		if( func.parameterTypes.GetLength() != 2 )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// The first parameter must be an inref (to receive the object type), and
-		// the second must be a bool out ref (to return if the type should or shouldn't be garbage collected)
-		if( func.inOutFlags[0] != asTM_INREF || func.inOutFlags[1] != asTM_OUTREF || !func.parameterTypes[1].IsEqualExceptRef(asCDataType::CreatePrimitive(ttBool, false)) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		func.id = beh->templateCallback = AddBehaviourFunction(func, internal);
-	}
-	else if( behaviour >= asBEHAVE_FIRST_GC &&
-		     behaviour <= asBEHAVE_LAST_GC )
-	{
-		// Only allow GC behaviours for types registered to be garbage collected
-		if( !(func.objectType->flags & asOBJ_GC) )
-		{
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Verify parameter count
-		if( (behaviour == asBEHAVE_GETREFCOUNT ||
-			 behaviour == asBEHAVE_SETGCFLAG   ||
-			 behaviour == asBEHAVE_GETGCFLAG) &&
-			func.parameterTypes.GetLength() != 0 )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		if( (behaviour == asBEHAVE_ENUMREFS ||
-			 behaviour == asBEHAVE_RELEASEREFS) &&
-			func.parameterTypes.GetLength() != 1 )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify return type
-		if( behaviour == asBEHAVE_GETREFCOUNT &&
-			func.returnType != asCDataType::CreatePrimitive(ttInt, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		if( behaviour == asBEHAVE_GETGCFLAG &&
-			func.returnType != asCDataType::CreatePrimitive(ttBool, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		if( (behaviour == asBEHAVE_SETGCFLAG ||
-			 behaviour == asBEHAVE_ENUMREFS  ||
-			 behaviour == asBEHAVE_RELEASEREFS) &&
-			func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		if( behaviour == asBEHAVE_GETREFCOUNT )
-			func.id = beh->gcGetRefCount = AddBehaviourFunction(func, internal);
-		else if( behaviour == asBEHAVE_SETGCFLAG )
-			func.id = beh->gcSetFlag = AddBehaviourFunction(func, internal);
-		else if( behaviour == asBEHAVE_GETGCFLAG )
-			func.id = beh->gcGetFlag = AddBehaviourFunction(func, internal);
-		else if( behaviour == asBEHAVE_ENUMREFS )
-			func.id = beh->gcEnumReferences = AddBehaviourFunction(func, internal);
-		else if( behaviour == asBEHAVE_RELEASEREFS )
-			func.id = beh->gcReleaseAllReferences = AddBehaviourFunction(func, internal);
-	}
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.30.0. 2014-10-24
-	else if( behaviour == asBEHAVE_IMPLICIT_VALUE_CAST ||
-		     behaviour == asBEHAVE_VALUE_CAST )
-	{
-		// There are two allowed signatures
-		// 1. type f()
-		// 2. void f(?&out)
-
-		if( !(func.parameterTypes.GetLength() == 1 && func.parameterTypes[0].GetTokenType() == ttQuestion && func.inOutFlags[0] == asTM_OUTREF && func.returnType.GetTokenType() == ttVoid) &&
-			!(func.parameterTypes.GetLength() == 0 &&  func.returnType.GetTokenType() != ttVoid) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// It is not allowed to implement a value cast to bool
-		if( func.returnType.IsEqualExceptRefAndConst(asCDataType::CreatePrimitive(ttBool, false)) )
-			return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		asCString decl;
-		decl += func.returnType.Format(defaultNamespace);
-		decl += behaviour == asBEHAVE_VALUE_CAST ? " opConv(" : " opImplConv(";
-		if( func.parameterTypes.GetLength() )
-			decl += "?&out";
-		decl += ")";
-		func.id = RegisterMethodToObjectType(objectType, decl.AddressOf(), funcPointer, callConv, auxiliary);
-	}
-	// Deprecated since 2.30.0, 2014-12-30
-	else if( behaviour == asBEHAVE_REF_CAST ||
-	         behaviour == asBEHAVE_IMPLICIT_REF_CAST )
-	{
-		// There are two allowed signatures
-		//  1. obj @f()
-		//  2. void f(?&out)
-
-		if( !(func.parameterTypes.GetLength() == 0 && func.returnType.IsObjectHandle()) &&
-			!(func.parameterTypes.GetLength() == 1 && func.parameterTypes[0].GetTokenType() == ttQuestion && func.inOutFlags[0] == asTM_OUTREF && func.returnType.GetTokenType() == ttVoid) )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Currently it is not supported to register const overloads for the ref cast behaviour
-		if( func.IsReadOnly() )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		asCString decl;
-		decl += func.returnType.Format(defaultNamespace);
-		if( internal.returnAutoHandle )
-			decl += "+";
-		decl += behaviour == asBEHAVE_REF_CAST ? " opCast(" : " opImplCast(";
-		if( func.parameterTypes.GetLength() )
-			decl += "?&out";
-		decl += ")";
-		func.id = RegisterMethodToObjectType(objectType, decl.AddressOf(), funcPointer, callConv, auxiliary);
-	}
-#endif
-	else if ( behaviour == asBEHAVE_GET_WEAKREF_FLAG )
-	{
-		// This behaviour is only allowed for reference types
-		if( !(func.objectType->flags & asOBJ_REF) )
-		{
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Don't allow it if the type is registered with nohandle or scoped
-		if( func.objectType->flags & (asOBJ_NOHANDLE|asOBJ_SCOPED) )
-		{
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
-			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-		}
-
-		// Verify that the return type is a reference since it needs to return a pointer to an asISharedBool
-		if( !func.returnType.IsReference() )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		// Verify that there are no parameters
-		if( func.parameterTypes.GetLength() != 0 )
-			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		if( beh->getWeakRefFlag )
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-		func.id = beh->getWeakRefFlag = AddBehaviourFunction(func, internal);
-	}
-	else
-	{
-		asASSERT(false);
-
-		return ConfigError(asINVALID_ARG, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-	}
-
-	if( func.id < 0 )
-		return ConfigError(func.id, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
-
-	// Return function id as success
-	return func.id;
-}
-
-int asCScriptEngine::SetTemplateRestrictions(asCObjectType *templateType, asCScriptFunction *func, const char *caller, const char *decl)
-{
-	asASSERT(templateType->flags & asOBJ_TEMPLATE);
-
-	for (asUINT subTypeIdx = 0; subTypeIdx < templateType->templateSubTypes.GetLength(); subTypeIdx++)
-	{
-		if (func->returnType.GetTypeInfo() == templateType->templateSubTypes[subTypeIdx].GetTypeInfo())
-		{
-			if (func->returnType.IsObjectHandle())
-				templateType->acceptValueSubType = false;
-			else if (!func->returnType.IsReference())
-				templateType->acceptRefSubType = false;
-
-			// Can't support template subtypes by value, since each type is treated differently in the ABI
-			if (!func->returnType.IsObjectHandle() && !func->returnType.IsReference())
-				return ConfigError(asNOT_SUPPORTED, caller, templateType->name.AddressOf(), decl);
-		}
-
-		for (asUINT n = 0; n < func->parameterTypes.GetLength(); n++)
-		{
-			if (func->parameterTypes[n].GetTypeInfo() == templateType->templateSubTypes[subTypeIdx].GetTypeInfo())
-			{
-				// TODO: If unsafe references are allowed, then inout references allow value types
-				if (func->parameterTypes[n].IsObjectHandle() || (func->parameterTypes[n].IsReference() && func->inOutFlags[n] == asTM_INOUTREF))
-					templateType->acceptValueSubType = false;
-				else if (!func->parameterTypes[n].IsReference())
-					templateType->acceptRefSubType = false;
-
-				// Can't support template subtypes by value, since each type is treated differently in the ABI
-				if (!func->parameterTypes[n].IsObjectHandle() && !func->parameterTypes[n].IsReference())
-					return ConfigError(asNOT_SUPPORTED, caller, templateType->name.AddressOf(), decl);
-			}
-		}
-	}
-
-	return asSUCCESS;
-}
-
-int asCScriptEngine::VerifyVarTypeNotInFunction(asCScriptFunction *func)
-{
-	// Don't allow var type in this function
-	if( func->returnType.GetTokenType() == ttQuestion )
-		return asINVALID_DECLARATION;
-
-	for( unsigned int n = 0; n < func->parameterTypes.GetLength(); n++ )
-		if( func->parameterTypes[n].GetTokenType() == ttQuestion )
-			return asINVALID_DECLARATION;
-
-	return 0;
-}
-
-int asCScriptEngine::AddBehaviourFunction(asCScriptFunction &func, asSSystemFunctionInterface &internal)
-{
-	asUINT n;
-
-	int id = GetNextScriptFunctionId();
-
-	asSSystemFunctionInterface *newInterface = asNEW(asSSystemFunctionInterface)(internal);
-	if( newInterface == 0 )
-		return asOUT_OF_MEMORY;
-
-	asCScriptFunction *f = asNEW(asCScriptFunction)(this, 0, asFUNC_SYSTEM);
-	if( f == 0 )
-	{
-		asDELETE(newInterface, asSSystemFunctionInterface);
-		return asOUT_OF_MEMORY;
-	}
-
-	asASSERT(func.name != "" && func.name != "f");
-	f->name           = func.name;
-	f->sysFuncIntf    = newInterface;
-	f->returnType     = func.returnType;
-	f->objectType     = func.objectType;
-	if( f->objectType )
-		f->objectType->AddRefInternal();
-	f->id             = id;
-	f->isReadOnly     = func.isReadOnly;
-	f->accessMask     = defaultAccessMask;
-	f->parameterTypes = func.parameterTypes;
-	f->parameterNames = func.parameterNames;
-	f->inOutFlags     = func.inOutFlags;
-	for( n = 0; n < func.defaultArgs.GetLength(); n++ )
-		if( func.defaultArgs[n] )
-			f->defaultArgs.PushLast(asNEW(asCString)(*func.defaultArgs[n]));
-		else
-			f->defaultArgs.PushLast(0);
-
-	AddScriptFunction(f);
-
-	// If parameter type from other groups are used, add references
-	currentGroup->AddReferencesForFunc(this, f);
-
-	return id;
-}
-
-// interface
-int asCScriptEngine::RegisterGlobalProperty(const char *declaration, void *pointer)
-{
-	// Don't accept a null pointer
-	if( pointer == 0 )
-		return ConfigError(asINVALID_ARG, "RegisterGlobalProperty", declaration, 0);
-
-	asCDataType type;
-	asCString name;
-
-	int r;
-	asCBuilder bld(this, 0);
-	if( (r = bld.VerifyProperty(0, declaration, name, type, defaultNamespace)) < 0 )
-		return ConfigError(r, "RegisterGlobalProperty", declaration, 0);
-
-	// Don't allow registering references as global properties
-	if( type.IsReference() )
-		return ConfigError(asINVALID_TYPE, "RegisterGlobalProperty", declaration, 0);
-
-	// Store the property info
-	asCGlobalProperty *prop = AllocateGlobalProperty();
-	prop->name        = name;
-	prop->nameSpace   = defaultNamespace;
-	prop->type        = type;
-	prop->accessMask  = defaultAccessMask;
-
-	prop->SetRegisteredAddress(pointer);
-	varAddressMap.Insert(prop->GetAddressOfValue(), prop);
-
-	registeredGlobalProps.Put(prop);
-	prop->AddRef();
-	currentGroup->globalProps.PushLast(prop);
-
-	currentGroup->AddReferencesForType(this, type.GetTypeInfo());
-
-	return asSUCCESS;
-}
-
-// internal
-asCGlobalProperty *asCScriptEngine::AllocateGlobalProperty()
-{
-	asCGlobalProperty *prop = asNEW(asCGlobalProperty);
-	if( prop == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-
-	// First check the availability of a free slot
-	if( freeGlobalPropertyIds.GetLength() )
-	{
-		prop->id = freeGlobalPropertyIds.PopLast();
-		globalProperties[prop->id] = prop;
-		return prop;
-	}
-
-	prop->id = (asUINT)globalProperties.GetLength();
-	globalProperties.PushLast(prop);
-	return prop;
-}
-
-// internal
-void asCScriptEngine::RemoveGlobalProperty(asCGlobalProperty *prop)
-{
-	int index = globalProperties.IndexOf(prop);
-	if( index >= 0 )
-	{
-		freeGlobalPropertyIds.PushLast(index);
-		globalProperties[index] = 0;
-
-		asSMapNode<void*, asCGlobalProperty*> *node;
-		varAddressMap.MoveTo(&node, prop->GetAddressOfValue());
-		asASSERT(node);
-		if( node )
-			varAddressMap.Erase(node);
-
-		prop->Release();
-	}
-}
-
-// interface
-asUINT asCScriptEngine::GetGlobalPropertyCount() const
-{
-	return asUINT(registeredGlobalProps.GetSize());
-}
-
-// interface
-// TODO: If the typeId ever encodes the const flag, then the isConst parameter should be removed
-int asCScriptEngine::GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace, int *typeId, bool *isConst, const char **configGroup, void **pointer, asDWORD *accessMask) const
-{
-	const asCGlobalProperty *prop = registeredGlobalProps.Get(index);
-	if( !prop )
-		return asINVALID_ARG;
-
-	if( name )       *name       = prop->name.AddressOf();
-	if( nameSpace )  *nameSpace  = prop->nameSpace->name.AddressOf();
-	if( typeId )     *typeId     = GetTypeIdFromDataType(prop->type);
-	if( isConst )    *isConst    = prop->type.IsReadOnly();
-	if( pointer )    *pointer    = prop->GetRegisteredAddress();
-	if( accessMask ) *accessMask = prop->accessMask;
-
-	if( configGroup )
-	{
-		asCConfigGroup *group = FindConfigGroupForGlobalVar(index);
-		if( group )
-			*configGroup = group->groupName.AddressOf();
-		else
-			*configGroup = 0;
-	}
-
-	return asSUCCESS;
-}
-
-// interface
-int asCScriptEngine::GetGlobalPropertyIndexByName(const char *name) const
-{
-	asSNameSpace *ns = defaultNamespace;
-
-	// Find the global var id
-	while( ns )
-	{
-		int id = registeredGlobalProps.GetFirstIndex(ns, name);
-		if( id >= 0 ) 
-			return id;
-
-		// Recursively search parent namespace
-		ns = GetParentNameSpace(ns);
-	}
-
-	return asNO_GLOBAL_VAR;
-}
-
-// interface
-int asCScriptEngine::GetGlobalPropertyIndexByDecl(const char *decl) const
-{
-	// This const cast is OK. The builder won't modify the engine
-	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	asCString name;
-	asSNameSpace *ns;
-	asCDataType dt;
-	int r = bld.ParseVariableDeclaration(decl, defaultNamespace, name, ns, dt);
-	if( r < 0 )
-		return r;
-
-	// Search for a match
-	while( ns )
-	{
-		int id = registeredGlobalProps.GetFirstIndex(ns, name, asCCompGlobPropType(dt));
-		if( id >= 0 )
-			return id;
-
-		ns = GetParentNameSpace(ns);
-	}
-
-	return asNO_GLOBAL_VAR;
-}
-
-// interface
-int asCScriptEngine::RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary)
-{
-	if( obj == 0 )
-		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
-
-	// Determine the object type
-	asCDataType dt;
-	asCBuilder bld(this, 0);
-	int r = bld.ParseDataType(obj, &dt, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(r, "RegisterObjectMethod", obj, declaration);
-
-	// Don't allow application to modify primitives or handles
-	if( dt.GetTypeInfo() == 0 || dt.IsObjectHandle() )
-		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
-
-	// Don't allow application to modify built-in types or funcdefs
-	if( dt.GetTypeInfo() == &functionBehaviours ||
-		dt.GetTypeInfo() == &scriptTypeBehaviours ||
-		dt.GetTypeInfo()->CastToFuncdefType() )
-		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
-
-	// Don't allow modifying generated template instances
-	if( dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(dt.GetTypeInfo()->CastToObjectType()) )
-		return ConfigError(asINVALID_TYPE, "RegisterObjectMethod", obj, declaration);
-
-	return RegisterMethodToObjectType(dt.GetTypeInfo()->CastToObjectType(), declaration, funcPointer, callConv, auxiliary);
-}
-
-// internal
-int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary)
-{
-#ifdef AS_MAX_PORTABILITY
-	if( callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-#endif
-
-	asSSystemFunctionInterface internal;
-	int r = DetectCallingConvention(true, funcPointer, callConv, auxiliary, &internal);
-	if( r < 0 )
-		return ConfigError(r, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-
-	// TODO: cleanup: This is identical to what is in RegisterMethodToObjectType
-	// If the object type is a template, make sure there are no generated instances already
-	if( objectType->flags & asOBJ_TEMPLATE )
-	{
-		for( asUINT n = 0; n < generatedTemplateTypes.GetLength(); n++ )
-		{
-			asCObjectType *tmpl = generatedTemplateTypes[n];
-			if( tmpl->name == objectType->name &&
-				tmpl->nameSpace == objectType->nameSpace &&
-				!(tmpl->templateSubTypes[0].GetTypeInfo() && (tmpl->templateSubTypes[0].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE)) )
-			{
-				asCString msg;
-				msg.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, asCDataType::CreateType(tmpl, false).Format(tmpl->nameSpace).AddressOf());
-				WriteMessage("",0,0, asMSGTYPE_ERROR, msg.AddressOf());
-				return ConfigError(asERROR, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-			}
-		}
-	}
-
-	isPrepared = false;
-
-	// Put the system function in the list of system functions
-	asSSystemFunctionInterface *newInterface = asNEW(asSSystemFunctionInterface)(internal);
-	if( newInterface == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-
-	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_SYSTEM);
-	if( func == 0 )
-	{
-		asDELETE(newInterface, asSSystemFunctionInterface);
-		return ConfigError(asOUT_OF_MEMORY, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-	}
-
-	func->sysFuncIntf = newInterface;
-	func->objectType  = objectType;
-	func->objectType->AddRefInternal();
-
-	asCBuilder bld(this, 0);
-	r = bld.ParseFunctionDeclaration(func->objectType, declaration, func, true, &newInterface->paramAutoHandles, &newInterface->returnAutoHandle);
-	if( r < 0 )
-	{
-		// Set as dummy function before deleting
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asINVALID_DECLARATION, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-	}
-
-	// Check name conflicts
-	r = bld.CheckNameConflictMember(objectType, func->name.AddressOf(), 0, 0, false);
-	if( r < 0 )
-	{
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asNAME_TAKEN, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-	}
-
-	// Check against duplicate methods
-	if( func->name == "opConv" || func->name == "opImplConv" || func->name == "opCast" || func->name == "opImplCast" )
-	{
-		// opConv and opCast are special methods that the compiler differentiates between by the return type
-		for( asUINT n = 0; n < func->objectType->methods.GetLength(); n++ )
-		{
-			asCScriptFunction *f = scriptFunctions[func->objectType->methods[n]];
-			if( f->name == func->name &&
-				f->IsSignatureExceptNameEqual(func) )
-			{
-				func->funcType = asFUNC_DUMMY;
-				asDELETE(func,asCScriptFunction);
-				return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-			}
-		}
-	}
-	else
-	{
-		for( asUINT n = 0; n < func->objectType->methods.GetLength(); n++ )
-		{
-			asCScriptFunction *f = scriptFunctions[func->objectType->methods[n]];
-			if( f->name == func->name &&
-				f->IsSignatureExceptNameAndReturnTypeEqual(func) )
-			{
-				func->funcType = asFUNC_DUMMY;
-				asDELETE(func,asCScriptFunction);
-				return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-			}
-		}
-	}
-
-	func->id = GetNextScriptFunctionId();
-	func->objectType->methods.PushLast(func->id);
-	func->accessMask = defaultAccessMask;
-	AddScriptFunction(func);
-
-	// If parameter type from other groups are used, add references
-	currentGroup->AddReferencesForFunc(this, func);
-
-	// Check if the method restricts that use of the template to value types or reference types
-	if( func->objectType->flags & asOBJ_TEMPLATE )
-	{
-		r = SetTemplateRestrictions(func->objectType, func, "RegisterObjectMethod", declaration);
-		if (r < 0)
-			return r;
-	}
-
-	// TODO: beh.copy member will be removed, so this is not necessary
-	// Is this the default copy behaviour?
-	if( func->name == "opAssign" && func->parameterTypes.GetLength() == 1 && func->isReadOnly == false &&
-		((objectType->flags & asOBJ_SCRIPT_OBJECT) || func->parameterTypes[0].IsEqualExceptRefAndConst(asCDataType::CreateType(func->objectType, false))) )
-	{
-		if( func->objectType->beh.copy != 0 )
-			return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
-
-		func->objectType->beh.copy = func->id;
-		func->AddRefInternal();
-	}
-
-	// Return the function id as success
-	return func->id;
-}
-
-// interface
-int asCScriptEngine::RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary)
-{
-#ifdef AS_MAX_PORTABILITY
-	if( callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterGlobalFunction", declaration, 0);
-#endif
-
-	asSSystemFunctionInterface internal;
-	int r = DetectCallingConvention(false, funcPointer, callConv, auxiliary, &internal);
-	if( r < 0 )
-		return ConfigError(r, "RegisterGlobalFunction", declaration, 0);
-
-	isPrepared = false;
-
-	// Put the system function in the list of system functions
-	asSSystemFunctionInterface *newInterface = asNEW(asSSystemFunctionInterface)(internal);
-	if( newInterface == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterGlobalFunction", declaration, 0);
-
-	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_SYSTEM);
-	if( func == 0 )
-	{
-		asDELETE(newInterface, asSSystemFunctionInterface);
-		return ConfigError(asOUT_OF_MEMORY, "RegisterGlobalFunction", declaration, 0);
-	}
-
-	func->sysFuncIntf = newInterface;
-
-	asCBuilder bld(this, 0);
-	r = bld.ParseFunctionDeclaration(0, declaration, func, true, &newInterface->paramAutoHandles, &newInterface->returnAutoHandle, defaultNamespace);
-	if( r < 0 )
-	{
-		// Set as dummy function before deleting
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asINVALID_DECLARATION, "RegisterGlobalFunction", declaration, 0);
-	}
-
-	// TODO: namespace: What if the declaration defined an explicit namespace?
-	func->nameSpace = defaultNamespace;
-
-	// Check name conflicts
-	r = bld.CheckNameConflict(func->name.AddressOf(), 0, 0, defaultNamespace);
-	if( r < 0 )
-	{
-		// Set as dummy function before deleting
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asNAME_TAKEN, "RegisterGlobalFunction", declaration, 0);
-	}
-
-	// Make sure the function is not identical to a previously registered function
-	asUINT n;
-	const asCArray<unsigned int> &idxs = registeredGlobalFuncs.GetIndexes(func->nameSpace, func->name);
-	for( n = 0; n < idxs.GetLength(); n++ )
-	{
-		asCScriptFunction *f = registeredGlobalFuncs.Get(idxs[n]);
-		if( f->IsSignatureExceptNameAndReturnTypeEqual(func) )
-		{
-			func->funcType = asFUNC_DUMMY;
-			asDELETE(func,asCScriptFunction);
-			return ConfigError(asALREADY_REGISTERED, "RegisterGlobalFunction", declaration, 0);
-		}
-	}
-
-	func->id = GetNextScriptFunctionId();
-	AddScriptFunction(func);
-
-	currentGroup->scriptFunctions.PushLast(func);
-	func->accessMask = defaultAccessMask;
-	registeredGlobalFuncs.Put(func);
-
-	// If parameter type from other groups are used, add references
-	currentGroup->AddReferencesForFunc(this, func);
-
-	// Return the function id as success
-	return func->id;
-}
-
-// interface
-asUINT asCScriptEngine::GetGlobalFunctionCount() const
-{
-	// Don't count the builtin delegate factory
-	return asUINT(registeredGlobalFuncs.GetSize()-1);
-}
-
-// interface
-asIScriptFunction *asCScriptEngine::GetGlobalFunctionByIndex(asUINT index) const
-{
-	// Don't count the builtin delegate factory
-	index++;
-
-	if( index >= registeredGlobalFuncs.GetSize() )
-		return 0;
-
-	return static_cast<asIScriptFunction*>(const_cast<asCScriptFunction*>(registeredGlobalFuncs.Get(index)));
-}
-
-// interface
-asIScriptFunction *asCScriptEngine::GetGlobalFunctionByDecl(const char *decl) const
-{
-	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	asCScriptFunction func(const_cast<asCScriptEngine*>(this), 0, asFUNC_DUMMY);
-	int r = bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, defaultNamespace);
-	if( r < 0 )
-		return 0;
-
-	asSNameSpace *ns = defaultNamespace;
-	// Search script functions for matching interface
-	while( ns )
-	{
-		asIScriptFunction *f = 0;
-		const asCArray<unsigned int> &idxs = registeredGlobalFuncs.GetIndexes(ns, func.name);
-		for( unsigned int n = 0; n < idxs.GetLength(); n++ )
-		{
-			const asCScriptFunction *funcPtr = registeredGlobalFuncs.Get(idxs[n]);
-			if( funcPtr->objectType == 0 &&
-				func.returnType                 == funcPtr->returnType &&
-				func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
-				)
-			{
-				bool match = true;
-				for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
-				{
-					if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
-					{
-						match = false;
-						break;
-					}
-				}
-
-				if( match )
-				{
-					if( f == 0 )
-						f = const_cast<asCScriptFunction*>(funcPtr);
-					else
-						// Multiple functions
-						return 0;
-				}
-			}
-		}
-
-		if( f )
-			return f;
-
-		// Recursively search parent namespaces
-		ns = GetParentNameSpace(ns);
-	}
-
-	return 0;
-}
-
-
-asCTypeInfo *asCScriptEngine::GetRegisteredType(const asCString &type, asSNameSpace *ns) const
-{
-	asSMapNode<asSNameSpaceNamePair, asCTypeInfo *> *cursor;
-	if( allRegisteredTypes.MoveTo(&cursor, asSNameSpaceNamePair(ns, type)) )
-		return cursor->value;
-
-	return 0;
-}
-
-
-
-
-void asCScriptEngine::PrepareEngine()
-{
-	if( isPrepared ) return;
-	if( configFailed ) return;
-
-	asUINT n;
-	for( n = 0; n < scriptFunctions.GetLength(); n++ )
-	{
-		// Determine the host application interface
-		if( scriptFunctions[n] && scriptFunctions[n]->funcType == asFUNC_SYSTEM )
-		{
-			if( scriptFunctions[n]->sysFuncIntf->callConv == ICC_GENERIC_FUNC ||
-				scriptFunctions[n]->sysFuncIntf->callConv == ICC_GENERIC_METHOD )
-				PrepareSystemFunctionGeneric(scriptFunctions[n], scriptFunctions[n]->sysFuncIntf, this);
-			else
-				PrepareSystemFunction(scriptFunctions[n], scriptFunctions[n]->sysFuncIntf, this);
-		}
-	}
-
-	// Validate object type registrations
-	for( n = 0; n < registeredObjTypes.GetLength(); n++ )
-	{
-		asCObjectType *type = registeredObjTypes[n];
-		if( type && !(type->flags & asOBJ_SCRIPT_OBJECT) )
-		{
-			bool missingBehaviour = false;
-			const char *infoMsg = 0;
-
-			// Verify that GC types have all behaviours
-			if( type->flags & asOBJ_GC )
-			{
-				if( type->beh.addref                 == 0 ||
-					type->beh.release                == 0 ||
-					type->beh.gcGetRefCount          == 0 ||
-					type->beh.gcSetFlag              == 0 ||
-					type->beh.gcGetFlag              == 0 ||
-					type->beh.gcEnumReferences       == 0 ||
-					type->beh.gcReleaseAllReferences == 0 )
-				{
-					infoMsg = TXT_GC_REQUIRE_ADD_REL_GC_BEHAVIOUR;
-					missingBehaviour = true;
-				}
-			}
-			// Verify that scoped ref types have the release behaviour
-			else if( type->flags & asOBJ_SCOPED )
-			{
-				if( type->beh.release == 0 )
-				{
-					infoMsg = TXT_SCOPE_REQUIRE_REL_BEHAVIOUR;
-					missingBehaviour = true;
-				}
-			}
-			// Verify that ref types have add ref and release behaviours
-			else if( (type->flags & asOBJ_REF) &&
-				     !(type->flags & asOBJ_NOHANDLE) &&
-					 !(type->flags & asOBJ_NOCOUNT) )
-			{
-				if( type->beh.addref  == 0 ||
-					type->beh.release == 0 )
-				{
-					infoMsg = TXT_REF_REQUIRE_ADD_REL_BEHAVIOUR;
-					missingBehaviour = true;
-				}
-			}
-			// Verify that non-pod value types have the constructor and destructor registered
-			else if( (type->flags & asOBJ_VALUE) &&
-				     !(type->flags & asOBJ_POD) )
-			{
-				if( type->beh.construct == 0 ||
-					type->beh.destruct  == 0 )
-				{
-					infoMsg = TXT_NON_POD_REQUIRE_CONSTR_DESTR_BEHAVIOUR;
-					missingBehaviour = true;
-				}
-			}
-
-			if( missingBehaviour )
-			{
-				asCString str;
-				str.Format(TXT_TYPE_s_IS_MISSING_BEHAVIOURS, type->name.AddressOf());
-				WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-				WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, infoMsg);
-				ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
-			}
-		}
-	}
-
-	isPrepared = true;
-}
-
-int asCScriptEngine::ConfigError(int err, const char *funcName, const char *arg1, const char *arg2)
-{
-	configFailed = true;
-	if( funcName )
-	{
-		asCString str;
-		if( arg1 )
-		{
-			if( arg2 )
-				str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_AND_s_d, funcName, arg1, arg2, err);
-			else
-				str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_d, funcName, arg1, err);
-		}
-		else
-			str.Format(TXT_FAILED_IN_FUNC_s_d, funcName, err);
-
-		WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-	}
-	return err;
-}
-
-// interface
-int asCScriptEngine::RegisterDefaultArrayType(const char *type)
-{
-	asCBuilder bld(this, 0);
-	asCDataType dt;
-	int r = bld.ParseDataType(type, &dt, defaultNamespace);
-	if( r < 0 ) return r;
-
-	if( dt.GetTypeInfo() == 0 ||
-		!(dt.GetTypeInfo()->GetFlags() & asOBJ_TEMPLATE) )
-		return asINVALID_TYPE;
-
-	defaultArrayObjectType = dt.GetTypeInfo()->CastToObjectType();
-	defaultArrayObjectType->AddRefInternal();
-
-	return 0;
-}
-
-// interface
-int asCScriptEngine::GetDefaultArrayTypeId() const
-{
-	if( defaultArrayObjectType )
-		return GetTypeIdFromDataType(asCDataType::CreateType(defaultArrayObjectType, false));
-
-	return asINVALID_TYPE;
-}
-
-// interface
-int asCScriptEngine::RegisterStringFactory(const char *datatype, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary)
-{
-	asSSystemFunctionInterface internal;
-	int r = DetectCallingConvention(false, funcPointer, callConv, auxiliary, &internal);
-	if( r < 0 )
-		return ConfigError(r, "RegisterStringFactory", datatype, 0);
-
-#ifdef AS_MAX_PORTABILITY
-	if( callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterStringFactory", datatype, 0);
-#else
-	if( callConv != asCALL_CDECL &&
-		callConv != asCALL_STDCALL &&
-		callConv != asCALL_THISCALL_ASGLOBAL &&
-		callConv != asCALL_GENERIC )
-		return ConfigError(asNOT_SUPPORTED, "RegisterStringFactory", datatype, 0);
-#endif
-
-	// Put the system function in the list of system functions
-	asSSystemFunctionInterface *newInterface = asNEW(asSSystemFunctionInterface)(internal);
-	if( newInterface == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterStringFactory", datatype, 0);
-
-	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_SYSTEM);
-	if( func == 0 )
-	{
-		asDELETE(newInterface, asSSystemFunctionInterface);
-		return ConfigError(asOUT_OF_MEMORY, "RegisterStringFactory", datatype, 0);
-	}
-
-	func->name        = "$str";
-	func->sysFuncIntf = newInterface;
-
-	asCBuilder bld(this, 0);
-
-	asCDataType dt;
-	r = bld.ParseDataType(datatype, &dt, defaultNamespace, true);
-	if( r < 0 )
-	{
-		// Set as dummy before deleting
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asINVALID_TYPE, "RegisterStringFactory", datatype, 0);
-	}
-
-	func->returnType = dt;
-	func->parameterTypes.PushLast(asCDataType::CreatePrimitive(ttInt, true));
-	func->inOutFlags.PushLast(asTM_NONE);
-	asCDataType parm1 = asCDataType::CreatePrimitive(ttUInt8, true);
-	parm1.MakeReference(true);
-	func->parameterTypes.PushLast(parm1);
-	func->inOutFlags.PushLast(asTM_INREF);
-	func->id = GetNextScriptFunctionId();
-	AddScriptFunction(func);
-
-	stringFactory = func;
-
-	if( func->returnType.GetTypeInfo() )
-	{
-		asCConfigGroup *group = FindConfigGroupForTypeInfo(func->returnType.GetTypeInfo());
-		if( group == 0 ) group = &defaultGroup;
-		group->scriptFunctions.PushLast(func);
-	}
-
-	// Register function id as success
-	return func->id;
-}
-
-// interface
-int asCScriptEngine::GetStringFactoryReturnTypeId(asDWORD *flags) const
-{
-	if( stringFactory == 0 )
-		return asNO_FUNCTION;
-
-	return stringFactory->GetReturnTypeId(flags);
-}
-
-// internal
-asCModule *asCScriptEngine::GetModule(const char *name, bool create)
-{
-	// Accept null as well as zero-length string
-	if( name == 0 ) name = "";
-
-	asCModule *retModule = 0;
-
-	ACQUIRESHARED(engineRWLock);
-	if( lastModule && lastModule->name == name )
-		retModule = lastModule;
-	else
-	{
-		// TODO: optimize: Improve linear search
-		for( asUINT n = 0; n < scriptModules.GetLength(); ++n )
-			if( scriptModules[n] && scriptModules[n]->name == name )
-			{
-				retModule = scriptModules[n];
-				break;
-			}
-	}
-	RELEASESHARED(engineRWLock);
-
-	if( retModule )
-	{
-		ACQUIREEXCLUSIVE(engineRWLock);
-		lastModule = retModule;
-		RELEASEEXCLUSIVE(engineRWLock);
-
-		return retModule;
-	}
-
-	if( create )
-	{
-		retModule = asNEW(asCModule)(name, this);
-		if( retModule == 0 )
-		{
-			// Out of memory
-			return 0;
-		}
-
-		ACQUIREEXCLUSIVE(engineRWLock);
-		scriptModules.PushLast(retModule);
-		lastModule = retModule;
-		RELEASEEXCLUSIVE(engineRWLock);
-	}
-
-	return retModule;
-}
-
-asCModule *asCScriptEngine::GetModuleFromFuncId(int id)
-{
-	if( id < 0 ) return 0;
-	if( id >= (int)scriptFunctions.GetLength() ) return 0;
-	asCScriptFunction *func = scriptFunctions[id];
-	if( func == 0 ) return 0;
-	return func->module;
-}
-
-// internal
-int asCScriptEngine::RequestBuild()
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-	if( isBuilding )
-	{
-		RELEASEEXCLUSIVE(engineRWLock);
-		return asBUILD_IN_PROGRESS;
-	}
-	isBuilding = true;
-	RELEASEEXCLUSIVE(engineRWLock);
-
-	return 0;
-}
-
-// internal
-void asCScriptEngine::BuildCompleted()
-{
-	// Always free up pooled memory after a completed build
-	memoryMgr.FreeUnusedMemory();
-
-	isBuilding = false;
-}
-
-void asCScriptEngine::RemoveTemplateInstanceType(asCObjectType *t)
-{
-	// If there is a module that still owns the generated type, then don't remove it
-	if( t->module )
-		return;
-
-	// Don't remove it if there are external refernces
-	if( t->externalRefCount.get() )
-		return;
-
-	// Only remove the template instance type if no config group is using it
-	if( defaultGroup.generatedTemplateInstances.Exists(t) )
-		return;
-	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
-		if( configGroups[n]->generatedTemplateInstances.Exists(t) )
-			return;
-
-	t->DestroyInternal();
-	templateInstanceTypes.RemoveValue(t);
-	generatedTemplateTypes.RemoveValue(t);
-	t->ReleaseInternal();
-}
-
-// internal
-asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes, asCModule *requestingModule)
-{
-	asUINT n;
-
-	// Is there any template instance type or template specialization already with this subtype?
-	for( n = 0; n < templateInstanceTypes.GetLength(); n++ )
-	{
-		asCObjectType *type = templateInstanceTypes[n];
-		if( type &&
-			type->name == templateType->name &&
-			type->templateSubTypes == subTypes )
-		{
-			// If the template instance is generated, then the module should hold a reference
-			// to it so the config group can determine see that the template type is in use.
-			// Template specializations will be treated as normal types
-			if( requestingModule && generatedTemplateTypes.Exists(type) )
-			{
-				if( type->module == 0 )
-				{
-					// Set the ownership of this template type
-					// It may be without ownership if it was previously created from application with for example GetTypeInfoByDecl
-					type->module = requestingModule;
-				}
-				if( !requestingModule->templateInstances.Exists(type) )
-				{
-					requestingModule->templateInstances.PushLast(type);
-					type->AddRefInternal();
-				}
-			}
-
-			return templateInstanceTypes[n];
-		}
-	}
-
-	// No previous template instance exists
-
-	// Make sure this template supports the subtype
-	for( n = 0; n < subTypes.GetLength(); n++ )
-	{
-		if( !templateType->acceptValueSubType && (subTypes[n].IsPrimitive() || (subTypes[n].GetTypeInfo()->flags & asOBJ_VALUE)) )
-			return 0;
-
-		if( !templateType->acceptRefSubType && (subTypes[n].IsObject() && (subTypes[n].GetTypeInfo()->flags & asOBJ_REF)) )
-			return 0;
-	}
-
-	// Create a new template instance type based on the templateType
-	asCObjectType *ot = asNEW(asCObjectType)(this);
-	if( ot == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-
-	ot->templateSubTypes = subTypes;
-	ot->flags            = templateType->flags;
-	ot->size             = templateType->size;
-	ot->name             = templateType->name;
-	ot->nameSpace        = templateType->nameSpace;
-
-	// If the template is being requested from a module, then the module should hold a reference to the type
-	if( requestingModule )
-	{
-		// Set the ownership of this template type
-		ot->module = requestingModule;
-		requestingModule->templateInstances.PushLast(ot);
-		ot->AddRefInternal();
-	}
-	else
-	{
-		// If the template type is not requested directly from a module, then set the ownership
-		// of it to the same module as one of the subtypes. If none of the subtypes are owned by]
-		// any module, the template instance will be without ownership and can be removed from the
-		// engine at any time (unless the application holds an external reference).
-		for( n = 0; n < subTypes.GetLength(); n++ )
-		{
-			if( subTypes[n].GetTypeInfo() )
-			{
-				ot->module = subTypes[n].GetTypeInfo()->module;
-				if( ot->module )
-				{
-					ot->module->templateInstances.PushLast(ot);
-					ot->AddRefInternal();
-					break;
-				}
-			}
-		}
-	}
-
-	// Before filling in the methods, call the template instance callback behaviour to validate the type
-	if( templateType->beh.templateCallback )
-	{
-		// If the validation is deferred then the validation will be done later,
-		// so it is necessary to continue the preparation of the template instance type
-		if( !deferValidationOfTemplateTypes )
-		{
-			asCScriptFunction *callback = scriptFunctions[templateType->beh.templateCallback];
-
-			bool dontGarbageCollect = false;
-			if( !CallGlobalFunctionRetBool(ot, &dontGarbageCollect, callback->sysFuncIntf, callback) )
-			{
-				// The type cannot be instantiated
-				ot->templateSubTypes.SetLength(0);
-				if( ot->module )
-				{
-					ot->module->templateInstances.RemoveValue(ot);
-					ot->ReleaseInternal();
-				}
-				ot->ReleaseInternal();
-				return 0;
-			}
-
-			// If the callback said this template instance won't be garbage collected then remove the flag
-			if( dontGarbageCollect )
-				ot->flags &= ~asOBJ_GC;
-		}
-
-		ot->beh.templateCallback = templateType->beh.templateCallback;
-		scriptFunctions[ot->beh.templateCallback]->AddRefInternal();
-	}
-
-	ot->methods = templateType->methods;
-	for( n = 0; n < ot->methods.GetLength(); n++ )
-		scriptFunctions[ot->methods[n]]->AddRefInternal();
-
-	if( templateType->flags & asOBJ_REF )
-	{
-		// Store the real factory in the constructor. This is used by the CreateScriptObject function.
-		// Otherwise it wouldn't be necessary to store the real factory ids.
-		ot->beh.construct = templateType->beh.factory;
-		ot->beh.constructors = templateType->beh.factories;
-	}
-	else
-	{
-		ot->beh.construct = templateType->beh.construct;
-		ot->beh.constructors = templateType->beh.constructors;
-	}
-	for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
-		scriptFunctions[ot->beh.constructors[n]]->AddRefInternal();
-
-
-	// Before proceeding with the generation of the template functions for the template instance it is necessary
-	// to include the new template instance type in the list of known types, otherwise it is possible that we get
-	// a infinite recursive loop as the template instance type is requested again during the generation of the
-	// template functions.
-	templateInstanceTypes.PushLast(ot);
-
-	// Store the template instance types that have been created automatically by the engine from a template type
-	// The object types in templateInstanceTypes that are not also in generatedTemplateTypes are registered template specializations
-	generatedTemplateTypes.PushLast(ot);
-
-
-	// As the new template type is instantiated the engine should
-	// generate new functions to substitute the ones with the template subtype.
-	for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
-	{
-		int funcId = ot->beh.constructors[n];
-		asCScriptFunction *func = scriptFunctions[funcId];
-
-		if( GenerateNewTemplateFunction(templateType, ot, func, &func) )
-		{
-			// Release the old function, the new one already has its ref count set to 1
-			scriptFunctions[funcId]->ReleaseInternal();
-			ot->beh.constructors[n] = func->id;
-
-			if( ot->beh.construct == funcId )
-				ot->beh.construct = func->id;
-		}
-	}
-
-	ot->beh.factory = 0;
-
-	if( templateType->flags & asOBJ_REF )
-	{
-		// Generate factory stubs for each of the factories
-		for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
-		{
-			asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, ot->beh.constructors[n]);
-
-			ot->beh.factories.PushLast(func->id);
-
-			// Set the default factory as well
-			if( ot->beh.constructors[n] == ot->beh.construct )
-				ot->beh.factory = func->id;
-		}
-	}
-	else
-	{
-		// Generate factory stubs for each of the constructors
-		for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
-		{
-			asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, ot->beh.constructors[n]);
-
-			if( ot->beh.constructors[n] == ot->beh.construct )
-				ot->beh.construct = func->id;
-
-			// Release previous constructor
-			scriptFunctions[ot->beh.constructors[n]]->ReleaseInternal();
-
-			ot->beh.constructors[n] = func->id;
-		}
-	}
-
-	// Generate stub for the list factory as well
-	if( templateType->beh.listFactory )
-	{
-		asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, templateType->beh.listFactory);
-		
-		// Rename the function to easily identify it in LoadByteCode
-		func->name = "$list";
-
-		ot->beh.listFactory = func->id;
-	}
-
-	ot->beh.addref = templateType->beh.addref;
-	if( scriptFunctions[ot->beh.addref] ) scriptFunctions[ot->beh.addref]->AddRefInternal();
-	ot->beh.release = templateType->beh.release;
-	if( scriptFunctions[ot->beh.release] ) scriptFunctions[ot->beh.release]->AddRefInternal();
-	ot->beh.destruct = templateType->beh.destruct;
-	if( scriptFunctions[ot->beh.destruct] ) scriptFunctions[ot->beh.destruct]->AddRefInternal();
-	ot->beh.copy = templateType->beh.copy;
-	if( scriptFunctions[ot->beh.copy] ) scriptFunctions[ot->beh.copy]->AddRefInternal();
-	ot->beh.gcGetRefCount = templateType->beh.gcGetRefCount;
-	if( scriptFunctions[ot->beh.gcGetRefCount] ) scriptFunctions[ot->beh.gcGetRefCount]->AddRefInternal();
-	ot->beh.gcSetFlag = templateType->beh.gcSetFlag;
-	if( scriptFunctions[ot->beh.gcSetFlag] ) scriptFunctions[ot->beh.gcSetFlag]->AddRefInternal();
-	ot->beh.gcGetFlag = templateType->beh.gcGetFlag;
-	if( scriptFunctions[ot->beh.gcGetFlag] ) scriptFunctions[ot->beh.gcGetFlag]->AddRefInternal();
-	ot->beh.gcEnumReferences = templateType->beh.gcEnumReferences;
-	if( scriptFunctions[ot->beh.gcEnumReferences] ) scriptFunctions[ot->beh.gcEnumReferences]->AddRefInternal();
-	ot->beh.gcReleaseAllReferences = templateType->beh.gcReleaseAllReferences;
-	if( scriptFunctions[ot->beh.gcReleaseAllReferences] ) scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRefInternal();
-	ot->beh.getWeakRefFlag = templateType->beh.getWeakRefFlag;
-	if( scriptFunctions[ot->beh.getWeakRefFlag] ) scriptFunctions[ot->beh.getWeakRefFlag]->AddRefInternal();
-
-	// As the new template type is instantiated, the engine should
-	// generate new functions to substitute the ones with the template subtype.
-	for( n = 0; n < ot->methods.GetLength(); n++ )
-	{
-		int funcId = ot->methods[n];
-		asCScriptFunction *func = scriptFunctions[funcId];
-
-		if( GenerateNewTemplateFunction(templateType, ot, func, &func) )
-		{
-			// Release the old function, the new one already has its ref count set to 1
-			scriptFunctions[funcId]->ReleaseInternal();
-			ot->methods[n] = func->id;
-		}
-	}
-
-	// Increase ref counter for sub type if it is an object type
-	for( n = 0; n < ot->templateSubTypes.GetLength(); n++ )
-		if( ot->templateSubTypes[n].GetTypeInfo() )
-			ot->templateSubTypes[n].GetTypeInfo()->AddRefInternal();
-
-	// Copy the properties to the template instance
-	for( n = 0; n < templateType->properties.GetLength(); n++ )
-	{
-		asCObjectProperty *prop = templateType->properties[n];
-		ot->properties.PushLast(asNEW(asCObjectProperty)(*prop));
-		if( prop->type.GetTypeInfo() )
-			prop->type.GetTypeInfo()->AddRefInternal();
-	}
-
-	// Any child funcdefs must also be copied to the template instance (with adjustments in case of template subtypes)
-	for (n = 0; n < templateType->childFuncDefs.GetLength(); n++)
-	{
-		asCFuncdefType *funcdef = GenerateNewTemplateFuncdef(templateType, ot, templateType->childFuncDefs[n]);
-		funcdef->parentClass = ot;
-		ot->childFuncDefs.PushLast(funcdef);
-	}
-
-	return ot;
-}
-
-// interface
-asILockableSharedBool *asCScriptEngine::GetWeakRefFlagOfScriptObject(void *obj, const asITypeInfo *type) const
-{
-	// Make sure it is not a null pointer
-	if( obj == 0 || type == 0 ) return 0;
-
-	const asCObjectType *objType = static_cast<const asCObjectType *>(type);
-	asILockableSharedBool *dest = 0;
-	if( objType->beh.getWeakRefFlag )
-	{
-		// Call the getweakrefflag behaviour
-		dest = reinterpret_cast<asILockableSharedBool*>(CallObjectMethodRetPtr(obj, objType->beh.getWeakRefFlag));
-	}
-	return dest;
-}
-
-// internal
-asCDataType asCScriptEngine::DetermineTypeForTemplate(const asCDataType &orig, asCObjectType *tmpl, asCObjectType *ot)
-{
-	asCDataType dt;
-	if( orig.GetTypeInfo() && (orig.GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE) )
-	{
-		bool found = false;
-		for( asUINT n = 0; n < tmpl->templateSubTypes.GetLength(); n++ )
-		{
-			if( orig.GetTypeInfo() == tmpl->templateSubTypes[n].GetTypeInfo() )
-			{
-				found = true;
-				dt = ot->templateSubTypes[n];
-				if( orig.IsObjectHandle() && !ot->templateSubTypes[n].IsObjectHandle() )
-				{
-					dt.MakeHandle(true, true);
-					asASSERT(dt.IsObjectHandle());
-					if( orig.IsHandleToConst() )
-						dt.MakeHandleToConst(true);
-					dt.MakeReference(orig.IsReference());
-					dt.MakeReadOnly(orig.IsReadOnly());
-				}
-				else
-				{
-					dt.MakeReference(orig.IsReference());
-					dt.MakeReadOnly(ot->templateSubTypes[n].IsReadOnly() || orig.IsReadOnly());
-				}
-				break;
-			}
-		}
-		asASSERT( found );
-		UNUSED_VAR( found );
-	}
-	else if( orig.GetTypeInfo() == tmpl )
-	{
-		if( orig.IsObjectHandle() )
-			dt = asCDataType::CreateObjectHandle(ot, false);
-		else
-			dt = asCDataType::CreateType(ot, false);
-
-		dt.MakeReference(orig.IsReference());
-		dt.MakeReadOnly(orig.IsReadOnly());
-	}
-	else if( orig.GetTypeInfo() && (orig.GetTypeInfo()->flags & asOBJ_TEMPLATE) )
-	{
-		// The type is itself a template, so it is necessary to find the correct template instance type
-		asCArray<asCDataType> tmplSubTypes;
-		asCObjectType *origType = orig.GetTypeInfo()->CastToObjectType();
-		bool needInstance = true;
-
-		// Find the matching replacements for the subtypes
-		for( asUINT n = 0; n < origType->templateSubTypes.GetLength(); n++ )
-		{
-			if( origType->templateSubTypes[n].GetTypeInfo() == 0 ||
-				!(origType->templateSubTypes[n].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE) )
-			{
-				// The template is already an instance so we shouldn't attempt to create another instance
-				needInstance = false;
-				break;
-			}
-
-			for( asUINT m = 0; m < tmpl->templateSubTypes.GetLength(); m++ )
-				if( origType->templateSubTypes[n].GetTypeInfo() == tmpl->templateSubTypes[m].GetTypeInfo() )
-					tmplSubTypes.PushLast(ot->templateSubTypes[m]);
-
-			if( tmplSubTypes.GetLength() != n+1 )
-			{
-				asASSERT( false );
-				return orig;
-			}
-		}
-
-		asCObjectType *ntype = origType;
-		if( needInstance )
-		{
-			// Always find the original template type when creating a new template instance otherwise the
-			// generation will fail since it will attempt to create factory stubs when they already exists, etc
-			for( asUINT n = 0; n < registeredTemplateTypes.GetLength(); n++ )
-				if( registeredTemplateTypes[n]->name == origType->name )
-				{
-					origType = registeredTemplateTypes[n];
-					break;
-				}
-
-			ntype = GetTemplateInstanceType(origType, tmplSubTypes, ot->module);
-			if( ntype == 0 )
-			{
-				// It not possible to instantiate the subtype
-				asASSERT( false );
-				ntype = tmpl;
-			}
-		}
-
-		if( orig.IsObjectHandle() )
-			dt = asCDataType::CreateObjectHandle(ntype, false);
-		else
-			dt = asCDataType::CreateType(ntype, false);
-
-		dt.MakeReference(orig.IsReference());
-		dt.MakeReadOnly(orig.IsReadOnly());
-	}
-	else
-		dt = orig;
-
-	return dt;
-}
-
-// internal
-asCScriptFunction *asCScriptEngine::GenerateTemplateFactoryStub(asCObjectType *templateType, asCObjectType *ot, int factoryId)
-{
-	asCScriptFunction *factory = scriptFunctions[factoryId];
-
-	// By first instantiating the function as a dummy and then changing it to be a script function
-	// I avoid having it added to the garbage collector. As it is known that this object will stay
-	// alive until the template instance is no longer used there is no need to have the GC check
-	// this function all the time.
-	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_DUMMY);
-	if( func == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-
-	func->funcType = asFUNC_SCRIPT;
-	func->AllocateScriptFunctionData();
-	func->id = GetNextScriptFunctionId();
-	AddScriptFunction(func);
-
-	func->isShared = true;
-	if( templateType->flags & asOBJ_REF )
-	{
-		func->name = "$fact";
-		func->returnType = asCDataType::CreateObjectHandle(ot, false);
-	}
-	else
-	{
-		func->name = "$beh0";
-		func->returnType = factory->returnType; // constructors return nothing
-		func->objectType = ot;
-		func->objectType->AddRefInternal();
-	}
-
-	// Skip the first parameter as this is the object type pointer that the stub will add
-	func->parameterTypes.SetLength(factory->parameterTypes.GetLength()-1);
-	func->parameterNames.SetLength(factory->parameterNames.GetLength()-1);
-	func->inOutFlags.SetLength(factory->inOutFlags.GetLength()-1);
-	func->defaultArgs.SetLength(factory->defaultArgs.GetLength()-1);
-	for( asUINT p = 1; p < factory->parameterTypes.GetLength(); p++ )
-	{
-		func->parameterTypes[p-1] = factory->parameterTypes[p];
-		func->parameterNames[p-1] = factory->parameterNames[p];
-		func->inOutFlags[p-1] = factory->inOutFlags[p];
-		func->defaultArgs[p-1] = factory->defaultArgs[p] ? asNEW(asCString)(*factory->defaultArgs[p]) : 0;
-	}
-	func->scriptData->objVariablesOnHeap = 0;
-	
-	// Generate the bytecode for the factory stub
-	asUINT bcLength = asBCTypeSize[asBCInfo[asBC_OBJTYPE].type] +
-	                  asBCTypeSize[asBCInfo[asBC_CALLSYS].type] +
-	                  asBCTypeSize[asBCInfo[asBC_RET].type];
-
-	if( ep.includeJitInstructions )
-		bcLength += asBCTypeSize[asBCInfo[asBC_JitEntry].type];
-	if( templateType->flags & asOBJ_VALUE )
-		bcLength += asBCTypeSize[asBCInfo[asBC_SwapPtr].type];
-
-	func->scriptData->byteCode.SetLength(bcLength);
-	asDWORD *bc = func->scriptData->byteCode.AddressOf();
-
-	if( ep.includeJitInstructions )
-	{
-		*(asBYTE*)bc = asBC_JitEntry;
-		*(asPWORD*)(bc+1) = 0;
-		bc += asBCTypeSize[asBCInfo[asBC_JitEntry].type];
-	}
-
-	*(asBYTE*)bc = asBC_OBJTYPE;
-	*(asPWORD*)(bc+1) = (asPWORD)ot;
-	bc += asBCTypeSize[asBCInfo[asBC_OBJTYPE].type];
-	if( templateType->flags & asOBJ_VALUE )
-	{
-		// Swap the object pointer with the object type
-		*(asBYTE*)bc = asBC_SwapPtr;
-		bc += asBCTypeSize[asBCInfo[asBC_SwapPtr].type];
-	}
-	*(asBYTE*)bc = asBC_CALLSYS;
-	*(asDWORD*)(bc+1) = factoryId;
-	bc += asBCTypeSize[asBCInfo[asBC_CALLSYS].type];
-	*(asBYTE*)bc = asBC_RET;
-	*(((asWORD*)bc)+1) = (asWORD)func->GetSpaceNeededForArguments() + (func->objectType ? AS_PTR_SIZE : 0);
-
-	func->AddReferences();
-	func->scriptData->stackNeeded = AS_PTR_SIZE;
-
-	// Tell the virtual machine not to clean up the object on exception
-	func->dontCleanUpOnException = true;
-
-	func->JITCompile();
-
-	// Need to translate the list pattern too so the VM and compiler will know the correct type of the members
-	if( factory->listPattern )
-	{
-		asSListPatternNode *n = factory->listPattern;
-		asSListPatternNode *last = 0;
-		while( n )
-		{
-			asSListPatternNode *newNode = n->Duplicate();
-			if( newNode->type == asLPT_TYPE )
-			{
-				asSListPatternDataTypeNode *typeNode = reinterpret_cast<asSListPatternDataTypeNode*>(newNode);
-				typeNode->dataType = DetermineTypeForTemplate(typeNode->dataType, templateType, ot);
-			}
-
-			if( last )
-				last->next = newNode;
-			else
-				func->listPattern = newNode;
-
-			last = newNode;
-
-			n = n->next;
-		}
-	}
-
-	return func;
-}
-
-bool asCScriptEngine::RequireTypeReplacement(asCDataType &type, asCObjectType *templateType)
-{
-	if( type.GetTypeInfo() == templateType ) return true;
-	if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE) ) return true;
-	if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) )
-	{
-		asCObjectType *ot = type.GetTypeInfo()->CastToObjectType();
-		for( asUINT n = 0; n < ot->templateSubTypes.GetLength(); n++ )
-			if( ot->templateSubTypes[n].GetTypeInfo() &&
-				ot->templateSubTypes[n].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE )
-				return true;
-	}
-
-	return false;
-}
-
-bool asCScriptEngine::GenerateNewTemplateFunction(asCObjectType *templateType, asCObjectType *ot, asCScriptFunction *func, asCScriptFunction **newFunc)
-{
-	bool needNewFunc = false;
-	if( RequireTypeReplacement(func->returnType, templateType) )
-		needNewFunc = true;
-	else
-	{
-		for( asUINT p = 0; p < func->parameterTypes.GetLength(); p++ )
-		{
-			if( RequireTypeReplacement(func->parameterTypes[p], templateType) )
-			{
-				needNewFunc = true;
-				break;
-			}
-		}
-	}
-
-	if( !needNewFunc )
-		return false;
-
-	asCScriptFunction *func2 = asNEW(asCScriptFunction)(this, 0, func->funcType);
-	if( func2 == 0 )
-	{
-		// Out of memory
-		return false;
-	}
-
-	func2->name     = func->name;
-
-	func2->returnType = DetermineTypeForTemplate(func->returnType, templateType, ot);
-	func2->parameterTypes.SetLength(func->parameterTypes.GetLength());
-	for (asUINT p = 0; p < func->parameterTypes.GetLength(); p++)
-		func2->parameterTypes[p] = DetermineTypeForTemplate(func->parameterTypes[p], templateType, ot);
-
-	for (asUINT n = 0; n < func->defaultArgs.GetLength(); n++)
-		if (func->defaultArgs[n])
-			func2->defaultArgs.PushLast(asNEW(asCString)(*func->defaultArgs[n]));
-		else
-			func2->defaultArgs.PushLast(0);
-
-	// TODO: template: Must be careful when instantiating templates for garbage collected types
-	//                 If the template hasn't been registered with the behaviours, it shouldn't
-	//                 permit instantiation of garbage collected types that in turn may refer to
-	//                 this instance.
-
-	func2->parameterNames = func->parameterNames;
-	func2->inOutFlags = func->inOutFlags;
-	func2->isReadOnly = func->isReadOnly;
-	func2->objectType = ot;
-	func2->objectType->AddRefInternal();
-	func2->sysFuncIntf = asNEW(asSSystemFunctionInterface)(*func->sysFuncIntf);
-
-	// Adjust the clean up instructions
-	if( func2->sysFuncIntf->callConv == ICC_GENERIC_FUNC ||
-		func2->sysFuncIntf->callConv == ICC_GENERIC_METHOD )
-		PrepareSystemFunctionGeneric(func2, func2->sysFuncIntf, this);
-	else
-		PrepareSystemFunction(func2, func2->sysFuncIntf, this);
-
-	func2->id       = GetNextScriptFunctionId();
-	AddScriptFunction(func2);
-
-	// Return the new function
-	*newFunc = func2;
-
-	return true;
-}
-
-asCFuncdefType *asCScriptEngine::GenerateNewTemplateFuncdef(asCObjectType *templateType, asCObjectType *ot, asCFuncdefType *func)
-{
-	asCScriptFunction *func2 = asNEW(asCScriptFunction)(this, 0, func->funcdef->funcType);
-	if (func2 == 0)
-	{
-		// Out of memory
-		return 0;
-	}
-
-	func2->name = func->name;
-
-	func2->returnType = DetermineTypeForTemplate(func->funcdef->returnType, templateType, ot);
-	func2->parameterTypes.SetLength(func->funcdef->parameterTypes.GetLength());
-	for (asUINT p = 0; p < func->funcdef->parameterTypes.GetLength(); p++)
-		func2->parameterTypes[p] = DetermineTypeForTemplate(func->funcdef->parameterTypes[p], templateType, ot);
-
-	// TODO: template: Must be careful when instantiating templates for garbage collected types
-	//                 If the template hasn't been registered with the behaviours, it shouldn't
-	//                 permit instantiation of garbage collected types that in turn may refer to
-	//                 this instance.
-
-	func2->inOutFlags = func->funcdef->inOutFlags;
-	func2->isReadOnly = func->funcdef->isReadOnly;
-	asASSERT(func->funcdef->objectType == 0);
-	asASSERT(func->funcdef->sysFuncIntf == 0);
-
-	func2->id = GetNextScriptFunctionId();
-	AddScriptFunction(func2);
-
-	asCFuncdefType *fdt2 = asNEW(asCFuncdefType)(this, func2);
-	funcDefs.PushLast(fdt2); // don't increase refCount as the constructor already set it to 1
-
-	// Return the new function
-	return fdt2;
-}
-
-void asCScriptEngine::CallObjectMethod(void *obj, int func) const
-{
-	asCScriptFunction *s = scriptFunctions[func];
-	asASSERT( s != 0 );
-	CallObjectMethod(obj, s->sysFuncIntf, s);
-}
-
-void asCScriptEngine::CallObjectMethod(void *obj, asSSystemFunctionInterface *i, asCScriptFunction *s) const
-{
-#if defined(__GNUC__) || defined(AS_PSVITA)
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-	}
-	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
-	{
-		// For virtual thiscalls we must call the method as a true class method
-		// so that the compiler will lookup the function address in the vftable
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			struct
-			{
-				asFUNCTION_t func;
-				asPWORD baseOffset;  // Same size as the pointer
-			} f;
-		} p;
-		p.f.func = (asFUNCTION_t)(i->func);
-		p.f.baseOffset = asPWORD(i->baseOffset);
-		void (asCSimpleDummy::*f)() = p.mthd;
-		(((asCSimpleDummy*)obj)->*f)();
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		void (*f)(void *) = (void (*)(void *))(i->func);
-		f(obj);
-	}
-#else
-#ifndef AS_NO_CLASS_METHODS
-	if( i->callConv == ICC_THISCALL )
-	{
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			asFUNCTION_t func;
-		} p;
-		p.func = (asFUNCTION_t)(i->func);
-		void (asCSimpleDummy::*f)() = p.mthd;
-		obj = (void*)(asPWORD(obj) + i->baseOffset);
-		(((asCSimpleDummy*)obj)->*f)();
-	}
-	else
-#endif
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		void (*f)(void *) = (void (*)(void *))(i->func);
-		f(obj);
-	}
-#endif
-}
-
-bool asCScriptEngine::CallObjectMethodRetBool(void *obj, int func) const
-{
-	asCScriptFunction *s = scriptFunctions[func];
-	asASSERT( s != 0 );
-	asSSystemFunctionInterface *i = s->sysFuncIntf;
-
-#if defined(__GNUC__) || defined(AS_PSVITA)
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(bool*)gen.GetReturnPointer();
-	}
-	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
-	{
-		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			struct
-			{
-				asFUNCTION_t func;
-				asPWORD baseOffset;
-			} f;
-		} p;
-		p.f.func = (asFUNCTION_t)(i->func);
-		p.f.baseOffset = asPWORD(i->baseOffset);
-		bool (asCSimpleDummy::*f)() = (bool (asCSimpleDummy::*)())(p.mthd);
-		return (((asCSimpleDummy*)obj)->*f)();
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		bool (*f)(void *) = (bool (*)(void *))(i->func);
-		return f(obj);
-	}
-#else
-#ifndef AS_NO_CLASS_METHODS
-	if( i->callConv == ICC_THISCALL )
-	{
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			asFUNCTION_t func;
-		} p;
-		p.func = (asFUNCTION_t)(i->func);
-		bool (asCSimpleDummy::*f)() = (bool (asCSimpleDummy::*)())p.mthd;
-		obj = (void*)(asPWORD(obj) + i->baseOffset);
-		return (((asCSimpleDummy*)obj)->*f)();
-	}
-	else
-#endif
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(bool*)gen.GetReturnPointer();
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		bool (*f)(void *) = (bool (*)(void *))(i->func);
-		return f(obj);
-	}
-#endif
-}
-
-int asCScriptEngine::CallObjectMethodRetInt(void *obj, int func) const
-{
-	asCScriptFunction *s = scriptFunctions[func];
-	asASSERT( s != 0 );
-	asSSystemFunctionInterface *i = s->sysFuncIntf;
-
-#if defined(__GNUC__) || defined(AS_PSVITA)
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(int*)gen.GetReturnPointer();
-	}
-	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
-	{
-		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			struct
-			{
-				asFUNCTION_t func;
-				asPWORD baseOffset;
-			} f;
-		} p;
-		p.f.func = (asFUNCTION_t)(i->func);
-		p.f.baseOffset = asPWORD(i->baseOffset);
-		int (asCSimpleDummy::*f)() = (int (asCSimpleDummy::*)())(p.mthd);
-		return (((asCSimpleDummy*)obj)->*f)();
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		int (*f)(void *) = (int (*)(void *))(i->func);
-		return f(obj);
-	}
-#else
-#ifndef AS_NO_CLASS_METHODS
-	if( i->callConv == ICC_THISCALL )
-	{
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			asFUNCTION_t func;
-		} p;
-		p.func = (asFUNCTION_t)(i->func);
-		int (asCSimpleDummy::*f)() = (int (asCSimpleDummy::*)())p.mthd;
-		obj = (void*)(asPWORD(obj) + i->baseOffset);
-		return (((asCSimpleDummy*)obj)->*f)();
-	}
-	else
-#endif
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(int*)gen.GetReturnPointer();
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		int (*f)(void *) = (int (*)(void *))(i->func);
-		return f(obj);
-	}
-#endif
-}
-
-void *asCScriptEngine::CallObjectMethodRetPtr(void *obj, int func) const
-{
-	asCScriptFunction *s = scriptFunctions[func];
-	asASSERT( s != 0 );
-	asSSystemFunctionInterface *i = s->sysFuncIntf;
-
-#if defined(__GNUC__) || defined(AS_PSVITA)
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(void**)gen.GetReturnPointer();
-	}
-	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
-	{
-		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			struct
-			{
-				asFUNCTION_t func;
-				asPWORD baseOffset;
-			} f;
-		} p;
-		p.f.func = (asFUNCTION_t)(i->func);
-		p.f.baseOffset = asPWORD(i->baseOffset);
-		void *(asCSimpleDummy::*f)() = (void *(asCSimpleDummy::*)())(p.mthd);
-		return (((asCSimpleDummy*)obj)->*f)();
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		void *(*f)(void *) = (void *(*)(void *))(i->func);
-		return f(obj);
-	}
-#else
-#ifndef AS_NO_CLASS_METHODS
-	if( i->callConv == ICC_THISCALL )
-	{
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			asFUNCTION_t func;
-		} p;
-		p.func = (asFUNCTION_t)(i->func);
-		void *(asCSimpleDummy::*f)() = (void *(asCSimpleDummy::*)())p.mthd;
-		obj = (void*)(asPWORD(obj) + i->baseOffset);
-		return (((asCSimpleDummy*)obj)->*f)();
-	}
-	else
-#endif
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(void **)gen.GetReturnPointer();
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		void *(*f)(void *) = (void *(*)(void *))(i->func);
-		return f(obj);
-	}
-#endif
-}
-
-void *asCScriptEngine::CallObjectMethodRetPtr(void *obj, int param1, asCScriptFunction *func) const
-{
-	asASSERT( obj != 0 );
-	asASSERT( func != 0 );
-	asSSystemFunctionInterface *i = func->sysFuncIntf;
-
-#ifndef AS_NO_CLASS_METHODS
-	if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
-	{
-#if defined(__GNUC__) || defined(AS_PSVITA)
-		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			struct
-			{
-				asFUNCTION_t func;
-				asPWORD baseOffset;
-			} f;
-		} p;
-		p.f.func = (asFUNCTION_t)(i->func);
-		p.f.baseOffset = asPWORD(i->baseOffset);
-		void *(asCSimpleDummy::*f)(int) = (void *(asCSimpleDummy::*)(int))(p.mthd);
-		return (((asCSimpleDummy*)obj)->*f)(param1);
-#else
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			asFUNCTION_t func;
-		} p;
-		p.func = (asFUNCTION_t)(i->func);
-		void *(asCSimpleDummy::*f)(int) = (void *(asCSimpleDummy::*)(int))p.mthd;
-		obj = (void*)(asPWORD(obj) + i->baseOffset);
-		return (((asCSimpleDummy*)obj)->*f)(param1);
-#endif
-	}
-	else
-#endif
-	if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), func, obj, reinterpret_cast<asDWORD*>(&param1));
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(void **)gen.GetReturnPointer();
-	}
-	else if( i->callConv == ICC_CDECL_OBJLAST )
-	{
-		void *(*f)(int, void *) = (void *(*)(int, void *))(i->func);
-		return f(param1, obj);
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		void *(*f)(void *, int) = (void *(*)(void *, int))(i->func);
-		return f(obj, param1);
-	}
-}
-
-void *asCScriptEngine::CallGlobalFunctionRetPtr(int func) const
-{
-	asCScriptFunction *s = scriptFunctions[func];
-	asASSERT( s != 0 );
-	return CallGlobalFunctionRetPtr(s->sysFuncIntf, s);
-}
-
-void *asCScriptEngine::CallGlobalFunctionRetPtr(int func, void *param1) const
-{
-	asCScriptFunction *s = scriptFunctions[func];
-	asASSERT( s != 0 );
-	return CallGlobalFunctionRetPtr(s->sysFuncIntf, s, param1);
-}
-
-void *asCScriptEngine::CallGlobalFunctionRetPtr(asSSystemFunctionInterface *i, asCScriptFunction *s) const
-{
-	if( i->callConv == ICC_CDECL )
-	{
-		void *(*f)() = (void *(*)())(i->func);
-		return f();
-	}
-	else if( i->callConv == ICC_STDCALL )
-	{
-		typedef void *(STDCALL *func_t)();
-		func_t f = (func_t)(i->func);
-		return f();
-	}
-	else
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, 0);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(void**)gen.GetReturnPointer();
-	}
-}
-
-void *asCScriptEngine::CallGlobalFunctionRetPtr(asSSystemFunctionInterface *i, asCScriptFunction *s, void *param1) const
-{
-	if( i->callConv == ICC_CDECL )
-	{
-		void *(*f)(void *) = (void *(*)(void *))(i->func);
-		return f(param1);
-	}
-	else if( i->callConv == ICC_STDCALL )
-	{
-		typedef void *(STDCALL *func_t)(void *);
-		func_t f = (func_t)(i->func);
-		return f(param1);
-	}
-	else
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, (asDWORD*)&param1);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(void**)gen.GetReturnPointer();
-	}
-}
-
-void asCScriptEngine::CallObjectMethod(void *obj, void *param, int func) const
-{
-	asCScriptFunction *s = scriptFunctions[func];
-	asASSERT( s != 0 );
-	CallObjectMethod(obj, param, s->sysFuncIntf, s);
-}
-
-void asCScriptEngine::CallObjectMethod(void *obj, void *param, asSSystemFunctionInterface *i, asCScriptFunction *s) const
-{
-#if defined(__GNUC__) || defined(AS_PSVITA)
-	if( i->callConv == ICC_CDECL_OBJLAST )
-	{
-		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
-		f(param, obj);
-	}
-	else if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, (asDWORD*)&param);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-	}
-	else if( i->callConv == ICC_VIRTUAL_THISCALL || i->callConv == ICC_THISCALL )
-	{
-		// For virtual thiscalls we must call the method as a true class method
-		// so that the compiler will lookup the function address in the vftable
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			struct
-			{
-				asFUNCTION_t func;
-				asPWORD baseOffset;  // Same size as the pointer
-			} f;
-		} p;
-		p.f.func = (asFUNCTION_t)(i->func);
-		p.f.baseOffset = asPWORD(i->baseOffset);
-		void (asCSimpleDummy::*f)(void*) = (void (asCSimpleDummy::*)(void*))(p.mthd);
-		(((asCSimpleDummy*)obj)->*f)(param);
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJFIRST */
-	{
-		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
-		f(obj, param);
-	}
-#else
-#ifndef AS_NO_CLASS_METHODS
-	if( i->callConv == ICC_THISCALL )
-	{
-		union
-		{
-			asSIMPLEMETHOD_t mthd;
-			asFUNCTION_t func;
-		} p;
-		p.func = (asFUNCTION_t)(i->func);
-		void (asCSimpleDummy::*f)(void *) = (void (asCSimpleDummy::*)(void *))(p.mthd);
-		obj = (void*)(asPWORD(obj) + i->baseOffset);
-		(((asCSimpleDummy*)obj)->*f)(param);
-	}
-	else
-#endif
-	if( i->callConv == ICC_CDECL_OBJLAST )
-	{
-		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
-		f(param, obj);
-	}
-	else if( i->callConv == ICC_GENERIC_METHOD )
-	{
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, (asDWORD*)&param);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-	}
-	else /*if( i->callConv == ICC_CDECL_OBJFIRST )*/
-	{
-		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
-		f(obj, param);
-	}
-#endif
-}
-
-void asCScriptEngine::CallGlobalFunction(void *param1, void *param2, asSSystemFunctionInterface *i, asCScriptFunction *s) const
-{
-	if( i->callConv == ICC_CDECL )
-	{
-		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
-		f(param1, param2);
-	}
-	else if( i->callConv == ICC_STDCALL )
-	{
-		typedef void (STDCALL *func_t)(void *, void *);
-		func_t f = (func_t)(i->func);
-		f(param1, param2);
-	}
-	else
-	{
-		// We must guarantee the order of the arguments which is why we copy them to this
-		// array. Otherwise the compiler may put them anywhere it likes, or even keep them
-		// in the registers which causes problem.
-		void *params[2] = {param1, param2};
-
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, (asDWORD*)&params);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-	}
-}
-
-bool asCScriptEngine::CallGlobalFunctionRetBool(void *param1, void *param2, asSSystemFunctionInterface *i, asCScriptFunction *s) const
-{
-	if( i->callConv == ICC_CDECL )
-	{
-		bool (*f)(void *, void *) = (bool (*)(void *, void *))(i->func);
-		return f(param1, param2);
-	}
-	else if( i->callConv == ICC_STDCALL )
-	{
-		typedef bool (STDCALL *func_t)(void *, void *);
-		func_t f = (func_t)(i->func);
-		return f(param1, param2);
-	}
-	else
-	{
-		// TODO: When simulating a 64bit environment by defining AS_64BIT_PTR on a 32bit platform this code
-		//       fails, because the stack given to asCGeneric is not prepared with two 64bit arguments.
-
-		// We must guarantee the order of the arguments which is why we copy them to this
-		// array. Otherwise the compiler may put them anywhere it likes, or even keep them
-		// in the registers which causes problem.
-		void *params[2] = {param1, param2};
-		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, (asDWORD*)params);
-		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
-		f(&gen);
-		return *(bool*)gen.GetReturnPointer();
-	}
-}
-
-void *asCScriptEngine::CallAlloc(const asCObjectType *type) const
-{
-	// Allocate 4 bytes as the smallest size. Otherwise CallSystemFunction may try to
-	// copy a DWORD onto a smaller memory block, in case the object type is return in registers.
-
-	// Pad to the next even 4 bytes to avoid asBC_CPY writing outside of allocated buffer for registered POD types
-	asUINT size = type->size;
-	if( size & 0x3 )
-		size += 4 - (size & 0x3);
-
-#ifndef WIP_16BYTE_ALIGN
-#if defined(AS_DEBUG)
-	return ((asALLOCFUNCDEBUG_t)userAlloc)(size, __FILE__, __LINE__);
-#else
-	return userAlloc(size);
-#endif
-#else
-#if defined(AS_DEBUG)
-	return ((asALLOCALIGNEDFUNCDEBUG_t)userAllocAligned)(size, type->alignment, __FILE__, __LINE__);
-#else
-	return userAllocAligned(size, type->alignment);
-#endif
-#endif
-}
-
-void asCScriptEngine::CallFree(void *obj) const
-{
-#ifndef WIP_16BYTE_ALIGN
-	userFree(obj);
-#else
-	userFreeAligned(obj);
-#endif
-}
-
-// interface
-int asCScriptEngine::NotifyGarbageCollectorOfNewObject(void *obj, asITypeInfo *type)
-{
-	return gc.AddScriptObjectToGC(obj, static_cast<asCObjectType*>(type));
-}
-
-// interface
-int asCScriptEngine::GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, asITypeInfo **type)
-{
-	return gc.GetObjectInGC(idx, seqNbr, obj, type);
-}
-
-// interface
-int asCScriptEngine::GarbageCollect(asDWORD flags, asUINT iterations)
-{
-	int r = gc.GarbageCollect(flags, iterations);
-
-	if( r == 0 )
-	{
-		// Delete any modules that have been discarded previously but not
-		// removed due to being referred to by objects in the garbage collector
-		DeleteDiscardedModules();
-	}
-
-	return r;
-}
-
-// interface
-void asCScriptEngine::GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const
-{
-	gc.GetStatistics(currentSize, totalDestroyed, totalDetected, newObjects, totalNewDestroyed);
-}
-
-// interface
-void asCScriptEngine::GCEnumCallback(void *reference)
-{
-	gc.GCEnumCallback(reference);
-}
-
-
-int asCScriptEngine::GetTypeIdFromDataType(const asCDataType &dtIn) const
-{
-	if( dtIn.IsNullHandle() ) return asTYPEID_VOID;
-
-	if( dtIn.GetTypeInfo() == 0 )
-	{
-		// Primitives have pre-fixed typeIds
-		switch( dtIn.GetTokenType() )
-		{
-		case ttVoid:   return asTYPEID_VOID;
-		case ttBool:   return asTYPEID_BOOL;
-		case ttInt8:   return asTYPEID_INT8;
-		case ttInt16:  return asTYPEID_INT16;
-		case ttInt:    return asTYPEID_INT32;
-		case ttInt64:  return asTYPEID_INT64;
-		case ttUInt8:  return asTYPEID_UINT8;
-		case ttUInt16: return asTYPEID_UINT16;
-		case ttUInt:   return asTYPEID_UINT32;
-		case ttUInt64: return asTYPEID_UINT64;
-		case ttFloat:  return asTYPEID_FLOAT;
-		case ttDouble: return asTYPEID_DOUBLE;
-		default:
-			// All types should be covered by the above. The variable type is not really a type
-			asASSERT(dtIn.GetTokenType() == ttQuestion);
-			return -1;
-		}
-	}
-
-	int typeId = -1;
-	asCTypeInfo *ot = dtIn.GetTypeInfo();
-	asASSERT(ot != &functionBehaviours);
-	// Object's hold the typeId themselves
-	typeId = ot->typeId;
-
-	if( typeId == -1 )
-	{
-		ACQUIREEXCLUSIVE(engineRWLock);
-		// Make sure another thread didn't determine the typeId while we were waiting for the lock
-		if( ot->typeId == -1 )
-		{
-			typeId = typeIdSeqNbr++;
-			if( ot->flags & asOBJ_SCRIPT_OBJECT ) typeId |= asTYPEID_SCRIPTOBJECT;
-			else if( ot->flags & asOBJ_TEMPLATE ) typeId |= asTYPEID_TEMPLATE;
-			else if( ot->flags & asOBJ_ENUM ) {} // TODO: Should we have a specific bit for this?
-			else typeId |= asTYPEID_APPOBJECT;
-
-			ot->typeId = typeId;
-
-			mapTypeIdToTypeInfo.Insert(typeId, ot);
-		}
-		RELEASEEXCLUSIVE(engineRWLock);
-	}
-
-	// Add flags according to the requested type
-	if( dtIn.GetTypeInfo() && !(dtIn.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
-	{
-		// The ASHANDLE types behave like handles, but are really
-		// value types so the typeId is never returned as a handle
-		if( dtIn.IsObjectHandle() )
-			typeId |= asTYPEID_OBJHANDLE;
-		if( dtIn.IsHandleToConst() )
-			typeId |= asTYPEID_HANDLETOCONST;
-	}
-
-	return typeId;
-}
-
-asCDataType asCScriptEngine::GetDataTypeFromTypeId(int typeId) const
-{
-	int baseId = typeId & (asTYPEID_MASK_OBJECT | asTYPEID_MASK_SEQNBR);
-
-	if( typeId <= asTYPEID_DOUBLE )
-	{
-		eTokenType type[] = {ttVoid, ttBool, ttInt8, ttInt16, ttInt, ttInt64, ttUInt8, ttUInt16, ttUInt, ttUInt64, ttFloat, ttDouble};
-		return asCDataType::CreatePrimitive(type[typeId], false);
-	}
-
-	// First check if the typeId is an object type
-	asCTypeInfo *ot = 0;
-	ACQUIRESHARED(engineRWLock);
-	asSMapNode<int,asCTypeInfo*> *cursor = 0;
-	if( mapTypeIdToTypeInfo.MoveTo(&cursor, baseId) )
-		ot = mapTypeIdToTypeInfo.GetValue(cursor);
-	RELEASESHARED(engineRWLock);
-
-	if( ot )
-	{
-		asCDataType dt = asCDataType::CreateType(ot, false);
-		if( typeId & asTYPEID_OBJHANDLE )
-			dt.MakeHandle(true, true);
-		if( typeId & asTYPEID_HANDLETOCONST )
-			dt.MakeHandleToConst(true);
-
-		return dt;
-	}
-
-	return asCDataType();
-}
-
-asCObjectType *asCScriptEngine::GetObjectTypeFromTypeId(int typeId) const
-{
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-	return dt.GetTypeInfo()->CastToObjectType();
-}
-
-void asCScriptEngine::RemoveFromTypeIdMap(asCTypeInfo *type)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-	asSMapNode<int,asCTypeInfo*> *cursor = 0;
-	mapTypeIdToTypeInfo.MoveFirst(&cursor);
-	while( cursor )
-	{
-		if(mapTypeIdToTypeInfo.GetValue(cursor) == type )
-		{
-			mapTypeIdToTypeInfo.Erase(cursor);
-			break;
-		}
-		mapTypeIdToTypeInfo.MoveNext(&cursor, cursor);
-	}
-	RELEASEEXCLUSIVE(engineRWLock);
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-asITypeInfo *asCScriptEngine::GetObjectTypeByDecl(const char *decl) const
-{
-	asITypeInfo *ti = GetTypeInfoByDecl(decl);
-	return reinterpret_cast<asCTypeInfo*>(ti)->CastToObjectType();
-}
-#endif
-
-// interface
-asITypeInfo *asCScriptEngine::GetTypeInfoByDecl(const char *decl) const
-{
-	asCDataType dt;
-	// This cast is ok, because we are not changing anything in the engine
-	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
-	if (r < 0)
-		return 0;
-
-	return dt.GetTypeInfo();
-}
-
-// interface
-int asCScriptEngine::GetTypeIdByDecl(const char *decl) const
-{
-	asCDataType dt;
-	// This cast is ok, because we are not changing anything in the engine
-	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
-
-	// Don't write parser errors to the message callback
-	bld.silent = true;
-
-	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
-	if( r < 0 )
-		return asINVALID_TYPE;
-
-	return GetTypeIdFromDataType(dt);
-}
-
-// interface
-const char *asCScriptEngine::GetTypeDeclaration(int typeId, bool includeNamespace) const
-{
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-
-	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = dt.Format(defaultNamespace, includeNamespace);
-
-	return tempString->AddressOf();
-}
-
-// interface
-int asCScriptEngine::GetSizeOfPrimitiveType(int typeId) const
-{
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-	if( !dt.IsPrimitive() ) return 0;
-
-	return dt.GetSizeInMemoryBytes();
-}
-
-// interface
-int asCScriptEngine::RefCastObject(void *obj, asITypeInfo *fromType, asITypeInfo *toType, void **newPtr, bool useOnlyImplicitCast)
-{
-	if( newPtr == 0 ) return asINVALID_ARG;
-	*newPtr = 0;
-
-	if( fromType == 0 || toType == 0 ) return asINVALID_ARG;
-
-	// A null-pointer can always be cast to another type, so it will always be successful
-	if( obj == 0 )
-		return asSUCCESS;
-
-	if( fromType == toType )
-	{
-		*newPtr = obj;
-		AddRefScriptObject(*newPtr, toType);
-		return asSUCCESS;
-	}
-
-	// Check for funcdefs
-	if ((fromType->GetFlags() & asOBJ_FUNCDEF) && (toType->GetFlags() & asOBJ_FUNCDEF))
-	{
-		asCFuncdefType *fromFunc = reinterpret_cast<asCTypeInfo*>(fromType)->CastToFuncdefType();
-		asCFuncdefType *toFunc = reinterpret_cast<asCTypeInfo*>(toType)->CastToFuncdefType();
-
-		if (fromFunc && toFunc && fromFunc->funcdef->IsSignatureExceptNameEqual(toFunc->funcdef))
-		{
-			*newPtr = obj;
-			AddRefScriptObject(*newPtr, toType);
-			return asSUCCESS;
-		}
-		
-		return asSUCCESS;
-	}
-
-	// Look for ref cast behaviours
-	asCScriptFunction *universalCastFunc = 0;
-	asCObjectType *from = reinterpret_cast<asCObjectType*>(fromType);
-	for( asUINT n = 0; n < from->methods.GetLength(); n++ )
-	{
-		asCScriptFunction *func = scriptFunctions[from->methods[n]];
-		if( func->name == "opImplCast" ||
-			(!useOnlyImplicitCast && func->name == "opCast") )
-		{
-			if( func->returnType.GetTypeInfo() == toType )
-			{
-				*newPtr = CallObjectMethodRetPtr(obj, func->id);
-				// The ref cast behaviour returns a handle with incremented
-				// ref counter, so there is no need to call AddRef explicitly
-				// unless the function is registered with autohandle
-				if( func->sysFuncIntf->returnAutoHandle )
-					AddRefScriptObject(*newPtr, toType);
-				return asSUCCESS;
-			}
-			else
-			{
-				asASSERT( func->returnType.GetTokenType() == ttVoid && 
-						  func->parameterTypes.GetLength() == 1 && 
-						  func->parameterTypes[0].GetTokenType() == ttQuestion );
-				universalCastFunc = func;
-			}
-		}
-	}
-
-	// One last chance if the object has a void opCast(?&out) behaviour
-	if( universalCastFunc )
-	{
-		// TODO: Add proper error handling
-		asIScriptContext *ctx = RequestContext();
-		ctx->Prepare(universalCastFunc);
-		ctx->SetObject(obj);
-		ctx->SetArgVarType(0, newPtr, toType->GetTypeId() | asTYPEID_OBJHANDLE);
-		ctx->Execute();
-		ReturnContext(ctx);
-
-		// The opCast(?&out) method already incremented the
-		// refCount so there is no need to do it manually
-		return asSUCCESS;
-	}
-
-	// For script classes and interfaces there is a quick route
-	if( (fromType->GetFlags() & asOBJ_SCRIPT_OBJECT) && (toType->GetFlags() & asOBJ_SCRIPT_OBJECT) )
-	{
-		if( fromType == toType )
-		{
-			*newPtr = obj;
-			reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
-			return asSUCCESS;
-		}
-
-		// Up casts to base class or interface can be done implicitly
-		if( fromType->DerivesFrom(toType) ||
-			fromType->Implements(toType) )
-		{
-			*newPtr = obj;
-			reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
-			return asSUCCESS;
-		}
-		// Down casts to derived class or from interface can only be done explicitly
-		if( !useOnlyImplicitCast )
-		{
-			if( toType->Implements(fromType) || 
-				toType->DerivesFrom(fromType) )
-			{
-				*newPtr = obj;
-				reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
-				return asSUCCESS;
-			}
-
-			// Get the true type of the object so the explicit cast can evaluate all possibilities
-			asITypeInfo *trueType = reinterpret_cast<asCScriptObject*>(obj)->GetObjectType();
-			if( trueType->DerivesFrom(toType) ||
-				trueType->Implements(toType) )
-			{
-				*newPtr = obj;
-				reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
-				return asSUCCESS;
-			}
-		}
-	}
-
-	// The cast is not available, but it is still a success
-	return asSUCCESS;
-}
-
-// interface
-void *asCScriptEngine::CreateScriptObject(const asITypeInfo *type)
-{
-	if( type == 0 ) return 0;
-
-	asCObjectType *objType = const_cast<asCObjectType*>(reinterpret_cast<const asCObjectType *>(type));
-	void *ptr = 0;
-
-	// Check that there is a default factory for ref types
-	if( objType->beh.factory == 0 && (objType->flags & asOBJ_REF) )
-	{
-		asCString str;
-		str.Format(TXT_FAILED_IN_FUNC_s_d, "CreateScriptObject", asNO_FUNCTION);
-		WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-		return 0;
-	}
-
-	// Construct the object
-	if( objType->flags & asOBJ_SCRIPT_OBJECT )
-	{
-		// Call the script class' default factory with a context
-		ptr = ScriptObjectFactory(objType, this);
-	}
-	else if( objType->flags & asOBJ_TEMPLATE )
-	{
-		// The registered factory that takes the object type is moved
-		// to the construct behaviour when the type is instantiated
-#ifdef AS_NO_EXCEPTIONS
-		ptr = CallGlobalFunctionRetPtr(objType->beh.construct, objType);
-#else
-		try
-		{
-			ptr = CallGlobalFunctionRetPtr(objType->beh.construct, objType);
-		}
-		catch(...)
-		{
-			asIScriptContext *ctx = asGetActiveContext();
-			if( ctx )
-				ctx->SetException(TXT_EXCEPTION_CAUGHT);
-		}
-#endif
-	}
-	else if( objType->flags & asOBJ_REF )
-	{
-		// Call the default factory directly
-#ifdef AS_NO_EXCEPTIONS
-		ptr = CallGlobalFunctionRetPtr(objType->beh.factory);
-#else
-		try
-		{
-			ptr = CallGlobalFunctionRetPtr(objType->beh.factory);
-		}
-		catch(...)
-		{
-			asIScriptContext *ctx = asGetActiveContext();
-			if( ctx )
-				ctx->SetException(TXT_EXCEPTION_CAUGHT);
-		}
-#endif
-	}
-	else
-	{
-		// Make sure there is a default constructor or that it is a POD type
-		if( objType->beh.construct == 0 && !(objType->flags & asOBJ_POD) )
-		{
-			asCString str;
-			str.Format(TXT_FAILED_IN_FUNC_s_d, "CreateScriptObject", asNO_FUNCTION);
-			WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
-			return 0;
-		}
-
-		// Manually allocate the memory, then call the default constructor
-		ptr = CallAlloc(objType);
-		int funcIndex = objType->beh.construct;
-		if( funcIndex )
-		{
-#ifdef AS_NO_EXCEPTIONS
-			CallObjectMethod(ptr, funcIndex);
-#else
-			try
-			{
-				CallObjectMethod(ptr, funcIndex);
-			}
-			catch(...)
-			{
-				asIScriptContext *ctx = asGetActiveContext();
-				if( ctx )
-					ctx->SetException(TXT_EXCEPTION_CAUGHT);
-
-				// Free the memory
-				CallFree(ptr);
-				ptr = 0;
-			}
-#endif
-		}
-	}
-
-	return ptr;
-}
-
-// interface
-void *asCScriptEngine::CreateUninitializedScriptObject(const asITypeInfo *type)
-{
-	// This function only works for script classes. Registered types cannot be created this way.
-	if( type == 0 || !(type->GetFlags() & asOBJ_SCRIPT_OBJECT) )
-		return 0;
-
-	asCObjectType *objType = const_cast<asCObjectType*>(reinterpret_cast<const asCObjectType*>(type));
-
-	// Construct the object, but do not call the actual constructor that initializes the members
-	// The initialization will be done by the application afterwards, e.g. through serialization.
-	asCScriptObject *obj = reinterpret_cast<asCScriptObject*>(CallAlloc(objType));
-
-	// Pre-initialize the memory so there are no invalid pointers
-	ScriptObject_ConstructUnitialized(objType, obj);
-
-	return obj;
-}
-
-// interface
-void *asCScriptEngine::CreateScriptObjectCopy(void *origObj, const asITypeInfo *type)
-{
-	if( origObj == 0 || type == 0 ) return 0;
-
-	void *newObj = 0;
-
-	const asCObjectType *ot = reinterpret_cast<const asCObjectType*>(type);
-	// TODO: runtime optimize: Should call copy factory for ref types too
-	if( ot->beh.copyconstruct )
-	{
-		// Manually allocate the memory, then call the copy constructor
-		newObj = CallAlloc(ot);
-#ifdef AS_NO_EXCEPTIONS
-		CallObjectMethod(newObj, origObj, ot->beh.copyconstruct);
-#else
-		try
-		{
-			CallObjectMethod(newObj, origObj, ot->beh.copyconstruct);
-		}
-		catch(...)
-		{
-			asIScriptContext *ctx = asGetActiveContext();
-			if( ctx )
-				ctx->SetException(TXT_EXCEPTION_CAUGHT);
-
-			// Free the memory
-			CallFree(newObj);
-			newObj = 0;
-		}
-#endif
-	}
-	else
-	{
-		// Allocate the object and then do a value assign
-		newObj = CreateScriptObject(type);
-		if( newObj == 0 ) return 0;
-
-		AssignScriptObject(newObj, origObj, type);
-	}
-
-	return newObj;
-}
-
-// internal
-void asCScriptEngine::ConstructScriptObjectCopy(void *mem, void *obj, asCObjectType *type)
-{
-	if( type == 0 || mem == 0 || obj == 0 ) return;
-
-	// This function is only meant to be used for value types
-	asASSERT( type->flags & asOBJ_VALUE );
-
-	// Call the copy constructor if available, else call the default constructor followed by the opAssign
-	int funcIndex = type->beh.copyconstruct;
-	if( funcIndex )
-	{
-		CallObjectMethod(mem, obj, funcIndex);
-	}
-	else
-	{
-		funcIndex = type->beh.construct;
-		if( funcIndex )
-			CallObjectMethod(mem, funcIndex);
-
-		AssignScriptObject(mem, obj, type);
-	}
-}
-
-// interface
-int asCScriptEngine::AssignScriptObject(void *dstObj, void *srcObj, const asITypeInfo *type)
-{
-	// TODO: Warn about invalid call in message stream
-	// TODO: Should a script exception be set in case a context is active?
-	if( type == 0 || dstObj == 0 || srcObj == 0 ) return asINVALID_ARG;
-
-	const asCObjectType *objType = reinterpret_cast<const asCObjectType*>(type);
-
-	// If value assign for ref types has been disabled, then don't do anything if the type is a ref type
-	if( ep.disallowValueAssignForRefType && (objType->flags & asOBJ_REF) && !(objType->flags & asOBJ_SCOPED) )
-		return asNOT_SUPPORTED;
-
-	// Must not copy if the opAssign is not available and the object is not a POD object
-	if( objType->beh.copy )
-	{
-		asCScriptFunction *func = scriptFunctions[objType->beh.copy];
-		if( func->funcType == asFUNC_SYSTEM )
-			CallObjectMethod(dstObj, srcObj, objType->beh.copy);
-		else
-		{
-			// Call the script class' opAssign method
-			asASSERT( objType->flags & asOBJ_SCRIPT_OBJECT );
-			reinterpret_cast<asCScriptObject*>(dstObj)->CopyFrom(reinterpret_cast<asCScriptObject*>(srcObj));
-		}
-	}
-	else if( objType->size && (objType->flags & asOBJ_POD) )
-	{
-		memcpy(dstObj, srcObj, objType->size);
-	}
-
-	return asSUCCESS;
-}
-
-// interface
-void asCScriptEngine::AddRefScriptObject(void *obj, const asITypeInfo *type)
-{
-	// Make sure it is not a null pointer
-	if( obj == 0 || type == 0 ) return;
-
-	const asCTypeInfo *ti = static_cast<const asCTypeInfo*>(type);
-	if (ti->flags & asOBJ_FUNCDEF)
-	{
-		CallObjectMethod(obj, functionBehaviours.beh.addref);
-	}
-	else
-	{
-		asCObjectType *objType = const_cast<asCTypeInfo*>(ti)->CastToObjectType();
-		if (objType && objType->beh.addref)
-		{
-			// Call the addref behaviour
-			CallObjectMethod(obj, objType->beh.addref);
-		}
-	}
-}
-
-// interface
-void asCScriptEngine::ReleaseScriptObject(void *obj, const asITypeInfo *type)
-{
-	// Make sure it is not a null pointer
-	if( obj == 0 || type == 0 ) return;
-
-	const asCTypeInfo *ti = static_cast<const asCTypeInfo*>(type);
-	if (ti->flags & asOBJ_FUNCDEF)
-	{
-		CallObjectMethod(obj, functionBehaviours.beh.release);
-	}
-	else
-	{
-		asCObjectType *objType = const_cast<asCTypeInfo*>(ti)->CastToObjectType();
-		if (objType && objType->flags & asOBJ_REF)
-		{
-			asASSERT((objType->flags & asOBJ_NOCOUNT) || objType->beh.release);
-			if (objType->beh.release)
-			{
-				// Call the release behaviour
-				CallObjectMethod(obj, objType->beh.release);
-			}
-		}
-		else if( objType )
-		{
-			// Call the destructor
-			if (objType->beh.destruct)
-				CallObjectMethod(obj, objType->beh.destruct);
-			else if (objType->flags & asOBJ_LIST_PATTERN)
-				DestroyList((asBYTE*)obj, objType);
-
-			// We'll have to trust that the memory for the object was allocated with CallAlloc.
-			// This is true if the object was created in the context, or with CreateScriptObject.
-
-			// Then free the memory
-			CallFree(obj);
-		}
-	}
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.30.0, 2014-11-04
-// interface
-bool asCScriptEngine::IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const
-{
-	// if equal, then it is obvious they are compatible
-	if( objTypeId == handleTypeId )
-		return true;
-
-	// Get the actual data types from the type ids
-	asCDataType objDt = GetDataTypeFromTypeId(objTypeId);
-	asCDataType hdlDt = GetDataTypeFromTypeId(handleTypeId);
-
-	// A handle to const cannot be passed to a handle that is not referencing a const object
-	if( objDt.IsHandleToConst() && !hdlDt.IsHandleToConst() )
-		return false;
-
-	if( objDt.GetTypeInfo() == hdlDt.GetTypeInfo() )
-	{
-		// The object type is equal
-		return true;
-	}
-	else if( objDt.IsScriptObject() && obj )
-	{
-		// Get the true type from the object instance
-		asCObjectType *objType = ((asCScriptObject*)obj)->objType;
-
-		// Check if the object implements the interface, or derives from the base class
-		// This will also return true, if the requested handle type is an exact match for the object type
-		if( objType->Implements(hdlDt.GetTypeInfo()) ||
-		    objType->DerivesFrom(hdlDt.GetTypeInfo()) )
-			return true;
-	}
-
-	return false;
-}
-#endif
-
-// interface
-int asCScriptEngine::BeginConfigGroup(const char *groupName)
-{
-	// Make sure the group name doesn't already exist
-	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
-	{
-		if( configGroups[n]->groupName == groupName )
-			return asNAME_TAKEN;
-	}
-
-	if( currentGroup != &defaultGroup )
-		return asNOT_SUPPORTED;
-
-	asCConfigGroup *group = asNEW(asCConfigGroup)();
-	if( group == 0 )
-		return asOUT_OF_MEMORY;
-
-	group->groupName = groupName;
-
-	configGroups.PushLast(group);
-	currentGroup = group;
-
-	return 0;
-}
-
-// interface
-int asCScriptEngine::EndConfigGroup()
-{
-	// Raise error if trying to end the default config
-	if( currentGroup == &defaultGroup )
-		return asERROR;
-
-	currentGroup = &defaultGroup;
-
-	return 0;
-}
-
-// interface
-int asCScriptEngine::RemoveConfigGroup(const char *groupName)
-{
-	// It is not allowed to remove a group that is still in use.
-
-	// It would be possible to change the code in such a way that
-	// the group could be removed even though it was still in use,
-	// but that would cause severe negative impact on runtime
-	// performance, since the VM would then have to be able handle
-	// situations where the types, functions, and global variables
-	// can be removed at any time.
-
-	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
-	{
-		if( configGroups[n]->groupName == groupName )
-		{
-			asCConfigGroup *group = configGroups[n];
-
-			// Remove any unused generated template instances 
-			// before verifying if the config group is still in use.
-			// RemoveTemplateInstanceType() checks if the instance is in use
-			for( asUINT g = generatedTemplateTypes.GetLength(); g-- > 0; )
-				RemoveTemplateInstanceType(generatedTemplateTypes[g]);
-
-			// Make sure the group isn't referenced by anyone
-			if( group->refCount > 0 )
-				return asCONFIG_GROUP_IS_IN_USE;
-
-			// Verify if any objects registered in this group is still alive
-			if( group->HasLiveObjects() )
-				return asCONFIG_GROUP_IS_IN_USE;
-
-			// Remove the group from the list
-			if( n == configGroups.GetLength() - 1 )
-				configGroups.PopLast();
-			else
-				configGroups[n] = configGroups.PopLast();
-
-			// Remove the configurations registered with this group
-			group->RemoveConfiguration(this);
-
-			asDELETE(group,asCConfigGroup);
-		}
-	}
-
-	return 0;
-}
-
-asCConfigGroup *asCScriptEngine::FindConfigGroupForFunction(int funcId) const
-{
-	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
-	{
-		// Check global functions
-		asUINT m;
-		for( m = 0; m < configGroups[n]->scriptFunctions.GetLength(); m++ )
-		{
-			if( configGroups[n]->scriptFunctions[m]->id == funcId )
-				return configGroups[n];
-		}
-	}
-
-	return 0;
-}
-
-
-asCConfigGroup *asCScriptEngine::FindConfigGroupForGlobalVar(int gvarId) const
-{
-	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
-	{
-		for( asUINT m = 0; m < configGroups[n]->globalProps.GetLength(); m++ )
-		{
-			if( int(configGroups[n]->globalProps[m]->id) == gvarId )
-				return configGroups[n];
-		}
-	}
-
-	return 0;
-}
-
-asCConfigGroup *asCScriptEngine::FindConfigGroupForTypeInfo(const asCTypeInfo *objType) const
-{
-	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
-	{
-		for( asUINT m = 0; m < configGroups[n]->types.GetLength(); m++ )
-		{
-			if( configGroups[n]->types[m] == objType )
-				return configGroups[n];
-		}
-	}
-
-	return 0;
-}
-
-asCConfigGroup *asCScriptEngine::FindConfigGroupForFuncDef(const asCFuncdefType *funcDef) const
-{
-	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
-	{
-		asCFuncdefType *f = const_cast<asCFuncdefType*>(funcDef);
-		if( configGroups[n]->types.Exists(f) )
-			return configGroups[n];
-	}
-
-	return 0;
-}
-
-// interface
-asDWORD asCScriptEngine::SetDefaultAccessMask(asDWORD defaultMask)
-{
-	asDWORD old = defaultAccessMask;
-	defaultAccessMask = defaultMask;
-	return old;
-}
-
-int asCScriptEngine::GetNextScriptFunctionId()
-{
-	// This function only returns the next function id that
-	// should be used. It doesn't update the internal arrays.
-	if( freeScriptFunctionIds.GetLength() )
-		return freeScriptFunctionIds[freeScriptFunctionIds.GetLength()-1];
-
-	return (int)scriptFunctions.GetLength();
-}
-
-void asCScriptEngine::AddScriptFunction(asCScriptFunction *func)
-{
-	// Update the internal arrays with the function id that is now used
-	if( freeScriptFunctionIds.GetLength() && freeScriptFunctionIds[freeScriptFunctionIds.GetLength()-1] == func->id )
-		freeScriptFunctionIds.PopLast();
-
-	if( asUINT(func->id) == scriptFunctions.GetLength() )
-		scriptFunctions.PushLast(func);
-	else
-	{
-		// The slot should be empty or already set with the function, which happens if an existing shared function is reused
-		asASSERT( scriptFunctions[func->id] == 0 || scriptFunctions[func->id] == func );
-		scriptFunctions[func->id] = func;
-	}
-}
-
-void asCScriptEngine::RemoveScriptFunction(asCScriptFunction *func)
-{
-	if( func == 0 || func->id < 0 ) return;
-	int id = func->id & ~FUNC_IMPORTED;
-	if( func->funcType == asFUNC_IMPORTED )
-	{
-		if( id >= (int)importedFunctions.GetLength() ) return;
-
-		if( importedFunctions[id] )
-		{
-			// Remove the function from the list of script functions
-			if( id == (int)importedFunctions.GetLength() - 1 )
-			{
-				importedFunctions.PopLast();
-			}
-			else
-			{
-				importedFunctions[id] = 0;
-				freeImportedFunctionIdxs.PushLast(id);
-			}
-		}
-	}
-	else
-	{
-		if( id >= (int)scriptFunctions.GetLength() ) return;
-		asASSERT( func == scriptFunctions[id] );
-
-		if( scriptFunctions[id] )
-		{
-			// Remove the function from the list of script functions
-			if( id == (int)scriptFunctions.GetLength() - 1 )
-			{
-				scriptFunctions.PopLast();
-			}
-			else
-			{
-				scriptFunctions[id] = 0;
-				freeScriptFunctionIds.PushLast(id);
-			}
-
-			// Is the function used as signature id?
-			if( func->signatureId == id )
-			{
-				// Remove the signature id
-				signatureIds.RemoveValue(func);
-
-				// Update all functions using the signature id
-				int newSigId = 0;
-				for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
-				{
-					if( scriptFunctions[n] && scriptFunctions[n]->signatureId == id )
-					{
-						if( newSigId == 0 )
-						{
-							newSigId = scriptFunctions[n]->id;
-							signatureIds.PushLast(scriptFunctions[n]);
-						}
-
-						scriptFunctions[n]->signatureId = newSigId;
-					}
-				}
-			}
-		}
-	}
-}
-
-// internal
-void asCScriptEngine::RemoveFuncdef(asCFuncdefType *funcdef)
-{
-	funcDefs.RemoveValue(funcdef);
-}
-
-// interface
-int asCScriptEngine::RegisterFuncdef(const char *decl)
-{
-	if( decl == 0 ) return ConfigError(asINVALID_ARG, "RegisterFuncdef", decl, 0);
-
-	// Parse the function declaration
-	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_FUNCDEF);
-	if( func == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterFuncdef", decl, 0);
-
-	asCBuilder bld(this, 0);
-	asCObjectType *parentClass = 0;
-	int r = bld.ParseFunctionDeclaration(0, decl, func, false, 0, 0, defaultNamespace, 0, &parentClass);
-	if( r < 0 )
-	{
-		// Set as dummy function before deleting
-		func->funcType = asFUNC_DUMMY;
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asINVALID_DECLARATION, "RegisterFuncdef", decl, 0);
-	}
-
-	// Check name conflicts
-	r = bld.CheckNameConflict(func->name.AddressOf(), 0, 0, defaultNamespace);
-	if( r < 0 )
-	{
-		asDELETE(func,asCScriptFunction);
-		return ConfigError(asNAME_TAKEN, "RegisterFuncdef", decl, 0);
-	}
-
-	func->id = GetNextScriptFunctionId();
-	AddScriptFunction(func);
-
-	asCFuncdefType *fdt = asNEW(asCFuncdefType)(this, func);
-	funcDefs.PushLast(fdt); // doesn't increase refcount
-	registeredFuncDefs.PushLast(fdt); // doesn't increase refcount
-	allRegisteredTypes.Insert(asSNameSpaceNamePair(fdt->nameSpace, fdt->name), fdt); // constructor already set the ref count to 1
-
-	currentGroup->types.PushLast(fdt);
-	if (parentClass)
-	{
-		parentClass->childFuncDefs.PushLast(fdt);
-		fdt->parentClass = parentClass;
-
-		// Check if the method restricts that use of the template to value types or reference types
-		if (parentClass->flags & asOBJ_TEMPLATE)
-		{
-			r = SetTemplateRestrictions(parentClass, func, "RegisterFuncdef", decl);
-			if (r < 0)
-				return r;
-		}
-	}
-
-	// If parameter type from other groups are used, add references
-	currentGroup->AddReferencesForFunc(this, func);
-
-	// Return the function id as success
-	return func->id;
-}
-
-// interface
-asUINT asCScriptEngine::GetFuncdefCount() const
-{
-	return asUINT(registeredFuncDefs.GetLength());
-}
-
-// interface
-asITypeInfo *asCScriptEngine::GetFuncdefByIndex(asUINT index) const
-{
-	if( index >= registeredFuncDefs.GetLength() )
-		return 0;
-
-	return registeredFuncDefs[index];
-}
-
-// internal
-asCFuncdefType *asCScriptEngine::FindMatchingFuncdef(asCScriptFunction *func, asCModule *module)
-{
-	asCFuncdefType *funcDef = func->funcdefType;
-
-	if (funcDef == 0)
-	{
-		// Check if there is any matching funcdefs already in the engine that can be reused
-		for (asUINT n = 0; n < funcDefs.GetLength(); n++)
-		{
-			if (funcDefs[n]->funcdef->IsSignatureExceptNameEqual(func))
-			{
-				if (func->isShared && !funcDefs[n]->funcdef->isShared)
-					continue;
-				funcDef = funcDefs[n];
-				break;
-			}
-		}
-	}
-
-	if (funcDef == 0)
-	{
-		// Create a matching funcdef
-		asCScriptFunction *fd = asNEW(asCScriptFunction)(this, 0, asFUNC_FUNCDEF);
-		fd->name = func->name;
-		fd->nameSpace = func->nameSpace;
-		fd->isShared = func->isShared;
-
-		fd->returnType = func->returnType;
-		fd->parameterTypes = func->parameterTypes;
-		fd->inOutFlags = func->inOutFlags;
-
-		funcDef = asNEW(asCFuncdefType)(this, fd);
-		funcDefs.PushLast(funcDef); // doesn't increase the refCount
-
-		fd->id = GetNextScriptFunctionId();
-		AddScriptFunction(fd);
-
-		if (module)
-		{
-			// Add the new funcdef to the module so it will 
-			// be available when saving the bytecode
-			funcDef->module = module;
-			module->funcDefs.PushLast(funcDef); // the refCount was already accounted for in the constructor
-		}
-
-		// Observe, if the funcdef is created without informing a module a reference will be stored in the
-		// engine's funcDefs array, but it will not be owned by any module. This means that it will live on
-		// until the engine is released.
-	}
-
-	if (funcDef && module && funcDef->module && funcDef->module != module)
-	{
-		// Unless this is a registered funcDef the returned funcDef must 
-		// be stored as part of the module for saving/loading bytecode
-		if (!module->funcDefs.Exists(funcDef))
-		{
-			module->funcDefs.PushLast(funcDef);
-			funcDef->AddRefInternal();
-		}
-		else
-		{
-			asASSERT(funcDef->IsShared());
-		}
-	}
-
-	return funcDef;
-}
-
-// interface
-// TODO: typedef: Accept complex types for the typedefs
-int asCScriptEngine::RegisterTypedef(const char *type, const char *decl)
-{
-	if( type == 0 ) return ConfigError(asINVALID_NAME, "RegisterTypedef", type, decl);
-
-	// Verify if the name has been registered as a type already
-	// TODO: Must check against registered funcdefs too
-	if( GetRegisteredType(type, defaultNamespace) )
-		// Let the application recover from this error, for example if the same typedef is registered twice
-		return asALREADY_REGISTERED;
-
-	// Grab the data type
-	size_t tokenLen;
-	eTokenType token;
-	asCDataType dataType;
-
-	//	Create the data type
-	token = tok.GetToken(decl, strlen(decl), &tokenLen);
-	switch(token)
-	{
-	case ttBool:
-	case ttInt:
-	case ttInt8:
-	case ttInt16:
-	case ttInt64:
-	case ttUInt:
-	case ttUInt8:
-	case ttUInt16:
-	case ttUInt64:
-	case ttFloat:
-	case ttDouble:
-		if( strlen(decl) != tokenLen )
-		{
-			return ConfigError(asINVALID_TYPE, "RegisterTypedef", type, decl);
-		}
-		break;
-
-	default:
-		return ConfigError(asINVALID_TYPE, "RegisterTypedef", type, decl);
-	}
-
-	dataType = asCDataType::CreatePrimitive(token, false);
-
-	// Make sure the name is not a reserved keyword
-	token = tok.GetToken(type, strlen(type), &tokenLen);
-	if( token != ttIdentifier || strlen(type) != tokenLen )
-		return ConfigError(asINVALID_NAME, "RegisterTypedef", type, decl);
-
-	asCBuilder bld(this, 0);
-	int r = bld.CheckNameConflict(type, 0, 0, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(asNAME_TAKEN, "RegisterTypedef", type, decl);
-
-	// Don't have to check against members of object
-	// types as they are allowed to use the names
-
-	// Put the data type in the list
-	asCTypedefType *td = asNEW(asCTypedefType)(this);
-	if( td == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterTypedef", type, decl);
-
-	td->flags           = asOBJ_TYPEDEF;
-	td->size            = dataType.GetSizeInMemoryBytes();
-	td->name            = type;
-	td->nameSpace       = defaultNamespace;
-	td->aliasForType    = dataType;
-
-	allRegisteredTypes.Insert(asSNameSpaceNamePair(td->nameSpace, td->name), td);
-	registeredTypeDefs.PushLast(td);
-
-	currentGroup->types.PushLast(td);
-
-	return asSUCCESS;
-}
-
-// interface
-asUINT asCScriptEngine::GetTypedefCount() const
-{
-	return asUINT(registeredTypeDefs.GetLength());
-}
-
-// interface
-asITypeInfo *asCScriptEngine::GetTypedefByIndex(asUINT index) const
-{
-	if( index >= registeredTypeDefs.GetLength() )
-		return 0;
-
-	return registeredTypeDefs[index];
-}
-
-// interface
-int asCScriptEngine::RegisterEnum(const char *name)
-{
-	//	Check the name
-	if( NULL == name )
-		return ConfigError(asINVALID_NAME, "RegisterEnum", name, 0);
-
-	// Verify if the name has been registered as a type already
-	if( GetRegisteredType(name, defaultNamespace) )
-		return asALREADY_REGISTERED;
-
-	// Use builder to parse the datatype
-	asCDataType dt;
-	asCBuilder bld(this, 0);
-	bool oldMsgCallback = msgCallback; msgCallback = false;
-	int r = bld.ParseDataType(name, &dt, defaultNamespace);
-	msgCallback = oldMsgCallback;
-	if( r >= 0 )
-	{
-		// If it is not in the defaultNamespace then the type was successfully parsed because
-		// it is declared in a parent namespace which shouldn't be treated as an error
-		if( dt.GetTypeInfo() && dt.GetTypeInfo()->nameSpace == defaultNamespace )
-			return ConfigError(asERROR, "RegisterEnum", name, 0);
-	}
-
-	// Make sure the name is not a reserved keyword
-	size_t tokenLen;
-	int token = tok.GetToken(name, strlen(name), &tokenLen);
-	if( token != ttIdentifier || strlen(name) != tokenLen )
-		return ConfigError(asINVALID_NAME, "RegisterEnum", name, 0);
-
-	r = bld.CheckNameConflict(name, 0, 0, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(asNAME_TAKEN, "RegisterEnum", name, 0);
-
-	asCEnumType *st = asNEW(asCEnumType)(this);
-	if( st == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterEnum", name, 0);
-
-	asCDataType dataType;
-	dataType.CreatePrimitive(ttInt, false);
-
-	st->flags = asOBJ_ENUM | asOBJ_SHARED;
-	st->size = 4;
-	st->name = name;
-	st->nameSpace = defaultNamespace;
-
-	allRegisteredTypes.Insert(asSNameSpaceNamePair(st->nameSpace, st->name), st);
-	registeredEnums.PushLast(st);
-
-	currentGroup->types.PushLast(st);
-
-	return asSUCCESS;
-}
-
-// interface
-int asCScriptEngine::RegisterEnumValue(const char *typeName, const char *valueName, int value)
-{
-	// Verify that the correct config group is used
-	if( currentGroup->FindType(typeName) == 0 )
-		return ConfigError(asWRONG_CONFIG_GROUP, "RegisterEnumValue", typeName, valueName);
-
-	asCDataType dt;
-	int r;
-	asCBuilder bld(this, 0);
-	r = bld.ParseDataType(typeName, &dt, defaultNamespace);
-	if( r < 0 )
-		return ConfigError(r, "RegisterEnumValue", typeName, valueName);
-
-	// Store the enum value
-	asCEnumType *ot = dt.GetTypeInfo()->CastToEnumType();
-	if( ot == 0 )
-		return ConfigError(asINVALID_TYPE, "RegisterEnumValue", typeName, valueName);
-
-	if( NULL == valueName )
-		return ConfigError(asINVALID_NAME, "RegisterEnumValue", typeName, valueName);
-
-	asUINT tokenLen = 0;
-	asETokenClass tokenClass = ParseToken(valueName, 0, &tokenLen);
-	if( tokenClass != asTC_IDENTIFIER || tokenLen != strlen(valueName) )
-		return ConfigError(asINVALID_NAME, "RegisterEnumValue", typeName, valueName);
-
-	for( unsigned int n = 0; n < ot->enumValues.GetLength(); n++ )
-	{
-		if( ot->enumValues[n]->name == valueName )
-			return ConfigError(asALREADY_REGISTERED, "RegisterEnumValue", typeName, valueName);
-	}
-
-	asSEnumValue *e = asNEW(asSEnumValue);
-	if( e == 0 )
-		return ConfigError(asOUT_OF_MEMORY, "RegisterEnumValue", typeName, valueName);
-
-	e->name = valueName;
-	e->value = value;
-
-	ot->enumValues.PushLast(e);
-
-	return asSUCCESS;
-}
-
-// interface
-asUINT asCScriptEngine::GetEnumCount() const
-{
-	return registeredEnums.GetLength();
-}
-
-// interface
-asITypeInfo *asCScriptEngine::GetEnumByIndex(asUINT index) const
-{
-	if( index >= registeredEnums.GetLength() )
-		return 0;
-
-	return registeredEnums[index];
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-int asCScriptEngine::GetEnumValueCount(int enumTypeId) const
-{
-	asITypeInfo *ti = GetTypeInfoById(enumTypeId);
-	asCEnumType *e = reinterpret_cast<asCTypeInfo*>(ti)->CastToEnumType();
-	if (e == 0)
-		return asINVALID_TYPE;
-
-	return e->GetEnumValueCount();
-}
-#endif
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-const char *asCScriptEngine::GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const
-{
-	asITypeInfo *ti = GetTypeInfoById(enumTypeId);
-	asCEnumType *e = reinterpret_cast<asCTypeInfo*>(ti)->CastToEnumType();
-	if (e == 0)
-		return 0;
-
-	return e->GetEnumValueByIndex(index, outValue);
-}
-#endif
-
-// interface
-asUINT asCScriptEngine::GetObjectTypeCount() const
-{
-	return asUINT(registeredObjTypes.GetLength());
-}
-
-// interface
-asITypeInfo *asCScriptEngine::GetObjectTypeByIndex(asUINT index) const
-{
-	if( index >= registeredObjTypes.GetLength() )
-		return 0;
-
-	return registeredObjTypes[index];
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-asITypeInfo *asCScriptEngine::GetObjectTypeByName(const char *name) const
-{
-	asITypeInfo *ti = GetTypeInfoByName(name);
-	return reinterpret_cast<asCTypeInfo*>(ti)->CastToObjectType();
-}
-#endif
-
-// interface
-asITypeInfo *asCScriptEngine::GetTypeInfoByName(const char *name) const
-{
-	asSNameSpace *ns = defaultNamespace;
-	while (ns)
-	{
-		// Check the object types
-		for (asUINT n = 0; n < registeredObjTypes.GetLength(); n++)
-		{
-			if (registeredObjTypes[n]->name == name &&
-				registeredObjTypes[n]->nameSpace == ns)
-				return registeredObjTypes[n];
-		}
-
-		// Perhaps it is a template type? In this case
-		// the returned type will be the generic type
-		for (asUINT n = 0; n < registeredTemplateTypes.GetLength(); n++)
-		{
-			if (registeredTemplateTypes[n]->name == name &&
-				registeredTemplateTypes[n]->nameSpace == ns)
-				return registeredTemplateTypes[n];
-		}
-
-		// Check the enum types
-		for (asUINT n = 0; n < registeredEnums.GetLength(); n++)
-		{
-			if (registeredEnums[n]->name == name &&
-				registeredEnums[n]->nameSpace == ns)
-				return registeredEnums[n];
-		}
-
-		// Check the typedefs
-		for (asUINT n = 0; n < registeredTypeDefs.GetLength();n++)
-		{
-			if (registeredTypeDefs[n]->name == name &&
-				registeredTypeDefs[n]->nameSpace == ns)
-				return registeredTypeDefs[n];
-		}
-
-		// Recursively search parent namespace
-		ns = GetParentNameSpace(ns);
-	}
-
-	return 0;
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-asITypeInfo *asCScriptEngine::GetObjectTypeById(int typeId) const
-{
-	asITypeInfo *ti = GetTypeInfoById(typeId);
-	return reinterpret_cast<asCTypeInfo*>(ti)->CastToObjectType();
-}
-#endif
-
-// interface
-asITypeInfo *asCScriptEngine::GetTypeInfoById(int typeId) const
-{
-	asCDataType dt = GetDataTypeFromTypeId(typeId);
-
-	// Is the type id valid?
-	if (!dt.IsValid()) return 0;
-
-	return dt.GetTypeInfo();
-}
-
-// interface
-asIScriptFunction *asCScriptEngine::GetFunctionById(int funcId) const
-{
-	return GetScriptFunction(funcId);
-}
-
-#ifdef AS_DEPRECATED
-// deprecated since 2.31.0, 2016-01-01
-// interface
-asIScriptFunction *asCScriptEngine::GetFuncdefFromTypeId(int typeId) const
-{
-	asCFuncdefType *t = GetDataTypeFromTypeId(typeId).GetTypeInfo()->CastToFuncdefType();
-	if (t)
-		return t->funcdef;
-	return 0;
-}
-#endif
-
-// internal
-bool asCScriptEngine::IsTemplateType(const char *name) const
-{
-	// Only look in the list of template types (not instance types)
-	for( unsigned int n = 0; n < registeredTemplateTypes.GetLength(); n++ )
-	{
-		asCObjectType *type = registeredTemplateTypes[n];
-		if( type && type->name == name )
-			return true;
-	}
-
-	return false;
-}
-
-// internal
-int asCScriptEngine::AddConstantString(const char *str, size_t len)
-{
-	// This is only called when build a script module, so it is
-	// known that only one thread can enter the function at a time.
-	asASSERT( isBuilding );
-
-	// The str may contain null chars, so we cannot use strlen, or strcmp, or strcpy
-
-	// Has the string been registered before?
-	asSMapNode<asCStringPointer, int> *cursor = 0;
-	if (stringToIdMap.MoveTo(&cursor, asCStringPointer(str, len)))
-		return cursor->value;
-
-	// No match was found, add the string
-	asCString *cstr = asNEW(asCString)(str, len);
-	if( cstr )
-	{
-		stringConstants.PushLast(cstr);
-		int index = (int)stringConstants.GetLength() - 1;
-		stringToIdMap.Insert(asCStringPointer(cstr), index);
-
-		// The VM currently doesn't handle string ids larger than 65535
-		asASSERT(stringConstants.GetLength() <= 65536);
-
-		return index;
-	}
-
-	return 0;
-}
-
-// internal
-const asCString &asCScriptEngine::GetConstantString(int id)
-{
-	return *stringConstants[id];
-}
-
-// internal
-int asCScriptEngine::GetScriptSectionNameIndex(const char *name)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	// TODO: These names are only released when the engine is freed. The assumption is that
-	//       the same script section names will be reused instead of there always being new
-	//       names. Is this assumption valid? Do we need to add reference counting?
-
-	// Store the script section names for future reference
-	for( asUINT n = 0; n < scriptSectionNames.GetLength(); n++ )
-	{
-		if( scriptSectionNames[n]->Compare(name) == 0 )
-		{
-			RELEASEEXCLUSIVE(engineRWLock);
-			return n;
-		}
-	}
-
-	asCString *str = asNEW(asCString)(name);
-	if( str )
-		scriptSectionNames.PushLast(str);
-	int r = int(scriptSectionNames.GetLength()-1);
-
-	RELEASEEXCLUSIVE(engineRWLock);
-
-	return r;
-}
-
-// interface
-void asCScriptEngine::SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	for( asUINT n = 0; n < cleanEngineFuncs.GetLength(); n++ )
-	{
-		if( cleanEngineFuncs[n].type == type )
-		{
-			cleanEngineFuncs[n].cleanFunc = callback;
-
-			RELEASEEXCLUSIVE(engineRWLock);
-
-			return;
-		}
-	}
-	SEngineClean otc = {type, callback};
-	cleanEngineFuncs.PushLast(otc);
-
-	RELEASEEXCLUSIVE(engineRWLock);
-}
-
-// interface
-void asCScriptEngine::SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	for( asUINT n = 0; n < cleanModuleFuncs.GetLength(); n++ )
-	{
-		if( cleanModuleFuncs[n].type == type )
-		{
-			cleanModuleFuncs[n].cleanFunc = callback;
-
-			RELEASEEXCLUSIVE(engineRWLock);
-
-			return;
-		}
-	}
-	SModuleClean otc = {type, callback};
-	cleanModuleFuncs.PushLast(otc);
-
-	RELEASEEXCLUSIVE(engineRWLock);
-}
-
-// interface
-void asCScriptEngine::SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	for( asUINT n = 0; n < cleanContextFuncs.GetLength(); n++ )
-	{
-		if( cleanContextFuncs[n].type == type )
-		{
-			cleanContextFuncs[n].cleanFunc = callback;
-
-			RELEASEEXCLUSIVE(engineRWLock);
-
-			return;
-		}
-	}
-	SContextClean otc = {type, callback};
-	cleanContextFuncs.PushLast(otc);
-
-	RELEASEEXCLUSIVE(engineRWLock);
-}
-
-// interface
-void asCScriptEngine::SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	for( asUINT n = 0; n < cleanFunctionFuncs.GetLength(); n++ )
-	{
-		if( cleanFunctionFuncs[n].type == type )
-		{
-			cleanFunctionFuncs[n].cleanFunc = callback;
-
-			RELEASEEXCLUSIVE(engineRWLock);
-
-			return;
-		}
-	}
-	SFunctionClean otc = {type, callback};
-	cleanFunctionFuncs.PushLast(otc);
-
-	RELEASEEXCLUSIVE(engineRWLock);
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2.31.0, 2015-12-06
-// interface
-void asCScriptEngine::SetObjectTypeUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type)
-{
-	SetTypeInfoUserDataCleanupCallback(callback, type);
-}
-#endif
-
-// interface
-void asCScriptEngine::SetTypeInfoUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	for( asUINT n = 0; n < cleanTypeInfoFuncs.GetLength(); n++ )
-	{
-		if( cleanTypeInfoFuncs[n].type == type )
-		{
-			cleanTypeInfoFuncs[n].cleanFunc = callback;
-
-			RELEASEEXCLUSIVE(engineRWLock);
-
-			return;
-		}
-	}
-	STypeInfoClean otc = {type, callback};
-	cleanTypeInfoFuncs.PushLast(otc);
-
-	RELEASEEXCLUSIVE(engineRWLock);
-}
-
-// interface
-void asCScriptEngine::SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type)
-{
-	ACQUIREEXCLUSIVE(engineRWLock);
-
-	for( asUINT n = 0; n < cleanScriptObjectFuncs.GetLength(); n++ )
-	{
-		if( cleanScriptObjectFuncs[n].type == type )
-		{
-			cleanScriptObjectFuncs[n].cleanFunc = callback;
-
-			RELEASEEXCLUSIVE(engineRWLock);
-
-			return;
-		}
-	}
-	SScriptObjClean soc = {type, callback};
-	cleanScriptObjectFuncs.PushLast(soc);
-
-	RELEASEEXCLUSIVE(engineRWLock);
-}
-
-// internal
-asCObjectType *asCScriptEngine::GetListPatternType(int listPatternFuncId)
-{
-	// Get the object type either from the constructor's object for value types
-	// or from the factory's return type for reference types
-	asCObjectType *ot = scriptFunctions[listPatternFuncId]->objectType;
-	if( ot == 0 )
-		ot = scriptFunctions[listPatternFuncId]->returnType.GetTypeInfo()->CastToObjectType();
-	asASSERT( ot );
-
-	// Check if this object type already has a list pattern type
-	for( asUINT n = 0; n < listPatternTypes.GetLength(); n++ )
-	{
-		if( listPatternTypes[n]->templateSubTypes[0].GetTypeInfo() == ot )
-			return listPatternTypes[n];
-	}
-
-	// Create a new list pattern type for the given object type
-	asCObjectType *lpt = asNEW(asCObjectType)(this);
-	lpt->templateSubTypes.PushLast(asCDataType::CreateType(ot, false));
-	lpt->flags = asOBJ_LIST_PATTERN;
-	listPatternTypes.PushLast(lpt);
-
-	return lpt;
-}
-
-// internal
-void asCScriptEngine::DestroyList(asBYTE *buffer, const asCObjectType *listPatternType)
-{
-	asASSERT( listPatternType && (listPatternType->flags & asOBJ_LIST_PATTERN) );
-
-	// Get the list pattern from the listFactory function
-	// TODO: runtime optimize: Store the used list factory in the listPatternType itself
-	// TODO: runtime optimize: Keep a flag to indicate if there is really a need to free anything
-	asCObjectType *ot = listPatternType->templateSubTypes[0].GetTypeInfo()->CastToObjectType();
-	asCScriptFunction *listFactory = scriptFunctions[ot->beh.listFactory];
-	asASSERT( listFactory );
-
-	asSListPatternNode *node = listFactory->listPattern;
-	DestroySubList(buffer, node);
-
-	asASSERT( node->type == asLPT_END );
-}
-
-// internal
-void asCScriptEngine::DestroySubList(asBYTE *&buffer, asSListPatternNode *&node)
-{
-	asASSERT( node->type == asLPT_START );
-
-	int count = 0;
-
-	node = node->next;
-	while( node )
-	{
-		if( node->type == asLPT_REPEAT || node->type == asLPT_REPEAT_SAME )
-		{
-			// Align the offset to 4 bytes boundary
-			if( (asPWORD(buffer) & 0x3) )
-				buffer += 4 - (asPWORD(buffer) & 0x3);
-
-			// Determine how many times the pattern repeat
-			count = *(asUINT*)buffer;
-			buffer += 4;
-
-			if( count == 0 )
-			{
-				// Skip the sub pattern that was expected to be repeated, otherwise
-				// we'll try to delete things that don't exist in the buffer
-				node = node->next;
-				if( node->type == asLPT_START )
-				{
-					int subCount = 1;
-					do
-					{
-						node = node->next;
-						if( node->type == asLPT_START )
-							subCount++;
-						else if( node->type == asLPT_END )
-							subCount--;
-					} while( subCount > 0 );
-					return;
-				}
-			}
-		}
-		else if( node->type == asLPT_TYPE )
-		{
-			// If we're not in a repeat iteration, then only 1 value should be destroyed
-			if( count <= 0 )
-				count = 1;
-
-			asCDataType dt = reinterpret_cast<asSListPatternDataTypeNode*>(node)->dataType;
-			bool isVarType = dt.GetTokenType() == ttQuestion;
-
-			while( count-- )
-			{
-				if( isVarType )
-				{
-					// Align the offset to 4 bytes boundary
-					if( (asPWORD(buffer) & 0x3) )
-						buffer += 4 - (asPWORD(buffer) & 0x3);
-
-					int typeId = *(int*)buffer;
-					buffer += 4;
-					dt = GetDataTypeFromTypeId(typeId);
-				}
-
-				asCTypeInfo *ti = dt.GetTypeInfo();
-				if( ti && (ti->flags & asOBJ_ENUM) == 0 )
-				{
-					// Free all instances of this type
-					if( ti->flags & asOBJ_VALUE )
-					{
-						asUINT size = ti->GetSize();
-
-						// Align the offset to 4 bytes boundary
-						if( size >= 4 && (asPWORD(buffer) & 0x3) )
-							buffer += 4 - (asPWORD(buffer) & 0x3);
-
-						asCObjectType *ot = ti->CastToObjectType();
-						if( ot && ot->beh.destruct )
-						{
-							// Only call the destructor if the object has been created
-							// We'll assume the object has been created if any byte in
-							// the memory is different from 0.
-							// TODO: This is not really correct, as bytes may have been
-							//       modified by the constructor, but then an exception
-							//       thrown aborting the initialization. The engine
-							//       really should be keeping track of which objects has
-							//       been successfully initialized.
-
-							for( asUINT n = 0; n < size; n++ )
-							{
-								if( buffer[n] != 0 )
-								{
-									void *ptr = (void*)buffer;
-									CallObjectMethod(ptr, ot->beh.destruct);
-									break;
-								}
-							}
-						}
-
-						// Advance the pointer in the buffer
-						buffer += size;
-					}
-					else
-					{
-						// Align the offset to 4 bytes boundary
-						if( asPWORD(buffer) & 0x3 )
-							buffer += 4 - (asPWORD(buffer) & 0x3);
-
-						// Call the release behaviour
-						void *ptr = *(void**)buffer;
-						if( ptr )
-							ReleaseScriptObject(ptr, ti);
-						buffer += AS_PTR_SIZE*4;
-					}
-				}
-				else
-				{
-					asUINT size = dt.GetSizeInMemoryBytes();
-
-					// Align the offset to 4 bytes boundary
-					if( size >= 4 && (asPWORD(buffer) & 0x3) )
-						buffer += 4 - (asPWORD(buffer) & 0x3);
-
-					// Advance the buffer
-					buffer += size;
-				}
-			}
-		}
-		else if( node->type == asLPT_START )
-		{
-			// If we're not in a repeat iteration, then only 1 value should be destroyed
-			if( count <= 0 )
-				count = 1;
-
-			while( count-- )
-			{
-				asSListPatternNode *subList = node;
-				DestroySubList(buffer, subList);
-
-				asASSERT( subList->type == asLPT_END );
-
-				if( count == 0 )
-					node = subList;
-			}
-		}
-		else if( node->type == asLPT_END )
-		{
-			return;
-		}
-		else
-		{
-			asASSERT( false );
-		}
-
-		node = node->next;
-	}
-}
-
-// internal
-asSNameSpace *asCScriptEngine::GetParentNameSpace(asSNameSpace *ns) const
-{
-	if( ns == 0 ) return 0;
-	if( ns == nameSpaces[0] ) return 0;
-
-	asCString scope = ns->name;
-	int pos = scope.FindLast("::");
-	if( pos >= 0 )
-	{
-		scope = scope.SubString(0, pos);
-		return FindNameSpace(scope.AddressOf());
-	}
-
-	return nameSpaces[0];
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptengine.cpp
+//
+// The implementation of the script engine interface
+//
+
+
+#include <stdlib.h>
+
+#include "as_config.h"
+#include "as_scriptengine.h"
+#include "as_builder.h"
+#include "as_context.h"
+#include "as_string_util.h"
+#include "as_tokenizer.h"
+#include "as_texts.h"
+#include "as_module.h"
+#include "as_callfunc.h"
+#include "as_generic.h"
+#include "as_scriptobject.h"
+#include "as_compiler.h"
+#include "as_bytecode.h"
+#include "as_debug.h"
+
+BEGIN_AS_NAMESPACE
+
+
+
+#ifdef AS_PROFILE
+// Instantiate the profiler once
+CProfiler g_profiler;
+#endif
+
+
+
+
+extern "C"
+{
+
+AS_API const char * asGetLibraryVersion()
+{
+#ifdef _DEBUG
+	return ANGELSCRIPT_VERSION_STRING " DEBUG";
+#else
+	return ANGELSCRIPT_VERSION_STRING;
+#endif
+}
+
+AS_API const char * asGetLibraryOptions()
+{
+	const char *string = " "
+
+	// Options
+#ifdef AS_MAX_PORTABILITY
+		"AS_MAX_PORTABILITY "
+#endif
+#ifdef AS_DEBUG
+		"AS_DEBUG "
+#endif
+#ifdef AS_NO_CLASS_METHODS
+		"AS_NO_CLASS_METHODS "
+#endif
+#ifdef AS_USE_DOUBLE_AS_FLOAT
+		"AS_USE_DOUBLE_AS_FLOAT "
+#endif
+#ifdef AS_64BIT_PTR
+		"AS_64BIT_PTR "
+#endif
+#ifdef AS_NO_THREADS
+		"AS_NO_THREADS "
+#endif
+#ifdef AS_NO_ATOMIC
+		"AS_NO_ATOMIC "
+#endif
+#ifdef AS_NO_COMPILER
+		"AS_NO_COMPILER "
+#endif
+#ifdef AS_NO_MEMBER_INIT
+		"AS_NO_MEMBER_INIT "
+#endif
+#ifdef AS_NO_THISCALL_FUNCTOR_METHOD
+		"AS_NO_THISCALL_FUNCTOR_METHOD "
+#endif
+#ifdef AS_NO_EXCEPTIONS
+		"AS_NO_EXCEPTIONS "
+#endif
+#ifdef WIP_16BYTE_ALIGN
+		"WIP_16BYTE_ALIGN "
+#endif
+#ifdef AS_BIG_ENDIAN
+		"AS_BIG_ENDIAN "
+#endif
+
+	// Target system
+#ifdef AS_WIN
+		"AS_WIN "
+#endif
+#ifdef AS_LINUX
+		"AS_LINUX "
+#endif
+#ifdef AS_MAC
+		"AS_MAC "
+#endif
+#ifdef AS_SUN
+		"AS_SUN "
+#endif
+#ifdef AS_BSD
+		"AS_BSD "
+#endif
+#ifdef AS_XBOX
+		"AS_XBOX "
+#endif
+#ifdef AS_XBOX360
+		"AS_XBOX360 "
+#endif
+#ifdef AS_PSP
+		"AS_PSP "
+#endif
+#ifdef AS_PS2
+		"AS_PS2 "
+#endif
+#ifdef AS_PS3
+		"AS_PS3 "
+#endif
+#ifdef AS_PSVITA
+		"AS_PSVITA "
+#endif
+#ifdef AS_DC
+		"AS_DC "
+#endif
+#ifdef AS_GC
+		"AS_GC "
+#endif
+#ifdef AS_WII
+		"AS_WII "
+#endif
+#ifdef AS_WIIU
+		"AS_WIIU "
+#endif
+#ifdef AS_IPHONE
+		"AS_IPHONE "
+#endif
+#ifdef AS_ANDROID
+		"AS_ANDROID "
+#endif
+#ifdef AS_HAIKU
+		"AS_HAIKU "
+#endif
+#ifdef AS_ILLUMOS
+		"AS_ILLUMOS "
+#endif
+#ifdef AS_MARMALADE
+		"AS_MARMALADE "
+#endif
+
+
+	// CPU family
+#ifdef AS_PPC
+		"AS_PPC "
+#endif
+#ifdef AS_PPC_64
+		"AS_PPC_64 "
+#endif
+#ifdef AS_X86
+		"AS_X86 "
+#endif
+#ifdef AS_MIPS
+		"AS_MIPS "
+#endif
+#ifdef AS_SH4
+		"AS_SH4 "
+#endif
+#ifdef AS_XENON
+		"AS_XENON "
+#endif
+#ifdef AS_ARM
+		"AS_ARM "
+#endif
+#ifdef AS_SOFTFP
+		"AS_SOFTFP "
+#endif
+#ifdef AS_X64_GCC
+		"AS_X64_GCC "
+#endif
+#ifdef AS_X64_MSVC
+		"AS_X64_MSVC "
+#endif
+#ifdef AS_SPARC
+		"AS_SPARC "
+#endif
+#ifdef AS_ARM64
+		"AS_ARM64 "
+#endif
+	;
+
+	return string;
+}
+
+AS_API asIScriptEngine *asCreateScriptEngine(asDWORD version)
+{
+	// Verify the version that the application expects
+	if( (version/10000) != (ANGELSCRIPT_VERSION/10000) )
+		return 0;
+
+	if( (version/100)%100 != (ANGELSCRIPT_VERSION/100)%100 )
+		return 0;
+
+	if( (version%100) > (ANGELSCRIPT_VERSION%100) )
+		return 0;
+
+	// Verify the size of the types
+	asASSERT( sizeof(asBYTE)  == 1 );
+	asASSERT( sizeof(asWORD)  == 2 );
+	asASSERT( sizeof(asDWORD) == 4 );
+	asASSERT( sizeof(asQWORD) == 8 );
+	asASSERT( sizeof(asPWORD) == sizeof(void*) );
+
+	// Verify the boolean type
+	asASSERT( sizeof(bool) == AS_SIZEOF_BOOL );
+	asASSERT( true == VALUE_OF_BOOLEAN_TRUE );
+
+	// Verify endianess
+#ifdef AS_BIG_ENDIAN
+	asDWORD dw = 0x00010203;
+	asQWORD qw = ((asQWORD(0x00010203)<<32)|asQWORD(0x04050607));
+#else
+	asDWORD dw = 0x03020100;
+	// C++ didn't have a standard way of declaring 64bit literal constants until C++11, so
+	// I'm forced to do it like this to avoid compilers warnings when compiling with the full
+	// C++ compliance.
+	asQWORD qw = ((asQWORD(0x07060504)<<32)|asQWORD(0x03020100));
+#endif
+	asASSERT( memcmp("\x00\x01\x02\x03", &dw, 4) == 0 );
+	asASSERT( memcmp("\x00\x01\x02\x03\x04\x05\x06\x07", &qw, 8) == 0 );
+	UNUSED_VAR(dw);
+	UNUSED_VAR(qw);
+
+	return asNEW(asCScriptEngine)();
+}
+
+} // extern "C"
+
+
+// interface
+int asCScriptEngine::SetEngineProperty(asEEngineProp property, asPWORD value)
+{
+	switch( property )
+	{
+	case asEP_ALLOW_UNSAFE_REFERENCES:
+		ep.allowUnsafeReferences = value ? true : false;
+		break;
+
+	case asEP_OPTIMIZE_BYTECODE:
+		ep.optimizeByteCode = value ? true : false;
+		break;
+
+	case asEP_COPY_SCRIPT_SECTIONS:
+		ep.copyScriptSections = value ? true : false;
+		break;
+
+	case asEP_MAX_STACK_SIZE:
+		if( value == 0 )
+		{
+			// Restore default: no limit and initially size 4KB
+			ep.maximumContextStackSize = 0;
+		}
+		else
+		{
+			// The size is given in bytes, but we only store dwords
+			ep.maximumContextStackSize = (asUINT)value/4;
+		}
+		break;
+
+	case asEP_INIT_STACK_SIZE:
+		if (value < 4)
+		{
+			// At least one dword
+			ep.initContextStackSize = 1;
+		}
+		else
+		{
+			// The size is given in bytes, but we only store dwords
+			ep.initContextStackSize = (asUINT)value / 4;
+		}
+		break;
+
+	case asEP_USE_CHARACTER_LITERALS:
+		ep.useCharacterLiterals = value ? true : false;
+		break;
+
+	case asEP_ALLOW_MULTILINE_STRINGS:
+		ep.allowMultilineStrings = value ? true : false;
+		break;
+
+	case asEP_ALLOW_IMPLICIT_HANDLE_TYPES:
+		ep.allowImplicitHandleTypes = value ? true : false;
+		break;
+
+	case asEP_BUILD_WITHOUT_LINE_CUES:
+		ep.buildWithoutLineCues = value ? true : false;
+		break;
+
+	case asEP_INIT_GLOBAL_VARS_AFTER_BUILD:
+		ep.initGlobalVarsAfterBuild = value ? true : false;
+		break;
+
+	case asEP_REQUIRE_ENUM_SCOPE:
+		ep.requireEnumScope = value ? true : false;
+		break;
+
+	case asEP_SCRIPT_SCANNER:
+		if( value <= 1 )
+			ep.scanner = (int)value;
+		else
+			return asINVALID_ARG;
+		break;
+
+	case asEP_INCLUDE_JIT_INSTRUCTIONS:
+		ep.includeJitInstructions = value ? true : false;
+		break;
+
+	case asEP_STRING_ENCODING:
+		if( value <= 1 )
+			ep.stringEncoding = (int)value;
+		else
+			return asINVALID_ARG;
+		break;
+
+	case asEP_PROPERTY_ACCESSOR_MODE:
+		if( value <= 3 )
+			ep.propertyAccessorMode = (int)value;
+		else
+			return asINVALID_ARG;
+		break;
+
+	case asEP_EXPAND_DEF_ARRAY_TO_TMPL:
+		ep.expandDefaultArrayToTemplate = value ? true : false;
+		break;
+
+	case asEP_AUTO_GARBAGE_COLLECT:
+		ep.autoGarbageCollect = value ? true : false;
+		break;
+
+	case asEP_DISALLOW_GLOBAL_VARS:
+		ep.disallowGlobalVars = value ? true : false;
+		break;
+
+	case asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT:
+		ep.alwaysImplDefaultConstruct = value ? true : false;
+		break;
+
+	case asEP_COMPILER_WARNINGS:
+		if( value <= 2 )
+			ep.compilerWarnings = (int)value;
+		else
+			return asINVALID_ARG;
+		break;
+
+	case asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE:
+		ep.disallowValueAssignForRefType = value ? true : false;
+		break;
+
+	case asEP_ALTER_SYNTAX_NAMED_ARGS:
+		if( value <= 2 )
+			ep.alterSyntaxNamedArgs = (int)value;
+		else
+			return asINVALID_ARG;
+		break;
+
+	case asEP_DISABLE_INTEGER_DIVISION:
+		ep.disableIntegerDivision = value ? true : false;
+		break;
+
+	case asEP_DISALLOW_EMPTY_LIST_ELEMENTS:
+		ep.disallowEmptyListElements = value ? true : false;
+		break;
+
+	case asEP_PRIVATE_PROP_AS_PROTECTED:
+		ep.privatePropAsProtected = value ? true : false;
+		break;
+
+	case asEP_ALLOW_UNICODE_IDENTIFIERS:
+		ep.allowUnicodeIdentifiers = value ? true : false;
+		break;
+
+	case asEP_HEREDOC_TRIM_MODE:
+		if (value <= 2)
+			ep.heredocTrimMode = (int)value;
+		else
+			return asINVALID_ARG;
+		break;
+
+	case asEP_MAX_NESTED_CALLS:
+		if (value > 0xFFFFFFFF)
+			ep.maxNestedCalls = 0xFFFFFFFF;
+		else
+			ep.maxNestedCalls = (asUINT)value;
+		break;
+
+	case asEP_GENERIC_CALL_MODE:
+		if (value > 1)
+			ep.genericCallMode = 1;
+		else
+			ep.genericCallMode = (asUINT)value;
+		break;
+
+	case asEP_INIT_CALL_STACK_SIZE:
+		ep.initCallStackSize = (asUINT)value;
+		break;
+
+	case asEP_MAX_CALL_STACK_SIZE:
+		ep.maxCallStackSize = (asUINT)value;
+		break;
+
+	case asEP_IGNORE_DUPLICATE_SHARED_INTF:
+		ep.ignoreDuplicateSharedIntf = value ? true : false;
+		break;
+
+	case asEP_NO_DEBUG_OUTPUT:
+		ep.noDebugOutput = value ? true : false;
+		break;
+
+	default:
+		return asINVALID_ARG;
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+asPWORD asCScriptEngine::GetEngineProperty(asEEngineProp property) const
+{
+	switch( property )
+	{
+	case asEP_ALLOW_UNSAFE_REFERENCES:
+		return ep.allowUnsafeReferences;
+
+	case asEP_OPTIMIZE_BYTECODE:
+		return ep.optimizeByteCode;
+
+	case asEP_COPY_SCRIPT_SECTIONS:
+		return ep.copyScriptSections;
+
+	case asEP_MAX_STACK_SIZE:
+		return ep.maximumContextStackSize * 4;
+
+	case asEP_INIT_STACK_SIZE:
+		return ep.initContextStackSize * 4;
+
+	case asEP_USE_CHARACTER_LITERALS:
+		return ep.useCharacterLiterals;
+
+	case asEP_ALLOW_MULTILINE_STRINGS:
+		return ep.allowMultilineStrings;
+
+	case asEP_ALLOW_IMPLICIT_HANDLE_TYPES:
+		return ep.allowImplicitHandleTypes;
+
+	case asEP_BUILD_WITHOUT_LINE_CUES:
+		return ep.buildWithoutLineCues;
+
+	case asEP_INIT_GLOBAL_VARS_AFTER_BUILD:
+		return ep.initGlobalVarsAfterBuild;
+
+	case asEP_REQUIRE_ENUM_SCOPE:
+		return ep.requireEnumScope;
+
+	case asEP_SCRIPT_SCANNER:
+		return ep.scanner;
+
+	case asEP_INCLUDE_JIT_INSTRUCTIONS:
+		return ep.includeJitInstructions;
+
+	case asEP_STRING_ENCODING:
+		return ep.stringEncoding;
+
+	case asEP_PROPERTY_ACCESSOR_MODE:
+		return ep.propertyAccessorMode;
+
+	case asEP_EXPAND_DEF_ARRAY_TO_TMPL:
+		return ep.expandDefaultArrayToTemplate;
+
+	case asEP_AUTO_GARBAGE_COLLECT:
+		return ep.autoGarbageCollect;
+
+	case asEP_DISALLOW_GLOBAL_VARS:
+		return ep.disallowGlobalVars;
+
+	case asEP_ALWAYS_IMPL_DEFAULT_CONSTRUCT:
+		return ep.alwaysImplDefaultConstruct;
+
+	case asEP_COMPILER_WARNINGS:
+		return ep.compilerWarnings;
+
+	case asEP_DISALLOW_VALUE_ASSIGN_FOR_REF_TYPE:
+		return ep.disallowValueAssignForRefType;
+
+	case asEP_ALTER_SYNTAX_NAMED_ARGS:
+		return ep.alterSyntaxNamedArgs;
+
+	case asEP_DISABLE_INTEGER_DIVISION:
+		return ep.disableIntegerDivision;
+
+	case asEP_DISALLOW_EMPTY_LIST_ELEMENTS:
+		return ep.disallowEmptyListElements;
+
+	case asEP_PRIVATE_PROP_AS_PROTECTED:
+		return ep.privatePropAsProtected;
+
+	case asEP_ALLOW_UNICODE_IDENTIFIERS:
+		return ep.allowUnicodeIdentifiers;
+
+	case asEP_HEREDOC_TRIM_MODE:
+		return ep.heredocTrimMode;
+
+	case asEP_MAX_NESTED_CALLS:
+		return ep.maxNestedCalls;
+
+	case asEP_GENERIC_CALL_MODE:
+		return ep.genericCallMode;
+
+	case asEP_INIT_CALL_STACK_SIZE:
+		return ep.initCallStackSize;
+
+	case asEP_MAX_CALL_STACK_SIZE:
+		return ep.maxCallStackSize;
+
+	case asEP_IGNORE_DUPLICATE_SHARED_INTF:
+		return ep.ignoreDuplicateSharedIntf;
+
+	case asEP_NO_DEBUG_OUTPUT:
+		return ep.noDebugOutput;
+
+	default:
+		return 0;
+	}
+
+	UNREACHABLE_RETURN;
+}
+
+// interface
+asIScriptFunction *asCScriptEngine::CreateDelegate(asIScriptFunction *func, void *obj)
+{
+	if( func == 0 || obj == 0 )
+		return 0;
+
+	// The function must be a class method
+	asITypeInfo *type = func->GetObjectType();
+	if( type == 0 )
+		return 0;
+
+	// The object type must allow handles
+	if( (type->GetFlags() & asOBJ_REF) == 0 || (type->GetFlags() & (asOBJ_SCOPED | asOBJ_NOHANDLE)) )
+		return 0;
+
+	// Create the delegate the same way it would be created by the scripts
+	return AS_NAMESPACE_QUALIFIER CreateDelegate(reinterpret_cast<asCScriptFunction*>(func), obj);
+}
+
+asCScriptEngine::asCScriptEngine()
+{
+	asCThreadManager::Prepare(0);
+
+	shuttingDown = false;
+	inDestructor = false;
+
+	// Engine properties
+	{
+		ep.allowUnsafeReferences         = false;
+		ep.optimizeByteCode              = true;
+		ep.copyScriptSections            = true;
+		ep.maximumContextStackSize       = 0;         // no limit
+		ep.initContextStackSize          = 1024;      // 4KB default init stack size
+		ep.useCharacterLiterals          = false;
+		ep.allowMultilineStrings         = false;
+		ep.allowImplicitHandleTypes      = false;
+		// TODO: optimize: Maybe this should be turned off by default? If a debugger is not used
+		//                 then this is just slowing down the execution.
+		ep.buildWithoutLineCues          = false;
+		ep.initGlobalVarsAfterBuild      = true;
+		ep.requireEnumScope              = false;
+		ep.scanner                       = 1;         // utf8. 0 = ascii
+		ep.includeJitInstructions        = false;
+		ep.stringEncoding                = 0;         // utf8. 1 = utf16
+		ep.propertyAccessorMode          = 3;         // 0 = disable, 1 = app registered only, 2 = app and script created, 3 = flag with 'property'
+		ep.expandDefaultArrayToTemplate  = false;
+		ep.autoGarbageCollect            = true;
+		ep.disallowGlobalVars            = false;
+		ep.alwaysImplDefaultConstruct    = false;
+		ep.compilerWarnings              = 1;         // 0 = no warnings, 1 = warning, 2 = treat as error
+		// TODO: 3.0.0: disallowValueAssignForRefType should be true by default
+		ep.disallowValueAssignForRefType = false;
+		ep.alterSyntaxNamedArgs          = 0;         // 0 = no alternate syntax, 1 = accept alternate syntax but warn, 2 = accept without warning
+		ep.disableIntegerDivision        = false;
+		ep.disallowEmptyListElements     = false;
+		ep.privatePropAsProtected        = false;
+		ep.allowUnicodeIdentifiers       = false;
+		ep.heredocTrimMode               = 1;         // 0 = never trim, 1 = don't trim on single line, 2 = trim initial and final empty line
+		ep.maxNestedCalls                = 100;
+		ep.genericCallMode               = 1;         // 0 = old (pre 2.33.0) behavior where generic ignored auto handles, 1 = treat handles like in native call
+		ep.initCallStackSize             = 10;        // 10 levels of calls
+		ep.maxCallStackSize              = 0;         // 0 = no limit
+		ep.ignoreDuplicateSharedIntf     = false;
+		ep.noDebugOutput                 = false;
+	}
+
+	gc.engine = this;
+	tok.engine = this;
+
+	refCount.set(1);
+	stringFactory = 0;
+	configFailed = false;
+	isPrepared = false;
+	isBuilding = false;
+	deferValidationOfTemplateTypes = false;
+	lastModule = 0;
+
+	typeIdSeqNbr      = 0;
+	currentGroup      = &defaultGroup;
+	defaultAccessMask = 0xFFFFFFFF; // All bits set so that built-in functions/types will be available to all modules
+
+	msgCallback = 0;
+	jitCompiler = 0;
+
+	// Create the global namespace
+	defaultNamespace = AddNameSpace("");
+
+	requestCtxFunc   = 0;
+	returnCtxFunc    = 0;
+	ctxCallbackParam = 0;
+
+	// We must set the namespace in the built-in types explicitly as
+	// this wasn't done by the default constructor. If we do not do
+	// this we will get null pointer access in other parts of the code
+	scriptTypeBehaviours.nameSpace     = defaultNamespace;
+	functionBehaviours.nameSpace       = defaultNamespace;
+
+	// Reserve function id 0 for no function
+	scriptFunctions.PushLast(0);
+
+	// Reserve the first typeIds for the primitive types
+	typeIdSeqNbr = asTYPEID_DOUBLE + 1;
+
+	// Make sure typeId for the built-in primitives are defined according to asETypeIdFlags
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttVoid,   false)) == asTYPEID_VOID   );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttBool,   false)) == asTYPEID_BOOL   );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt8,   false)) == asTYPEID_INT8   );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt16,  false)) == asTYPEID_INT16  );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt,    false)) == asTYPEID_INT32  );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttInt64,  false)) == asTYPEID_INT64  );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt8,  false)) == asTYPEID_UINT8  );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt16, false)) == asTYPEID_UINT16 );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt,   false)) == asTYPEID_UINT32 );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttUInt64, false)) == asTYPEID_UINT64 );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttFloat,  false)) == asTYPEID_FLOAT  );
+	asASSERT( GetTypeIdFromDataType(asCDataType::CreatePrimitive(ttDouble, false)) == asTYPEID_DOUBLE );
+
+	defaultArrayObjectType = 0;
+
+	RegisterScriptObject(this);
+	RegisterScriptFunction(this);
+
+#ifndef AS_NO_EXCEPTIONS
+	translateExceptionCallback = false;
+#endif
+}
+
+void asCScriptEngine::DeleteDiscardedModules()
+{
+	// TODO: redesign: Prevent more than one thread from entering this function at the same time.
+	//                 If a thread is already doing the work for the clean-up the other thread should
+	//                 simply return, as the first thread will continue.
+
+	ACQUIRESHARED(engineRWLock);
+	asUINT maxCount = discardedModules.GetLength();
+	RELEASESHARED(engineRWLock);
+
+	for( asUINT n = 0; n < maxCount; n++ )
+	{
+		ACQUIRESHARED(engineRWLock);
+		asCModule *mod = discardedModules[n];
+		RELEASESHARED(engineRWLock);
+
+		if( !mod->HasExternalReferences(shuttingDown) )
+		{
+			asDELETE(mod, asCModule);
+			n--;
+		}
+
+		ACQUIRESHARED(engineRWLock);
+		// Determine the max count again, since another module may have been discarded during the processing
+		maxCount = discardedModules.GetLength();
+		RELEASESHARED(engineRWLock);
+	}
+
+	// Go over the list of global properties, to see if it is possible to clean
+	// up some variables that are no longer referred to by any functions
+	for( asUINT n = 0; n < globalProperties.GetLength(); n++ )
+	{
+		asCGlobalProperty *prop = globalProperties[n];
+		if( prop && prop->refCount.get() == 1 )
+			RemoveGlobalProperty(prop);
+	}
+}
+
+asCScriptEngine::~asCScriptEngine()
+{
+	// TODO: clean-up: Clean up redundant code
+
+	inDestructor = true;
+
+	asASSERT(refCount.get() == 0);
+
+	// If ShutDown hasn't been called yet do it now
+	if( !shuttingDown )
+	{
+		AddRef();
+		ShutDownAndRelease();
+	}
+
+	// Unravel the registered interface
+	if( defaultArrayObjectType )
+	{
+		defaultArrayObjectType->ReleaseInternal();
+		defaultArrayObjectType = 0;
+	}
+
+	// Delete the functions for generated template types that may references object types
+	for( asUINT n = 0; n < generatedTemplateTypes.GetLength(); n++ )
+	{
+		asCObjectType *templateType = generatedTemplateTypes[n];
+		if( templateType )
+			templateType->DestroyInternal();
+	}
+	for( asUINT n = 0; n < listPatternTypes.GetLength(); n++ )
+	{
+		asCObjectType *type = listPatternTypes[n];
+		if( type )
+			type->ReleaseInternal();
+	}
+	listPatternTypes.SetLength(0);
+
+	// No script types must have survived
+	asASSERT( sharedScriptTypes.GetLength() == 0 );
+
+	// It is allowed to create new references to the engine temporarily while destroying objects
+	// but these references must be release immediately or else something is can go wrong later on
+	if( refCount.get() > 0 )
+		WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ENGINE_REF_COUNT_ERROR_DURING_SHUTDOWN);
+
+	mapTypeIdToTypeInfo.EraseAll();
+
+	// First remove what is not used, so that other groups can be deleted safely
+	defaultGroup.RemoveConfiguration(this, true);
+	while( configGroups.GetLength() )
+	{
+		// Delete config groups in the right order
+		asCConfigGroup *grp = configGroups.PopLast();
+		if( grp )
+		{
+			grp->RemoveConfiguration(this);
+			asDELETE(grp,asCConfigGroup);
+		}
+	}
+	// Remove what is remaining
+	defaultGroup.RemoveConfiguration(this);
+
+	// Any remaining objects in templateInstanceTypes is from generated template instances
+	for( asUINT n = 0; n < templateInstanceTypes.GetLength(); n++ )
+	{
+		asCObjectType *templateType = templateInstanceTypes[n];
+		if( templateInstanceTypes[n] )
+			templateType->ReleaseInternal();
+	}
+	templateInstanceTypes.SetLength(0);
+
+	asCSymbolTable<asCGlobalProperty>::iterator it = registeredGlobalProps.List();
+	for( ; it; it++ )
+	{
+		RemoveGlobalProperty(*it);
+		(*it)->Release();
+	}
+	registeredGlobalProps.Clear();
+
+	for( asUINT n = 0; n < templateSubTypes.GetLength(); n++ )
+	{
+		if( templateSubTypes[n] )
+		{
+			templateSubTypes[n]->DestroyInternal();
+			templateSubTypes[n]->ReleaseInternal();
+		}
+	}
+	templateSubTypes.SetLength(0);
+	registeredTypeDefs.SetLength(0);
+	registeredEnums.SetLength(0);
+	registeredObjTypes.SetLength(0);
+
+	asCSymbolTable<asCScriptFunction>::iterator funcIt = registeredGlobalFuncs.List();
+	for( ; funcIt; funcIt++ )
+		(*funcIt)->ReleaseInternal();
+	registeredGlobalFuncs.Clear();
+
+	scriptTypeBehaviours.ReleaseAllFunctions();
+	functionBehaviours.ReleaseAllFunctions();
+
+	for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
+		if( scriptFunctions[n] )
+		{
+			scriptFunctions[n]->DestroyInternal();
+
+			// Set the engine pointer to null to signal that the function is no longer part of the engine
+			scriptFunctions[n]->engine = 0;
+		}
+	scriptFunctions.SetLength(0);
+
+	// Increase the internal ref count for these builtin object types, so the destructor is not called incorrectly
+	scriptTypeBehaviours.AddRefInternal();
+	functionBehaviours.AddRefInternal();
+
+	// Destroy the funcdefs
+	// As funcdefs are shared between modules it shouldn't be a problem to keep the objects until the engine is released
+	for( asUINT n = 0; n < funcDefs.GetLength(); n++ )
+		if( funcDefs[n] )
+		{
+			funcDefs[n]->DestroyInternal();
+			funcDefs[n]->ReleaseInternal();
+		}
+	funcDefs.SetLength(0);
+
+	// Free the global properties
+	for( asUINT n = 0; n < globalProperties.GetLength(); n++ )
+	{
+		asCGlobalProperty *prop = globalProperties[n];
+		if( prop )
+		{
+			asASSERT( prop->refCount.get() == 1 );
+			RemoveGlobalProperty(prop);
+		}
+	}
+
+	// Free the script section names
+	for( asUINT n = 0; n < scriptSectionNames.GetLength(); n++ )
+		asDELETE(scriptSectionNames[n],asCString);
+	scriptSectionNames.SetLength(0);
+
+	// Clean the user data
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n+1] )
+		{
+			for( asUINT c = 0; c < cleanEngineFuncs.GetLength(); c++ )
+				if( cleanEngineFuncs[c].type == userData[n] )
+					cleanEngineFuncs[c].cleanFunc(this);
+		}
+	}
+
+	// Free namespaces
+	for( asUINT n = 0; n < nameSpaces.GetLength(); n++ )
+		asDELETE(nameSpaces[n], asSNameSpace);
+	nameSpaces.SetLength(0);
+
+	asCThreadManager::Unprepare();
+}
+
+// interface
+int asCScriptEngine::SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param)
+{
+	// Both callbacks or neither must be set
+	if( (requestCtx == 0 && returnCtx != 0) || (requestCtx != 0 && returnCtx == 0) )
+		return asINVALID_ARG;
+
+	requestCtxFunc   = requestCtx;
+	returnCtxFunc    = returnCtx;
+	ctxCallbackParam = param;
+
+	return 0;
+}
+
+// interface
+asIScriptContext *asCScriptEngine::RequestContext()
+{
+	if( requestCtxFunc )
+	{
+		// The return callback must also exist
+		asASSERT( returnCtxFunc );
+
+		asIScriptContext *ctx = requestCtxFunc(this, ctxCallbackParam);
+		return ctx;
+	}
+
+	// As fallback we create a new context
+	return CreateContext();
+}
+
+// internal
+asCModule *asCScriptEngine::FindNewOwnerForSharedType(asCTypeInfo *in_type, asCModule *in_mod)
+{
+	asASSERT( in_type->IsShared() );
+
+	if( in_type->module != in_mod)
+		return in_type->module;
+
+	for( asUINT n = 0; n < scriptModules.GetLength(); n++ )
+	{
+		// TODO: optimize: If the modules already stored the shared types separately, this would be quicker
+		int foundIdx = -1;
+		asCModule *mod = scriptModules[n];
+		if( mod == in_type->module ) continue;
+		if( in_type->flags & asOBJ_ENUM )
+			foundIdx = mod->m_enumTypes.IndexOf(CastToEnumType(in_type));
+		else if (in_type->flags & asOBJ_TYPEDEF)
+			foundIdx = mod->m_typeDefs.IndexOf(CastToTypedefType(in_type));
+		else if (in_type->flags & asOBJ_FUNCDEF)
+			foundIdx = mod->m_funcDefs.IndexOf(CastToFuncdefType(in_type));
+		else if (in_type->flags & asOBJ_TEMPLATE)
+			foundIdx = mod->m_templateInstances.IndexOf(CastToObjectType(in_type));
+		else
+			foundIdx = mod->m_classTypes.IndexOf(CastToObjectType(in_type));
+
+		if( foundIdx >= 0 )
+		{
+			in_type->module = mod;
+			break;
+		}
+	}
+
+	return in_type->module;
+}
+
+// internal
+asCModule *asCScriptEngine::FindNewOwnerForSharedFunc(asCScriptFunction *in_func, asCModule *in_mod)
+{
+	asASSERT( in_func->IsShared() );
+	asASSERT(!(in_func->funcType & asFUNC_FUNCDEF));
+
+	if( in_func->module != in_mod)
+		return in_func->module;
+
+	// Check if this is a class method or class factory for a type that has already been moved to a different module
+	if ((in_func->objectType && in_func->objectType->module && in_func->objectType->module != in_func->module) ||
+		(in_func->IsFactory() && in_func->returnType.GetTypeInfo()->module && in_func->returnType.GetTypeInfo()->module != in_func->module))
+	{
+		// The object type for the method has already been transferred to 
+		// another module, so transfer the method to the same module
+		if (in_func->objectType)
+			in_func->module = in_func->objectType->module;
+		else
+			in_func->module = in_func->returnType.GetTypeInfo()->module;
+
+		// Make sure the function is listed in the module
+		// The compiler may not have done this earlier, since the object
+		// type is shared and originally compiled from another module
+		if (in_func->module->m_scriptFunctions.IndexOf(in_func) < 0)
+		{
+			in_func->module->m_scriptFunctions.PushLast(in_func);
+			in_func->AddRefInternal();
+		}
+	}
+
+	for( asUINT n = 0; n < scriptModules.GetLength(); n++ )
+	{
+		// TODO: optimize: If the modules already stored the shared types separately, this would be quicker
+		int foundIdx = -1;
+		asCModule *mod = scriptModules[n];
+		if( mod == in_func->module ) continue;
+		foundIdx = mod->m_scriptFunctions.IndexOf(in_func);
+
+		if( foundIdx >= 0 )
+		{
+			in_func->module = mod;
+			break;
+		}
+	}
+
+	return in_func->module;
+}
+
+// interface
+void asCScriptEngine::ReturnContext(asIScriptContext *ctx)
+{
+	if( returnCtxFunc )
+	{
+		returnCtxFunc(this, ctx, ctxCallbackParam);
+		return;
+	}
+
+	// As fallback we just release the context
+	if( ctx )
+		ctx->Release();
+}
+
+// interface
+int asCScriptEngine::AddRef() const
+{
+	asASSERT( refCount.get() > 0 || inDestructor );
+	return refCount.atomicInc();
+}
+
+// interface
+int asCScriptEngine::Release() const
+{
+	int r = refCount.atomicDec();
+
+	if( r == 0 )
+	{
+		// It is possible that some function will temporarily increment the engine ref count
+		// during clean-up for example while destroying the objects in the garbage collector.
+		if( !inDestructor )
+			asDELETE(const_cast<asCScriptEngine*>(this),asCScriptEngine);
+		return 0;
+	}
+
+	return r;
+}
+
+// interface
+int asCScriptEngine::ShutDownAndRelease()
+{
+	// Do a full garbage collection cycle to clean up any object that may still hold on to the engine
+	GarbageCollect();
+
+	// Set the flag that the engine is being shutdown now. This will speed up
+	// the process, and will also allow the engine to warn about invalid calls
+	shuttingDown = true;
+
+	// Clear the context callbacks. If new context's are needed for the clean-up the engine will take care of this itself.
+	// Context callbacks are normally used for pooling contexts, and if we allow new contexts to be created without being
+	// immediately destroyed afterwards it means the engine's refcount will increase. This is turn may cause memory access
+	// violations later on when the pool releases its contexts.
+	SetContextCallbacks(0, 0, 0);
+
+	// The modules must be deleted first, as they may use
+	// object types from the config groups
+	for( asUINT n = (asUINT)scriptModules.GetLength(); n-- > 0; )
+		if( scriptModules[n] )
+			scriptModules[n]->Discard();
+	scriptModules.SetLength(0);
+
+	// Do another full garbage collection to destroy the object types/functions
+	// that may have been placed in the gc when destroying the modules
+	GarbageCollect();
+
+	// Do another sweep to delete discarded modules, that may not have
+	// been deleted earlier due to still having external references
+	DeleteDiscardedModules();
+
+	// If the application hasn't registered GC behaviours for all types
+	// that can form circular references with script types, then there
+	// may still be objects in the GC.
+	gc.ReportAndReleaseUndestroyedObjects();
+
+	// Release the engine reference
+	return Release();
+}
+
+// internal
+asSNameSpace *asCScriptEngine::AddNameSpace(const char *name)
+{
+	// First check if it doesn't exist already
+	asSNameSpace *ns = FindNameSpace(name);
+	if( ns ) return ns;
+
+	ns = asNEW(asSNameSpace);
+	if( ns == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+	ns->name = name;
+
+	nameSpaces.PushLast(ns);
+
+	return ns;
+}
+
+// internal
+asSNameSpace *asCScriptEngine::FindNameSpace(const char *name) const
+{
+	// TODO: optimize: Improve linear search
+	for( asUINT n = 0; n < nameSpaces.GetLength(); n++ )
+		if( nameSpaces[n]->name == name )
+			return nameSpaces[n];
+
+	return 0;
+}
+
+// interface
+const char *asCScriptEngine::GetDefaultNamespace() const
+{
+	return defaultNamespace->name.AddressOf();
+}
+
+// interface
+int asCScriptEngine::SetDefaultNamespace(const char *nameSpace)
+{
+	if( nameSpace == 0 )
+		return ConfigError(asINVALID_ARG, "SetDefaultNamespace", nameSpace, 0);
+
+	asCString ns = nameSpace;
+	if( ns != "" )
+	{
+		// Make sure the namespace is composed of alternating identifier and ::
+		size_t pos = 0;
+		bool expectIdentifier = true;
+		size_t len;
+		eTokenType t = ttIdentifier;
+
+		for( ; pos < ns.GetLength(); pos += len)
+		{
+			t = tok.GetToken(ns.AddressOf() + pos, ns.GetLength() - pos, &len);
+			if( (expectIdentifier && t != ttIdentifier) || (!expectIdentifier && t != ttScope) )
+				return ConfigError(asINVALID_DECLARATION, "SetDefaultNamespace", nameSpace, 0);
+
+			// Make sure parent namespaces are registred in case of nested namespaces
+			if (expectIdentifier)
+				AddNameSpace(ns.SubString(0, pos + len).AddressOf());
+
+			expectIdentifier = !expectIdentifier;
+		}
+
+		// If the namespace ends with :: then strip it off
+		if( t == ttScope )
+			ns.SetLength(ns.GetLength()-2);
+	}
+
+	defaultNamespace = AddNameSpace(ns.AddressOf());
+
+	return 0;
+}
+
+// interface
+void *asCScriptEngine::SetUserData(void *data, asPWORD type)
+{
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(userData[n+1]);
+			userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	userData.PushLast(type);
+	userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(engineRWLock);
+
+	return 0;
+}
+
+// interface
+void *asCScriptEngine::GetUserData(asPWORD type) const
+{
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(engineRWLock);
+
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			RELEASESHARED(engineRWLock);
+			return reinterpret_cast<void*>(userData[n+1]);
+		}
+	}
+
+	RELEASESHARED(engineRWLock);
+
+	return 0;
+}
+
+// interface
+int asCScriptEngine::SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv)
+{
+	msgCallback = true;
+	msgCallbackObj = obj;
+	bool isObj = false;
+	if( (unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST )
+	{
+		msgCallback = false;
+		return asNOT_SUPPORTED;
+	}
+	if( (unsigned)callConv >= asCALL_THISCALL )
+	{
+		isObj = true;
+		if( obj == 0 )
+		{
+			msgCallback = false;
+			return asINVALID_ARG;
+		}
+	}
+	int r = DetectCallingConvention(isObj, callback, callConv, 0, &msgCallbackFunc);
+	if( r < 0 ) msgCallback = false;
+	return r;
+}
+
+// interface
+int asCScriptEngine::ClearMessageCallback()
+{
+	msgCallback = false;
+	return 0;
+}
+
+// interface
+int asCScriptEngine::WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message)
+{
+	// Validate input parameters
+	if( section == 0 ||
+		message == 0 )
+		return asINVALID_ARG;
+
+	// If there is no callback then there's nothing to do
+	if( !msgCallback )
+		return 0;
+
+	// If a pre-message has been set, then write that first
+	if( preMessage.isSet )
+	{
+		asSMessageInfo msg;
+		msg.section = preMessage.scriptname.AddressOf();
+		msg.row     = preMessage.r;
+		msg.col     = preMessage.c;
+		msg.type    = asMSGTYPE_INFORMATION;
+		msg.message = preMessage.message.AddressOf();
+
+		if( msgCallbackFunc.callConv < ICC_THISCALL )
+			CallGlobalFunction(&msg, msgCallbackObj, &msgCallbackFunc, 0);
+		else
+			CallObjectMethod(msgCallbackObj, &msg, &msgCallbackFunc, 0);
+
+		preMessage.isSet = false;
+	}
+
+	// Write the message to the callback
+	asSMessageInfo msg;
+	msg.section = section;
+	msg.row     = row;
+	msg.col     = col;
+	msg.type    = type;
+	msg.message = message;
+
+	if( msgCallbackFunc.callConv < ICC_THISCALL )
+		CallGlobalFunction(&msg, msgCallbackObj, &msgCallbackFunc, 0);
+	else
+		CallObjectMethod(msgCallbackObj, &msg, &msgCallbackFunc, 0);
+
+	return 0;
+}
+
+int asCScriptEngine::SetJITCompiler(asIJITCompiler *compiler)
+{
+	jitCompiler = compiler;
+	return asSUCCESS;
+}
+
+asIJITCompiler *asCScriptEngine::GetJITCompiler() const
+{
+	return jitCompiler;
+}
+
+// interface
+asETokenClass asCScriptEngine::ParseToken(const char *string, size_t stringLength, asUINT *tokenLength) const
+{
+	if( stringLength == 0 )
+		stringLength = strlen(string);
+
+	size_t len;
+	asETokenClass tc;
+	tok.GetToken(string, stringLength, &len, &tc);
+
+	if( tokenLength )
+		*tokenLength = (asUINT)len;
+
+	return tc;
+}
+
+// interface
+asIScriptModule *asCScriptEngine::GetModule(const char *module, asEGMFlags flag)
+{
+	asCModule *mod = GetModule(module, false);
+
+	if( flag == asGM_ALWAYS_CREATE )
+	{
+		if( mod != 0 )
+			mod->Discard();
+
+		return GetModule(module, true);
+	}
+
+	if( mod == 0 && flag == asGM_CREATE_IF_NOT_EXISTS )
+		return GetModule(module, true);
+
+	return mod;
+}
+
+// interface
+int asCScriptEngine::DiscardModule(const char *module)
+{
+	asCModule *mod = GetModule(module, false);
+	if( mod == 0 ) return asNO_MODULE;
+
+	mod->Discard();
+
+	return 0;
+}
+
+// interface
+asUINT asCScriptEngine::GetModuleCount() const
+{
+	ACQUIRESHARED(engineRWLock);
+	asUINT length = asUINT(scriptModules.GetLength());
+	RELEASESHARED(engineRWLock);
+	return length;
+}
+
+// interface
+asIScriptModule *asCScriptEngine::GetModuleByIndex(asUINT index) const
+{
+	asIScriptModule *mod = 0;
+	ACQUIRESHARED(engineRWLock);
+	if( index < scriptModules.GetLength() )
+		mod = scriptModules[index];
+	RELEASESHARED(engineRWLock);
+	return mod;
+}
+
+// internal
+int asCScriptEngine::GetFactoryIdByDecl(const asCObjectType *ot, const char *decl)
+{
+	asCModule *mod = 0;
+
+	// Is this a script class?
+	if( (ot->flags & asOBJ_SCRIPT_OBJECT) && ot->size > 0 )
+		mod = scriptFunctions[ot->beh.factories[0]]->module;
+
+	asCBuilder bld(this, mod);
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	asCScriptFunction func(this, mod, asFUNC_DUMMY);
+	int r = bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, defaultNamespace);
+	if( r < 0 )
+		return asINVALID_DECLARATION;
+
+	// Search for matching factory function
+	int id = -1;
+	for( asUINT n = 0; n < ot->beh.factories.GetLength(); n++ )
+	{
+		asCScriptFunction *f = scriptFunctions[ot->beh.factories[n]];
+
+		// We don't really care if the name of the function is correct
+		if( f->IsSignatureExceptNameEqual(&func) )
+		{
+			id = ot->beh.factories[n];
+			break;
+		}
+	}
+
+	if( id == -1 ) return asNO_FUNCTION;
+
+	return id;
+}
+
+
+// internal
+int asCScriptEngine::GetMethodIdByDecl(const asCObjectType *ot, const char *decl, asCModule *mod)
+{
+	asCBuilder bld(this, mod);
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	asCScriptFunction func(this, mod, asFUNC_DUMMY);
+
+	// Set the object type so that the signature can be properly compared
+	// This cast is OK, it will only be used for comparison
+	func.objectType = const_cast<asCObjectType*>(ot);
+	func.objectType->AddRefInternal();
+
+	int r = bld.ParseFunctionDeclaration(func.objectType, decl, &func, false);
+	if( r < 0 )
+		return asINVALID_DECLARATION;
+
+	// Search script functions for matching interface
+	int id = -1;
+	for( asUINT n = 0; n < ot->methods.GetLength(); ++n )
+	{
+		if( func.IsSignatureEqual(scriptFunctions[ot->methods[n]]) )
+		{
+			if( id == -1 )
+				id = ot->methods[n];
+			else
+				return asMULTIPLE_FUNCTIONS;
+		}
+	}
+
+	if( id == -1 ) return asNO_FUNCTION;
+
+	return id;
+}
+
+
+// internal
+asCString asCScriptEngine::GetFunctionDeclaration(int funcId)
+{
+	asCString str;
+	asCScriptFunction *func = GetScriptFunction(funcId);
+	if( func )
+		str = func->GetDeclarationStr();
+
+	return str;
+}
+
+// internal
+asCScriptFunction *asCScriptEngine::GetScriptFunction(int funcId) const
+{
+	if( funcId < 0 || funcId >= (int)scriptFunctions.GetLength() )
+		return 0;
+
+	return scriptFunctions[funcId];
+}
+
+
+// interface
+asIScriptContext *asCScriptEngine::CreateContext()
+{
+	asIScriptContext *ctx = 0;
+	CreateContext(&ctx, false);
+	return ctx;
+}
+
+// internal
+int asCScriptEngine::CreateContext(asIScriptContext **context, bool isInternal)
+{
+	*context = asNEW(asCContext)(this, !isInternal);
+	if( *context == 0 )
+		return asOUT_OF_MEMORY;
+
+	// We need to make sure the engine has been
+	// prepared before any context is executed
+	PrepareEngine();
+
+	return 0;
+}
+
+// interface
+int asCScriptEngine::RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset, int compositeOffset, bool isCompositeIndirect)
+{
+	int r;
+	asCDataType dt;
+	asCBuilder bld(this, 0);
+	r = bld.ParseDataType(obj, &dt, defaultNamespace);
+	if( r < 0 )
+		return ConfigError(r, "RegisterObjectProperty", obj, declaration);
+
+	if (dt.GetTypeInfo() == 0 || (dt.IsObjectHandle() && !(dt.GetTypeInfo()->GetFlags() & asOBJ_IMPLICIT_HANDLE)))
+		return ConfigError(asINVALID_OBJECT, "RegisterObjectProperty", obj, declaration);
+
+	// Don't allow modifying generated template instances
+	if( dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(CastToObjectType(dt.GetTypeInfo())) )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectProperty", obj, declaration);
+
+	// Verify that the correct config group is used
+	if( currentGroup->FindType(dt.GetTypeInfo()->name.AddressOf()) == 0 )
+		return ConfigError(asWRONG_CONFIG_GROUP, "RegisterObjectProperty", obj, declaration);
+
+	asCDataType type;
+	asCString name;
+
+	if( (r = bld.VerifyProperty(&dt, declaration, name, type, 0)) < 0 )
+		return ConfigError(r, "RegisterObjectProperty", obj, declaration);
+
+	// The VM currently only supports 16bit offsets
+	// TODO: The VM needs to have support for 32bit offsets. Probably with a second ADDSi instruction
+	//       However, when implementing this it is necessary for the bytecode serialization to support
+	//       the switch between the instructions upon loading bytecode as the offset may not be the
+	//       same on all platforms
+	if( byteOffset > 32767 || byteOffset < -32768 )
+		return ConfigError(asINVALID_ARG, "RegisterObjectProperty", obj, declaration);
+	// The composite offset must also obey the ADDSi restriction
+	if (compositeOffset > 32767 || compositeOffset < -32768)
+		return ConfigError(asINVALID_ARG, "RegisterObjectProperty", obj, declaration);
+
+	asCObjectProperty *prop = asNEW(asCObjectProperty);
+	if( prop == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterObjectProperty", obj, declaration);
+
+	prop->name                = name;
+	prop->type                = type;
+	prop->byteOffset          = byteOffset;
+	prop->isPrivate           = false;
+	prop->isProtected         = false;
+	prop->compositeOffset     = compositeOffset;
+	prop->isCompositeIndirect = isCompositeIndirect;
+	prop->accessMask          = defaultAccessMask;
+
+	asCObjectType *ot = CastToObjectType(dt.GetTypeInfo());
+	asUINT idx = ot->properties.GetLength();
+	ot->properties.PushLast(prop);
+
+	// Add references to types so they are not released too early
+	if( type.GetTypeInfo() )
+	{
+		type.GetTypeInfo()->AddRefInternal();
+
+		// Add template instances to the config group
+		if( (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) && !currentGroup->types.Exists(type.GetTypeInfo()) )
+			currentGroup->types.PushLast(type.GetTypeInfo());
+	}
+
+	currentGroup->AddReferencesForType(this, type.GetTypeInfo());
+
+	// Return the index of the property to signal success
+	return idx;
+}
+
+// interface
+int asCScriptEngine::RegisterInterface(const char *name)
+{
+	if( name == 0 ) return ConfigError(asINVALID_NAME, "RegisterInterface", 0, 0);
+
+	// Verify if the name has been registered as a type already
+	if( GetRegisteredType(name, defaultNamespace) )
+		return asALREADY_REGISTERED;
+
+	// Use builder to parse the datatype
+	asCDataType dt;
+	asCBuilder bld(this, 0);
+	bool oldMsgCallback = msgCallback; msgCallback = false;
+	int r = bld.ParseDataType(name, &dt, defaultNamespace);
+	msgCallback = oldMsgCallback;
+	if( r >= 0 )
+	{
+		// If it is not in the defaultNamespace then the type was successfully parsed because
+		// it is declared in a parent namespace which shouldn't be treated as an error
+		if( dt.GetTypeInfo() && dt.GetTypeInfo()->nameSpace == defaultNamespace )
+			return ConfigError(asERROR, "RegisterInterface", name, 0);
+	}
+
+	// Make sure the name is not a reserved keyword
+	size_t tokenLen;
+	int token = tok.GetToken(name, strlen(name), &tokenLen);
+	if( token != ttIdentifier || strlen(name) != tokenLen )
+		return ConfigError(asINVALID_NAME, "RegisterInterface", name, 0);
+
+	r = bld.CheckNameConflict(name, 0, 0, defaultNamespace, true, false, false);
+	if( r < 0 )
+		return ConfigError(asNAME_TAKEN, "RegisterInterface", name, 0);
+
+	// Don't have to check against members of object
+	// types as they are allowed to use the names
+
+	// Register the object type for the interface
+	asCObjectType *st = asNEW(asCObjectType)(this);
+	if( st == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterInterface", name, 0);
+
+	st->flags = asOBJ_REF | asOBJ_SCRIPT_OBJECT | asOBJ_SHARED;
+	st->size = 0; // Cannot be instantiated
+	st->name = name;
+	st->nameSpace = defaultNamespace;
+
+	// Use the default script class behaviours
+	st->beh.factory = 0;
+	st->beh.addref = scriptTypeBehaviours.beh.addref;
+	scriptFunctions[st->beh.addref]->AddRefInternal();
+	st->beh.release = scriptTypeBehaviours.beh.release;
+	scriptFunctions[st->beh.release]->AddRefInternal();
+	st->beh.copy = 0;
+
+	allRegisteredTypes.Insert(asSNameSpaceNamePair(st->nameSpace, st->name), st);
+	registeredObjTypes.PushLast(st);
+
+	currentGroup->types.PushLast(st);
+
+	return GetTypeIdByDecl(name);
+}
+
+// interface
+int asCScriptEngine::RegisterInterfaceMethod(const char *intf, const char *declaration)
+{
+	// Verify that the correct config group is set.
+	if( currentGroup->FindType(intf) == 0 )
+		return ConfigError(asWRONG_CONFIG_GROUP, "RegisterInterfaceMethod", intf, declaration);
+
+	asCDataType dt;
+	asCBuilder bld(this, 0);
+	int r = bld.ParseDataType(intf, &dt, defaultNamespace);
+	if( r < 0 )
+		return ConfigError(r, "RegisterInterfaceMethod", intf, declaration);
+
+	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_INTERFACE);
+	if( func == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterInterfaceMethod", intf, declaration);
+
+	func->objectType = CastToObjectType(dt.GetTypeInfo());
+	func->objectType->AddRefInternal();
+
+	r = bld.ParseFunctionDeclaration(func->objectType, declaration, func, false);
+	if( r < 0 )
+	{
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asINVALID_DECLARATION, "RegisterInterfaceMethod", intf, declaration);
+	}
+
+	// Check name conflicts
+	r = bld.CheckNameConflictMember(dt.GetTypeInfo(), func->name.AddressOf(), 0, 0, false, false);
+	if( r < 0 )
+	{
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asNAME_TAKEN, "RegisterInterfaceMethod", intf, declaration);
+	}
+
+	func->id = GetNextScriptFunctionId();
+	AddScriptFunction(func);
+
+	// The index into the interface's vftable chunk should be
+	// its index in the methods array.
+	func->vfTableIdx = int(func->objectType->methods.GetLength());
+
+	func->objectType->methods.PushLast(func->id);
+
+	func->ComputeSignatureId();
+
+	currentGroup->AddReferencesForFunc(this, func);
+
+	// Return function id as success
+	return func->id;
+}
+
+int asCScriptEngine::RegisterObjectType(const char *name, int byteSize, asDWORD flags)
+{
+	int r;
+
+	isPrepared = false;
+
+	// Verify flags
+	// Must have either asOBJ_REF or asOBJ_VALUE
+	if( flags & asOBJ_REF )
+	{
+		// Can optionally have the asOBJ_GC, asOBJ_NOHANDLE, asOBJ_SCOPED, or asOBJ_TEMPLATE flag set, but nothing else
+		if( flags & ~(asOBJ_REF | asOBJ_GC | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_TEMPLATE | asOBJ_NOCOUNT | asOBJ_IMPLICIT_HANDLE) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+
+		// flags are exclusive
+		if( (flags & asOBJ_GC) && (flags & (asOBJ_NOHANDLE|asOBJ_SCOPED|asOBJ_NOCOUNT)) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+		if( (flags & asOBJ_NOHANDLE) && (flags & (asOBJ_GC|asOBJ_SCOPED|asOBJ_NOCOUNT|asOBJ_IMPLICIT_HANDLE)) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+		if( (flags & asOBJ_SCOPED) && (flags & (asOBJ_GC|asOBJ_NOHANDLE|asOBJ_NOCOUNT|asOBJ_IMPLICIT_HANDLE)) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+		if( (flags & asOBJ_NOCOUNT) && (flags & (asOBJ_GC|asOBJ_NOHANDLE|asOBJ_SCOPED)) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+
+		// Implicit handle is only allowed if the engine property for this is turned on
+		if( !ep.allowImplicitHandleTypes && (flags & asOBJ_IMPLICIT_HANDLE) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+	}
+	else if( flags & asOBJ_VALUE )
+	{
+		// Cannot use reference flags
+		if( flags & (asOBJ_REF | asOBJ_NOHANDLE | asOBJ_SCOPED | asOBJ_NOCOUNT | asOBJ_IMPLICIT_HANDLE) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+
+		// Flags are exclusive
+		if( (flags & asOBJ_POD) && (flags & (asOBJ_ASHANDLE | asOBJ_TEMPLATE)) )
+			return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+
+		// If the app type is given, we must validate the flags
+		if( flags & asOBJ_APP_CLASS )
+		{
+			// Must not set the primitive or float flag
+			if( flags & (asOBJ_APP_PRIMITIVE | asOBJ_APP_FLOAT | asOBJ_APP_ARRAY) )
+				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+		}
+		else
+		{
+			// Must not set the class properties, without the class flag
+			if( flags & (asOBJ_APP_CLASS_CONSTRUCTOR      |
+						 asOBJ_APP_CLASS_DESTRUCTOR       |
+						 asOBJ_APP_CLASS_ASSIGNMENT       |
+						 asOBJ_APP_CLASS_COPY_CONSTRUCTOR |
+						 asOBJ_APP_CLASS_ALLINTS          |
+						 asOBJ_APP_CLASS_ALLFLOATS) )
+			{
+				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+			}
+		}
+
+		if( flags & asOBJ_APP_PRIMITIVE )
+		{
+			if( flags & (asOBJ_APP_CLASS |
+						 asOBJ_APP_FLOAT |
+						 asOBJ_APP_ARRAY) )
+				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+		}
+		else if( flags & asOBJ_APP_FLOAT )
+		{
+			if( flags & (asOBJ_APP_CLASS     |
+						 asOBJ_APP_PRIMITIVE |
+						 asOBJ_APP_ARRAY) )
+				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+		}
+		else if( flags & asOBJ_APP_ARRAY )
+		{
+			if( flags & (asOBJ_APP_CLASS     |
+						 asOBJ_APP_PRIMITIVE |
+						 asOBJ_APP_FLOAT) )
+				return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+		}
+	}
+	else
+		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+
+	// Don't allow anything else than the defined flags
+#ifndef WIP_16BYTE_ALIGN
+	if( flags - (flags & asOBJ_MASK_VALID_FLAGS) )
+#else
+	if( flags - (flags & (asOBJ_MASK_VALID_FLAGS | asOBJ_APP_ALIGN16)) )
+#endif
+		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+
+	// Value types must have a defined size
+	if( (flags & asOBJ_VALUE) && byteSize == 0 )
+	{
+		WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_VALUE_TYPE_MUST_HAVE_SIZE);
+		return ConfigError(asINVALID_ARG, "RegisterObjectType", name, 0);
+	}
+
+	// Verify type name
+	if( name == 0 )
+		return ConfigError(asINVALID_NAME, "RegisterObjectType", name, 0);
+
+	asCString typeName;
+	asCBuilder bld(this, 0);
+	if( flags & asOBJ_TEMPLATE )
+	{
+		asCArray<asCString> subtypeNames;
+		r = bld.ParseTemplateDecl(name, &typeName, subtypeNames);
+		if( r < 0 )
+			return ConfigError(r, "RegisterObjectType", name, 0);
+
+		// Verify that the template name hasn't been registered as a type already
+		if( GetRegisteredType(typeName, defaultNamespace) )
+			// This is not an irrepairable error, as it may just be that the same type is registered twice
+			return asALREADY_REGISTERED;
+
+		asCObjectType *type = asNEW(asCObjectType)(this);
+		if( type == 0 )
+			return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
+
+		type->name       = typeName;
+		type->nameSpace  = defaultNamespace;
+		type->size       = byteSize;
+#ifdef WIP_16BYTE_ALIGN
+		// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
+		type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
+#endif
+		type->flags      = flags;
+		type->accessMask = defaultAccessMask;
+
+		// Store it in the object types
+		allRegisteredTypes.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
+		currentGroup->types.PushLast(type);
+		registeredObjTypes.PushLast(type);
+		registeredTemplateTypes.PushLast(type);
+
+		// Define the template subtypes
+		for( asUINT subTypeIdx = 0; subTypeIdx < subtypeNames.GetLength(); subTypeIdx++ )
+		{
+			asCTypeInfo *subtype = 0;
+			for( asUINT n = 0; n < templateSubTypes.GetLength(); n++ )
+			{
+				if( templateSubTypes[n]->name == subtypeNames[subTypeIdx] )
+				{
+					subtype = templateSubTypes[n];
+					break;
+				}
+			}
+			if( subtype == 0 )
+			{
+				// Create the new subtype if not already existing
+				subtype = asNEW(asCTypeInfo)(this);
+				if( subtype == 0 )
+					return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
+
+				subtype->name      = subtypeNames[subTypeIdx];
+				subtype->size      = 0;
+				subtype->flags     = asOBJ_TEMPLATE_SUBTYPE;
+				templateSubTypes.PushLast(subtype);
+			}
+			type->templateSubTypes.PushLast(asCDataType::CreateType(subtype, false));
+			subtype->AddRefInternal();
+		}
+	}
+	else
+	{
+		typeName = name;
+
+		// Verify if the name has been registered as a type already
+		if( GetRegisteredType(typeName, defaultNamespace) )
+			// This is not an irrepairable error, as it may just be that the same type is registered twice
+			return asALREADY_REGISTERED;
+
+		// Keep the most recent template generated instance type, so we know what it was before parsing the datatype
+		asCObjectType *mostRecentTemplateInstanceType = 0;
+		asUINT originalSizeOfGeneratedTemplateTypes = (asUINT)generatedTemplateTypes.GetLength();
+		if( originalSizeOfGeneratedTemplateTypes )
+			mostRecentTemplateInstanceType = generatedTemplateTypes[originalSizeOfGeneratedTemplateTypes-1];
+
+		// Use builder to parse the datatype
+		asCDataType dt;
+		bool oldMsgCallback = msgCallback; msgCallback = false;
+		r = bld.ParseDataType(name, &dt, defaultNamespace);
+		msgCallback = oldMsgCallback;
+
+		// If the builder fails or the namespace is different than the default
+		// namespace, then the type name is new and it should be registered
+		if( r < 0 || dt.GetTypeInfo()->nameSpace != defaultNamespace )
+		{
+			// Make sure the name is not a reserved keyword
+			size_t tokenLen;
+			int token = tok.GetToken(name, typeName.GetLength(), &tokenLen);
+			if( token != ttIdentifier || typeName.GetLength() != tokenLen )
+				return ConfigError(asINVALID_NAME, "RegisterObjectType", name, 0);
+
+			r = bld.CheckNameConflict(name, 0, 0, defaultNamespace, true, false, false);
+			if( r < 0 )
+				return ConfigError(asNAME_TAKEN, "RegisterObjectType", name, 0);
+
+			// Don't have to check against members of object
+			// types as they are allowed to use the names
+
+			// Put the data type in the list
+			asCObjectType *type = asNEW(asCObjectType)(this);
+			if( type == 0 )
+				return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
+
+			type->name       = typeName;
+			type->nameSpace  = defaultNamespace;
+			type->size       = byteSize;
+#ifdef WIP_16BYTE_ALIGN
+			// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
+			type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
+#endif
+			type->flags      = flags;
+			type->accessMask = defaultAccessMask;
+
+			allRegisteredTypes.Insert(asSNameSpaceNamePair(type->nameSpace, type->name), type);
+			registeredObjTypes.PushLast(type);
+
+			currentGroup->types.PushLast(type);
+		}
+		else
+		{
+			// The application is registering a template specialization so we
+			// need to replace the template instance type with the new type.
+
+			// TODO: Template: We don't require the lower dimensions to be registered first for registered template types
+			// int[][] must not be allowed to be registered
+			// if int[] hasn't been registered first
+			if( dt.GetSubType().IsTemplate() )
+				return ConfigError(asLOWER_ARRAY_DIMENSION_NOT_REGISTERED, "RegisterObjectType", name, 0);
+
+			if( dt.IsReadOnly() ||
+				dt.IsReference() )
+				return ConfigError(asINVALID_TYPE, "RegisterObjectType", name, 0);
+
+			// Was the template instance type generated before?
+			if( generatedTemplateTypes.Exists(CastToObjectType(dt.GetTypeInfo())) &&
+				generatedTemplateTypes[generatedTemplateTypes.GetLength()-1] == mostRecentTemplateInstanceType )
+			{
+				asCString str;
+				str.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, typeName.AddressOf());
+				WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+				return ConfigError(asNOT_SUPPORTED, "RegisterObjectType", name, 0);
+			}
+
+			// If this is not a generated template instance type, then it means it is an
+			// already registered template specialization
+			if( !generatedTemplateTypes.Exists(CastToObjectType(dt.GetTypeInfo())) )
+				return ConfigError(asALREADY_REGISTERED, "RegisterObjectType", name, 0);
+
+			// TODO: Add this again. The type is used by the factory stubs so we need to discount that
+			// Is the template instance type already being used?
+//			if( dt.GetTypeInfo()->GetRefCount() > 1 )
+//				return ConfigError(asNOT_SUPPORTED, "RegisterObjectType", name, 0);
+
+			// Put the data type in the list
+			asCObjectType *type = asNEW(asCObjectType)(this);
+			if( type == 0 )
+				return ConfigError(asOUT_OF_MEMORY, "RegisterObjectType", name, 0);
+
+			type->name       = dt.GetTypeInfo()->name;
+			// The namespace will be the same as the original template type
+			type->nameSpace  = dt.GetTypeInfo()->nameSpace;
+			type->templateSubTypes.PushLast(dt.GetSubType());
+			for( asUINT s = 0; s < type->templateSubTypes.GetLength(); s++ )
+				if( type->templateSubTypes[s].GetTypeInfo() )
+					type->templateSubTypes[s].GetTypeInfo()->AddRefInternal();
+			type->size       = byteSize;
+#ifdef WIP_16BYTE_ALIGN
+			// TODO: Types smaller than 4 don't need to be aligned to 4 byte boundaries
+			type->alignment  = (flags & asOBJ_APP_ALIGN16) ? 16 : 4;
+#endif
+			type->flags      = flags;
+			type->accessMask = defaultAccessMask;
+
+			templateInstanceTypes.PushLast(type);
+
+			currentGroup->types.PushLast(type);
+
+			// Remove the template instance type, which will no longer be used.
+			// It is possible that multiple template instances are generated if
+			// they have any relationship, so all of them must be removed
+			while( generatedTemplateTypes.GetLength() > originalSizeOfGeneratedTemplateTypes )
+				RemoveTemplateInstanceType(generatedTemplateTypes[generatedTemplateTypes.GetLength()-1]);
+		}
+	}
+
+	// Return the type id as the success (except for template types)
+	if( flags & asOBJ_TEMPLATE )
+		return asSUCCESS;
+
+	return GetTypeIdByDecl(name);
+}
+
+// interface
+int asCScriptEngine::RegisterObjectBehaviour(const char *datatype, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary, int compositeOffset, bool isCompositeIndirect)
+{
+	if( datatype == 0 ) return ConfigError(asINVALID_ARG, "RegisterObjectBehaviour", datatype, decl);
+
+	// Determine the object type
+	asCBuilder bld(this, 0);
+	asCDataType type;
+	int r = bld.ParseDataType(datatype, &type, defaultNamespace);
+	if( r < 0 )
+		return ConfigError(r, "RegisterObjectBehaviour", datatype, decl);
+
+	if( type.GetTypeInfo() == 0 || (type.IsObjectHandle() && !(type.GetTypeInfo()->GetFlags() & asOBJ_IMPLICIT_HANDLE)) )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
+
+	// Don't allow application to modify built-in types
+	if( type.GetTypeInfo() == &functionBehaviours ||
+		type.GetTypeInfo() == &scriptTypeBehaviours )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
+
+	if( type.IsReadOnly() || type.IsReference() )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
+
+	// Don't allow modifying generated template instances
+	if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(CastToObjectType(type.GetTypeInfo())) )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectBehaviour", datatype, decl);
+
+	return RegisterBehaviourToObjectType(CastToObjectType(type.GetTypeInfo()), behaviour, decl, funcPointer, callConv, auxiliary, compositeOffset, isCompositeIndirect);
+}
+
+// internal
+int asCScriptEngine::RegisterBehaviourToObjectType(asCObjectType *objectType, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary, int compositeOffset, bool isCompositeIndirect)
+{
+#ifdef AS_MAX_PORTABILITY
+	if( callConv != asCALL_GENERIC )
+		return ConfigError(asNOT_SUPPORTED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+#endif
+
+	asSSystemFunctionInterface internal;
+	bool isMethod = !(behaviour == asBEHAVE_FACTORY ||
+		              behaviour == asBEHAVE_LIST_FACTORY ||
+		              behaviour == asBEHAVE_TEMPLATE_CALLBACK);
+	int r = DetectCallingConvention(isMethod, funcPointer, callConv, auxiliary, &internal);
+	if( r < 0 )
+		return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+	internal.compositeOffset = compositeOffset;
+	internal.isCompositeIndirect = isCompositeIndirect;
+	if( (compositeOffset || isCompositeIndirect) && callConv != asCALL_THISCALL )
+		return ConfigError(asINVALID_ARG, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+	// TODO: cleanup: This is identical to what is in RegisterMethodToObjectType
+	// If the object type is a template, make sure there are no generated instances already
+	if( objectType->flags & asOBJ_TEMPLATE )
+	{
+		for( asUINT n = 0; n < generatedTemplateTypes.GetLength(); n++ )
+		{
+			asCObjectType *tmpl = generatedTemplateTypes[n];
+			if( tmpl->name == objectType->name &&
+				tmpl->nameSpace == objectType->nameSpace &&
+				!(tmpl->templateSubTypes[0].GetTypeInfo() && (tmpl->templateSubTypes[0].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE)) )
+			{
+				asCString msg;
+				msg.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, asCDataType::CreateType(tmpl, false).Format(tmpl->nameSpace).AddressOf());
+				WriteMessage("",0,0, asMSGTYPE_ERROR, msg.AddressOf());
+				return ConfigError(asERROR, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+			}
+		}
+	}
+
+	isPrepared = false;
+
+	asSTypeBehaviour *beh = &objectType->beh;
+
+	// Verify function declaration
+	asCScriptFunction func(this, 0, asFUNC_DUMMY);
+
+	bool expectListPattern = behaviour == asBEHAVE_LIST_FACTORY || behaviour == asBEHAVE_LIST_CONSTRUCT;
+	asCScriptNode *listPattern = 0;
+	asCBuilder bld(this, 0);
+	r = bld.ParseFunctionDeclaration(objectType, decl, &func, true, &internal.paramAutoHandles, &internal.returnAutoHandle, 0, expectListPattern ? &listPattern : 0);
+	if( r < 0 )
+	{
+		if( listPattern )
+			listPattern->Destroy(this);
+		return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+	}
+	func.name.Format("$beh%d", behaviour);
+
+	if( behaviour != asBEHAVE_FACTORY && behaviour != asBEHAVE_LIST_FACTORY )
+	{
+		func.objectType = objectType;
+		func.objectType->AddRefInternal();
+	}
+
+	// Check if the method restricts that use of the template to value types or reference types
+	if( objectType->flags & asOBJ_TEMPLATE )
+	{
+		r = SetTemplateRestrictions(objectType, &func, "RegisterObjectBehaviour", decl);
+		if (r < 0)
+			return r;
+	}
+
+	if( behaviour == asBEHAVE_CONSTRUCT )
+	{
+		// Verify that the return type is void
+		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		if( objectType->flags & asOBJ_SCRIPT_OBJECT )
+		{
+			// The script object is a special case
+			asASSERT(func.parameterTypes.GetLength() == 1);
+
+			beh->construct = AddBehaviourFunction(func, internal);
+			beh->factory   = beh->construct;
+			scriptFunctions[beh->factory]->AddRefInternal();
+			beh->constructors.PushLast(beh->construct);
+			beh->factories.PushLast(beh->factory);
+			func.id = beh->construct;
+		}
+		else
+		{
+			// Verify that it is a value type
+			if( !(func.objectType->flags & asOBJ_VALUE) )
+			{
+				WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+				return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+			}
+
+			// The templates take a hidden parameter with the object type
+			if( (objectType->flags & asOBJ_TEMPLATE) &&
+				(func.parameterTypes.GetLength() == 0 ||
+				 !func.parameterTypes[0].IsReference()) )
+			{
+				WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_FIRST_PARAM_MUST_BE_REF_FOR_TEMPLATE_FACTORY);
+				return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+			}
+
+			// TODO: Verify that the same constructor hasn't been registered already
+
+			// Store all constructors in a list
+			func.id = AddBehaviourFunction(func, internal);
+			beh->constructors.PushLast(func.id);
+			if( func.parameterTypes.GetLength() == 0 ||
+				(func.parameterTypes.GetLength() == 1 && (objectType->flags & asOBJ_TEMPLATE)) )
+			{
+				beh->construct = func.id;
+			}
+			else if( func.parameterTypes.GetLength() == 1 )
+			{
+				// Is this the copy constructor?
+				asCDataType paramType = func.parameterTypes[0];
+
+				// If the parameter is object, and const reference for input or inout,
+				// and same type as this class, then this is a copy constructor.
+				if( paramType.IsObject() && paramType.IsReference() && paramType.IsReadOnly() &&
+					(func.inOutFlags[0] & asTM_INREF) && paramType.GetTypeInfo() == objectType )
+					beh->copyconstruct = func.id;
+			}
+		}
+	}
+	else if( behaviour == asBEHAVE_DESTRUCT )
+	{
+		// Must be a value type
+		if( !(func.objectType->flags & asOBJ_VALUE) )
+		{
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		if( beh->destruct )
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that the return type is void
+		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that there are no parameters
+		if( func.parameterTypes.GetLength() > 0 )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		func.id = beh->destruct = AddBehaviourFunction(func, internal);
+	}
+	else if( behaviour == asBEHAVE_LIST_CONSTRUCT )
+	{
+		func.name = "$list";
+		
+		// Verify that the return type is void
+		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Verify that it is a value type
+		if( !(func.objectType->flags & asOBJ_VALUE) )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Verify the parameters
+		// The templates take a hidden parameter with the object type
+		if( (!(objectType->flags & asOBJ_TEMPLATE) && (func.parameterTypes.GetLength() != 1 || !func.parameterTypes[0].IsReference())) || 
+			((objectType->flags & asOBJ_TEMPLATE) && (func.parameterTypes.GetLength() != 2 || !func.parameterTypes[0].IsReference() || !func.parameterTypes[1].IsReference())) )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM);
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Don't accept duplicates
+		if( beh->listFactory )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Add the function
+		func.id = AddBehaviourFunction(func, internal);
+
+		// Re-use the listFactory member, as it is not possible to have both anyway
+		beh->listFactory = func.id;
+
+		// Store the list pattern for this function
+		r = scriptFunctions[func.id]->RegisterListPattern(decl, listPattern);
+
+		if( listPattern )
+			listPattern->Destroy(this);
+
+		if( r < 0 )
+			return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+	}
+	else if( behaviour == asBEHAVE_FACTORY || behaviour == asBEHAVE_LIST_FACTORY )
+	{
+		if( behaviour == asBEHAVE_LIST_FACTORY )
+			func.name = "$list";
+		
+		// Must be a ref type and must not have asOBJ_NOHANDLE
+		if( !(objectType->flags & asOBJ_REF) || (objectType->flags & asOBJ_NOHANDLE) )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Verify that the return type is a handle to the type
+		if( func.returnType != asCDataType::CreateObjectHandle(objectType, false) )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// The templates take a hidden parameter with the object type
+		if( (objectType->flags & asOBJ_TEMPLATE) &&
+			(func.parameterTypes.GetLength() == 0 ||
+			 !func.parameterTypes[0].IsReference()) )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_FIRST_PARAM_MUST_BE_REF_FOR_TEMPLATE_FACTORY);
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		if( behaviour == asBEHAVE_LIST_FACTORY )
+		{
+			// Make sure the factory takes a reference as its last parameter
+			if( objectType->flags & asOBJ_TEMPLATE )
+			{
+				if( func.parameterTypes.GetLength() != 2 || !func.parameterTypes[1].IsReference() )
+				{
+					if( listPattern )
+						listPattern->Destroy(this);
+
+					WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_TEMPLATE_LIST_FACTORY_EXPECTS_2_REF_PARAMS);
+					return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+				}
+			}
+			else
+			{
+				if( func.parameterTypes.GetLength() != 1 || !func.parameterTypes[0].IsReference() )
+				{
+					if( listPattern )
+						listPattern->Destroy(this);
+
+					WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM);
+					return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+				}
+			}
+		}
+
+		// TODO: Verify that the same factory function hasn't been registered already
+
+		// Don't accept duplicates
+		if( behaviour == asBEHAVE_LIST_FACTORY && beh->listFactory )
+		{
+			if( listPattern )
+				listPattern->Destroy(this);
+
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Store all factory functions in a list
+		func.id = AddBehaviourFunction(func, internal);
+
+		// The list factory is a special factory and isn't stored together with the rest
+		if( behaviour != asBEHAVE_LIST_FACTORY )
+			beh->factories.PushLast(func.id);
+
+		if( (func.parameterTypes.GetLength() == 0) ||
+			(func.parameterTypes.GetLength() == 1 && (objectType->flags & asOBJ_TEMPLATE)) )
+		{
+			beh->factory = func.id;
+		}
+		else if( (func.parameterTypes.GetLength() == 1) ||
+				 (func.parameterTypes.GetLength() == 2 && (objectType->flags & asOBJ_TEMPLATE)) )
+		{
+			if( behaviour == asBEHAVE_LIST_FACTORY )
+			{
+				beh->listFactory = func.id;
+
+				// Store the list pattern for this function
+				r = scriptFunctions[func.id]->RegisterListPattern(decl, listPattern);
+
+				if( listPattern )
+					listPattern->Destroy(this);
+
+				if( r < 0 )
+					return ConfigError(r, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+			}
+			else
+			{
+				// Is this the copy factory?
+				asCDataType paramType = func.parameterTypes[func.parameterTypes.GetLength()-1];
+
+				// If the parameter is object, and const reference for input,
+				// and same type as this class, then this is a copy constructor.
+				if( paramType.IsObject() && paramType.IsReference() && paramType.IsReadOnly() && func.inOutFlags[func.parameterTypes.GetLength()-1] == asTM_INREF && paramType.GetTypeInfo() == objectType )
+					beh->copyfactory = func.id;
+			}
+		}
+	}
+	else if( behaviour == asBEHAVE_ADDREF )
+	{
+		// Must be a ref type and must not have asOBJ_NOHANDLE, nor asOBJ_SCOPED
+		if( !(func.objectType->flags & asOBJ_REF) ||
+			(func.objectType->flags & asOBJ_NOHANDLE) ||
+			(func.objectType->flags & asOBJ_SCOPED) ||
+			(func.objectType->flags & asOBJ_NOCOUNT) )
+		{
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		if( beh->addref )
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that the return type is void
+		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that there are no parameters
+		if( func.parameterTypes.GetLength() > 0 )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		func.id = beh->addref = AddBehaviourFunction(func, internal);
+	}
+	else if( behaviour == asBEHAVE_RELEASE )
+	{
+		// Must be a ref type and must not have asOBJ_NOHANDLE
+		if( !(func.objectType->flags & asOBJ_REF) ||
+			(func.objectType->flags & asOBJ_NOHANDLE) ||
+			(func.objectType->flags & asOBJ_NOCOUNT) )
+		{
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		if( beh->release )
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that the return type is void
+		if( func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that there are no parameters
+		if( func.parameterTypes.GetLength() > 0 )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		func.id = beh->release = AddBehaviourFunction(func, internal);
+	}
+	else if( behaviour == asBEHAVE_TEMPLATE_CALLBACK )
+	{
+		// Must be a template type
+		if( !(func.objectType->flags & asOBJ_TEMPLATE) )
+		{
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		if( beh->templateCallback )
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that the return type is bool
+		if( func.returnType != asCDataType::CreatePrimitive(ttBool, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that there are two parameters
+		if( func.parameterTypes.GetLength() != 2 )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// The first parameter must be an inref (to receive the object type), and
+		// the second must be a bool out ref (to return if the type should or shouldn't be garbage collected)
+		if( func.inOutFlags[0] != asTM_INREF || func.inOutFlags[1] != asTM_OUTREF || !func.parameterTypes[1].IsEqualExceptRef(asCDataType::CreatePrimitive(ttBool, false)) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		func.id = beh->templateCallback = AddBehaviourFunction(func, internal);
+	}
+	else if( behaviour >= asBEHAVE_FIRST_GC &&
+		     behaviour <= asBEHAVE_LAST_GC )
+	{
+		// Only allow GC behaviours for types registered to be garbage collected
+		if( !(func.objectType->flags & asOBJ_GC) )
+		{
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Verify parameter count
+		if( (behaviour == asBEHAVE_GETREFCOUNT ||
+			 behaviour == asBEHAVE_SETGCFLAG   ||
+			 behaviour == asBEHAVE_GETGCFLAG) &&
+			func.parameterTypes.GetLength() != 0 )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		if( (behaviour == asBEHAVE_ENUMREFS ||
+			 behaviour == asBEHAVE_RELEASEREFS) &&
+			func.parameterTypes.GetLength() != 1 )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify return type
+		if( behaviour == asBEHAVE_GETREFCOUNT &&
+			func.returnType != asCDataType::CreatePrimitive(ttInt, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		if( behaviour == asBEHAVE_GETGCFLAG &&
+			func.returnType != asCDataType::CreatePrimitive(ttBool, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		if( (behaviour == asBEHAVE_SETGCFLAG ||
+			 behaviour == asBEHAVE_ENUMREFS  ||
+			 behaviour == asBEHAVE_RELEASEREFS) &&
+			func.returnType != asCDataType::CreatePrimitive(ttVoid, false) )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		if( behaviour == asBEHAVE_GETREFCOUNT )
+			func.id = beh->gcGetRefCount = AddBehaviourFunction(func, internal);
+		else if( behaviour == asBEHAVE_SETGCFLAG )
+			func.id = beh->gcSetFlag = AddBehaviourFunction(func, internal);
+		else if( behaviour == asBEHAVE_GETGCFLAG )
+			func.id = beh->gcGetFlag = AddBehaviourFunction(func, internal);
+		else if( behaviour == asBEHAVE_ENUMREFS )
+			func.id = beh->gcEnumReferences = AddBehaviourFunction(func, internal);
+		else if( behaviour == asBEHAVE_RELEASEREFS )
+			func.id = beh->gcReleaseAllReferences = AddBehaviourFunction(func, internal);
+	}
+	else if ( behaviour == asBEHAVE_GET_WEAKREF_FLAG )
+	{
+		// This behaviour is only allowed for reference types
+		if( !(func.objectType->flags & asOBJ_REF) )
+		{
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Don't allow it if the type is registered with nohandle or scoped
+		if( func.objectType->flags & (asOBJ_NOHANDLE|asOBJ_SCOPED) )
+		{
+			WriteMessage("", 0, 0, asMSGTYPE_ERROR, TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE);
+			return ConfigError(asILLEGAL_BEHAVIOUR_FOR_TYPE, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+		}
+
+		// Verify that the return type is a reference since it needs to return a pointer to an asISharedBool
+		if( !func.returnType.IsReference() )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		// Verify that there are no parameters
+		if( func.parameterTypes.GetLength() != 0 )
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		if( beh->getWeakRefFlag )
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+		func.id = beh->getWeakRefFlag = AddBehaviourFunction(func, internal);
+	}
+	else
+	{
+		asASSERT(false);
+
+		return ConfigError(asINVALID_ARG, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+	}
+
+	if( func.id < 0 )
+		return ConfigError(func.id, "RegisterObjectBehaviour", objectType->name.AddressOf(), decl);
+
+	// Return function id as success
+	return func.id;
+}
+
+int asCScriptEngine::SetTemplateRestrictions(asCObjectType *templateType, asCScriptFunction *func, const char *caller, const char *decl)
+{
+	asASSERT(templateType->flags & asOBJ_TEMPLATE);
+
+	for (asUINT subTypeIdx = 0; subTypeIdx < templateType->templateSubTypes.GetLength(); subTypeIdx++)
+	{
+		if (func->returnType.GetTypeInfo() == templateType->templateSubTypes[subTypeIdx].GetTypeInfo())
+		{
+			if (func->returnType.IsObjectHandle())
+				templateType->acceptValueSubType = false;
+			else if (!func->returnType.IsReference())
+				templateType->acceptRefSubType = false;
+
+			// Can't support template subtypes by value, since each type is treated differently in the ABI
+			if (!func->returnType.IsObjectHandle() && !func->returnType.IsReference())
+				return ConfigError(asNOT_SUPPORTED, caller, templateType->name.AddressOf(), decl);
+		}
+
+		for (asUINT n = 0; n < func->parameterTypes.GetLength(); n++)
+		{
+			if (func->parameterTypes[n].GetTypeInfo() == templateType->templateSubTypes[subTypeIdx].GetTypeInfo())
+			{
+				if (func->parameterTypes[n].IsObjectHandle() || 
+					(!ep.allowUnsafeReferences && func->parameterTypes[n].IsReference() && func->inOutFlags[n] == asTM_INOUTREF))
+					templateType->acceptValueSubType = false;
+				else if (!func->parameterTypes[n].IsReference())
+					templateType->acceptRefSubType = false;
+
+				// Can't support template subtypes by value, since each type is treated differently in the ABI
+				if (!func->parameterTypes[n].IsObjectHandle() && !func->parameterTypes[n].IsReference())
+					return ConfigError(asNOT_SUPPORTED, caller, templateType->name.AddressOf(), decl);
+			}
+		}
+	}
+
+	return asSUCCESS;
+}
+
+int asCScriptEngine::VerifyVarTypeNotInFunction(asCScriptFunction *func)
+{
+	// Don't allow var type in this function
+	if( func->returnType.GetTokenType() == ttQuestion )
+		return asINVALID_DECLARATION;
+
+	for( unsigned int n = 0; n < func->parameterTypes.GetLength(); n++ )
+		if( func->parameterTypes[n].GetTokenType() == ttQuestion )
+			return asINVALID_DECLARATION;
+
+	return 0;
+}
+
+int asCScriptEngine::AddBehaviourFunction(asCScriptFunction &func, asSSystemFunctionInterface &internal)
+{
+	asUINT n;
+
+	int id = GetNextScriptFunctionId();
+
+	asSSystemFunctionInterface *newInterface = asNEW(asSSystemFunctionInterface)(internal);
+	if( newInterface == 0 )
+		return asOUT_OF_MEMORY;
+
+	asCScriptFunction *f = asNEW(asCScriptFunction)(this, 0, asFUNC_SYSTEM);
+	if( f == 0 )
+	{
+		asDELETE(newInterface, asSSystemFunctionInterface);
+		return asOUT_OF_MEMORY;
+	}
+
+	asASSERT(func.name != "" && func.name != "f");
+	f->name           = func.name;
+	f->sysFuncIntf    = newInterface;
+	f->returnType     = func.returnType;
+	f->objectType     = func.objectType;
+	if( f->objectType )
+		f->objectType->AddRefInternal();
+	f->id             = id;
+	f->SetReadOnly(func.IsReadOnly());
+	f->accessMask     = defaultAccessMask;
+	f->parameterTypes = func.parameterTypes;
+	f->parameterNames = func.parameterNames;
+	f->inOutFlags     = func.inOutFlags;
+	f->traits         = func.traits;
+	for( n = 0; n < func.defaultArgs.GetLength(); n++ )
+		if( func.defaultArgs[n] )
+			f->defaultArgs.PushLast(asNEW(asCString)(*func.defaultArgs[n]));
+		else
+			f->defaultArgs.PushLast(0);
+
+	AddScriptFunction(f);
+
+	// If parameter type from other groups are used, add references
+	currentGroup->AddReferencesForFunc(this, f);
+
+	return id;
+}
+
+// interface
+int asCScriptEngine::RegisterGlobalProperty(const char *declaration, void *pointer)
+{
+	// Don't accept a null pointer
+	if( pointer == 0 )
+		return ConfigError(asINVALID_ARG, "RegisterGlobalProperty", declaration, 0);
+
+	asCDataType type;
+	asCString name;
+
+	int r;
+	asCBuilder bld(this, 0);
+	if( (r = bld.VerifyProperty(0, declaration, name, type, defaultNamespace)) < 0 )
+		return ConfigError(r, "RegisterGlobalProperty", declaration, 0);
+
+	// Don't allow registering references as global properties
+	if( type.IsReference() )
+		return ConfigError(asINVALID_TYPE, "RegisterGlobalProperty", declaration, 0);
+
+	// Store the property info
+	asCGlobalProperty *prop = AllocateGlobalProperty();
+	prop->name        = name;
+	prop->nameSpace   = defaultNamespace;
+	prop->type        = type;
+	prop->accessMask  = defaultAccessMask;
+
+	prop->SetRegisteredAddress(pointer);
+	varAddressMap.Insert(prop->GetAddressOfValue(), prop);
+
+	asUINT idx = registeredGlobalProps.Put(prop);
+	prop->AddRef();
+	currentGroup->globalProps.PushLast(prop);
+
+	currentGroup->AddReferencesForType(this, type.GetTypeInfo());
+
+	// Return the index of the property to signal success
+	return int(idx);
+}
+
+// internal
+asCGlobalProperty *asCScriptEngine::AllocateGlobalProperty()
+{
+	asCGlobalProperty *prop = asNEW(asCGlobalProperty);
+	if( prop == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+
+	// First check the availability of a free slot
+	if( freeGlobalPropertyIds.GetLength() )
+	{
+		prop->id = freeGlobalPropertyIds.PopLast();
+		globalProperties[prop->id] = prop;
+		return prop;
+	}
+
+	prop->id = (asUINT)globalProperties.GetLength();
+	globalProperties.PushLast(prop);
+	return prop;
+}
+
+// internal
+void asCScriptEngine::RemoveGlobalProperty(asCGlobalProperty *prop)
+{
+	int index = globalProperties.IndexOf(prop);
+	if( index >= 0 )
+	{
+		freeGlobalPropertyIds.PushLast(index);
+		globalProperties[index] = 0;
+
+		asSMapNode<void*, asCGlobalProperty*> *node;
+		varAddressMap.MoveTo(&node, prop->GetAddressOfValue());
+		asASSERT(node);
+		if( node )
+			varAddressMap.Erase(node);
+
+		prop->Release();
+	}
+}
+
+// interface
+asUINT asCScriptEngine::GetGlobalPropertyCount() const
+{
+	return asUINT(registeredGlobalProps.GetSize());
+}
+
+// interface
+// TODO: If the typeId ever encodes the const flag, then the isConst parameter should be removed
+int asCScriptEngine::GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace, int *typeId, bool *isConst, const char **configGroup, void **pointer, asDWORD *accessMask) const
+{
+	const asCGlobalProperty *prop = registeredGlobalProps.Get(index);
+	if( !prop )
+		return asINVALID_ARG;
+
+	if( name )       *name       = prop->name.AddressOf();
+	if( nameSpace )  *nameSpace  = prop->nameSpace->name.AddressOf();
+	if( typeId )     *typeId     = GetTypeIdFromDataType(prop->type);
+	if( isConst )    *isConst    = prop->type.IsReadOnly();
+	if( pointer )    *pointer    = prop->GetRegisteredAddress();
+	if( accessMask ) *accessMask = prop->accessMask;
+
+	if( configGroup )
+	{
+		asCConfigGroup *group = FindConfigGroupForGlobalVar(index);
+		if( group )
+			*configGroup = group->groupName.AddressOf();
+		else
+			*configGroup = 0;
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+int asCScriptEngine::GetGlobalPropertyIndexByName(const char *in_name) const
+{
+	asCString name;
+	asSNameSpace *ns = 0;
+	if( DetermineNameAndNamespace(in_name, defaultNamespace, name, ns) < 0 )
+		return asINVALID_ARG;
+			
+	// Find the global var id
+	while( ns )
+	{
+		int id = registeredGlobalProps.GetFirstIndex(ns, name);
+		if( id >= 0 )
+			return id;
+
+		// Recursively search parent namespace
+		ns = GetParentNameSpace(ns);
+	}
+
+	return asNO_GLOBAL_VAR;
+}
+
+// interface
+int asCScriptEngine::GetGlobalPropertyIndexByDecl(const char *decl) const
+{
+	// This const cast is OK. The builder won't modify the engine
+	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	asCString name;
+	asSNameSpace *ns;
+	asCDataType dt;
+	int r = bld.ParseVariableDeclaration(decl, defaultNamespace, name, ns, dt);
+	if( r < 0 )
+		return r;
+
+	// Search for a match
+	while( ns )
+	{
+		int id = registeredGlobalProps.GetFirstIndex(ns, name, asCCompGlobPropType(dt));
+		if( id >= 0 )
+			return id;
+
+		ns = GetParentNameSpace(ns);
+	}
+
+	return asNO_GLOBAL_VAR;
+}
+
+// interface
+int asCScriptEngine::RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary, int compositeOffset, bool isCompositeIndirect)
+{
+	if( obj == 0 )
+		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
+
+	// Determine the object type
+	asCDataType dt;
+	asCBuilder bld(this, 0);
+	int r = bld.ParseDataType(obj, &dt, defaultNamespace);
+	if( r < 0 )
+		return ConfigError(r, "RegisterObjectMethod", obj, declaration);
+
+	// Don't allow application to modify primitives or handles
+	if( dt.GetTypeInfo() == 0 || (dt.IsObjectHandle() && !(dt.GetTypeInfo()->GetFlags() & asOBJ_IMPLICIT_HANDLE)))
+		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
+
+	// Don't allow application to modify built-in types or funcdefs
+	if( dt.GetTypeInfo() == &functionBehaviours ||
+		dt.GetTypeInfo() == &scriptTypeBehaviours ||
+		CastToFuncdefType(dt.GetTypeInfo()) )
+		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", obj, declaration);
+
+	// Don't allow modifying generated template instances
+	if( dt.GetTypeInfo() && (dt.GetTypeInfo()->flags & asOBJ_TEMPLATE) && generatedTemplateTypes.Exists(CastToObjectType(dt.GetTypeInfo())) )
+		return ConfigError(asINVALID_TYPE, "RegisterObjectMethod", obj, declaration);
+
+	return RegisterMethodToObjectType(CastToObjectType(dt.GetTypeInfo()), declaration, funcPointer, callConv, auxiliary, compositeOffset, isCompositeIndirect);
+}
+
+// internal
+int asCScriptEngine::RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary, int compositeOffset, bool isCompositeIndirect)
+{
+#ifdef AS_MAX_PORTABILITY
+	if( callConv != asCALL_GENERIC )
+		return ConfigError(asNOT_SUPPORTED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+#endif
+
+	asSSystemFunctionInterface internal;
+	int r = DetectCallingConvention(true, funcPointer, callConv, auxiliary, &internal);
+	if( r < 0 )
+		return ConfigError(r, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+
+	internal.compositeOffset = compositeOffset;
+	internal.isCompositeIndirect = isCompositeIndirect;
+	if( (compositeOffset || isCompositeIndirect) && callConv != asCALL_THISCALL )
+		return ConfigError(asINVALID_ARG, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+
+	// TODO: cleanup: This is identical to what is in RegisterMethodToObjectType
+	// If the object type is a template, make sure there are no generated instances already
+	if( objectType->flags & asOBJ_TEMPLATE )
+	{
+		for( asUINT n = 0; n < generatedTemplateTypes.GetLength(); n++ )
+		{
+			asCObjectType *tmpl = generatedTemplateTypes[n];
+			if( tmpl->name == objectType->name &&
+				tmpl->nameSpace == objectType->nameSpace &&
+				!(tmpl->templateSubTypes[0].GetTypeInfo() && (tmpl->templateSubTypes[0].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE)) )
+			{
+				asCString msg;
+				msg.Format(TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER, asCDataType::CreateType(tmpl, false).Format(tmpl->nameSpace).AddressOf());
+				WriteMessage("",0,0, asMSGTYPE_ERROR, msg.AddressOf());
+				return ConfigError(asERROR, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+			}
+		}
+	}
+
+	isPrepared = false;
+
+	// Put the system function in the list of system functions
+	asSSystemFunctionInterface *newInterface = asNEW(asSSystemFunctionInterface)(internal);
+	if( newInterface == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+
+	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_SYSTEM);
+	if( func == 0 )
+	{
+		asDELETE(newInterface, asSSystemFunctionInterface);
+		return ConfigError(asOUT_OF_MEMORY, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+	}
+
+	func->sysFuncIntf = newInterface;
+	func->objectType  = objectType;
+	func->objectType->AddRefInternal();
+
+	asCBuilder bld(this, 0);
+	r = bld.ParseFunctionDeclaration(func->objectType, declaration, func, true, &newInterface->paramAutoHandles, &newInterface->returnAutoHandle);
+	if( r < 0 )
+	{
+		// Set as dummy function before deleting
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asINVALID_DECLARATION, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+	}
+
+	// Check name conflicts
+	r = bld.CheckNameConflictMember(objectType, func->name.AddressOf(), 0, 0, false, false);
+	if( r < 0 )
+	{
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asNAME_TAKEN, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+	}
+
+	// Validate property signature
+	if( func->IsProperty() && (r = bld.ValidateVirtualProperty(func)) < 0 )
+	{
+		// Set as dummy function before deleting
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		if( r == -5 )
+			return ConfigError(asNAME_TAKEN, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+		else
+			return ConfigError(asINVALID_DECLARATION, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+	}
+	
+	// Check against duplicate methods
+	if( func->name == "opConv" || func->name == "opImplConv" || func->name == "opCast" || func->name == "opImplCast" )
+	{
+		// opConv and opCast are special methods that the compiler differentiates between by the return type
+		for( asUINT n = 0; n < func->objectType->methods.GetLength(); n++ )
+		{
+			asCScriptFunction *f = scriptFunctions[func->objectType->methods[n]];
+			if( f->name == func->name &&
+				f->IsSignatureExceptNameEqual(func) )
+			{
+				func->funcType = asFUNC_DUMMY;
+				asDELETE(func,asCScriptFunction);
+				return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+			}
+		}
+	}
+	else
+	{
+		for( asUINT n = 0; n < func->objectType->methods.GetLength(); n++ )
+		{
+			asCScriptFunction *f = scriptFunctions[func->objectType->methods[n]];
+			if( f->name == func->name &&
+				f->IsSignatureExceptNameAndReturnTypeEqual(func) )
+			{
+				func->funcType = asFUNC_DUMMY;
+				asDELETE(func,asCScriptFunction);
+				return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+			}
+		}
+	}
+
+	func->id = GetNextScriptFunctionId();
+	func->objectType->methods.PushLast(func->id);
+	func->accessMask = defaultAccessMask;
+	AddScriptFunction(func);
+
+	// If parameter type from other groups are used, add references
+	currentGroup->AddReferencesForFunc(this, func);
+
+	// Check if the method restricts that use of the template to value types or reference types
+	if( func->objectType->flags & asOBJ_TEMPLATE )
+	{
+		r = SetTemplateRestrictions(func->objectType, func, "RegisterObjectMethod", declaration);
+		if (r < 0)
+			return r;
+	}
+
+	// TODO: beh.copy member will be removed, so this is not necessary
+	// Is this the default copy behaviour?
+	if( func->name == "opAssign" && func->parameterTypes.GetLength() == 1 && !func->IsReadOnly() &&
+		((objectType->flags & asOBJ_SCRIPT_OBJECT) || func->parameterTypes[0].IsEqualExceptRefAndConst(asCDataType::CreateType(func->objectType, false))) )
+	{
+		if( func->objectType->beh.copy != 0 )
+			return ConfigError(asALREADY_REGISTERED, "RegisterObjectMethod", objectType->name.AddressOf(), declaration);
+
+		func->objectType->beh.copy = func->id;
+		func->AddRefInternal();
+	}
+
+	// Return the function id as success
+	return func->id;
+}
+
+// interface
+int asCScriptEngine::RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary)
+{
+#ifdef AS_MAX_PORTABILITY
+	if( callConv != asCALL_GENERIC )
+		return ConfigError(asNOT_SUPPORTED, "RegisterGlobalFunction", declaration, 0);
+#endif
+
+	asSSystemFunctionInterface internal;
+	int r = DetectCallingConvention(false, funcPointer, callConv, auxiliary, &internal);
+	if( r < 0 )
+		return ConfigError(r, "RegisterGlobalFunction", declaration, 0);
+
+	isPrepared = false;
+
+	// Put the system function in the list of system functions
+	asSSystemFunctionInterface *newInterface = asNEW(asSSystemFunctionInterface)(internal);
+	if( newInterface == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterGlobalFunction", declaration, 0);
+
+	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_SYSTEM);
+	if( func == 0 )
+	{
+		asDELETE(newInterface, asSSystemFunctionInterface);
+		return ConfigError(asOUT_OF_MEMORY, "RegisterGlobalFunction", declaration, 0);
+	}
+
+	func->sysFuncIntf = newInterface;
+
+	asCBuilder bld(this, 0);
+	r = bld.ParseFunctionDeclaration(0, declaration, func, true, &newInterface->paramAutoHandles, &newInterface->returnAutoHandle, defaultNamespace);
+	if( r < 0 )
+	{
+		// Set as dummy function before deleting
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asINVALID_DECLARATION, "RegisterGlobalFunction", declaration, 0);
+	}
+
+	// TODO: namespace: What if the declaration defined an explicit namespace?
+	func->nameSpace = defaultNamespace;
+
+	// Check name conflicts
+	r = bld.CheckNameConflict(func->name.AddressOf(), 0, 0, defaultNamespace, false, false, false);
+	if( r < 0 )
+	{
+		// Set as dummy function before deleting
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asNAME_TAKEN, "RegisterGlobalFunction", declaration, 0);
+	}
+	
+	// Validate property signature
+	if( func->IsProperty() && (r = bld.ValidateVirtualProperty(func)) < 0 )
+	{
+		// Set as dummy function before deleting
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		if( r == -5 )
+			return ConfigError(asNAME_TAKEN, "RegisterGlobalFunction", declaration, 0);
+		else
+			return ConfigError(asINVALID_DECLARATION, "RegisterGlobalFunction", declaration, 0);
+	}
+
+	// Make sure the function is not identical to a previously registered function
+	asUINT n;
+	const asCArray<unsigned int> &idxs = registeredGlobalFuncs.GetIndexes(func->nameSpace, func->name);
+	for( n = 0; n < idxs.GetLength(); n++ )
+	{
+		asCScriptFunction *f = registeredGlobalFuncs.Get(idxs[n]);
+		if( f->IsSignatureExceptNameAndReturnTypeEqual(func) )
+		{
+			func->funcType = asFUNC_DUMMY;
+			asDELETE(func,asCScriptFunction);
+			return ConfigError(asALREADY_REGISTERED, "RegisterGlobalFunction", declaration, 0);
+		}
+	}
+
+	func->id = GetNextScriptFunctionId();
+	AddScriptFunction(func);
+
+	currentGroup->scriptFunctions.PushLast(func);
+	func->accessMask = defaultAccessMask;
+	registeredGlobalFuncs.Put(func);
+
+	// If parameter type from other groups are used, add references
+	currentGroup->AddReferencesForFunc(this, func);
+
+	// Return the function id as success
+	return func->id;
+}
+
+// interface
+asUINT asCScriptEngine::GetGlobalFunctionCount() const
+{
+	// Don't count the builtin delegate factory
+	return asUINT(registeredGlobalFuncs.GetSize()-1);
+}
+
+// interface
+asIScriptFunction *asCScriptEngine::GetGlobalFunctionByIndex(asUINT index) const
+{
+	// Don't count the builtin delegate factory
+	index++;
+
+	if( index >= registeredGlobalFuncs.GetSize() )
+		return 0;
+
+	return static_cast<asIScriptFunction*>(const_cast<asCScriptFunction*>(registeredGlobalFuncs.Get(index)));
+}
+
+// interface
+asIScriptFunction *asCScriptEngine::GetGlobalFunctionByDecl(const char *decl) const
+{
+	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	asCScriptFunction func(const_cast<asCScriptEngine*>(this), 0, asFUNC_DUMMY);
+	int r = bld.ParseFunctionDeclaration(0, decl, &func, false, 0, 0, defaultNamespace);
+	if( r < 0 )
+		return 0;
+
+	asSNameSpace *ns = defaultNamespace;
+	// Search script functions for matching interface
+	while( ns )
+	{
+		asIScriptFunction *f = 0;
+		const asCArray<unsigned int> &idxs = registeredGlobalFuncs.GetIndexes(ns, func.name);
+		for( unsigned int n = 0; n < idxs.GetLength(); n++ )
+		{
+			const asCScriptFunction *funcPtr = registeredGlobalFuncs.Get(idxs[n]);
+			if( funcPtr->objectType == 0 &&
+				func.returnType                 == funcPtr->returnType &&
+				func.parameterTypes.GetLength() == funcPtr->parameterTypes.GetLength()
+				)
+			{
+				bool match = true;
+				for( asUINT p = 0; p < func.parameterTypes.GetLength(); ++p )
+				{
+					if( func.parameterTypes[p] != funcPtr->parameterTypes[p] )
+					{
+						match = false;
+						break;
+					}
+				}
+
+				if( match )
+				{
+					if( f == 0 )
+						f = const_cast<asCScriptFunction*>(funcPtr);
+					else
+						// Multiple functions
+						return 0;
+				}
+			}
+		}
+
+		if( f )
+			return f;
+
+		// Recursively search parent namespaces
+		ns = GetParentNameSpace(ns);
+	}
+
+	return 0;
+}
+
+
+asCTypeInfo *asCScriptEngine::GetRegisteredType(const asCString &type, asSNameSpace *ns) const
+{
+	asSMapNode<asSNameSpaceNamePair, asCTypeInfo *> *cursor;
+	if( allRegisteredTypes.MoveTo(&cursor, asSNameSpaceNamePair(ns, type)) )
+		return cursor->value;
+
+	return 0;
+}
+
+
+
+
+void asCScriptEngine::PrepareEngine()
+{
+	if( isPrepared ) return;
+	if( configFailed ) return;
+
+	asUINT n;
+	for( n = 0; n < scriptFunctions.GetLength(); n++ )
+	{
+		// Determine the host application interface
+		if( scriptFunctions[n] && scriptFunctions[n]->funcType == asFUNC_SYSTEM )
+		{
+			if( scriptFunctions[n]->sysFuncIntf->callConv == ICC_GENERIC_FUNC ||
+				scriptFunctions[n]->sysFuncIntf->callConv == ICC_GENERIC_METHOD )
+				PrepareSystemFunctionGeneric(scriptFunctions[n], scriptFunctions[n]->sysFuncIntf, this);
+			else
+				PrepareSystemFunction(scriptFunctions[n], scriptFunctions[n]->sysFuncIntf, this);
+		}
+	}
+
+	// Validate object type registrations
+	for( n = 0; n < registeredObjTypes.GetLength(); n++ )
+	{
+		asCObjectType *type = registeredObjTypes[n];
+		if( type && !(type->flags & asOBJ_SCRIPT_OBJECT) )
+		{
+			bool missingBehaviour = false;
+			const char *infoMsg = 0;
+
+			// Verify that GC types have all behaviours
+			if( type->flags & asOBJ_GC )
+			{
+				if (type->flags & asOBJ_REF)
+				{
+					if (type->beh.addref == 0 ||
+						type->beh.release == 0 ||
+						type->beh.gcGetRefCount == 0 ||
+						type->beh.gcSetFlag == 0 ||
+						type->beh.gcGetFlag == 0 ||
+						type->beh.gcEnumReferences == 0 ||
+						type->beh.gcReleaseAllReferences == 0)
+					{
+						infoMsg = TXT_GC_REQUIRE_ADD_REL_GC_BEHAVIOUR;
+						missingBehaviour = true;
+					}
+				}
+				else
+				{
+					if (type->beh.gcEnumReferences == 0)
+					{
+						infoMsg = TXT_VALUE_GC_REQUIRE_GC_BEHAVIOUR;
+						missingBehaviour = true;
+					}
+				}
+			}
+			// Verify that scoped ref types have the release behaviour
+			if( type->flags & asOBJ_SCOPED )
+			{
+				if( type->beh.release == 0 )
+				{
+					infoMsg = TXT_SCOPE_REQUIRE_REL_BEHAVIOUR;
+					missingBehaviour = true;
+				}
+			}
+			// Verify that ref types have add ref and release behaviours
+			if( (type->flags & asOBJ_REF) &&
+				!(type->flags & asOBJ_SCOPED) &&
+				!(type->flags & asOBJ_NOHANDLE) &&
+				!(type->flags & asOBJ_NOCOUNT) )
+			{
+				if( type->beh.addref  == 0 ||
+					type->beh.release == 0 )
+				{
+					infoMsg = TXT_REF_REQUIRE_ADD_REL_BEHAVIOUR;
+					missingBehaviour = true;
+				}
+			}
+			// Verify that non-pod value types have the constructor and destructor registered
+			if( (type->flags & asOBJ_VALUE) &&
+				!(type->flags & asOBJ_POD) )
+			{
+				if( type->beh.constructors.GetLength() == 0 ||
+					type->beh.destruct  == 0 )
+				{
+					infoMsg = TXT_NON_POD_REQUIRE_CONSTR_DESTR_BEHAVIOUR;
+					missingBehaviour = true;
+				}
+			}
+
+			if( missingBehaviour )
+			{
+				asCString str;
+				str.Format(TXT_TYPE_s_IS_MISSING_BEHAVIOURS, type->name.AddressOf());
+				WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+				WriteMessage("", 0, 0, asMSGTYPE_INFORMATION, infoMsg);
+				ConfigError(asINVALID_CONFIGURATION, 0, 0, 0);
+			}
+		}
+	}
+
+	isPrepared = true;
+}
+
+int asCScriptEngine::ConfigError(int err, const char *funcName, const char *arg1, const char *arg2)
+{
+	configFailed = true;
+	if( funcName )
+	{
+		asCString str;
+		if( arg1 )
+		{
+			if( arg2 )
+				str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_AND_s_s_d, funcName, arg1, arg2, errorNames[-err], err);
+			else
+				str.Format(TXT_FAILED_IN_FUNC_s_WITH_s_s_d, funcName, arg1, errorNames[-err], err);
+		}
+		else
+			str.Format(TXT_FAILED_IN_FUNC_s_s_d, funcName, errorNames[-err], err);
+
+		WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+	}
+	return err;
+}
+
+// interface
+int asCScriptEngine::RegisterDefaultArrayType(const char *type)
+{
+	asCBuilder bld(this, 0);
+	asCDataType dt;
+	int r = bld.ParseDataType(type, &dt, defaultNamespace);
+	if( r < 0 ) return r;
+
+	if( dt.GetTypeInfo() == 0 ||
+		!(dt.GetTypeInfo()->GetFlags() & asOBJ_TEMPLATE) )
+		return asINVALID_TYPE;
+
+	defaultArrayObjectType = CastToObjectType(dt.GetTypeInfo());
+	defaultArrayObjectType->AddRefInternal();
+
+	return 0;
+}
+
+// interface
+int asCScriptEngine::GetDefaultArrayTypeId() const
+{
+	if( defaultArrayObjectType )
+		return GetTypeIdFromDataType(asCDataType::CreateType(defaultArrayObjectType, false));
+
+	return asINVALID_TYPE;
+}
+
+// interface
+int asCScriptEngine::RegisterStringFactory(const char *datatype, asIStringFactory *factory)
+{
+	if (factory == 0)
+		return ConfigError(asINVALID_ARG, "RegisterStringFactory", datatype, 0);
+
+	// Parse the data type
+	asCBuilder bld(this, 0);
+	asCDataType dt;
+	int r = bld.ParseDataType(datatype, &dt, defaultNamespace, true);
+	if (r < 0)
+		return ConfigError(asINVALID_TYPE, "RegisterStringFactory", datatype, 0);
+
+	// Validate the type. It must not be reference or handle
+	if (dt.IsReference() || dt.IsObjectHandle())
+		return ConfigError(asINVALID_TYPE, "RegisterStringFactory", datatype, 0);
+
+	// All string literals will be treated as const
+	dt.MakeReadOnly(true);
+
+	stringType = dt;
+	stringFactory = factory;
+
+	return asSUCCESS;
+}
+
+// interface
+int asCScriptEngine::GetStringFactoryReturnTypeId(asDWORD *flags) const
+{
+	if( stringFactory == 0 )
+		return asNO_FUNCTION;
+
+	if( flags )
+		*flags = 0;
+	return GetTypeIdFromDataType(stringType);
+}
+
+// internal
+asCModule *asCScriptEngine::GetModule(const char *name, bool create)
+{
+	// Accept null as well as zero-length string
+	if( name == 0 ) name = "";
+
+	asCModule *retModule = 0;
+
+	ACQUIRESHARED(engineRWLock);
+	if( lastModule && lastModule->m_name == name )
+		retModule = lastModule;
+	else
+	{
+		// TODO: optimize: Improve linear search
+		for( asUINT n = 0; n < scriptModules.GetLength(); ++n )
+			if( scriptModules[n] && scriptModules[n]->m_name == name )
+			{
+				retModule = scriptModules[n];
+				break;
+			}
+	}
+	RELEASESHARED(engineRWLock);
+
+	if( retModule )
+	{
+		ACQUIREEXCLUSIVE(engineRWLock);
+		lastModule = retModule;
+		RELEASEEXCLUSIVE(engineRWLock);
+
+		return retModule;
+	}
+
+	if( create )
+	{
+		retModule = asNEW(asCModule)(name, this);
+		if( retModule == 0 )
+		{
+			// Out of memory
+			return 0;
+		}
+
+		ACQUIREEXCLUSIVE(engineRWLock);
+		scriptModules.PushLast(retModule);
+		lastModule = retModule;
+		RELEASEEXCLUSIVE(engineRWLock);
+	}
+
+	return retModule;
+}
+
+asCModule *asCScriptEngine::GetModuleFromFuncId(int id)
+{
+	if( id < 0 ) return 0;
+	if( id >= (int)scriptFunctions.GetLength() ) return 0;
+	asCScriptFunction *func = scriptFunctions[id];
+	if( func == 0 ) return 0;
+	return func->module;
+}
+
+// internal
+int asCScriptEngine::RequestBuild()
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+	if( isBuilding )
+	{
+		RELEASEEXCLUSIVE(engineRWLock);
+		return asBUILD_IN_PROGRESS;
+	}
+	isBuilding = true;
+	RELEASEEXCLUSIVE(engineRWLock);
+
+	return 0;
+}
+
+// internal
+void asCScriptEngine::BuildCompleted()
+{
+	// Always free up pooled memory after a completed build
+	memoryMgr.FreeUnusedMemory();
+
+	isBuilding = false;
+}
+
+void asCScriptEngine::RemoveTemplateInstanceType(asCObjectType *t)
+{
+	// If there is a module that still owns the generated type, then don't remove it
+	if( t->module )
+		return;
+
+	// Don't remove it if there are external refernces
+	if( t->externalRefCount.get() )
+		return;
+
+	// Only remove the template instance type if no config group is using it
+	if( defaultGroup.generatedTemplateInstances.Exists(t) )
+		return;
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+		if( configGroups[n]->generatedTemplateInstances.Exists(t) )
+			return;
+
+	t->DestroyInternal();
+	templateInstanceTypes.RemoveValue(t);
+	generatedTemplateTypes.RemoveValue(t);
+	t->ReleaseInternal();
+}
+
+// internal
+asCObjectType *asCScriptEngine::GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes, asCModule *requestingModule)
+{
+	asUINT n;
+
+	// Is there any template instance type or template specialization already with this subtype?
+	for( n = 0; n < templateInstanceTypes.GetLength(); n++ )
+	{
+		asCObjectType *type = templateInstanceTypes[n];
+		if( type &&
+			type->name == templateType->name &&
+			type->nameSpace == templateType->nameSpace &&
+			type->templateSubTypes == subTypes )
+		{
+			// If the template instance is generated, then the module should hold a reference
+			// to it so the config group can determine see that the template type is in use.
+			// Template specializations will be treated as normal types
+			if( requestingModule && generatedTemplateTypes.Exists(type) )
+			{
+				if( type->module == 0 )
+				{
+					// Set the ownership of this template type
+					// It may be without ownership if it was previously created from application with for example GetTypeInfoByDecl
+					type->module = requestingModule;
+				}
+				if( !requestingModule->m_templateInstances.Exists(type) )
+				{
+					requestingModule->m_templateInstances.PushLast(type);
+					type->AddRefInternal();
+				}
+			}
+
+			return templateInstanceTypes[n];
+		}
+	}
+
+	// No previous template instance exists
+
+	// Make sure this template supports the subtype
+	for( n = 0; n < subTypes.GetLength(); n++ )
+	{
+		if( !templateType->acceptValueSubType && (subTypes[n].IsPrimitive() || (subTypes[n].GetTypeInfo()->flags & asOBJ_VALUE)) )
+			return 0;
+
+		if( !templateType->acceptRefSubType && (subTypes[n].IsObject() && (subTypes[n].GetTypeInfo()->flags & asOBJ_REF)) )
+			return 0;
+	}
+
+	// Create a new template instance type based on the templateType
+	asCObjectType *ot = asNEW(asCObjectType)(this);
+	if( ot == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+
+	ot->templateSubTypes = subTypes;
+	ot->flags            = templateType->flags;
+	ot->size             = templateType->size;
+	ot->name             = templateType->name;
+	ot->nameSpace        = templateType->nameSpace;
+
+	// If the template is being requested from a module, then the module should hold a reference to the type
+	if( requestingModule )
+	{
+		// Set the ownership of this template type
+		ot->module = requestingModule;
+		requestingModule->m_templateInstances.PushLast(ot);
+		ot->AddRefInternal();
+	}
+	else
+	{
+		// If the template type is not requested directly from a module, then set the ownership
+		// of it to the same module as one of the subtypes. If none of the subtypes are owned by]
+		// any module, the template instance will be without ownership and can be removed from the
+		// engine at any time (unless the application holds an external reference).
+		for( n = 0; n < subTypes.GetLength(); n++ )
+		{
+			if( subTypes[n].GetTypeInfo() )
+			{
+				ot->module = subTypes[n].GetTypeInfo()->module;
+				if( ot->module )
+				{
+					ot->module->m_templateInstances.PushLast(ot);
+					ot->AddRefInternal();
+					break;
+				}
+			}
+		}
+	}
+
+	// Before filling in the methods, call the template instance callback behaviour to validate the type
+	if( templateType->beh.templateCallback )
+	{
+		// If the validation is deferred then the validation will be done later,
+		// so it is necessary to continue the preparation of the template instance type
+		if( !deferValidationOfTemplateTypes )
+		{
+			asCScriptFunction *callback = scriptFunctions[templateType->beh.templateCallback];
+
+			bool dontGarbageCollect = false;
+			if( !CallGlobalFunctionRetBool(ot, &dontGarbageCollect, callback->sysFuncIntf, callback) )
+			{
+				// The type cannot be instantiated
+				ot->templateSubTypes.SetLength(0);
+				if( ot->module )
+				{
+					ot->module->m_templateInstances.RemoveValue(ot);
+					ot->ReleaseInternal();
+				}
+				ot->ReleaseInternal();
+				return 0;
+			}
+
+			// If the callback said this template instance won't be garbage collected then remove the flag
+			if( dontGarbageCollect )
+				ot->flags &= ~asOBJ_GC;
+		}
+
+		ot->beh.templateCallback = templateType->beh.templateCallback;
+		scriptFunctions[ot->beh.templateCallback]->AddRefInternal();
+	}
+
+	ot->methods = templateType->methods;
+	for( n = 0; n < ot->methods.GetLength(); n++ )
+		scriptFunctions[ot->methods[n]]->AddRefInternal();
+
+	if( templateType->flags & asOBJ_REF )
+	{
+		// Store the real factory in the constructor. This is used by the CreateScriptObject function.
+		// Otherwise it wouldn't be necessary to store the real factory ids.
+		ot->beh.construct = templateType->beh.factory;
+		ot->beh.constructors = templateType->beh.factories;
+	}
+	else
+	{
+		ot->beh.construct = templateType->beh.construct;
+		ot->beh.constructors = templateType->beh.constructors;
+	}
+	for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
+		scriptFunctions[ot->beh.constructors[n]]->AddRefInternal();
+
+
+	// Before proceeding with the generation of the template functions for the template instance it is necessary
+	// to include the new template instance type in the list of known types, otherwise it is possible that we get
+	// a infinite recursive loop as the template instance type is requested again during the generation of the
+	// template functions.
+	templateInstanceTypes.PushLast(ot);
+
+	// Store the template instance types that have been created automatically by the engine from a template type
+	// The object types in templateInstanceTypes that are not also in generatedTemplateTypes are registered template specializations
+	generatedTemplateTypes.PushLast(ot);
+
+	// Any child funcdefs must be copied to the template instance (with adjustments in case of template subtypes)
+	// This must be done before resolving other methods, to make sure the other methods that may refer to the
+	// templated funcdef will resolve to the new funcdef
+	for (n = 0; n < templateType->childFuncDefs.GetLength(); n++)
+	{
+		asCFuncdefType *funcdef = GenerateNewTemplateFuncdef(templateType, ot, templateType->childFuncDefs[n]);
+		funcdef->parentClass = ot;
+		ot->childFuncDefs.PushLast(funcdef);
+	}
+
+	// As the new template type is instantiated the engine should
+	// generate new functions to substitute the ones with the template subtype.
+	for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
+	{
+		int funcId = ot->beh.constructors[n];
+		asCScriptFunction *func = scriptFunctions[funcId];
+
+		if( GenerateNewTemplateFunction(templateType, ot, func, &func) )
+		{
+			// Release the old function, the new one already has its ref count set to 1
+			scriptFunctions[funcId]->ReleaseInternal();
+			ot->beh.constructors[n] = func->id;
+
+			if( ot->beh.construct == funcId )
+				ot->beh.construct = func->id;
+		}
+	}
+
+	ot->beh.factory = 0;
+
+	if( templateType->flags & asOBJ_REF )
+	{
+		// Generate factory stubs for each of the factories
+		for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
+		{
+			asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, ot->beh.constructors[n]);
+
+			ot->beh.factories.PushLast(func->id);
+
+			// Set the default factory as well
+			if( ot->beh.constructors[n] == ot->beh.construct )
+				ot->beh.factory = func->id;
+		}
+	}
+	else
+	{
+		// Generate factory stubs for each of the constructors
+		for( n = 0; n < ot->beh.constructors.GetLength(); n++ )
+		{
+			asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, ot->beh.constructors[n]);
+
+			if( ot->beh.constructors[n] == ot->beh.construct )
+				ot->beh.construct = func->id;
+
+			// Release previous constructor
+			scriptFunctions[ot->beh.constructors[n]]->ReleaseInternal();
+
+			ot->beh.constructors[n] = func->id;
+		}
+	}
+
+	// Generate stub for the list factory as well
+	if( templateType->beh.listFactory )
+	{
+		asCScriptFunction *func = GenerateTemplateFactoryStub(templateType, ot, templateType->beh.listFactory);
+
+		// Rename the function to easily identify it in LoadByteCode
+		func->name = "$list";
+
+		ot->beh.listFactory = func->id;
+	}
+
+	// Create new template functions for behaviours that may need to know the new object type id
+	int funcId = templateType->beh.destruct;
+	asCScriptFunction* func = scriptFunctions[funcId];
+	if (func && GenerateNewTemplateFunction(templateType, ot, func, &func))
+		ot->beh.destruct = func->id;
+	else
+	{
+		ot->beh.destruct = templateType->beh.destruct;
+		if (scriptFunctions[ot->beh.destruct]) scriptFunctions[ot->beh.destruct]->AddRefInternal();
+	}
+
+	funcId = templateType->beh.copy;
+	func = scriptFunctions[funcId];
+	if (func && GenerateNewTemplateFunction(templateType, ot, func, &func))
+		ot->beh.copy = func->id;
+	else
+	{
+		ot->beh.copy = templateType->beh.copy;
+		if (scriptFunctions[ot->beh.copy]) scriptFunctions[ot->beh.copy]->AddRefInternal();
+	}
+
+	funcId = templateType->beh.gcEnumReferences;
+	func = scriptFunctions[funcId];
+	if (func && GenerateNewTemplateFunction(templateType, ot, func, &func))
+		ot->beh.gcEnumReferences = func->id;
+	else
+	{
+		ot->beh.gcEnumReferences = templateType->beh.gcEnumReferences;
+		if (scriptFunctions[ot->beh.gcEnumReferences]) scriptFunctions[ot->beh.gcEnumReferences]->AddRefInternal();
+	}
+
+	funcId = templateType->beh.gcReleaseAllReferences;
+	func = scriptFunctions[funcId];
+	if (func && GenerateNewTemplateFunction(templateType, ot, func, &func))
+		ot->beh.gcReleaseAllReferences = func->id;
+	else
+	{
+		ot->beh.gcReleaseAllReferences = templateType->beh.gcReleaseAllReferences;
+		if (scriptFunctions[ot->beh.gcReleaseAllReferences]) scriptFunctions[ot->beh.gcReleaseAllReferences]->AddRefInternal();
+	}
+
+	// For the last behaviours no unique copy is generated. It is not expected that
+	// anyone will need to see the correct objectType for these to implement them
+	ot->beh.addref = templateType->beh.addref;
+	if( scriptFunctions[ot->beh.addref] ) scriptFunctions[ot->beh.addref]->AddRefInternal();
+	ot->beh.release = templateType->beh.release;
+	if( scriptFunctions[ot->beh.release] ) scriptFunctions[ot->beh.release]->AddRefInternal();
+	ot->beh.gcGetRefCount = templateType->beh.gcGetRefCount;
+	if( scriptFunctions[ot->beh.gcGetRefCount] ) scriptFunctions[ot->beh.gcGetRefCount]->AddRefInternal();
+	ot->beh.gcSetFlag = templateType->beh.gcSetFlag;
+	if( scriptFunctions[ot->beh.gcSetFlag] ) scriptFunctions[ot->beh.gcSetFlag]->AddRefInternal();
+	ot->beh.gcGetFlag = templateType->beh.gcGetFlag;
+	if( scriptFunctions[ot->beh.gcGetFlag] ) scriptFunctions[ot->beh.gcGetFlag]->AddRefInternal();
+	ot->beh.getWeakRefFlag = templateType->beh.getWeakRefFlag;
+	if( scriptFunctions[ot->beh.getWeakRefFlag] ) scriptFunctions[ot->beh.getWeakRefFlag]->AddRefInternal();
+
+	// As the new template type is instantiated, the engine should
+	// generate new functions to substitute the ones with the template subtype.
+	for( n = 0; n < ot->methods.GetLength(); n++ )
+	{
+		funcId = ot->methods[n];
+		func = scriptFunctions[funcId];
+
+		if( GenerateNewTemplateFunction(templateType, ot, func, &func) )
+		{
+			// Release the old function, the new one already has its ref count set to 1
+			scriptFunctions[funcId]->ReleaseInternal();
+			ot->methods[n] = func->id;
+		}
+	}
+
+	// Increase ref counter for sub type if it is an object type
+	for( n = 0; n < ot->templateSubTypes.GetLength(); n++ )
+		if( ot->templateSubTypes[n].GetTypeInfo() )
+			ot->templateSubTypes[n].GetTypeInfo()->AddRefInternal();
+
+	// Copy the properties to the template instance
+	for( n = 0; n < templateType->properties.GetLength(); n++ )
+	{
+		asCObjectProperty *prop = templateType->properties[n];
+		ot->properties.PushLast(asNEW(asCObjectProperty)(*prop));
+		if( prop->type.GetTypeInfo() )
+			prop->type.GetTypeInfo()->AddRefInternal();
+	}
+
+	return ot;
+}
+
+// interface
+asILockableSharedBool *asCScriptEngine::GetWeakRefFlagOfScriptObject(void *obj, const asITypeInfo *type) const
+{
+	// Make sure it is not a null pointer
+	if( obj == 0 || type == 0 ) return 0;
+
+	const asCObjectType *objType = static_cast<const asCObjectType *>(type);
+	asILockableSharedBool *dest = 0;
+	if( objType->beh.getWeakRefFlag )
+	{
+		// Call the getweakrefflag behaviour
+		dest = reinterpret_cast<asILockableSharedBool*>(CallObjectMethodRetPtr(obj, objType->beh.getWeakRefFlag));
+	}
+	return dest;
+}
+
+// internal
+// orig is the parameter type that is to be replaced
+// tmpl is the registered template. Used to find which subtype is being replaced
+// ot is the new template instance that is being created. Used to find the target type
+asCDataType asCScriptEngine::DetermineTypeForTemplate(const asCDataType &orig, asCObjectType *tmpl, asCObjectType *ot)
+{
+	asCDataType dt;
+	if( orig.GetTypeInfo() && (orig.GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE) )
+	{
+		bool found = false;
+		for( asUINT n = 0; n < tmpl->templateSubTypes.GetLength(); n++ )
+		{
+			if( orig.GetTypeInfo() == tmpl->templateSubTypes[n].GetTypeInfo() )
+			{
+				found = true;
+				dt = ot->templateSubTypes[n];
+				if( orig.IsObjectHandle() && !ot->templateSubTypes[n].IsObjectHandle() )
+				{
+					dt.MakeHandle(true, true);
+					asASSERT(dt.IsObjectHandle());
+					if( orig.IsHandleToConst() )
+						dt.MakeHandleToConst(true);
+					dt.MakeReference(orig.IsReference());
+					dt.MakeReadOnly(orig.IsReadOnly());
+				}
+				else
+				{
+					// The target type is a handle, then check if the application
+					// wants this handle to be to a const object. This is done by
+					// flagging the type with 'if_handle_then_const' in the declaration.
+					if (dt.IsObjectHandle() && orig.HasIfHandleThenConst())
+						dt.MakeHandleToConst(true);
+
+					dt.MakeReference(orig.IsReference());
+					dt.MakeReadOnly(ot->templateSubTypes[n].IsReadOnly() || orig.IsReadOnly());
+
+					// If the target is a @& then don't make the handle const, 
+					// as it is not possible to declare functions with @const &
+					if (orig.IsReference() && dt.IsObjectHandle())
+						dt.MakeReadOnly(false);
+				}
+				break;
+			}
+		}
+		asASSERT( found );
+		UNUSED_VAR( found );
+	}
+	else if( orig.GetTypeInfo() == tmpl )
+	{
+		if( orig.IsObjectHandle() )
+			dt = asCDataType::CreateObjectHandle(ot, false);
+		else
+			dt = asCDataType::CreateType(ot, false);
+
+		dt.MakeReference(orig.IsReference());
+		dt.MakeReadOnly(orig.IsReadOnly());
+	}
+	else if( orig.GetTypeInfo() && (orig.GetTypeInfo()->flags & asOBJ_TEMPLATE) )
+	{
+		// The type is itself a template, so it is necessary to find the correct template instance type
+		asCArray<asCDataType> tmplSubTypes;
+		asCObjectType *origType = CastToObjectType(orig.GetTypeInfo());
+		bool needInstance = true;
+
+		// Find the matching replacements for the subtypes
+		for( asUINT n = 0; n < origType->templateSubTypes.GetLength(); n++ )
+		{
+			if( origType->templateSubTypes[n].GetTypeInfo() == 0 ||
+				!(origType->templateSubTypes[n].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE) )
+			{
+				// The template is already an instance so we shouldn't attempt to create another instance
+				needInstance = false;
+				break;
+			}
+
+			for( asUINT m = 0; m < tmpl->templateSubTypes.GetLength(); m++ )
+				if( origType->templateSubTypes[n].GetTypeInfo() == tmpl->templateSubTypes[m].GetTypeInfo() )
+					tmplSubTypes.PushLast(ot->templateSubTypes[m]);
+
+			if( tmplSubTypes.GetLength() != n+1 )
+			{
+				asASSERT( false );
+				return orig;
+			}
+		}
+
+		asCObjectType *ntype = origType;
+		if( needInstance )
+		{
+			// Always find the original template type when creating a new template instance otherwise the
+			// generation will fail since it will attempt to create factory stubs when they already exists, etc
+			for( asUINT n = 0; n < registeredTemplateTypes.GetLength(); n++ )
+				if( registeredTemplateTypes[n]->name == origType->name &&
+					registeredTemplateTypes[n]->nameSpace == origType->nameSpace )
+				{
+					origType = registeredTemplateTypes[n];
+					break;
+				}
+
+			ntype = GetTemplateInstanceType(origType, tmplSubTypes, ot->module);
+			if( ntype == 0 )
+			{
+				// It not possible to instantiate the subtype
+				asASSERT( false );
+				ntype = tmpl;
+			}
+		}
+
+		if( orig.IsObjectHandle() )
+			dt = asCDataType::CreateObjectHandle(ntype, false);
+		else
+			dt = asCDataType::CreateType(ntype, false);
+
+		dt.MakeReference(orig.IsReference());
+		dt.MakeReadOnly(orig.IsReadOnly());
+	}
+	else if (orig.GetTypeInfo() && (orig.GetTypeInfo()->flags & asOBJ_FUNCDEF) && CastToFuncdefType(orig.GetTypeInfo())->parentClass == tmpl)
+	{
+		// The type is a child funcdef. Find the corresponding child funcdef in the template instance
+		for (asUINT n = 0; n < ot->childFuncDefs.GetLength(); n++)
+		{
+			if (ot->childFuncDefs[n]->name == orig.GetTypeInfo()->name)
+			{
+				dt = orig;
+				dt.SetTypeInfo(ot->childFuncDefs[n]);
+			}
+		}
+	}
+	else
+		dt = orig;
+
+	return dt;
+}
+
+// internal
+asCScriptFunction *asCScriptEngine::GenerateTemplateFactoryStub(asCObjectType *templateType, asCObjectType *ot, int factoryId)
+{
+	asCScriptFunction *factory = scriptFunctions[factoryId];
+
+	// By first instantiating the function as a dummy and then changing it to be a script function
+	// I avoid having it added to the garbage collector. As it is known that this object will stay
+	// alive until the template instance is no longer used there is no need to have the GC check
+	// this function all the time.
+	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_DUMMY);
+	if( func == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+
+	func->funcType = asFUNC_SCRIPT;
+	func->AllocateScriptFunctionData();
+	func->id = GetNextScriptFunctionId();
+	AddScriptFunction(func);
+
+	func->traits = factory->traits;
+	func->SetShared(true);
+	if( templateType->flags & asOBJ_REF )
+	{
+		func->name = "$fact";
+		func->returnType = asCDataType::CreateObjectHandle(ot, false);
+	}
+	else
+	{
+		func->name = "$beh0";
+		func->returnType = factory->returnType; // constructors return nothing
+		func->objectType = ot;
+		func->objectType->AddRefInternal();
+	}
+
+	// Skip the first parameter as this is the object type pointer that the stub will add
+	func->parameterTypes.SetLength(factory->parameterTypes.GetLength()-1);
+	func->parameterNames.SetLength(factory->parameterNames.GetLength()-1);
+	func->inOutFlags.SetLength(factory->inOutFlags.GetLength()-1);
+	func->defaultArgs.SetLength(factory->defaultArgs.GetLength()-1);
+	for( asUINT p = 1; p < factory->parameterTypes.GetLength(); p++ )
+	{
+		func->parameterTypes[p-1] = factory->parameterTypes[p];
+		func->parameterNames[p-1] = factory->parameterNames[p];
+		func->inOutFlags[p-1] = factory->inOutFlags[p];
+		func->defaultArgs[p-1] = factory->defaultArgs[p] ? asNEW(asCString)(*factory->defaultArgs[p]) : 0;
+	}
+
+	// Generate the bytecode for the factory stub
+	asUINT bcLength = asBCTypeSize[asBCInfo[asBC_OBJTYPE].type] +
+	                  asBCTypeSize[asBCInfo[asBC_CALLSYS].type] +
+	                  asBCTypeSize[asBCInfo[asBC_RET].type];
+
+	if( ep.includeJitInstructions )
+		bcLength += asBCTypeSize[asBCInfo[asBC_JitEntry].type];
+	if( templateType->flags & asOBJ_VALUE )
+		bcLength += asBCTypeSize[asBCInfo[asBC_SwapPtr].type];
+
+	func->scriptData->byteCode.SetLength(bcLength);
+	asDWORD *bc = func->scriptData->byteCode.AddressOf();
+
+	if( ep.includeJitInstructions )
+	{
+		*(asBYTE*)bc = asBC_JitEntry;
+		*(asPWORD*)(bc+1) = 0;
+		bc += asBCTypeSize[asBCInfo[asBC_JitEntry].type];
+	}
+
+	*(asBYTE*)bc = asBC_OBJTYPE;
+	*(asPWORD*)(bc+1) = (asPWORD)ot;
+	bc += asBCTypeSize[asBCInfo[asBC_OBJTYPE].type];
+	if( templateType->flags & asOBJ_VALUE )
+	{
+		// Swap the object pointer with the object type
+		*(asBYTE*)bc = asBC_SwapPtr;
+		bc += asBCTypeSize[asBCInfo[asBC_SwapPtr].type];
+	}
+	*(asBYTE*)bc = asBC_CALLSYS;
+	*(asDWORD*)(bc+1) = factoryId;
+	bc += asBCTypeSize[asBCInfo[asBC_CALLSYS].type];
+	*(asBYTE*)bc = asBC_RET;
+	*(((asWORD*)bc)+1) = (asWORD)func->GetSpaceNeededForArguments() + (func->objectType ? AS_PTR_SIZE : 0);
+
+	func->AddReferences();
+	func->scriptData->stackNeeded = AS_PTR_SIZE;
+
+	// Tell the virtual machine not to clean up the object on exception
+	func->dontCleanUpOnException = true;
+
+	func->JITCompile();
+
+	// Need to translate the list pattern too so the VM and compiler will know the correct type of the members
+	if( factory->listPattern )
+	{
+		asSListPatternNode *n = factory->listPattern;
+		asSListPatternNode *last = 0;
+		while( n )
+		{
+			asSListPatternNode *newNode = n->Duplicate();
+			if( newNode->type == asLPT_TYPE )
+			{
+				asSListPatternDataTypeNode *typeNode = reinterpret_cast<asSListPatternDataTypeNode*>(newNode);
+				typeNode->dataType = DetermineTypeForTemplate(typeNode->dataType, templateType, ot);
+			}
+
+			if( last )
+				last->next = newNode;
+			else
+				func->listPattern = newNode;
+
+			last = newNode;
+
+			n = n->next;
+		}
+	}
+
+	return func;
+}
+
+bool asCScriptEngine::RequireTypeReplacement(asCDataType &type, asCObjectType *templateType)
+{
+	if( type.GetTypeInfo() == templateType ) return true;
+	if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE) ) return true;
+	if( type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_TEMPLATE) )
+	{
+		asCObjectType *ot = CastToObjectType(type.GetTypeInfo());
+		for( asUINT n = 0; n < ot->templateSubTypes.GetLength(); n++ )
+			if( ot->templateSubTypes[n].GetTypeInfo() &&
+				ot->templateSubTypes[n].GetTypeInfo()->flags & asOBJ_TEMPLATE_SUBTYPE )
+				return true;
+	}
+	if (type.GetTypeInfo() && (type.GetTypeInfo()->flags & asOBJ_FUNCDEF) && CastToFuncdefType(type.GetTypeInfo())->parentClass == templateType)
+		return true;
+
+	return false;
+}
+
+bool asCScriptEngine::GenerateNewTemplateFunction(asCObjectType *templateType, asCObjectType *ot, asCScriptFunction *func, asCScriptFunction **newFunc)
+{
+	// Due to the objectType it is always required to generate a new function, 
+	// even if none of the function arguments needs to be changed.
+/*
+	// TODO: Can we store the new function in some other optimized way to avoid
+	//       duplicating all information just because of the different objectType member?
+	bool needNewFunc = false;
+
+	if( RequireTypeReplacement(func->returnType, templateType) )
+		needNewFunc = true;
+	else
+	{
+		for( asUINT p = 0; p < func->parameterTypes.GetLength(); p++ )
+		{
+			if( RequireTypeReplacement(func->parameterTypes[p], templateType) )
+			{
+				needNewFunc = true;
+				break;
+			}
+		}
+	}
+
+	if( !needNewFunc )
+		return false;
+*/
+
+	asCScriptFunction *func2 = asNEW(asCScriptFunction)(this, 0, func->funcType);
+	if( func2 == 0 )
+	{
+		// Out of memory
+		return false;
+	}
+
+	func2->name     = func->name;
+
+	func2->returnType = DetermineTypeForTemplate(func->returnType, templateType, ot);
+	func2->parameterTypes.SetLength(func->parameterTypes.GetLength());
+	for (asUINT p = 0; p < func->parameterTypes.GetLength(); p++)
+		func2->parameterTypes[p] = DetermineTypeForTemplate(func->parameterTypes[p], templateType, ot);
+
+	for (asUINT n = 0; n < func->defaultArgs.GetLength(); n++)
+		if (func->defaultArgs[n])
+			func2->defaultArgs.PushLast(asNEW(asCString)(*func->defaultArgs[n]));
+		else
+			func2->defaultArgs.PushLast(0);
+
+	// TODO: template: Must be careful when instantiating templates for garbage collected types
+	//                 If the template hasn't been registered with the behaviours, it shouldn't
+	//                 permit instantiation of garbage collected types that in turn may refer to
+	//                 this instance.
+
+	func2->parameterNames = func->parameterNames;
+	func2->inOutFlags = func->inOutFlags;
+	func2->traits = func->traits;
+	func2->SetReadOnly(func->IsReadOnly());
+	func2->objectType = ot;
+	func2->objectType->AddRefInternal();
+	func2->sysFuncIntf = asNEW(asSSystemFunctionInterface)(*func->sysFuncIntf);
+
+	// Adjust the clean up instructions
+	if( func2->sysFuncIntf->callConv == ICC_GENERIC_FUNC ||
+		func2->sysFuncIntf->callConv == ICC_GENERIC_METHOD )
+		PrepareSystemFunctionGeneric(func2, func2->sysFuncIntf, this);
+	else
+		PrepareSystemFunction(func2, func2->sysFuncIntf, this);
+
+	func2->id       = GetNextScriptFunctionId();
+	AddScriptFunction(func2);
+
+	// Return the new function
+	*newFunc = func2;
+
+	return true;
+}
+
+asCFuncdefType *asCScriptEngine::GenerateNewTemplateFuncdef(asCObjectType *templateType, asCObjectType *ot, asCFuncdefType *func)
+{
+	// TODO: Only generate the new funcdef if it used the template subtypes.
+	//       Remember to also update the clean up in asCObjectType::DestroyInternal so it doesn't delete
+	//       child funcdefs that have not been created specificially for the template instance.
+	//       Perhaps a new funcdef is always needed, since the funcdef will have a reference to the
+	//       parent class (in this case the template instance).
+
+	asCScriptFunction *func2 = asNEW(asCScriptFunction)(this, 0, func->funcdef->funcType);
+	if (func2 == 0)
+	{
+		// Out of memory
+		return 0;
+	}
+
+	func2->name = func->name;
+
+	func2->returnType = DetermineTypeForTemplate(func->funcdef->returnType, templateType, ot);
+	func2->parameterTypes.SetLength(func->funcdef->parameterTypes.GetLength());
+	for (asUINT p = 0; p < func->funcdef->parameterTypes.GetLength(); p++)
+		func2->parameterTypes[p] = DetermineTypeForTemplate(func->funcdef->parameterTypes[p], templateType, ot);
+
+	// TODO: template: Must be careful when instantiating templates for garbage collected types
+	//                 If the template hasn't been registered with the behaviours, it shouldn't
+	//                 permit instantiation of garbage collected types that in turn may refer to
+	//                 this instance.
+
+	func2->inOutFlags = func->funcdef->inOutFlags;
+	func2->SetReadOnly(func->funcdef->IsReadOnly());
+	asASSERT(func->funcdef->objectType == 0);
+	asASSERT(func->funcdef->sysFuncIntf == 0);
+
+	func2->id = GetNextScriptFunctionId();
+	AddScriptFunction(func2);
+
+	asCFuncdefType *fdt2 = asNEW(asCFuncdefType)(this, func2);
+	funcDefs.PushLast(fdt2); // don't increase refCount as the constructor already set it to 1
+
+	// Return the new function
+	return fdt2;
+}
+
+void asCScriptEngine::CallObjectMethod(void *obj, int func) const
+{
+	asCScriptFunction *s = scriptFunctions[func];
+	asASSERT( s != 0 );
+	CallObjectMethod(obj, s->sysFuncIntf, s);
+}
+
+void asCScriptEngine::CallObjectMethod(void *obj, asSSystemFunctionInterface *i, asCScriptFunction *s) const
+{
+#if defined(__GNUC__) || defined(AS_PSVITA)
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+	}
+	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
+	{
+		// For virtual thiscalls we must call the method as a true class method
+		// so that the compiler will lookup the function address in the vftable
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			struct
+			{
+				asFUNCTION_t func;
+				asPWORD baseOffset;  // Same size as the pointer
+			} f;
+		} p;
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		p.f.func = (asFUNCTION_t)(i->func);
+		p.f.baseOffset = asPWORD(i->baseOffset);
+		void (asCSimpleDummy::*f)() = p.mthd;
+		(((asCSimpleDummy*)obj)->*f)();
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		void (*f)(void *) = (void (*)(void *))(i->func);
+		f(obj);
+	}
+#else
+#ifndef AS_NO_CLASS_METHODS
+	if( i->callConv == ICC_THISCALL )
+	{
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			asFUNCTION_t func;
+		} p;
+		p.func = (asFUNCTION_t)(i->func);
+		void (asCSimpleDummy::*f)() = p.mthd;
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		obj = (void*)(asPWORD(obj) + i->baseOffset);
+		(((asCSimpleDummy*)obj)->*f)();
+	}
+	else
+#endif
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		void (*f)(void *) = (void (*)(void *))(i->func);
+		f(obj);
+	}
+#endif
+}
+
+bool asCScriptEngine::CallObjectMethodRetBool(void *obj, int func) const
+{
+	asCScriptFunction *s = scriptFunctions[func];
+	asASSERT( s != 0 );
+	asSSystemFunctionInterface *i = s->sysFuncIntf;
+
+#if defined(__GNUC__) || defined(AS_PSVITA)
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(bool*)gen.GetReturnPointer();
+	}
+	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
+	{
+		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			struct
+			{
+				asFUNCTION_t func;
+				asPWORD baseOffset;
+			} f;
+		} p;
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		p.f.func = (asFUNCTION_t)(i->func);
+		p.f.baseOffset = asPWORD(i->baseOffset);
+		bool (asCSimpleDummy::*f)() = (bool (asCSimpleDummy::*)())(p.mthd);
+		return (((asCSimpleDummy*)obj)->*f)();
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		bool (*f)(void *) = (bool (*)(void *))(i->func);
+		return f(obj);
+	}
+#else
+#ifndef AS_NO_CLASS_METHODS
+	if( i->callConv == ICC_THISCALL )
+	{
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			asFUNCTION_t func;
+		} p;
+		p.func = (asFUNCTION_t)(i->func);
+		bool (asCSimpleDummy::*f)() = (bool (asCSimpleDummy::*)())p.mthd;
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		obj = (void*)(asPWORD(obj) + i->baseOffset);
+		return (((asCSimpleDummy*)obj)->*f)();
+	}
+	else
+#endif
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(bool*)gen.GetReturnPointer();
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		bool (*f)(void *) = (bool (*)(void *))(i->func);
+		return f(obj);
+	}
+#endif
+}
+
+int asCScriptEngine::CallObjectMethodRetInt(void *obj, int func) const
+{
+	asCScriptFunction *s = scriptFunctions[func];
+	asASSERT( s != 0 );
+	asSSystemFunctionInterface *i = s->sysFuncIntf;
+
+#if defined(__GNUC__) || defined(AS_PSVITA)
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(int*)gen.GetReturnPointer();
+	}
+	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
+	{
+		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			struct
+			{
+				asFUNCTION_t func;
+				asPWORD baseOffset;
+			} f;
+		} p;
+		p.f.func = (asFUNCTION_t)(i->func);
+		p.f.baseOffset = asPWORD(i->baseOffset);
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		int (asCSimpleDummy::*f)() = (int (asCSimpleDummy::*)())(p.mthd);
+		return (((asCSimpleDummy*)obj)->*f)();
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		int (*f)(void *) = (int (*)(void *))(i->func);
+		return f(obj);
+	}
+#else
+#ifndef AS_NO_CLASS_METHODS
+	if( i->callConv == ICC_THISCALL )
+	{
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			asFUNCTION_t func;
+		} p;
+		p.func = (asFUNCTION_t)(i->func);
+		int (asCSimpleDummy::*f)() = (int (asCSimpleDummy::*)())p.mthd;
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		obj = (void*)(asPWORD(obj) + i->baseOffset);
+		return (((asCSimpleDummy*)obj)->*f)();
+	}
+	else
+#endif
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(int*)gen.GetReturnPointer();
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		int (*f)(void *) = (int (*)(void *))(i->func);
+		return f(obj);
+	}
+#endif
+}
+
+void *asCScriptEngine::CallObjectMethodRetPtr(void *obj, int func) const
+{
+	asCScriptFunction *s = scriptFunctions[func];
+	asASSERT( s != 0 );
+	asSSystemFunctionInterface *i = s->sysFuncIntf;
+
+#if defined(__GNUC__) || defined(AS_PSVITA)
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(void**)gen.GetReturnPointer();
+	}
+	else if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
+	{
+		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			struct
+			{
+				asFUNCTION_t func;
+				asPWORD baseOffset;
+			} f;
+		} p;
+		p.f.func = (asFUNCTION_t)(i->func);
+		p.f.baseOffset = asPWORD(i->baseOffset);
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		void *(asCSimpleDummy::*f)() = (void *(asCSimpleDummy::*)())(p.mthd);
+		return (((asCSimpleDummy*)obj)->*f)();
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		void *(*f)(void *) = (void *(*)(void *))(i->func);
+		return f(obj);
+	}
+#else
+#ifndef AS_NO_CLASS_METHODS
+	if( i->callConv == ICC_THISCALL )
+	{
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			asFUNCTION_t func;
+		} p;
+		p.func = (asFUNCTION_t)(i->func);
+		void *(asCSimpleDummy::*f)() = (void *(asCSimpleDummy::*)())p.mthd;
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		obj = (void*)(asPWORD(obj) + i->baseOffset);
+		return (((asCSimpleDummy*)obj)->*f)();
+	}
+	else
+#endif
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(void **)gen.GetReturnPointer();
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJLAST || i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		void *(*f)(void *) = (void *(*)(void *))(i->func);
+		return f(obj);
+	}
+#endif
+}
+
+void *asCScriptEngine::CallObjectMethodRetPtr(void *obj, int param1, asCScriptFunction *func) const
+{
+	asASSERT( obj != 0 );
+	asASSERT( func != 0 );
+	asSSystemFunctionInterface *i = func->sysFuncIntf;
+
+#ifndef AS_NO_CLASS_METHODS
+	if( i->callConv == ICC_THISCALL || i->callConv == ICC_VIRTUAL_THISCALL )
+	{
+#if defined(__GNUC__) || defined(AS_PSVITA)
+		// For virtual thiscalls we must call the method as a true class method so that the compiler will lookup the function address in the vftable
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			struct
+			{
+				asFUNCTION_t func;
+				asPWORD baseOffset;
+			} f;
+		} p;
+		p.f.func = (asFUNCTION_t)(i->func);
+		p.f.baseOffset = asPWORD(i->baseOffset);
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		void *(asCSimpleDummy::*f)(int) = (void *(asCSimpleDummy::*)(int))(p.mthd);
+		return (((asCSimpleDummy*)obj)->*f)(param1);
+#else
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			asFUNCTION_t func;
+		} p;
+		p.func = (asFUNCTION_t)(i->func);
+		void *(asCSimpleDummy::*f)(int) = (void *(asCSimpleDummy::*)(int))p.mthd;
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		obj = (void*)(asPWORD(obj) + i->baseOffset);
+		return (((asCSimpleDummy*)obj)->*f)(param1);
+#endif
+	}
+	else
+#endif
+	if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), func, obj, reinterpret_cast<asDWORD*>(&param1));
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(void **)gen.GetReturnPointer();
+	}
+	else if( i->callConv == ICC_CDECL_OBJLAST )
+	{
+		void *(*f)(int, void *) = (void *(*)(int, void *))(i->func);
+		return f(param1, obj);
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		void *(*f)(void *, int) = (void *(*)(void *, int))(i->func);
+		return f(obj, param1);
+	}
+}
+
+void *asCScriptEngine::CallGlobalFunctionRetPtr(int func) const
+{
+	asCScriptFunction *s = scriptFunctions[func];
+	asASSERT( s != 0 );
+	return CallGlobalFunctionRetPtr(s->sysFuncIntf, s);
+}
+
+void *asCScriptEngine::CallGlobalFunctionRetPtr(int func, void *param1) const
+{
+	asCScriptFunction *s = scriptFunctions[func];
+	asASSERT( s != 0 );
+	return CallGlobalFunctionRetPtr(s->sysFuncIntf, s, param1);
+}
+
+void *asCScriptEngine::CallGlobalFunctionRetPtr(asSSystemFunctionInterface *i, asCScriptFunction *s) const
+{
+	if( i->callConv == ICC_CDECL )
+	{
+		void *(*f)() = (void *(*)())(i->func);
+		return f();
+	}
+	else if( i->callConv == ICC_STDCALL )
+	{
+		typedef void *(STDCALL *func_t)();
+		func_t f = (func_t)(i->func);
+		return f();
+	}
+	else
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, 0);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(void**)gen.GetReturnPointer();
+	}
+}
+
+void *asCScriptEngine::CallGlobalFunctionRetPtr(asSSystemFunctionInterface *i, asCScriptFunction *s, void *param1) const
+{
+	if( i->callConv == ICC_CDECL )
+	{
+		void *(*f)(void *) = (void *(*)(void *))(i->func);
+		return f(param1);
+	}
+	else if( i->callConv == ICC_STDCALL )
+	{
+		typedef void *(STDCALL *func_t)(void *);
+		func_t f = (func_t)(i->func);
+		return f(param1);
+	}
+	else
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, (asDWORD*)&param1);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(void**)gen.GetReturnPointer();
+	}
+}
+
+void asCScriptEngine::CallObjectMethod(void *obj, void *param, int func) const
+{
+	asCScriptFunction *s = scriptFunctions[func];
+	asASSERT( s != 0 );
+	CallObjectMethod(obj, param, s->sysFuncIntf, s);
+}
+
+void asCScriptEngine::CallObjectMethod(void *obj, void *param, asSSystemFunctionInterface *i, asCScriptFunction *s) const
+{
+#if defined(__GNUC__) || defined(AS_PSVITA)
+	if( i->callConv == ICC_CDECL_OBJLAST )
+	{
+		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
+		f(param, obj);
+	}
+	else if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, (asDWORD*)&param);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+	}
+	else if( i->callConv == ICC_VIRTUAL_THISCALL || i->callConv == ICC_THISCALL )
+	{
+		// For virtual thiscalls we must call the method as a true class method
+		// so that the compiler will lookup the function address in the vftable
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			struct
+			{
+				asFUNCTION_t func;
+				asPWORD baseOffset;  // Same size as the pointer
+			} f;
+		} p;
+		p.f.func = (asFUNCTION_t)(i->func);
+		p.f.baseOffset = asPWORD(i->baseOffset);
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		void (asCSimpleDummy::*f)(void*) = (void (asCSimpleDummy::*)(void*))(p.mthd);
+		(((asCSimpleDummy*)obj)->*f)(param);
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJFIRST */
+	{
+		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
+		f(obj, param);
+	}
+#else
+#ifndef AS_NO_CLASS_METHODS
+	if( i->callConv == ICC_THISCALL )
+	{
+		union
+		{
+			asSIMPLEMETHOD_t mthd;
+			asFUNCTION_t func;
+		} p;
+		p.func = (asFUNCTION_t)(i->func);
+		void (asCSimpleDummy::*f)(void *) = (void (asCSimpleDummy::*)(void *))(p.mthd);
+
+		obj = (void*) ((char*) obj +  i->compositeOffset);
+		if(i->isCompositeIndirect)
+			obj = *((void**)obj);
+
+		obj = (void*)(asPWORD(obj) + i->baseOffset);
+		(((asCSimpleDummy*)obj)->*f)(param);
+	}
+	else
+#endif
+	if( i->callConv == ICC_CDECL_OBJLAST )
+	{
+		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
+		f(param, obj);
+	}
+	else if( i->callConv == ICC_GENERIC_METHOD )
+	{
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, obj, (asDWORD*)&param);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+	}
+	else /*if( i->callConv == ICC_CDECL_OBJFIRST )*/
+	{
+		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
+		f(obj, param);
+	}
+#endif
+}
+
+void asCScriptEngine::CallGlobalFunction(void *param1, void *param2, asSSystemFunctionInterface *i, asCScriptFunction *s) const
+{
+	if( i->callConv == ICC_CDECL )
+	{
+		void (*f)(void *, void *) = (void (*)(void *, void *))(i->func);
+		f(param1, param2);
+	}
+	else if( i->callConv == ICC_STDCALL )
+	{
+		typedef void (STDCALL *func_t)(void *, void *);
+		func_t f = (func_t)(i->func);
+		f(param1, param2);
+	}
+	else
+	{
+		// We must guarantee the order of the arguments which is why we copy them to this
+		// array. Otherwise the compiler may put them anywhere it likes, or even keep them
+		// in the registers which causes problem.
+		void *params[2] = {param1, param2};
+
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, (asDWORD*)&params);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+	}
+}
+
+bool asCScriptEngine::CallGlobalFunctionRetBool(void *param1, void *param2, asSSystemFunctionInterface *i, asCScriptFunction *s) const
+{
+	if( i->callConv == ICC_CDECL )
+	{
+		bool (*f)(void *, void *) = (bool (*)(void *, void *))(i->func);
+		return f(param1, param2);
+	}
+	else if( i->callConv == ICC_STDCALL )
+	{
+		typedef bool (STDCALL *func_t)(void *, void *);
+		func_t f = (func_t)(i->func);
+		return f(param1, param2);
+	}
+	else
+	{
+		// TODO: When simulating a 64bit environment by defining AS_64BIT_PTR on a 32bit platform this code
+		//       fails, because the stack given to asCGeneric is not prepared with two 64bit arguments.
+
+		// We must guarantee the order of the arguments which is why we copy them to this
+		// array. Otherwise the compiler may put them anywhere it likes, or even keep them
+		// in the registers which causes problem.
+		void *params[2] = {param1, param2};
+		asCGeneric gen(const_cast<asCScriptEngine*>(this), s, 0, (asDWORD*)params);
+		void (*f)(asIScriptGeneric *) = (void (*)(asIScriptGeneric *))(i->func);
+		f(&gen);
+		return *(bool*)gen.GetReturnPointer();
+	}
+}
+
+void *asCScriptEngine::CallAlloc(const asCObjectType *type) const
+{
+	// Allocate 4 bytes as the smallest size. Otherwise CallSystemFunction may try to
+	// copy a DWORD onto a smaller memory block, in case the object type is return in registers.
+
+	// Pad to the next even 4 bytes to avoid asBC_CPY writing outside of allocated buffer for registered POD types
+	asUINT size = type->size;
+	if( size & 0x3 )
+		size += 4 - (size & 0x3);
+
+#ifndef WIP_16BYTE_ALIGN
+#if defined(AS_DEBUG)
+	return ((asALLOCFUNCDEBUG_t)userAlloc)(size, __FILE__, __LINE__);
+#else
+	return userAlloc(size);
+#endif
+#else
+#if defined(AS_DEBUG)
+	return ((asALLOCALIGNEDFUNCDEBUG_t)userAllocAligned)(size, type->alignment, __FILE__, __LINE__);
+#else
+	return userAllocAligned(size, type->alignment);
+#endif
+#endif
+}
+
+void asCScriptEngine::CallFree(void *obj) const
+{
+#ifndef WIP_16BYTE_ALIGN
+	userFree(obj);
+#else
+	userFreeAligned(obj);
+#endif
+}
+
+// interface
+int asCScriptEngine::NotifyGarbageCollectorOfNewObject(void *obj, asITypeInfo *type)
+{
+	return gc.AddScriptObjectToGC(obj, static_cast<asCObjectType*>(type));
+}
+
+// interface
+int asCScriptEngine::GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj, asITypeInfo **type)
+{
+	return gc.GetObjectInGC(idx, seqNbr, obj, type);
+}
+
+// interface
+int asCScriptEngine::GarbageCollect(asDWORD flags, asUINT iterations)
+{
+	int r = gc.GarbageCollect(flags, iterations);
+
+	if( r == 0 )
+	{
+		// Delete any modules that have been discarded previously but not
+		// removed due to being referred to by objects in the garbage collector
+		DeleteDiscardedModules();
+	}
+
+	return r;
+}
+
+// interface
+void asCScriptEngine::GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const
+{
+	gc.GetStatistics(currentSize, totalDestroyed, totalDetected, newObjects, totalNewDestroyed);
+}
+
+// interface
+void asCScriptEngine::GCEnumCallback(void *reference)
+{
+	gc.GCEnumCallback(reference);
+}
+
+// interface
+void asCScriptEngine::ForwardGCEnumReferences(void *ref, asITypeInfo *type)
+{
+	asCTypeInfo *t = reinterpret_cast<asCTypeInfo*>(type);
+	if ((t->flags & asOBJ_VALUE) && (t->flags & asOBJ_GC))
+	{
+		CallObjectMethod(ref, this, CastToObjectType(t)->beh.gcEnumReferences);
+	}
+}
+
+// interface
+void asCScriptEngine::ForwardGCReleaseReferences(void *ref, asITypeInfo *type)
+{
+	asCTypeInfo *t = reinterpret_cast<asCTypeInfo*>(type);
+	if ((t->flags & asOBJ_VALUE) && (t->flags & asOBJ_GC))
+	{
+		CallObjectMethod(ref, this, CastToObjectType(t)->beh.gcReleaseAllReferences);
+	}
+}
+
+// interface
+void asCScriptEngine::SetCircularRefDetectedCallback(asCIRCULARREFFUNC_t callback, void *param)
+{
+	gc.circularRefDetectCallbackFunc  = callback;
+	gc.circularRefDetectCallbackParam = param;
+}
+
+int asCScriptEngine::GetTypeIdFromDataType(const asCDataType &dtIn) const
+{
+	if( dtIn.IsNullHandle() ) return asTYPEID_VOID;
+
+	if( dtIn.GetTypeInfo() == 0 )
+	{
+		// Primitives have pre-fixed typeIds
+		switch( dtIn.GetTokenType() )
+		{
+		case ttVoid:   return asTYPEID_VOID;
+		case ttBool:   return asTYPEID_BOOL;
+		case ttInt8:   return asTYPEID_INT8;
+		case ttInt16:  return asTYPEID_INT16;
+		case ttInt:    return asTYPEID_INT32;
+		case ttInt64:  return asTYPEID_INT64;
+		case ttUInt8:  return asTYPEID_UINT8;
+		case ttUInt16: return asTYPEID_UINT16;
+		case ttUInt:   return asTYPEID_UINT32;
+		case ttUInt64: return asTYPEID_UINT64;
+		case ttFloat:  return asTYPEID_FLOAT;
+		case ttDouble: return asTYPEID_DOUBLE;
+		default:
+			// All types should be covered by the above. The variable type is not really a type
+			asASSERT(dtIn.GetTokenType() == ttQuestion);
+			return -1;
+		}
+	}
+
+	int typeId = -1;
+	asCTypeInfo *ot = dtIn.GetTypeInfo();
+	asASSERT(ot != &functionBehaviours);
+	// Object's hold the typeId themselves
+	typeId = ot->typeId;
+
+	if( typeId == -1 )
+	{
+		ACQUIREEXCLUSIVE(engineRWLock);
+		// Make sure another thread didn't determine the typeId while we were waiting for the lock
+		if( ot->typeId == -1 )
+		{
+			typeId = typeIdSeqNbr++;
+			if( ot->flags & asOBJ_SCRIPT_OBJECT ) typeId |= asTYPEID_SCRIPTOBJECT;
+			else if( ot->flags & asOBJ_TEMPLATE ) typeId |= asTYPEID_TEMPLATE;
+			else if( ot->flags & asOBJ_ENUM ) {} // TODO: Should we have a specific bit for this?
+			else typeId |= asTYPEID_APPOBJECT;
+
+			ot->typeId = typeId;
+
+			mapTypeIdToTypeInfo.Insert(typeId, ot);
+		}
+		RELEASEEXCLUSIVE(engineRWLock);
+	}
+
+	// Add flags according to the requested type
+	if( dtIn.GetTypeInfo() && !(dtIn.GetTypeInfo()->flags & asOBJ_ASHANDLE) )
+	{
+		// The ASHANDLE types behave like handles, but are really
+		// value types so the typeId is never returned as a handle
+		if( dtIn.IsObjectHandle() )
+			typeId |= asTYPEID_OBJHANDLE;
+		if( dtIn.IsHandleToConst() )
+			typeId |= asTYPEID_HANDLETOCONST;
+	}
+
+	return typeId;
+}
+
+asCDataType asCScriptEngine::GetDataTypeFromTypeId(int typeId) const
+{
+	int baseId = typeId & (asTYPEID_MASK_OBJECT | asTYPEID_MASK_SEQNBR);
+
+	if( typeId <= asTYPEID_DOUBLE )
+	{
+		eTokenType type[] = {ttVoid, ttBool, ttInt8, ttInt16, ttInt, ttInt64, ttUInt8, ttUInt16, ttUInt, ttUInt64, ttFloat, ttDouble};
+		return asCDataType::CreatePrimitive(type[typeId], false);
+	}
+
+	// First check if the typeId is an object type
+	asCTypeInfo *ot = 0;
+	ACQUIRESHARED(engineRWLock);
+	asSMapNode<int,asCTypeInfo*> *cursor = 0;
+	if( mapTypeIdToTypeInfo.MoveTo(&cursor, baseId) )
+		ot = mapTypeIdToTypeInfo.GetValue(cursor);
+	RELEASESHARED(engineRWLock);
+
+	if( ot )
+	{
+		asCDataType dt = asCDataType::CreateType(ot, false);
+		if( typeId & asTYPEID_OBJHANDLE )
+			dt.MakeHandle(true, true);
+		if( typeId & asTYPEID_HANDLETOCONST )
+			dt.MakeHandleToConst(true);
+
+		return dt;
+	}
+
+	return asCDataType();
+}
+
+asCObjectType *asCScriptEngine::GetObjectTypeFromTypeId(int typeId) const
+{
+	asCDataType dt = GetDataTypeFromTypeId(typeId);
+	return CastToObjectType(dt.GetTypeInfo());
+}
+
+void asCScriptEngine::RemoveFromTypeIdMap(asCTypeInfo *type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+	asSMapNode<int,asCTypeInfo*> *cursor = 0;
+	mapTypeIdToTypeInfo.MoveFirst(&cursor);
+	while( cursor )
+	{
+		if(mapTypeIdToTypeInfo.GetValue(cursor) == type )
+		{
+			mapTypeIdToTypeInfo.Erase(cursor);
+			break;
+		}
+		mapTypeIdToTypeInfo.MoveNext(&cursor, cursor);
+	}
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
+// interface
+asITypeInfo *asCScriptEngine::GetTypeInfoByDecl(const char *decl) const
+{
+	asCDataType dt;
+	// This cast is ok, because we are not changing anything in the engine
+	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
+	if (r < 0)
+		return 0;
+
+	return dt.GetTypeInfo();
+}
+
+// interface
+int asCScriptEngine::GetTypeIdByDecl(const char *decl) const
+{
+	asCDataType dt;
+	// This cast is ok, because we are not changing anything in the engine
+	asCBuilder bld(const_cast<asCScriptEngine*>(this), 0);
+
+	// Don't write parser errors to the message callback
+	bld.silent = true;
+
+	int r = bld.ParseDataType(decl, &dt, defaultNamespace);
+	if( r < 0 )
+		return asINVALID_TYPE;
+
+	return GetTypeIdFromDataType(dt);
+}
+
+// interface
+const char *asCScriptEngine::GetTypeDeclaration(int typeId, bool includeNamespace) const
+{
+	asCDataType dt = GetDataTypeFromTypeId(typeId);
+
+	asCString *tempString = &asCThreadManager::GetLocalData()->string;
+	*tempString = dt.Format(defaultNamespace, includeNamespace);
+
+	return tempString->AddressOf();
+}
+
+// interface
+int asCScriptEngine::GetSizeOfPrimitiveType(int typeId) const
+{
+	asCDataType dt = GetDataTypeFromTypeId(typeId);
+	if( !dt.IsPrimitive() ) return 0;
+
+	return dt.GetSizeInMemoryBytes();
+}
+
+// interface
+int asCScriptEngine::RefCastObject(void *obj, asITypeInfo *fromType, asITypeInfo *toType, void **newPtr, bool useOnlyImplicitCast)
+{
+	if( newPtr == 0 ) return asINVALID_ARG;
+	*newPtr = 0;
+
+	if( fromType == 0 || toType == 0 ) return asINVALID_ARG;
+
+	// A null-pointer can always be cast to another type, so it will always be successful
+	if( obj == 0 )
+		return asSUCCESS;
+
+	if( fromType == toType )
+	{
+		*newPtr = obj;
+		AddRefScriptObject(*newPtr, toType);
+		return asSUCCESS;
+	}
+
+	// Check for funcdefs
+	if ((fromType->GetFlags() & asOBJ_FUNCDEF) && (toType->GetFlags() & asOBJ_FUNCDEF))
+	{
+		asCFuncdefType *fromFunc = CastToFuncdefType(reinterpret_cast<asCTypeInfo*>(fromType));
+		asCFuncdefType *toFunc = CastToFuncdefType(reinterpret_cast<asCTypeInfo*>(toType));
+
+		if (fromFunc && toFunc && fromFunc->funcdef->IsSignatureExceptNameEqual(toFunc->funcdef))
+		{
+			*newPtr = obj;
+			AddRefScriptObject(*newPtr, toType);
+			return asSUCCESS;
+		}
+
+		return asSUCCESS;
+	}
+
+	// Look for ref cast behaviours
+	asCScriptFunction *universalCastFunc = 0;
+	asCObjectType *from = CastToObjectType(reinterpret_cast< asCTypeInfo*>(fromType));
+	if( from == 0 ) return asINVALID_ARG;
+	for( asUINT n = 0; n < from->methods.GetLength(); n++ )
+	{
+		asCScriptFunction *func = scriptFunctions[from->methods[n]];
+		if( func->name == "opImplCast" ||
+			(!useOnlyImplicitCast && func->name == "opCast") )
+		{
+			if( func->returnType.GetTypeInfo() == toType )
+			{
+				*newPtr = CallObjectMethodRetPtr(obj, func->id);
+				// The ref cast behaviour returns a handle with incremented
+				// ref counter, so there is no need to call AddRef explicitly
+				// unless the function is registered with autohandle
+				if( func->sysFuncIntf->returnAutoHandle )
+					AddRefScriptObject(*newPtr, toType);
+				return asSUCCESS;
+			}
+			else if( func->returnType.GetTokenType() == ttVoid &&
+					 func->parameterTypes.GetLength() == 1 &&
+					 func->parameterTypes[0].GetTokenType() == ttQuestion )
+			{
+				universalCastFunc = func;
+			}
+		}
+	}
+
+	// One last chance if the object has a void opCast(?&out) behaviour
+	if( universalCastFunc )
+	{
+		// TODO: Add proper error handling
+		asIScriptContext *ctx = RequestContext();
+		ctx->Prepare(universalCastFunc);
+		ctx->SetObject(obj);
+		ctx->SetArgVarType(0, newPtr, toType->GetTypeId() | asTYPEID_OBJHANDLE);
+		ctx->Execute();
+		ReturnContext(ctx);
+
+		// The opCast(?&out) method already incremented the
+		// refCount so there is no need to do it manually
+		return asSUCCESS;
+	}
+
+	// For script classes and interfaces there is a quick route
+	if( (fromType->GetFlags() & asOBJ_SCRIPT_OBJECT) && (toType->GetFlags() & asOBJ_SCRIPT_OBJECT) )
+	{
+		if( fromType == toType )
+		{
+			*newPtr = obj;
+			reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
+			return asSUCCESS;
+		}
+
+		// Up casts to base class or interface can be done implicitly
+		if( fromType->DerivesFrom(toType) ||
+			fromType->Implements(toType) )
+		{
+			*newPtr = obj;
+			reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
+			return asSUCCESS;
+		}
+		// Down casts to derived class or from interface can only be done explicitly
+		if( !useOnlyImplicitCast )
+		{
+			// Get the true type of the object so the explicit cast can evaluate all possibilities
+			asITypeInfo *trueType = reinterpret_cast<asCScriptObject*>(obj)->GetObjectType();
+			if (trueType->DerivesFrom(toType) ||
+				trueType->Implements(toType))
+			{
+				*newPtr = obj;
+				reinterpret_cast<asCScriptObject*>(*newPtr)->AddRef();
+				return asSUCCESS;
+			}
+		}
+	}
+
+	// The cast is not available, but it is still a success
+	return asSUCCESS;
+}
+
+// interface
+void *asCScriptEngine::CreateScriptObject(const asITypeInfo *type)
+{
+	if( type == 0 ) return 0;
+
+	asCObjectType *objType = CastToObjectType(const_cast<asCTypeInfo*>(reinterpret_cast<const asCTypeInfo*>(type)));
+	if (objType == 0) return 0;
+	void *ptr = 0;
+
+	// Check that there is a default factory for ref types
+	if( objType->beh.factory == 0 && (objType->flags & asOBJ_REF) )
+	{
+		// TODO: How to report the reason the object couldn't be created, without writing to the message callback? optional argument with return code?
+		// TODO: Warn about the invalid call to message callback. Make it an optional, so the warning can be turned off
+//		asCString str;
+//		str.Format(TXT_FAILED_IN_FUNC_s_s_d, "CreateScriptObject", errorNames[-asNO_FUNCTION], asNO_FUNCTION);
+//		WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+		return 0;
+	}
+
+	// Construct the object
+	if( objType->flags & asOBJ_SCRIPT_OBJECT )
+	{
+		// Call the script class' default factory with a context
+		ptr = ScriptObjectFactory(objType, this);
+	}
+	else if( (objType->flags & asOBJ_TEMPLATE) && (objType->flags & asOBJ_REF) )
+	{
+		// The registered factory that takes the object type is moved
+		// to the construct behaviour when the type is instantiated
+#ifdef AS_NO_EXCEPTIONS
+		ptr = CallGlobalFunctionRetPtr(objType->beh.construct, objType);
+#else
+		try
+		{
+			ptr = CallGlobalFunctionRetPtr(objType->beh.construct, objType);
+		}
+		catch (...)
+		{
+			asCContext *ctx = reinterpret_cast<asCContext*>(asGetActiveContext());
+			if (ctx)
+				ctx->HandleAppException();
+		}
+#endif
+	}
+	else if( objType->flags & asOBJ_REF )
+	{
+		// Call the default factory directly
+#ifdef AS_NO_EXCEPTIONS
+		ptr = CallGlobalFunctionRetPtr(objType->beh.factory);
+#else
+		try
+		{
+			ptr = CallGlobalFunctionRetPtr(objType->beh.factory);
+		}
+		catch(...)
+		{
+			asCContext *ctx = reinterpret_cast<asCContext*>(asGetActiveContext());
+			if( ctx )
+				ctx->HandleAppException();
+		}
+#endif
+	}
+	else
+	{
+		// Make sure there is a default constructor or that it is a POD type
+		if( objType->beh.construct == 0 && !(objType->flags & asOBJ_POD) )
+		{
+			// TODO: How to report the reason the object couldn't be created, without writing to the message callback? optional argument with return code?
+			// TODO: Warn about the invalid call to message callback. Make it an optional, so the warning can be turned off
+//			asCString str;
+//			str.Format(TXT_FAILED_IN_FUNC_s_s_d, "CreateScriptObject", errorNames[-asNO_FUNCTION], asNO_FUNCTION);
+//			WriteMessage("", 0, 0, asMSGTYPE_ERROR, str.AddressOf());
+			return 0;
+		}
+
+		// Manually allocate the memory, then call the default constructor
+		ptr = CallAlloc(objType);
+		int funcIndex = objType->beh.construct;
+		if (funcIndex)
+		{
+			if (objType->flags & asOBJ_TEMPLATE)
+			{
+				// Templates of value types create script functions as the constructors
+				CallScriptObjectMethod(ptr, funcIndex);
+			}
+			else
+			{
+#ifdef AS_NO_EXCEPTIONS
+				CallObjectMethod(ptr, funcIndex);
+#else
+				try
+				{
+					CallObjectMethod(ptr, funcIndex);
+				}
+				catch (...)
+				{
+					asCContext *ctx = reinterpret_cast<asCContext*>(asGetActiveContext());
+					if (ctx)
+						ctx->HandleAppException();
+
+					// Free the memory
+					CallFree(ptr);
+					ptr = 0;
+				}
+#endif
+			}
+		}
+	}
+
+	return ptr;
+}
+
+// internal
+int asCScriptEngine::CallScriptObjectMethod(void *obj, int funcId)
+{
+	asIScriptContext *ctx = 0;
+	int r = 0;
+	bool isNested = false;
+
+	// Use nested call in the context if there is an active context
+	ctx = asGetActiveContext();
+	if (ctx)
+	{
+		// It may not always be possible to reuse the current context,
+		// in which case we'll have to create a new one any way.
+		if (ctx->GetEngine() == this && ctx->PushState() == asSUCCESS)
+			isNested = true;
+		else
+			ctx = 0;
+	}
+
+	if (ctx == 0)
+	{
+		// Request a context from the engine
+		ctx = RequestContext();
+		if (ctx == 0)
+		{
+			// TODO: How to best report this failure?
+			return asERROR;
+		}
+	}
+
+	r = ctx->Prepare(scriptFunctions[funcId]);
+	if (r < 0)
+	{
+		if (isNested)
+			ctx->PopState();
+		else
+			ReturnContext(ctx);
+		// TODO: How to best report this failure?
+		return asERROR;
+	}
+
+	// Set the object
+	ctx->SetObject(obj);
+
+	for (;;)
+	{
+		r = ctx->Execute();
+
+		// We can't allow this execution to be suspended
+		// so resume the execution immediately
+		if (r != asEXECUTION_SUSPENDED)
+			break;
+	}
+
+	if (r != asEXECUTION_FINISHED)
+	{
+		if (isNested)
+		{
+			ctx->PopState();
+
+			// If the execution was aborted or an exception occurred,
+			// then we should forward that to the outer execution.
+			if (r == asEXECUTION_EXCEPTION)
+			{
+				// TODO: How to improve this exception
+				ctx->SetException(TXT_EXCEPTION_IN_NESTED_CALL);
+			}
+			else if (r == asEXECUTION_ABORTED)
+				ctx->Abort();
+		}
+		else
+			ReturnContext(ctx);
+
+		// TODO: How to best report the error?
+		return asERROR;
+	}
+
+	if (isNested)
+		ctx->PopState();
+	else
+		ReturnContext(ctx);
+
+	return asSUCCESS;
+}
+
+// interface
+void *asCScriptEngine::CreateUninitializedScriptObject(const asITypeInfo *type)
+{
+	// This function only works for script classes. Registered types cannot be created this way.
+	if( type == 0 || !(type->GetFlags() & asOBJ_SCRIPT_OBJECT) )
+		return 0;
+
+	asCObjectType *objType = CastToObjectType(const_cast<asCTypeInfo*>(reinterpret_cast<const asCTypeInfo*>(type)));
+	if (objType == 0)
+		return 0;
+
+	// Construct the object, but do not call the actual constructor that initializes the members
+	// The initialization will be done by the application afterwards, e.g. through serialization.
+	asCScriptObject *obj = reinterpret_cast<asCScriptObject*>(CallAlloc(objType));
+
+	// Pre-initialize the memory so there are no invalid pointers
+	ScriptObject_ConstructUnitialized(objType, obj);
+
+	return obj;
+}
+
+// interface
+void *asCScriptEngine::CreateScriptObjectCopy(void *origObj, const asITypeInfo *type)
+{
+	if( origObj == 0 || type == 0 ) return 0;
+
+	const asCObjectType* ot = CastToObjectType(const_cast<asCTypeInfo*>(reinterpret_cast<const asCTypeInfo*>(type)));
+	if (ot == 0) return 0;
+
+	void *newObj = 0;
+
+	if ((ot->flags & asOBJ_SCRIPT_OBJECT) && ot->beh.copyfactory)
+	{
+		// Call the script class' default factory with a context
+		newObj = ScriptObjectCopyFactory(ot, origObj, this);
+	}
+	else if (ot->beh.copyfactory)
+	{
+		// Call the copy factory which will allocate the memory then copy the original object
+#ifdef AS_NO_EXCEPTIONS
+		newObj = CallGlobalFunctionRetPtr(ot->beh.copyfactory, origObj);
+#else
+		try
+		{
+			newObj = CallGlobalFunctionRetPtr(ot->beh.copyfactory, origObj);
+		}
+		catch (...)
+		{
+			asCContext *ctx = reinterpret_cast<asCContext*>(asGetActiveContext());
+			if (ctx)
+				ctx->HandleAppException();
+		}
+#endif
+	}
+	else if(ot->beh.copyconstruct )
+	{
+		// Manually allocate the memory, then call the copy constructor
+		newObj = CallAlloc(ot);
+#ifdef AS_NO_EXCEPTIONS
+		CallObjectMethod(newObj, origObj, ot->beh.copyconstruct);
+#else
+		try
+		{
+			CallObjectMethod(newObj, origObj, ot->beh.copyconstruct);
+		}
+		catch(...)
+		{
+			asCContext *ctx = reinterpret_cast<asCContext*>(asGetActiveContext());
+			if( ctx )
+				ctx->HandleAppException();
+
+			// Free the memory
+			CallFree(newObj);
+			newObj = 0;
+		}
+#endif
+	}
+	else
+	{
+		// Allocate the object and then do a value assign
+		newObj = CreateScriptObject(type);
+		if( newObj == 0 ) return 0;
+
+		AssignScriptObject(newObj, origObj, type);
+	}
+
+	return newObj;
+}
+
+// internal
+void asCScriptEngine::ConstructScriptObjectCopy(void *mem, void *obj, asCObjectType *type)
+{
+	if( type == 0 || mem == 0 || obj == 0 ) return;
+
+	// This function is only meant to be used for value types
+	asASSERT( type->flags & asOBJ_VALUE );
+
+	// Call the copy constructor if available, else call the default constructor followed by the opAssign
+	int funcIndex = type->beh.copyconstruct;
+	if( funcIndex )
+	{
+		CallObjectMethod(mem, obj, funcIndex);
+	}
+	else
+	{
+		funcIndex = type->beh.construct;
+		if( funcIndex )
+			CallObjectMethod(mem, funcIndex);
+
+		AssignScriptObject(mem, obj, type);
+	}
+}
+
+// interface
+int asCScriptEngine::AssignScriptObject(void *dstObj, void *srcObj, const asITypeInfo *type)
+{
+	// TODO: Warn about invalid call in message stream (make it optional)
+	if( type == 0 || dstObj == 0 || srcObj == 0 ) return asINVALID_ARG;
+
+	const asCObjectType *objType = CastToObjectType(const_cast<asCTypeInfo*>(reinterpret_cast<const asCTypeInfo*>(type)));
+	if (objType == 0) return asINVALID_ARG;
+
+	// If value assign for ref types has been disabled, then don't do anything if the type is a ref type
+	if (ep.disallowValueAssignForRefType && (objType->flags & asOBJ_REF) && !(objType->flags & asOBJ_SCOPED))
+	{
+		asIScriptContext *ctx = asGetActiveContext();
+		if (ctx)
+			ctx->SetException("Cannot do value assignment");
+		return asNOT_SUPPORTED;
+	}
+
+	// Must not copy if the opAssign is not available and the object is not a POD object
+	if (objType->beh.copy)
+	{
+		asCScriptFunction* func = scriptFunctions[objType->beh.copy];
+		if (func->funcType == asFUNC_SYSTEM)
+			CallObjectMethod(dstObj, srcObj, objType->beh.copy);
+		else
+		{
+			// Call the script class' opAssign method
+			asASSERT(objType->flags & asOBJ_SCRIPT_OBJECT);
+			reinterpret_cast<asCScriptObject*>(dstObj)->CopyFrom(reinterpret_cast<asCScriptObject*>(srcObj));
+		}
+	}
+	else if (objType->size && (objType->flags & asOBJ_POD))
+	{
+		memcpy(dstObj, srcObj, objType->size);
+	}
+	else
+	{
+		asIScriptContext* ctx = asGetActiveContext();
+		if (ctx)
+			ctx->SetException("Cannot do value assignment");
+		return asNOT_SUPPORTED;
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+void asCScriptEngine::AddRefScriptObject(void *obj, const asITypeInfo *type)
+{
+	// Make sure it is not a null pointer
+	if( obj == 0 || type == 0 ) return;
+
+	const asCTypeInfo *ti = reinterpret_cast<const asCTypeInfo*>(type);
+	if (ti->flags & asOBJ_FUNCDEF)
+	{
+		CallObjectMethod(obj, functionBehaviours.beh.addref);
+	}
+	else
+	{
+		asCObjectType *objType = CastToObjectType(const_cast<asCTypeInfo*>(ti));
+		if (objType && objType->beh.addref)
+		{
+			// Call the addref behaviour
+			CallObjectMethod(obj, objType->beh.addref);
+		}
+	}
+}
+
+// interface
+void asCScriptEngine::ReleaseScriptObject(void *obj, const asITypeInfo *type)
+{
+	// Make sure it is not a null pointer
+	if( obj == 0 || type == 0 ) return;
+
+	const asCTypeInfo *ti = reinterpret_cast<const asCTypeInfo*>(type);
+	if (ti->flags & asOBJ_FUNCDEF)
+	{
+		CallObjectMethod(obj, functionBehaviours.beh.release);
+	}
+	else
+	{
+		asCObjectType *objType = CastToObjectType(const_cast<asCTypeInfo*>(ti));
+		if (objType && objType->flags & asOBJ_REF)
+		{
+			asASSERT((objType->flags & asOBJ_NOCOUNT) || objType->beh.release);
+			if (objType->beh.release)
+			{
+				// Call the release behaviour
+				CallObjectMethod(obj, objType->beh.release);
+			}
+		}
+		else if( objType )
+		{
+			// Call the destructor
+			if (objType->beh.destruct)
+				CallObjectMethod(obj, objType->beh.destruct);
+			else if (objType->flags & asOBJ_LIST_PATTERN)
+				DestroyList((asBYTE*)obj, objType);
+
+			// We'll have to trust that the memory for the object was allocated with CallAlloc.
+			// This is true if the object was created in the context, or with CreateScriptObject.
+
+			// Then free the memory
+			CallFree(obj);
+		}
+	}
+}
+
+// interface
+int asCScriptEngine::BeginConfigGroup(const char *groupName)
+{
+	// Make sure the group name doesn't already exist
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+	{
+		if( configGroups[n]->groupName == groupName )
+			return asNAME_TAKEN;
+	}
+
+	if( currentGroup != &defaultGroup )
+		return asNOT_SUPPORTED;
+
+	asCConfigGroup *group = asNEW(asCConfigGroup)();
+	if( group == 0 )
+		return asOUT_OF_MEMORY;
+
+	group->groupName = groupName;
+
+	configGroups.PushLast(group);
+	currentGroup = group;
+
+	return 0;
+}
+
+// interface
+int asCScriptEngine::EndConfigGroup()
+{
+	// Raise error if trying to end the default config
+	if( currentGroup == &defaultGroup )
+		return asERROR;
+
+	currentGroup = &defaultGroup;
+
+	return 0;
+}
+
+// interface
+int asCScriptEngine::RemoveConfigGroup(const char *groupName)
+{
+	// It is not allowed to remove a group that is still in use.
+
+	// It would be possible to change the code in such a way that
+	// the group could be removed even though it was still in use,
+	// but that would cause severe negative impact on runtime
+	// performance, since the VM would then have to be able handle
+	// situations where the types, functions, and global variables
+	// can be removed at any time.
+
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+	{
+		if( configGroups[n]->groupName == groupName )
+		{
+			asCConfigGroup *group = configGroups[n];
+
+			// Remove any unused generated template instances
+			// before verifying if the config group is still in use.
+			// RemoveTemplateInstanceType() checks if the instance is in use
+			for( asUINT g = generatedTemplateTypes.GetLength(); g-- > 0; )
+				RemoveTemplateInstanceType(generatedTemplateTypes[g]);
+
+			// Make sure the group isn't referenced by anyone
+			if( group->refCount > 0 )
+				return asCONFIG_GROUP_IS_IN_USE;
+
+			// Verify if any objects registered in this group is still alive
+			if( group->HasLiveObjects() )
+				return asCONFIG_GROUP_IS_IN_USE;
+
+			// Remove the group from the list
+			if( n == configGroups.GetLength() - 1 )
+				configGroups.PopLast();
+			else
+				configGroups[n] = configGroups.PopLast();
+
+			// Remove the configurations registered with this group
+			group->RemoveConfiguration(this);
+
+			asDELETE(group,asCConfigGroup);
+		}
+	}
+
+	return 0;
+}
+
+asCConfigGroup *asCScriptEngine::FindConfigGroupForFunction(int funcId) const
+{
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+	{
+		// Check global functions
+		asUINT m;
+		for( m = 0; m < configGroups[n]->scriptFunctions.GetLength(); m++ )
+		{
+			if( configGroups[n]->scriptFunctions[m]->id == funcId )
+				return configGroups[n];
+		}
+	}
+
+	return 0;
+}
+
+
+asCConfigGroup *asCScriptEngine::FindConfigGroupForGlobalVar(int gvarId) const
+{
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+	{
+		for( asUINT m = 0; m < configGroups[n]->globalProps.GetLength(); m++ )
+		{
+			if( int(configGroups[n]->globalProps[m]->id) == gvarId )
+				return configGroups[n];
+		}
+	}
+
+	return 0;
+}
+
+asCConfigGroup *asCScriptEngine::FindConfigGroupForTypeInfo(const asCTypeInfo *objType) const
+{
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+	{
+		for( asUINT m = 0; m < configGroups[n]->types.GetLength(); m++ )
+		{
+			if( configGroups[n]->types[m] == objType )
+				return configGroups[n];
+		}
+	}
+
+	return 0;
+}
+
+asCConfigGroup *asCScriptEngine::FindConfigGroupForFuncDef(const asCFuncdefType *funcDef) const
+{
+	for( asUINT n = 0; n < configGroups.GetLength(); n++ )
+	{
+		asCFuncdefType *f = const_cast<asCFuncdefType*>(funcDef);
+		if( configGroups[n]->types.Exists(f) )
+			return configGroups[n];
+	}
+
+	return 0;
+}
+
+// interface
+asDWORD asCScriptEngine::SetDefaultAccessMask(asDWORD defaultMask)
+{
+	asDWORD old = defaultAccessMask;
+	defaultAccessMask = defaultMask;
+	return old;
+}
+
+int asCScriptEngine::GetNextScriptFunctionId()
+{
+	// This function only returns the next function id that
+	// should be used. It doesn't update the internal arrays.
+	if( freeScriptFunctionIds.GetLength() )
+		return freeScriptFunctionIds[freeScriptFunctionIds.GetLength()-1];
+
+	return (int)scriptFunctions.GetLength();
+}
+
+void asCScriptEngine::AddScriptFunction(asCScriptFunction *func)
+{
+	// Update the internal arrays with the function id that is now used
+	if( freeScriptFunctionIds.GetLength() && freeScriptFunctionIds[freeScriptFunctionIds.GetLength()-1] == func->id )
+		freeScriptFunctionIds.PopLast();
+
+	if( asUINT(func->id) == scriptFunctions.GetLength() )
+		scriptFunctions.PushLast(func);
+	else
+	{
+		// The slot should be empty or already set with the function, which happens if an existing shared function is reused
+		asASSERT( scriptFunctions[func->id] == 0 || scriptFunctions[func->id] == func );
+		scriptFunctions[func->id] = func;
+	}
+}
+
+void asCScriptEngine::RemoveScriptFunction(asCScriptFunction *func)
+{
+	if( func == 0 || func->id < 0 ) return;
+	int id = func->id & ~FUNC_IMPORTED;
+	if( func->funcType == asFUNC_IMPORTED )
+	{
+		if( id >= (int)importedFunctions.GetLength() ) return;
+
+		if( importedFunctions[id] )
+		{
+			// Remove the function from the list of script functions
+			if( id == (int)importedFunctions.GetLength() - 1 )
+			{
+				importedFunctions.PopLast();
+			}
+			else
+			{
+				importedFunctions[id] = 0;
+				freeImportedFunctionIdxs.PushLast(id);
+			}
+		}
+	}
+	else
+	{
+		if( id >= (int)scriptFunctions.GetLength() ) return;
+		asASSERT( func == scriptFunctions[id] );
+
+		if( scriptFunctions[id] )
+		{
+			// Remove the function from the list of script functions
+			if( id == (int)scriptFunctions.GetLength() - 1 )
+			{
+				scriptFunctions.PopLast();
+			}
+			else
+			{
+				scriptFunctions[id] = 0;
+				freeScriptFunctionIds.PushLast(id);
+			}
+
+			// Is the function used as signature id?
+			if( func->signatureId == id )
+			{
+				// Remove the signature id
+				signatureIds.RemoveValue(func);
+
+				// Update all functions using the signature id
+				int newSigId = 0;
+				for( asUINT n = 0; n < scriptFunctions.GetLength(); n++ )
+				{
+					if( scriptFunctions[n] && scriptFunctions[n]->signatureId == id )
+					{
+						if( newSigId == 0 )
+						{
+							newSigId = scriptFunctions[n]->id;
+							signatureIds.PushLast(scriptFunctions[n]);
+						}
+
+						scriptFunctions[n]->signatureId = newSigId;
+					}
+				}
+			}
+		}
+	}
+}
+
+// internal
+void asCScriptEngine::RemoveFuncdef(asCFuncdefType *funcdef)
+{
+	funcDefs.RemoveValue(funcdef);
+}
+
+// interface
+int asCScriptEngine::RegisterFuncdef(const char *decl)
+{
+	if( decl == 0 ) return ConfigError(asINVALID_ARG, "RegisterFuncdef", decl, 0);
+
+	// Parse the function declaration
+	asCScriptFunction *func = asNEW(asCScriptFunction)(this, 0, asFUNC_FUNCDEF);
+	if( func == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterFuncdef", decl, 0);
+
+	asCBuilder bld(this, 0);
+	asCObjectType *parentClass = 0;
+	int r = bld.ParseFunctionDeclaration(0, decl, func, false, 0, 0, defaultNamespace, 0, &parentClass);
+	if( r < 0 )
+	{
+		// Set as dummy function before deleting
+		func->funcType = asFUNC_DUMMY;
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asINVALID_DECLARATION, "RegisterFuncdef", decl, 0);
+	}
+
+	// Check name conflicts
+	r = bld.CheckNameConflict(func->name.AddressOf(), 0, 0, defaultNamespace, true, false, false);
+	if( r < 0 )
+	{
+		asDELETE(func,asCScriptFunction);
+		return ConfigError(asNAME_TAKEN, "RegisterFuncdef", decl, 0);
+	}
+
+	func->id = GetNextScriptFunctionId();
+	AddScriptFunction(func);
+
+	asCFuncdefType *fdt = asNEW(asCFuncdefType)(this, func);
+	funcDefs.PushLast(fdt); // doesn't increase refcount
+	registeredFuncDefs.PushLast(fdt); // doesn't increase refcount
+	allRegisteredTypes.Insert(asSNameSpaceNamePair(fdt->nameSpace, fdt->name), fdt); // constructor already set the ref count to 1
+
+	currentGroup->types.PushLast(fdt);
+	if (parentClass)
+	{
+		parentClass->childFuncDefs.PushLast(fdt);
+		fdt->parentClass = parentClass;
+
+		// Check if the method restricts that use of the template to value types or reference types
+		if (parentClass->flags & asOBJ_TEMPLATE)
+		{
+			r = SetTemplateRestrictions(parentClass, func, "RegisterFuncdef", decl);
+			if (r < 0)
+				return r;
+		}
+	}
+
+	// If parameter type from other groups are used, add references
+	currentGroup->AddReferencesForFunc(this, func);
+
+	// Return the type id as success
+	return GetTypeIdFromDataType(asCDataType::CreateType(fdt, false));
+}
+
+// interface
+asUINT asCScriptEngine::GetFuncdefCount() const
+{
+	return asUINT(registeredFuncDefs.GetLength());
+}
+
+// interface
+asITypeInfo *asCScriptEngine::GetFuncdefByIndex(asUINT index) const
+{
+	if( index >= registeredFuncDefs.GetLength() )
+		return 0;
+
+	return registeredFuncDefs[index];
+}
+
+// internal
+asCFuncdefType *asCScriptEngine::FindMatchingFuncdef(asCScriptFunction *func, asCModule *module)
+{
+	asCFuncdefType *funcDef = func->funcdefType;
+
+	if (funcDef == 0)
+	{
+		// Check if there is any matching funcdefs already in the engine that can be reused
+		for (asUINT n = 0; n < funcDefs.GetLength(); n++)
+		{
+			if (funcDefs[n]->funcdef->IsSignatureExceptNameEqual(func))
+			{
+				if (func->IsShared() && !funcDefs[n]->funcdef->IsShared())
+					continue;
+				funcDef = funcDefs[n];
+				break;
+			}
+		}
+	}
+
+	if (funcDef == 0)
+	{
+		// Create a matching funcdef
+		asCScriptFunction *fd = asNEW(asCScriptFunction)(this, 0, asFUNC_FUNCDEF);
+		fd->name = func->name;
+		fd->nameSpace = func->nameSpace;
+		fd->SetShared(func->IsShared());
+
+		fd->returnType = func->returnType;
+		fd->parameterTypes = func->parameterTypes;
+		fd->inOutFlags = func->inOutFlags;
+
+		funcDef = asNEW(asCFuncdefType)(this, fd);
+		funcDefs.PushLast(funcDef); // doesn't increase the refCount
+
+		fd->id = GetNextScriptFunctionId();
+		AddScriptFunction(fd);
+
+		if (module)
+		{
+			// Add the new funcdef to the module so it will
+			// be available when saving the bytecode
+			funcDef->module = module;
+			module->AddFuncDef(funcDef); // the refCount was already accounted for in the constructor
+		}
+
+		// Observe, if the funcdef is created without informing a module a reference will be stored in the
+		// engine's funcDefs array, but it will not be owned by any module. This means that it will live on
+		// until the engine is released.
+	}
+
+	if (funcDef && module && funcDef->module && funcDef->module != module)
+	{
+		// Unless this is a registered funcDef the returned funcDef must
+		// be stored as part of the module for saving/loading bytecode
+		if (!module->m_funcDefs.Exists(funcDef))
+		{
+			module->AddFuncDef(funcDef);
+			funcDef->AddRefInternal();
+		}
+		else
+		{
+			asASSERT(funcDef->IsShared());
+		}
+	}
+
+	return funcDef;
+}
+
+// interface
+// TODO: typedef: Accept complex types for the typedefs
+int asCScriptEngine::RegisterTypedef(const char *type, const char *decl)
+{
+	if( type == 0 ) return ConfigError(asINVALID_NAME, "RegisterTypedef", type, decl);
+
+	// Verify if the name has been registered as a type already
+	// TODO: Must check against registered funcdefs too
+	if( GetRegisteredType(type, defaultNamespace) )
+		// Let the application recover from this error, for example if the same typedef is registered twice
+		return asALREADY_REGISTERED;
+
+	// Grab the data type
+	size_t tokenLen;
+	eTokenType token;
+	asCDataType dataType;
+
+	//	Create the data type
+	token = tok.GetToken(decl, strlen(decl), &tokenLen);
+	switch(token)
+	{
+	case ttBool:
+	case ttInt:
+	case ttInt8:
+	case ttInt16:
+	case ttInt64:
+	case ttUInt:
+	case ttUInt8:
+	case ttUInt16:
+	case ttUInt64:
+	case ttFloat:
+	case ttDouble:
+		if( strlen(decl) != tokenLen )
+		{
+			return ConfigError(asINVALID_TYPE, "RegisterTypedef", type, decl);
+		}
+		break;
+
+	default:
+		return ConfigError(asINVALID_TYPE, "RegisterTypedef", type, decl);
+	}
+
+	dataType = asCDataType::CreatePrimitive(token, false);
+
+	// Make sure the name is not a reserved keyword
+	token = tok.GetToken(type, strlen(type), &tokenLen);
+	if( token != ttIdentifier || strlen(type) != tokenLen )
+		return ConfigError(asINVALID_NAME, "RegisterTypedef", type, decl);
+
+	asCBuilder bld(this, 0);
+	int r = bld.CheckNameConflict(type, 0, 0, defaultNamespace, true, false, false);
+	if( r < 0 )
+		return ConfigError(asNAME_TAKEN, "RegisterTypedef", type, decl);
+
+	// Don't have to check against members of object
+	// types as they are allowed to use the names
+
+	// Put the data type in the list
+	asCTypedefType *td = asNEW(asCTypedefType)(this);
+	if( td == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterTypedef", type, decl);
+
+	td->flags           = asOBJ_TYPEDEF;
+	td->size            = dataType.GetSizeInMemoryBytes();
+	td->name            = type;
+	td->nameSpace       = defaultNamespace;
+	td->aliasForType    = dataType;
+
+	allRegisteredTypes.Insert(asSNameSpaceNamePair(td->nameSpace, td->name), td);
+	registeredTypeDefs.PushLast(td);
+
+	currentGroup->types.PushLast(td);
+
+	return GetTypeIdByDecl(type);
+}
+
+// interface
+asUINT asCScriptEngine::GetTypedefCount() const
+{
+	return asUINT(registeredTypeDefs.GetLength());
+}
+
+// interface
+asITypeInfo *asCScriptEngine::GetTypedefByIndex(asUINT index) const
+{
+	if( index >= registeredTypeDefs.GetLength() )
+		return 0;
+
+	return registeredTypeDefs[index];
+}
+
+// interface
+int asCScriptEngine::RegisterEnum(const char *name)
+{
+	//	Check the name
+	if( NULL == name )
+		return ConfigError(asINVALID_NAME, "RegisterEnum", name, 0);
+
+	// Verify if the name has been registered as a type already
+	if( GetRegisteredType(name, defaultNamespace) )
+		return asALREADY_REGISTERED;
+
+	// Use builder to parse the datatype
+	asCDataType dt;
+	asCBuilder bld(this, 0);
+	bool oldMsgCallback = msgCallback; msgCallback = false;
+	int r = bld.ParseDataType(name, &dt, defaultNamespace);
+	msgCallback = oldMsgCallback;
+	if( r >= 0 )
+	{
+		// If it is not in the defaultNamespace then the type was successfully parsed because
+		// it is declared in a parent namespace which shouldn't be treated as an error
+		if( dt.GetTypeInfo() && dt.GetTypeInfo()->nameSpace == defaultNamespace )
+			return ConfigError(asERROR, "RegisterEnum", name, 0);
+	}
+
+	// Make sure the name is not a reserved keyword
+	size_t tokenLen;
+	int token = tok.GetToken(name, strlen(name), &tokenLen);
+	if( token != ttIdentifier || strlen(name) != tokenLen )
+		return ConfigError(asINVALID_NAME, "RegisterEnum", name, 0);
+
+	r = bld.CheckNameConflict(name, 0, 0, defaultNamespace, true, false, false);
+	if( r < 0 )
+		return ConfigError(asNAME_TAKEN, "RegisterEnum", name, 0);
+
+	asCEnumType *st = asNEW(asCEnumType)(this);
+	if( st == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterEnum", name, 0);
+
+	asCDataType dataType;
+	dataType.CreatePrimitive(ttInt, false);
+
+	st->flags = asOBJ_ENUM | asOBJ_SHARED;
+	st->size = 4;
+	st->name = name;
+	st->nameSpace = defaultNamespace;
+
+	allRegisteredTypes.Insert(asSNameSpaceNamePair(st->nameSpace, st->name), st);
+	registeredEnums.PushLast(st);
+
+	currentGroup->types.PushLast(st);
+
+	return GetTypeIdByDecl(name);
+}
+
+// interface
+int asCScriptEngine::RegisterEnumValue(const char *typeName, const char *valueName, int value)
+{
+	// Verify that the correct config group is used
+	if( currentGroup->FindType(typeName) == 0 )
+		return ConfigError(asWRONG_CONFIG_GROUP, "RegisterEnumValue", typeName, valueName);
+
+	asCDataType dt;
+	int r;
+	asCBuilder bld(this, 0);
+	r = bld.ParseDataType(typeName, &dt, defaultNamespace);
+	if( r < 0 )
+		return ConfigError(r, "RegisterEnumValue", typeName, valueName);
+
+	// Store the enum value
+	asCEnumType *ot = CastToEnumType(dt.GetTypeInfo());
+	if( ot == 0 )
+		return ConfigError(asINVALID_TYPE, "RegisterEnumValue", typeName, valueName);
+
+	if( NULL == valueName )
+		return ConfigError(asINVALID_NAME, "RegisterEnumValue", typeName, valueName);
+
+	asUINT tokenLen = 0;
+	asETokenClass tokenClass = ParseToken(valueName, 0, &tokenLen);
+	if( tokenClass != asTC_IDENTIFIER || tokenLen != strlen(valueName) )
+		return ConfigError(asINVALID_NAME, "RegisterEnumValue", typeName, valueName);
+
+	for( unsigned int n = 0; n < ot->enumValues.GetLength(); n++ )
+	{
+		if( ot->enumValues[n]->name == valueName )
+			return ConfigError(asALREADY_REGISTERED, "RegisterEnumValue", typeName, valueName);
+	}
+
+	asSEnumValue *e = asNEW(asSEnumValue);
+	if( e == 0 )
+		return ConfigError(asOUT_OF_MEMORY, "RegisterEnumValue", typeName, valueName);
+
+	e->name = valueName;
+	e->value = value;
+
+	ot->enumValues.PushLast(e);
+
+	return asSUCCESS;
+}
+
+// interface
+asUINT asCScriptEngine::GetEnumCount() const
+{
+	return registeredEnums.GetLength();
+}
+
+// interface
+asITypeInfo *asCScriptEngine::GetEnumByIndex(asUINT index) const
+{
+	if( index >= registeredEnums.GetLength() )
+		return 0;
+
+	return registeredEnums[index];
+}
+
+// interface
+asUINT asCScriptEngine::GetObjectTypeCount() const
+{
+	return asUINT(registeredObjTypes.GetLength());
+}
+
+// interface
+asITypeInfo *asCScriptEngine::GetObjectTypeByIndex(asUINT index) const
+{
+	if( index >= registeredObjTypes.GetLength() )
+		return 0;
+
+	return registeredObjTypes[index];
+}
+
+// interface
+asITypeInfo *asCScriptEngine::GetTypeInfoByName(const char *in_name) const
+{
+	asCString name;
+	asSNameSpace *ns = 0;
+	if( DetermineNameAndNamespace(in_name, defaultNamespace, name, ns) < 0 )
+		return 0;
+			
+	while (ns)
+	{
+		// Check the object types
+		for (asUINT n = 0; n < registeredObjTypes.GetLength(); n++)
+		{
+			if (registeredObjTypes[n]->name == name &&
+				registeredObjTypes[n]->nameSpace == ns)
+				return registeredObjTypes[n];
+		}
+
+		// Perhaps it is a template type? In this case
+		// the returned type will be the generic type
+		for (asUINT n = 0; n < registeredTemplateTypes.GetLength(); n++)
+		{
+			if (registeredTemplateTypes[n]->name == name &&
+				registeredTemplateTypes[n]->nameSpace == ns)
+				return registeredTemplateTypes[n];
+		}
+
+		// Check the enum types
+		for (asUINT n = 0; n < registeredEnums.GetLength(); n++)
+		{
+			if (registeredEnums[n]->name == name &&
+				registeredEnums[n]->nameSpace == ns)
+				return registeredEnums[n];
+		}
+
+		// Check the typedefs
+		for (asUINT n = 0; n < registeredTypeDefs.GetLength();n++)
+		{
+			if (registeredTypeDefs[n]->name == name &&
+				registeredTypeDefs[n]->nameSpace == ns)
+				return registeredTypeDefs[n];
+		}
+
+		// Recursively search parent namespace
+		ns = GetParentNameSpace(ns);
+	}
+
+	return 0;
+}
+
+// internal
+int asCScriptEngine::DetermineNameAndNamespace(const char *in_name, asSNameSpace *implicitNs, asCString &out_name, asSNameSpace *&out_ns) const
+{
+	if( in_name == 0 )
+		return asINVALID_ARG;
+	
+	asCString name = in_name;
+	asCString scope;
+	asSNameSpace *ns = implicitNs;
+	
+	// Check if the given name contains a scope
+	int pos = name.FindLast("::");
+	if( pos >= 0 )
+	{
+		scope = name.SubString(0, pos);
+		name = name.SubString(pos+2);
+		if( pos == 0 )
+		{
+			// The scope is '::' so the search must start in the global namespace
+			ns = nameSpaces[0];
+		}
+		else if( scope.SubString(0, 2) == "::" )
+		{
+			// The scope starts with '::' so the given scope is fully qualified
+			ns = FindNameSpace(scope.SubString(2).AddressOf());
+		}
+		else
+		{
+			// The scope doesn't start with '::' so it is relative to the current namespace
+			if( implicitNs->name == "" )
+				ns = FindNameSpace(scope.AddressOf());
+			else
+				ns = FindNameSpace((implicitNs->name + "::" + scope).AddressOf());
+		}
+	}
+	
+	out_name = name;
+	out_ns = ns;
+	
+	return 0;
+}
+
+
+// interface
+asITypeInfo *asCScriptEngine::GetTypeInfoById(int typeId) const
+{
+	asCDataType dt = GetDataTypeFromTypeId(typeId);
+
+	// Is the type id valid?
+	if (!dt.IsValid()) return 0;
+
+	return dt.GetTypeInfo();
+}
+
+// interface
+asIScriptFunction *asCScriptEngine::GetFunctionById(int funcId) const
+{
+	return GetScriptFunction(funcId);
+}
+
+// internal
+bool asCScriptEngine::IsTemplateType(const char *name) const
+{
+	// Only look in the list of template types (not instance types)
+	for( unsigned int n = 0; n < registeredTemplateTypes.GetLength(); n++ )
+	{
+		asCObjectType *type = registeredTemplateTypes[n];
+		if( type && type->name == name )
+			return true;
+	}
+
+	return false;
+}
+
+// internal
+int asCScriptEngine::GetScriptSectionNameIndex(const char *name)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	// TODO: These names are only released when the engine is freed. The assumption is that
+	//       the same script section names will be reused instead of there always being new
+	//       names. Is this assumption valid? Do we need to add reference counting?
+
+	// Store the script section names for future reference
+	for( asUINT n = 0; n < scriptSectionNames.GetLength(); n++ )
+	{
+		if( scriptSectionNames[n]->Compare(name) == 0 )
+		{
+			RELEASEEXCLUSIVE(engineRWLock);
+			return n;
+		}
+	}
+
+	asCString *str = asNEW(asCString)(name);
+	if( str )
+		scriptSectionNames.PushLast(str);
+	int r = int(scriptSectionNames.GetLength()-1);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+
+	return r;
+}
+
+// interface
+void asCScriptEngine::SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanEngineFuncs.GetLength(); n++ )
+	{
+		if( cleanEngineFuncs[n].type == type )
+		{
+			cleanEngineFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SEngineClean otc = {type, callback};
+	cleanEngineFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
+// interface
+void asCScriptEngine::SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanModuleFuncs.GetLength(); n++ )
+	{
+		if( cleanModuleFuncs[n].type == type )
+		{
+			cleanModuleFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SModuleClean otc = {type, callback};
+	cleanModuleFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
+// interface
+void asCScriptEngine::SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanContextFuncs.GetLength(); n++ )
+	{
+		if( cleanContextFuncs[n].type == type )
+		{
+			cleanContextFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SContextClean otc = {type, callback};
+	cleanContextFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
+// interface
+void asCScriptEngine::SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanFunctionFuncs.GetLength(); n++ )
+	{
+		if( cleanFunctionFuncs[n].type == type )
+		{
+			cleanFunctionFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SFunctionClean otc = {type, callback};
+	cleanFunctionFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
+// interface
+void asCScriptEngine::SetTypeInfoUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanTypeInfoFuncs.GetLength(); n++ )
+	{
+		if( cleanTypeInfoFuncs[n].type == type )
+		{
+			cleanTypeInfoFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	STypeInfoClean otc = {type, callback};
+	cleanTypeInfoFuncs.PushLast(otc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
+// interface
+void asCScriptEngine::SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type)
+{
+	ACQUIREEXCLUSIVE(engineRWLock);
+
+	for( asUINT n = 0; n < cleanScriptObjectFuncs.GetLength(); n++ )
+	{
+		if( cleanScriptObjectFuncs[n].type == type )
+		{
+			cleanScriptObjectFuncs[n].cleanFunc = callback;
+
+			RELEASEEXCLUSIVE(engineRWLock);
+
+			return;
+		}
+	}
+	SScriptObjClean soc = {type, callback};
+	cleanScriptObjectFuncs.PushLast(soc);
+
+	RELEASEEXCLUSIVE(engineRWLock);
+}
+
+// interface
+int asCScriptEngine::SetTranslateAppExceptionCallback(asSFuncPtr callback, void *param, int callConv)
+{
+#ifdef AS_NO_EXCEPTIONS
+	return asNOT_SUPPORTED;
+#else
+	if (callback.ptr.f.func == 0)
+	{
+		// Clear the callback
+		translateExceptionCallback = false;
+		return asSUCCESS;
+	}
+
+	// Detect the new callback
+	translateExceptionCallback = true;
+	translateExceptionCallbackObj = param;
+	bool isObj = false;
+	if ((unsigned)callConv == asCALL_GENERIC || (unsigned)callConv == asCALL_THISCALL_OBJFIRST || (unsigned)callConv == asCALL_THISCALL_OBJLAST)
+		return asNOT_SUPPORTED;
+	if ((unsigned)callConv >= asCALL_THISCALL)
+	{
+		isObj = true;
+		if (param == 0)
+		{
+			translateExceptionCallback = false;
+			return asINVALID_ARG;
+		}
+	}
+	int r = DetectCallingConvention(isObj, callback, callConv, 0, &translateExceptionCallbackFunc);
+	if (r < 0) 
+		translateExceptionCallback = false;
+
+	return r;
+#endif
+}
+
+// internal
+asCObjectType *asCScriptEngine::GetListPatternType(int listPatternFuncId)
+{
+	// Get the object type either from the constructor's object for value types
+	// or from the factory's return type for reference types
+	asCObjectType *ot = scriptFunctions[listPatternFuncId]->objectType;
+	if( ot == 0 )
+		ot = CastToObjectType(scriptFunctions[listPatternFuncId]->returnType.GetTypeInfo());
+	asASSERT( ot );
+
+	// Check if this object type already has a list pattern type
+	for( asUINT n = 0; n < listPatternTypes.GetLength(); n++ )
+	{
+		if( listPatternTypes[n]->templateSubTypes[0].GetTypeInfo() == ot )
+			return listPatternTypes[n];
+	}
+
+	// Create a new list pattern type for the given object type
+	asCObjectType *lpt = asNEW(asCObjectType)(this);
+	lpt->templateSubTypes.PushLast(asCDataType::CreateType(ot, false));
+	lpt->flags = asOBJ_LIST_PATTERN;
+	listPatternTypes.PushLast(lpt);
+
+	return lpt;
+}
+
+// internal
+void asCScriptEngine::DestroyList(asBYTE *buffer, const asCObjectType *listPatternType)
+{
+	asASSERT( listPatternType && (listPatternType->flags & asOBJ_LIST_PATTERN) );
+
+	// Get the list pattern from the listFactory function
+	// TODO: runtime optimize: Store the used list factory in the listPatternType itself
+	// TODO: runtime optimize: Keep a flag to indicate if there is really a need to free anything
+	asCObjectType *ot = CastToObjectType(listPatternType->templateSubTypes[0].GetTypeInfo());
+	asCScriptFunction *listFactory = scriptFunctions[ot->beh.listFactory];
+	asASSERT( listFactory );
+
+	asSListPatternNode *node = listFactory->listPattern;
+	DestroySubList(buffer, node);
+
+	asASSERT( node->type == asLPT_END );
+}
+
+// internal
+void asCScriptEngine::DestroySubList(asBYTE *&buffer, asSListPatternNode *&node)
+{
+	asASSERT( node->type == asLPT_START );
+
+	int count = 0;
+
+	node = node->next;
+	while( node )
+	{
+		if( node->type == asLPT_REPEAT || node->type == asLPT_REPEAT_SAME )
+		{
+			// Align the offset to 4 bytes boundary
+			if( (asPWORD(buffer) & 0x3) )
+				buffer += 4 - (asPWORD(buffer) & 0x3);
+
+			// Determine how many times the pattern repeat
+			count = *(asUINT*)buffer;
+			buffer += 4;
+
+			if( count == 0 )
+			{
+				// Skip the sub pattern that was expected to be repeated, otherwise
+				// we'll try to delete things that don't exist in the buffer
+				node = node->next;
+				if( node->type == asLPT_START )
+				{
+					int subCount = 1;
+					do
+					{
+						node = node->next;
+						if( node->type == asLPT_START )
+							subCount++;
+						else if( node->type == asLPT_END )
+							subCount--;
+					} while( subCount > 0 );
+					return;
+				}
+			}
+		}
+		else if( node->type == asLPT_TYPE )
+		{
+			// If we're not in a repeat iteration, then only 1 value should be destroyed
+			if( count <= 0 )
+				count = 1;
+
+			asCDataType dt = reinterpret_cast<asSListPatternDataTypeNode*>(node)->dataType;
+			bool isVarType = dt.GetTokenType() == ttQuestion;
+
+			while( count-- )
+			{
+				if( isVarType )
+				{
+					// Align the offset to 4 bytes boundary
+					if( (asPWORD(buffer) & 0x3) )
+						buffer += 4 - (asPWORD(buffer) & 0x3);
+
+					int typeId = *(int*)buffer;
+					buffer += 4;
+					dt = GetDataTypeFromTypeId(typeId);
+				}
+
+				asCTypeInfo *ti = dt.GetTypeInfo();
+				if( ti && (ti->flags & asOBJ_ENUM) == 0 )
+				{
+					// Free all instances of this type
+					if( ti->flags & asOBJ_VALUE )
+					{
+						asUINT size = ti->GetSize();
+
+						// Align the offset to 4 bytes boundary
+						if( size >= 4 && (asPWORD(buffer) & 0x3) )
+							buffer += 4 - (asPWORD(buffer) & 0x3);
+
+						asCObjectType *ot = CastToObjectType(ti);
+						if( ot && ot->beh.destruct )
+						{
+							// Only call the destructor if the object has been created
+							// We'll assume the object has been created if any byte in
+							// the memory is different from 0.
+							// TODO: This is not really correct, as bytes may have been
+							//       modified by the constructor, but then an exception
+							//       thrown aborting the initialization. The engine
+							//       really should be keeping track of which objects has
+							//       been successfully initialized.
+
+							for( asUINT n = 0; n < size; n++ )
+							{
+								if( buffer[n] != 0 )
+								{
+									void *ptr = (void*)buffer;
+									CallObjectMethod(ptr, ot->beh.destruct);
+									break;
+								}
+							}
+						}
+
+						// Advance the pointer in the buffer
+						buffer += size;
+					}
+					else
+					{
+						// Align the offset to 4 bytes boundary
+						if( asPWORD(buffer) & 0x3 )
+							buffer += 4 - (asPWORD(buffer) & 0x3);
+
+						// Call the release behaviour
+						void *ptr = *(void**)buffer;
+						if( ptr )
+							ReleaseScriptObject(ptr, ti);
+						buffer += AS_PTR_SIZE*4;
+					}
+				}
+				else
+				{
+					asUINT size = dt.GetSizeInMemoryBytes();
+
+					// Align the offset to 4 bytes boundary
+					if( size >= 4 && (asPWORD(buffer) & 0x3) )
+						buffer += 4 - (asPWORD(buffer) & 0x3);
+
+					// Advance the buffer
+					buffer += size;
+				}
+			}
+		}
+		else if( node->type == asLPT_START )
+		{
+			// If we're not in a repeat iteration, then only 1 value should be destroyed
+			if( count <= 0 )
+				count = 1;
+
+			while( count-- )
+			{
+				asSListPatternNode *subList = node;
+				DestroySubList(buffer, subList);
+
+				asASSERT( subList->type == asLPT_END );
+
+				if( count == 0 )
+					node = subList;
+			}
+		}
+		else if( node->type == asLPT_END )
+		{
+			return;
+		}
+		else
+		{
+			asASSERT( false );
+		}
+
+		node = node->next;
+	}
+}
+
+// internal
+asSNameSpace *asCScriptEngine::GetParentNameSpace(asSNameSpace *ns) const
+{
+	if( ns == 0 ) return 0;
+	if( ns == nameSpaces[0] ) return 0;
+
+	asCString scope = ns->name;
+	int pos = scope.FindLast("::");
+	if( pos >= 0 )
+	{
+		scope = scope.SubString(0, pos);
+		return FindNameSpace(scope.AddressOf());
+	}
+
+	return nameSpaces[0];
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_scriptengine.h b/Sources/AngelScript/source/as_scriptengine.h
old mode 100755
new mode 100644
index 7663e9b40..bd7578368
--- a/Sources/AngelScript/source/as_scriptengine.h
+++ b/Sources/AngelScript/source/as_scriptengine.h
@@ -1,544 +1,529 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptengine.h
-//
-// The implementation of the script engine interface
-//
-
-
-
-#ifndef AS_SCRIPTENGINE_H
-#define AS_SCRIPTENGINE_H
-
-#include "as_config.h"
-#include "as_atomic.h"
-#include "as_scriptfunction.h"
-#include "as_array.h"
-#include "as_datatype.h"
-#include "as_objecttype.h"
-#include "as_module.h"
-#include "as_callfunc.h"
-#include "as_configgroup.h"
-#include "as_memory.h"
-#include "as_gc.h"
-#include "as_tokenizer.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCBuilder;
-class asCContext;
-
-// TODO: import: Remove this when import is removed
-struct sBindInfo;
-
-class asCScriptEngine : public asIScriptEngine
-{
-//=============================================================
-// From asIScriptEngine
-//=============================================================
-public:
-	// Memory management
-	virtual int AddRef() const;
-	virtual int Release() const;
-	virtual int ShutDownAndRelease();
-
-	// Engine properties
-	virtual int     SetEngineProperty(asEEngineProp property, asPWORD value);
-	virtual asPWORD GetEngineProperty(asEEngineProp property) const;
-
-	// Compiler messages
-	virtual int SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv);
-	virtual int ClearMessageCallback();
-	virtual int WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message);
-
-	// JIT Compiler
-	virtual int SetJITCompiler(asIJITCompiler *compiler);
-	virtual asIJITCompiler *GetJITCompiler() const;
-
-	// Global functions
-	virtual int                RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0);
-	virtual asUINT             GetGlobalFunctionCount() const;
-	virtual asIScriptFunction *GetGlobalFunctionByIndex(asUINT index) const;
-	virtual asIScriptFunction *GetGlobalFunctionByDecl(const char *declaration) const;
-
-	// Global properties
-	virtual int    RegisterGlobalProperty(const char *declaration, void *pointer);
-	virtual asUINT GetGlobalPropertyCount() const;
-	virtual int    GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0, const char **configGroup = 0, void **pointer = 0, asDWORD *accessMask = 0) const;
-	virtual int    GetGlobalPropertyIndexByName(const char *name) const;
-	virtual int    GetGlobalPropertyIndexByDecl(const char *decl) const;
-
-	// Type registration
-	virtual int            RegisterObjectType(const char *obj, int byteSize, asDWORD flags);
-	virtual int            RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset);
-	virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0);
-	virtual int            RegisterObjectBehaviour(const char *obj, asEBehaviours behaviour, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0);
-	virtual int            RegisterInterface(const char *name);
-	virtual int            RegisterInterfaceMethod(const char *intf, const char *declaration);
-	virtual asUINT         GetObjectTypeCount() const;
-	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual asITypeInfo   *GetObjectTypeByName(const char *name) const;
-	virtual asITypeInfo   *GetObjectTypeByDecl(const char *decl) const;
-#endif
-
-	// String factory
-	virtual int RegisterStringFactory(const char *datatype, const asSFuncPtr &factoryFunc, asDWORD callConv, void *auxiliary = 0);
-	virtual int GetStringFactoryReturnTypeId(asDWORD *flags) const;
-
-	// Default array type
-	virtual int RegisterDefaultArrayType(const char *type);
-	virtual int GetDefaultArrayTypeId() const;
-
-	// Enums
-	virtual int          RegisterEnum(const char *type);
-	virtual int          RegisterEnumValue(const char *type, const char *name, int value);
-	virtual asUINT       GetEnumCount() const;
-	virtual asITypeInfo *GetEnumByIndex(asUINT index) const;
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual int          GetEnumValueCount(int enumTypeId) const;
-	virtual const char * GetEnumValueByIndex(int enumTypeId, asUINT index, int *outValue) const;
-#endif
-
-	// Funcdefs
-	virtual int          RegisterFuncdef(const char *decl);
-	virtual asUINT       GetFuncdefCount() const;
-	virtual asITypeInfo *GetFuncdefByIndex(asUINT index) const;
-
-	// Typedefs
-	// TODO: interface: Should perhaps rename this to Alias, since it doesn't really create a new type
-	virtual int          RegisterTypedef(const char *type, const char *decl);
-	virtual asUINT       GetTypedefCount() const;
-	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const;
-
-	// Configuration groups
-	virtual int         BeginConfigGroup(const char *groupName);
-	virtual int         EndConfigGroup();
-	virtual int         RemoveConfigGroup(const char *groupName);
-	virtual asDWORD     SetDefaultAccessMask(asDWORD defaultMask);
-	virtual int         SetDefaultNamespace(const char *nameSpace);
-	virtual const char *GetDefaultNamespace() const;
-
-	// Script modules
-	virtual asIScriptModule *GetModule(const char *module, asEGMFlags flag);
-	virtual int              DiscardModule(const char *module);
-	virtual asUINT           GetModuleCount() const;
-	virtual asIScriptModule *GetModuleByIndex(asUINT index) const;
-
-	// Script functions
-	virtual asIScriptFunction *GetFunctionById(int funcId) const;
-#ifdef AS_DEPRECATED
-	// deprecated since 2.31.0, 2016-01-01
-	virtual asIScriptFunction *GetFuncdefFromTypeId(int typeId) const;
-#endif
-
-	// Type identification
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual asITypeInfo   *GetObjectTypeById(int typeId) const;
-#endif
-	virtual int            GetTypeIdByDecl(const char *decl) const;
-	virtual const char    *GetTypeDeclaration(int typeId, bool includeNamespace = false) const;
-	virtual int            GetSizeOfPrimitiveType(int typeId) const;
-	virtual asITypeInfo   *GetTypeInfoById(int typeId) const;
-	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const;
-	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const;
-
-	// Script execution
-	virtual asIScriptContext      *CreateContext();
-	virtual void                  *CreateScriptObject(const asITypeInfo *type);
-	virtual void                  *CreateScriptObjectCopy(void *obj, const asITypeInfo *type);
-	virtual void                  *CreateUninitializedScriptObject(const asITypeInfo *type);
-	virtual asIScriptFunction     *CreateDelegate(asIScriptFunction *func, void *obj);
-	virtual int                    AssignScriptObject(void *dstObj, void *srcObj, const asITypeInfo *type);
-	virtual void                   ReleaseScriptObject(void *obj, const asITypeInfo *type);
-	virtual void                   AddRefScriptObject(void *obj, const asITypeInfo *type);
-	virtual int                    RefCastObject(void *obj, asITypeInfo *fromType, asITypeInfo *toType, void **newPtr, bool useOnlyImplicitCast = false);
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.30.0, 2014-11-04
-	virtual bool                   IsHandleCompatibleWithObject(void *obj, int objTypeId, int handleTypeId) const;
-#endif
-	virtual asILockableSharedBool *GetWeakRefFlagOfScriptObject(void *obj, const asITypeInfo *type) const;
-
-	// Context pooling
-	virtual asIScriptContext *RequestContext();
-	virtual void              ReturnContext(asIScriptContext *ctx);
-	virtual int               SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param = 0);
-
-	// String interpretation
-	virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, asUINT *tokenLength = 0) const;
-
-	// Garbage collection
-	virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE, asUINT numIterations = 1);
-	virtual void GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const;
-	virtual int  NotifyGarbageCollectorOfNewObject(void *obj, asITypeInfo *type);
-	virtual int  GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj = 0, asITypeInfo **type = 0);
-	virtual void GCEnumCallback(void *reference);
-
-	// User data
-	virtual void *SetUserData(void *data, asPWORD type);
-	virtual void *GetUserData(asPWORD type) const;
-	virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type);
-	virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type);
-	virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type);
-	virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type);
-#ifdef AS_DEPRECATED
-	// Deprecated since 2.31.0, 2015-12-06
-	virtual void  SetObjectTypeUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type);
-#endif
-	virtual void  SetTypeInfoUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type);
-	virtual void  SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type);
-
-//===========================================================
-// internal methods
-//===========================================================
-public:
-	asCScriptEngine();
-	virtual ~asCScriptEngine();
-
-//protected:
-	friend class asCBuilder;
-	friend class asCCompiler;
-	friend class asCContext;
-	friend class asCDataType;
-	friend class asCModule;
-	friend class asCRestore;
-	friend class asCByteCode;
-	friend int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
-
-	int RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0);
-	int RegisterBehaviourToObjectType(asCObjectType *objectType, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0);
-
-	int VerifyVarTypeNotInFunction(asCScriptFunction *func);
-
-	void *CallAlloc(const asCObjectType *objType) const;
-	void  CallFree(void *obj) const;
-
-	void *CallGlobalFunctionRetPtr(int func) const;
-	void *CallGlobalFunctionRetPtr(int func, void *param1) const;
-	void *CallGlobalFunctionRetPtr(asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
-	void *CallGlobalFunctionRetPtr(asSSystemFunctionInterface *i, asCScriptFunction *s, void *param1) const;
-	void  CallObjectMethod(void *obj, int func) const;
-	void  CallObjectMethod(void *obj, void *param, int func) const;
-	void  CallObjectMethod(void *obj, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
-	void  CallObjectMethod(void *obj, void *param, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
-	bool  CallObjectMethodRetBool(void *obj, int func) const;
-	int   CallObjectMethodRetInt(void *obj, int func) const;
-	void *CallObjectMethodRetPtr(void *obj, int func) const;
-	void *CallObjectMethodRetPtr(void *obj, int param1, asCScriptFunction *func) const;
-	void  CallGlobalFunction(void *param1, void *param2, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
-	bool  CallGlobalFunctionRetBool(void *param1, void *param2, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
-
-	void ConstructScriptObjectCopy(void *mem, void *obj, asCObjectType *type);
-
-	void DeleteDiscardedModules();
-
-	void RemoveTemplateInstanceType(asCObjectType *t);
-
-	asCConfigGroup *FindConfigGroupForFunction(int funcId) const;
-	asCConfigGroup *FindConfigGroupForGlobalVar(int gvarId) const;
-	asCConfigGroup *FindConfigGroupForTypeInfo(const asCTypeInfo *type) const;
-	asCConfigGroup *FindConfigGroupForFuncDef(const asCFuncdefType *funcDef) const;
-
-	int  RequestBuild();
-	void BuildCompleted();
-
-	void PrepareEngine();
-	bool isPrepared;
-
-	int CreateContext(asIScriptContext **context, bool isInternal);
-
-	asCTypeInfo *GetRegisteredType(const asCString &name, asSNameSpace *ns) const;
-
-	asCObjectType *GetListPatternType(int listPatternFuncId);
-	void DestroyList(asBYTE *buffer, const asCObjectType *listPatternType);
-	void DestroySubList(asBYTE *&buffer, asSListPatternNode *&patternNode);
-
-	int AddBehaviourFunction(asCScriptFunction &func, asSSystemFunctionInterface &internal);
-
-	asCString GetFunctionDeclaration(int funcId);
-
-	asCScriptFunction *GetScriptFunction(int funcId) const;
-
-	asCModule *GetModule(const char *name, bool create);
-	asCModule *GetModuleFromFuncId(int funcId);
-
-	int  GetMethodIdByDecl(const asCObjectType *ot, const char *decl, asCModule *mod);
-	int  GetFactoryIdByDecl(const asCObjectType *ot, const char *decl);
-
-	int  GetNextScriptFunctionId();
-	void AddScriptFunction(asCScriptFunction *func);
-	void RemoveScriptFunction(asCScriptFunction *func);
-	void RemoveFuncdef(asCFuncdefType *func);
-
-	int ConfigError(int err, const char *funcName, const char *arg1, const char *arg2);
-
-	int                GetTypeIdFromDataType(const asCDataType &dt) const;
-	asCDataType        GetDataTypeFromTypeId(int typeId) const;
-	asCObjectType     *GetObjectTypeFromTypeId(int typeId) const;
-	void               RemoveFromTypeIdMap(asCTypeInfo *type);
-
-	bool               IsTemplateType(const char *name) const;
-	int                SetTemplateRestrictions(asCObjectType *templateType, asCScriptFunction *func, const char *caller, const char *decl);
-	asCObjectType     *GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes, asCModule *requestingModule);
-	asCScriptFunction *GenerateTemplateFactoryStub(asCObjectType *templateType, asCObjectType *templateInstanceType, int origFactoryId);
-	bool               GenerateNewTemplateFunction(asCObjectType *templateType, asCObjectType *templateInstanceType, asCScriptFunction *templateFunc, asCScriptFunction **newFunc);
-	asCFuncdefType    *GenerateNewTemplateFuncdef(asCObjectType *templateType, asCObjectType *templateInstanceType, asCFuncdefType *templateFuncdef);
-	asCDataType        DetermineTypeForTemplate(const asCDataType &orig, asCObjectType *tmpl, asCObjectType *ot);
-	bool               RequireTypeReplacement(asCDataType &type, asCObjectType *templateType);
-
-	asCModule         *FindNewOwnerForSharedType(asCTypeInfo *type, asCModule *mod);
-	asCModule         *FindNewOwnerForSharedFunc(asCScriptFunction *func, asCModule *mod);
-
-	asCFuncdefType    *FindMatchingFuncdef(asCScriptFunction *func, asCModule *mod);
-
-	// String constants
-	// TODO: Must free unused string constants, thus the ref count for each must be tracked
-	int              AddConstantString(const char *str, size_t length);
-	const asCString &GetConstantString(int id);
-
-	// Global property management
-	asCGlobalProperty *AllocateGlobalProperty();
-	void RemoveGlobalProperty(asCGlobalProperty *prop);
-
-	int GetScriptSectionNameIndex(const char *name);
-
-	// Namespace management
-	asSNameSpace *AddNameSpace(const char *name);
-	asSNameSpace *FindNameSpace(const char *name) const;
-	asSNameSpace *GetParentNameSpace(asSNameSpace *ns) const;
-
-//===========================================================
-// internal properties
-//===========================================================
-	asCMemoryMgr memoryMgr;
-
-	asUINT initialContextStackSize;
-
-	asCObjectType   *defaultArrayObjectType;
-	asCObjectType    scriptTypeBehaviours;
-	asCObjectType    functionBehaviours;
-
-	// Registered interface
-	asCArray<asCObjectType *>         registeredObjTypes;      // doesn't increase ref count
-	asCArray<asCTypedefType *>        registeredTypeDefs;      // doesn't increase ref count
-	asCArray<asCEnumType *>           registeredEnums;         // doesn't increase ref count
-	// TODO: memory savings: Since there can be only one property with the same name a simpler symbol table should be used for global props
-	asCSymbolTable<asCGlobalProperty> registeredGlobalProps;   // increases ref count
-	asCSymbolTable<asCScriptFunction> registeredGlobalFuncs;
-	asCArray<asCFuncdefType *>        registeredFuncDefs;      // doesn't increase ref count
-	asCArray<asCObjectType *>         registeredTemplateTypes; // doesn't increase ref count
-	asCScriptFunction                *stringFactory;
-	bool configFailed;
-
-	// Stores all registered types
-	asCMap<asSNameSpaceNamePair, asCTypeInfo*> allRegisteredTypes; // increases ref count
-
-	// Dummy types used to name the subtypes in the template objects 
-	asCArray<asCTypeInfo *>        templateSubTypes;
-
-	// Store information about template types
-	// This list will contain all instances of templates, both registered specialized 
-	// types and those automacially instantiated from scripts
-	asCArray<asCObjectType *>      templateInstanceTypes; // increases ref count
-
-	// Store information about list patterns
-	asCArray<asCObjectType *>      listPatternTypes; // increases ref count
-
-	// Stores all global properties, both those registered by application, and those declared by scripts.
-	// The id of a global property is the index in this array.
-	asCArray<asCGlobalProperty *> globalProperties; // increases ref count
-	asCArray<int>                 freeGlobalPropertyIds;
-
-	// This map is used to quickly find a property by its memory address
-	// It is used principally during building, cleanup, and garbage detection for script functions
-	asCMap<void*, asCGlobalProperty*> varAddressMap; // doesn't increase ref count
-
-	// Stores all functions, i.e. registered functions, script functions, class methods, behaviours, etc.
-	asCArray<asCScriptFunction *> scriptFunctions;       // doesn't increase ref count
-	asCArray<int>                 freeScriptFunctionIds;
-	asCArray<asCScriptFunction *> signatureIds;
-
-	// An array with all module imported functions
-	asCArray<sBindInfo *>  importedFunctions; // doesn't increase ref count
-	asCArray<int>          freeImportedFunctionIdxs;
-
-	// Synchronized
-	mutable asCAtomic      refCount;
-	// Synchronized with engineRWLock
-	// This array holds all live script modules
-	asCArray<asCModule *>  scriptModules;
-	// Synchronized with engineRWLock
-	// This is a pointer to the last module that was requested. It is used for performance 
-	// improvement, since it is common that the same module is accessed many times in a row
-	asCModule             *lastModule;
-	// Synchronized with engineRWLock
-	// This flag is true if a script is currently being compiled. It is used to prevent multiple
-	// threads from requesting builds at the same time (without blocking)
-	bool                   isBuilding;
-	// Synchronized with engineRWLock
-	// This array holds modules that have been discard (thus are no longer visible to the application)
-	// but cannot yet be deleted due to having external references to some of the entities in them
-	asCArray<asCModule *>  discardedModules;
-	// This flag is set to true during compilations of scripts (or loading pre-compiled scripts) 
-	// to delay the validation of template types until the subtypes have been fully declared 
-	bool                   deferValidationOfTemplateTypes;
-
-	// Tokenizer is instantiated once to share resources
-	asCTokenizer tok;
-
-	// Stores shared script declared types (classes, interfaces, enums)
-	asCArray<asCTypeInfo *> sharedScriptTypes; // increases ref count
-	// This array stores the template instances types that have been automatically generated from template types
-	asCArray<asCObjectType *> generatedTemplateTypes;
-	// Stores the funcdefs
-	// TODO: redesign: Only shared funcdefs should be stored here
-	//                 a funcdef becomes shared if all arguments and the return type are shared (or application registered)
-	asCArray<asCFuncdefType *> funcDefs; // doesn't increases ref count
-
-	// Stores the names of the script sections for debugging purposes
-	asCArray<asCString *> scriptSectionNames;
-
-	// Type identifiers
-	mutable int                             typeIdSeqNbr;
-	mutable asCMap<int, asCTypeInfo*>       mapTypeIdToTypeInfo;
-
-	// Garbage collector
-	asCGarbageCollector gc;
-
-	// Dynamic groups
-	asCConfigGroup             defaultGroup;
-	asCArray<asCConfigGroup*>  configGroups;
-	asCConfigGroup            *currentGroup;
-	asDWORD                    defaultAccessMask;
-	asSNameSpace              *defaultNamespace;
-
-	// Message callback
-	bool                        msgCallback;
-	asSSystemFunctionInterface  msgCallbackFunc;
-	void                       *msgCallbackObj;
-	struct preMessage_t
-	{
-		preMessage_t() { isSet = false; }
-		bool      isSet;
-		asCString message;
-		asCString scriptname;
-		int       r;
-		int       c;
-	} preMessage;
-
-	// JIt compilation
-	asIJITCompiler             *jitCompiler;
-
-	// Namespaces
-	// These are shared between all entities and are 
-	// only deleted once the engine is destroyed
-	asCArray<asSNameSpace*> nameSpaces;
-
-	// String constants
-	// These are shared between all scripts and are
-	// only deleted once the engine is destroyed
-	asCArray<asCString*>          stringConstants;
-	asCMap<asCStringPointer, int> stringToIdMap;
-
-	// Callbacks for context pooling
-	asREQUESTCONTEXTFUNC_t  requestCtxFunc;
-	asRETURNCONTEXTFUNC_t   returnCtxFunc;
-	void                   *ctxCallbackParam;
-
-	// User data
-	asCArray<asPWORD>       userData;
-
-	struct SEngineClean    { asPWORD type; asCLEANENGINEFUNC_t       cleanFunc; };
-	asCArray<SEngineClean>    cleanEngineFuncs;
-	struct SModuleClean    { asPWORD type; asCLEANMODULEFUNC_t       cleanFunc; };
-	asCArray<SModuleClean>    cleanModuleFuncs;
-	struct SContextClean   { asPWORD type; asCLEANCONTEXTFUNC_t      cleanFunc; };
-	asCArray<SContextClean>   cleanContextFuncs;
-	struct SFunctionClean  { asPWORD type; asCLEANFUNCTIONFUNC_t     cleanFunc; };
-	asCArray<SFunctionClean>  cleanFunctionFuncs;
-	struct STypeInfoClean  { asPWORD type; asCLEANTYPEINFOFUNC_t     cleanFunc; };
-	asCArray<STypeInfoClean>  cleanTypeInfoFuncs;
-	struct SScriptObjClean { asPWORD type; asCLEANSCRIPTOBJECTFUNC_t cleanFunc; };
-	asCArray<SScriptObjClean> cleanScriptObjectFuncs;
-
-	// Synchronization for threads
-	DECLAREREADWRITELOCK(mutable engineRWLock)
-
-	// Engine properties
-	struct
-	{
-		bool   allowUnsafeReferences;
-		bool   optimizeByteCode;
-		bool   copyScriptSections;
-		asUINT maximumContextStackSize;
-		bool   useCharacterLiterals;
-		bool   allowMultilineStrings;
-		bool   allowImplicitHandleTypes;
-		bool   buildWithoutLineCues;
-		bool   initGlobalVarsAfterBuild;
-		bool   requireEnumScope;
-		int    scanner;
-		bool   includeJitInstructions;
-		int    stringEncoding;
-		int    propertyAccessorMode;
-		bool   expandDefaultArrayToTemplate;
-		bool   autoGarbageCollect;
-		bool   disallowGlobalVars;
-		bool   alwaysImplDefaultConstruct;
-		int    compilerWarnings;
-		bool   disallowValueAssignForRefType;
-		// TODO: 3.0.0: Remove the alterSyntaxNamedArgs
-		int    alterSyntaxNamedArgs;
-		bool   disableIntegerDivision;
-		bool   disallowEmptyListElements;
-		// TODO: 3.0.0: Remove the privatePropAsProtected
-		bool   privatePropAsProtected;
-		bool   allowUnicodeIdentifiers;
-		int    heredocTrimMode;
-	} ep;
-
-	// This flag is to allow a quicker shutdown when releasing the engine
-	bool shuttingDown;
-
-	// This flag is set when the engine's destructor is called, this is to 
-	// avoid recursive calls if an object happens to increment/decrement
-	// the ref counter during shutdown
-	bool inDestructor;
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptengine.h
+//
+// The implementation of the script engine interface
+//
+
+
+
+#ifndef AS_SCRIPTENGINE_H
+#define AS_SCRIPTENGINE_H
+
+#include "as_config.h"
+#include "as_atomic.h"
+#include "as_scriptfunction.h"
+#include "as_array.h"
+#include "as_datatype.h"
+#include "as_objecttype.h"
+#include "as_module.h"
+#include "as_callfunc.h"
+#include "as_configgroup.h"
+#include "as_memory.h"
+#include "as_gc.h"
+#include "as_tokenizer.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCBuilder;
+class asCContext;
+
+// TODO: import: Remove this when import is removed
+struct sBindInfo;
+
+class asCScriptEngine : public asIScriptEngine
+{
+//=============================================================
+// From asIScriptEngine
+//=============================================================
+public:
+	// Memory management
+	virtual int AddRef() const;
+	virtual int Release() const;
+	virtual int ShutDownAndRelease();
+
+	// Engine properties
+	virtual int     SetEngineProperty(asEEngineProp property, asPWORD value);
+	virtual asPWORD GetEngineProperty(asEEngineProp property) const;
+
+	// Compiler messages
+	virtual int SetMessageCallback(const asSFuncPtr &callback, void *obj, asDWORD callConv);
+	virtual int ClearMessageCallback();
+	virtual int WriteMessage(const char *section, int row, int col, asEMsgType type, const char *message);
+
+	// JIT Compiler
+	virtual int SetJITCompiler(asIJITCompiler *compiler);
+	virtual asIJITCompiler *GetJITCompiler() const;
+
+	// Global functions
+	virtual int                RegisterGlobalFunction(const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0);
+	virtual asUINT             GetGlobalFunctionCount() const;
+	virtual asIScriptFunction *GetGlobalFunctionByIndex(asUINT index) const;
+	virtual asIScriptFunction *GetGlobalFunctionByDecl(const char *declaration) const;
+
+	// Global properties
+	virtual int    RegisterGlobalProperty(const char *declaration, void *pointer);
+	virtual asUINT GetGlobalPropertyCount() const;
+	virtual int    GetGlobalPropertyByIndex(asUINT index, const char **name, const char **nameSpace = 0, int *typeId = 0, bool *isConst = 0, const char **configGroup = 0, void **pointer = 0, asDWORD *accessMask = 0) const;
+	virtual int    GetGlobalPropertyIndexByName(const char *name) const;
+	virtual int    GetGlobalPropertyIndexByDecl(const char *decl) const;
+
+	// Type registration
+	virtual int            RegisterObjectType(const char *obj, int byteSize, asDWORD flags);
+	virtual int            RegisterObjectProperty(const char *obj, const char *declaration, int byteOffset, int compositeOffset = 0, bool isCompositeIndirect = false);
+	virtual int            RegisterObjectMethod(const char *obj, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0, int compositeOffset = 0, bool isCompositeIndirect = false);
+	virtual int            RegisterObjectBehaviour(const char *obj, asEBehaviours behaviour, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0, int compositeOffset = 0, bool isCompositeIndirect = false);
+	virtual int            RegisterInterface(const char *name);
+	virtual int            RegisterInterfaceMethod(const char *intf, const char *declaration);
+	virtual asUINT         GetObjectTypeCount() const;
+	virtual asITypeInfo   *GetObjectTypeByIndex(asUINT index) const;
+
+	// String factory
+	virtual int RegisterStringFactory(const char *datatype, asIStringFactory *factory);
+	virtual int GetStringFactoryReturnTypeId(asDWORD *flags) const;
+
+	// Default array type
+	virtual int RegisterDefaultArrayType(const char *type);
+	virtual int GetDefaultArrayTypeId() const;
+
+	// Enums
+	virtual int          RegisterEnum(const char *type);
+	virtual int          RegisterEnumValue(const char *type, const char *name, int value);
+	virtual asUINT       GetEnumCount() const;
+	virtual asITypeInfo *GetEnumByIndex(asUINT index) const;
+
+	// Funcdefs
+	virtual int          RegisterFuncdef(const char *decl);
+	virtual asUINT       GetFuncdefCount() const;
+	virtual asITypeInfo *GetFuncdefByIndex(asUINT index) const;
+
+	// Typedefs
+	// TODO: interface: Should perhaps rename this to Alias, since it doesn't really create a new type
+	virtual int          RegisterTypedef(const char *type, const char *decl);
+	virtual asUINT       GetTypedefCount() const;
+	virtual asITypeInfo *GetTypedefByIndex(asUINT index) const;
+
+	// Configuration groups
+	virtual int         BeginConfigGroup(const char *groupName);
+	virtual int         EndConfigGroup();
+	virtual int         RemoveConfigGroup(const char *groupName);
+	virtual asDWORD     SetDefaultAccessMask(asDWORD defaultMask);
+	virtual int         SetDefaultNamespace(const char *nameSpace);
+	virtual const char *GetDefaultNamespace() const;
+
+	// Script modules
+	virtual asIScriptModule *GetModule(const char *module, asEGMFlags flag);
+	virtual int              DiscardModule(const char *module);
+	virtual asUINT           GetModuleCount() const;
+	virtual asIScriptModule *GetModuleByIndex(asUINT index) const;
+
+	// Script functions
+	virtual asIScriptFunction *GetFunctionById(int funcId) const;
+
+	// Type identification
+	virtual int            GetTypeIdByDecl(const char *decl) const;
+	virtual const char    *GetTypeDeclaration(int typeId, bool includeNamespace = false) const;
+	virtual int            GetSizeOfPrimitiveType(int typeId) const;
+	virtual asITypeInfo   *GetTypeInfoById(int typeId) const;
+	virtual asITypeInfo   *GetTypeInfoByName(const char *name) const;
+	virtual asITypeInfo   *GetTypeInfoByDecl(const char *decl) const;
+
+	// Script execution
+	virtual asIScriptContext      *CreateContext();
+	virtual void                  *CreateScriptObject(const asITypeInfo *type);
+	virtual void                  *CreateScriptObjectCopy(void *obj, const asITypeInfo *type);
+	virtual void                  *CreateUninitializedScriptObject(const asITypeInfo *type);
+	virtual asIScriptFunction     *CreateDelegate(asIScriptFunction *func, void *obj);
+	virtual int                    AssignScriptObject(void *dstObj, void *srcObj, const asITypeInfo *type);
+	virtual void                   ReleaseScriptObject(void *obj, const asITypeInfo *type);
+	virtual void                   AddRefScriptObject(void *obj, const asITypeInfo *type);
+	virtual int                    RefCastObject(void *obj, asITypeInfo *fromType, asITypeInfo *toType, void **newPtr, bool useOnlyImplicitCast = false);
+	virtual asILockableSharedBool *GetWeakRefFlagOfScriptObject(void *obj, const asITypeInfo *type) const;
+
+	// Context pooling
+	virtual asIScriptContext *RequestContext();
+	virtual void              ReturnContext(asIScriptContext *ctx);
+	virtual int               SetContextCallbacks(asREQUESTCONTEXTFUNC_t requestCtx, asRETURNCONTEXTFUNC_t returnCtx, void *param = 0);
+
+	// String interpretation
+	virtual asETokenClass ParseToken(const char *string, size_t stringLength = 0, asUINT *tokenLength = 0) const;
+
+	// Garbage collection
+	virtual int  GarbageCollect(asDWORD flags = asGC_FULL_CYCLE, asUINT numIterations = 1);
+	virtual void GetGCStatistics(asUINT *currentSize, asUINT *totalDestroyed, asUINT *totalDetected, asUINT *newObjects, asUINT *totalNewDestroyed) const;
+	virtual int  NotifyGarbageCollectorOfNewObject(void *obj, asITypeInfo *type);
+	virtual int  GetObjectInGC(asUINT idx, asUINT *seqNbr, void **obj = 0, asITypeInfo **type = 0);
+	virtual void GCEnumCallback(void *reference);
+	virtual void ForwardGCEnumReferences(void *ref, asITypeInfo *type);
+	virtual void ForwardGCReleaseReferences(void *ref, asITypeInfo *type);
+	virtual void SetCircularRefDetectedCallback(asCIRCULARREFFUNC_t callback, void *param = 0);
+
+	// User data
+	virtual void *SetUserData(void *data, asPWORD type);
+	virtual void *GetUserData(asPWORD type) const;
+	virtual void  SetEngineUserDataCleanupCallback(asCLEANENGINEFUNC_t callback, asPWORD type);
+	virtual void  SetModuleUserDataCleanupCallback(asCLEANMODULEFUNC_t callback, asPWORD type);
+	virtual void  SetContextUserDataCleanupCallback(asCLEANCONTEXTFUNC_t callback, asPWORD type);
+	virtual void  SetFunctionUserDataCleanupCallback(asCLEANFUNCTIONFUNC_t callback, asPWORD type);
+	virtual void  SetTypeInfoUserDataCleanupCallback(asCLEANTYPEINFOFUNC_t callback, asPWORD type);
+	virtual void  SetScriptObjectUserDataCleanupCallback(asCLEANSCRIPTOBJECTFUNC_t callback, asPWORD type);
+
+	// Exception handling
+	virtual int SetTranslateAppExceptionCallback(asSFuncPtr callback, void *param, int callConv);
+
+//===========================================================
+// internal methods
+//===========================================================
+public:
+	asCScriptEngine();
+	virtual ~asCScriptEngine();
+
+//protected:
+	friend class asCBuilder;
+	friend class asCCompiler;
+	friend class asCContext;
+	friend class asCDataType;
+	friend class asCModule;
+	friend class asCRestore;
+	friend class asCByteCode;
+	friend int PrepareSystemFunction(asCScriptFunction *func, asSSystemFunctionInterface *internal, asCScriptEngine *engine);
+
+	int RegisterMethodToObjectType(asCObjectType *objectType, const char *declaration, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0, int compositeOffset = 0, bool isCompositeIndirect = false);
+	int RegisterBehaviourToObjectType(asCObjectType *objectType, asEBehaviours behaviour, const char *decl, const asSFuncPtr &funcPointer, asDWORD callConv, void *auxiliary = 0, int compositeOffset = 0, bool isCompositeIndirect = false);
+
+	int VerifyVarTypeNotInFunction(asCScriptFunction *func);
+
+	void *CallAlloc(const asCObjectType *objType) const;
+	void  CallFree(void *obj) const;
+
+	void *CallGlobalFunctionRetPtr(int func) const;
+	void *CallGlobalFunctionRetPtr(int func, void *param1) const;
+	void *CallGlobalFunctionRetPtr(asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
+	void *CallGlobalFunctionRetPtr(asSSystemFunctionInterface *i, asCScriptFunction *s, void *param1) const;
+	void  CallObjectMethod(void *obj, int func) const;
+	void  CallObjectMethod(void *obj, void *param, int func) const;
+	void  CallObjectMethod(void *obj, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
+	void  CallObjectMethod(void *obj, void *param, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
+	bool  CallObjectMethodRetBool(void *obj, int func) const;
+	int   CallObjectMethodRetInt(void *obj, int func) const;
+	void *CallObjectMethodRetPtr(void *obj, int func) const;
+	void *CallObjectMethodRetPtr(void *obj, int param1, asCScriptFunction *func) const;
+	void  CallGlobalFunction(void *param1, void *param2, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
+	bool  CallGlobalFunctionRetBool(void *param1, void *param2, asSSystemFunctionInterface *func, asCScriptFunction *desc) const;
+	int   CallScriptObjectMethod(void *obj, int func);
+
+	void ConstructScriptObjectCopy(void *mem, void *obj, asCObjectType *type);
+
+	void DeleteDiscardedModules();
+
+	void RemoveTemplateInstanceType(asCObjectType *t);
+
+	asCConfigGroup *FindConfigGroupForFunction(int funcId) const;
+	asCConfigGroup *FindConfigGroupForGlobalVar(int gvarId) const;
+	asCConfigGroup *FindConfigGroupForTypeInfo(const asCTypeInfo *type) const;
+	asCConfigGroup *FindConfigGroupForFuncDef(const asCFuncdefType *funcDef) const;
+
+	int  RequestBuild();
+	void BuildCompleted();
+
+	void PrepareEngine();
+	bool isPrepared;
+
+	int CreateContext(asIScriptContext **context, bool isInternal);
+
+	asCTypeInfo *GetRegisteredType(const asCString &name, asSNameSpace *ns) const;
+
+	asCObjectType *GetListPatternType(int listPatternFuncId);
+	void DestroyList(asBYTE *buffer, const asCObjectType *listPatternType);
+	void DestroySubList(asBYTE *&buffer, asSListPatternNode *&patternNode);
+
+	int AddBehaviourFunction(asCScriptFunction &func, asSSystemFunctionInterface &internal);
+
+	asCString GetFunctionDeclaration(int funcId);
+
+	asCScriptFunction *GetScriptFunction(int funcId) const;
+
+	asCModule *GetModule(const char *name, bool create);
+	asCModule *GetModuleFromFuncId(int funcId);
+
+	int  GetMethodIdByDecl(const asCObjectType *ot, const char *decl, asCModule *mod);
+	int  GetFactoryIdByDecl(const asCObjectType *ot, const char *decl);
+
+	int  GetNextScriptFunctionId();
+	void AddScriptFunction(asCScriptFunction *func);
+	void RemoveScriptFunction(asCScriptFunction *func);
+	void RemoveFuncdef(asCFuncdefType *func);
+
+	int ConfigError(int err, const char *funcName, const char *arg1, const char *arg2);
+
+	int                GetTypeIdFromDataType(const asCDataType &dt) const;
+	asCDataType        GetDataTypeFromTypeId(int typeId) const;
+	asCObjectType     *GetObjectTypeFromTypeId(int typeId) const;
+	void               RemoveFromTypeIdMap(asCTypeInfo *type);
+
+	bool               IsTemplateType(const char *name) const;
+	int                SetTemplateRestrictions(asCObjectType *templateType, asCScriptFunction *func, const char *caller, const char *decl);
+	asCObjectType     *GetTemplateInstanceType(asCObjectType *templateType, asCArray<asCDataType> &subTypes, asCModule *requestingModule);
+	asCScriptFunction *GenerateTemplateFactoryStub(asCObjectType *templateType, asCObjectType *templateInstanceType, int origFactoryId);
+	bool               GenerateNewTemplateFunction(asCObjectType *templateType, asCObjectType *templateInstanceType, asCScriptFunction *templateFunc, asCScriptFunction **newFunc);
+	asCFuncdefType    *GenerateNewTemplateFuncdef(asCObjectType *templateType, asCObjectType *templateInstanceType, asCFuncdefType *templateFuncdef);
+	asCDataType        DetermineTypeForTemplate(const asCDataType &orig, asCObjectType *tmpl, asCObjectType *ot);
+	bool               RequireTypeReplacement(asCDataType &type, asCObjectType *templateType);
+
+	asCModule         *FindNewOwnerForSharedType(asCTypeInfo *type, asCModule *mod);
+	asCModule         *FindNewOwnerForSharedFunc(asCScriptFunction *func, asCModule *mod);
+
+	asCFuncdefType    *FindMatchingFuncdef(asCScriptFunction *func, asCModule *mod);
+
+	int                DetermineNameAndNamespace(const char *in_name, asSNameSpace *implicitNs, asCString &out_name, asSNameSpace *&out_ns) const;
+	
+	// Global property management
+	asCGlobalProperty *AllocateGlobalProperty();
+	void RemoveGlobalProperty(asCGlobalProperty *prop);
+
+	int GetScriptSectionNameIndex(const char *name);
+
+	// Namespace management
+	asSNameSpace *AddNameSpace(const char *name);
+	asSNameSpace *FindNameSpace(const char *name) const;
+	asSNameSpace *GetParentNameSpace(asSNameSpace *ns) const;
+
+//===========================================================
+// internal properties
+//===========================================================
+	asCMemoryMgr memoryMgr;
+
+	asCObjectType   *defaultArrayObjectType;
+	asCObjectType    scriptTypeBehaviours;
+	asCObjectType    functionBehaviours;
+
+	// Registered interface
+	asCArray<asCObjectType *>         registeredObjTypes;      // doesn't increase ref count
+	asCArray<asCTypedefType *>        registeredTypeDefs;      // doesn't increase ref count
+	asCArray<asCEnumType *>           registeredEnums;         // doesn't increase ref count
+	// TODO: memory savings: Since there can be only one property with the same name a simpler symbol table should be used for global props
+	asCSymbolTable<asCGlobalProperty> registeredGlobalProps;   // increases ref count
+	asCSymbolTable<asCScriptFunction> registeredGlobalFuncs;
+	asCArray<asCFuncdefType *>        registeredFuncDefs;      // doesn't increase ref count
+	asCArray<asCObjectType *>         registeredTemplateTypes; // doesn't increase ref count
+	asIStringFactory                 *stringFactory;
+	asCDataType                       stringType;
+	bool configFailed;
+
+	// Stores all registered types
+	asCMap<asSNameSpaceNamePair, asCTypeInfo*> allRegisteredTypes; // increases ref count
+
+	// Dummy types used to name the subtypes in the template objects
+	asCArray<asCTypeInfo *>        templateSubTypes;
+
+	// Store information about template types
+	// This list will contain all instances of templates, both registered specialized
+	// types and those automacially instantiated from scripts
+	asCArray<asCObjectType *>      templateInstanceTypes; // increases ref count
+
+	// Store information about list patterns
+	asCArray<asCObjectType *>      listPatternTypes; // increases ref count
+
+	// Stores all global properties, both those registered by application, and those declared by scripts.
+	// The id of a global property is the index in this array.
+	asCArray<asCGlobalProperty *> globalProperties; // increases ref count
+	asCArray<int>                 freeGlobalPropertyIds;
+
+	// This map is used to quickly find a property by its memory address
+	// It is used principally during building, cleanup, and garbage detection for script functions
+	asCMap<void*, asCGlobalProperty*> varAddressMap; // doesn't increase ref count
+
+	// Stores all functions, i.e. registered functions, script functions, class methods, behaviours, etc.
+	asCArray<asCScriptFunction *> scriptFunctions;       // doesn't increase ref count
+	asCArray<int>                 freeScriptFunctionIds;
+	asCArray<asCScriptFunction *> signatureIds;
+
+	// An array with all module imported functions
+	asCArray<sBindInfo *>  importedFunctions; // doesn't increase ref count
+	asCArray<int>          freeImportedFunctionIdxs;
+
+	// Synchronized
+	mutable asCAtomic      refCount;
+	// Synchronized with engineRWLock
+	// This array holds all live script modules
+	asCArray<asCModule *>  scriptModules;
+	// Synchronized with engineRWLock
+	// This is a pointer to the last module that was requested. It is used for performance
+	// improvement, since it is common that the same module is accessed many times in a row
+	asCModule             *lastModule;
+	// Synchronized with engineRWLock
+	// This flag is true if a script is currently being compiled. It is used to prevent multiple
+	// threads from requesting builds at the same time (without blocking)
+	bool                   isBuilding;
+	// Synchronized with engineRWLock
+	// This array holds modules that have been discard (thus are no longer visible to the application)
+	// but cannot yet be deleted due to having external references to some of the entities in them
+	asCArray<asCModule *>  discardedModules;
+	// This flag is set to true during compilations of scripts (or loading pre-compiled scripts)
+	// to delay the validation of template types until the subtypes have been fully declared
+	bool                   deferValidationOfTemplateTypes;
+
+	// Tokenizer is instantiated once to share resources
+	asCTokenizer tok;
+
+	// Stores shared script declared types (classes, interfaces, enums)
+	asCArray<asCTypeInfo *> sharedScriptTypes; // increases ref count
+	// This array stores the template instances types that have been automatically generated from template types
+	asCArray<asCObjectType *> generatedTemplateTypes;
+	// Stores the funcdefs
+	// TODO: redesign: Only shared funcdefs should be stored here
+	//                 a funcdef becomes shared if all arguments and the return type are shared (or application registered)
+	asCArray<asCFuncdefType *> funcDefs; // doesn't increases ref count
+
+	// Stores the names of the script sections for debugging purposes
+	asCArray<asCString *> scriptSectionNames;
+
+	// Type identifiers
+	mutable int                             typeIdSeqNbr;
+	mutable asCMap<int, asCTypeInfo*>       mapTypeIdToTypeInfo;
+
+	// Garbage collector
+	asCGarbageCollector gc;
+
+	// Dynamic groups
+	asCConfigGroup             defaultGroup;
+	asCArray<asCConfigGroup*>  configGroups;
+	asCConfigGroup            *currentGroup;
+	asDWORD                    defaultAccessMask;
+	asSNameSpace              *defaultNamespace;
+
+	// Message callback
+	bool                        msgCallback;
+	asSSystemFunctionInterface  msgCallbackFunc;
+	void                       *msgCallbackObj;
+	struct preMessage_t
+	{
+		preMessage_t() { isSet = false; }
+		bool      isSet;
+		asCString message;
+		asCString scriptname;
+		int       r;
+		int       c;
+	} preMessage;
+
+	// JIt compilation
+	asIJITCompiler             *jitCompiler;
+
+	// Namespaces
+	// These are shared between all entities and are
+	// only deleted once the engine is destroyed
+	asCArray<asSNameSpace*> nameSpaces;
+
+	// Callbacks for context pooling
+	asREQUESTCONTEXTFUNC_t  requestCtxFunc;
+	asRETURNCONTEXTFUNC_t   returnCtxFunc;
+	void                   *ctxCallbackParam;
+
+	// User data
+	asCArray<asPWORD>       userData;
+
+	struct SEngineClean    { asPWORD type; asCLEANENGINEFUNC_t       cleanFunc; };
+	asCArray<SEngineClean>    cleanEngineFuncs;
+	struct SModuleClean    { asPWORD type; asCLEANMODULEFUNC_t       cleanFunc; };
+	asCArray<SModuleClean>    cleanModuleFuncs;
+	struct SContextClean   { asPWORD type; asCLEANCONTEXTFUNC_t      cleanFunc; };
+	asCArray<SContextClean>   cleanContextFuncs;
+	struct SFunctionClean  { asPWORD type; asCLEANFUNCTIONFUNC_t     cleanFunc; };
+	asCArray<SFunctionClean>  cleanFunctionFuncs;
+	struct STypeInfoClean  { asPWORD type; asCLEANTYPEINFOFUNC_t     cleanFunc; };
+	asCArray<STypeInfoClean>  cleanTypeInfoFuncs;
+	struct SScriptObjClean { asPWORD type; asCLEANSCRIPTOBJECTFUNC_t cleanFunc; };
+	asCArray<SScriptObjClean> cleanScriptObjectFuncs;
+
+	// Synchronization for threads
+	DECLAREREADWRITELOCK(mutable engineRWLock)
+
+	// Engine properties
+	struct
+	{
+		bool   allowUnsafeReferences;
+		bool   optimizeByteCode;
+		bool   copyScriptSections;
+		asUINT maximumContextStackSize;
+		asUINT initContextStackSize;
+		bool   useCharacterLiterals;
+		bool   allowMultilineStrings;
+		bool   allowImplicitHandleTypes;
+		bool   buildWithoutLineCues;
+		bool   initGlobalVarsAfterBuild;
+		bool   requireEnumScope;
+		int    scanner;
+		bool   includeJitInstructions;
+		int    stringEncoding;
+		int    propertyAccessorMode;
+		bool   expandDefaultArrayToTemplate;
+		bool   autoGarbageCollect;
+		bool   disallowGlobalVars;
+		bool   alwaysImplDefaultConstruct;
+		int    compilerWarnings;
+		bool   disallowValueAssignForRefType;
+		// TODO: 3.0.0: Remove the alterSyntaxNamedArgs
+		int    alterSyntaxNamedArgs;
+		bool   disableIntegerDivision;
+		bool   disallowEmptyListElements;
+		// TODO: 3.0.0: Remove the privatePropAsProtected
+		bool   privatePropAsProtected;
+		bool   allowUnicodeIdentifiers;
+		int    heredocTrimMode;
+		asUINT maxNestedCalls;
+		asUINT genericCallMode;
+		asUINT initCallStackSize;
+		asUINT maxCallStackSize;
+		bool   ignoreDuplicateSharedIntf;
+		bool   noDebugOutput;
+	} ep;
+
+	// Callbacks
+#ifndef AS_NO_EXCEPTIONS
+	bool                       translateExceptionCallback;
+	asSSystemFunctionInterface translateExceptionCallbackFunc;
+	void *                     translateExceptionCallbackObj;
+#endif
+
+	// This flag is to allow a quicker shutdown when releasing the engine
+	bool shuttingDown;
+
+	// This flag is set when the engine's destructor is called, this is to
+	// avoid recursive calls if an object happens to increment/decrement
+	// the ref counter during shutdown
+	bool inDestructor;
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_scriptfunction.cpp b/Sources/AngelScript/source/as_scriptfunction.cpp
old mode 100755
new mode 100644
index cdc70714e..c76e68326
--- a/Sources/AngelScript/source/as_scriptfunction.cpp
+++ b/Sources/AngelScript/source/as_scriptfunction.cpp
@@ -1,1698 +1,1855 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptfunction.cpp
-//
-// A container for a compiled script function
-//
-
-
-
-#include "as_config.h"
-#include "as_scriptfunction.h"
-#include "as_tokendef.h"
-#include "as_scriptengine.h"
-#include "as_callfunc.h"
-#include "as_bytecode.h"
-#include "as_texts.h"
-#include "as_scriptnode.h"
-#include "as_builder.h"
-#include "as_scriptcode.h"
-
-#include <cstdlib> // qsort
-
-BEGIN_AS_NAMESPACE
-
-#ifdef AS_MAX_PORTABILITY
-
-static void ScriptFunction_AddRef_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
-	self->AddRef();
-}
-
-static void ScriptFunction_Release_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
-	self->Release();
-}
-
-static void ScriptFunction_GetRefCount_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
-	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
-}
-
-static void ScriptFunction_SetFlag_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
-	self->SetFlag();
-}
-
-static void ScriptFunction_GetFlag_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
-	*(bool*)gen->GetAddressOfReturnLocation() = self->GetFlag();
-}
-
-static void ScriptFunction_EnumReferences_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->EnumReferences(engine);
-}
-
-static void ScriptFunction_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->ReleaseAllHandles(engine);
-}
-
-static void ScriptFunction_CreateDelegate_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *func = (asCScriptFunction*)gen->GetArgAddress(0);
-	void *obj = gen->GetArgAddress(1);
-	gen->SetReturnAddress(CreateDelegate(func, obj));
-}
-
-// TODO: operator==
-/*static void ScriptFunction_opEquals_Generic(asIScriptGeneric *gen)
-{
-	asCScriptFunction *funcSelf = (asCScriptFunction*)gen->GetObject();
-	asCScriptFunction *funcOther = (asCScriptFunction*)gen->GetArgAddress(0);
-	*(bool*)gen->GetAddressOfReturnLocation() = *funcSelf == *funcOther;
-}
-*/
-
-#endif
-
-
-void RegisterScriptFunction(asCScriptEngine *engine)
-{
-	// Register the gc behaviours for the script functions
-	int r = 0;
-	UNUSED_VAR(r); // It is only used in debug mode
-	engine->functionBehaviours.engine = engine;
-	engine->functionBehaviours.flags = asOBJ_REF | asOBJ_GC;
-	engine->functionBehaviours.name = "$func";
-#ifndef AS_MAX_PORTABILITY
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ADDREF, "void f()", asMETHOD(asCScriptFunction,AddRef), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASE, "void f()", asMETHOD(asCScriptFunction,Release), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(asCScriptFunction,GetRefCount), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_SETGCFLAG, "void f()", asMETHOD(asCScriptFunction,SetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(asCScriptFunction,GetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(asCScriptFunction,EnumReferences), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(asCScriptFunction,ReleaseAllHandles), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	// TODO: Need some way to allow the arg type to adapt when the funcdefs are instantiated
-//	r = engine->RegisterMethodToObjectType(&engine->functionBehaviours, "bool opEquals(const int &in)", asMETHOD(asCScriptFunction,operator==), asCALL_THISCALL); asASSERT( r >= 0 );
-#else
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptFunction_AddRef_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptFunction_Release_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptFunction_GetRefCount_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptFunction_SetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptFunction_GetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptFunction_EnumReferences_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptFunction_ReleaseAllHandles_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-//	r = engine->RegisterMethodToObjectType(&engine->functionBehaviours, "bool opEquals(const int &in)", asFUNCTION(ScriptFunction_opEquals_Generic), asCALL_GENERIC); asASSERT( r >= 0 );
-#endif
-
-	// Register the builtin function for creating delegates
-	// This function returns a handle to the delegate, but since the type is not known at this time it is
-	// registered to return a void then the return type is changed manually to the builtin function type
-	// The name of the function is an invalid identifier so it cannot be invoked accidentally from the script
-#ifndef AS_MAX_PORTABILITY
-	r = engine->RegisterGlobalFunction("void f(int &in, int &in)", asFUNCTION(CreateDelegate), asCALL_CDECL); asASSERT( r >= 0 );
-#else
-	r = engine->RegisterGlobalFunction("void f(int &in, int &in)", asFUNCTION(ScriptFunction_CreateDelegate_Generic), asCALL_GENERIC); asASSERT( r >= 0 );
-#endif
-
-	// Rename the function so that it cannot be called manually by the script
-	int idx = engine->registeredGlobalFuncs.GetIndex(engine->scriptFunctions[r]);
-	engine->registeredGlobalFuncs.Erase(idx);
-	engine->scriptFunctions[r]->name = DELEGATE_FACTORY;
-	engine->registeredGlobalFuncs.Put(engine->scriptFunctions[r]);
-
-	// Change the return type so the VM will know the function really returns a handle
-	engine->scriptFunctions[r]->returnType = asCDataType::CreateType(&engine->functionBehaviours, false);
-	engine->scriptFunctions[r]->returnType.MakeHandle(true);
-}
-
-asCScriptFunction *CreateDelegate(asCScriptFunction *func, void *obj)
-{
-	if( func == 0 || obj == 0 )
-	{
-		// TODO: delegate: Should set script exception
-		return 0;
-	}
-
-	// Create an instance of a asCScriptFunction with the type asFUNC_DELEGATE
-	// The delegate shouldn't have a function id and is not added to the engine->scriptFunctions
-	asCScriptFunction *delegate = asNEW(asCScriptFunction)(static_cast<asCScriptEngine*>(func->GetEngine()), 0, asFUNC_DELEGATE);
-	if( delegate )
-		delegate->MakeDelegate(func, obj);
-
-	return delegate;
-}
-
-// internal
-void asCScriptFunction::MakeDelegate(asCScriptFunction *func, void *obj)
-{
-	// Increase the reference of the function and object
-	func->AddRef();
-	funcForDelegate = func;
-
-	func->GetEngine()->AddRefScriptObject(obj, func->GetObjectType());
-	objForDelegate = obj;
-
-	// The return type and parameters are copied from the delegated method to this object
-	// TODO: optimize: Do we really need to copy? Whenever requested the delegate can simply return the delegated methods' info directly
-	parameterTypes = func->parameterTypes;
-	returnType     = func->returnType;
-	inOutFlags     = func->inOutFlags;
-
-	// The delegate doesn't own the parameters as it will only forward them to the real method
-	// so the exception handler must not clean up the parameters for the delegate
-	dontCleanUpOnException = true;
-}
-
-// interface
-void *asCScriptFunction::GetAuxiliary() const
-{
-	if (sysFuncIntf)
-		return sysFuncIntf->auxiliary;
-
-	return 0;
-}
-
-// interface
-void *asCScriptFunction::GetDelegateObject() const
-{
-	return objForDelegate;
-}
-
-// interface
-asITypeInfo *asCScriptFunction::GetDelegateObjectType() const
-{
-	if( objForDelegate == 0 || funcForDelegate == 0 )
-		return 0;
-
-	return funcForDelegate->objectType;
-}
-
-// interface
-asIScriptFunction *asCScriptFunction::GetDelegateFunction() const
-{
-	return funcForDelegate;
-}
-
-// TODO: operator==
-/*
-// internal
-bool asCScriptFunction::operator==(const asCScriptFunction &other) const
-{
-	if( this == &other ) return true;
-
-	if( this->funcType == asFUNC_DELEGATE && other.funcType == asFUNC_DELEGATE )
-	{
-		if( this->objForDelegate == other.objForDelegate &&
-			this->funcForDelegate == other.funcForDelegate )
-			return true;
-	}
-
-	return false;
-}
-*/
-
-// internal
-int asCScriptFunction::RegisterListPattern(const char *decl, asCScriptNode *listNodes)
-{
-	if( listNodes == 0 )
-		return asINVALID_ARG;
-
-	// Build the representation of the list pattern from the script nodes
-	asSListPatternNode *node;
-	listPattern = asNEW(asSListPatternNode)(asLPT_START);
-	node = listPattern;
-
-	// Recursively parse the child
-	int r = ParseListPattern(node, decl, listNodes);
-
-	node->next = asNEW(asSListPatternNode)(asLPT_END);
-
-	return r;
-}
-
-// internal
-int asCScriptFunction::ParseListPattern(asSListPatternNode *&target, const char *decl, asCScriptNode *listNodes)
-{
-	asSListPatternNode *node = target;
-
-	listNodes = listNodes->firstChild;
-	while( listNodes )
-	{
-		if( listNodes->nodeType == snIdentifier )
-		{
-			asCString token(&decl[listNodes->tokenPos], listNodes->tokenLength);
-			if( token == "repeat" )
-			{
-				node->next = asNEW(asSListPatternNode)(asLPT_REPEAT);
-				node = node->next;
-			}
-			else if( token == "repeat_same" )
-			{
-				// TODO: list: Should make sure this is a sub-list
-				node->next = asNEW(asSListPatternNode)(asLPT_REPEAT_SAME);
-				node = node->next;
-			}
-			else
-			{
-				// Shouldn't happen as the parser already reported the error
-				asASSERT(false);
-			}
-		}
-		else if( listNodes->nodeType == snDataType )
-		{
-			asCDataType dt;
-			asCBuilder builder(engine, 0);
-			asCScriptCode code;
-			code.SetCode("", decl, 0, false);
-			dt = builder.CreateDataTypeFromNode(listNodes, &code, engine->defaultNamespace, false, returnType.GetTypeInfo()->CastToObjectType());
-
-			node->next = asNEW(asSListPatternDataTypeNode)(dt);
-			node = node->next;
-		}
-		else if( listNodes->nodeType == snListPattern )
-		{
-			node->next = asNEW(asSListPatternNode)(asLPT_START);
-			node = node->next;
-
-			// Recursively parse the child
-			int r = ParseListPattern(node, decl, listNodes);
-			if( r < 0 )
-				return r;
-
-			node->next = asNEW(asSListPatternNode)(asLPT_END);
-			node = node->next;
-		}
-		else
-		{
-			// Unexpected token in the list, the parser shouldn't have allowed
-			asASSERT( false );
-			return -1;
-		}
-
-		listNodes = listNodes->next;
-	}
-
-	target = node;
-	return 0;
-}
-
-// internal
-asCScriptFunction::asCScriptFunction(asCScriptEngine *engine, asCModule *mod, asEFuncType _funcType)
-{
-	funcType               = _funcType;
-	if( funcType == asFUNC_DELEGATE )
-	{
-		// Delegates behave like object instances, rather than script code
-		externalRefCount.set(1);
-		internalRefCount.set(0);
-	}
-	else
-	{
-		internalRefCount.set(1);
-		externalRefCount.set(0);
-	}
-
-	this->engine           = engine;
-	this->scriptData       = 0;
-	module                 = mod;
-	objectType             = 0;
-	name                   = "";
-	isReadOnly             = false;
-	isPrivate              = false;
-	isProtected            = false;
-	isFinal                = false;
-	isOverride             = false;
-	sysFuncIntf            = 0;
-	signatureId            = 0;
-	dontCleanUpOnException = false;
-	vfTableIdx             = -1;
-	gcFlag                 = false;
-	userData               = 0;
-	id                     = 0;
-	accessMask             = 0xFFFFFFFF;
-	isShared               = false;
-	nameSpace              = engine->nameSpaces[0];
-	objForDelegate         = 0;
-	funcForDelegate        = 0;
-	listPattern            = 0;
-	funcdefType            = 0;
-
-	if( funcType == asFUNC_SCRIPT )
-		AllocateScriptFunctionData();
-
-	// Notify the GC of delegates
-	if( funcType == asFUNC_DELEGATE )
-		engine->gc.AddScriptObjectToGC(this, &engine->functionBehaviours);
-}
-
-void asCScriptFunction::AllocateScriptFunctionData()
-{
-	if( scriptData ) return;
-
-	scriptData = asNEW(ScriptFunctionData);
-
-	scriptData->stackNeeded      = 0;
-	scriptData->variableSpace    = 0;
-	scriptData->scriptSectionIdx = -1;
-	scriptData->declaredAt       = 0;
-	scriptData->jitFunction      = 0;
-}
-
-void asCScriptFunction::DeallocateScriptFunctionData()
-{
-	if( !scriptData ) return;
-
-	for( asUINT n = 0; n < scriptData->variables.GetLength(); n++ )
-		asDELETE(scriptData->variables[n],asSScriptVariable);
-	scriptData->variables.SetLength(0);
-
-	asDELETE(scriptData, ScriptFunctionData);
-	scriptData = 0;
-}
-
-// internal
-asCScriptFunction::~asCScriptFunction()
-{
-	// Dummy functions that are allocated on the stack are not reference counted
-	asASSERT( funcType == asFUNC_DUMMY    ||
-		      (externalRefCount.get() == 0 && internalRefCount.get() == 0) );
-
-	// Remove the script function from the engine's scriptFunctions array here
-	// Don't remove it before, because there may still be functions referring to it
-	// by index until now. If it was removed in DestroyInternal, those would not
-	// be able to release the refcount, thus causing memory leak.
-	if( engine && id != 0 && funcType != asFUNC_DUMMY )
-		engine->RemoveScriptFunction(this);
-
-	// If the engine pointer is 0, then DestroyInternal has already been called and there is nothing more to do
-	if( engine == 0 ) return;
-
-	DestroyInternal();
-
-	// Finally set the engine pointer to 0 because it must not be accessed again
-	engine = 0;
-}
-
-// internal
-void asCScriptFunction::DestroyHalfCreated()
-{
-	asASSERT( externalRefCount.get() == 0 && internalRefCount.get() == 1 );
-
-	// Set the funcType to dummy so the destructor won't complain
-	funcType = asFUNC_DUMMY;
-
-	// If the bytecode exist remove it before destroying, otherwise it
-	// will fail when the destructor releases the references as the bytecode
-	// is not fully constructed.
-	if( scriptData )
-		scriptData->byteCode.SetLength(0);
-
-	asDELETE(this, asCScriptFunction);
-}
-
-// internal
-void asCScriptFunction::DestroyInternal()
-{
-	// Clean up user data
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n+1] )
-		{
-			for( asUINT c = 0; c < engine->cleanFunctionFuncs.GetLength(); c++ )
-				if( engine->cleanFunctionFuncs[c].type == userData[n] )
-					engine->cleanFunctionFuncs[c].cleanFunc(this);
-		}
-	}
-	userData.SetLength(0);
-
-	// Release all references the function holds to other objects
-	ReleaseReferences();
-	parameterTypes.SetLength(0);
-	returnType = asCDataType::CreatePrimitive(ttVoid, false);
-
-	for( asUINT p = 0; p < defaultArgs.GetLength(); p++ )
-		if( defaultArgs[p] )
-			asDELETE(defaultArgs[p], asCString);
-	defaultArgs.SetLength(0);
-
-	if( sysFuncIntf )
-		asDELETE(sysFuncIntf,asSSystemFunctionInterface);
-	sysFuncIntf = 0;
-
-	if( objectType )
-	{
-		objectType->ReleaseInternal();
-		objectType = 0;
-	}
-
-	DeallocateScriptFunctionData();
-
-	// Deallocate list pattern data
-	while( listPattern )
-	{
-		asSListPatternNode *n = listPattern->next;
-		asDELETE(listPattern, asSListPatternNode);
-		listPattern = n;
-	}
-}
-
-// interface
-int asCScriptFunction::GetId() const
-{
-	return id;
-}
-
-// interface
-int asCScriptFunction::AddRef() const
-{
-	gcFlag = false;
-	return externalRefCount.atomicInc();
-}
-
-// interface
-int asCScriptFunction::Release() const
-{
-	gcFlag = false;
-	int r = externalRefCount.atomicDec();
-	if( r == 0 &&
-		funcType != asFUNC_DUMMY )    // Dummy functions are allocated on the stack and cannot be deleted
-	{
-		// There are no more external references, if there are also no
-		// internal references then it is time to delete the function
-		if( internalRefCount.get() == 0 )
-		{
-			// If there are no internal references, then no module is owning the function
-			// For example if the function was dynamically compiled without adding it to the scope of the module
-			asASSERT( module == 0 );
-
-			asDELETE(const_cast<asCScriptFunction*>(this),asCScriptFunction);
-		}
-	}
-
-	return r;
-}
-
-// internal
-int asCScriptFunction::AddRefInternal()
-{
-	return internalRefCount.atomicInc();
-}
-
-// internal
-int asCScriptFunction::ReleaseInternal()
-{
-	int r = internalRefCount.atomicDec();
-	if( r == 0 &&
-		funcType != asFUNC_DUMMY )
-	{
-		// There are no more internal references, if there are also no
-		// external references then it is time to delete the function
-		if( externalRefCount.get() == 0 )
-		{
-			asDELETE(const_cast<asCScriptFunction*>(this),asCScriptFunction);
-		}
-	}
-
-	return r;
-}
-
-// interface
-int asCScriptFunction::GetTypeId() const
-{
-	// This const cast is ok, the object won't be modified
-	asCDataType dt = asCDataType::CreateType(engine->FindMatchingFuncdef(const_cast<asCScriptFunction*>(this), 0), false);
-	return engine->GetTypeIdFromDataType(dt);
-}
-
-// interface
-bool asCScriptFunction::IsCompatibleWithTypeId(int typeId) const
-{
-	asCDataType dt = engine->GetDataTypeFromTypeId(typeId);
-
-	// Make sure the type is a function
-	if (!dt.IsFuncdef())
-		return false;
-
-	asCScriptFunction *func = dt.GetTypeInfo()->CastToFuncdefType()->funcdef;
-	if( !IsSignatureExceptNameEqual(func) )
-		return false;
-
-	// If this is a class method, then only return true if the object type is the same
-	if( objectType != func->objectType )
-		return false;
-
-	return true;
-}
-
-// interface
-const char *asCScriptFunction::GetModuleName() const
-{
-	if( module )
-	{
-		return module->name.AddressOf();
-	}
-
-	return 0;
-}
-
-// interface
-asIScriptModule *asCScriptFunction::GetModule() const
-{
-	return module;
-}
-
-// interface
-asITypeInfo *asCScriptFunction::GetObjectType() const
-{
-	return objectType;
-}
-
-// interface
-const char *asCScriptFunction::GetObjectName() const
-{
-	if( objectType )
-		return objectType->GetName();
-
-	return 0;
-}
-
-// interface
-const char *asCScriptFunction::GetName() const
-{
-	return name.AddressOf();
-}
-
-// interface
-const char *asCScriptFunction::GetNamespace() const
-{
-	if (nameSpace)
-		return nameSpace->name.AddressOf();
-
-	return 0;
-}
-
-// interface
-bool asCScriptFunction::IsReadOnly() const
-{
-	return isReadOnly;
-}
-
-// interface
-bool asCScriptFunction::IsPrivate() const
-{
-	return isPrivate;
-}
-
-// interface
-bool asCScriptFunction::IsProtected() const
-{
-	return isProtected;
-}
-
-// internal
-int asCScriptFunction::GetSpaceNeededForArguments()
-{
-	// We need to check the size for each type
-	int s = 0;
-	for( asUINT n = 0; n < parameterTypes.GetLength(); n++ )
-		s += parameterTypes[n].GetSizeOnStackDWords();
-
-	return s;
-}
-
-// internal
-int asCScriptFunction::GetSpaceNeededForReturnValue()
-{
-	return returnType.GetSizeOnStackDWords();
-}
-
-// internal
-bool asCScriptFunction::DoesReturnOnStack() const
-{
-	if( returnType.GetTypeInfo() &&
-		(returnType.GetTypeInfo()->flags & asOBJ_VALUE) &&
-		!returnType.IsReference() )
-		return true;
-
-	return false;
-}
-
-// internal
-asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool includeNamespace, bool includeParamNames) const
-{
-	asCString str;
-
-	// TODO: default arg: Make the declaration with the default args an option
-
-	// Don't add the return type for constructors and destructors
-	if( !(returnType.GetTokenType() == ttVoid &&
-		  objectType &&
-		  (name == objectType->name || (name.GetLength() > 0 && name[0] == '~') ||
-		   name == "$beh0" || name == "$beh2")) )
-	{
-		str = returnType.Format(nameSpace, includeNamespace);
-		str += " ";
-	}
-	if( objectType && includeObjectName )
-	{
-		if( includeNamespace && objectType->nameSpace->name != "" )
-			str += objectType->nameSpace->name + "::";
-
-		if( objectType->name != "" )
-			str += objectType->name + "::";
-		else
-			str += "_unnamed_type_::";
-	}
-	else if (funcdefType && funcdefType->parentClass && includeObjectName)
-	{
-		if (includeNamespace && funcdefType->parentClass->nameSpace->name != "")
-			str += funcdefType->parentClass->nameSpace->name + "::";
-
-		if (funcdefType->parentClass->name != "")
-			str += funcdefType->parentClass->name + "::";
-		else
-			str += "_unnamed_type_::";
-	}
-	else if( includeNamespace && nameSpace->name != "" )
-	{
-		str += nameSpace->name + "::";
-	}
-	if( name == "" )
-		str += "_unnamed_function_(";
-	else if( name.SubString(0,4) == "$beh" && name.GetLength() == 5 )
-	{
-		if( name[4] == '0' + asBEHAVE_CONSTRUCT )
-			str += objectType->name + "(";
-		else if( name[4] == '0' + asBEHAVE_FACTORY )
-			str += returnType.GetTypeInfo()->name + "(";
-		else if( name[4] == '0' + asBEHAVE_DESTRUCT )
-			str += "~" + objectType->name + "(";
-		else
-			str += name + "(";
-	}
-	else
-		str += name + "(";
-
-	if( parameterTypes.GetLength() > 0 )
-	{
-		asUINT n;
-		for( n = 0; n < parameterTypes.GetLength() - 1; n++ )
-		{
-			str += parameterTypes[n].Format(nameSpace, includeNamespace);
-			if( parameterTypes[n].IsReference() && inOutFlags.GetLength() > n )
-			{
-				if( inOutFlags[n] == asTM_INREF ) str += "in";
-				else if( inOutFlags[n] == asTM_OUTREF ) str += "out";
-				else if( inOutFlags[n] == asTM_INOUTREF ) str += "inout";
-			}
-
-			if( includeParamNames && n < parameterNames.GetLength() && parameterNames[n].GetLength() != 0 )
-			{
-				str += " ";
-				str += parameterNames[n];
-			}
-
-			if( defaultArgs.GetLength() > n && defaultArgs[n] )
-			{
-				asCString tmp;
-				tmp.Format(" = %s", defaultArgs[n]->AddressOf());
-				str += tmp;
-			}
-
-			str += ", ";
-		}
-
-		// Add the last parameter
-		str += parameterTypes[n].Format(nameSpace, includeNamespace);
-		if( parameterTypes[n].IsReference() && inOutFlags.GetLength() > n )
-		{
-			if( inOutFlags[n] == asTM_INREF ) str += "in";
-			else if( inOutFlags[n] == asTM_OUTREF ) str += "out";
-			else if( inOutFlags[n] == asTM_INOUTREF ) str += "inout";
-		}
-
-		if( includeParamNames && n < parameterNames.GetLength() && parameterNames[n].GetLength() != 0 )
-		{
-			str += " ";
-			str += parameterNames[n];
-		}
-
-		if( defaultArgs.GetLength() > n && defaultArgs[n] )
-		{
-			asCString tmp;
-			tmp.Format(" = %s", defaultArgs[n]->AddressOf());
-			str += tmp;
-		}
-	}
-
-	str += ")";
-
-	if( isReadOnly )
-		str += " const";
-
-	// Add the declaration of the list pattern
-	if( listPattern )
-	{
-		asSListPatternNode *n = listPattern;
-		bool first = true;
-		while( n )
-		{
-			if( n->type == asLPT_START )
-			{
-				str += " {";
-				first = true;
-			}
-			else if( n->type == asLPT_END )
-			{
-				str += " }";
-				first = false;
-			}
-			else if( n->type == asLPT_REPEAT )
-				str += " repeat";
-			else if( n->type == asLPT_REPEAT_SAME )
-				str += " repeat_same";
-			else if( n->type == asLPT_TYPE )
-			{
-				if( first )
-				{
-					str += " ";
-					first = false;
-				}
-				else
-					str += ", ";
-				str += reinterpret_cast<asSListPatternDataTypeNode*>(n)->dataType.Format(nameSpace, includeNamespace);
-			}
-
-			n = n->next;
-		}
-	}
-
-	return str;
-}
-
-// interface
-int asCScriptFunction::FindNextLineWithCode(int line) const
-{
-	if( scriptData == 0 ) return -1;
-	if( scriptData->lineNumbers.GetLength() == 0 ) return -1;
-
-	// The line numbers for constructors are not in order due to the way
-	// class members can be initialized directly in the declaration
-	if( objectType && objectType->name == name )
-	{
-		// Sort all line numbers before looking for the next
-		asCArray<int> lineNbrs;
-		for( asUINT n = 1; n < scriptData->lineNumbers.GetLength(); n += 2 )
-			lineNbrs.PushLast(scriptData->lineNumbers[n]&0xFFFFF);
-
-		struct C
-		{
-			static int cmp(const void *a, const void *b) { return *(int*)a - *(int*)b; }
-		};
-		std::qsort(&lineNbrs[0], lineNbrs.GetLength(), sizeof(int), C::cmp);
-
-		if( line < lineNbrs[0] && line < (scriptData->declaredAt&0xFFFFF)) return -1;
-		if( line > lineNbrs[lineNbrs.GetLength()-1] ) return -1;
-
-		// Find the line with code on or right after the input line
-		// TODO: optimize: Do binary search
-		for( asUINT n = 0; n < lineNbrs.GetLength(); n++ )
-			if( line <= lineNbrs[n] )
-				return lineNbrs[n];
-	}
-	else
-	{
-		// Check if given line is outside function
-		if( line < (scriptData->declaredAt&0xFFFFF) ) return -1;
-		if( line > (scriptData->lineNumbers[scriptData->lineNumbers.GetLength()-1]&0xFFFFF) ) return -1;
-
-		// Find the line with code on or right after the input line
-		// TODO: optimize: Do binary search instead
-		for( asUINT n = 1; n < scriptData->lineNumbers.GetLength(); n += 2 )
-		{
-			if( line <= (scriptData->lineNumbers[n]&0xFFFFF) )
-				return (scriptData->lineNumbers[n]&0xFFFFF);
-		}
-	}
-
-	return -1;
-}
-
-// internal
-int asCScriptFunction::GetLineNumber(int programPosition, int *sectionIdx)
-{
-	asASSERT( scriptData );
-
-	if( sectionIdx ) *sectionIdx = scriptData->scriptSectionIdx;
-	if( scriptData->lineNumbers.GetLength() == 0 ) return 0;
-
-	if( sectionIdx )
-	{
-		// Find the correct section index if the function is compiled from multiple sections
-		// This array will be empty most of the time so we don't need a sofisticated algorithm to search it
-		for( asUINT n = 0; n < scriptData->sectionIdxs.GetLength(); n += 2 )
-		{
-			if( scriptData->sectionIdxs[n] <= programPosition )
-				*sectionIdx = scriptData->sectionIdxs[n+1];
-		}
-	}
-
-	// Do a binary search in the buffer
-	int max = (int)scriptData->lineNumbers.GetLength()/2 - 1;
-	int min = 0;
-	int i = max/2;
-
-	for(;;)
-	{
-		if( scriptData->lineNumbers[i*2] < programPosition )
-		{
-			// Have we found the largest number < programPosition?
-			if( max == i ) return scriptData->lineNumbers[i*2+1];
-			if( scriptData->lineNumbers[i*2+2] > programPosition ) return scriptData->lineNumbers[i*2+1];
-
-			min = i + 1;
-			i = (max + min)/2;
-		}
-		else if( scriptData->lineNumbers[i*2] > programPosition )
-		{
-			// Have we found the smallest number > programPosition?
-			if( min == i ) return scriptData->lineNumbers[i*2+1];
-
-			max = i - 1;
-			i = (max + min)/2;
-		}
-		else
-		{
-			// We found the exact position
-			return scriptData->lineNumbers[i*2+1];
-		}
-	}
-}
-
-// interface
-asEFuncType asCScriptFunction::GetFuncType() const
-{
-	return funcType;
-}
-
-// interface
-asUINT asCScriptFunction::GetVarCount() const
-{
-	if( scriptData )
-		return asUINT(scriptData->variables.GetLength());
-	return 0;
-}
-
-// interface
-int asCScriptFunction::GetVar(asUINT index, const char **out_name, int *out_typeId) const
-{
-	if( scriptData == 0 )
-		return asNOT_SUPPORTED;
-	if( index >= scriptData->variables.GetLength() )
-		return asINVALID_ARG;
-
-	if( out_name )
-		*out_name = scriptData->variables[index]->name.AddressOf();
-	if( out_typeId )
-		*out_typeId = engine->GetTypeIdFromDataType(scriptData->variables[index]->type);
-
-	return asSUCCESS;
-}
-
-// interface
-const char *asCScriptFunction::GetVarDecl(asUINT index, bool includeNamespace) const
-{
-	if( scriptData == 0 || index >= scriptData->variables.GetLength() )
-		return 0;
-
-	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = scriptData->variables[index]->type.Format(nameSpace, includeNamespace);
-	*tempString += " " + scriptData->variables[index]->name;
-
-	return tempString->AddressOf();
-}
-
-// internal
-void asCScriptFunction::AddVariable(asCString &in_name, asCDataType &in_type, int in_stackOffset)
-{
-	asASSERT( scriptData );
-	asSScriptVariable *var = asNEW(asSScriptVariable);
-	if( var == 0 )
-	{
-		// Out of memory
-		return;
-	}
-	var->name                 = in_name;
-	var->type                 = in_type;
-	var->stackOffset          = in_stackOffset;
-	var->declaredAtProgramPos = 0;
-	scriptData->variables.PushLast(var);
-}
-
-// internal
-asCTypeInfo *asCScriptFunction::GetTypeInfoOfLocalVar(short varOffset)
-{
-	asASSERT( scriptData );
-
-	for( asUINT n = 0; n < scriptData->objVariablePos.GetLength(); n++ )
-	{
-		if( scriptData->objVariablePos[n] == varOffset )
-			return scriptData->objVariableTypes[n];
-	}
-
-	return 0;
-}
-
-// internal
-void asCScriptFunction::ComputeSignatureId()
-{
-	// This function will compute the signatureId based on the
-	// function name, return type, and parameter types. The object
-	// type for methods is not used, so that class methods and
-	// interface methods match each other.
-	for( asUINT n = 0; n < engine->signatureIds.GetLength(); n++ )
-	{
-		if( !IsSignatureEqual(engine->signatureIds[n]) ) continue;
-
-		// We don't need to increment the reference counter here, because
-		// asCScriptEngine::FreeScriptFunctionId will maintain the signature
-		// id as the function is freed.
-		signatureId = engine->signatureIds[n]->signatureId;
-		return;
-	}
-
-	signatureId = id;
-	engine->signatureIds.PushLast(this);
-}
-
-// internal
-bool asCScriptFunction::IsSignatureEqual(const asCScriptFunction *func) const
-{
-	if( name != func->name || !IsSignatureExceptNameEqual(func) ) return false;
-
-	return true;
-}
-
-// internal
-bool asCScriptFunction::IsSignatureExceptNameEqual(const asCScriptFunction *func) const
-{
-	return IsSignatureExceptNameEqual(func->returnType, func->parameterTypes, func->inOutFlags, func->objectType, func->isReadOnly);
-}
-
-// internal
-bool asCScriptFunction::IsSignatureExceptNameEqual(const asCDataType &retType, const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &paramInOut, const asCObjectType *objType, bool readOnly) const
-{
-	if( this->returnType != retType ) return false;
-
-	return IsSignatureExceptNameAndReturnTypeEqual(paramTypes, paramInOut, objType, readOnly);
-}
-
-// internal
-bool asCScriptFunction::IsSignatureExceptNameAndObjectTypeEqual(const asCScriptFunction *func) const
-{
-	return IsSignatureExceptNameEqual(func->returnType, func->parameterTypes, func->inOutFlags, objectType, isReadOnly);
-}
-
-// internal
-bool asCScriptFunction::IsSignatureExceptNameAndReturnTypeEqual(const asCScriptFunction *func) const
-{
-	return IsSignatureExceptNameAndReturnTypeEqual(func->parameterTypes, func->inOutFlags, func->objectType, func->isReadOnly);
-}
-
-// internal
-bool asCScriptFunction::IsSignatureExceptNameAndReturnTypeEqual(const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &paramInOut, const asCObjectType *objType, bool readOnly) const
-{
-	if( this->isReadOnly        != readOnly       ) return false;
-	if( (this->objectType != 0) != (objType != 0) ) return false;
-	if( this->inOutFlags        != paramInOut     ) return false;
-	if( this->parameterTypes    != paramTypes     ) return false;
-
-	return true;
-}
-
-// internal
-void asCScriptFunction::AddReferences()
-{
-	// This array will be used to make sure we only add the reference to the same resource once
-	// This is especially important for global variables, as it expects the initialization function
-	// to hold only one reference to the variable. However, if the variable is initialized through
-	// the default constructor followed by the assignment operator we will have two references to
-	// the variable in the function.
-	asCArray<void*> ptrs;
-
-	// Only count references if there is any bytecode
-	if( scriptData && scriptData->byteCode.GetLength() )
-	{
-		if( returnType.GetTypeInfo() )
-		{
-			returnType.GetTypeInfo()->AddRefInternal();
-
-			asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(returnType.GetTypeInfo());
-			if( group != 0 ) group->AddRef();
-		}
-
-		for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
-			if( parameterTypes[p].GetTypeInfo() )
-			{
-				parameterTypes[p].GetTypeInfo()->AddRefInternal();
-
-				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(parameterTypes[p].GetTypeInfo());
-				if( group != 0 ) group->AddRef();
-			}
-
-		for( asUINT v = 0; v < scriptData->objVariableTypes.GetLength(); v++ )
-			if( scriptData->objVariableTypes[v] ) // The null handle is also stored, but it doesn't have an object type
-			{
-				scriptData->objVariableTypes[v]->AddRefInternal();
-
-				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(scriptData->objVariableTypes[v]);
-				if( group != 0 ) group->AddRef();
-			}
-
-		// Go through the byte code and add references to all resources used by the function
-		asCArray<asDWORD> &bc = scriptData->byteCode;
-		for( asUINT n = 0; n < bc.GetLength(); n += asBCTypeSize[asBCInfo[*(asBYTE*)&bc[n]].type] )
-		{
-			switch( *(asBYTE*)&bc[n] )
-			{
-			// Object types
-			case asBC_OBJTYPE:
-			case asBC_FREE:
-			case asBC_REFCPY:
-			case asBC_RefCpyV:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					asASSERT( objType );
-					if( objType )
-						objType->AddRefInternal();
-				}
-				break;
-
-			// Object type and function
-			case asBC_ALLOC:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					asASSERT( objType );
-					if( objType )
-						objType->AddRefInternal();
-
-					int funcId = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
-					if( funcId )
-						engine->scriptFunctions[funcId]->AddRefInternal();
-				}
-				break;
-
-			// Global variables
-			case asBC_PGA:
-			case asBC_PshGPtr:
-			case asBC_LDG:
-			case asBC_PshG4:
-			case asBC_LdGRdR4:
-			case asBC_CpyGtoV4:
-			case asBC_CpyVtoG4:
-			case asBC_SetG4:
-				// Need to increase the reference for each global variable
-				{
-					void *gvarPtr = (void*)asBC_PTRARG(&bc[n]);
-					if( !gvarPtr ) break;
-					asCGlobalProperty *prop = GetPropertyByGlobalVarPtr(gvarPtr);
-					if( !prop ) break;
-
-					// Only addref the properties once
-					if( !ptrs.Exists(gvarPtr) )
-					{
-						prop->AddRef();
-						ptrs.PushLast(gvarPtr);
-					}
-
-					asCConfigGroup *group = engine->FindConfigGroupForGlobalVar(prop->id);
-					if( group != 0 ) group->AddRef();
-				}
-				break;
-
-			// System functions
-			case asBC_CALLSYS:
-				{
-					int funcId = asBC_INTARG(&bc[n]);
-					asCConfigGroup *group = engine->FindConfigGroupForFunction(funcId);
-					if( group != 0 ) group->AddRef();
-
-					asASSERT( funcId > 0 );
-					if( funcId > 0 )
-						engine->scriptFunctions[funcId]->AddRefInternal();
-				}
-				break;
-
-			// Functions
-			case asBC_CALL:
-			case asBC_CALLINTF:
-				{
-					int funcId = asBC_INTARG(&bc[n]);
-					asASSERT( funcId > 0 );
-					if( funcId > 0 )
-						engine->scriptFunctions[funcId]->AddRefInternal();
-				}
-				break;
-
-			// Function pointers
-			case asBC_FuncPtr:
-				{
-					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
-					asASSERT( func );
-					if( func )
-						func->AddRefInternal();
-				}
-				break;
-			}
-		}
-	}
-}
-
-// internal
-void asCScriptFunction::ReleaseReferences()
-{
-	asCArray<void*> ptrs;
-
-	// Only count references if there is any bytecode
-	if( scriptData && scriptData->byteCode.GetLength() )
-	{
-		if( returnType.GetTypeInfo() )
-		{
-			returnType.GetTypeInfo()->ReleaseInternal();
-
-			asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(returnType.GetTypeInfo());
-			if( group != 0 ) group->Release();
-		}
-
-		for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
-			if( parameterTypes[p].GetTypeInfo() )
-			{
-				parameterTypes[p].GetTypeInfo()->ReleaseInternal();
-
-				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(parameterTypes[p].GetTypeInfo());
-				if( group != 0 ) group->Release();
-			}
-
-		for( asUINT v = 0; v < scriptData->objVariableTypes.GetLength(); v++ )
-			if( scriptData->objVariableTypes[v] ) // The null handle is also stored, but it doesn't have an object type
-			{
-				scriptData->objVariableTypes[v]->ReleaseInternal();
-
-				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(scriptData->objVariableTypes[v]);
-				if( group != 0 ) group->Release();
-			}
-
-		// Go through the byte code and release references to all resources used by the function
-		asCArray<asDWORD> &bc = scriptData->byteCode;
-		for( asUINT n = 0; n < bc.GetLength(); n += asBCTypeSize[asBCInfo[*(asBYTE*)&bc[n]].type] )
-		{
-			switch( *(asBYTE*)&bc[n] )
-			{
-			// Object types
-			case asBC_OBJTYPE:
-			case asBC_FREE:
-			case asBC_REFCPY:
-			case asBC_RefCpyV:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					if( objType )
-						objType->ReleaseInternal();
-				}
-				break;
-
-			// Object type and function
-			case asBC_ALLOC:
-				{
-					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
-					if( objType )
-						objType->ReleaseInternal();
-
-					int funcId = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
-					if( funcId > 0 )
-					{
-						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
-						if( fptr )
-							fptr->ReleaseInternal();
-
-						// The engine may have been forced to destroy the function internals early
-						// and this may will make it impossible to find the function by id anymore.
-						// This should only happen if the engine is released while the application
-						// is still keeping functions alive.
-						// TODO: Fix this possible memory leak
-					}
-				}
-				break;
-
-			// Global variables
-			case asBC_PGA:
-			case asBC_PshGPtr:
-			case asBC_LDG:
-			case asBC_PshG4:
-			case asBC_LdGRdR4:
-			case asBC_CpyGtoV4:
-			case asBC_CpyVtoG4:
-			case asBC_SetG4:
-				// Need to increase the reference for each global variable
-				{
-					void *gvarPtr = (void*)asBC_PTRARG(&bc[n]);
-					if( !gvarPtr ) break;
-					asCGlobalProperty *prop = GetPropertyByGlobalVarPtr(gvarPtr);
-					if( !prop ) break;
-
-					// Only release the properties once
-					if( !ptrs.Exists(gvarPtr) )
-					{
-						prop->Release();
-						ptrs.PushLast(gvarPtr);
-					}
-
-					asCConfigGroup *group = engine->FindConfigGroupForGlobalVar(prop->id);
-					if( group != 0 ) group->Release();
-				}
-				break;
-
-			// System functions
-			case asBC_CALLSYS:
-				{
-					int funcId = asBC_INTARG(&bc[n]);
-					asCConfigGroup *group = engine->FindConfigGroupForFunction(funcId);
-					if( group != 0 ) group->Release();
-
-					if( funcId )
-					{
-						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
-						if( fptr )
-							fptr->ReleaseInternal();
-					}
-				}
-				break;
-
-			// Functions
-			case asBC_CALL:
-			case asBC_CALLINTF:
-				{
-					int funcId = asBC_INTARG(&bc[n]);
-					if( funcId )
-					{
-						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
-						if( fptr )
-							fptr->ReleaseInternal();
-
-						// The engine may have been forced to destroy the function internals early
-						// and this may will make it impossible to find the function by id anymore.
-						// This should only happen if the engine is released while the application
-						// is still keeping functions alive.
-						// TODO: Fix this possible memory leak
-					}
-				}
-				break;
-
-			// Function pointers
-			case asBC_FuncPtr:
-				{
-					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
-					if( func )
-						func->ReleaseInternal();
-				}
-				break;
-			}
-		}
-
-		// Release the jit compiled function
-		if( scriptData->jitFunction )
-			engine->jitCompiler->ReleaseJITFunction(scriptData->jitFunction);
-		scriptData->jitFunction = 0;
-	}
-
-	// Delegate
-	if( objForDelegate )
-		engine->ReleaseScriptObject(objForDelegate, funcForDelegate->GetObjectType());
-	objForDelegate = 0;
-	if( funcForDelegate )
-		funcForDelegate->Release();
-	funcForDelegate = 0;
-}
-
-// interface
-int asCScriptFunction::GetReturnTypeId(asDWORD *flags) const
-{
-	if( flags )
-	{
-		if( returnType.IsReference() )
-		{
-			*flags = asTM_INOUTREF;
-			*flags |= returnType.IsReadOnly() ? asTM_CONST : 0;
-		}
-		else
-			*flags = asTM_NONE;
-	}
-
-	return engine->GetTypeIdFromDataType(returnType);
-}
-
-// interface
-asUINT asCScriptFunction::GetParamCount() const
-{
-	return (asUINT)parameterTypes.GetLength();
-}
-
-// interface
-int asCScriptFunction::GetParam(asUINT index, int *out_typeId, asDWORD *out_flags, const char **out_name, const char **out_defaultArg) const
-{
-	if( index >= parameterTypes.GetLength() )
-		return asINVALID_ARG;
-
-	if( out_typeId )
-		*out_typeId = engine->GetTypeIdFromDataType(parameterTypes[index]);
-
-	if( out_flags )
-	{
-		*out_flags = inOutFlags[index];
-		*out_flags |= parameterTypes[index].IsReadOnly() ? asTM_CONST : 0;
-	}
-
-	if( out_name )
-	{
-		// The parameter names are not stored if loading from bytecode without debug information
-		if( index < parameterNames.GetLength() )
-			*out_name = parameterNames[index].AddressOf();
-		else
-			*out_name = 0;
-	}
-
-	if( out_defaultArg )
-	{
-		if( index < defaultArgs.GetLength() && defaultArgs[index] )
-			*out_defaultArg = defaultArgs[index]->AddressOf();
-		else
-			*out_defaultArg = 0;
-	}
-
-	return asSUCCESS;
-}
-
-#ifdef AS_DEPRECATED
-// Deprecated since 2014-04-06, 2.29.0
-int asCScriptFunction::GetParamTypeId(asUINT index, asDWORD *flags) const
-{
-	if( index >= parameterTypes.GetLength() )
-		return asINVALID_ARG;
-
-	if( flags )
-	{
-		*flags = inOutFlags[index];
-		*flags |= parameterTypes[index].IsReadOnly() ? asTM_CONST : 0;
-	}
-
-	return engine->GetTypeIdFromDataType(parameterTypes[index]);
-}
-#endif
-
-// interface
-asIScriptEngine *asCScriptFunction::GetEngine() const
-{
-	return engine;
-}
-
-// interface
-const char *asCScriptFunction::GetDeclaration(bool includeObjectName, bool includeNamespace, bool includeParamNames) const
-{
-	asCString *tempString = &asCThreadManager::GetLocalData()->string;
-	*tempString = GetDeclarationStr(includeObjectName, includeNamespace, includeParamNames);
-	return tempString->AddressOf();
-}
-
-// interface
-const char *asCScriptFunction::GetScriptSectionName() const
-{
-	if( scriptData && scriptData->scriptSectionIdx >= 0 )
-		return engine->scriptSectionNames[scriptData->scriptSectionIdx]->AddressOf();
-
-	return 0;
-}
-
-// interface
-const char *asCScriptFunction::GetConfigGroup() const
-{
-	asCConfigGroup *group = 0;
-	if( funcType != asFUNC_FUNCDEF )
-		group = engine->FindConfigGroupForFunction(id);
-	else
-		group = engine->FindConfigGroupForFuncDef(this->funcdefType);
-
-	if( group == 0 )
-		return 0;
-
-	return group->groupName.AddressOf();
-}
-
-// interface
-asDWORD asCScriptFunction::GetAccessMask() const
-{
-	return accessMask;
-}
-
-// internal
-void asCScriptFunction::JITCompile()
-{
-	if( funcType != asFUNC_SCRIPT )
-		return;
-
-	asASSERT( scriptData );
-
-	asIJITCompiler *jit = engine->GetJITCompiler();
-	if( !jit )
-		return;
-
-	// Make sure the function has been compiled with JitEntry instructions
-	// For functions that has JitEntry this will be a quick test
-	asUINT length;
-	asDWORD *byteCode = GetByteCode(&length);
-	asDWORD *end = byteCode + length;
-	bool foundJitEntry = false;
-	while( byteCode < end )
-	{
-		// Determine the instruction
-		asEBCInstr op = asEBCInstr(*(asBYTE*)byteCode);
-		if( op == asBC_JitEntry )
-		{
-			foundJitEntry = true;
-			break;
-		}
-
-		// Move to next instruction
-		byteCode += asBCTypeSize[asBCInfo[op].type];
-	}
-
-	if( !foundJitEntry )
-	{
-		asCString msg;
-		msg.Format(TXT_NO_JIT_IN_FUNC_s, GetDeclaration());
-		engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
-	}
-
-	// Release the previous function, if any
-	if( scriptData->jitFunction )
-	{
-		engine->jitCompiler->ReleaseJITFunction(scriptData->jitFunction);
-		scriptData->jitFunction = 0;
-	}
-
-	// Compile for native system
-	int r = jit->CompileFunction(this, &scriptData->jitFunction);
-	if( r < 0 )
-		asASSERT( scriptData->jitFunction == 0 );
-}
-
-// interface
-asDWORD *asCScriptFunction::GetByteCode(asUINT *length)
-{
-	if( scriptData == 0 ) return 0;
-
-	if( length )
-		*length = (asUINT)scriptData->byteCode.GetLength();
-
-	if( scriptData->byteCode.GetLength() )
-		return scriptData->byteCode.AddressOf();
-
-	return 0;
-}
-
-// interface
-void *asCScriptFunction::SetUserData(void *data, asPWORD type)
-{
-	// As a thread might add a new new user data at the same time as another
-	// it is necessary to protect both read and write access to the userData member
-	ACQUIREEXCLUSIVE(engine->engineRWLock);
-
-	// It is not intended to store a lot of different types of userdata,
-	// so a more complex structure like a associative map would just have
-	// more overhead than a simple array.
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n] == type )
-		{
-			void *oldData = reinterpret_cast<void*>(userData[n+1]);
-			userData[n+1] = reinterpret_cast<asPWORD>(data);
-
-			RELEASEEXCLUSIVE(engine->engineRWLock);
-
-			return oldData;
-		}
-	}
-
-	userData.PushLast(type);
-	userData.PushLast(reinterpret_cast<asPWORD>(data));
-
-	RELEASEEXCLUSIVE(engine->engineRWLock);
-
-	return 0;
-}
-
-// interface
-void *asCScriptFunction::GetUserData(asPWORD type) const
-{
-	// There may be multiple threads reading, but when
-	// setting the user data nobody must be reading.
-	ACQUIRESHARED(engine->engineRWLock);
-
-	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
-	{
-		if( userData[n] == type )
-		{
-			RELEASESHARED(engine->engineRWLock);
-			return reinterpret_cast<void*>(userData[n+1]);
-		}
-	}
-
-	RELEASESHARED(engine->engineRWLock);
-
-	return 0;
-}
-
-// internal
-// TODO: cleanup: This method should probably be a member of the engine
-asCGlobalProperty *asCScriptFunction::GetPropertyByGlobalVarPtr(void *gvarPtr)
-{
-	asSMapNode<void*, asCGlobalProperty*> *node;
-	if( engine->varAddressMap.MoveTo(&node, gvarPtr) )
-	{
-		asASSERT(gvarPtr == node->value->GetAddressOfValue());
-		return node->value;
-	}
-	return 0;
-}
-
-// internal
-int asCScriptFunction::GetRefCount()
-{
-	asASSERT( funcType == asFUNC_DELEGATE );
-
-	return externalRefCount.get();
-}
-
-// internal
-void asCScriptFunction::SetFlag()
-{
-	gcFlag = true;
-}
-
-// internal
-bool asCScriptFunction::GetFlag()
-{
-	return gcFlag;
-}
-
-// internal
-void asCScriptFunction::EnumReferences(asIScriptEngine *)
-{
-	asASSERT( funcType == asFUNC_DELEGATE );
-
-	// Delegate
-	if( objForDelegate )
-		engine->GCEnumCallback(objForDelegate);
-}
-
-// internal
-void asCScriptFunction::ReleaseAllHandles(asIScriptEngine *)
-{
-	asASSERT( funcType == asFUNC_DELEGATE );
-
-	// Release paramaters
-
-	// Delegate
-	if( objForDelegate )
-		engine->ReleaseScriptObject(objForDelegate, funcForDelegate->GetObjectType());
-	objForDelegate = 0;
-}
-
-// internal
-bool asCScriptFunction::IsShared() const
-{
-	// All system functions are shared
-	if( funcType == asFUNC_SYSTEM ) return true;
-
-	// All class methods for shared classes are also shared
-	asASSERT( objectType == 0 || objectType->engine == engine || objectType->engine == 0 );
-	if( objectType && (objectType->flags & asOBJ_SHARED) ) return true;
-
-	// Functions that have been specifically marked as shared are shared
-	return isShared;
-}
-
-// internal
-bool asCScriptFunction::IsFinal() const
-{
-	return isFinal;
-}
-
-// internal
-bool asCScriptFunction::IsOverride() const
-{
-	return isOverride;
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptfunction.cpp
+//
+// A container for a compiled script function
+//
+
+
+
+#include "as_config.h"
+#include "as_scriptfunction.h"
+#include "as_tokendef.h"
+#include "as_scriptengine.h"
+#include "as_callfunc.h"
+#include "as_bytecode.h"
+#include "as_texts.h"
+#include "as_scriptnode.h"
+#include "as_builder.h"
+#include "as_scriptcode.h"
+
+#include <cstdlib> // qsort
+
+BEGIN_AS_NAMESPACE
+
+#ifdef AS_MAX_PORTABILITY
+
+static void ScriptFunction_AddRef_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
+	self->AddRef();
+}
+
+static void ScriptFunction_Release_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
+	self->Release();
+}
+
+static void ScriptFunction_GetRefCount_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
+	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
+}
+
+static void ScriptFunction_SetFlag_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
+	self->SetFlag();
+}
+
+static void ScriptFunction_GetFlag_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
+	*(bool*)gen->GetAddressOfReturnLocation() = self->GetFlag();
+}
+
+static void ScriptFunction_EnumReferences_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->EnumReferences(engine);
+}
+
+static void ScriptFunction_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *self = (asCScriptFunction*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->ReleaseAllHandles(engine);
+}
+
+static void ScriptFunction_CreateDelegate_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *func = (asCScriptFunction*)gen->GetArgAddress(0);
+	void *obj = gen->GetArgAddress(1);
+	gen->SetReturnAddress(CreateDelegate(func, obj));
+}
+
+// TODO: operator==
+/*static void ScriptFunction_opEquals_Generic(asIScriptGeneric *gen)
+{
+	asCScriptFunction *funcSelf = (asCScriptFunction*)gen->GetObject();
+	asCScriptFunction *funcOther = (asCScriptFunction*)gen->GetArgAddress(0);
+	*(bool*)gen->GetAddressOfReturnLocation() = *funcSelf == *funcOther;
+}
+*/
+
+#endif
+
+
+void RegisterScriptFunction(asCScriptEngine *engine)
+{
+	// Register the gc behaviours for the script functions
+	int r = 0;
+	UNUSED_VAR(r); // It is only used in debug mode
+	engine->functionBehaviours.engine = engine;
+	engine->functionBehaviours.flags = asOBJ_REF | asOBJ_GC;
+	engine->functionBehaviours.name = "$func";
+#ifndef AS_MAX_PORTABILITY
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ADDREF, "void f()", asMETHOD(asCScriptFunction,AddRef), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASE, "void f()", asMETHOD(asCScriptFunction,Release), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(asCScriptFunction,GetRefCount), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_SETGCFLAG, "void f()", asMETHOD(asCScriptFunction,SetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(asCScriptFunction,GetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(asCScriptFunction,EnumReferences), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(asCScriptFunction,ReleaseAllHandles), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	// TODO: Need some way to allow the arg type to adapt when the funcdefs are instantiated
+//	r = engine->RegisterMethodToObjectType(&engine->functionBehaviours, "bool opEquals(const int &in)", asMETHOD(asCScriptFunction,operator==), asCALL_THISCALL); asASSERT( r >= 0 );
+#else
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptFunction_AddRef_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptFunction_Release_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptFunction_GetRefCount_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptFunction_SetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptFunction_GetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptFunction_EnumReferences_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->functionBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptFunction_ReleaseAllHandles_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+//	r = engine->RegisterMethodToObjectType(&engine->functionBehaviours, "bool opEquals(const int &in)", asFUNCTION(ScriptFunction_opEquals_Generic), asCALL_GENERIC); asASSERT( r >= 0 );
+#endif
+
+	// Register the builtin function for creating delegates
+	// This function returns a handle to the delegate, but since the type is not known at this time it is
+	// registered to return a void then the return type is changed manually to the builtin function type
+	// The name of the function is an invalid identifier so it cannot be invoked accidentally from the script
+#ifndef AS_MAX_PORTABILITY
+	r = engine->RegisterGlobalFunction("void f(int &in, int &in)", asFUNCTION(CreateDelegate), asCALL_CDECL); asASSERT( r >= 0 );
+#else
+	r = engine->RegisterGlobalFunction("void f(int &in, int &in)", asFUNCTION(ScriptFunction_CreateDelegate_Generic), asCALL_GENERIC); asASSERT( r >= 0 );
+#endif
+
+	// Rename the function so that it cannot be called manually by the script
+	int idx = engine->registeredGlobalFuncs.GetIndex(engine->scriptFunctions[r]);
+	engine->registeredGlobalFuncs.Erase(idx);
+	engine->scriptFunctions[r]->name = DELEGATE_FACTORY;
+	engine->registeredGlobalFuncs.Put(engine->scriptFunctions[r]);
+
+	// Change the return type so the VM will know the function really returns a handle
+	engine->scriptFunctions[r]->returnType = asCDataType::CreateType(&engine->functionBehaviours, false);
+	engine->scriptFunctions[r]->returnType.MakeHandle(true);
+}
+
+asCScriptFunction *CreateDelegate(asCScriptFunction *func, void *obj)
+{
+	if( func == 0 || obj == 0 )
+	{
+		// TODO: delegate: Should set script exception
+		return 0;
+	}
+
+	// Create an instance of a asCScriptFunction with the type asFUNC_DELEGATE
+	// The delegate shouldn't have a function id and is not added to the engine->scriptFunctions
+	asCScriptFunction *delegate = asNEW(asCScriptFunction)(static_cast<asCScriptEngine*>(func->GetEngine()), 0, asFUNC_DELEGATE);
+	if( delegate )
+		delegate->MakeDelegate(func, obj);
+
+	return delegate;
+}
+
+// internal
+void asCScriptFunction::MakeDelegate(asCScriptFunction *func, void *obj)
+{
+	// Increase the reference of the function and object
+	func->AddRef();
+	funcForDelegate = func;
+
+	func->GetEngine()->AddRefScriptObject(obj, func->GetObjectType());
+	objForDelegate = obj;
+
+	// The return type and parameters are copied from the delegated method to this object
+	// TODO: optimize: Do we really need to copy? Whenever requested the delegate can simply return the delegated methods' info directly
+	parameterTypes = func->parameterTypes;
+	returnType     = func->returnType;
+	inOutFlags     = func->inOutFlags;
+
+	// The delegate doesn't own the parameters as it will only forward them to the real method
+	// so the exception handler must not clean up the parameters for the delegate
+	dontCleanUpOnException = true;
+}
+
+// interface
+void *asCScriptFunction::GetAuxiliary() const
+{
+	if (sysFuncIntf)
+		return sysFuncIntf->auxiliary;
+
+	return 0;
+}
+
+// interface
+void *asCScriptFunction::GetDelegateObject() const
+{
+	return objForDelegate;
+}
+
+// interface
+asITypeInfo *asCScriptFunction::GetDelegateObjectType() const
+{
+	if( objForDelegate == 0 || funcForDelegate == 0 )
+		return 0;
+
+	return funcForDelegate->objectType;
+}
+
+// interface
+asIScriptFunction *asCScriptFunction::GetDelegateFunction() const
+{
+	return funcForDelegate;
+}
+
+// TODO: operator==
+/*
+// internal
+bool asCScriptFunction::operator==(const asCScriptFunction &other) const
+{
+	if( this == &other ) return true;
+
+	if( this->funcType == asFUNC_DELEGATE && other.funcType == asFUNC_DELEGATE )
+	{
+		if( this->objForDelegate == other.objForDelegate &&
+			this->funcForDelegate == other.funcForDelegate )
+			return true;
+	}
+
+	return false;
+}
+*/
+
+// internal
+int asCScriptFunction::RegisterListPattern(const char *decl, asCScriptNode *listNodes)
+{
+	if( listNodes == 0 )
+		return asINVALID_ARG;
+
+	// Build the representation of the list pattern from the script nodes
+	asSListPatternNode *node;
+	listPattern = asNEW(asSListPatternNode)(asLPT_START);
+	node = listPattern;
+
+	// Recursively parse the child
+	int r = ParseListPattern(node, decl, listNodes);
+
+	node->next = asNEW(asSListPatternNode)(asLPT_END);
+
+	return r;
+}
+
+// internal
+int asCScriptFunction::ParseListPattern(asSListPatternNode *&target, const char *decl, asCScriptNode *listNodes)
+{
+	asSListPatternNode *node = target;
+
+	listNodes = listNodes->firstChild;
+	while( listNodes )
+	{
+		if( listNodes->nodeType == snIdentifier )
+		{
+			asCString token(&decl[listNodes->tokenPos], listNodes->tokenLength);
+			if( token == "repeat" )
+			{
+				node->next = asNEW(asSListPatternNode)(asLPT_REPEAT);
+				node = node->next;
+			}
+			else if( token == "repeat_same" )
+			{
+				// TODO: list: Should make sure this is a sub-list
+				node->next = asNEW(asSListPatternNode)(asLPT_REPEAT_SAME);
+				node = node->next;
+			}
+			else
+			{
+				// Shouldn't happen as the parser already reported the error
+				asASSERT(false);
+			}
+		}
+		else if( listNodes->nodeType == snDataType )
+		{
+			asCDataType dt;
+			asCBuilder builder(engine, 0);
+			asCScriptCode code;
+			code.SetCode("", decl, 0, false);
+
+			// For list factory we get the object type from the return type, for list constructor we get it from the object type directly
+			dt = builder.CreateDataTypeFromNode(listNodes, &code, engine->defaultNamespace, false, objectType ? objectType : CastToObjectType(returnType.GetTypeInfo()));
+
+			node->next = asNEW(asSListPatternDataTypeNode)(dt);
+			node = node->next;
+		}
+		else if( listNodes->nodeType == snListPattern )
+		{
+			node->next = asNEW(asSListPatternNode)(asLPT_START);
+			node = node->next;
+
+			// Recursively parse the child
+			int r = ParseListPattern(node, decl, listNodes);
+			if( r < 0 )
+				return r;
+
+			node->next = asNEW(asSListPatternNode)(asLPT_END);
+			node = node->next;
+		}
+		else
+		{
+			// Unexpected token in the list, the parser shouldn't have allowed
+			asASSERT( false );
+			return -1;
+		}
+
+		listNodes = listNodes->next;
+	}
+
+	target = node;
+	return 0;
+}
+
+// internal
+asCScriptFunction::asCScriptFunction(asCScriptEngine *engine, asCModule *mod, asEFuncType _funcType)
+{
+	funcType               = _funcType;
+	if( funcType == asFUNC_DELEGATE )
+	{
+		// Delegates behave like object instances, rather than script code
+		externalRefCount.set(1);
+		internalRefCount.set(0);
+	}
+	else
+	{
+		internalRefCount.set(1);
+		externalRefCount.set(0);
+	}
+
+	this->engine           = engine;
+	this->scriptData       = 0;
+	module                 = mod;
+	objectType             = 0;
+	name                   = "";
+	sysFuncIntf            = 0;
+	signatureId            = 0;
+	dontCleanUpOnException = false;
+	vfTableIdx             = -1;
+	gcFlag                 = false;
+	userData               = 0;
+	id                     = 0;
+	accessMask             = 0xFFFFFFFF;
+	nameSpace              = engine->nameSpaces[0];
+	objForDelegate         = 0;
+	funcForDelegate        = 0;
+	listPattern            = 0;
+	funcdefType            = 0;
+
+	if( funcType == asFUNC_SCRIPT )
+		AllocateScriptFunctionData();
+
+	// Notify the GC of delegates
+	if( funcType == asFUNC_DELEGATE )
+		engine->gc.AddScriptObjectToGC(this, &engine->functionBehaviours);
+}
+
+void asCScriptFunction::AllocateScriptFunctionData()
+{
+	if( scriptData ) return;
+
+	scriptData = asNEW(ScriptFunctionData);
+
+	scriptData->stackNeeded      = 0;
+	scriptData->variableSpace    = 0;
+	scriptData->scriptSectionIdx = -1;
+	scriptData->declaredAt       = 0;
+	scriptData->jitFunction      = 0;
+}
+
+void asCScriptFunction::DeallocateScriptFunctionData()
+{
+	if( !scriptData ) return;
+
+	for( asUINT n = 0; n < scriptData->variables.GetLength(); n++ )
+		asDELETE(scriptData->variables[n],asSScriptVariable);
+	scriptData->variables.SetLength(0);
+
+	asDELETE(scriptData, ScriptFunctionData);
+	scriptData = 0;
+}
+
+// internal
+asCScriptFunction::~asCScriptFunction()
+{
+	// Dummy functions that are allocated on the stack are not reference counted
+	asASSERT( funcType == asFUNC_DUMMY    ||
+		      (externalRefCount.get() == 0 && internalRefCount.get() == 0) );
+
+	// Remove the script function from the engine's scriptFunctions array here
+	// Don't remove it before, because there may still be functions referring to it
+	// by index until now. If it was removed in DestroyInternal, those would not
+	// be able to release the refcount, thus causing memory leak.
+	if( engine && id != 0 && funcType != asFUNC_DUMMY )
+		engine->RemoveScriptFunction(this);
+
+	// If the engine pointer is 0, then DestroyInternal has already been called and there is nothing more to do
+	if( engine == 0 ) return;
+
+	DestroyInternal();
+
+	// Finally set the engine pointer to 0 because it must not be accessed again
+	engine = 0;
+}
+
+// internal
+void asCScriptFunction::DestroyHalfCreated()
+{
+	asASSERT( externalRefCount.get() == 0 && internalRefCount.get() == 1 );
+
+	// Set the funcType to dummy so the destructor won't complain
+	funcType = asFUNC_DUMMY;
+
+	// If the bytecode exist remove it before destroying, otherwise it
+	// will fail when the destructor releases the references as the bytecode
+	// is not fully constructed.
+	if( scriptData )
+		scriptData->byteCode.SetLength(0);
+
+	asDELETE(this, asCScriptFunction);
+}
+
+// internal
+void asCScriptFunction::DestroyInternal()
+{
+	// Clean up user data
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n+1] )
+		{
+			for( asUINT c = 0; c < engine->cleanFunctionFuncs.GetLength(); c++ )
+				if( engine->cleanFunctionFuncs[c].type == userData[n] )
+					engine->cleanFunctionFuncs[c].cleanFunc(this);
+		}
+	}
+	userData.SetLength(0);
+
+	// Release all references the function holds to other objects
+	ReleaseReferences();
+	parameterTypes.SetLength(0);
+	returnType = asCDataType::CreatePrimitive(ttVoid, false);
+
+	for( asUINT p = 0; p < defaultArgs.GetLength(); p++ )
+		if( defaultArgs[p] )
+			asDELETE(defaultArgs[p], asCString);
+	defaultArgs.SetLength(0);
+
+	if( sysFuncIntf )
+		asDELETE(sysFuncIntf,asSSystemFunctionInterface);
+	sysFuncIntf = 0;
+
+	if( objectType )
+	{
+		objectType->ReleaseInternal();
+		objectType = 0;
+	}
+
+	DeallocateScriptFunctionData();
+
+	// Deallocate list pattern data
+	while( listPattern )
+	{
+		asSListPatternNode *n = listPattern->next;
+		asDELETE(listPattern, asSListPatternNode);
+		listPattern = n;
+	}
+}
+
+// interface
+int asCScriptFunction::GetId() const
+{
+	return id;
+}
+
+// interface
+int asCScriptFunction::AddRef() const
+{
+	gcFlag = false;
+	return externalRefCount.atomicInc();
+}
+
+// interface
+int asCScriptFunction::Release() const
+{
+	gcFlag = false;
+	int r = externalRefCount.atomicDec();
+	if( r == 0 &&
+		funcType != asFUNC_DUMMY )    // Dummy functions are allocated on the stack and cannot be deleted
+	{
+		// There are no more external references, if there are also no
+		// internal references then it is time to delete the function
+		if( internalRefCount.get() == 0 )
+		{
+			// If there are no internal references, then no module is owning the function
+			// For example if the function was dynamically compiled without adding it to the scope of the module
+			asASSERT( module == 0 );
+
+			asDELETE(const_cast<asCScriptFunction*>(this),asCScriptFunction);
+		}
+	}
+
+	return r;
+}
+
+// internal
+int asCScriptFunction::AddRefInternal()
+{
+	return internalRefCount.atomicInc();
+}
+
+// internal
+int asCScriptFunction::ReleaseInternal()
+{
+	int r = internalRefCount.atomicDec();
+	if( r == 0 &&
+		funcType != asFUNC_DUMMY )
+	{
+		// There are no more internal references, if there are also no
+		// external references then it is time to delete the function
+		if( externalRefCount.get() == 0 )
+		{
+			asDELETE(const_cast<asCScriptFunction*>(this),asCScriptFunction);
+		}
+	}
+
+	return r;
+}
+
+// interface
+int asCScriptFunction::GetTypeId() const
+{
+	// This const cast is ok, the object won't be modified
+	asCDataType dt = asCDataType::CreateType(engine->FindMatchingFuncdef(const_cast<asCScriptFunction*>(this), 0), false);
+	return engine->GetTypeIdFromDataType(dt);
+}
+
+// interface
+bool asCScriptFunction::IsCompatibleWithTypeId(int typeId) const
+{
+	asCDataType dt = engine->GetDataTypeFromTypeId(typeId);
+
+	// Make sure the type is a function
+	if (!dt.IsFuncdef())
+		return false;
+
+	asCScriptFunction *func = CastToFuncdefType(dt.GetTypeInfo())->funcdef;
+	if( !IsSignatureExceptNameEqual(func) )
+		return false;
+
+	// If this is a class method, then only return true if the object type is the same
+	if( objectType != func->objectType )
+		return false;
+
+	return true;
+}
+
+// interface
+const char *asCScriptFunction::GetModuleName() const
+{
+	if( module )
+		return module->GetName();
+
+	return 0;
+}
+
+// interface
+asIScriptModule *asCScriptFunction::GetModule() const
+{
+	return module;
+}
+
+// interface
+asITypeInfo *asCScriptFunction::GetObjectType() const
+{
+	return objectType;
+}
+
+// interface
+const char *asCScriptFunction::GetObjectName() const
+{
+	if( objectType )
+		return objectType->GetName();
+
+	return 0;
+}
+
+// interface
+const char *asCScriptFunction::GetName() const
+{
+	return name.AddressOf();
+}
+
+// interface
+const char *asCScriptFunction::GetNamespace() const
+{
+	if (nameSpace)
+		return nameSpace->name.AddressOf();
+
+	return 0;
+}
+
+// interface
+bool asCScriptFunction::IsReadOnly() const
+{
+	return traits.GetTrait(asTRAIT_CONST);
+}
+
+// interface
+bool asCScriptFunction::IsPrivate() const
+{
+	return traits.GetTrait(asTRAIT_PRIVATE);
+}
+
+// interface
+bool asCScriptFunction::IsProtected() const
+{
+	return traits.GetTrait(asTRAIT_PROTECTED);
+}
+
+// internal
+int asCScriptFunction::GetSpaceNeededForArguments()
+{
+	// We need to check the size for each type
+	int s = 0;
+	for( asUINT n = 0; n < parameterTypes.GetLength(); n++ )
+		s += parameterTypes[n].GetSizeOnStackDWords();
+
+	return s;
+}
+
+// internal
+int asCScriptFunction::GetSpaceNeededForReturnValue()
+{
+	return returnType.GetSizeOnStackDWords();
+}
+
+// internal
+bool asCScriptFunction::DoesReturnOnStack() const
+{
+	if( returnType.GetTypeInfo() &&
+		(returnType.GetTypeInfo()->flags & asOBJ_VALUE) &&
+		!returnType.IsReference() )
+		return true;
+
+	return false;
+}
+
+// internal
+asCString asCScriptFunction::GetDeclarationStr(bool includeObjectName, bool includeNamespace, bool includeParamNames) const
+{
+	asCString str;
+
+	// TODO: default arg: Make the declaration with the default args an option
+
+	// Don't add the return type for constructors and destructors
+	if( !(returnType.GetTokenType() == ttVoid &&
+		  objectType &&
+		  (name == objectType->name || (name.GetLength() > 0 && name[0] == '~') ||
+		   name == "$beh0" || name == "$beh2")) )
+	{
+		str = returnType.Format(nameSpace, includeNamespace);
+		str += " ";
+	}
+	if( objectType && includeObjectName )
+	{
+		if( includeNamespace && objectType->nameSpace->name != "" )
+			str += objectType->nameSpace->name + "::";
+
+		if( objectType->name != "" )
+			str += objectType->name + "::";
+		else
+			str += "_unnamed_type_::";
+	}
+	else if (funcdefType && funcdefType->parentClass && includeObjectName)
+	{
+		if (includeNamespace && funcdefType->parentClass->nameSpace->name != "")
+			str += funcdefType->parentClass->nameSpace->name + "::";
+
+		if (funcdefType->parentClass->name != "")
+			str += funcdefType->parentClass->name + "::";
+		else
+			str += "_unnamed_type_::";
+	}
+	else if( includeNamespace && nameSpace->name != "" && !objectType )
+	{
+		str += nameSpace->name + "::";
+	}
+	if( name == "" )
+		str += "_unnamed_function_(";
+	else if( name.SubString(0,4) == "$beh" && name.GetLength() == 5 )
+	{
+		if( name[4] == '0' + asBEHAVE_CONSTRUCT )
+			str += objectType->name + "(";
+		else if( name[4] == '0' + asBEHAVE_FACTORY )
+			str += returnType.GetTypeInfo()->name + "(";
+		else if( name[4] == '0' + asBEHAVE_DESTRUCT )
+			str += "~" + objectType->name + "(";
+		else
+			str += name + "(";
+	}
+	else
+		str += name + "(";
+
+	if( parameterTypes.GetLength() > 0 )
+	{
+		asUINT n;
+		for( n = 0; n < parameterTypes.GetLength() - 1; n++ )
+		{
+			str += parameterTypes[n].Format(nameSpace, includeNamespace);
+			if( parameterTypes[n].IsReference() && inOutFlags.GetLength() > n )
+			{
+				if( inOutFlags[n] == asTM_INREF ) str += "in";
+				else if( inOutFlags[n] == asTM_OUTREF ) str += "out";
+				else if( inOutFlags[n] == asTM_INOUTREF ) str += "inout";
+			}
+
+			if( includeParamNames && n < parameterNames.GetLength() && parameterNames[n].GetLength() != 0 )
+			{
+				str += " ";
+				str += parameterNames[n];
+			}
+
+			if( defaultArgs.GetLength() > n && defaultArgs[n] )
+			{
+				asCString tmp;
+				tmp.Format(" = %s", defaultArgs[n]->AddressOf());
+				str += tmp;
+			}
+
+			str += ", ";
+		}
+
+		// Add the last parameter
+		str += parameterTypes[n].Format(nameSpace, includeNamespace);
+		if( parameterTypes[n].IsReference() && inOutFlags.GetLength() > n )
+		{
+			if( inOutFlags[n] == asTM_INREF ) str += "in";
+			else if( inOutFlags[n] == asTM_OUTREF ) str += "out";
+			else if( inOutFlags[n] == asTM_INOUTREF ) str += "inout";
+		}
+
+		if( includeParamNames && n < parameterNames.GetLength() && parameterNames[n].GetLength() != 0 )
+		{
+			str += " ";
+			str += parameterNames[n];
+		}
+
+		if( defaultArgs.GetLength() > n && defaultArgs[n] )
+		{
+			asCString tmp;
+			tmp.Format(" = %s", defaultArgs[n]->AddressOf());
+			str += tmp;
+		}
+	}
+
+	str += ")";
+
+	if( IsReadOnly() )
+		str += " const";
+
+	// Add the declaration of the list pattern
+	if( listPattern )
+	{
+		asSListPatternNode *n = listPattern;
+		bool first = true;
+		while( n )
+		{
+			if( n->type == asLPT_START )
+			{
+				str += " {";
+				first = true;
+			}
+			else if( n->type == asLPT_END )
+			{
+				str += " }";
+				first = false;
+			}
+			else if( n->type == asLPT_REPEAT )
+				str += " repeat";
+			else if( n->type == asLPT_REPEAT_SAME )
+				str += " repeat_same";
+			else if( n->type == asLPT_TYPE )
+			{
+				if( first )
+				{
+					str += " ";
+					first = false;
+				}
+				else
+					str += ", ";
+				str += reinterpret_cast<asSListPatternDataTypeNode*>(n)->dataType.Format(nameSpace, includeNamespace);
+			}
+
+			n = n->next;
+		}
+	}
+
+	return str;
+}
+
+// interface
+int asCScriptFunction::FindNextLineWithCode(int line) const
+{
+	if( scriptData == 0 ) return -1;
+	if( scriptData->lineNumbers.GetLength() == 0 ) return -1;
+
+	// The line numbers for constructors are not in order due to the way
+	// class members can be initialized directly in the declaration
+	if( objectType && objectType->name == name )
+	{
+		// Sort all line numbers before looking for the next
+		asCArray<int> lineNbrs;
+		for( asUINT n = 1; n < scriptData->lineNumbers.GetLength(); n += 2 )
+			lineNbrs.PushLast(scriptData->lineNumbers[n]&0xFFFFF);
+
+		struct C
+		{
+			static int cmp(const void *a, const void *b) { return *(int*)a - *(int*)b; }
+		};
+		std::qsort(&lineNbrs[0], lineNbrs.GetLength(), sizeof(int), C::cmp);
+
+		if( line < lineNbrs[0] && line < (scriptData->declaredAt&0xFFFFF)) return -1;
+		if( line > lineNbrs[lineNbrs.GetLength()-1] ) return -1;
+
+		// Find the line with code on or right after the input line
+		// TODO: optimize: Do binary search
+		for( asUINT n = 0; n < lineNbrs.GetLength(); n++ )
+			if( line <= lineNbrs[n] )
+				return lineNbrs[n];
+	}
+	else
+	{
+		// Check if given line is outside function
+		if( line < (scriptData->declaredAt&0xFFFFF) ) return -1;
+		if( line > (scriptData->lineNumbers[scriptData->lineNumbers.GetLength()-1]&0xFFFFF) ) return -1;
+
+		// Find the line with code on or right after the input line
+		// TODO: optimize: Do binary search instead
+		for( asUINT n = 1; n < scriptData->lineNumbers.GetLength(); n += 2 )
+		{
+			if( line <= (scriptData->lineNumbers[n]&0xFFFFF) )
+				return (scriptData->lineNumbers[n]&0xFFFFF);
+		}
+	}
+
+	return -1;
+}
+
+// internal
+int asCScriptFunction::GetLineNumber(int programPosition, int *sectionIdx)
+{
+	asASSERT( scriptData );
+
+	if( sectionIdx ) *sectionIdx = scriptData->scriptSectionIdx;
+	if( scriptData->lineNumbers.GetLength() == 0 ) return 0;
+
+	if( sectionIdx )
+	{
+		// Find the correct section index if the function is compiled from multiple sections
+		// This array will be empty most of the time so we don't need a sofisticated algorithm to search it
+		for( asUINT n = 0; n < scriptData->sectionIdxs.GetLength(); n += 2 )
+		{
+			if( scriptData->sectionIdxs[n] <= programPosition )
+				*sectionIdx = scriptData->sectionIdxs[n+1];
+		}
+	}
+
+	// Do a binary search in the buffer
+	int max = (int)scriptData->lineNumbers.GetLength()/2 - 1;
+	int min = 0;
+	int i = max/2;
+
+	for(;;)
+	{
+		if( scriptData->lineNumbers[i*2] < programPosition )
+		{
+			// Have we found the largest number < programPosition?
+			if( max == i ) return scriptData->lineNumbers[i*2+1];
+			if( scriptData->lineNumbers[i*2+2] > programPosition ) return scriptData->lineNumbers[i*2+1];
+
+			min = i + 1;
+			i = (max + min)/2;
+		}
+		else if( scriptData->lineNumbers[i*2] > programPosition )
+		{
+			// Have we found the smallest number > programPosition?
+			if( min == i ) return scriptData->lineNumbers[i*2+1];
+
+			max = i - 1;
+			i = (max + min)/2;
+		}
+		else
+		{
+			// We found the exact position
+			return scriptData->lineNumbers[i*2+1];
+		}
+	}
+}
+
+// interface
+asEFuncType asCScriptFunction::GetFuncType() const
+{
+	return funcType;
+}
+
+// interface
+asUINT asCScriptFunction::GetVarCount() const
+{
+	if( scriptData )
+		return asUINT(scriptData->variables.GetLength());
+	return 0;
+}
+
+// interface
+int asCScriptFunction::GetVar(asUINT index, const char **out_name, int *out_typeId) const
+{
+	if( scriptData == 0 )
+		return asNOT_SUPPORTED;
+	if( index >= scriptData->variables.GetLength() )
+		return asINVALID_ARG;
+
+	if( out_name )
+		*out_name = scriptData->variables[index]->name.AddressOf();
+	if( out_typeId )
+		*out_typeId = engine->GetTypeIdFromDataType(scriptData->variables[index]->type);
+
+	return asSUCCESS;
+}
+
+// interface
+const char *asCScriptFunction::GetVarDecl(asUINT index, bool includeNamespace) const
+{
+	if( scriptData == 0 || index >= scriptData->variables.GetLength() )
+		return 0;
+
+	asCString *tempString = &asCThreadManager::GetLocalData()->string;
+	*tempString = scriptData->variables[index]->type.Format(nameSpace, includeNamespace);
+	*tempString += " " + scriptData->variables[index]->name;
+
+	return tempString->AddressOf();
+}
+
+// internal
+void asCScriptFunction::AddVariable(const asCString &in_name, asCDataType &in_type, int in_stackOffset, bool in_onHeap)
+{
+	asASSERT( scriptData );
+	asSScriptVariable *var = asNEW(asSScriptVariable);
+	if( var == 0 )
+	{
+		// Out of memory
+		return;
+	}
+	var->name                 = in_name;
+	var->type                 = in_type;
+	var->stackOffset          = in_stackOffset;
+	var->onHeap               = in_onHeap;
+	var->declaredAtProgramPos = 0;
+	scriptData->variables.PushLast(var);
+}
+
+// internal
+asCTypeInfo *asCScriptFunction::GetTypeInfoOfLocalVar(short varOffset)
+{
+	asASSERT( scriptData );
+
+	for( asUINT n = 0; n < scriptData->variables.GetLength(); n++ )
+	{
+		if (scriptData->variables[n]->stackOffset == varOffset)
+			return scriptData->variables[n]->type.GetTypeInfo();
+	}
+
+	return 0;
+}
+
+// internal
+void asCScriptFunction::ComputeSignatureId()
+{
+	// This function will compute the signatureId based on the
+	// function name, return type, and parameter types. The object
+	// type for methods is not used, so that class methods and
+	// interface methods match each other.
+	for( asUINT n = 0; n < engine->signatureIds.GetLength(); n++ )
+	{
+		if( !IsSignatureEqual(engine->signatureIds[n]) ) continue;
+
+		// We don't need to increment the reference counter here, because
+		// asCScriptEngine::FreeScriptFunctionId will maintain the signature
+		// id as the function is freed.
+		signatureId = engine->signatureIds[n]->signatureId;
+		return;
+	}
+
+	signatureId = id;
+	engine->signatureIds.PushLast(this);
+}
+
+// internal
+bool asCScriptFunction::IsSignatureEqual(const asCScriptFunction *func) const
+{
+	if( name != func->name || !IsSignatureExceptNameEqual(func) ) return false;
+
+	return true;
+}
+
+// internal
+bool asCScriptFunction::IsSignatureExceptNameEqual(const asCScriptFunction *func) const
+{
+	return IsSignatureExceptNameEqual(func->returnType, func->parameterTypes, func->inOutFlags, func->objectType, func->IsReadOnly());
+}
+
+// internal
+bool asCScriptFunction::IsSignatureExceptNameEqual(const asCDataType &retType, const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &paramInOut, const asCObjectType *objType, bool readOnly) const
+{
+	if( this->returnType != retType ) return false;
+
+	return IsSignatureExceptNameAndReturnTypeEqual(paramTypes, paramInOut, objType, readOnly);
+}
+
+// internal
+bool asCScriptFunction::IsSignatureExceptNameAndObjectTypeEqual(const asCScriptFunction *func) const
+{
+	return IsSignatureExceptNameEqual(func->returnType, func->parameterTypes, func->inOutFlags, objectType, IsReadOnly());
+}
+
+// internal
+bool asCScriptFunction::IsSignatureExceptNameAndReturnTypeEqual(const asCScriptFunction *func) const
+{
+	return IsSignatureExceptNameAndReturnTypeEqual(func->parameterTypes, func->inOutFlags, func->objectType, func->IsReadOnly());
+}
+
+// internal
+bool asCScriptFunction::IsSignatureExceptNameAndReturnTypeEqual(const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &paramInOut, const asCObjectType *objType, bool readOnly) const
+{
+	if( this->IsReadOnly()      != readOnly       ) return false;
+	if( (this->objectType != 0) != (objType != 0) ) return false;
+	if( this->inOutFlags        != paramInOut     ) return false;
+	if( this->parameterTypes    != paramTypes     ) return false;
+
+	return true;
+}
+
+// internal
+void asCScriptFunction::AddReferences()
+{
+	// This array will be used to make sure we only add the reference to the same resource once
+	// This is especially important for global variables, as it expects the initialization function
+	// to hold only one reference to the variable. However, if the variable is initialized through
+	// the default constructor followed by the assignment operator we will have two references to
+	// the variable in the function.
+	asCArray<void*> ptrs;
+
+	// Only count references if there is any bytecode
+	if( scriptData && scriptData->byteCode.GetLength() )
+	{
+		if( returnType.GetTypeInfo() )
+		{
+			returnType.GetTypeInfo()->AddRefInternal();
+
+			asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(returnType.GetTypeInfo());
+			if( group != 0 ) group->AddRef();
+		}
+
+		for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
+			if( parameterTypes[p].GetTypeInfo() )
+			{
+				parameterTypes[p].GetTypeInfo()->AddRefInternal();
+
+				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(parameterTypes[p].GetTypeInfo());
+				if( group != 0 ) group->AddRef();
+			}
+
+		for (asUINT v = 0; v < scriptData->variables.GetLength(); v++)
+		{
+			asCTypeInfo* ti = reinterpret_cast<asCTypeInfo*>(scriptData->variables[v]->type.GetTypeInfo());
+			if (ti) // The null handle is also stored, but it doesn't have an object type
+			{
+				ti->AddRefInternal();
+
+				asCConfigGroup* group = engine->FindConfigGroupForTypeInfo(ti);
+				if (group != 0) group->AddRef();
+			}
+		}
+
+		// Go through the byte code and add references to all resources used by the function
+		asCArray<asDWORD> &bc = scriptData->byteCode;
+		for( asUINT n = 0; n < bc.GetLength(); n += asBCTypeSize[asBCInfo[*(asBYTE*)&bc[n]].type] )
+		{
+			switch( *(asBYTE*)&bc[n] )
+			{
+			// Object types
+			case asBC_OBJTYPE:
+			case asBC_FREE:
+			case asBC_REFCPY:
+			case asBC_RefCpyV:
+				{
+					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
+					asASSERT( objType );
+					if( objType )
+						objType->AddRefInternal();
+				}
+				break;
+
+			// Object type and function
+			case asBC_ALLOC:
+				{
+					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
+					asASSERT( objType );
+					if( objType )
+						objType->AddRefInternal();
+
+					int funcId = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
+					if( funcId )
+						engine->scriptFunctions[funcId]->AddRefInternal();
+				}
+				break;
+
+			// Global variables
+			case asBC_PGA:
+			case asBC_PshGPtr:
+			case asBC_LDG:
+			case asBC_PshG4:
+			case asBC_LdGRdR4:
+			case asBC_CpyGtoV4:
+			case asBC_CpyVtoG4:
+			case asBC_SetG4:
+				// Need to increase the reference for each global variable
+				{
+					void *gvarPtr = (void*)asBC_PTRARG(&bc[n]);
+					if( !gvarPtr ) break;
+					asCGlobalProperty *prop = GetPropertyByGlobalVarPtr(gvarPtr);
+
+					if (!prop)
+					{
+						// The pointer is a string constant. In order to make sure the correct resource
+						// management is maintained we request a new string constant here, so the compiler
+						// or bytecode loader can release its copy afterwards.
+						asCString str;
+						asUINT length;
+						int r = engine->stringFactory->GetRawStringData(gvarPtr, 0, &length);
+						if (r >= 0)
+						{
+							str.SetLength(length);
+							engine->stringFactory->GetRawStringData(gvarPtr, str.AddressOf(), &length);
+
+							// Get a new pointer (depending on the string factory implementation it may actually be the same)
+							gvarPtr = const_cast<void*>(engine->stringFactory->GetStringConstant(str.AddressOf(), length));
+							asBC_PTRARG(&bc[n]) = (asPWORD)gvarPtr;
+						}
+						
+						// If we get an error from the string factory there is not
+						// anything we can do about it, except report a message.
+						// TODO: NEWSTRING: Write a message and then exit gracefully
+						asASSERT(r >= 0);
+						break;
+					}
+
+					// Only addref the properties once
+					if( !ptrs.Exists(gvarPtr) )
+					{
+						prop->AddRef();
+						ptrs.PushLast(gvarPtr);
+					}
+
+					asCConfigGroup *group = engine->FindConfigGroupForGlobalVar(prop->id);
+					if( group != 0 ) group->AddRef();
+				}
+				break;
+
+			// System functions
+			case asBC_CALLSYS:
+				{
+					int funcId = asBC_INTARG(&bc[n]);
+					asCConfigGroup *group = engine->FindConfigGroupForFunction(funcId);
+					if( group != 0 ) group->AddRef();
+
+					asASSERT( funcId > 0 );
+					if( funcId > 0 )
+						engine->scriptFunctions[funcId]->AddRefInternal();
+				}
+				break;
+
+			// Functions
+			case asBC_CALL:
+			case asBC_CALLINTF:
+				{
+					int funcId = asBC_INTARG(&bc[n]);
+					asASSERT( funcId > 0 );
+					if( funcId > 0 )
+						engine->scriptFunctions[funcId]->AddRefInternal();
+				}
+				break;
+
+			// Function pointers
+			case asBC_FuncPtr:
+				{
+					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
+					asASSERT( func );
+					if( func )
+						func->AddRefInternal();
+				}
+				break;
+			}
+		}
+	}
+}
+
+// internal
+void asCScriptFunction::ReleaseReferences()
+{
+	asCArray<void*> ptrs;
+
+	// Only count references if there is any bytecode
+	if( scriptData && scriptData->byteCode.GetLength() )
+	{
+		if( returnType.GetTypeInfo() )
+		{
+			returnType.GetTypeInfo()->ReleaseInternal();
+
+			asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(returnType.GetTypeInfo());
+			if( group != 0 ) group->Release();
+		}
+
+		for( asUINT p = 0; p < parameterTypes.GetLength(); p++ )
+			if( parameterTypes[p].GetTypeInfo() )
+			{
+				parameterTypes[p].GetTypeInfo()->ReleaseInternal();
+
+				asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(parameterTypes[p].GetTypeInfo());
+				if( group != 0 ) group->Release();
+			}
+
+		for (asUINT v = 0; v < scriptData->variables.GetLength(); v++)
+		{
+			asCTypeInfo* ti = reinterpret_cast<asCTypeInfo*>(scriptData->variables[v]->type.GetTypeInfo());
+			if (ti) // The null handle is also stored, but it doesn't have an object type
+			{
+				ti->ReleaseInternal();
+
+				asCConfigGroup* group = engine->FindConfigGroupForTypeInfo(ti);
+				if (group != 0) group->Release();
+			}
+		}
+
+		// Go through the byte code and release references to all resources used by the function
+		asCArray<asDWORD> &bc = scriptData->byteCode;
+		for( asUINT n = 0; n < bc.GetLength(); n += asBCTypeSize[asBCInfo[*(asBYTE*)&bc[n]].type] )
+		{
+			switch( *(asBYTE*)&bc[n] )
+			{
+			// Object types
+			case asBC_OBJTYPE:
+			case asBC_FREE:
+			case asBC_REFCPY:
+			case asBC_RefCpyV:
+				{
+					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
+					if( objType )
+						objType->ReleaseInternal();
+				}
+				break;
+
+			// Object type and function
+			case asBC_ALLOC:
+				{
+					asCObjectType *objType = (asCObjectType*)asBC_PTRARG(&bc[n]);
+					if( objType )
+						objType->ReleaseInternal();
+
+					int funcId = asBC_INTARG(&bc[n]+AS_PTR_SIZE);
+					if( funcId > 0 )
+					{
+						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
+						if( fptr )
+							fptr->ReleaseInternal();
+
+						// The engine may have been forced to destroy the function internals early
+						// and this may will make it impossible to find the function by id anymore.
+						// This should only happen if the engine is released while the application
+						// is still keeping functions alive.
+						// TODO: Fix this possible memory leak
+					}
+				}
+				break;
+
+			// Global variables
+			case asBC_PGA:
+			case asBC_PshGPtr:
+			case asBC_LDG:
+			case asBC_PshG4:
+			case asBC_LdGRdR4:
+			case asBC_CpyGtoV4:
+			case asBC_CpyVtoG4:
+			case asBC_SetG4:
+				// Need to increase the reference for each global variable
+				{
+					void *gvarPtr = (void*)asBC_PTRARG(&bc[n]);
+					if( !gvarPtr ) break;
+					asCGlobalProperty *prop = GetPropertyByGlobalVarPtr(gvarPtr);
+
+					if (!prop)
+					{
+						// The pointer is a string constant, so it needs to be released by the string factory
+						int r = engine->stringFactory->ReleaseStringConstant(gvarPtr);
+						UNUSED_VAR(r);
+
+						// If we get an error from the string factory there is not
+						// anything we can do about it, except report a message.
+						// TODO: Write a message showing that the string couldn't be 
+						//       released. Include the first 10 characters and the length
+						//       to make it easier to identify which string it was
+						asASSERT(r >= 0);
+						break;
+					}
+
+					// Only release the properties once
+					if( !ptrs.Exists(gvarPtr) )
+					{
+						prop->Release();
+						ptrs.PushLast(gvarPtr);
+					}
+
+					asCConfigGroup *group = engine->FindConfigGroupForGlobalVar(prop->id);
+					if( group != 0 ) group->Release();
+				}
+				break;
+
+			// System functions
+			case asBC_CALLSYS:
+				{
+					int funcId = asBC_INTARG(&bc[n]);
+					asCConfigGroup *group = engine->FindConfigGroupForFunction(funcId);
+					if( group != 0 ) group->Release();
+
+					if( funcId )
+					{
+						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
+						if( fptr )
+							fptr->ReleaseInternal();
+					}
+				}
+				break;
+
+			// Functions
+			case asBC_CALL:
+			case asBC_CALLINTF:
+				{
+					int funcId = asBC_INTARG(&bc[n]);
+					if( funcId )
+					{
+						asCScriptFunction *fptr = engine->scriptFunctions[funcId];
+						if( fptr )
+							fptr->ReleaseInternal();
+
+						// The engine may have been forced to destroy the function internals early
+						// and this may will make it impossible to find the function by id anymore.
+						// This should only happen if the engine is released while the application
+						// is still keeping functions alive.
+						// TODO: Fix this possible memory leak
+					}
+				}
+				break;
+
+			// Function pointers
+			case asBC_FuncPtr:
+				{
+					asCScriptFunction *func = (asCScriptFunction*)asBC_PTRARG(&bc[n]);
+					if( func )
+						func->ReleaseInternal();
+				}
+				break;
+			}
+		}
+
+		// Release the jit compiled function
+		if( scriptData->jitFunction )
+			engine->jitCompiler->ReleaseJITFunction(scriptData->jitFunction);
+		scriptData->jitFunction = 0;
+	}
+
+	// Delegate
+	if( objForDelegate )
+		engine->ReleaseScriptObject(objForDelegate, funcForDelegate->GetObjectType());
+	objForDelegate = 0;
+	if( funcForDelegate )
+		funcForDelegate->Release();
+	funcForDelegate = 0;
+}
+
+// interface
+int asCScriptFunction::GetReturnTypeId(asDWORD *flags) const
+{
+	if( flags )
+	{
+		if( returnType.IsReference() )
+		{
+			*flags = asTM_INOUTREF;
+			*flags |= returnType.IsReadOnly() ? asTM_CONST : 0;
+		}
+		else
+			*flags = asTM_NONE;
+	}
+
+	return engine->GetTypeIdFromDataType(returnType);
+}
+
+// interface
+asUINT asCScriptFunction::GetParamCount() const
+{
+	return (asUINT)parameterTypes.GetLength();
+}
+
+// interface
+int asCScriptFunction::GetParam(asUINT index, int *out_typeId, asDWORD *out_flags, const char **out_name, const char **out_defaultArg) const
+{
+	if( index >= parameterTypes.GetLength() )
+		return asINVALID_ARG;
+
+	if( out_typeId )
+		*out_typeId = engine->GetTypeIdFromDataType(parameterTypes[index]);
+
+	if( out_flags )
+	{
+		*out_flags = inOutFlags[index];
+		*out_flags |= parameterTypes[index].IsReadOnly() ? asTM_CONST : 0;
+	}
+
+	if( out_name )
+	{
+		// The parameter names are not stored if loading from bytecode without debug information
+		if( index < parameterNames.GetLength() )
+			*out_name = parameterNames[index].AddressOf();
+		else
+			*out_name = 0;
+	}
+
+	if( out_defaultArg )
+	{
+		if( index < defaultArgs.GetLength() && defaultArgs[index] )
+			*out_defaultArg = defaultArgs[index]->AddressOf();
+		else
+			*out_defaultArg = 0;
+	}
+
+	return asSUCCESS;
+}
+
+// interface
+asIScriptEngine *asCScriptFunction::GetEngine() const
+{
+	return engine;
+}
+
+// interface
+const char *asCScriptFunction::GetDeclaration(bool includeObjectName, bool includeNamespace, bool includeParamNames) const
+{
+	asCString *tempString = &asCThreadManager::GetLocalData()->string;
+	*tempString = GetDeclarationStr(includeObjectName, includeNamespace, includeParamNames);
+	return tempString->AddressOf();
+}
+
+// interface
+const char *asCScriptFunction::GetScriptSectionName() const
+{
+	if( scriptData && scriptData->scriptSectionIdx >= 0 )
+		return engine->scriptSectionNames[scriptData->scriptSectionIdx]->AddressOf();
+
+	return 0;
+}
+
+// interface
+const char *asCScriptFunction::GetConfigGroup() const
+{
+	asCConfigGroup *group = 0;
+	if( funcType != asFUNC_FUNCDEF )
+		group = engine->FindConfigGroupForFunction(id);
+	else
+		group = engine->FindConfigGroupForFuncDef(this->funcdefType);
+
+	if( group == 0 )
+		return 0;
+
+	return group->groupName.AddressOf();
+}
+
+// interface
+asDWORD asCScriptFunction::GetAccessMask() const
+{
+	return accessMask;
+}
+
+// internal
+void asCScriptFunction::JITCompile()
+{
+	if( funcType != asFUNC_SCRIPT )
+		return;
+
+	asASSERT( scriptData );
+
+	asIJITCompiler *jit = engine->GetJITCompiler();
+	if( !jit )
+		return;
+
+	// Make sure the function has been compiled with JitEntry instructions
+	// For functions that has JitEntry this will be a quick test
+	asUINT length;
+	asDWORD *byteCode = GetByteCode(&length);
+	asDWORD *end = byteCode + length;
+	bool foundJitEntry = false;
+	while( byteCode < end )
+	{
+		// Determine the instruction
+		asEBCInstr op = asEBCInstr(*(asBYTE*)byteCode);
+		if( op == asBC_JitEntry )
+		{
+			foundJitEntry = true;
+			break;
+		}
+
+		// Move to next instruction
+		byteCode += asBCTypeSize[asBCInfo[op].type];
+	}
+
+	if( !foundJitEntry )
+	{
+		asCString msg;
+		msg.Format(TXT_NO_JIT_IN_FUNC_s, GetDeclaration());
+		engine->WriteMessage("", 0, 0, asMSGTYPE_WARNING, msg.AddressOf());
+	}
+
+	// Release the previous function, if any
+	if( scriptData->jitFunction )
+	{
+		engine->jitCompiler->ReleaseJITFunction(scriptData->jitFunction);
+		scriptData->jitFunction = 0;
+	}
+
+	// Compile for native system
+	int r = jit->CompileFunction(this, &scriptData->jitFunction);
+	if( r < 0 )
+		asASSERT( scriptData->jitFunction == 0 );
+}
+
+// interface
+asDWORD *asCScriptFunction::GetByteCode(asUINT *length)
+{
+	if( scriptData == 0 ) return 0;
+
+	if( length )
+		*length = (asUINT)scriptData->byteCode.GetLength();
+
+	if( scriptData->byteCode.GetLength() )
+		return scriptData->byteCode.AddressOf();
+
+	return 0;
+}
+
+// interface
+void *asCScriptFunction::SetUserData(void *data, asPWORD type)
+{
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(engine->engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(userData[n+1]);
+			userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(engine->engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	userData.PushLast(type);
+	userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(engine->engineRWLock);
+
+	return 0;
+}
+
+// interface
+void *asCScriptFunction::GetUserData(asPWORD type) const
+{
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(engine->engineRWLock);
+
+	for( asUINT n = 0; n < userData.GetLength(); n += 2 )
+	{
+		if( userData[n] == type )
+		{
+			RELEASESHARED(engine->engineRWLock);
+			return reinterpret_cast<void*>(userData[n+1]);
+		}
+	}
+
+	RELEASESHARED(engine->engineRWLock);
+
+	return 0;
+}
+
+// internal
+// TODO: cleanup: This method should probably be a member of the engine
+asCGlobalProperty *asCScriptFunction::GetPropertyByGlobalVarPtr(void *gvarPtr)
+{
+	asSMapNode<void*, asCGlobalProperty*> *node;
+	if( engine->varAddressMap.MoveTo(&node, gvarPtr) )
+	{
+		asASSERT(gvarPtr == node->value->GetAddressOfValue());
+		return node->value;
+	}
+	return 0;
+}
+
+// internal
+int asCScriptFunction::GetRefCount()
+{
+	asASSERT( funcType == asFUNC_DELEGATE );
+
+	return externalRefCount.get();
+}
+
+// internal
+void asCScriptFunction::SetFlag()
+{
+	gcFlag = true;
+}
+
+// internal
+bool asCScriptFunction::GetFlag()
+{
+	return gcFlag;
+}
+
+// internal
+void asCScriptFunction::EnumReferences(asIScriptEngine *)
+{
+	asASSERT( funcType == asFUNC_DELEGATE );
+
+	// Delegate
+	if( objForDelegate )
+		engine->GCEnumCallback(objForDelegate);
+}
+
+// internal
+void asCScriptFunction::ReleaseAllHandles(asIScriptEngine *)
+{
+	asASSERT( funcType == asFUNC_DELEGATE );
+
+	// Release paramaters
+
+	// Delegate
+	if( objForDelegate )
+		engine->ReleaseScriptObject(objForDelegate, funcForDelegate->GetObjectType());
+	objForDelegate = 0;
+}
+
+// interface
+bool asCScriptFunction::IsShared() const
+{
+	// All system functions are shared
+	if( funcType == asFUNC_SYSTEM ) return true;
+
+	// All class methods for shared classes are also shared
+	asASSERT( objectType == 0 || objectType->engine == engine || objectType->engine == 0 );
+	if( objectType && (objectType->flags & asOBJ_SHARED) ) return true;
+
+	// funcdefs that are registered by the application are shared
+	if (funcType == asFUNC_FUNCDEF && module == 0) return true;
+
+	// Functions that have been specifically marked as shared are shared
+	return traits.GetTrait(asTRAIT_SHARED);
+}
+
+// interface
+bool asCScriptFunction::IsFinal() const
+{
+	return traits.GetTrait(asTRAIT_FINAL);
+}
+
+// interface
+bool asCScriptFunction::IsOverride() const
+{
+	return traits.GetTrait(asTRAIT_OVERRIDE);
+}
+
+// interface
+bool asCScriptFunction::IsExplicit() const
+{
+	return traits.GetTrait(asTRAIT_EXPLICIT);
+}
+
+// interface
+bool asCScriptFunction::IsProperty() const
+{
+	return traits.GetTrait(asTRAIT_PROPERTY);
+}
+
+// internal
+bool asCScriptFunction::IsFactory() const
+{
+	if (objectType) return false;
+	
+	asCObjectType* type = CastToObjectType(returnType.GetTypeInfo());
+	if (type == 0) return false;
+
+	if (type->name != name) return false;
+
+	if (type->nameSpace != nameSpace) return false;
+	
+	return true;
+}
+
+// internal
+asCScriptFunction* asCScriptFunction::FindNextFunctionCalled(asUINT startSearchFromProgramPos, int *outStackDelta, asUINT *outProgramPos)
+{
+	if (scriptData == 0)
+		return 0;
+
+	if (outProgramPos)
+		*outProgramPos = startSearchFromProgramPos;
+
+	// Find out which function that will be called
+	asCScriptFunction* calledFunc = 0;
+	int stackDelta = 0;
+	for (asUINT n = startSearchFromProgramPos; scriptData->byteCode.GetLength(); )
+	{
+		asBYTE bc = *(asBYTE*)&scriptData->byteCode[n];
+		if (bc == asBC_CALL ||
+			bc == asBC_CALLSYS ||
+			bc == asBC_Thiscall1 ||
+			bc == asBC_CALLINTF ||
+			bc == asBC_ALLOC ||
+			bc == asBC_CALLBND ||
+			bc == asBC_CallPtr)
+		{
+			calledFunc = GetCalledFunction(n);
+
+			if (outProgramPos)
+				*outProgramPos = n + asBCTypeSize[asBCInfo[bc].type];
+
+			break;
+		}
+
+		// Keep track of the stack size between the
+		// instruction that needs to be adjusted and the call
+		stackDelta += asBCInfo[bc].stackInc;
+
+		n += asBCTypeSize[asBCInfo[bc].type];
+	}
+
+	if (outStackDelta)
+		*outStackDelta = stackDelta;
+
+	return calledFunc;
+}
+
+// internal
+asCScriptFunction* asCScriptFunction::GetCalledFunction(asDWORD programPos)
+{
+	if (scriptData == 0)
+		return 0;
+
+	asBYTE bc = *(asBYTE*)&scriptData->byteCode[programPos];
+
+	if (bc == asBC_CALL ||
+		bc == asBC_CALLSYS ||
+		bc == asBC_Thiscall1 ||
+		bc == asBC_CALLINTF)
+	{
+		// Find the function from the function id in bytecode
+		int funcId = asBC_INTARG(&scriptData->byteCode[programPos]);
+		return engine->scriptFunctions[funcId];
+	}
+	else if (bc == asBC_ALLOC)
+	{
+		// Find the function from the function id in the bytecode
+		int funcId = asBC_INTARG(&scriptData->byteCode[programPos + AS_PTR_SIZE]);
+		return engine->scriptFunctions[funcId];
+	}
+	else if (bc == asBC_CALLBND)
+	{
+		// Find the function from the engine's bind array
+		int funcId = asBC_INTARG(&scriptData->byteCode[programPos]);
+		return engine->importedFunctions[funcId & ~FUNC_IMPORTED]->importedFunctionSignature;
+	}
+	else if (bc == asBC_CallPtr)
+	{
+		asUINT v;
+		int var = asBC_SWORDARG0(&scriptData->byteCode[programPos]);
+
+		// Find the funcdef from the local variable
+		for (v = 0; v < scriptData->variables.GetLength(); v++)
+			if (scriptData->variables[v]->stackOffset == var)
+				return CastToFuncdefType(scriptData->variables[v]->type.GetTypeInfo())->funcdef;
+
+		// Look in parameters
+		int paramPos = 0;
+		if (objectType)
+			paramPos -= AS_PTR_SIZE;
+		if (DoesReturnOnStack())
+			paramPos -= AS_PTR_SIZE;
+		for (v = 0; v < parameterTypes.GetLength(); v++)
+		{
+			if (var == paramPos)
+			{
+				if (parameterTypes[v].IsFuncdef())
+					return CastToFuncdefType(parameterTypes[v].GetTypeInfo())->funcdef;
+				else
+					return 0;
+			}
+			paramPos -= parameterTypes[v].GetSizeOnStackDWords();
+		}
+	}
+
+	return 0;
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_scriptfunction.h b/Sources/AngelScript/source/as_scriptfunction.h
old mode 100755
new mode 100644
index f17be0378..d8631baf6
--- a/Sources/AngelScript/source/as_scriptfunction.h
+++ b/Sources/AngelScript/source/as_scriptfunction.h
@@ -1,343 +1,377 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptfunction.h
-//
-// A container for a compiled script function
-//
-
-
-
-#ifndef AS_SCRIPTFUNCTION_H
-#define AS_SCRIPTFUNCTION_H
-
-#include "as_config.h"
-#include "as_string.h"
-#include "as_array.h"
-#include "as_datatype.h"
-#include "as_atomic.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCScriptEngine;
-class asCModule;
-class asCConfigGroup;
-class asCGlobalProperty;
-class asCScriptNode;
-class asCFuncdefType;
-struct asSNameSpace;
-
-struct asSScriptVariable
-{
-	asCString   name;
-	asCDataType type;
-	int         stackOffset;
-	asUINT      declaredAtProgramPos;
-};
-
-enum asEListPatternNodeType
-{
-	asLPT_REPEAT,
-	asLPT_REPEAT_SAME,
-	asLPT_START,
-	asLPT_END,
-	asLPT_TYPE
-};
-
-struct asSListPatternNode
-{
-	asSListPatternNode(asEListPatternNodeType t) : type(t), next(0) {}
-	virtual ~asSListPatternNode() {};
-	virtual asSListPatternNode *Duplicate() { return asNEW(asSListPatternNode)(type); }
-	asEListPatternNodeType  type;
-	asSListPatternNode     *next;
-};
-
-struct asSListPatternDataTypeNode : public asSListPatternNode
-{
-	asSListPatternDataTypeNode(const asCDataType &dt) : asSListPatternNode(asLPT_TYPE), dataType(dt) {}
-	asSListPatternNode *Duplicate() { return asNEW(asSListPatternDataTypeNode)(dataType); }
-	asCDataType dataType;
-};
-
-enum asEObjVarInfoOption
-{
-	asOBJ_UNINIT,
-	asOBJ_INIT,
-	asBLOCK_BEGIN,
-	asBLOCK_END
-};
-
-struct asSObjectVariableInfo
-{
-	asUINT              programPos;
-	int                 variableOffset;
-	asEObjVarInfoOption option;
-};
-
-struct asSSystemFunctionInterface;
-
-// TODO: Might be interesting to allow enumeration of accessed global variables, and 
-//       also functions/methods that are being called. This could be used to build a 
-//       code database with call graphs, etc.
-
-void RegisterScriptFunction(asCScriptEngine *engine);
-
-class asCScriptFunction : public asIScriptFunction
-{
-public:
-	// From asIScriptFunction
-	asIScriptEngine     *GetEngine() const;
-
-	// Memory management
-	int AddRef() const;
-	int Release() const;
-
-	// Miscellaneous
-	int                  GetId() const;
-	asEFuncType          GetFuncType() const;
-	const char          *GetModuleName() const;
-	asIScriptModule     *GetModule() const;
-	const char          *GetScriptSectionName() const;
-	const char          *GetConfigGroup() const;
-	asDWORD              GetAccessMask() const;
-	void                *GetAuxiliary() const;
-
-	// Function signature
-	asITypeInfo         *GetObjectType() const;
-	const char          *GetObjectName() const;
-	const char          *GetName() const;
-	const char          *GetNamespace() const;
-	const char          *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const;
-	bool                 IsReadOnly() const;
-	bool                 IsPrivate() const;
-	bool                 IsProtected() const;
-	bool                 IsFinal() const;
-	bool                 IsOverride() const;
-	bool                 IsShared() const;
-	asUINT               GetParamCount() const;
-	int                  GetParam(asUINT index, int *typeId, asDWORD *flags = 0, const char **name = 0, const char **defaultArg = 0) const;
-#ifdef AS_DEPRECATED
-	// Deprecated, since 2.29.0, 2014-04-06
-	int                  GetParamTypeId(asUINT index, asDWORD *flags = 0) const;
-#endif
-	int                  GetReturnTypeId(asDWORD *flags = 0) const;
-
-	// Type id for function pointers 
-	int                  GetTypeId() const;
-	bool                 IsCompatibleWithTypeId(int typeId) const;
-
-	// Delegates
-	void                *GetDelegateObject() const;
-	asITypeInfo         *GetDelegateObjectType() const;
-	asIScriptFunction   *GetDelegateFunction() const;
-
-	// Debug information
-	asUINT               GetVarCount() const;
-	int                  GetVar(asUINT index, const char **name, int *typeId = 0) const;
-	const char *         GetVarDecl(asUINT index, bool includeNamespace = false) const;
-	int                  FindNextLineWithCode(int line) const;
-
-	// For JIT compilation
-	asDWORD             *GetByteCode(asUINT *length = 0);
-
-	// User data
-	void                *SetUserData(void *userData, asPWORD type);
-	void                *GetUserData(asPWORD type) const;
-
-public:
-	//-----------------------------------
-	// Internal methods
-
-	asCScriptFunction(asCScriptEngine *engine, asCModule *mod, asEFuncType funcType);
-	~asCScriptFunction();
-
-	// Keep an internal reference counter to separate references coming from 
-	// application or script objects and references coming from the script code
-	int AddRefInternal();
-	int ReleaseInternal();
-
-	void     DestroyHalfCreated();
-
-	// TODO: operator==
-	// TODO: The asIScriptFunction should provide operator== and operator!= that should do a
-	//       a value comparison. Two delegate objects that point to the same object and class method should compare as equal
-	// TODO: The operator== should also be provided in script as opEquals to allow the same comparison in script
-	//       To do this we'll need some way to adapt the argtype for opEquals for each funcdef, preferrably without instantiating lots of different methods
-	//       Perhaps reusing 'auto' to mean the same type as the object
-	//bool      operator==(const asCScriptFunction &other) const;
-
-	void      DestroyInternal();
-
-	void      AddVariable(asCString &name, asCDataType &type, int stackOffset);
-
-	int       GetSpaceNeededForArguments();
-	int       GetSpaceNeededForReturnValue();
-	asCString GetDeclarationStr(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const;
-	int       GetLineNumber(int programPosition, int *sectionIdx);
-	void      ComputeSignatureId();
-	bool      IsSignatureEqual(const asCScriptFunction *func) const;
-	bool      IsSignatureExceptNameEqual(const asCScriptFunction *func) const;
-	bool      IsSignatureExceptNameEqual(const asCDataType &retType, const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &inOutFlags, const asCObjectType *type, bool isReadOnly) const;
-	bool      IsSignatureExceptNameAndReturnTypeEqual(const asCScriptFunction *fun) const;
-	bool      IsSignatureExceptNameAndReturnTypeEqual(const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &inOutFlags, const asCObjectType *type, bool isReadOnly) const;
-	bool      IsSignatureExceptNameAndObjectTypeEqual(const asCScriptFunction *func) const;
-
-	asCTypeInfo *GetTypeInfoOfLocalVar(short varOffset);
-
-	void      MakeDelegate(asCScriptFunction *func, void *obj);
-
-	int       RegisterListPattern(const char *decl, asCScriptNode *listPattern);
-	int       ParseListPattern(asSListPatternNode *&target, const char *decl, asCScriptNode *listPattern);
-
-	bool      DoesReturnOnStack() const;
-
-	void      JITCompile();
-
-	void      AddReferences();
-	void      ReleaseReferences();
-
-	void      AllocateScriptFunctionData();
-	void      DeallocateScriptFunctionData();
-
-	asCGlobalProperty *GetPropertyByGlobalVarPtr(void *gvarPtr);
-
-	// GC methods (for delegates)
-	int  GetRefCount();
-	void SetFlag();
-	bool GetFlag();
-	void EnumReferences(asIScriptEngine *engine);
-	void ReleaseAllHandles(asIScriptEngine *engine);
-
-public:
-	//-----------------------------------
-	// Properties
-
-	mutable asCAtomic            externalRefCount; // Used for external referneces
-	        asCAtomic            internalRefCount; // Used for internal references
-	mutable bool                 gcFlag;
-	asCScriptEngine             *engine;
-	asCModule                   *module;
-
-	asCArray<asPWORD>            userData;
-
-	// Function signature
-	asCString                    name;
-	asCDataType                  returnType;
-	asCArray<asCDataType>        parameterTypes;
-	asCArray<asCString>          parameterNames;
-	asCArray<asETypeModifiers>   inOutFlags;
-	asCArray<asCString *>        defaultArgs;
-	bool                         isReadOnly;
-	bool                         isPrivate;
-	bool                         isProtected;
-	bool                         isFinal;
-	bool                         isOverride;
-	asCObjectType               *objectType;
-	int                          signatureId;
-
-	int                          id;
-
-	asEFuncType                  funcType;
-	asDWORD                      accessMask;
-	bool                         isShared;
-
-	// Namespace will be null for funcdefs that are declared as child funcdefs 
-	// of a class. In this case the namespace shall be taken from the parentClass 
-	// in the funcdefType
-	asSNameSpace                *nameSpace;
-
-	asCFuncdefType              *funcdefType; // Doesn't increase refCount
-
-	// Used by asFUNC_DELEGATE
-	void              *objForDelegate;
-	asCScriptFunction *funcForDelegate;
-
-	// Used by list factory behaviour
-	asSListPatternNode *listPattern;
-
-	// Used by asFUNC_SCRIPT
-	struct ScriptFunctionData
-	{
-		// Bytecode for the script function
-		asCArray<asDWORD>               byteCode;
-
-		// The stack space needed for the local variables
-		asDWORD                         variableSpace;
-
-		// These hold information on objects and function pointers, including temporary
-		// variables used by exception handler and when saving bytecode
-		asCArray<asCTypeInfo*>          objVariableTypes;
-		asCArray<int>                   objVariablePos;
-
-		// The first variables in above array are allocated on the heap, the rest on the stack.
-		// This variable shows how many are on the heap.
-		asUINT                          objVariablesOnHeap;
-
-		// Holds information on scope for object variables on the stack
-		asCArray<asSObjectVariableInfo> objVariableInfo;
-
-		// The stack needed to execute the function
-		int                             stackNeeded;
-
-		// JIT compiled code of this function
-		asJITFunction                   jitFunction;
-
-		// Holds debug information on explicitly declared variables
-		asCArray<asSScriptVariable*>    variables;
-		// Store position, line number pairs for debug information
-		asCArray<int>                   lineNumbers;
-		// Store the script section where the code was declared
-		int                             scriptSectionIdx;
-		// Store the location where the function was declared  (row in the lower 20 bits, and column in the upper 12)
-		int                             declaredAt;
-		// Store position/index pairs if the bytecode is compiled from multiple script sections
-		asCArray<int>                   sectionIdxs;
-	};
-	ScriptFunctionData          *scriptData;
-
-	// Stub functions and delegates don't own the object and parameters
-	bool                         dontCleanUpOnException;
-
-	// Used by asFUNC_VIRTUAL
-	int                          vfTableIdx;
-
-	// Used by asFUNC_SYSTEM
-	asSSystemFunctionInterface  *sysFuncIntf;
-};
-
-const char * const DELEGATE_FACTORY = "$dlgte";
-asCScriptFunction *CreateDelegate(asCScriptFunction *func, void *obj);
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2022 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptfunction.h
+//
+// A container for a compiled script function
+//
+
+
+
+#ifndef AS_SCRIPTFUNCTION_H
+#define AS_SCRIPTFUNCTION_H
+
+#include "as_config.h"
+#include "as_string.h"
+#include "as_array.h"
+#include "as_datatype.h"
+#include "as_atomic.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCScriptEngine;
+class asCModule;
+class asCConfigGroup;
+class asCGlobalProperty;
+class asCScriptNode;
+class asCFuncdefType;
+struct asSNameSpace;
+
+struct asSScriptVariable
+{
+	asCString   name;
+	asCDataType type;
+	int         stackOffset;
+	asUINT      onHeap : 1;
+	asUINT      declaredAtProgramPos : 31;
+};
+
+enum asEListPatternNodeType
+{
+	asLPT_REPEAT,
+	asLPT_REPEAT_SAME,
+	asLPT_START,
+	asLPT_END,
+	asLPT_TYPE
+};
+
+struct asSListPatternNode
+{
+	asSListPatternNode(asEListPatternNodeType t) : type(t), next(0) {}
+	virtual ~asSListPatternNode() {};
+	virtual asSListPatternNode *Duplicate() { return asNEW(asSListPatternNode)(type); }
+	asEListPatternNodeType  type;
+	asSListPatternNode     *next;
+};
+
+struct asSListPatternDataTypeNode : public asSListPatternNode
+{
+	asSListPatternDataTypeNode(const asCDataType &dt) : asSListPatternNode(asLPT_TYPE), dataType(dt) {}
+	asSListPatternNode *Duplicate() { return asNEW(asSListPatternDataTypeNode)(dataType); }
+	asCDataType dataType;
+};
+
+enum asEObjVarInfoOption
+{
+	asOBJ_UNINIT,	// object is uninitialized/destroyed
+	asOBJ_INIT,		// object is initialized
+	asBLOCK_BEGIN,	// scope block begins
+	asBLOCK_END,	// scope block ends
+	asOBJ_VARDECL	// object variable is declared (but not necessarily initialized)
+};
+
+enum asEFuncTrait
+{
+	asTRAIT_CONSTRUCTOR = 1,
+	asTRAIT_DESTRUCTOR  = 2,
+	asTRAIT_CONST       = 4,
+	asTRAIT_PRIVATE     = 8,
+	asTRAIT_PROTECTED   = 16,
+	asTRAIT_FINAL       = 32,
+	asTRAIT_OVERRIDE    = 64,
+	asTRAIT_SHARED      = 128,
+	asTRAIT_EXTERNAL    = 256,
+	asTRAIT_EXPLICIT    = 512,
+	asTRAIT_PROPERTY    = 1024
+};
+
+struct asSFunctionTraits
+{
+	asSFunctionTraits() : traits(0) {}
+	void SetTrait(asEFuncTrait trait, bool set) { if (set) traits |= trait; else traits &= ~trait; }
+	bool GetTrait(asEFuncTrait trait) const { return (traits & trait) ? true : false; }
+protected:
+	asDWORD traits;
+};
+
+struct asSObjectVariableInfo
+{
+	asUINT              programPos;
+	int                 variableOffset;
+	asEObjVarInfoOption option;
+};
+
+struct asSTryCatchInfo
+{
+	asUINT tryPos;
+	asUINT catchPos;
+};
+
+struct asSSystemFunctionInterface;
+
+// TODO: Might be interesting to allow enumeration of accessed global variables, and
+//       also functions/methods that are being called. This could be used to build a
+//       code database with call graphs, etc.
+
+void RegisterScriptFunction(asCScriptEngine *engine);
+
+class asCScriptFunction : public asIScriptFunction
+{
+public:
+	// From asIScriptFunction
+	asIScriptEngine     *GetEngine() const;
+
+	// Memory management
+	int AddRef() const;
+	int Release() const;
+
+	// Miscellaneous
+	int                  GetId() const;
+	asEFuncType          GetFuncType() const;
+	const char          *GetModuleName() const;
+	asIScriptModule     *GetModule() const;
+	const char          *GetScriptSectionName() const;
+	const char          *GetConfigGroup() const;
+	asDWORD              GetAccessMask() const;
+	void                *GetAuxiliary() const;
+
+	// Function signature
+	asITypeInfo         *GetObjectType() const;
+	const char          *GetObjectName() const;
+	const char          *GetName() const;
+	const char          *GetNamespace() const;
+	const char          *GetDeclaration(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const;
+	bool                 IsReadOnly() const;
+	bool                 IsPrivate() const;
+	bool                 IsProtected() const;
+	bool                 IsFinal() const;
+	bool                 IsOverride() const;
+	bool                 IsShared() const;
+	bool                 IsExplicit() const;
+	bool                 IsProperty() const;
+	asUINT               GetParamCount() const;
+	int                  GetParam(asUINT index, int *typeId, asDWORD *flags = 0, const char **name = 0, const char **defaultArg = 0) const;
+	int                  GetReturnTypeId(asDWORD *flags = 0) const;
+
+	// Type id for function pointers
+	int                  GetTypeId() const;
+	bool                 IsCompatibleWithTypeId(int typeId) const;
+
+	// Delegates
+	void                *GetDelegateObject() const;
+	asITypeInfo         *GetDelegateObjectType() const;
+	asIScriptFunction   *GetDelegateFunction() const;
+
+	// Debug information
+	asUINT               GetVarCount() const;
+	int                  GetVar(asUINT index, const char **name, int *typeId = 0) const;
+	const char *         GetVarDecl(asUINT index, bool includeNamespace = false) const;
+	int                  FindNextLineWithCode(int line) const;
+
+	// For JIT compilation
+	asDWORD             *GetByteCode(asUINT *length = 0);
+
+	// User data
+	void                *SetUserData(void *userData, asPWORD type);
+	void                *GetUserData(asPWORD type) const;
+
+public:
+	//-----------------------------------
+	// Internal methods
+
+	void SetShared(bool set) { traits.SetTrait(asTRAIT_SHARED, set); }
+	void SetReadOnly(bool set) { traits.SetTrait(asTRAIT_CONST, set); }
+	void SetFinal(bool set) { traits.SetTrait(asTRAIT_FINAL, set); }
+	void SetOverride(bool set) { traits.SetTrait(asTRAIT_OVERRIDE, set); }
+	void SetExplicit(bool set) { traits.SetTrait(asTRAIT_EXPLICIT, set); }
+	void SetProtected(bool set) { traits.SetTrait(asTRAIT_PROTECTED, set); }
+	void SetPrivate(bool set) { traits.SetTrait(asTRAIT_PRIVATE, set); }
+	void SetProperty(bool set) { traits.SetTrait(asTRAIT_PROPERTY, set); }
+	bool IsFactory() const;
+
+	asCScriptFunction(asCScriptEngine *engine, asCModule *mod, asEFuncType funcType);
+	~asCScriptFunction();
+
+	// Keep an internal reference counter to separate references coming from
+	// application or script objects and references coming from the script code
+	int AddRefInternal();
+	int ReleaseInternal();
+
+	void     DestroyHalfCreated();
+
+	// TODO: operator==
+	// TODO: The asIScriptFunction should provide operator== and operator!= that should do a
+	//       a value comparison. Two delegate objects that point to the same object and class method should compare as equal
+	// TODO: The operator== should also be provided in script as opEquals to allow the same comparison in script
+	//       To do this we'll need some way to adapt the argtype for opEquals for each funcdef, preferrably without instantiating lots of different methods
+	//       Perhaps reusing 'auto' to mean the same type as the object
+	//bool      operator==(const asCScriptFunction &other) const;
+
+	void      DestroyInternal();
+
+	void      AddVariable(const asCString &name, asCDataType &type, int stackOffset, bool onHeap);
+
+	int       GetSpaceNeededForArguments();
+	int       GetSpaceNeededForReturnValue();
+	asCString GetDeclarationStr(bool includeObjectName = true, bool includeNamespace = false, bool includeParamNames = false) const;
+	int       GetLineNumber(int programPosition, int *sectionIdx);
+	void      ComputeSignatureId();
+	bool      IsSignatureEqual(const asCScriptFunction *func) const;
+	bool      IsSignatureExceptNameEqual(const asCScriptFunction *func) const;
+	bool      IsSignatureExceptNameEqual(const asCDataType &retType, const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &inOutFlags, const asCObjectType *type, bool isReadOnly) const;
+	bool      IsSignatureExceptNameAndReturnTypeEqual(const asCScriptFunction *fun) const;
+	bool      IsSignatureExceptNameAndReturnTypeEqual(const asCArray<asCDataType> &paramTypes, const asCArray<asETypeModifiers> &inOutFlags, const asCObjectType *type, bool isReadOnly) const;
+	bool      IsSignatureExceptNameAndObjectTypeEqual(const asCScriptFunction *func) const;
+
+	asCTypeInfo *GetTypeInfoOfLocalVar(short varOffset);
+
+	void      MakeDelegate(asCScriptFunction *func, void *obj);
+
+	int       RegisterListPattern(const char *decl, asCScriptNode *listPattern);
+	int       ParseListPattern(asSListPatternNode *&target, const char *decl, asCScriptNode *listPattern);
+
+	bool      DoesReturnOnStack() const;
+
+	void      JITCompile();
+
+	void      AddReferences();
+	void      ReleaseReferences();
+
+	void      AllocateScriptFunctionData();
+	void      DeallocateScriptFunctionData();
+
+	asCScriptFunction* FindNextFunctionCalled(asUINT startSearchFromProgramPos, int *stackDelta, asUINT *outProgramPos);
+	asCScriptFunction* GetCalledFunction(asDWORD programPos);
+
+	asCGlobalProperty *GetPropertyByGlobalVarPtr(void *gvarPtr);
+
+	// GC methods (for delegates)
+	int  GetRefCount();
+	void SetFlag();
+	bool GetFlag();
+	void EnumReferences(asIScriptEngine *engine);
+	void ReleaseAllHandles(asIScriptEngine *engine);
+
+public:
+	//-----------------------------------
+	// Properties
+
+	mutable asCAtomic            externalRefCount; // Used for external referneces
+	        asCAtomic            internalRefCount; // Used for internal references
+	mutable bool                 gcFlag;
+	asCScriptEngine             *engine;
+	asCModule                   *module;
+
+	asCArray<asPWORD>            userData;
+
+	// Function signature
+	asCString                    name;
+	asCDataType                  returnType;
+	asCArray<asCDataType>        parameterTypes;
+	asCArray<asCString>          parameterNames;
+	asCArray<asETypeModifiers>   inOutFlags;
+	asCArray<asCString *>        defaultArgs;
+	asSFunctionTraits            traits;
+	asCObjectType               *objectType;
+	int                          signatureId;
+
+	int                          id;
+
+	asEFuncType                  funcType;
+	asDWORD                      accessMask;
+
+	// Namespace will be null for funcdefs that are declared as child funcdefs
+	// of a class. In this case the namespace shall be taken from the parentClass
+	// in the funcdefType
+	asSNameSpace                *nameSpace;
+
+	asCFuncdefType              *funcdefType; // Doesn't increase refCount
+
+	// Used by asFUNC_DELEGATE
+	void              *objForDelegate;
+	asCScriptFunction *funcForDelegate;
+
+	// Used by list factory behaviour
+	asSListPatternNode *listPattern;
+
+	// Used by asFUNC_SCRIPT
+	struct ScriptFunctionData
+	{
+		// Bytecode for the script function
+		asCArray<asDWORD>               byteCode;
+
+		// The stack space needed for the local variables
+		asDWORD                         variableSpace;
+
+		// Holds information on scope for object variables on the stack
+		asCArray<asSObjectVariableInfo> objVariableInfo;
+
+		// Holds information on try/catch blocks for exception handling
+		asCArray<asSTryCatchInfo>       tryCatchInfo;
+
+		// The stack needed to execute the function
+		int                             stackNeeded;
+
+		// JIT compiled code of this function
+		asJITFunction                   jitFunction;
+
+		// Holds type information on both explicitly declared variables and temporary variables
+		// Used during exception handling, byte code serialization, debugging, and context serialization
+		asCArray<asSScriptVariable*>    variables;
+
+		// Store position, line number pairs for debug information
+		asCArray<int>                   lineNumbers;
+		// Store the script section where the code was declared
+		int                             scriptSectionIdx;
+		// Store the location where the function was declared  (row in the lower 20 bits, and column in the upper 12)
+		int                             declaredAt;
+		// Store position/index pairs if the bytecode is compiled from multiple script sections
+		asCArray<int>                   sectionIdxs;
+	};
+	ScriptFunctionData          *scriptData;
+
+	// Stub functions and delegates don't own the object and parameters
+	bool                         dontCleanUpOnException;
+
+	// Used by asFUNC_VIRTUAL
+	int                          vfTableIdx;
+
+	// Used by asFUNC_SYSTEM
+	asSSystemFunctionInterface  *sysFuncIntf;
+};
+
+const char * const DELEGATE_FACTORY = "$dlgte";
+asCScriptFunction *CreateDelegate(asCScriptFunction *func, void *obj);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_scriptnode.cpp b/Sources/AngelScript/source/as_scriptnode.cpp
old mode 100755
new mode 100644
index 28d5a64f4..9bd9cfd2b
--- a/Sources/AngelScript/source/as_scriptnode.cpp
+++ b/Sources/AngelScript/source/as_scriptnode.cpp
@@ -1,178 +1,178 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptnode.cpp
-//
-// A node in the script tree built by the parser for compilation
-//
-
-
-
-#include "as_scriptnode.h"
-#include "as_scriptengine.h"
-
-BEGIN_AS_NAMESPACE
-
-asCScriptNode::asCScriptNode(eScriptNode type)
-{
-	nodeType    = type;
-	tokenType   = ttUnrecognizedToken;
-	tokenPos    = 0;
-	tokenLength = 0;
-
-	parent      = 0;
-	next        = 0;
-	prev        = 0;
-	firstChild  = 0;
-	lastChild   = 0;
-}
-
-void asCScriptNode::Destroy(asCScriptEngine *engine)
-{
-	// Destroy all children
-	asCScriptNode *node = firstChild;
-	asCScriptNode *nxt;
-
-	while( node )
-	{
-		nxt = node->next;
-		node->Destroy(engine);
-		node = nxt;
-	}
-
-	// Return the memory to the memory manager
-	engine->memoryMgr.FreeScriptNode(this);
-}
-
-asCScriptNode *asCScriptNode::CreateCopy(asCScriptEngine *engine)
-{
-	void *ptr = engine->memoryMgr.AllocScriptNode();
-	if( ptr == 0 )
-	{
-		// Out of memory
-		return 0;
-	}
-
-	new(ptr) asCScriptNode(nodeType);
-	
-	asCScriptNode *node = reinterpret_cast<asCScriptNode*>(ptr);
-	node->tokenLength = tokenLength;
-	node->tokenPos    = tokenPos;
-	node->tokenType   = tokenType;
-
-	asCScriptNode *child = firstChild;
-	while( child )
-	{
-		node->AddChildLast(child->CreateCopy(engine));
-		child = child->next;
-	}
-
-	return node;
-}
-
-void asCScriptNode::SetToken(sToken *token)
-{
-	tokenType   = token->type;
-}
-
-void asCScriptNode::UpdateSourcePos(size_t pos, size_t length)
-{
-	if( pos == 0 && length == 0 ) return;
-
-	if( tokenPos == 0 && tokenLength == 0 )
-	{
-		tokenPos = pos;
-		tokenLength = length;
-	}
-	else
-	{
-		if( tokenPos > pos )
-		{
-			tokenLength = tokenPos + tokenLength - pos;
-			tokenPos = pos;
-		}
-
-		if( pos + length > tokenPos + tokenLength )
-		{
-			tokenLength = pos + length - tokenPos;
-		}
-	}
-}
-
-void asCScriptNode::AddChildLast(asCScriptNode *node)
-{
-	// We might get a null pointer if the parser encounter an out-of-memory situation
-	if( node == 0 ) return;
-
-	if( lastChild )
-	{
-		lastChild->next = node;
-		node->next      = 0;
-		node->prev      = lastChild;
-		node->parent    = this;
-		lastChild       = node;
-	}
-	else
-	{
-		firstChild   = node;
-		lastChild    = node;
-		node->next   = 0;
-		node->prev   = 0;
-		node->parent = this;
-	}
-
-	UpdateSourcePos(node->tokenPos, node->tokenLength);
-}
-
-void asCScriptNode::DisconnectParent()
-{
-	if( parent )
-	{
-		if( parent->firstChild == this )
-			parent->firstChild = next;
-		if( parent->lastChild == this )
-			parent->lastChild = prev;
-	}
-
-	if( next )
-		next->prev = prev;
-
-	if( prev )
-		prev->next = next;
-
-	parent = 0;
-	next = 0;
-	prev = 0;
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptnode.cpp
+//
+// A node in the script tree built by the parser for compilation
+//
+
+
+
+#include "as_scriptnode.h"
+#include "as_scriptengine.h"
+
+BEGIN_AS_NAMESPACE
+
+asCScriptNode::asCScriptNode(eScriptNode type)
+{
+	nodeType    = type;
+	tokenType   = ttUnrecognizedToken;
+	tokenPos    = 0;
+	tokenLength = 0;
+
+	parent      = 0;
+	next        = 0;
+	prev        = 0;
+	firstChild  = 0;
+	lastChild   = 0;
+}
+
+void asCScriptNode::Destroy(asCScriptEngine *engine)
+{
+	// Destroy all children
+	asCScriptNode *node = firstChild;
+	asCScriptNode *nxt;
+
+	while( node )
+	{
+		nxt = node->next;
+		node->Destroy(engine);
+		node = nxt;
+	}
+
+	// Return the memory to the memory manager
+	engine->memoryMgr.FreeScriptNode(this);
+}
+
+asCScriptNode *asCScriptNode::CreateCopy(asCScriptEngine *engine)
+{
+	void *ptr = engine->memoryMgr.AllocScriptNode();
+	if( ptr == 0 )
+	{
+		// Out of memory
+		return 0;
+	}
+
+	new(ptr) asCScriptNode(nodeType);
+	
+	asCScriptNode *node = reinterpret_cast<asCScriptNode*>(ptr);
+	node->tokenLength = tokenLength;
+	node->tokenPos    = tokenPos;
+	node->tokenType   = tokenType;
+
+	asCScriptNode *child = firstChild;
+	while( child )
+	{
+		node->AddChildLast(child->CreateCopy(engine));
+		child = child->next;
+	}
+
+	return node;
+}
+
+void asCScriptNode::SetToken(sToken *token)
+{
+	tokenType   = token->type;
+}
+
+void asCScriptNode::UpdateSourcePos(size_t pos, size_t length)
+{
+	if( pos == 0 && length == 0 ) return;
+
+	if( tokenPos == 0 && tokenLength == 0 )
+	{
+		tokenPos = pos;
+		tokenLength = length;
+	}
+	else
+	{
+		if( tokenPos > pos )
+		{
+			tokenLength = tokenPos + tokenLength - pos;
+			tokenPos = pos;
+		}
+
+		if( pos + length > tokenPos + tokenLength )
+		{
+			tokenLength = pos + length - tokenPos;
+		}
+	}
+}
+
+void asCScriptNode::AddChildLast(asCScriptNode *node)
+{
+	// We might get a null pointer if the parser encounter an out-of-memory situation
+	if( node == 0 ) return;
+
+	if( lastChild )
+	{
+		lastChild->next = node;
+		node->next      = 0;
+		node->prev      = lastChild;
+		node->parent    = this;
+		lastChild       = node;
+	}
+	else
+	{
+		firstChild   = node;
+		lastChild    = node;
+		node->next   = 0;
+		node->prev   = 0;
+		node->parent = this;
+	}
+
+	UpdateSourcePos(node->tokenPos, node->tokenLength);
+}
+
+void asCScriptNode::DisconnectParent()
+{
+	if( parent )
+	{
+		if( parent->firstChild == this )
+			parent->firstChild = next;
+		if( parent->lastChild == this )
+			parent->lastChild = prev;
+	}
+
+	if( next )
+		next->prev = prev;
+
+	if( prev )
+		prev->next = next;
+
+	parent = 0;
+	next = 0;
+	prev = 0;
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_scriptnode.h b/Sources/AngelScript/source/as_scriptnode.h
old mode 100755
new mode 100644
index 33ab3bce0..e743f1172
--- a/Sources/AngelScript/source/as_scriptnode.h
+++ b/Sources/AngelScript/source/as_scriptnode.h
@@ -1,137 +1,138 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_scriptnode.h
-//
-// A node in the script tree built by the parser for compilation
-//
-
-
-#ifndef AS_SCRIPTNODE_H
-#define AS_SCRIPTNODE_H
-
-#include "as_config.h"
-#include "as_tokendef.h"
-
-BEGIN_AS_NAMESPACE
-
-enum eScriptNode
-{
-	snUndefined,
-	snScript,
-	snFunction,
-	snConstant,
-	snDataType,
-	snIdentifier,
-	snParameterList,
-	snStatementBlock,
-	snDeclaration,
-	snExpressionStatement,
-	snIf,
-	snFor,
-	snWhile,
-	snReturn,
-	snExpression,
-	snExprTerm,
-	snFunctionCall,
-	snConstructCall,
-	snArgList,
-	snExprPreOp,
-	snExprPostOp,
-	snExprOperator,
-	snExprValue,
-	snBreak,
-	snContinue,
-	snDoWhile,
-	snAssignment,
-	snCondition,
-	snSwitch,
-	snCase,
-	snImport,
-	snClass,
-	snInitList,
-	snInterface,
-	snEnum,
-	snTypedef,
-	snCast,
-	snVariableAccess,
-	snFuncDef,
-	snVirtualProperty,
-	snNamespace,
-	snMixin,
-	snListPattern,
-	snNamedArgument,
-	snScope
-};
-
-struct sToken
-{
-	eTokenType type;
-	size_t pos;
-	size_t length;
-};
-
-class asCScriptEngine;
-
-class asCScriptNode
-{
-public:
-	asCScriptNode(eScriptNode nodeType);
-
-	void Destroy(asCScriptEngine *engine);
-	asCScriptNode *CreateCopy(asCScriptEngine *engine);
-
-	void SetToken(sToken *token);
-	void AddChildLast(asCScriptNode *node);
-	void DisconnectParent();
-
-	void UpdateSourcePos(size_t pos, size_t length);
-
-	eScriptNode nodeType;
-	eTokenType tokenType;
-	size_t tokenPos;
-	size_t tokenLength;
-
-	asCScriptNode *parent;
-	asCScriptNode *next;
-	asCScriptNode *prev;
-	asCScriptNode *firstChild;
-	asCScriptNode *lastChild;
-
-protected:
-	// Must call Destroy instead
-	~asCScriptNode() {}
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2018 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_scriptnode.h
+//
+// A node in the script tree built by the parser for compilation
+//
+
+
+#ifndef AS_SCRIPTNODE_H
+#define AS_SCRIPTNODE_H
+
+#include "as_config.h"
+#include "as_tokendef.h"
+
+BEGIN_AS_NAMESPACE
+
+enum eScriptNode
+{
+	snUndefined,
+	snScript,
+	snFunction,
+	snConstant,
+	snDataType,
+	snIdentifier,
+	snParameterList,
+	snStatementBlock,
+	snDeclaration,
+	snExpressionStatement,
+	snIf,
+	snFor,
+	snWhile,
+	snReturn,
+	snExpression,
+	snExprTerm,
+	snFunctionCall,
+	snConstructCall,
+	snArgList,
+	snExprPreOp,
+	snExprPostOp,
+	snExprOperator,
+	snExprValue,
+	snBreak,
+	snContinue,
+	snDoWhile,
+	snAssignment,
+	snCondition,
+	snSwitch,
+	snCase,
+	snImport,
+	snClass,
+	snInitList,
+	snInterface,
+	snEnum,
+	snTypedef,
+	snCast,
+	snVariableAccess,
+	snFuncDef,
+	snVirtualProperty,
+	snNamespace,
+	snMixin,
+	snListPattern,
+	snNamedArgument,
+	snScope,
+	snTryCatch
+};
+
+struct sToken
+{
+	eTokenType type;
+	size_t pos;
+	size_t length;
+};
+
+class asCScriptEngine;
+
+class asCScriptNode
+{
+public:
+	asCScriptNode(eScriptNode nodeType);
+
+	void Destroy(asCScriptEngine *engine);
+	asCScriptNode *CreateCopy(asCScriptEngine *engine);
+
+	void SetToken(sToken *token);
+	void AddChildLast(asCScriptNode *node);
+	void DisconnectParent();
+
+	void UpdateSourcePos(size_t pos, size_t length);
+
+	eScriptNode nodeType;
+	eTokenType tokenType;
+	size_t tokenPos;
+	size_t tokenLength;
+
+	asCScriptNode *parent;
+	asCScriptNode *next;
+	asCScriptNode *prev;
+	asCScriptNode *firstChild;
+	asCScriptNode *lastChild;
+
+protected:
+	// Must call Destroy instead
+	~asCScriptNode() {}
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_scriptobject.cpp b/Sources/AngelScript/source/as_scriptobject.cpp
old mode 100755
new mode 100644
index dcef93850..260792eec
--- a/Sources/AngelScript/source/as_scriptobject.cpp
+++ b/Sources/AngelScript/source/as_scriptobject.cpp
@@ -1,1069 +1,1184 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-#include <new>
-#include "as_config.h"
-#include "as_scriptengine.h"
-#include "as_scriptobject.h"
-#include "as_texts.h"
-
-BEGIN_AS_NAMESPACE
-
-// This helper function will call the default factory, that is a script function
-asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngine *engine)
-{
-	asIScriptContext *ctx = 0;
-	int r = 0;
-	bool isNested = false;
-
-	// Use nested call in the context if there is an active context
-	ctx = asGetActiveContext();
-	if( ctx )
-	{
-		// It may not always be possible to reuse the current context, 
-		// in which case we'll have to create a new one any way.
-		if( ctx->GetEngine() == objType->GetEngine() && ctx->PushState() == asSUCCESS )
-			isNested = true;
-		else
-			ctx = 0;
-	}
-	
-	if( ctx == 0 )
-	{
-		// Request a context from the engine
-		ctx = engine->RequestContext();
-		if( ctx == 0 )
-		{
-			// TODO: How to best report this failure?
-			return 0;
-		}
-	}
-
-	r = ctx->Prepare(engine->scriptFunctions[objType->beh.factory]);
-	if( r < 0 )
-	{
-		if( isNested )
-			ctx->PopState();
-		else
-			engine->ReturnContext(ctx);
-		return 0;
-	}
-
-	for(;;)
-	{
-		r = ctx->Execute();
-
-		// We can't allow this execution to be suspended 
-		// so resume the execution immediately
-		if( r != asEXECUTION_SUSPENDED )
-			break;
-	}
-
-	if( r != asEXECUTION_FINISHED )
-	{
-		if( isNested )
-		{
-			ctx->PopState();
-
-			// If the execution was aborted or an exception occurred,
-			// then we should forward that to the outer execution.
-			if( r == asEXECUTION_EXCEPTION )
-			{
-				// TODO: How to improve this exception
-				ctx->SetException(TXT_EXCEPTION_IN_NESTED_CALL);
-			}
-			else if( r == asEXECUTION_ABORTED )
-				ctx->Abort();
-		}
-		else
-			engine->ReturnContext(ctx);
-		return 0;
-	}
-
-	asIScriptObject *ptr = (asIScriptObject*)ctx->GetReturnAddress();
-
-	// Increase the reference, because the context will release its pointer
-	ptr->AddRef();
-
-	if( isNested )
-		ctx->PopState();
-	else
-		engine->ReturnContext(ctx);
-
-	return ptr;
-}
-
-#ifdef AS_MAX_PORTABILITY
-
-static void ScriptObject_AddRef_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	self->AddRef();
-}
-
-static void ScriptObject_Release_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	self->Release();
-}
-
-static void ScriptObject_GetRefCount_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
-}
-
-static void ScriptObject_SetFlag_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	self->SetFlag();
-}
-
-static void ScriptObject_GetFlag_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	*(bool*)gen->GetAddressOfReturnLocation() = self->GetFlag();
-}
-
-static void ScriptObject_GetWeakRefFlag_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	*(asILockableSharedBool**)gen->GetAddressOfReturnLocation() = self->GetWeakRefFlag();
-}
-
-static void ScriptObject_EnumReferences_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->EnumReferences(engine);
-}
-
-static void ScriptObject_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
-	self->ReleaseAllHandles(engine);
-}
-
-static void ScriptObject_Assignment_Generic(asIScriptGeneric *gen)
-{
-	asCScriptObject *other = *(asCScriptObject**)gen->GetAddressOfArg(0);
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-
-	*self = *other;
-
-	*(asCScriptObject**)gen->GetAddressOfReturnLocation() = self;
-}
-
-static void ScriptObject_Construct_Generic(asIScriptGeneric *gen)
-{
-	asCObjectType *objType = *(asCObjectType**)gen->GetAddressOfArg(0);
-	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
-
-	ScriptObject_Construct(objType, self);
-}
-
-#endif
-
-void RegisterScriptObject(asCScriptEngine *engine)
-{
-	// Register the default script class behaviours
-	int r = 0;
-	UNUSED_VAR(r); // It is only used in debug mode
-	engine->scriptTypeBehaviours.engine = engine;
-	engine->scriptTypeBehaviours.flags = asOBJ_SCRIPT_OBJECT | asOBJ_REF | asOBJ_GC;
-	engine->scriptTypeBehaviours.name = "$obj";
-#ifndef AS_MAX_PORTABILITY
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptObject_Construct), asCALL_CDECL_OBJLAST, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ADDREF, "void f()", asMETHOD(asCScriptObject,AddRef), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASE, "void f()", asMETHOD(asCScriptObject,Release), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterMethodToObjectType(&engine->scriptTypeBehaviours, "int &opAssign(int &in)", asFUNCTION(ScriptObject_Assignment), asCALL_CDECL_OBJLAST); asASSERT( r >= 0 );
-
-	// Weakref behaviours
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GET_WEAKREF_FLAG, "int &f()", asMETHOD(asCScriptObject,GetWeakRefFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	
-	// Register GC behaviours
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(asCScriptObject,GetRefCount), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_SETGCFLAG, "void f()", asMETHOD(asCScriptObject,SetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(asCScriptObject,GetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(asCScriptObject,EnumReferences), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(asCScriptObject,ReleaseAllHandles), asCALL_THISCALL, 0); asASSERT( r >= 0 );
-#else
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptObject_Construct_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptObject_AddRef_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptObject_Release_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterMethodToObjectType(&engine->scriptTypeBehaviours, "int &opAssign(int &in)", asFUNCTION(ScriptObject_Assignment_Generic), asCALL_GENERIC); asASSERT( r >= 0 );
-
-	// Weakref behaviours
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GET_WEAKREF_FLAG, "int &f()", asFUNCTION(ScriptObject_GetWeakRefFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-
-	// Register GC behaviours
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptObject_GetRefCount_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptObject_SetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptObject_GetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptObject_EnumReferences_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptObject_ReleaseAllHandles_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
-#endif
-}
-
-void ScriptObject_Construct(asCObjectType *objType, asCScriptObject *self)
-{
-	new(self) asCScriptObject(objType);
-}
-
-void ScriptObject_ConstructUnitialized(asCObjectType *objType, asCScriptObject *self)
-{
-	new(self) asCScriptObject(objType, false);
-}
-
-asCScriptObject::asCScriptObject(asCObjectType *ot, bool doInitialize)
-{
-	refCount.set(1);
-	objType = ot;
-	objType->AddRef();
-	isDestructCalled = false;
-	extra = 0;
-	hasRefCountReachedZero = false;
-
-	// Notify the garbage collector of this object
-	if( objType->flags & asOBJ_GC )
-		objType->engine->gc.AddScriptObjectToGC(this, objType);
-
-	// Initialize members to zero. Technically we only need to zero the pointer
-	// members, but just the memset is faster than having to loop and check the datatypes
-	memset((void*)(this+1), 0, objType->size - sizeof(asCScriptObject));
-
-	if( doInitialize )
-	{
-#ifdef AS_NO_MEMBER_INIT
-		// When member initialization is disabled the constructor must make sure
-		// to allocate and initialize all members with the default constructor
-		for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
-		{
-			asCObjectProperty *prop = objType->properties[n];
-			if( prop->type.IsObject() && !prop->type.IsObjectHandle() )
-			{
-				if( prop->type.IsReference() || prop->type.GetTypeInfo()->flags & asOBJ_REF )
-				{
-					asPWORD *ptr = reinterpret_cast<asPWORD*>(reinterpret_cast<asBYTE*>(this) + prop->byteOffset);
-					if( prop->type.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT )
-						*ptr = (asPWORD)ScriptObjectFactory(prop->type.GetTypeInfo(), ot->engine);
-					else
-						*ptr = (asPWORD)AllocateUninitializedObject(prop->type.GetTypeInfo(), ot->engine);
-				}
-			}
-		}
-#endif
-	}
-	else
-	{
-		// When the object is created without initialization, all non-handle members must be allocated, but not initialized
-		asCScriptEngine *engine = objType->engine;
-		for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
-		{
-			asCObjectProperty *prop = objType->properties[n];
-			if( prop->type.IsObject() && !prop->type.IsObjectHandle() )
-			{
-				if( prop->type.IsReference() || (prop->type.GetTypeInfo()->flags & asOBJ_REF) )
-				{
-					asPWORD *ptr = reinterpret_cast<asPWORD*>(reinterpret_cast<asBYTE*>(this) + prop->byteOffset);
-					*ptr = (asPWORD)AllocateUninitializedObject(prop->type.GetTypeInfo()->CastToObjectType(), engine);
-				}
-			}
-		}
-	}
-}
-
-void asCScriptObject::Destruct()
-{
-	// Call the destructor, which will also call the GCObject's destructor
-	this->~asCScriptObject();
-
-	// Free the memory
-#ifndef WIP_16BYTE_ALIGN
-	userFree(this);
-#else
-	// Script object memory is allocated through asCScriptEngine::CallAlloc()
-	// This free call must match the allocator used in CallAlloc().
-	userFreeAligned(this);
-#endif
-}
-
-asCScriptObject::~asCScriptObject()
-{
-	if( extra )
-	{
-		if( extra->weakRefFlag )
-		{
-			extra->weakRefFlag->Release();
-			extra->weakRefFlag = 0;
-		}
-
-		if( objType->engine )
-		{
-			// Clean the user data
-			for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
-			{
-				if( extra->userData[n+1] )
-				{
-					for( asUINT c = 0; c < objType->engine->cleanScriptObjectFuncs.GetLength(); c++ )
-						if( objType->engine->cleanScriptObjectFuncs[c].type == extra->userData[n] )
-							objType->engine->cleanScriptObjectFuncs[c].cleanFunc(this);
-				}
-			}
-		}
-
-		asDELETE(extra, SExtra);
-	}
-
-	// The engine pointer should be available from the objectType
-	asCScriptEngine *engine = objType->engine;
-
-	// Destroy all properties
-	// In most cases the members are initialized in the order they have been declared, 
-	// so it's safer to uninitialize them from last to first. The order may be different
-	// depending on the use of inheritance and or initialization in the declaration.
-	// TODO: Should the order of initialization be stored by the compiler so that the 
-	//       reverse order can be guaranteed during the destruction?
-	for( int n = (int)objType->properties.GetLength()-1; n >= 0; n-- )
-	{
-		asCObjectProperty *prop = objType->properties[n];
-		if( prop->type.IsObject() )
-		{
-			// Destroy the object
-			asCObjectType *propType = prop->type.GetTypeInfo()->CastToObjectType();
-			if( prop->type.IsReference() || propType->flags & asOBJ_REF )
-			{
-				void **ptr = (void**)(((char*)this) + prop->byteOffset);
-				if( *ptr )
-				{
-					FreeObject(*ptr, propType, engine);
-					*(asDWORD*)ptr = 0;
-				}
-			}
-			else
-			{
-				// The object is allocated inline. As only POD objects may be allocated inline
-				// it is not a problem to call the destructor even if the object may never have
-				// been initialized, e.g. if an exception interrupted the constructor.
-				asASSERT( propType->flags & asOBJ_POD );
-
-				void *ptr = (void**)(((char*)this) + prop->byteOffset);
-				if( propType->beh.destruct )
-					engine->CallObjectMethod(ptr, propType->beh.destruct);
-			}
-		}
-		else if( prop->type.IsFuncdef() )
-		{
-			// Release the function descriptor
-			asCScriptFunction **ptr = (asCScriptFunction**)(((char*)this) + prop->byteOffset);
-			if (*ptr)
-			{
-				(*ptr)->Release();
-				*ptr = 0;
-			}
-		}
-	}
-
-	objType->Release();
-	objType = 0;
-
-	// Something is really wrong if the refCount is not 0 by now
-	asASSERT( refCount.get() == 0 );
-}
-
-asILockableSharedBool *asCScriptObject::GetWeakRefFlag() const
-{
-	// If the object's refCount has already reached zero then the object is already
-	// about to be destroyed so it's ok to return null if the weakRefFlag doesn't already
-	// exist
-	if( (extra && extra->weakRefFlag) || hasRefCountReachedZero )
-		return extra->weakRefFlag;
-
-	// Lock globally so no other thread can attempt
-	// to create a shared bool at the same time.
-	// TODO: runtime optimize: Instead of locking globally, it would be possible to have 
-	//                         a critical section per object type. This would reduce the 
-	//                         chances of two threads lock on the same critical section.
-	asAcquireExclusiveLock();
-
-	// Make sure another thread didn't create the 
-	// flag while we waited for the lock
-	if( !extra )
-		extra = asNEW(SExtra);
-	if( !extra->weakRefFlag )
-		extra->weakRefFlag = asNEW(asCLockableSharedBool);
-
-	asReleaseExclusiveLock();
-
-	return extra->weakRefFlag;
-}
-
-void *asCScriptObject::GetUserData(asPWORD type) const
-{
-	if( !extra )
-		return 0;
-
-	// There may be multiple threads reading, but when
-	// setting the user data nobody must be reading.
-	// TODO: runtime optimize: Would it be worth it to have a rwlock per object type?
-	asAcquireSharedLock();
-
-	for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
-	{
-		if( extra->userData[n] == type )
-		{
-			void *userData = reinterpret_cast<void*>(extra->userData[n+1]);
-			asReleaseSharedLock();
-			return userData;
-		}
-	}
-
-	asReleaseSharedLock();
-
-	return 0;
-}
-
-void *asCScriptObject::SetUserData(void *data, asPWORD type)
-{
-	// Lock globally so no other thread can attempt
-	// to manipulate the extra data at the same time.
-	// TODO: runtime optimize: Instead of locking globally, it would be possible to have 
-	//                         a critical section per object type. This would reduce the 
-	//                         chances of two threads lock on the same critical section.
-	asAcquireExclusiveLock();
-
-	// Make sure another thread didn't create the 
-	// flag while we waited for the lock
-	if( !extra )
-		extra = asNEW(SExtra);
-
-	// It is not intended to store a lot of different types of userdata,
-	// so a more complex structure like a associative map would just have
-	// more overhead than a simple array.
-	for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
-	{
-		if( extra->userData[n] == type )
-		{
-			void *oldData = reinterpret_cast<void*>(extra->userData[n+1]);
-			extra->userData[n+1] = reinterpret_cast<asPWORD>(data);
-
-			asReleaseExclusiveLock();
-
-			return oldData;
-		}
-	}
-
-	extra->userData.PushLast(type);
-	extra->userData.PushLast(reinterpret_cast<asPWORD>(data));
-
-	asReleaseExclusiveLock();
-
-	return 0;
-}
-
-asIScriptEngine *asCScriptObject::GetEngine() const
-{
-	return objType->engine;
-}
-
-int asCScriptObject::AddRef() const
-{
-	// Warn in case the application tries to increase the refCount after it has reached zero.
-	// This may happen for example if the application calls a method on the class while it is
-	// being destroyed. The application shouldn't do this because it may cause application
-	// crashes if members that have already been destroyed are accessed accidentally.
-	if( hasRefCountReachedZero )
-	{
-		if( objType && objType->engine )
-		{
-			asCString msg;
-			msg.Format(TXT_RESURRECTING_SCRIPTOBJECT_s, objType->name.AddressOf());
-			objType->engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
-		}
-	}
-
-	// Increase counter and clear flag set by GC
-	gcFlag = false;
-	return refCount.atomicInc();
-}
-
-int asCScriptObject::Release() const
-{
-	// Clear the flag set by the GC
-	gcFlag = false;
-
-	// If the weak ref flag exists it is because someone held a weak ref
-	// and that someone may add a reference to the object at any time. It
-	// is ok to check the existance of the weakRefFlag without locking here
-	// because if the refCount is 1 then no other thread is currently 
-	// creating the weakRefFlag.
-	if( refCount.get() == 1 && extra && extra->weakRefFlag )
-	{
-		// Set the flag to tell others that the object is no longer alive
-		// We must do this before decreasing the refCount to 0 so we don't
-		// end up with a race condition between this thread attempting to 
-		// destroy the object and the other that temporary added a strong
-		// ref from the weak ref.
-		extra->weakRefFlag->Set(true);
-	}
-
-	// Call the script destructor behaviour if the reference counter is 1.
-	if( refCount.get() == 1 && !isDestructCalled )
-	{
-		// This cast is OK since we are the last reference
-		const_cast<asCScriptObject*>(this)->CallDestructor();
-	}
-
-	// Now do the actual releasing
-	int r = refCount.atomicDec();
-	if( r == 0 )
-	{
-		// Flag this object as being destroyed so the application
-		// can be warned if the code attempts to resurrect the object
-		// during the destructor. This also avoids a recursive call
-		// to the destructor which would crash the application if it
-		// really does resurrect the object.
-		if( !hasRefCountReachedZero )
-		{
-			hasRefCountReachedZero = true;
-
-			// This cast is OK since we are the last reference
-			const_cast<asCScriptObject*>(this)->Destruct();
-		}
-		return 0;
-	}
-
-	return r;
-}
-
-void asCScriptObject::CallDestructor()
-{
-	// Only allow the destructor to be called once
-	if( isDestructCalled ) return;
-
-	asIScriptContext *ctx = 0;
-	bool isNested = false;
-	bool doAbort = false;
-
-	// Make sure the destructor is called once only, even if the  
-	// reference count is increased and then decreased again
-	isDestructCalled = true;
-
-	// Call the destructor for this class and all the super classes
-	asCObjectType *ot = objType;
-	while( ot )
-	{
-		int funcIndex = ot->beh.destruct;
-		if( funcIndex )
-		{
-			if( ctx == 0 )
-			{
-				// Check for active context first as it is quicker
-				// to reuse than to set up a new one.
-				ctx = asGetActiveContext();
-				if( ctx )
-				{
-					if( ctx->GetEngine() == objType->GetEngine() && ctx->PushState() == asSUCCESS )
-						isNested = true;
-					else
-						ctx = 0;
-				}
-
-				if( ctx == 0 )
-				{
-					// Request a context from the engine
-					ctx = objType->engine->RequestContext();
-					if( ctx == 0 )
-					{
-						// TODO: How to best report this failure?
-						return;
-					}
-				}
-			}
-
-			int r = ctx->Prepare(objType->engine->scriptFunctions[funcIndex]);
-			if( r >= 0 )
-			{
-				ctx->SetObject(this);
-
-				for(;;)
-				{
-					r = ctx->Execute();
-
-					// If the script tries to suspend itself just restart it
-					if( r != asEXECUTION_SUSPENDED )
-						break;
-				}
-
-				// Exceptions in the destructor will be ignored, as there is not much
-				// that can be done about them. However a request to abort the execution
-				// will be forwarded to the outer execution, in case of a nested call.
-				if( r == asEXECUTION_ABORTED )
-					doAbort = true;
-
-				// Observe, even though the current destructor was aborted or an exception
-				// occurred, we still try to execute the base class' destructor if available
-				// in order to free as many resources as possible.
-			}
-		}
-
-		ot = ot->derivedFrom;
-	}
-
-	if( ctx )
-	{
-		if( isNested )
-		{
-			ctx->PopState();
-
-			// Forward any request to abort the execution to the outer call
-			if( doAbort )
-				ctx->Abort();
-		}
-		else
-		{
-			// Return the context to engine
-			objType->engine->ReturnContext(ctx);
-		}
-	}
-}
-
-asITypeInfo *asCScriptObject::GetObjectType() const
-{
-	return objType;
-}
-
-int asCScriptObject::GetRefCount()
-{
-	return refCount.get();
-}
-
-void asCScriptObject::SetFlag()
-{
-	gcFlag = true;
-}
-
-bool asCScriptObject::GetFlag()
-{
-	return gcFlag;
-}
-
-// interface
-int asCScriptObject::GetTypeId() const
-{
-	asCDataType dt = asCDataType::CreateType(objType, false);
-	return objType->engine->GetTypeIdFromDataType(dt);
-}
-
-asUINT asCScriptObject::GetPropertyCount() const
-{
-	return asUINT(objType->properties.GetLength());
-}
-
-int asCScriptObject::GetPropertyTypeId(asUINT prop) const
-{
-	if( prop >= objType->properties.GetLength() )
-		return asINVALID_ARG;
-
-	return objType->engine->GetTypeIdFromDataType(objType->properties[prop]->type);
-}
-
-const char *asCScriptObject::GetPropertyName(asUINT prop) const
-{
-	if( prop >= objType->properties.GetLength() )
-		return 0;
-
-	return objType->properties[prop]->name.AddressOf();
-}
-
-void *asCScriptObject::GetAddressOfProperty(asUINT prop)
-{
-	if( prop >= objType->properties.GetLength() )
-		return 0;
-
-	// Objects are stored by reference, so this must be dereferenced
-	asCDataType *dt = &objType->properties[prop]->type;
-	if( dt->IsObject() && !dt->IsObjectHandle() &&
-		(dt->IsReference() || dt->GetTypeInfo()->flags & asOBJ_REF) )
-		return *(void**)(((char*)this) + objType->properties[prop]->byteOffset);
-
-	return (void*)(((char*)this) + objType->properties[prop]->byteOffset);
-}
-
-void asCScriptObject::EnumReferences(asIScriptEngine *engine)
-{
-	// We'll notify the GC of all object handles that we're holding
-	for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
-	{
-		asCObjectProperty *prop = objType->properties[n];
-		void *ptr = 0;
-		if( prop->type.IsObject() )
-		{
-			// TODO: gc: The members of the value type needs to be enumerated
-			//           too, since the value type may be holding a reference.
-			if( prop->type.IsReference() || (prop->type.GetTypeInfo()->flags & asOBJ_REF) )
-				ptr = *(void**)(((char*)this) + prop->byteOffset);
-			else
-				ptr = (void*)(((char*)this) + prop->byteOffset);
-		}
-		else if (prop->type.IsFuncdef())
-			ptr = *(void**)(((char*)this) + prop->byteOffset);
-
-		if (ptr)
-			((asCScriptEngine*)engine)->GCEnumCallback(ptr);
-	}
-}
-
-void asCScriptObject::ReleaseAllHandles(asIScriptEngine *engine)
-{
-	for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
-	{
-		asCObjectProperty *prop = objType->properties[n];
-
-		// TODO: gc: The members of the members needs to be released
-		//           too, since they may be holding a reference. Even
-		//           if the member is a value type.
-		if( prop->type.IsObject() && prop->type.IsObjectHandle() )
-		{
-			void **ptr = (void**)(((char*)this) + prop->byteOffset);
-			if( *ptr )
-			{
-				asASSERT( (prop->type.GetTypeInfo()->flags & asOBJ_NOCOUNT) || prop->type.GetBehaviour()->release );
-				if( prop->type.GetBehaviour()->release )
-					((asCScriptEngine*)engine)->CallObjectMethod(*ptr, prop->type.GetBehaviour()->release);
-				*ptr = 0;
-			}
-		}
-		else if (prop->type.IsFuncdef())
-		{
-			asCScriptFunction **ptr = (asCScriptFunction**)(((char*)this) + prop->byteOffset);
-			if (*ptr)
-			{
-				(*ptr)->Release();
-				*ptr = 0;
-			}
-		}
-	}
-}
-
-asCScriptObject &ScriptObject_Assignment(asCScriptObject *other, asCScriptObject *self)
-{
-	return (*self = *other);
-}
-
-asCScriptObject &asCScriptObject::operator=(const asCScriptObject &other)
-{
-	if( &other != this )
-	{
-		if( !other.objType->DerivesFrom(objType) )
-		{
-			// We cannot allow a value assignment from a type that isn't the same or 
-			// derives from this type as the member properties may not have the same layout
-			asIScriptContext *ctx = asGetActiveContext();
-			ctx->SetException(TXT_MISMATCH_IN_VALUE_ASSIGN);
-			return *this;
-		}
-
-		// If the script class implements the opAssign method, it should be called
-		asCScriptEngine *engine = objType->engine;
-		asCScriptFunction *func = engine->scriptFunctions[objType->beh.copy];
-		if( func->funcType == asFUNC_SYSTEM )
-		{
-			// Copy all properties
-			for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
-			{
-				asCObjectProperty *prop = objType->properties[n];
-				if( prop->type.IsObject() )
-				{
-					void **dst = (void**)(((char*)this) + prop->byteOffset);
-					void **src = (void**)(((char*)&other) + prop->byteOffset);
-					if( !prop->type.IsObjectHandle() )
-					{
-						if( prop->type.IsReference() || (prop->type.GetTypeInfo()->flags & asOBJ_REF) )
-							CopyObject(*src, *dst, prop->type.GetTypeInfo()->CastToObjectType(), engine);
-						else
-							CopyObject(src, dst, prop->type.GetTypeInfo()->CastToObjectType(), engine);
-					}
-					else
-						CopyHandle((asPWORD*)src, (asPWORD*)dst, prop->type.GetTypeInfo()->CastToObjectType(), engine);
-				}
-				else if (prop->type.IsFuncdef())
-				{
-					asCScriptFunction **dst = (asCScriptFunction**)(((char*)this) + prop->byteOffset);
-					asCScriptFunction **src = (asCScriptFunction**)(((char*)&other) + prop->byteOffset);
-					if (*dst)
-						(*dst)->Release();
-					*dst = *src;
-					if (*dst)
-						(*dst)->AddRef();
-				}
-				else
-				{
-					void *dst = ((char*)this) + prop->byteOffset;
-					void *src = ((char*)&other) + prop->byteOffset;
-					memcpy(dst, src, prop->type.GetSizeInMemoryBytes());
-				}
-			}
-		}
-		else
-		{
-			// Reuse the active context or create a new one to call the script class' opAssign method
-			asIScriptContext *ctx = 0;
-			int r = 0;
-			bool isNested = false;
-
-			ctx = asGetActiveContext();
-			if( ctx )
-			{
-				if( ctx->GetEngine() == engine && ctx->PushState() == asSUCCESS )
-					isNested = true;
-				else
-					ctx = 0;
-			}
-
-			if( ctx == 0 )
-			{
-				// Request a context from the engine
-				ctx = engine->RequestContext();
-				if( ctx == 0 )
-				{
-					// TODO: How to best report this failure?
-					return *this;
-				}
-			}
-
-			r = ctx->Prepare(engine->scriptFunctions[objType->beh.copy]);
-			if( r < 0 )
-			{
-				if( isNested )
-					ctx->PopState();
-				else
-					engine->ReturnContext(ctx);
-				// TODO: How to best report this failure?
-				return *this;
-			}
-
-			r = ctx->SetArgAddress(0, const_cast<asCScriptObject*>(&other));
-			asASSERT( r >= 0 );
-			r = ctx->SetObject(this);
-			asASSERT( r >= 0 );
-
-			for(;;)
-			{
-				r = ctx->Execute();
-
-				// We can't allow this execution to be suspended 
-				// so resume the execution immediately
-				if( r != asEXECUTION_SUSPENDED )
-					break;
-			}
-
-			if( r != asEXECUTION_FINISHED )
-			{
-				if( isNested )
-				{
-					ctx->PopState();
-
-					// If the execution was aborted or an exception occurred,
-					// then we should forward that to the outer execution.
-					if( r == asEXECUTION_EXCEPTION )
-					{
-						// TODO: How to improve this exception
-						ctx->SetException(TXT_EXCEPTION_IN_NESTED_CALL);
-					}
-					else if( r == asEXECUTION_ABORTED )
-						ctx->Abort();
-				}
-				else
-				{
-					// Return the context to the engine
-					engine->ReturnContext(ctx);
-				}
-				return *this;
-			}
-
-			if( isNested )
-				ctx->PopState();
-			else
-			{
-				// Return the context to the engine
-				engine->ReturnContext(ctx);
-			}
-		}
-	}
-
-	return *this;
-}
-
-int asCScriptObject::CopyFrom(asIScriptObject *other)
-{
-	if( other == 0 ) return asINVALID_ARG;
-
-	if( GetTypeId() != other->GetTypeId() )
-		return asINVALID_TYPE;
-
-	*this = *(asCScriptObject*)other;
-
-	return 0;
-}
-
-void *asCScriptObject::AllocateUninitializedObject(asCObjectType *in_objType, asCScriptEngine *engine)
-{
-	void *ptr = 0;
-
-	if( in_objType->flags & asOBJ_SCRIPT_OBJECT )
-	{
-		ptr = engine->CallAlloc(in_objType);
-		ScriptObject_ConstructUnitialized(in_objType, reinterpret_cast<asCScriptObject*>(ptr));
-	}
-	else if( in_objType->flags & asOBJ_TEMPLATE )
-	{
-		// Templates store the original factory that takes the object
-		// type as a hidden parameter in the construct behaviour
-		ptr = engine->CallGlobalFunctionRetPtr(in_objType->beh.construct, in_objType);
-	}
-	else if( in_objType->flags & asOBJ_REF )
-	{
-		ptr = engine->CallGlobalFunctionRetPtr(in_objType->beh.factory);
-	}
-	else
-	{
-		ptr = engine->CallAlloc(in_objType);
-		int funcIndex = in_objType->beh.construct;
-		if( funcIndex )
-			engine->CallObjectMethod(ptr, funcIndex);
-	}
-
-	return ptr;
-}
-
-void asCScriptObject::FreeObject(void *ptr, asCObjectType *in_objType, asCScriptEngine *engine)
-{
-	if( in_objType->flags & asOBJ_REF )
-	{
-		asASSERT( (in_objType->flags & asOBJ_NOCOUNT) || in_objType->beh.release );
-		if(in_objType->beh.release )
-			engine->CallObjectMethod(ptr, in_objType->beh.release);
-	}
-	else
-	{
-		if( in_objType->beh.destruct )
-			engine->CallObjectMethod(ptr, in_objType->beh.destruct);
-
-		engine->CallFree(ptr);
-	}
-}
-
-void asCScriptObject::CopyObject(void *src, void *dst, asCObjectType *in_objType, asCScriptEngine *engine)
-{
-	int funcIndex = in_objType->beh.copy;
-	if( funcIndex )
-	{
-		asCScriptFunction *func = engine->scriptFunctions[in_objType->beh.copy];
-		if( func->funcType == asFUNC_SYSTEM )
-			engine->CallObjectMethod(dst, src, funcIndex);
-		else
-		{
-			// Call the script class' opAssign method
-			asASSERT(in_objType->flags & asOBJ_SCRIPT_OBJECT );
-			reinterpret_cast<asCScriptObject*>(dst)->CopyFrom(reinterpret_cast<asCScriptObject*>(src));
-		}
-	}
-	else if( in_objType->size && (in_objType->flags & asOBJ_POD) )
-		memcpy(dst, src, in_objType->size);
-}
-
-void asCScriptObject::CopyHandle(asPWORD *src, asPWORD *dst, asCObjectType *in_objType, asCScriptEngine *engine)
-{
-	// asOBJ_NOCOUNT doesn't have addref or release behaviours
-	asASSERT( (in_objType->flags & asOBJ_NOCOUNT) || (in_objType->beh.release && in_objType->beh.addref) );
-
-	if( *dst && in_objType->beh.release )
-		engine->CallObjectMethod(*(void**)dst, in_objType->beh.release);
-	*dst = *src;
-	if( *dst && in_objType->beh.addref )
-		engine->CallObjectMethod(*(void**)dst, in_objType->beh.addref);
-}
-
-// TODO: weak: Should move to its own file
-asCLockableSharedBool::asCLockableSharedBool() : value(false) 
-{
-	refCount.set(1);
-}
-
-int asCLockableSharedBool::AddRef() const
-{
-	return refCount.atomicInc();
-}
-
-int asCLockableSharedBool::Release() const
-{
-	int r = refCount.atomicDec();
-	if( r == 0 )
-		asDELETE(const_cast<asCLockableSharedBool*>(this), asCLockableSharedBool);
-	return r;
-}
-
-bool asCLockableSharedBool::Get() const
-{
-	return value;
-}
-
-void asCLockableSharedBool::Set(bool v)
-{
-	// Make sure the value is not changed while another thread  
-	// is inspecting it and taking a decision on what to do.
-	Lock();
-	value = v;
-	Unlock();
-}
-
-void asCLockableSharedBool::Lock() const
-{
-	ENTERCRITICALSECTION(lock);
-}
-
-void asCLockableSharedBool::Unlock() const
-{
-	LEAVECRITICALSECTION(lock);
-}
-
-// Interface
-// Auxiliary function to allow applications to create shared 
-// booleans without having to implement the logic for them
-AS_API asILockableSharedBool *asCreateLockableSharedBool()
-{
-	return asNEW(asCLockableSharedBool);
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2019 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+#include <new>
+#include "as_config.h"
+#include "as_scriptengine.h"
+#include "as_scriptobject.h"
+#include "as_texts.h"
+
+BEGIN_AS_NAMESPACE
+
+// This helper function will call the default factory, that is a script function
+asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngine *engine)
+{
+	asIScriptContext *ctx = 0;
+	int r = 0;
+	bool isNested = false;
+
+	// Use nested call in the context if there is an active context
+	ctx = asGetActiveContext();
+	if( ctx )
+	{
+		// It may not always be possible to reuse the current context, 
+		// in which case we'll have to create a new one any way.
+		if( ctx->GetEngine() == objType->GetEngine() && ctx->PushState() == asSUCCESS )
+			isNested = true;
+		else
+			ctx = 0;
+	}
+	
+	if( ctx == 0 )
+	{
+		// Request a context from the engine
+		ctx = engine->RequestContext();
+		if( ctx == 0 )
+		{
+			// TODO: How to best report this failure?
+			return 0;
+		}
+	}
+
+	r = ctx->Prepare(engine->scriptFunctions[objType->beh.factory]);
+	if( r < 0 )
+	{
+		if( isNested )
+			ctx->PopState();
+		else
+			engine->ReturnContext(ctx);
+		return 0;
+	}
+
+	for(;;)
+	{
+		r = ctx->Execute();
+
+		// We can't allow this execution to be suspended 
+		// so resume the execution immediately
+		if( r != asEXECUTION_SUSPENDED )
+			break;
+	}
+
+	if( r != asEXECUTION_FINISHED )
+	{
+		if( isNested )
+		{
+			ctx->PopState();
+
+			// If the execution was aborted or an exception occurred,
+			// then we should forward that to the outer execution.
+			if( r == asEXECUTION_EXCEPTION )
+			{
+				// TODO: How to improve this exception
+				ctx->SetException(TXT_EXCEPTION_IN_NESTED_CALL);
+			}
+			else if( r == asEXECUTION_ABORTED )
+				ctx->Abort();
+		}
+		else
+			engine->ReturnContext(ctx);
+		return 0;
+	}
+
+	asIScriptObject *ptr = (asIScriptObject*)ctx->GetReturnAddress();
+
+	// Increase the reference, because the context will release its pointer
+	ptr->AddRef();
+
+	if( isNested )
+		ctx->PopState();
+	else
+		engine->ReturnContext(ctx);
+
+	return ptr;
+}
+
+// This helper function will call the copy factory, that is a script function
+// TODO: Clean up: This function is almost identical to ScriptObjectFactory. Should make better use of the identical code.
+asIScriptObject *ScriptObjectCopyFactory(const asCObjectType *objType, void *origObj, asCScriptEngine *engine)
+{
+	asIScriptContext *ctx = 0;
+	int r = 0;
+	bool isNested = false;
+
+	// Use nested call in the context if there is an active context
+	ctx = asGetActiveContext();
+	if (ctx)
+	{
+		// It may not always be possible to reuse the current context, 
+		// in which case we'll have to create a new one any way.
+		if (ctx->GetEngine() == objType->GetEngine() && ctx->PushState() == asSUCCESS)
+			isNested = true;
+		else
+			ctx = 0;
+	}
+
+	if (ctx == 0)
+	{
+		// Request a context from the engine
+		ctx = engine->RequestContext();
+		if (ctx == 0)
+		{
+			// TODO: How to best report this failure?
+			return 0;
+		}
+	}
+
+	r = ctx->Prepare(engine->scriptFunctions[objType->beh.copyfactory]);
+	if (r < 0)
+	{
+		if (isNested)
+			ctx->PopState();
+		else
+			engine->ReturnContext(ctx);
+		return 0;
+	}
+
+	// Let the context handle the case for argument by ref (&) or by handle (@)
+	ctx->SetArgObject(0, origObj);
+
+	for (;;)
+	{
+		r = ctx->Execute();
+
+		// We can't allow this execution to be suspended 
+		// so resume the execution immediately
+		if (r != asEXECUTION_SUSPENDED)
+			break;
+	}
+
+	if (r != asEXECUTION_FINISHED)
+	{
+		if (isNested)
+		{
+			ctx->PopState();
+
+			// If the execution was aborted or an exception occurred,
+			// then we should forward that to the outer execution.
+			if (r == asEXECUTION_EXCEPTION)
+			{
+				// TODO: How to improve this exception
+				ctx->SetException(TXT_EXCEPTION_IN_NESTED_CALL);
+			}
+			else if (r == asEXECUTION_ABORTED)
+				ctx->Abort();
+		}
+		else
+			engine->ReturnContext(ctx);
+		return 0;
+	}
+
+	asIScriptObject *ptr = (asIScriptObject*)ctx->GetReturnAddress();
+
+	// Increase the reference, because the context will release its pointer
+	ptr->AddRef();
+
+	if (isNested)
+		ctx->PopState();
+	else
+		engine->ReturnContext(ctx);
+
+	return ptr;
+}
+
+#ifdef AS_MAX_PORTABILITY
+
+static void ScriptObject_AddRef_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	self->AddRef();
+}
+
+static void ScriptObject_Release_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	self->Release();
+}
+
+static void ScriptObject_GetRefCount_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	*(int*)gen->GetAddressOfReturnLocation() = self->GetRefCount();
+}
+
+static void ScriptObject_SetFlag_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	self->SetFlag();
+}
+
+static void ScriptObject_GetFlag_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	*(bool*)gen->GetAddressOfReturnLocation() = self->GetFlag();
+}
+
+static void ScriptObject_GetWeakRefFlag_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	*(asILockableSharedBool**)gen->GetAddressOfReturnLocation() = self->GetWeakRefFlag();
+}
+
+static void ScriptObject_EnumReferences_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->EnumReferences(engine);
+}
+
+static void ScriptObject_ReleaseAllHandles_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+	asIScriptEngine *engine = *(asIScriptEngine**)gen->GetAddressOfArg(0);
+	self->ReleaseAllHandles(engine);
+}
+
+static void ScriptObject_Assignment_Generic(asIScriptGeneric *gen)
+{
+	asCScriptObject *other = *(asCScriptObject**)gen->GetAddressOfArg(0);
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+
+	*self = *other;
+
+	*(asCScriptObject**)gen->GetAddressOfReturnLocation() = self;
+}
+
+static void ScriptObject_Construct_Generic(asIScriptGeneric *gen)
+{
+	asCObjectType *objType = *(asCObjectType**)gen->GetAddressOfArg(0);
+	asCScriptObject *self = (asCScriptObject*)gen->GetObject();
+
+	ScriptObject_Construct(objType, self);
+}
+
+#endif
+
+void RegisterScriptObject(asCScriptEngine *engine)
+{
+	// Register the default script class behaviours
+	int r = 0;
+	UNUSED_VAR(r); // It is only used in debug mode
+	engine->scriptTypeBehaviours.engine = engine;
+	engine->scriptTypeBehaviours.flags = asOBJ_SCRIPT_OBJECT | asOBJ_REF | asOBJ_GC;
+	engine->scriptTypeBehaviours.name = "$obj";
+#ifndef AS_MAX_PORTABILITY
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptObject_Construct), asCALL_CDECL_OBJLAST, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ADDREF, "void f()", asMETHOD(asCScriptObject,AddRef), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASE, "void f()", asMETHOD(asCScriptObject,Release), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterMethodToObjectType(&engine->scriptTypeBehaviours, "int &opAssign(int &in)", asFUNCTION(ScriptObject_Assignment), asCALL_CDECL_OBJLAST); asASSERT( r >= 0 );
+
+	// Weakref behaviours
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GET_WEAKREF_FLAG, "int &f()", asMETHOD(asCScriptObject,GetWeakRefFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	
+	// Register GC behaviours
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asMETHOD(asCScriptObject,GetRefCount), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_SETGCFLAG, "void f()", asMETHOD(asCScriptObject,SetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asMETHOD(asCScriptObject,GetFlag), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asMETHOD(asCScriptObject,EnumReferences), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asMETHOD(asCScriptObject,ReleaseAllHandles), asCALL_THISCALL, 0); asASSERT( r >= 0 );
+#else
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_CONSTRUCT, "void f(int&in)", asFUNCTION(ScriptObject_Construct_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ADDREF, "void f()", asFUNCTION(ScriptObject_AddRef_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASE, "void f()", asFUNCTION(ScriptObject_Release_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterMethodToObjectType(&engine->scriptTypeBehaviours, "int &opAssign(int &in)", asFUNCTION(ScriptObject_Assignment_Generic), asCALL_GENERIC); asASSERT( r >= 0 );
+
+	// Weakref behaviours
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GET_WEAKREF_FLAG, "int &f()", asFUNCTION(ScriptObject_GetWeakRefFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+
+	// Register GC behaviours
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETREFCOUNT, "int f()", asFUNCTION(ScriptObject_GetRefCount_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_SETGCFLAG, "void f()", asFUNCTION(ScriptObject_SetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_GETGCFLAG, "bool f()", asFUNCTION(ScriptObject_GetFlag_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_ENUMREFS, "void f(int&in)", asFUNCTION(ScriptObject_EnumReferences_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+	r = engine->RegisterBehaviourToObjectType(&engine->scriptTypeBehaviours, asBEHAVE_RELEASEREFS, "void f(int&in)", asFUNCTION(ScriptObject_ReleaseAllHandles_Generic), asCALL_GENERIC, 0); asASSERT( r >= 0 );
+#endif
+}
+
+void ScriptObject_Construct(asCObjectType *objType, asCScriptObject *self)
+{
+	new(self) asCScriptObject(objType);
+}
+
+void ScriptObject_ConstructUnitialized(asCObjectType *objType, asCScriptObject *self)
+{
+	new(self) asCScriptObject(objType, false);
+}
+
+asCScriptObject::asCScriptObject(asCObjectType *ot, bool doInitialize)
+{
+	refCount.set(1);
+	objType = ot;
+	objType->AddRef();
+	isDestructCalled = false;
+	extra = 0;
+	hasRefCountReachedZero = false;
+
+	// Notify the garbage collector of this object
+	if( objType->flags & asOBJ_GC )
+		objType->engine->gc.AddScriptObjectToGC(this, objType);
+
+	// Initialize members to zero. Technically we only need to zero the pointer
+	// members, but just the memset is faster than having to loop and check the datatypes
+	memset((void*)(this+1), 0, objType->size - sizeof(asCScriptObject));
+
+	if( doInitialize )
+	{
+#ifdef AS_NO_MEMBER_INIT
+		// When member initialization is disabled the constructor must make sure
+		// to allocate and initialize all members with the default constructor
+		for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
+		{
+			asCObjectProperty *prop = objType->properties[n];
+			if( prop->type.IsObject() && !prop->type.IsObjectHandle() )
+			{
+				if( prop->type.IsReference() || prop->type.GetTypeInfo()->flags & asOBJ_REF )
+				{
+					asPWORD *ptr = reinterpret_cast<asPWORD*>(reinterpret_cast<asBYTE*>(this) + prop->byteOffset);
+					if( prop->type.GetTypeInfo()->flags & asOBJ_SCRIPT_OBJECT )
+						*ptr = (asPWORD)ScriptObjectFactory(prop->type.GetTypeInfo(), ot->engine);
+					else
+						*ptr = (asPWORD)AllocateUninitializedObject(prop->type.GetTypeInfo(), ot->engine);
+				}
+			}
+		}
+#endif
+	}
+	else
+	{
+		// When the object is created without initialization, all non-handle members must be allocated, but not initialized
+		asCScriptEngine *engine = objType->engine;
+		for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
+		{
+			asCObjectProperty *prop = objType->properties[n];
+			if( prop->type.IsObject() && !prop->type.IsObjectHandle() )
+			{
+				if( prop->type.IsReference() || (prop->type.GetTypeInfo()->flags & asOBJ_REF) )
+				{
+					asPWORD *ptr = reinterpret_cast<asPWORD*>(reinterpret_cast<asBYTE*>(this) + prop->byteOffset);
+					*ptr = (asPWORD)AllocateUninitializedObject(CastToObjectType(prop->type.GetTypeInfo()), engine);
+				}
+			}
+		}
+	}
+}
+
+void asCScriptObject::Destruct()
+{
+	// Call the destructor, which will also call the GCObject's destructor
+	this->~asCScriptObject();
+
+	// Free the memory
+#ifndef WIP_16BYTE_ALIGN
+	userFree(this);
+#else
+	// Script object memory is allocated through asCScriptEngine::CallAlloc()
+	// This free call must match the allocator used in CallAlloc().
+	userFreeAligned(this);
+#endif
+}
+
+asCScriptObject::~asCScriptObject()
+{
+	if( extra )
+	{
+		if( extra->weakRefFlag )
+		{
+			extra->weakRefFlag->Release();
+			extra->weakRefFlag = 0;
+		}
+
+		if( objType->engine )
+		{
+			// Clean the user data
+			for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
+			{
+				if( extra->userData[n+1] )
+				{
+					for( asUINT c = 0; c < objType->engine->cleanScriptObjectFuncs.GetLength(); c++ )
+						if( objType->engine->cleanScriptObjectFuncs[c].type == extra->userData[n] )
+							objType->engine->cleanScriptObjectFuncs[c].cleanFunc(this);
+				}
+			}
+		}
+
+		asDELETE(extra, SExtra);
+	}
+
+	// The engine pointer should be available from the objectType
+	asCScriptEngine *engine = objType->engine;
+
+	// Destroy all properties
+	// In most cases the members are initialized in the order they have been declared, 
+	// so it's safer to uninitialize them from last to first. The order may be different
+	// depending on the use of inheritance and or initialization in the declaration.
+	// TODO: Should the order of initialization be stored by the compiler so that the 
+	//       reverse order can be guaranteed during the destruction?
+	for( int n = (int)objType->properties.GetLength()-1; n >= 0; n-- )
+	{
+		asCObjectProperty *prop = objType->properties[n];
+		if( prop->type.IsObject() )
+		{
+			// Destroy the object
+			asCObjectType *propType = CastToObjectType(prop->type.GetTypeInfo());
+			if( prop->type.IsReference() || propType->flags & asOBJ_REF )
+			{
+				void **ptr = (void**)(((char*)this) + prop->byteOffset);
+				if( *ptr )
+				{
+					FreeObject(*ptr, propType, engine);
+					*(asDWORD*)ptr = 0;
+				}
+			}
+			else
+			{
+				// The object is allocated inline. As only POD objects may be allocated inline
+				// it is not a problem to call the destructor even if the object may never have
+				// been initialized, e.g. if an exception interrupted the constructor.
+				asASSERT( propType->flags & asOBJ_POD );
+
+				void *ptr = (void**)(((char*)this) + prop->byteOffset);
+				if( propType->beh.destruct )
+					engine->CallObjectMethod(ptr, propType->beh.destruct);
+			}
+		}
+		else if( prop->type.IsFuncdef() )
+		{
+			// Release the function descriptor
+			asCScriptFunction **ptr = (asCScriptFunction**)(((char*)this) + prop->byteOffset);
+			if (*ptr)
+			{
+				(*ptr)->Release();
+				*ptr = 0;
+			}
+		}
+	}
+
+	objType->Release();
+	objType = 0;
+
+	// Something is really wrong if the refCount is not 0 by now
+	asASSERT( refCount.get() == 0 );
+}
+
+asILockableSharedBool *asCScriptObject::GetWeakRefFlag() const
+{
+	// If the object's refCount has already reached zero then the object is already
+	// about to be destroyed so it's ok to return null if the weakRefFlag doesn't already
+	// exist
+	if( (extra && extra->weakRefFlag) || hasRefCountReachedZero )
+		return extra->weakRefFlag;
+
+	// Lock globally so no other thread can attempt
+	// to create a shared bool at the same time.
+	// TODO: runtime optimize: Instead of locking globally, it would be possible to have 
+	//                         a critical section per object type. This would reduce the 
+	//                         chances of two threads lock on the same critical section.
+	asAcquireExclusiveLock();
+
+	// Make sure another thread didn't create the 
+	// flag while we waited for the lock
+	if( !extra )
+		extra = asNEW(SExtra);
+	if( !extra->weakRefFlag )
+		extra->weakRefFlag = asNEW(asCLockableSharedBool);
+
+	asReleaseExclusiveLock();
+
+	return extra->weakRefFlag;
+}
+
+void *asCScriptObject::GetUserData(asPWORD type) const
+{
+	if( !extra )
+		return 0;
+
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	// TODO: runtime optimize: Would it be worth it to have a rwlock per object type?
+	asAcquireSharedLock();
+
+	for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
+	{
+		if( extra->userData[n] == type )
+		{
+			void *userData = reinterpret_cast<void*>(extra->userData[n+1]);
+			asReleaseSharedLock();
+			return userData;
+		}
+	}
+
+	asReleaseSharedLock();
+
+	return 0;
+}
+
+void *asCScriptObject::SetUserData(void *data, asPWORD type)
+{
+	// Lock globally so no other thread can attempt
+	// to manipulate the extra data at the same time.
+	// TODO: runtime optimize: Instead of locking globally, it would be possible to have 
+	//                         a critical section per object type. This would reduce the 
+	//                         chances of two threads lock on the same critical section.
+	asAcquireExclusiveLock();
+
+	// Make sure another thread didn't create the 
+	// flag while we waited for the lock
+	if( !extra )
+		extra = asNEW(SExtra);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for( asUINT n = 0; n < extra->userData.GetLength(); n += 2 )
+	{
+		if( extra->userData[n] == type )
+		{
+			void *oldData = reinterpret_cast<void*>(extra->userData[n+1]);
+			extra->userData[n+1] = reinterpret_cast<asPWORD>(data);
+
+			asReleaseExclusiveLock();
+
+			return oldData;
+		}
+	}
+
+	extra->userData.PushLast(type);
+	extra->userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	asReleaseExclusiveLock();
+
+	return 0;
+}
+
+asIScriptEngine *asCScriptObject::GetEngine() const
+{
+	return objType->engine;
+}
+
+int asCScriptObject::AddRef() const
+{
+	// Warn in case the application tries to increase the refCount after it has reached zero.
+	// This may happen for example if the application calls a method on the class while it is
+	// being destroyed. The application shouldn't do this because it may cause application
+	// crashes if members that have already been destroyed are accessed accidentally.
+	if( hasRefCountReachedZero )
+	{
+		if( objType && objType->engine )
+		{
+			asCString msg;
+			msg.Format(TXT_RESURRECTING_SCRIPTOBJECT_s, objType->name.AddressOf());
+			objType->engine->WriteMessage("", 0, 0, asMSGTYPE_ERROR, msg.AddressOf());
+		}
+	}
+
+	// Increase counter and clear flag set by GC
+	gcFlag = false;
+	return refCount.atomicInc();
+}
+
+int asCScriptObject::Release() const
+{
+	// Clear the flag set by the GC
+	gcFlag = false;
+
+	// If the weak ref flag exists it is because someone held a weak ref
+	// and that someone may add a reference to the object at any time. It
+	// is ok to check the existance of the weakRefFlag without locking here
+	// because if the refCount is 1 then no other thread is currently 
+	// creating the weakRefFlag.
+	if( refCount.get() == 1 && extra && extra->weakRefFlag )
+	{
+		// Set the flag to tell others that the object is no longer alive
+		// We must do this before decreasing the refCount to 0 so we don't
+		// end up with a race condition between this thread attempting to 
+		// destroy the object and the other that temporary added a strong
+		// ref from the weak ref.
+		extra->weakRefFlag->Set(true);
+	}
+
+	// Call the script destructor behaviour if the reference counter is 1.
+	if( refCount.get() == 1 && !isDestructCalled )
+	{
+		// This cast is OK since we are the last reference
+		const_cast<asCScriptObject*>(this)->CallDestructor();
+	}
+
+	// Now do the actual releasing
+	int r = refCount.atomicDec();
+	if( r == 0 )
+	{
+		// Flag this object as being destroyed so the application
+		// can be warned if the code attempts to resurrect the object
+		// during the destructor. This also avoids a recursive call
+		// to the destructor which would crash the application if it
+		// really does resurrect the object.
+		if( !hasRefCountReachedZero )
+		{
+			hasRefCountReachedZero = true;
+
+			// This cast is OK since we are the last reference
+			const_cast<asCScriptObject*>(this)->Destruct();
+		}
+		return 0;
+	}
+
+	return r;
+}
+
+void asCScriptObject::CallDestructor()
+{
+	// Only allow the destructor to be called once
+	if( isDestructCalled ) return;
+
+	asIScriptContext *ctx = 0;
+	bool isNested = false;
+	bool doAbort = false;
+
+	// Make sure the destructor is called once only, even if the  
+	// reference count is increased and then decreased again
+	isDestructCalled = true;
+
+	// Call the destructor for this class and all the super classes
+	asCObjectType *ot = objType;
+	while( ot )
+	{
+		int funcIndex = ot->beh.destruct;
+		if( funcIndex )
+		{
+			if( ctx == 0 )
+			{
+				// Check for active context first as it is quicker
+				// to reuse than to set up a new one.
+				ctx = asGetActiveContext();
+				if( ctx )
+				{
+					if( ctx->GetEngine() == objType->GetEngine() && ctx->PushState() == asSUCCESS )
+						isNested = true;
+					else
+						ctx = 0;
+				}
+
+				if( ctx == 0 )
+				{
+					// Request a context from the engine
+					ctx = objType->engine->RequestContext();
+					if( ctx == 0 )
+					{
+						// TODO: How to best report this failure?
+						return;
+					}
+				}
+			}
+
+			int r = ctx->Prepare(objType->engine->scriptFunctions[funcIndex]);
+			if( r >= 0 )
+			{
+				ctx->SetObject(this);
+
+				for(;;)
+				{
+					r = ctx->Execute();
+
+					// If the script tries to suspend itself just restart it
+					if( r != asEXECUTION_SUSPENDED )
+						break;
+				}
+
+				// Exceptions in the destructor will be ignored, as there is not much
+				// that can be done about them. However a request to abort the execution
+				// will be forwarded to the outer execution, in case of a nested call.
+				if( r == asEXECUTION_ABORTED )
+					doAbort = true;
+
+				// Observe, even though the current destructor was aborted or an exception
+				// occurred, we still try to execute the base class' destructor if available
+				// in order to free as many resources as possible.
+			}
+		}
+
+		ot = ot->derivedFrom;
+	}
+
+	if( ctx )
+	{
+		if( isNested )
+		{
+			ctx->PopState();
+
+			// Forward any request to abort the execution to the outer call
+			if( doAbort )
+				ctx->Abort();
+		}
+		else
+		{
+			// Return the context to engine
+			objType->engine->ReturnContext(ctx);
+		}
+	}
+}
+
+asITypeInfo *asCScriptObject::GetObjectType() const
+{
+	return objType;
+}
+
+int asCScriptObject::GetRefCount()
+{
+	return refCount.get();
+}
+
+void asCScriptObject::SetFlag()
+{
+	gcFlag = true;
+}
+
+bool asCScriptObject::GetFlag()
+{
+	return gcFlag;
+}
+
+// interface
+int asCScriptObject::GetTypeId() const
+{
+	asCDataType dt = asCDataType::CreateType(objType, false);
+	return objType->engine->GetTypeIdFromDataType(dt);
+}
+
+asUINT asCScriptObject::GetPropertyCount() const
+{
+	return asUINT(objType->properties.GetLength());
+}
+
+int asCScriptObject::GetPropertyTypeId(asUINT prop) const
+{
+	if( prop >= objType->properties.GetLength() )
+		return asINVALID_ARG;
+
+	return objType->engine->GetTypeIdFromDataType(objType->properties[prop]->type);
+}
+
+const char *asCScriptObject::GetPropertyName(asUINT prop) const
+{
+	if( prop >= objType->properties.GetLength() )
+		return 0;
+
+	return objType->properties[prop]->name.AddressOf();
+}
+
+void *asCScriptObject::GetAddressOfProperty(asUINT prop)
+{
+	if( prop >= objType->properties.GetLength() )
+		return 0;
+
+	// Objects are stored by reference, so this must be dereferenced
+	asCDataType *dt = &objType->properties[prop]->type;
+	if( dt->IsObject() && !dt->IsObjectHandle() &&
+		(dt->IsReference() || dt->GetTypeInfo()->flags & asOBJ_REF) )
+		return *(void**)(((char*)this) + objType->properties[prop]->byteOffset);
+
+	return (void*)(((char*)this) + objType->properties[prop]->byteOffset);
+}
+
+void asCScriptObject::EnumReferences(asIScriptEngine *engine)
+{
+	// We'll notify the GC of all object handles that we're holding
+	for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
+	{
+		asCObjectProperty *prop = objType->properties[n];
+		void *ptr = 0;
+		if (prop->type.IsObject())
+		{
+			if (prop->type.IsReference() || (prop->type.GetTypeInfo()->flags & asOBJ_REF))
+				ptr = *(void**)(((char*)this) + prop->byteOffset);
+			else
+				ptr = (void*)(((char*)this) + prop->byteOffset);
+
+			// The members of the value type needs to be enumerated
+			// too, since the value type may be holding a reference.
+			if ((prop->type.GetTypeInfo()->flags & asOBJ_VALUE) && (prop->type.GetTypeInfo()->flags & asOBJ_GC))
+			{
+				reinterpret_cast<asCScriptEngine*>(engine)->CallObjectMethod(ptr, engine, CastToObjectType(prop->type.GetTypeInfo())->beh.gcEnumReferences);
+			}
+		}
+		else if (prop->type.IsFuncdef())
+			ptr = *(void**)(((char*)this) + prop->byteOffset);
+
+		if (ptr)
+			((asCScriptEngine*)engine)->GCEnumCallback(ptr);
+	}
+}
+
+void asCScriptObject::ReleaseAllHandles(asIScriptEngine *engine)
+{
+	for( asUINT n = 0; n < objType->properties.GetLength(); n++ )
+	{
+		asCObjectProperty *prop = objType->properties[n];
+
+		if (prop->type.IsObject())
+		{
+			if (prop->type.IsObjectHandle())
+			{
+				void **ptr = (void**)(((char*)this) + prop->byteOffset);
+				if (*ptr)
+				{
+					asASSERT((prop->type.GetTypeInfo()->flags & asOBJ_NOCOUNT) || prop->type.GetBehaviour()->release);
+					if (prop->type.GetBehaviour()->release)
+						((asCScriptEngine*)engine)->CallObjectMethod(*ptr, prop->type.GetBehaviour()->release);
+					*ptr = 0;
+				}
+			}
+			else if ((prop->type.GetTypeInfo()->flags & asOBJ_VALUE) && (prop->type.GetTypeInfo()->flags & asOBJ_GC))
+			{
+				// The members of the members needs to be released
+				// too, since they may be holding a reference. Even
+				// if the member is a value type.
+				void *ptr = 0;
+				if (prop->type.IsReference())
+					ptr = *(void**)(((char*)this) + prop->byteOffset);
+				else
+					ptr = (void*)(((char*)this) + prop->byteOffset);
+
+				reinterpret_cast<asCScriptEngine*>(engine)->CallObjectMethod(ptr, engine, CastToObjectType(prop->type.GetTypeInfo())->beh.gcReleaseAllReferences);
+			}
+		}
+		else if (prop->type.IsFuncdef())
+		{
+			asCScriptFunction **ptr = (asCScriptFunction**)(((char*)this) + prop->byteOffset);
+			if (*ptr)
+			{
+				(*ptr)->Release();
+				*ptr = 0;
+			}
+		}
+	}
+}
+
+asCScriptObject &ScriptObject_Assignment(asCScriptObject *other, asCScriptObject *self)
+{
+	return (*self = *other);
+}
+
+asCScriptObject &asCScriptObject::operator=(const asCScriptObject &other)
+{
+	CopyFromAs(&other, objType);
+	return *this;
+}
+
+// internal
+int asCScriptObject::CopyFromAs(const asCScriptObject *other, asCObjectType *in_objType)
+{
+	if( other != this )
+	{
+		if( !other->objType->DerivesFrom(in_objType) )
+		{
+			// We cannot allow a value assignment from a type that isn't the same or 
+			// derives from this type as the member properties may not have the same layout
+			asIScriptContext *ctx = asGetActiveContext();
+			ctx->SetException(TXT_MISMATCH_IN_VALUE_ASSIGN);
+			return asERROR;
+		}
+
+		// If the script class implements the opAssign method, it should be called
+		asCScriptEngine *engine = in_objType->engine;
+		asCScriptFunction *func = engine->scriptFunctions[in_objType->beh.copy];
+		if( func->funcType == asFUNC_SYSTEM )
+		{
+			// If derived, use the base class' assignment operator to copy the inherited
+			// properties. Then only copy new properties for the derived class
+			if( in_objType->derivedFrom )
+				CopyFromAs(other, in_objType->derivedFrom);
+			
+			for( asUINT n = in_objType->derivedFrom ? in_objType->derivedFrom->properties.GetLength() : 0; 
+			     n < in_objType->properties.GetLength(); 
+				 n++ )
+			{
+				asCObjectProperty *prop = in_objType->properties[n];
+				if( prop->type.IsObject() )
+				{
+					void **dst = (void**)(((char*)this) + prop->byteOffset);
+					void **src = (void**)(((char*)other) + prop->byteOffset);
+					if( !prop->type.IsObjectHandle() )
+					{
+						if( prop->type.IsReference() || (prop->type.GetTypeInfo()->flags & asOBJ_REF) )
+							CopyObject(*src, *dst, CastToObjectType(prop->type.GetTypeInfo()), engine);
+						else
+							CopyObject(src, dst, CastToObjectType(prop->type.GetTypeInfo()), engine);
+					}
+					else
+						CopyHandle((asPWORD*)src, (asPWORD*)dst, CastToObjectType(prop->type.GetTypeInfo()), engine);
+				}
+				else if (prop->type.IsFuncdef())
+				{
+					asCScriptFunction **dst = (asCScriptFunction**)(((char*)this) + prop->byteOffset);
+					asCScriptFunction **src = (asCScriptFunction**)(((char*)other) + prop->byteOffset);
+					if (*dst)
+						(*dst)->Release();
+					*dst = *src;
+					if (*dst)
+						(*dst)->AddRef();
+				}
+				else
+				{
+					void *dst = ((char*)this) + prop->byteOffset;
+					void *src = ((char*)other) + prop->byteOffset;
+					memcpy(dst, src, prop->type.GetSizeInMemoryBytes());
+				}
+			}
+		}
+		else
+		{
+			// Reuse the active context or create a new one to call the script class' opAssign method
+			asIScriptContext *ctx = 0;
+			int r = 0;
+			bool isNested = false;
+
+			ctx = asGetActiveContext();
+			if( ctx )
+			{
+				if( ctx->GetEngine() == engine && ctx->PushState() == asSUCCESS )
+					isNested = true;
+				else
+					ctx = 0;
+			}
+
+			if( ctx == 0 )
+			{
+				// Request a context from the engine
+				ctx = engine->RequestContext();
+				if( ctx == 0 )
+					return asERROR;
+			}
+
+			r = ctx->Prepare(engine->scriptFunctions[in_objType->beh.copy]);
+			if( r < 0 )
+			{
+				if( isNested )
+					ctx->PopState();
+				else
+					engine->ReturnContext(ctx);
+				return r;
+			}
+
+			r = ctx->SetArgAddress(0, const_cast<asCScriptObject*>(other));
+			asASSERT( r >= 0 );
+			r = ctx->SetObject(this);
+			asASSERT( r >= 0 );
+
+			for(;;)
+			{
+				r = ctx->Execute();
+
+				// We can't allow this execution to be suspended 
+				// so resume the execution immediately
+				if( r != asEXECUTION_SUSPENDED )
+					break;
+			}
+
+			if( r != asEXECUTION_FINISHED )
+			{
+				if( isNested )
+				{
+					ctx->PopState();
+
+					// If the execution was aborted or an exception occurred,
+					// then we should forward that to the outer execution.
+					if( r == asEXECUTION_EXCEPTION )
+					{
+						// TODO: How to improve this exception
+						ctx->SetException(TXT_EXCEPTION_IN_NESTED_CALL);
+					}
+					else if( r == asEXECUTION_ABORTED )
+						ctx->Abort();
+				}
+				else
+				{
+					// Return the context to the engine
+					engine->ReturnContext(ctx);
+				}
+				return asERROR;
+			}
+
+			if( isNested )
+				ctx->PopState();
+			else
+			{
+				// Return the context to the engine
+				engine->ReturnContext(ctx);
+			}
+		}
+	}
+
+	return asSUCCESS;
+}
+
+int asCScriptObject::CopyFrom(const asIScriptObject *other)
+{
+	if( other == 0 ) return asINVALID_ARG;
+
+	if( GetTypeId() != other->GetTypeId() )
+		return asINVALID_TYPE;
+
+	*this = *(asCScriptObject*)other;
+
+	return asSUCCESS;
+}
+
+void *asCScriptObject::AllocateUninitializedObject(asCObjectType *in_objType, asCScriptEngine *engine)
+{
+	void *ptr = 0;
+
+	if( in_objType->flags & asOBJ_SCRIPT_OBJECT )
+	{
+		ptr = engine->CallAlloc(in_objType);
+		ScriptObject_ConstructUnitialized(in_objType, reinterpret_cast<asCScriptObject*>(ptr));
+	}
+	else if( in_objType->flags & asOBJ_TEMPLATE )
+	{
+		// Templates store the original factory that takes the object
+		// type as a hidden parameter in the construct behaviour
+		ptr = engine->CallGlobalFunctionRetPtr(in_objType->beh.construct, in_objType);
+	}
+	else if( in_objType->flags & asOBJ_REF )
+	{
+		ptr = engine->CallGlobalFunctionRetPtr(in_objType->beh.factory);
+	}
+	else
+	{
+		ptr = engine->CallAlloc(in_objType);
+		int funcIndex = in_objType->beh.construct;
+		if( funcIndex )
+			engine->CallObjectMethod(ptr, funcIndex);
+	}
+
+	return ptr;
+}
+
+void asCScriptObject::FreeObject(void *ptr, asCObjectType *in_objType, asCScriptEngine *engine)
+{
+	if( in_objType->flags & asOBJ_REF )
+	{
+		asASSERT( (in_objType->flags & asOBJ_NOCOUNT) || in_objType->beh.release );
+		if(in_objType->beh.release )
+			engine->CallObjectMethod(ptr, in_objType->beh.release);
+	}
+	else
+	{
+		if( in_objType->beh.destruct )
+			engine->CallObjectMethod(ptr, in_objType->beh.destruct);
+
+		engine->CallFree(ptr);
+	}
+}
+
+void asCScriptObject::CopyObject(const void *src, void *dst, asCObjectType *in_objType, asCScriptEngine *engine)
+{
+	int funcIndex = in_objType->beh.copy;
+	if( funcIndex )
+	{
+		asCScriptFunction *func = engine->scriptFunctions[in_objType->beh.copy];
+		if( func->funcType == asFUNC_SYSTEM )
+			engine->CallObjectMethod(dst, const_cast<void*>(src), funcIndex);
+		else
+		{
+			// Call the script class' opAssign method
+			asASSERT(in_objType->flags & asOBJ_SCRIPT_OBJECT );
+			reinterpret_cast<asCScriptObject*>(dst)->CopyFrom(reinterpret_cast<const asCScriptObject*>(src));
+		}
+	}
+	else if( in_objType->size && (in_objType->flags & asOBJ_POD) )
+		memcpy(dst, src, in_objType->size);
+}
+
+void asCScriptObject::CopyHandle(asPWORD *src, asPWORD *dst, asCObjectType *in_objType, asCScriptEngine *engine)
+{
+	// asOBJ_NOCOUNT doesn't have addref or release behaviours
+	asASSERT( (in_objType->flags & asOBJ_NOCOUNT) || (in_objType->beh.release && in_objType->beh.addref) );
+
+	if( *dst && in_objType->beh.release )
+		engine->CallObjectMethod(*(void**)dst, in_objType->beh.release);
+	*dst = *src;
+	if( *dst && in_objType->beh.addref )
+		engine->CallObjectMethod(*(void**)dst, in_objType->beh.addref);
+}
+
+// TODO: weak: Should move to its own file
+asCLockableSharedBool::asCLockableSharedBool() : value(false) 
+{
+	refCount.set(1);
+}
+
+int asCLockableSharedBool::AddRef() const
+{
+	return refCount.atomicInc();
+}
+
+int asCLockableSharedBool::Release() const
+{
+	int r = refCount.atomicDec();
+	if( r == 0 )
+		asDELETE(const_cast<asCLockableSharedBool*>(this), asCLockableSharedBool);
+	return r;
+}
+
+bool asCLockableSharedBool::Get() const
+{
+	return value;
+}
+
+void asCLockableSharedBool::Set(bool v)
+{
+	// Make sure the value is not changed while another thread  
+	// is inspecting it and taking a decision on what to do.
+	Lock();
+	value = v;
+	Unlock();
+}
+
+void asCLockableSharedBool::Lock() const
+{
+	ENTERCRITICALSECTION(lock);
+}
+
+void asCLockableSharedBool::Unlock() const
+{
+	LEAVECRITICALSECTION(lock);
+}
+
+// Interface
+// Auxiliary function to allow applications to create shared 
+// booleans without having to implement the logic for them
+AS_API asILockableSharedBool *asCreateLockableSharedBool()
+{
+	return asNEW(asCLockableSharedBool);
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_scriptobject.h b/Sources/AngelScript/source/as_scriptobject.h
old mode 100755
new mode 100644
index c87941d89..77a435e62
--- a/Sources/AngelScript/source/as_scriptobject.h
+++ b/Sources/AngelScript/source/as_scriptobject.h
@@ -1,163 +1,165 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_scriptobject.h
-//
-// A generic class for handling script declared structures
-//
-
-
-
-#ifndef AS_SCRIPTOBJECT_H
-#define AS_SCRIPTOBJECT_H
-
-#include "as_config.h"
-#include "as_atomic.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCObjectType;
-
-// TODO: Add const overload for GetAddressOfProperty
-
-// TODO: weak: Should move to its own file
-class asCLockableSharedBool : public asILockableSharedBool
-{
-public:
-	asCLockableSharedBool();
-	int AddRef() const;
-	int Release() const;
-
-	bool Get() const;
-	void Set(bool);
-	
-	void Lock() const;
-	void Unlock() const;
-
-protected:
-	mutable asCAtomic refCount;
-	bool      value;
-	DECLARECRITICALSECTION(mutable lock);
-};
-
-class asCScriptObject : public asIScriptObject
-{
-public:
-//===================================
-// From asIScriptObject
-//===================================
-
-	// Memory management
-	int                    AddRef() const;
-	int                    Release() const;
-	asILockableSharedBool *GetWeakRefFlag() const;
-
-	// Type info
-	int            GetTypeId() const;
-	asITypeInfo   *GetObjectType() const;
-
-	// Class properties
-	asUINT      GetPropertyCount() const;
-	int         GetPropertyTypeId(asUINT prop) const;
-	const char *GetPropertyName(asUINT prop) const;
-	void       *GetAddressOfProperty(asUINT prop);
-
-	// Miscellaneous
-	asIScriptEngine *GetEngine() const;
-	int              CopyFrom(asIScriptObject *other);
-
-	// User data
-	void *SetUserData(void *data, asPWORD type = 0);
-	void *GetUserData(asPWORD type = 0) const;
-
-//====================================
-// Internal
-//====================================
-	asCScriptObject(asCObjectType *objType, bool doInitialize = true);
-	virtual ~asCScriptObject();
-
-	asCScriptObject &operator=(const asCScriptObject &other);
-
-	// GC methods
-	void Destruct();
-	int  GetRefCount();
-	void SetFlag();
-	bool GetFlag();
-	void EnumReferences(asIScriptEngine *engine);
-	void ReleaseAllHandles(asIScriptEngine *engine);
-
-	// Used for properties
-	void *AllocateUninitializedObject(asCObjectType *objType, asCScriptEngine *engine);
-	void FreeObject(void *ptr, asCObjectType *objType, asCScriptEngine *engine);
-	void CopyObject(void *src, void *dst, asCObjectType *objType, asCScriptEngine *engine);
-	void CopyHandle(asPWORD *src, asPWORD *dst, asCObjectType *objType, asCScriptEngine *engine);
-
-	void CallDestructor();
-
-//=============================================
-// Properties
-//=============================================
-protected:
-	friend class asCContext;
-	asCObjectType    *objType;
-
-	mutable asCAtomic refCount;
-	mutable asBYTE    gcFlag:1;
-	mutable asBYTE    hasRefCountReachedZero:1;
-	bool              isDestructCalled;
-
-	// Most script classes instances won't have neither the weakRefFlags nor
-	// userData so we only allocate this if requested. Even when used it is 
-	// not something that will be accessed all the time so having the extra
-	// indirection will not affect the performance significantly.
-	struct SExtra
-	{
-		SExtra() : weakRefFlag(0) {};
-		asCLockableSharedBool *weakRefFlag;
-		asCArray<asPWORD>      userData;
-	};
-	mutable SExtra *extra;
-};
-
-void ScriptObject_Construct(asCObjectType *objType, asCScriptObject *self);
-asCScriptObject &ScriptObject_Assignment(asCScriptObject *other, asCScriptObject *self);
-
-void ScriptObject_ConstructUnitialized(asCObjectType *objType, asCScriptObject *self);
-
-void RegisterScriptObject(asCScriptEngine *engine);
-
-asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngine *engine);
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2019 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_scriptobject.h
+//
+// A generic class for handling script declared structures
+//
+
+
+
+#ifndef AS_SCRIPTOBJECT_H
+#define AS_SCRIPTOBJECT_H
+
+#include "as_config.h"
+#include "as_atomic.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCObjectType;
+
+// TODO: Add const overload for GetAddressOfProperty
+
+// TODO: weak: Should move to its own file
+class asCLockableSharedBool : public asILockableSharedBool
+{
+public:
+	asCLockableSharedBool();
+	int AddRef() const;
+	int Release() const;
+
+	bool Get() const;
+	void Set(bool);
+
+	void Lock() const;
+	void Unlock() const;
+
+protected:
+	mutable asCAtomic refCount;
+	bool      value;
+	DECLARECRITICALSECTION(mutable lock)
+};
+
+class asCScriptObject : public asIScriptObject
+{
+public:
+//===================================
+// From asIScriptObject
+//===================================
+
+	// Memory management
+	int                    AddRef() const;
+	int                    Release() const;
+	asILockableSharedBool *GetWeakRefFlag() const;
+
+	// Type info
+	int            GetTypeId() const;
+	asITypeInfo   *GetObjectType() const;
+
+	// Class properties
+	asUINT      GetPropertyCount() const;
+	int         GetPropertyTypeId(asUINT prop) const;
+	const char *GetPropertyName(asUINT prop) const;
+	void       *GetAddressOfProperty(asUINT prop);
+
+	// Miscellaneous
+	asIScriptEngine *GetEngine() const;
+	int              CopyFrom(const asIScriptObject *other);
+
+	// User data
+	void *SetUserData(void *data, asPWORD type = 0);
+	void *GetUserData(asPWORD type = 0) const;
+
+//====================================
+// Internal
+//====================================
+	asCScriptObject(asCObjectType *objType, bool doInitialize = true);
+	virtual ~asCScriptObject();
+
+	asCScriptObject &operator=(const asCScriptObject &other);
+
+	// GC methods
+	void Destruct();
+	int  GetRefCount();
+	void SetFlag();
+	bool GetFlag();
+	void EnumReferences(asIScriptEngine *engine);
+	void ReleaseAllHandles(asIScriptEngine *engine);
+
+	// Used for properties
+	void *AllocateUninitializedObject(asCObjectType *objType, asCScriptEngine *engine);
+	void FreeObject(void *ptr, asCObjectType *objType, asCScriptEngine *engine);
+	void CopyObject(const void *src, void *dst, asCObjectType *objType, asCScriptEngine *engine);
+	void CopyHandle(asPWORD *src, asPWORD *dst, asCObjectType *objType, asCScriptEngine *engine);
+	int  CopyFromAs(const asCScriptObject *other, asCObjectType *objType);
+
+	void CallDestructor();
+
+//=============================================
+// Properties
+//=============================================
+protected:
+	friend class asCContext;
+	asCObjectType    *objType;
+
+	mutable asCAtomic refCount;
+	mutable asBYTE    gcFlag:1;
+	mutable asBYTE    hasRefCountReachedZero:1;
+	bool              isDestructCalled;
+
+	// Most script classes instances won't have neither the weakRefFlags nor
+	// userData so we only allocate this if requested. Even when used it is
+	// not something that will be accessed all the time so having the extra
+	// indirection will not affect the performance significantly.
+	struct SExtra
+	{
+		SExtra() : weakRefFlag(0) {};
+		asCLockableSharedBool *weakRefFlag;
+		asCArray<asPWORD>      userData;
+	};
+	mutable SExtra *extra;
+};
+
+void ScriptObject_Construct(asCObjectType *objType, asCScriptObject *self);
+asCScriptObject &ScriptObject_Assignment(asCScriptObject *other, asCScriptObject *self);
+
+void ScriptObject_ConstructUnitialized(asCObjectType *objType, asCScriptObject *self);
+
+void RegisterScriptObject(asCScriptEngine *engine);
+
+asIScriptObject *ScriptObjectFactory(const asCObjectType *objType, asCScriptEngine *engine);
+asIScriptObject *ScriptObjectCopyFactory(const asCObjectType *objType, void *origObj, asCScriptEngine *engine);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_string.cpp b/Sources/AngelScript/source/as_string.cpp
old mode 100755
new mode 100644
index b9f63f8da..8bd3edfe3
--- a/Sources/AngelScript/source/as_string.cpp
+++ b/Sources/AngelScript/source/as_string.cpp
@@ -1,483 +1,487 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-#include "as_config.h"
-
-#include <stdarg.h>		// va_list, va_start(), etc
-#include <stdlib.h>		// strtod(), strtol()
-#include <string.h>		// some compilers declare memcpy() here
-
-#if !defined(AS_NO_MEMORY_H)
-#include <memory.h>
-#endif
-
-#include "as_string.h"
-#include "as_string_util.h"
-
-asCString::asCString()
-{
-	length = 0;
-	local[0] = 0;
-}
-
-// Copy constructor
-asCString::asCString(const asCString &str)
-{
-	length = 0;
-	local[0] = 0;
-
-	Assign(str.AddressOf(), str.length);
-}
-
-#ifdef AS_CAN_USE_CPP11
-asCString::asCString(asCString &&str)
-{
-	if( str.length <= 11 )
-	{
-		length = str.length;
-		memcpy(local, str.local, length);
-		local[length] = 0;
-	}
-	else
-	{
-		dynamic = str.dynamic;
-		length = str.length;
-	}
-
-	str.dynamic = 0;
-	str.length = 0;
-}
-#endif // c++11
-
-asCString::asCString(const char *str, size_t len)
-{
-	length = 0;
-	local[0] = 0;
-
-	Assign(str, len);
-}
-
-asCString::asCString(const char *str)
-{
-	length = 0;
-	local[0] = 0;
-
-	size_t len = strlen(str);
-	Assign(str, len);
-}
-
-asCString::asCString(char ch)
-{
-	length = 0;
-	local[0] = 0;
-
-	Assign(&ch, 1);
-}
-
-asCString::~asCString()
-{
-	if( length > 11 && dynamic )
-	{
-		asDELETEARRAY(dynamic);
-	}
-}
-
-char *asCString::AddressOf()
-{
-	if( length <= 11 )
-		return local;
-	else
-		return dynamic;
-}
-
-const char *asCString::AddressOf() const
-{
-	if( length <= 11 )
-		return local;
-	else
-		return dynamic;
-}
-
-void asCString::SetLength(size_t len)
-{
-	Allocate(len, true);
-}
-
-void asCString::Allocate(size_t len, bool keepData)
-{
-	// If we stored the capacity of the dynamically allocated buffer it would be possible
-	// to save some memory allocations if a string decreases in size then increases again,
-	// but this would require extra bytes in the string object itself, or a decrease of 
-	// the static buffer, which in turn would mean extra memory is needed. I've tested each
-	// of these options, and it turned out that the current choice is what best balanced
-	// the number of allocations against the size of the allocations.
-
-	if( len > 11 && len > length )
-	{
-		// Allocate a new dynamic buffer if the new one is larger than the old
-		char *buf = asNEWARRAY(char,len+1);
-		if( buf == 0 )
-		{
-			// Out of memory. Return without modifying anything
-			return;
-		}
-
-		if( keepData )
-		{
-			int l = (int)len < (int)length ? (int)len : (int)length;
-			memcpy(buf, AddressOf(), l);
-		}
-
-		if( length > 11 )
-		{
-			asDELETEARRAY(dynamic);
-		}
-
-		dynamic = buf;
-	}
-	else if( len <= 11 && length > 11 )
-	{
-		// Free the dynamic buffer, since it is no longer needed
-		char *buf = dynamic;
-		if( keepData )
-		{
-			memcpy(&local, buf, len);
-		}
-		asDELETEARRAY(buf);
-	}
-
-	length = (int)len;
-
-	// Make sure the buffer is null terminated
-	AddressOf()[length] = 0;
-}
-
-void asCString::Assign(const char *str, size_t len)
-{
-	Allocate(len, false);
-
-	// Copy the string
-	memcpy(AddressOf(), str, length);
-	AddressOf()[length] = 0;
-}
-
-asCString &asCString::operator =(const char *str)
-{
-	size_t len = str ? strlen(str) : 0;
-	Assign(str, len);
-
-	return *this;
-}
-
-asCString &asCString::operator =(const asCString &str)
-{
-	Assign(str.AddressOf(), str.length);
-
-	return *this;
-}
-
-#ifdef AS_CAN_USE_CPP11
-asCString &asCString::operator =(asCString &&str)
-{
-	if( this != &str )
-	{
-		if( length > 11 && dynamic )
-		{
-			asDELETEARRAY(dynamic);
-		}
-
-		if ( str.length <= 11 )
-		{
-			length = str.length;
-
-			memcpy(local, str.local, length);
-			local[length] = 0;
-		}
-		else
-		{
-			dynamic = str.dynamic;
-			length = str.length;
-		}
-
-		str.dynamic = 0;
-		str.length = 0;
-	}
-
-	return *this;
-}
-#endif // c++11
-
-asCString &asCString::operator =(char ch)
-{
-	Assign(&ch, 1);
-
-	return *this;
-}
-
-void asCString::Concatenate(const char *str, size_t len)
-{
-	asUINT oldLength = length;
-	SetLength(length + len);
-
-	memcpy(AddressOf() + oldLength, str, len);
-	AddressOf()[length] = 0;
-}
-
-asCString &asCString::operator +=(const char *str)
-{
-	size_t len = strlen(str);
-	Concatenate(str, len);
-
-	return *this;
-}
-
-asCString &asCString::operator +=(const asCString &str)
-{
-	Concatenate(str.AddressOf(), str.length);
-
-	return *this;
-}
-
-asCString &asCString::operator +=(char ch)
-{
-	Concatenate(&ch, 1);
-
-	return *this;
-}
-
-size_t asCString::GetLength() const
-{
-	return length;
-}
-
-// Returns the length
-size_t asCString::Format(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-
-	char tmp[256];
-	int r = asVSNPRINTF(tmp, 255, format, args);
-
-	if( r > 0 )
-	{
-		Assign(tmp, r);
-	}
-	else
-	{
-		size_t n = 512;
-		asCString str; // Use temporary string in case the current buffer is a parameter
-		str.Allocate(n, false);
-
-		while( (r = asVSNPRINTF(str.AddressOf(), n, format, args)) < 0 )
-		{
-			n *= 2;
-			str.Allocate(n, false);
-		}
-
-		Assign(str.AddressOf(), r);
-	}
-
-	va_end(args);
-
-	return length;
-}
-
-char &asCString::operator [](size_t index) 
-{
-	asASSERT(index < length);
-
-	return AddressOf()[index];
-}
-
-const char &asCString::operator [](size_t index) const
-{
-	asASSERT(index < length);
-
-	return AddressOf()[index];
-}
-
-asCString asCString::SubString(size_t in_start, size_t in_length) const
-{
-	if( in_start >= GetLength() || in_length == 0 )
-		return asCString("");
-
-	if( in_length == (size_t)(-1) ) in_length = GetLength() - in_start;
-
-	asCString tmp;
-	tmp.Assign(AddressOf() + in_start, in_length);
-
-	return tmp;
-}
-
-int asCString::Compare(const char *str) const
-{
-	return asCompareStrings(AddressOf(), length, str, strlen(str));
-}
-
-int asCString::Compare(const asCString &str) const
-{
-	return asCompareStrings(AddressOf(), length, str.AddressOf(), str.GetLength());
-}
-
-int asCString::Compare(const char *str, size_t len) const
-{
-	return asCompareStrings(AddressOf(), length, str, len);
-}
-
-size_t asCString::RecalculateLength()
-{
-	SetLength(strlen(AddressOf()));
-
-	return length;
-}
-
-int asCString::FindLast(const char *str, int *count) const
-{
-	// There is no strstr that starts from the end, so 
-	// we'll iterate until we find the last occurrance.
-	// This shouldn't cause a performance problem because
-	// it is not expected that this will be done very often,
-	// and then only on quite short strings anyway.
-
-	if( count ) *count = 0;
-
-	const char *last = 0;
-	const char *curr = AddressOf()-1;
-	while( (curr = strstr(curr+1, str)) != 0 )
-	{
-		if( count ) (*count)++;
-		last = curr;
-	}
-
-	if( last )
-		return int(last - AddressOf());
-
-	return -1;
-}
-
-//-----------------------------------------------------------------------------
-// Helper functions
-
-bool operator ==(const asCString &a, const char *b)
-{
-	return a.Compare(b) == 0;
-}
-
-bool operator !=(const asCString &a, const char *b)
-{
-	return a.Compare(b) != 0;
-}
-
-bool operator ==(const asCString &a, const asCString &b)
-{
-	return a.Compare(b) == 0;
-}
-
-bool operator !=(const asCString &a, const asCString &b)
-{
-	return a.Compare(b) != 0;
-}
-
-bool operator ==(const char *a, const asCString &b)
-{
-	return b.Compare(a) == 0;
-}
-
-bool operator !=(const char *a, const asCString &b)
-{
-	return b.Compare(a) != 0;
-}
-
-bool operator <(const asCString &a, const asCString &b)
-{
-	return a.Compare(b) < 0;
-}
-
-asCString operator +(const asCString &a, const asCString &b)
-{
-	asCString res = a;
-	res += b;
-
-	return res;
-}
-
-asCString operator +(const char *a, const asCString &b)
-{
-	asCString res = a;
-	res += b;
-
-	return res;
-}
-
-asCString operator +(const asCString &a, const char *b)
-{
-	asCString res = a;
-	res += b;
-
-	return res;
-}
-
-// wrapper class
-
-asCStringPointer::asCStringPointer()
-	: string(0), length(0), cstring(0)
-{
-}
-
-asCStringPointer::asCStringPointer(const char *str, size_t len)
-	: string(str), length(len), cstring(0)
-{
-}
-
-asCStringPointer::asCStringPointer(asCString *cstr)
-	: string(0), length(0), cstring(cstr)
-{
-}
-
-const char *asCStringPointer::AddressOf() const
-{
-	return string ? string : cstring->AddressOf();
-}
-
-size_t asCStringPointer::GetLength() const
-{
-	return string ? length : cstring->GetLength();
-}
-
-bool asCStringPointer::operator==(const asCStringPointer& other) const
-{
-	return asCompareStrings(AddressOf(), GetLength(), other.AddressOf(), other.GetLength()) == 0;
-}
-
-bool asCStringPointer::operator<(const asCStringPointer& other) const
-{
-	return asCompareStrings(AddressOf(), GetLength(), other.AddressOf(), other.GetLength()) < 0;
-}
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2017 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+#include "as_config.h"
+
+#include <stdarg.h>		// va_list, va_start(), etc
+#include <stdlib.h>		// strtod(), strtol()
+#include <string.h>		// some compilers declare memcpy() here
+
+#if !defined(AS_NO_MEMORY_H)
+#include <memory.h>
+#endif
+
+#include "as_string.h"
+#include "as_string_util.h"
+
+asCString::asCString()
+{
+	length = 0;
+	local[0] = 0;
+}
+
+// Copy constructor
+asCString::asCString(const asCString &str)
+{
+	length = 0;
+	local[0] = 0;
+
+	Assign(str.AddressOf(), str.length);
+}
+
+#ifdef AS_CAN_USE_CPP11
+asCString::asCString(asCString &&str)
+{
+	if( str.length <= 11 )
+	{
+		length = str.length;
+		memcpy(local, str.local, length);
+		local[length] = 0;
+	}
+	else
+	{
+		dynamic = str.dynamic;
+		length = str.length;
+	}
+
+	str.dynamic = 0;
+	str.length = 0;
+}
+#endif // c++11
+
+asCString::asCString(const char *str, size_t len)
+{
+	length = 0;
+	local[0] = 0;
+
+	Assign(str, len);
+}
+
+asCString::asCString(const char *str)
+{
+	length = 0;
+	local[0] = 0;
+
+	size_t len = strlen(str);
+	Assign(str, len);
+}
+
+asCString::asCString(char ch)
+{
+	length = 0;
+	local[0] = 0;
+
+	Assign(&ch, 1);
+}
+
+asCString::~asCString()
+{
+	if( length > 11 && dynamic )
+	{
+		asDELETEARRAY(dynamic);
+	}
+}
+
+char *asCString::AddressOf()
+{
+	if( length <= 11 )
+		return local;
+	else
+		return dynamic;
+}
+
+const char *asCString::AddressOf() const
+{
+	if( length <= 11 )
+		return local;
+	else
+		return dynamic;
+}
+
+void asCString::SetLength(size_t len)
+{
+	Allocate(len, true);
+}
+
+void asCString::Allocate(size_t len, bool keepData)
+{
+	// If we stored the capacity of the dynamically allocated buffer it would be possible
+	// to save some memory allocations if a string decreases in size then increases again,
+	// but this would require extra bytes in the string object itself, or a decrease of 
+	// the static buffer, which in turn would mean extra memory is needed. I've tested each
+	// of these options, and it turned out that the current choice is what best balanced
+	// the number of allocations against the size of the allocations.
+
+	if( len > 11 && len > length )
+	{
+		// Allocate a new dynamic buffer if the new one is larger than the old
+		char *buf = asNEWARRAY(char,len+1);
+		if( buf == 0 )
+		{
+			// Out of memory. Return without modifying anything
+			return;
+		}
+
+		if( keepData )
+		{
+			int l = (int)len < (int)length ? (int)len : (int)length;
+			memcpy(buf, AddressOf(), l);
+		}
+
+		if( length > 11 )
+		{
+			asDELETEARRAY(dynamic);
+		}
+
+		dynamic = buf;
+	}
+	else if( len <= 11 && length > 11 )
+	{
+		// Free the dynamic buffer, since it is no longer needed
+		char *buf = dynamic;
+		if( keepData )
+		{
+			memcpy(&local, buf, len);
+		}
+		asDELETEARRAY(buf);
+	}
+
+	length = (int)len;
+
+	// Make sure the buffer is null terminated
+	AddressOf()[length] = 0;
+}
+
+void asCString::Assign(const char *str, size_t len)
+{
+	Allocate(len, false);
+
+	// Copy the string
+	memcpy(AddressOf(), str, length);
+	AddressOf()[length] = 0;
+}
+
+asCString &asCString::operator =(const char *str)
+{
+	size_t len = str ? strlen(str) : 0;
+	Assign(str, len);
+
+	return *this;
+}
+
+asCString &asCString::operator =(const asCString &str)
+{
+	Assign(str.AddressOf(), str.length);
+
+	return *this;
+}
+
+#ifdef AS_CAN_USE_CPP11
+asCString &asCString::operator =(asCString &&str)
+{
+	if( this != &str )
+	{
+		if( length > 11 && dynamic )
+		{
+			asDELETEARRAY(dynamic);
+		}
+
+		if ( str.length <= 11 )
+		{
+			length = str.length;
+
+			memcpy(local, str.local, length);
+			local[length] = 0;
+		}
+		else
+		{
+			dynamic = str.dynamic;
+			length = str.length;
+		}
+
+		str.dynamic = 0;
+		str.length = 0;
+	}
+
+	return *this;
+}
+#endif // c++11
+
+asCString &asCString::operator =(char ch)
+{
+	Assign(&ch, 1);
+
+	return *this;
+}
+
+void asCString::Concatenate(const char *str, size_t len)
+{
+	asUINT oldLength = length;
+	SetLength(length + len);
+
+	memcpy(AddressOf() + oldLength, str, len);
+	AddressOf()[length] = 0;
+}
+
+asCString &asCString::operator +=(const char *str)
+{
+	size_t len = strlen(str);
+	Concatenate(str, len);
+
+	return *this;
+}
+
+asCString &asCString::operator +=(const asCString &str)
+{
+	Concatenate(str.AddressOf(), str.length);
+
+	return *this;
+}
+
+asCString &asCString::operator +=(char ch)
+{
+	Concatenate(&ch, 1);
+
+	return *this;
+}
+
+size_t asCString::GetLength() const
+{
+	return length;
+}
+
+// Returns the length
+size_t asCString::Format(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+
+	const size_t startSize = 1024;
+	char tmp[startSize];
+	int r = asVSNPRINTF(tmp, startSize-1, format, args);
+
+	if( r > 0 && r < int(startSize) )
+	{
+		Assign(tmp, r);
+	}
+	else
+	{
+		// TODO: For some reason this doesn't work properly on Linux. Perhaps the
+		//       problem is related to vsnprintf not keeping the state of va_arg.
+		//       Perhaps I need to rewrite this in some way to keep the state
+		size_t n = startSize*2;
+		asCString str; // Use temporary string in case the current buffer is a parameter
+		str.Allocate(n, false);
+
+		while( (r = asVSNPRINTF(str.AddressOf(), n, format, args)) < 0 || r >= int(n) )
+		{
+			n *= 2;
+			str.Allocate(n, false);
+		}
+
+		Assign(str.AddressOf(), r);
+	}
+
+	va_end(args);
+
+	return length;
+}
+
+char &asCString::operator [](size_t index) 
+{
+	asASSERT(index < length);
+
+	return AddressOf()[index];
+}
+
+const char &asCString::operator [](size_t index) const
+{
+	asASSERT(index < length);
+
+	return AddressOf()[index];
+}
+
+asCString asCString::SubString(size_t in_start, size_t in_length) const
+{
+	if( in_start >= GetLength() || in_length == 0 )
+		return asCString("");
+
+	if( in_length == (size_t)(-1) ) in_length = GetLength() - in_start;
+
+	asCString tmp;
+	tmp.Assign(AddressOf() + in_start, in_length);
+
+	return tmp;
+}
+
+int asCString::Compare(const char *str) const
+{
+	return asCompareStrings(AddressOf(), length, str, strlen(str));
+}
+
+int asCString::Compare(const asCString &str) const
+{
+	return asCompareStrings(AddressOf(), length, str.AddressOf(), str.GetLength());
+}
+
+int asCString::Compare(const char *str, size_t len) const
+{
+	return asCompareStrings(AddressOf(), length, str, len);
+}
+
+size_t asCString::RecalculateLength()
+{
+	SetLength(strlen(AddressOf()));
+
+	return length;
+}
+
+int asCString::FindLast(const char *str, int *count) const
+{
+	// There is no strstr that starts from the end, so 
+	// we'll iterate until we find the last occurrance.
+	// This shouldn't cause a performance problem because
+	// it is not expected that this will be done very often,
+	// and then only on quite short strings anyway.
+
+	if( count ) *count = 0;
+
+	const char *last = 0;
+	const char *curr = AddressOf()-1;
+	while( (curr = strstr(curr+1, str)) != 0 )
+	{
+		if( count ) (*count)++;
+		last = curr;
+	}
+
+	if( last )
+		return int(last - AddressOf());
+
+	return -1;
+}
+
+//-----------------------------------------------------------------------------
+// Helper functions
+
+bool operator ==(const asCString &a, const char *b)
+{
+	return a.Compare(b) == 0;
+}
+
+bool operator !=(const asCString &a, const char *b)
+{
+	return a.Compare(b) != 0;
+}
+
+bool operator ==(const asCString &a, const asCString &b)
+{
+	return a.Compare(b) == 0;
+}
+
+bool operator !=(const asCString &a, const asCString &b)
+{
+	return a.Compare(b) != 0;
+}
+
+bool operator ==(const char *a, const asCString &b)
+{
+	return b.Compare(a) == 0;
+}
+
+bool operator !=(const char *a, const asCString &b)
+{
+	return b.Compare(a) != 0;
+}
+
+bool operator <(const asCString &a, const asCString &b)
+{
+	return a.Compare(b) < 0;
+}
+
+asCString operator +(const asCString &a, const asCString &b)
+{
+	asCString res = a;
+	res += b;
+
+	return res;
+}
+
+asCString operator +(const char *a, const asCString &b)
+{
+	asCString res = a;
+	res += b;
+
+	return res;
+}
+
+asCString operator +(const asCString &a, const char *b)
+{
+	asCString res = a;
+	res += b;
+
+	return res;
+}
+
+// wrapper class
+
+asCStringPointer::asCStringPointer()
+	: string(0), length(0), cstring(0)
+{
+}
+
+asCStringPointer::asCStringPointer(const char *str, size_t len)
+	: string(str), length(len), cstring(0)
+{
+}
+
+asCStringPointer::asCStringPointer(asCString *cstr)
+	: string(0), length(0), cstring(cstr)
+{
+}
+
+const char *asCStringPointer::AddressOf() const
+{
+	return string ? string : cstring->AddressOf();
+}
+
+size_t asCStringPointer::GetLength() const
+{
+	return string ? length : cstring->GetLength();
+}
+
+bool asCStringPointer::operator==(const asCStringPointer& other) const
+{
+	return asCompareStrings(AddressOf(), GetLength(), other.AddressOf(), other.GetLength()) == 0;
+}
+
+bool asCStringPointer::operator<(const asCStringPointer& other) const
+{
+	return asCompareStrings(AddressOf(), GetLength(), other.AddressOf(), other.GetLength()) < 0;
+}
diff --git a/Sources/AngelScript/source/as_string.h b/Sources/AngelScript/source/as_string.h
old mode 100755
new mode 100644
index 016e87144..0ee7469c0
--- a/Sources/AngelScript/source/as_string.h
+++ b/Sources/AngelScript/source/as_string.h
@@ -1,134 +1,134 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-// This class has been designed to be easy to use, but not necessarily efficiency.
-// It doesn't use shared string memory, or reference counting. It keeps track of
-// string length, memory size. It also makes sure that the string is null-terminated.
-
-#ifndef AS_STRING_H
-#define AS_STRING_H
-
-#include <stdio.h>
-#include <string.h>
-
-class asCString
-{
-public:
-	asCString();
-	~asCString();
-
-#ifdef AS_CAN_USE_CPP11
-	asCString(asCString &&);
-	asCString &operator =(asCString &&);
-#endif // c++11
-
-	asCString(const asCString &);
-	asCString(const char *);
-	asCString(const char *, size_t length);
-	explicit asCString(char);
-
-	void   Allocate(size_t len, bool keepData);
-	void   SetLength(size_t len);
-	size_t GetLength() const;
-
-	void Concatenate(const char *str, size_t length);
-	asCString &operator +=(const asCString &);
-	asCString &operator +=(const char *);
-	asCString &operator +=(char);
-
-	void Assign(const char *str, size_t length);
-	asCString &operator =(const asCString &);
-	asCString &operator =(const char *);
-	asCString &operator =(char);
-
-	asCString SubString(size_t start, size_t length = (size_t)(-1)) const;
-
-	int FindLast(const char *str, int *count = 0) const;
-
-	size_t Format(const char *fmt, ...);
-
-	int Compare(const char *str) const;
-	int Compare(const asCString &str) const;
-	int Compare(const char *str, size_t length) const;
-
-	char *AddressOf();
-	const char *AddressOf() const;
-	char &operator [](size_t index);
-	const char &operator[](size_t index) const;
-	size_t RecalculateLength();
-
-protected:
-	unsigned int length;
-	union
-	{
-		char *dynamic;
-		char local[12];
-	};
-};
-
-// Helper functions
-
-bool operator ==(const asCString &, const asCString &);
-bool operator !=(const asCString &, const asCString &);
-
-bool operator ==(const asCString &, const char *);
-bool operator !=(const asCString &, const char *);
-
-bool operator ==(const char *, const asCString &);
-bool operator !=(const char *, const asCString &);
-
-bool operator <(const asCString &, const asCString &);
-
-asCString operator +(const asCString &, const char *);
-asCString operator +(const char *, const asCString &);
-asCString operator +(const asCString &, const asCString &);
-
-// a wrapper for using the pointer of asCString in asCMap
-class asCStringPointer
-{
-public:
-	asCStringPointer();
-	asCStringPointer(const char *str, size_t len);
-	asCStringPointer(asCString *cstr);
-
-	const char *AddressOf() const;
-	size_t GetLength() const;
-
-	bool operator==(const asCStringPointer& other) const;
-	bool operator<(const asCStringPointer& other) const;
-
-private:
-	// Either string/length or cstring is stored
-	const char *string;
-	size_t      length;
-	asCString  *cstring;
-};
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2014 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+// This class has been designed to be easy to use, but not necessarily efficiency.
+// It doesn't use shared string memory, or reference counting. It keeps track of
+// string length, memory size. It also makes sure that the string is null-terminated.
+
+#ifndef AS_STRING_H
+#define AS_STRING_H
+
+#include <stdio.h>
+#include <string.h>
+
+class asCString
+{
+public:
+	asCString();
+	~asCString();
+
+#ifdef AS_CAN_USE_CPP11
+	asCString(asCString &&);
+	asCString &operator =(asCString &&);
+#endif // c++11
+
+	asCString(const asCString &);
+	asCString(const char *);
+	asCString(const char *, size_t length);
+	explicit asCString(char);
+
+	void   Allocate(size_t len, bool keepData);
+	void   SetLength(size_t len);
+	size_t GetLength() const;
+
+	void Concatenate(const char *str, size_t length);
+	asCString &operator +=(const asCString &);
+	asCString &operator +=(const char *);
+	asCString &operator +=(char);
+
+	void Assign(const char *str, size_t length);
+	asCString &operator =(const asCString &);
+	asCString &operator =(const char *);
+	asCString &operator =(char);
+
+	asCString SubString(size_t start, size_t length = (size_t)(-1)) const;
+
+	int FindLast(const char *str, int *count = 0) const;
+
+	size_t Format(const char *fmt, ...);
+
+	int Compare(const char *str) const;
+	int Compare(const asCString &str) const;
+	int Compare(const char *str, size_t length) const;
+
+	char *AddressOf();
+	const char *AddressOf() const;
+	char &operator [](size_t index);
+	const char &operator[](size_t index) const;
+	size_t RecalculateLength();
+
+protected:
+	unsigned int length;
+	union
+	{
+		char *dynamic;
+		char local[12];
+	};
+};
+
+// Helper functions
+
+bool operator ==(const asCString &, const asCString &);
+bool operator !=(const asCString &, const asCString &);
+
+bool operator ==(const asCString &, const char *);
+bool operator !=(const asCString &, const char *);
+
+bool operator ==(const char *, const asCString &);
+bool operator !=(const char *, const asCString &);
+
+bool operator <(const asCString &, const asCString &);
+
+asCString operator +(const asCString &, const char *);
+asCString operator +(const char *, const asCString &);
+asCString operator +(const asCString &, const asCString &);
+
+// a wrapper for using the pointer of asCString in asCMap
+class asCStringPointer
+{
+public:
+	asCStringPointer();
+	asCStringPointer(const char *str, size_t len);
+	asCStringPointer(asCString *cstr);
+
+	const char *AddressOf() const;
+	size_t GetLength() const;
+
+	bool operator==(const asCStringPointer& other) const;
+	bool operator<(const asCStringPointer& other) const;
+
+private:
+	// Either string/length or cstring is stored
+	const char *string;
+	size_t      length;
+	asCString  *cstring;
+};
+
+#endif
diff --git a/Sources/AngelScript/source/as_string_util.cpp b/Sources/AngelScript/source/as_string_util.cpp
old mode 100755
new mode 100644
index 19b2d4117..32edbedb0
--- a/Sources/AngelScript/source/as_string_util.cpp
+++ b/Sources/AngelScript/source/as_string_util.cpp
@@ -1,371 +1,383 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-
-*/
-
-#include "as_config.h"
-
-#include <string.h>     // some compilers declare memcpy() here
-#include <math.h>       // pow()
-
-#if !defined(AS_NO_MEMORY_H)
-#include <memory.h>
-#endif
-
-#include "as_string.h"
-#include "as_string_util.h"
-
-BEGIN_AS_NAMESPACE
-
-int asCompareStrings(const char *str1, size_t len1, const char *str2, size_t len2)
-{
-	if( len1 == 0 ) 
-	{
-		if( str2 == 0 || len2 == 0 ) return 0; // Equal
-
-		return 1; // The other string is larger than this
-	}
-
-	if( str2 == 0 )
-	{
-		if( len1 == 0 ) 
-			return 0; // Equal
-
-		return -1; // The other string is smaller than this
-	}
-
-	if( len2 < len1 )
-	{
-		int result = memcmp(str1, str2, len2);
-		if( result == 0 ) return -1; // The other string is smaller than this
-
-		return result;
-	}
-
-	int result = memcmp(str1, str2, len1);
-	if( result == 0 && len1 < len2 ) return 1; // The other string is larger than this
-
-	return result;
-}
-
-double asStringScanDouble(const char *string, size_t *numScanned)
-{
-	// I decided to do my own implementation of strtod() because this function
-	// doesn't seem to be present on all systems. iOS 5 for example doesn't appear 
-	// to include the function in the standard lib.
-	
-	// Another reason is that the standard implementation of strtod() is dependent
-	// on the locale on some systems, i.e. it may use comma instead of dot for 
-	// the decimal indicator. This can be avoided by forcing the locale to "C" with
-	// setlocale(), but this is another thing that is highly platform dependent.
-
-	double value = 0;
-	double fraction = 0.1;
-	int exponent = 0;
-	bool negativeExponent = false;
-	int c = 0;
-
-	// The tokenizer separates the sign from the number in   
-	// two tokens so we'll never have a sign to parse here
-
-	// Parse the integer value
-	for( ;; )
-	{
-		if( string[c] >= '0' && string[c] <= '9' )
-			value = value*10 + double(string[c] - '0');
-		else 
-			break;
-
-		c++;
-	}
-
-	if( string[c] == '.' )
-	{
-		c++;
-
-		// Parse the fraction
-		for( ;; )
-		{
-			if( string[c] >= '0' && string[c] <= '9' )
-				value += fraction * double(string[c] - '0');
-			else
-				break;
-
-			c++;
-			fraction *= 0.1;
-		}
-	}
-
-	if( string[c] == 'e' || string[c] == 'E' )
-	{
-		c++;
-
-		// Parse the sign of the exponent
-		if( string[c] == '-' )
-		{
-			negativeExponent = true;
-			c++;
-		}
-		else if( string[c] == '+' )
-			c++;
-
-		// Parse the exponent value
-		for( ;; )
-		{
-			if( string[c] >= '0' && string[c] <= '9' )
-				exponent = exponent*10 + int(string[c] - '0');
-			else
-				break;
-
-			c++;
-		}
-	}
-
-	if( exponent )
-	{
-		if( negativeExponent )
-			exponent = -exponent;
-		value *= pow(10.0, exponent);
-	}
-
-	if( numScanned )
-		*numScanned = c;
-
-	return value;
-}
-
-// Converts a character to the decimal number based on the radix
-// Returns -1 if the character is not valid for the radix
-static int asCharToNbr(char ch, int radix)
-{
-	if( ch >= '0' && ch <= '9' ) return ((ch -= '0') < radix ? ch : -1);
-	if( ch >= 'A' && ch <= 'Z' ) return ((ch -= 'A'-10) < radix ? ch : -1);
-	if( ch >= 'a' && ch <= 'z' ) return ((ch -= 'a'-10) < radix ? ch : -1);
-	return -1;
-}
-
-// If base is 0 the string should be prefixed by 0x, 0d, 0o, or 0b to allow the function to automatically determine the radix
-asQWORD asStringScanUInt64(const char *string, int base, size_t *numScanned)
-{
-	asASSERT(base == 10 || base == 16 || base == 0);
-
-	const char *end = string;
-
-	asQWORD res = 0;
-	if( base == 10 )
-	{
-		while( *end >= '0' && *end <= '9' )
-		{
-			res *= 10;
-			res += *end++ - '0';
-		}
-	}
-	else
-	{
-		if( base == 0 && string[0] == '0')
-		{
-			// Determine the radix from the prefix
-			switch( string[1] )
-			{
-			case 'b': case 'B': base = 2; break;
-			case 'o': case 'O': base = 8; break;
-			case 'd': case 'D': base = 10; break;
-			case 'x': case 'X': base = 16; break;
-			}
-			end += 2;
-		}
-
-		asASSERT( base );
-
-		if( base )
-		{
-			for( int nbr; (nbr = asCharToNbr(*end, base)) >= 0; end++ )
-				res = res * base + nbr;
-		}
-	}
-
-	if( numScanned )
-		*numScanned = end - string;
-
-	return res;
-}
-
-//
-// The function will encode the unicode code point into the outEncodedBuffer, and then
-// return the length of the encoded value. If the input value is not a valid unicode code 
-// point, then the function will return -1.
-//
-// This function is taken from the AngelCode ToolBox.
-//
-int asStringEncodeUTF8(unsigned int value, char *outEncodedBuffer)
-{
-	unsigned char *buf = (unsigned char*)outEncodedBuffer;
-
-	int length = -1;
-
-	if( value <= 0x7F )
-	{
-		buf[0] = static_cast<unsigned char>(value);
-		return 1;
-	}
-	else if( value >= 0x80 && value <= 0x7FF )
-	{
-		// Encode it with 2 characters
-		buf[0] = static_cast<unsigned char>(0xC0 + (value >> 6));
-		length = 2;
-	}
-	else if( (value >= 0x800 && value <= 0xD7FF) || (value >= 0xE000 && value <= 0xFFFF) )
-	{
-		// Note: Values 0xD800 to 0xDFFF are not valid unicode characters
-		buf[0] = static_cast<unsigned char>(0xE0 + (value >> 12));
-		length = 3;
-	}
-	else if( value >= 0x10000 && value <= 0x10FFFF )
-	{
-		buf[0] = static_cast<unsigned char>(0xF0 + (value >> 18));
-		length = 4;
-	}
-
-	int n = length-1;
-	for( ; n > 0; n-- )
-	{
-		buf[n] = static_cast<unsigned char>(0x80 + (value & 0x3F));
-		value >>= 6;
-	}
-
-	return length;
-}
-
-//
-// The function will decode an UTF8 character and return the unicode code point.
-// outLength will receive the number of bytes that were decoded.
-//
-// This function is taken from the AngelCode ToolBox.
-//
-int asStringDecodeUTF8(const char *encodedBuffer, unsigned int *outLength)
-{
-	const unsigned char *buf = (const unsigned char*)encodedBuffer;
-	
-	int value = 0;
-	int length = -1;
-	unsigned char byte = buf[0];
-	if( (byte & 0x80) == 0 )
-	{
-		// This is the only byte
-		if( outLength ) *outLength = 1;
-		return byte;
-	}
-	else if( (byte & 0xE0) == 0xC0 )
-	{
-		// There is one more byte
-		value = int(byte & 0x1F);
-		length = 2;
-
-		// The value at this moment must not be less than 2, because 
-		// that should have been encoded with one byte only.
-		if( value < 2 )
-			length = -1;
-	}
-	else if( (byte & 0xF0) == 0xE0 )
-	{
-		// There are two more bytes
-		value = int(byte & 0x0F);
-		length = 3;
-	}
-	else if( (byte & 0xF8) == 0xF0 )
-	{
-		// There are three more bytes
-		value = int(byte & 0x07);
-		length = 4;
-	}
-
-	int n = 1;
-	for( ; n < length; n++ )
-	{
-		byte = buf[n];
-		if( (byte & 0xC0) == 0x80 )
-			value = (value << 6) + int(byte & 0x3F);
-		else 
-			break;
-	}
-
-	if( n == length )
-	{
-		if( outLength ) *outLength = (unsigned)length;
-		return value;
-	}
-
-	// The byte sequence isn't a valid UTF-8 byte sequence.
-	return -1;
-}
-
-//
-// The function will encode the unicode code point into the outEncodedBuffer, and then
-// return the length of the encoded value. If the input value is not a valid unicode code 
-// point, then the function will return -1.
-//
-// This function is taken from the AngelCode ToolBox.
-//
-int asStringEncodeUTF16(unsigned int value, char *outEncodedBuffer)
-{
-	if( value < 0x10000 )
-	{
-#ifndef AS_BIG_ENDIAN
-		outEncodedBuffer[0] = (value & 0xFF);
-		outEncodedBuffer[1] = ((value >> 8) & 0xFF);
-#else
-		outEncodedBuffer[1] = (value & 0xFF);
-		outEncodedBuffer[0] = ((value >> 8) & 0xFF);
-#endif
-		return 2;
-	}
-	else
-	{
-		value -= 0x10000;
-		int surrogate1 = ((value >> 10) & 0x3FF) + 0xD800;
-		int surrogate2 = (value & 0x3FF) + 0xDC00;
-
-#ifndef AS_BIG_ENDIAN
-		outEncodedBuffer[0] = (surrogate1 & 0xFF);
-		outEncodedBuffer[1] = ((surrogate1 >> 8) & 0xFF);
-		outEncodedBuffer[2] = (surrogate2 & 0xFF);
-		outEncodedBuffer[3] = ((surrogate2 >> 8) & 0xFF);
-#else
-		outEncodedBuffer[1] = (surrogate1 & 0xFF);
-		outEncodedBuffer[0] = ((surrogate1 >> 8) & 0xFF);
-		outEncodedBuffer[3] = (surrogate2 & 0xFF);
-		outEncodedBuffer[2] = ((surrogate2 >> 8) & 0xFF);
-#endif
-
-		return 4;
-	}
-}
-
-
-END_AS_NAMESPACE
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2017 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+
+*/
+
+#include "as_config.h"
+
+#include <string.h>     // some compilers declare memcpy() here
+#include <math.h>       // pow()
+
+#if !defined(AS_NO_MEMORY_H)
+#include <memory.h>
+#endif
+
+#include "as_string.h"
+#include "as_string_util.h"
+
+BEGIN_AS_NAMESPACE
+
+int asCompareStrings(const char *str1, size_t len1, const char *str2, size_t len2)
+{
+	if( len1 == 0 ) 
+	{
+		if( str2 == 0 || len2 == 0 ) return 0; // Equal
+
+		return 1; // The other string is larger than this
+	}
+
+	if( str2 == 0 )
+	{
+		if( len1 == 0 ) 
+			return 0; // Equal
+
+		return -1; // The other string is smaller than this
+	}
+
+	if( len2 < len1 )
+	{
+		int result = memcmp(str1, str2, len2);
+		if( result == 0 ) return -1; // The other string is smaller than this
+
+		return result;
+	}
+
+	int result = memcmp(str1, str2, len1);
+	if( result == 0 && len1 < len2 ) return 1; // The other string is larger than this
+
+	return result;
+}
+
+double asStringScanDouble(const char *string, size_t *numScanned)
+{
+	// I decided to do my own implementation of strtod() because this function
+	// doesn't seem to be present on all systems. iOS 5 for example doesn't appear 
+	// to include the function in the standard lib.
+	
+	// Another reason is that the standard implementation of strtod() is dependent
+	// on the locale on some systems, i.e. it may use comma instead of dot for 
+	// the decimal indicator. This can be avoided by forcing the locale to "C" with
+	// setlocale(), but this is another thing that is highly platform dependent.
+
+	double value = 0;
+	double fraction = 0.1;
+	int exponent = 0;
+	bool negativeExponent = false;
+	int c = 0;
+
+	// The tokenizer separates the sign from the number in   
+	// two tokens so we'll never have a sign to parse here
+
+	// Parse the integer value
+	for( ;; )
+	{
+		if( string[c] >= '0' && string[c] <= '9' )
+			value = value*10 + double(string[c] - '0');
+		else 
+			break;
+
+		c++;
+	}
+
+	if( string[c] == '.' )
+	{
+		c++;
+
+		// Parse the fraction
+		for( ;; )
+		{
+			if( string[c] >= '0' && string[c] <= '9' )
+				value += fraction * double(string[c] - '0');
+			else
+				break;
+
+			c++;
+			fraction *= 0.1;
+		}
+	}
+
+	if( string[c] == 'e' || string[c] == 'E' )
+	{
+		c++;
+
+		// Parse the sign of the exponent
+		if( string[c] == '-' )
+		{
+			negativeExponent = true;
+			c++;
+		}
+		else if( string[c] == '+' )
+			c++;
+
+		// Parse the exponent value
+		for( ;; )
+		{
+			if( string[c] >= '0' && string[c] <= '9' )
+				exponent = exponent*10 + int(string[c] - '0');
+			else
+				break;
+
+			c++;
+		}
+	}
+
+	if( exponent )
+	{
+		if( negativeExponent )
+			exponent = -exponent;
+		value *= pow(10.0, exponent);
+	}
+
+	if( numScanned )
+		*numScanned = c;
+
+	return value;
+}
+
+// Converts a character to the decimal number based on the radix
+// Returns -1 if the character is not valid for the radix
+static int asCharToNbr(char ch, int radix)
+{
+	if( ch >= '0' && ch <= '9' ) return ((ch -= '0') < radix ? ch : -1);
+	if( ch >= 'A' && ch <= 'Z' ) return ((ch -= 'A'-10) < radix ? ch : -1);
+	if( ch >= 'a' && ch <= 'z' ) return ((ch -= 'a'-10) < radix ? ch : -1);
+	return -1;
+}
+
+// If base is 0 the string should be prefixed by 0x, 0d, 0o, or 0b to allow the function to automatically determine the radix
+asQWORD asStringScanUInt64(const char *string, int base, size_t *numScanned, bool *overflow)
+{
+	asASSERT(base == 10 || base == 16 || base == 0);
+
+	if (overflow)
+		*overflow = false;
+
+	const char *end = string;
+
+	static const asQWORD QWORD_MAX = (~asQWORD(0));
+
+	asQWORD res = 0;
+	if( base == 10 )
+	{
+		while( *end >= '0' && *end <= '9' )
+		{
+			if( overflow && ((res > QWORD_MAX / 10) || ((asUINT(*end - '0') > (QWORD_MAX - (QWORD_MAX / 10) * 10)) && res == QWORD_MAX / 10)) )
+				*overflow = true;
+			res *= 10;
+			res += *end++ - '0';
+		}
+	}
+	else
+	{
+		if( base == 0 && string[0] == '0')
+		{
+			// Determine the radix from the prefix
+			switch( string[1] )
+			{
+			case 'b': case 'B': base = 2; break;
+			case 'o': case 'O': base = 8; break;
+			case 'd': case 'D': base = 10; break;
+			case 'x': case 'X': base = 16; break;
+			}
+			end += 2;
+		}
+
+		asASSERT( base );
+
+		if( base )
+		{
+			for (int nbr; (nbr = asCharToNbr(*end, base)) >= 0; end++)
+			{
+				if (overflow && ((res > QWORD_MAX / base) || ((asUINT(nbr) > (QWORD_MAX - (QWORD_MAX / base) * base)) && res == QWORD_MAX / base)) )
+					*overflow = true;
+
+				res = res * base + nbr;
+			}
+		}
+	}
+
+	if( numScanned )
+		*numScanned = end - string;
+
+	return res;
+}
+
+//
+// The function will encode the unicode code point into the outEncodedBuffer, and then
+// return the length of the encoded value. If the input value is not a valid unicode code 
+// point, then the function will return -1.
+//
+// This function is taken from the AngelCode ToolBox.
+//
+int asStringEncodeUTF8(unsigned int value, char *outEncodedBuffer)
+{
+	unsigned char *buf = (unsigned char*)outEncodedBuffer;
+
+	int length = -1;
+
+	if( value <= 0x7F )
+	{
+		buf[0] = static_cast<unsigned char>(value);
+		return 1;
+	}
+	else if( value >= 0x80 && value <= 0x7FF )
+	{
+		// Encode it with 2 characters
+		buf[0] = static_cast<unsigned char>(0xC0 + (value >> 6));
+		length = 2;
+	}
+	else if( (value >= 0x800 && value <= 0xD7FF) || (value >= 0xE000 && value <= 0xFFFF) )
+	{
+		// Note: Values 0xD800 to 0xDFFF are not valid unicode characters
+		buf[0] = static_cast<unsigned char>(0xE0 + (value >> 12));
+		length = 3;
+	}
+	else if( value >= 0x10000 && value <= 0x10FFFF )
+	{
+		buf[0] = static_cast<unsigned char>(0xF0 + (value >> 18));
+		length = 4;
+	}
+
+	int n = length-1;
+	for( ; n > 0; n-- )
+	{
+		buf[n] = static_cast<unsigned char>(0x80 + (value & 0x3F));
+		value >>= 6;
+	}
+
+	return length;
+}
+
+//
+// The function will decode an UTF8 character and return the unicode code point.
+// outLength will receive the number of bytes that were decoded.
+//
+// This function is taken from the AngelCode ToolBox.
+//
+int asStringDecodeUTF8(const char *encodedBuffer, unsigned int *outLength)
+{
+	const unsigned char *buf = (const unsigned char*)encodedBuffer;
+	
+	int value = 0;
+	int length = -1;
+	unsigned char byte = buf[0];
+	if( (byte & 0x80) == 0 )
+	{
+		// This is the only byte
+		if( outLength ) *outLength = 1;
+		return byte;
+	}
+	else if( (byte & 0xE0) == 0xC0 )
+	{
+		// There is one more byte
+		value = int(byte & 0x1F);
+		length = 2;
+
+		// The value at this moment must not be less than 2, because 
+		// that should have been encoded with one byte only.
+		if( value < 2 )
+			length = -1;
+	}
+	else if( (byte & 0xF0) == 0xE0 )
+	{
+		// There are two more bytes
+		value = int(byte & 0x0F);
+		length = 3;
+	}
+	else if( (byte & 0xF8) == 0xF0 )
+	{
+		// There are three more bytes
+		value = int(byte & 0x07);
+		length = 4;
+	}
+
+	int n = 1;
+	for( ; n < length; n++ )
+	{
+		byte = buf[n];
+		if( (byte & 0xC0) == 0x80 )
+			value = (value << 6) + int(byte & 0x3F);
+		else 
+			break;
+	}
+
+	if( n == length )
+	{
+		if( outLength ) *outLength = (unsigned)length;
+		return value;
+	}
+
+	// The byte sequence isn't a valid UTF-8 byte sequence.
+	return -1;
+}
+
+//
+// The function will encode the unicode code point into the outEncodedBuffer, and then
+// return the length of the encoded value. If the input value is not a valid unicode code 
+// point, then the function will return -1.
+//
+// This function is taken from the AngelCode ToolBox.
+//
+int asStringEncodeUTF16(unsigned int value, char *outEncodedBuffer)
+{
+	if( value < 0x10000 )
+	{
+#ifndef AS_BIG_ENDIAN
+		outEncodedBuffer[0] = (value & 0xFF);
+		outEncodedBuffer[1] = ((value >> 8) & 0xFF);
+#else
+		outEncodedBuffer[1] = (value & 0xFF);
+		outEncodedBuffer[0] = ((value >> 8) & 0xFF);
+#endif
+		return 2;
+	}
+	else
+	{
+		value -= 0x10000;
+		int surrogate1 = ((value >> 10) & 0x3FF) + 0xD800;
+		int surrogate2 = (value & 0x3FF) + 0xDC00;
+
+#ifndef AS_BIG_ENDIAN
+		outEncodedBuffer[0] = (surrogate1 & 0xFF);
+		outEncodedBuffer[1] = ((surrogate1 >> 8) & 0xFF);
+		outEncodedBuffer[2] = (surrogate2 & 0xFF);
+		outEncodedBuffer[3] = ((surrogate2 >> 8) & 0xFF);
+#else
+		outEncodedBuffer[1] = (surrogate1 & 0xFF);
+		outEncodedBuffer[0] = ((surrogate1 >> 8) & 0xFF);
+		outEncodedBuffer[3] = (surrogate2 & 0xFF);
+		outEncodedBuffer[2] = ((surrogate2 >> 8) & 0xFF);
+#endif
+
+		return 4;
+	}
+}
+
+
+END_AS_NAMESPACE
diff --git a/Sources/AngelScript/source/as_string_util.h b/Sources/AngelScript/source/as_string_util.h
old mode 100755
new mode 100644
index 707c8754b..29174dfb8
--- a/Sources/AngelScript/source/as_string_util.h
+++ b/Sources/AngelScript/source/as_string_util.h
@@ -1,51 +1,51 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2011 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-#ifndef AS_STRING_UTIL_H
-#define AS_STRING_UTIL_H
-
-#include "as_config.h"
-
-BEGIN_AS_NAMESPACE
-
-int     asCompareStrings(const char *str1, size_t len1, const char *str2, size_t len2);
-
-double  asStringScanDouble(const char *string, size_t *numScanned);
-asQWORD asStringScanUInt64(const char *string, int base, size_t *numScanned);
-
-int     asStringEncodeUTF8(unsigned int value, char *outEncodedBuffer);
-int     asStringDecodeUTF8(const char *encodedBuffer, unsigned int *outLength);
-
-int     asStringEncodeUTF16(unsigned int value, char *outEncodedBuffer);
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2016 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+#ifndef AS_STRING_UTIL_H
+#define AS_STRING_UTIL_H
+
+#include "as_config.h"
+
+BEGIN_AS_NAMESPACE
+
+int     asCompareStrings(const char *str1, size_t len1, const char *str2, size_t len2);
+
+double  asStringScanDouble(const char *string, size_t *numScanned);
+asQWORD asStringScanUInt64(const char *string, int base, size_t *numScanned, bool *overflow);
+
+int     asStringEncodeUTF8(unsigned int value, char *outEncodedBuffer);
+int     asStringDecodeUTF8(const char *encodedBuffer, unsigned int *outLength);
+
+int     asStringEncodeUTF16(unsigned int value, char *outEncodedBuffer);
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_symboltable.h b/Sources/AngelScript/source/as_symboltable.h
old mode 100755
new mode 100644
index 64aa6cc7f..261b4f330
--- a/Sources/AngelScript/source/as_symboltable.h
+++ b/Sources/AngelScript/source/as_symboltable.h
@@ -1,567 +1,567 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2012-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_symboltable.h
-//
-//  Created on: Jun 19, 2012
-//      Author: Markus Lenger, a.k.a. mlengerx
-//
-// This class is used for fast symbol lookups while parsing or loading bytecode
-//
-
-#ifndef AS_SYMBOLTABLE_H
-#define AS_SYMBOLTABLE_H
-
-#include "as_config.h"
-#include "as_memory.h"
-#include "as_string.h"
-#include "as_map.h"
-#include "as_datatype.h"
-#include "as_namespace.h"
-
-
-BEGIN_AS_NAMESPACE
-
-
-
-
-
-// Interface to avoid nested templates which is not well supported by older compilers, e.g. MSVC6
-struct asIFilter
-{
-	virtual bool operator()(const void*) const = 0;
-	virtual ~asIFilter() {};
-};
-
-
-
-
-// forward declaration
-template<class T>
-class asCSymbolTable;
-
-
-
-
-// Iterator that allows iterating in index order
-template<class T, class T2 = T>
-class asCSymbolTableIterator
-{
-public:
-	T2* operator*() const;
-	T2* operator->() const;
-	asCSymbolTableIterator<T, T2>& operator++(int);
-	asCSymbolTableIterator<T, T2>& operator--(int);
-	operator bool() const;
-	int GetIndex() const { return m_idx; }
-
-private:
-	friend class asCSymbolTable<T>;
-	asCSymbolTableIterator<T, T2>(asCSymbolTable<T> *table);
-
-	void Next();
-	void Previous();
-
-	asCSymbolTable<T>* m_table;
-	unsigned int       m_idx;
-};
-
-
-
-
-// Symbol table mapping namespace + name to symbols
-// The structure keeps the entries indexed in an array so the indices will not change
-// There is also a map for a quick lookup. The map supports multiple entries with the same name
-template<class T>
-class asCSymbolTable
-{
-public:
-	typedef asCSymbolTableIterator<T, T> iterator;
-	typedef asCSymbolTableIterator<T, const T> const_iterator;
-
-	asCSymbolTable(asUINT initialCapacity = 0);
-
-	int      GetFirstIndex(const asSNameSpace *ns, const asCString &name, const asIFilter &comparator) const;
-	int      GetFirstIndex(const asSNameSpace *ns, const asCString &name) const;
-	int      GetLastIndex() const;
-
-	int      GetIndex(const T*) const;
-
-	T*       GetFirst(const asSNameSpace *ns, const asCString &name, const asIFilter &comparator) const;
-	T*       GetFirst(const asSNameSpace *ns, const asCString &name);
-	const T* GetFirst(const asSNameSpace *ns, const asCString &name) const;
-	T*       Get(asUINT index);
-	const T* Get(asUINT index) const;
-	T*       GetLast();
-	const T* GetLast() const;
-
-	const asCArray<asUINT> &GetIndexes(const asSNameSpace *ns, const asCString &name) const;
-
-	asUINT   Put(T* entry);
-
-	asUINT   GetSize() const;
-
-	void SwapWith(asCSymbolTable<T> &other);
-
-	void Clear();
-	bool Erase(asUINT idx);
-	void Allocate(asUINT elem_cnt, bool keep_data);
-
-	iterator List();
-	const_iterator List() const;
-
-private:
-	// Don't allow assignment
-	asCSymbolTable<T>& operator=(const asCSymbolTable<T> &other) { return *this; }
-
-	friend class asCSymbolTableIterator<T, T>;
-	friend class asCSymbolTableIterator<T, const T>;
-
-	void GetKey(const T *entry, asSNameSpaceNamePair &key) const;
-	bool CheckIdx(asUINT idx) const;
-
-	asCMap<asSNameSpaceNamePair, asCArray<asUINT> > m_map;
-	asCArray<T*>                                    m_entries;
-	unsigned int                                    m_size;
-};
-
-
-
-
-template<class T>
-void asCSymbolTable<T>::SwapWith(asCSymbolTable<T> &other)
-{
-	m_map.SwapWith(other.m_map);
-	m_entries.SwapWith(other.m_entries);
-
-	asUINT tmp = m_size;
-	m_size = other.m_size;
-	other.m_size = tmp;
-}
-
-
-
-
-// Constructor
-// initialCapacity gives the number of entries to allocate in advance
-template<class T>
-asCSymbolTable<T>::asCSymbolTable(asUINT initialCapacity) : m_entries(initialCapacity)
-{
-	m_size = 0;
-}
-
-
-
-template<class T>
-int asCSymbolTable<T>::GetFirstIndex(
-        const asSNameSpace *ns,
-        const asCString &name,
-        const asIFilter &filter) const
-{
-	asSNameSpaceNamePair key(ns, name);
-
-	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
-	if( m_map.MoveTo(&cursor, key) )
-	{
-		const asCArray<asUINT> &arr = m_map.GetValue(cursor);
-		for( asUINT n = 0; n < arr.GetLength(); n++ )
-		{
-			T *entry = m_entries[arr[n]];
-			if( entry && filter(entry) )
-				return arr[n];
-		}
-	}
-
-	return -1;
-}
-
-
-
-template<class T>
-const asCArray<asUINT> &asCSymbolTable<T>::GetIndexes(const asSNameSpace *ns, const asCString &name) const
-{
-	asSNameSpaceNamePair key(ns, name);
-
-	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
-	if( m_map.MoveTo(&cursor, key) )
-		return m_map.GetValue(cursor);
-
-	static asCArray<asUINT> dummy;
-	return dummy;
-}
-
-
-
-
-template<class T>
-T* asCSymbolTable<T>::GetFirst(const asSNameSpace *ns, const asCString &name, const asIFilter &comp) const
-{
-	int idx = GetFirstIndex(ns, name, comp);
-	if (idx != -1) return m_entries[idx];
-	return 0;
-}
-
-
-
-
-template<class T>
-int asCSymbolTable<T>::GetFirstIndex(const asSNameSpace *ns, const asCString &name) const
-{
-	asSNameSpaceNamePair key(ns, name);
-
-	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
-	if( m_map.MoveTo(&cursor, key) )
-		return m_map.GetValue(cursor)[0];
-
-	return -1;
-}
-
-
-
-
-// Find the index of a certain symbol
-// ATTENTION: this function has linear runtime complexity O(n)!!
-template<class T>
-int asCSymbolTable<T>::GetIndex(const T* entry) const
-{
-	for( asUINT n = 0; n < m_entries.GetLength(); n++ )
-		if( m_entries[n] == entry )
-			return n;
-
-	return -1;
-}
-
-
-
-
-
-
-template<class T>
-T* asCSymbolTable<T>::Get(asUINT idx)
-{
-	if( !CheckIdx(idx) )
-		return 0;
-
-	return m_entries[idx];
-}
-
-template<class T>
-const T* asCSymbolTable<T>::Get(asUINT idx) const
-{
-	return const_cast< asCSymbolTable<T>* >(this)->Get(idx);
-}
-
-
-
-
-
-template<class T>
-T* asCSymbolTable<T>::GetFirst(const asSNameSpace *ns, const asCString &name)
-{
-	int idx = GetFirstIndex(ns, name);
-	return Get(idx);
-}
-
-template<class T>
-const T* asCSymbolTable<T>::GetFirst(const asSNameSpace *ns, const asCString &name) const
-{
-	return const_cast< asCSymbolTable<T>* >(this)->GetFirst(ns, name);
-}
-
-
-
-
-
-template<class T>
-T* asCSymbolTable<T>::GetLast()
-{
-	return Get(GetLastIndex());
-}
-
-template<class T>
-const T* asCSymbolTable<T>::GetLast() const
-{
-	return const_cast< asCSymbolTable<T>* >(this)->GetLast();
-}
-
-
-
-
-
-// Clear the symbol table
-// ATTENTION: The contained symbols are not rleased. This is up to the client
-template<class T>
-void asCSymbolTable<T>::Clear()
-{
-	m_entries.SetLength(0);
-	m_map.EraseAll();
-	m_size = 0;
-}
-
-
-
-
-// Pre-allocate slots for elemCnt entries
-template<class T>
-void asCSymbolTable<T>::Allocate(asUINT elemCnt, bool keepData)
-{
-	asASSERT( elemCnt >= m_entries.GetLength() );
-	m_entries.Allocate(elemCnt, keepData);
-	if( !keepData )
-		m_map.EraseAll();
-}
-
-
-
-template<class T>
-bool asCSymbolTable<T>::Erase(asUINT idx)
-{
-	if( !CheckIdx(idx) )
-	{
-		asASSERT(false);
-		return false;
-	}
-
-	T *entry = m_entries[idx];
-	asASSERT(entry);
-	if( !entry )
-		return false;
-
-	// Remove the symbol from the lookup map
-	asSNameSpaceNamePair key;
-	GetKey(entry, key);
-
-	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
-	if( m_map.MoveTo(&cursor, key) )
-	{
-		asCArray<asUINT> &arr = m_map.GetValue(cursor);
-		arr.RemoveValue(idx);
-		if( arr.GetLength() == 0 )
-			m_map.Erase(cursor);
-	}
-	else
-		asASSERT(false);
-
-	// Remove the symbol from the indexed array
-	if( idx == m_entries.GetLength() - 1 )
-		m_entries.PopLast();
-	else
-	{
-		// Must keep the array packed
-		int prevIdx = int(m_entries.GetLength()-1);
-		m_entries[idx] = m_entries.PopLast();
-		
-		// Update the index in the lookup map
-		entry = m_entries[idx];
-		GetKey(entry, key);
-		if( m_map.MoveTo(&cursor, key) )
-		{
-			asCArray<asUINT> &arr = m_map.GetValue(cursor);
-			arr[arr.IndexOf(prevIdx)] = idx;
-		}
-		else
-			asASSERT(false);
-	}
-	m_size--;
-
-	return true;
-}
-
-
-
-
-template<class T>
-asUINT asCSymbolTable<T>::Put(T *entry)
-{
-	asUINT idx = m_entries.GetLength();
-	asSNameSpaceNamePair key;
-	GetKey(entry, key);
-
-	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
-	if( m_map.MoveTo(&cursor, key) )
-		m_map.GetValue(cursor).PushLast(idx);
-	else
-	{
-		asCArray<asUINT> arr(1);
-		arr.PushLast(idx);
-		m_map.Insert(key, arr);
-	}
-
-	m_entries.PushLast(entry);
-	m_size++;
-	return idx;
-}
-
-
-
-
-// Return key for specified symbol (namespace and name are used to generate the key)
-template<class T>
-void asCSymbolTable<T>::GetKey(const T *entry, asSNameSpaceNamePair &key) const
-{
-	key = asSNameSpaceNamePair(entry->nameSpace, entry->name);
-}
-
-
-
-
-template<class T>
-asUINT asCSymbolTable<T>::GetSize() const
-{
-	return m_size;
-}
-
-
-
-
-template<class T>
-bool asCSymbolTable<T>::CheckIdx(asUINT idx) const
-{
-	return idx < m_entries.GetLength();
-}
-
-
-
-
-template<class T>
-int asCSymbolTable<T>::GetLastIndex() const
-{
-	int idx = int(m_entries.GetLength()) - 1;
-	asASSERT( idx == -1 || m_entries[idx] );
-	return idx;
-}
-
-
-
-
-template<class T>
-asCSymbolTableIterator<T, T> asCSymbolTable<T>::List()
-{
-	return asCSymbolTableIterator<T, T>(this);
-}
-
-
-
-
-template<class T>
-typename asCSymbolTable<T>::const_iterator asCSymbolTable<T>::List() const
-{
-	return asCSymbolTableIterator<T, const T>(const_cast< asCSymbolTable<T> *>(this));
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////
-// Iterator
-
-
-template<class T, class T2>
-asCSymbolTableIterator<T, T2>::asCSymbolTableIterator(asCSymbolTable<T> *table) : m_table(table), m_idx(0)
-{
-	asUINT sz = m_table->m_entries.GetLength();
-	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
-		m_idx++;
-}
-
-
-
-template<class T, class T2>
-T2* asCSymbolTableIterator<T, T2>::operator*() const
-{
-	asASSERT(m_table->CheckIdx(m_idx));
-	return m_table->m_entries[m_idx];
-}
-
-
-
-template<class T, class T2>
-T2* asCSymbolTableIterator<T, T2>::operator->() const
-{
-	asASSERT(m_table->CheckIdx(m_idx));
-	return m_table->m_entries[m_idx];
-}
-
-
-
-template<class T, class T2>
-asCSymbolTableIterator<T, T2>& asCSymbolTableIterator<T, T2>::operator++(int)
-{
-	Next();
-	return *this;
-}
-
-
-
-// Return true if more elements are following
-// ATTENTION: When deleting the object currently pointed to by this iterator this
-// method returns false even though there might be more elements in the list
-template<class T, class T2>
-asCSymbolTableIterator<T, T2>::operator bool() const
-{
-	return m_idx < m_table->m_entries.GetLength() && m_table->m_entries[m_idx] != 0;
-}
-
-
-
-template<class T, class T2>
-void asCSymbolTableIterator<T, T2>::Next()
-{
-	asUINT sz = m_table->m_entries.GetLength();
-	m_idx++;
-	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
-		m_idx++;
-}
-
-
-
-template<class T, class T2>
-void asCSymbolTableIterator<T, T2>::Previous()
-{
-	// overflow on stepping over first element
-	asUINT sz = m_table->m_entries.GetLength();
-	m_idx--;
-	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
-		m_idx--;
-}
-
-
-
-template<class T, class T2>
-asCSymbolTableIterator<T, T2>& asCSymbolTableIterator<T, T2>::operator--(int)
-{
-	Previous();
-	return *this;
-}
-
-
-END_AS_NAMESPACE
-
-#endif // AS_SYMBOLTABLE_H
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2012-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_symboltable.h
+//
+//  Created on: Jun 19, 2012
+//      Author: Markus Lenger, a.k.a. mlengerx
+//
+// This class is used for fast symbol lookups while parsing or loading bytecode
+//
+
+#ifndef AS_SYMBOLTABLE_H
+#define AS_SYMBOLTABLE_H
+
+#include "as_config.h"
+#include "as_memory.h"
+#include "as_string.h"
+#include "as_map.h"
+#include "as_datatype.h"
+#include "as_namespace.h"
+
+
+BEGIN_AS_NAMESPACE
+
+
+
+
+
+// Interface to avoid nested templates which is not well supported by older compilers, e.g. MSVC6
+struct asIFilter
+{
+	virtual bool operator()(const void*) const = 0;
+	virtual ~asIFilter() {};
+};
+
+
+
+
+// forward declaration
+template<class T>
+class asCSymbolTable;
+
+
+
+
+// Iterator that allows iterating in index order
+template<class T, class T2 = T>
+class asCSymbolTableIterator
+{
+public:
+	T2* operator*() const;
+	T2* operator->() const;
+	asCSymbolTableIterator<T, T2>& operator++(int);
+	asCSymbolTableIterator<T, T2>& operator--(int);
+	operator bool() const;
+	int GetIndex() const { return m_idx; }
+
+private:
+	friend class asCSymbolTable<T>;
+	asCSymbolTableIterator(asCSymbolTable<T> *table);
+
+	void Next();
+	void Previous();
+
+	asCSymbolTable<T>* m_table;
+	unsigned int       m_idx;
+};
+
+
+
+
+// Symbol table mapping namespace + name to symbols
+// The structure keeps the entries indexed in an array so the indices will not change
+// There is also a map for a quick lookup. The map supports multiple entries with the same name
+template<class T>
+class asCSymbolTable
+{
+public:
+	typedef asCSymbolTableIterator<T, T> iterator;
+	typedef asCSymbolTableIterator<T, const T> const_iterator;
+
+	asCSymbolTable(asUINT initialCapacity = 0);
+
+	int      GetFirstIndex(const asSNameSpace *ns, const asCString &name, const asIFilter &comparator) const;
+	int      GetFirstIndex(const asSNameSpace *ns, const asCString &name) const;
+	int      GetLastIndex() const;
+
+	int      GetIndex(const T*) const;
+
+	T*       GetFirst(const asSNameSpace *ns, const asCString &name, const asIFilter &comparator) const;
+	T*       GetFirst(const asSNameSpace *ns, const asCString &name);
+	const T* GetFirst(const asSNameSpace *ns, const asCString &name) const;
+	T*       Get(asUINT index);
+	const T* Get(asUINT index) const;
+	T*       GetLast();
+	const T* GetLast() const;
+
+	const asCArray<asUINT> &GetIndexes(const asSNameSpace *ns, const asCString &name) const;
+
+	asUINT   Put(T* entry);
+
+	asUINT   GetSize() const;
+
+	void SwapWith(asCSymbolTable<T> &other);
+
+	void Clear();
+	bool Erase(asUINT idx);
+	void Allocate(asUINT elem_cnt, bool keep_data);
+
+	iterator List();
+	const_iterator List() const;
+
+private:
+	// Don't allow assignment
+	asCSymbolTable<T>& operator=(const asCSymbolTable<T> &other) { return *this; }
+
+	friend class asCSymbolTableIterator<T, T>;
+	friend class asCSymbolTableIterator<T, const T>;
+
+	void GetKey(const T *entry, asSNameSpaceNamePair &key) const;
+	bool CheckIdx(asUINT idx) const;
+
+	asCMap<asSNameSpaceNamePair, asCArray<asUINT> > m_map;
+	asCArray<T*>                                    m_entries;
+	unsigned int                                    m_size;
+};
+
+
+
+
+template<class T>
+void asCSymbolTable<T>::SwapWith(asCSymbolTable<T> &other)
+{
+	m_map.SwapWith(other.m_map);
+	m_entries.SwapWith(other.m_entries);
+
+	asUINT tmp = m_size;
+	m_size = other.m_size;
+	other.m_size = tmp;
+}
+
+
+
+
+// Constructor
+// initialCapacity gives the number of entries to allocate in advance
+template<class T>
+asCSymbolTable<T>::asCSymbolTable(asUINT initialCapacity) : m_entries(initialCapacity)
+{
+	m_size = 0;
+}
+
+
+
+template<class T>
+int asCSymbolTable<T>::GetFirstIndex(
+        const asSNameSpace *ns,
+        const asCString &name,
+        const asIFilter &filter) const
+{
+	asSNameSpaceNamePair key(ns, name);
+
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
+	if( m_map.MoveTo(&cursor, key) )
+	{
+		const asCArray<asUINT> &arr = m_map.GetValue(cursor);
+		for( asUINT n = 0; n < arr.GetLength(); n++ )
+		{
+			T *entry = m_entries[arr[n]];
+			if( entry && filter(entry) )
+				return arr[n];
+		}
+	}
+
+	return -1;
+}
+
+
+
+template<class T>
+const asCArray<asUINT> &asCSymbolTable<T>::GetIndexes(const asSNameSpace *ns, const asCString &name) const
+{
+	asSNameSpaceNamePair key(ns, name);
+
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
+	if( m_map.MoveTo(&cursor, key) )
+		return m_map.GetValue(cursor);
+
+	static asCArray<asUINT> dummy;
+	return dummy;
+}
+
+
+
+
+template<class T>
+T* asCSymbolTable<T>::GetFirst(const asSNameSpace *ns, const asCString &name, const asIFilter &comp) const
+{
+	int idx = GetFirstIndex(ns, name, comp);
+	if (idx != -1) return m_entries[idx];
+	return 0;
+}
+
+
+
+
+template<class T>
+int asCSymbolTable<T>::GetFirstIndex(const asSNameSpace *ns, const asCString &name) const
+{
+	asSNameSpaceNamePair key(ns, name);
+
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
+	if( m_map.MoveTo(&cursor, key) )
+		return m_map.GetValue(cursor)[0];
+
+	return -1;
+}
+
+
+
+
+// Find the index of a certain symbol
+// ATTENTION: this function has linear runtime complexity O(n)!!
+template<class T>
+int asCSymbolTable<T>::GetIndex(const T* entry) const
+{
+	for( asUINT n = 0; n < m_entries.GetLength(); n++ )
+		if( m_entries[n] == entry )
+			return n;
+
+	return -1;
+}
+
+
+
+
+
+
+template<class T>
+T* asCSymbolTable<T>::Get(asUINT idx)
+{
+	if( !CheckIdx(idx) )
+		return 0;
+
+	return m_entries[idx];
+}
+
+template<class T>
+const T* asCSymbolTable<T>::Get(asUINT idx) const
+{
+	return const_cast< asCSymbolTable<T>* >(this)->Get(idx);
+}
+
+
+
+
+
+template<class T>
+T* asCSymbolTable<T>::GetFirst(const asSNameSpace *ns, const asCString &name)
+{
+	int idx = GetFirstIndex(ns, name);
+	return Get(idx);
+}
+
+template<class T>
+const T* asCSymbolTable<T>::GetFirst(const asSNameSpace *ns, const asCString &name) const
+{
+	return const_cast< asCSymbolTable<T>* >(this)->GetFirst(ns, name);
+}
+
+
+
+
+
+template<class T>
+T* asCSymbolTable<T>::GetLast()
+{
+	return Get(GetLastIndex());
+}
+
+template<class T>
+const T* asCSymbolTable<T>::GetLast() const
+{
+	return const_cast< asCSymbolTable<T>* >(this)->GetLast();
+}
+
+
+
+
+
+// Clear the symbol table
+// ATTENTION: The contained symbols are not rleased. This is up to the client
+template<class T>
+void asCSymbolTable<T>::Clear()
+{
+	m_entries.SetLength(0);
+	m_map.EraseAll();
+	m_size = 0;
+}
+
+
+
+
+// Pre-allocate slots for elemCnt entries
+template<class T>
+void asCSymbolTable<T>::Allocate(asUINT elemCnt, bool keepData)
+{
+	asASSERT( elemCnt >= m_entries.GetLength() );
+	m_entries.Allocate(elemCnt, keepData);
+	if( !keepData )
+		m_map.EraseAll();
+}
+
+
+
+template<class T>
+bool asCSymbolTable<T>::Erase(asUINT idx)
+{
+	if( !CheckIdx(idx) )
+	{
+		asASSERT(false);
+		return false;
+	}
+
+	T *entry = m_entries[idx];
+	asASSERT(entry);
+	if( !entry )
+		return false;
+
+	// Remove the symbol from the lookup map
+	asSNameSpaceNamePair key;
+	GetKey(entry, key);
+
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
+	if( m_map.MoveTo(&cursor, key) )
+	{
+		asCArray<asUINT> &arr = m_map.GetValue(cursor);
+		arr.RemoveValue(idx);
+		if( arr.GetLength() == 0 )
+			m_map.Erase(cursor);
+	}
+	else
+		asASSERT(false);
+
+	// Remove the symbol from the indexed array
+	if( idx == m_entries.GetLength() - 1 )
+		m_entries.PopLast();
+	else
+	{
+		// Must keep the array packed
+		int prevIdx = int(m_entries.GetLength()-1);
+		m_entries[idx] = m_entries.PopLast();
+		
+		// Update the index in the lookup map
+		entry = m_entries[idx];
+		GetKey(entry, key);
+		if( m_map.MoveTo(&cursor, key) )
+		{
+			asCArray<asUINT> &arr = m_map.GetValue(cursor);
+			arr[arr.IndexOf(prevIdx)] = idx;
+		}
+		else
+			asASSERT(false);
+	}
+	m_size--;
+
+	return true;
+}
+
+
+
+
+template<class T>
+asUINT asCSymbolTable<T>::Put(T *entry)
+{
+	asUINT idx = m_entries.GetLength();
+	asSNameSpaceNamePair key;
+	GetKey(entry, key);
+
+	asSMapNode<asSNameSpaceNamePair, asCArray<asUINT> > *cursor;
+	if( m_map.MoveTo(&cursor, key) )
+		m_map.GetValue(cursor).PushLast(idx);
+	else
+	{
+		asCArray<asUINT> arr(1);
+		arr.PushLast(idx);
+		m_map.Insert(key, arr);
+	}
+
+	m_entries.PushLast(entry);
+	m_size++;
+	return idx;
+}
+
+
+
+
+// Return key for specified symbol (namespace and name are used to generate the key)
+template<class T>
+void asCSymbolTable<T>::GetKey(const T *entry, asSNameSpaceNamePair &key) const
+{
+	key = asSNameSpaceNamePair(entry->nameSpace, entry->name);
+}
+
+
+
+
+template<class T>
+asUINT asCSymbolTable<T>::GetSize() const
+{
+	return m_size;
+}
+
+
+
+
+template<class T>
+bool asCSymbolTable<T>::CheckIdx(asUINT idx) const
+{
+	return idx < m_entries.GetLength();
+}
+
+
+
+
+template<class T>
+int asCSymbolTable<T>::GetLastIndex() const
+{
+	int idx = int(m_entries.GetLength()) - 1;
+	asASSERT( idx == -1 || m_entries[idx] );
+	return idx;
+}
+
+
+
+
+template<class T>
+asCSymbolTableIterator<T, T> asCSymbolTable<T>::List()
+{
+	return asCSymbolTableIterator<T, T>(this);
+}
+
+
+
+
+template<class T>
+typename asCSymbolTable<T>::const_iterator asCSymbolTable<T>::List() const
+{
+	return asCSymbolTableIterator<T, const T>(const_cast< asCSymbolTable<T> *>(this));
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////
+// Iterator
+
+
+template<class T, class T2>
+asCSymbolTableIterator<T, T2>::asCSymbolTableIterator(asCSymbolTable<T> *table) : m_table(table), m_idx(0)
+{
+	asUINT sz = m_table->m_entries.GetLength();
+	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
+		m_idx++;
+}
+
+
+
+template<class T, class T2>
+T2* asCSymbolTableIterator<T, T2>::operator*() const
+{
+	asASSERT(m_table->CheckIdx(m_idx));
+	return m_table->m_entries[m_idx];
+}
+
+
+
+template<class T, class T2>
+T2* asCSymbolTableIterator<T, T2>::operator->() const
+{
+	asASSERT(m_table->CheckIdx(m_idx));
+	return m_table->m_entries[m_idx];
+}
+
+
+
+template<class T, class T2>
+asCSymbolTableIterator<T, T2>& asCSymbolTableIterator<T, T2>::operator++(int)
+{
+	Next();
+	return *this;
+}
+
+
+
+// Return true if more elements are following
+// ATTENTION: When deleting the object currently pointed to by this iterator this
+// method returns false even though there might be more elements in the list
+template<class T, class T2>
+asCSymbolTableIterator<T, T2>::operator bool() const
+{
+	return m_idx < m_table->m_entries.GetLength() && m_table->m_entries[m_idx] != 0;
+}
+
+
+
+template<class T, class T2>
+void asCSymbolTableIterator<T, T2>::Next()
+{
+	asUINT sz = m_table->m_entries.GetLength();
+	m_idx++;
+	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
+		m_idx++;
+}
+
+
+
+template<class T, class T2>
+void asCSymbolTableIterator<T, T2>::Previous()
+{
+	// overflow on stepping over first element
+	asUINT sz = m_table->m_entries.GetLength();
+	m_idx--;
+	while( m_idx < sz && m_table->m_entries[m_idx] == 0 )
+		m_idx--;
+}
+
+
+
+template<class T, class T2>
+asCSymbolTableIterator<T, T2>& asCSymbolTableIterator<T, T2>::operator--(int)
+{
+	Previous();
+	return *this;
+}
+
+
+END_AS_NAMESPACE
+
+#endif // AS_SYMBOLTABLE_H
diff --git a/Sources/AngelScript/source/as_texts.h b/Sources/AngelScript/source/as_texts.h
old mode 100755
new mode 100644
index dab9ef700..88fb6dd37
--- a/Sources/AngelScript/source/as_texts.h
+++ b/Sources/AngelScript/source/as_texts.h
@@ -1,349 +1,403 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_texts.h
-//
-// These are text strings used through out the library
-//
-
-
-#ifndef AS_TEXTS_H
-#define AS_TEXTS_H
-
-// Compiler messages
-
-#define TXT_s_ALREADY_DECLARED                      "'%s' is already declared"
-#define TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED "Abstract class '%s' cannot be instantiated"
-#define TXT_ACCESSING_PRIVATE_PROP_s                "Accessing private property '%s' of parent class"
-#define TXT_ARG_NOT_LVALUE                          "Output argument expression is not assignable"
-#define TXT_ATTR_s_INFORMED_MULTIPLE_TIMES          "Attribute '%s' informed multiple times"
-#define TXT_AUTO_NOT_ALLOWED                        "Auto is not allowed here"
-
-#define TXT_BOTH_MUST_BE_SAME                     "Both expressions must have the same type"
-#define TXT_BOTH_CONDITIONS_MUST_CALL_CONSTRUCTOR "Both conditions must call constructor"
-#define TEXT_BASE_DOESNT_HAVE_DEF_CONSTR          "Base class doesn't have default constructor. Make explicit call to base constructor"
-
-#define TXT_CANDIDATES_ARE                         "Candidates are:"
-#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_LOOPS       "Can't call a constructor in loops"
-#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_SWITCH      "Can't call a constructor in switch"
-#define TXT_CANNOT_CALL_CONSTRUCTOR_TWICE          "Can't call a constructor multiple times"
-#define TXT_CANNOT_CREATE_DELEGATE_FOR_NOREF_TYPES "Can't create delegate for types that do not support handles"
-#define TXT_CANNOT_IMPLEMENT_SELF                  "Can't implement itself, or another interface that implements this interface"
-#define TXT_CANNOT_INHERIT_FROM_s_FINAL            "Can't inherit from class '%s' marked as final"
-#define TXT_CANNOT_INHERIT_FROM_MULTIPLE_CLASSES   "Can't inherit from multiple classes"
-#define TXT_CANNOT_INHERIT_FROM_SELF               "Can't inherit from itself, or another class that inherits from this class"
-#define TXT_CANNOT_PASS_CLASS_METHOD_AS_ARG        "Can't pass class method as arg directly. Use a delegate object instead"
-#define TXT_CANNOT_RESOLVE_AUTO                     "Unable to resolve auto type"
-#define TXT_CANNOT_RETURN_REF_TO_LOCAL             "Can't return reference to local value."
-#define TXT_CANT_CONSTRUCT_s_USE_REF_CAST          "Can't construct handle '%s'. Use ref cast instead"
-#define TXT_CANT_IMPLICITLY_CONVERT_s_TO_s         "Can't implicitly convert from '%s' to '%s'."
-#define TXT_CANT_RETURN_VALUE                      "Can't return value when return type is 'void'"
-#define TXT_CHANGE_SIGN                            "Implicit conversion changed sign of value"
-#define TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT       "A class cannot be both abstract and final"
-#define TXT_COMPILING_s                            "Compiling %s"
-#define TXT_COMPOUND_ASGN_ON_VALUE_TYPE            "Compound assignments with property accessors on value types are not supported"
-#define TXT_COMPOUND_ASGN_WITH_IDX_PROP            "Compound assignments with indexed property accessors are not supported"
-#define TXT_COMPOUND_ASGN_REQUIRE_GET_SET          "Compound assignments with property accessors require both get and set accessors"
-
-#define TXT_DATA_TYPE_CANT_BE_s                     "Data type can't be '%s'"
-#define TXT_DECL_IN_SWITCH                          "Variables cannot be declared in switch cases, except inside statement blocks"
-#define TXT_DEFAULT_MUST_BE_LAST                    "The default case must be the last one"
-#define TXT_DEF_ARG_MISSING_IN_FUNC_s               "All subsequent parameters after the first default value must have default values in function '%s'"
-#define TXT_DEF_ARG_TYPE_DOESNT_MATCH               "The type of the default argument expression doesn't match the function parameter type"
-#define TXT_DUPLICATE_NAMED_ARG                     "Duplicate named argument"
-#define TXT_DERIVED_METHOD_MUST_HAVE_SAME_RETTYPE_s "The method in the derived class must have the same return type as in the base class: '%s'"
-#define TXT_DESTRUCTOR_MAY_NOT_HAVE_PARM            "The destructor must not have any parameters"
-#define TXT_DESTRUCTOR_s_s_NAME_ERROR              "The name of the destructor '%s::~%s' must be the same as the class"
-#define TXT_DISALLOW_ASSIGN_ON_REF_TYPE             "Value assignment on reference types is not allowed. Did you mean to do a handle assignment?"
-#define TXT_DISALLOW_COMPOUND_ASSIGN_ON_REF_TYPE    "Compound assignment on reference types is not allowed"
-#define TXT_DUPLICATE_SWITCH_CASE                   "Duplicate switch case"
-
-#define TXT_ELSE_WITH_EMPTY_STATEMENT         "Else with empty statement"
-#define TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED "Empty list element is not allowed"
-#define TXT_EMPTY_SWITCH                      "Empty switch statement"
-#define TXT_EXPECTED_s                        "Expected '%s'"
-#define TXT_EXPECTED_CONSTANT                 "Expected constant"
-#define TXT_EXPECTED_DATA_TYPE                "Expected data type"
-#define TXT_EXPECTED_EXPRESSION_VALUE         "Expected expression value"
-#define TXT_EXPECTED_IDENTIFIER               "Expected identifier"
-#define TXT_EXPECTED_LIST                     "Expected a list enclosed by { } to match pattern"
-#define TXT_EXPECTED_METHOD_OR_PROPERTY       "Expected method or property"
-#define TXT_EXPECTED_ONE_OF                   "Expected one of: "
-#define TXT_EXPECTED_OPERATOR                 "Expected operator"
-#define TXT_EXPECTED_s_OR_s                   "Expected '%s' or '%s'"
-#define TXT_EXPECTED_POST_OPERATOR            "Expected post operator"
-#define TXT_EXPECTED_PRE_OPERATOR             "Expected pre operator"
-#define TXT_EXPECTED_STRING                   "Expected string"
-#define TXT_EXPR_DOESNT_EVAL_TO_FUNC          "Expression doesn't evaluate to a function"
-#define TXT_EXPR_MUST_BE_BOOL                 "Expression must be of boolean type"
-
-#define TXT_FAILED_TO_COMPILE_DEF_ARG_d_IN_FUNC_s "Failed while compiling default arg for parameter %d in function '%s'"
-#define TXT_FAILED_TO_CREATE_TEMP_OBJ             "Previous error occurred while attempting to create a temporary copy of object"
-#define TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC         "Float value truncated in implicit conversion to integer"
-#define TXT_FOUND_MULTIPLE_ENUM_VALUES            "Found multiple matching enum values"
-#define TXT_FUNCTION_ALREADY_EXIST                "A function with the same name and parameters already exists"
-#define TXT_FUNCTION_s_NOT_FOUND                  "Function '%s' not found"
-
-#define TXT_GET_SET_ACCESSOR_TYPE_MISMATCH_FOR_s "The property '%s' has mismatching types for the get and set accessors"
-#define TXT_GLOBAL_VARS_NOT_ALLOWED              "Global variables have been disabled by the application"
-
-#define TXT_HANDLE_ASSIGN_ON_NON_HANDLE_PROP     "It is not allowed to perform a handle assignment on a non-handle property"
-#define TXT_HANDLE_COMPARISON                    "The operand is implicitly converted to handle in order to compare them"
-#define TXT_HANDLE_OF_HANDLE_IS_NOT_ALLOWED      "Handle to handle is not allowed"
-#define TXT_s_HIDES_VAR_IN_OUTER_SCOPE           "Variable '%s' hides another variable of same name in outer scope"
-
-#define TXT_IDENTIFIER_s_NOT_DATA_TYPE             "Identifier '%s' is not a data type"
-#define TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS "Identifier '%s' is not a data type in global namespace"
-#define TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s     "Identifier '%s' is not a data type in namespace '%s' or parent"
-#define TXT_IF_WITH_EMPTY_STATEMENT                "If with empty statement"
-#define TXT_ILLEGAL_MEMBER_TYPE                    "Illegal member type"
-// TODO: Should be TXT_ILLEGAL_OPERATION_ON_s
-#define TXT_ILLEGAL_OPERATION                      "Illegal operation on this datatype"
-#define TXT_ILLEGAL_OPERATION_ON_s                 "Illegal operation on '%s'"
-#define TXT_ILLEGAL_TARGET_TYPE_FOR_REF_CAST       "Illegal target type for reference cast"
-#define TXT_ILLEGAL_VARIABLE_NAME_s                "Illegal variable name '%s'."
-#define TXT_INHERITED_PRIVATE_PROP_ACCESS_s        "Illegal access to inherited private property '%s'"
-#define TXT_INIT_LIST_CANNOT_BE_USED_WITH_s        "Initialization lists cannot be used with '%s'"
-#define TXT_INSTANCING_INVLD_TMPL_TYPE_s_s         "Attempting to instantiate invalid template type '%s<%s>'"
-#define TXT_INSTEAD_FOUND_s                        "Instead found '%s'"
-#define TXT_INSTEAD_FOUND_IDENTIFIER_s             "Instead found identifier '%s'"
-#define TXT_INSTEAD_FOUND_KEYWORD_s                "Instead found reserved keyword '%s'"
-#define TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED     "Interface '%s' cannot be instantiated"
-#define TXT_INTERFACE_CAN_ONLY_IMPLEMENT_INTERFACE "Interfaces can only implement other interfaces"
-#define TXT_INVALID_BREAK                          "Invalid 'break'"
-#define TXT_INVALID_CHAR_LITERAL                   "Invalid character literal"
-#define TXT_INVALID_CONTINUE                       "Invalid 'continue'"
-#define TXT_INVALID_ESCAPE_SEQUENCE                "Invalid escape sequence"
-#define TXT_INVALID_EXPRESSION_AMBIGUOUS_NAME      "Invalid expression: ambiguous name"
-#define TXT_INVALID_EXPRESSION_LAMBDA              "Invalid expression: stand-alone anonymous function"
-#define TXT_INVALID_OP_ON_METHOD                   "Invalid operation on method"
-#define TXT_INVALID_REF_PROP_ACCESS                "Invalid reference. Property accessors cannot be used in combined read/write operations"
-#define TXT_INVALID_SCOPE                          "Invalid scope resolution"
-#define TXT_INVALID_TYPE                           "Invalid type"
-#define TXT_INVALID_UNICODE_FORMAT_EXPECTED_d      "Invalid unicode escape sequence, expected %d hex digits"
-#define TXT_INVALID_UNICODE_VALUE                  "Invalid unicode code point"
-#define TXT_INVALID_UNICODE_SEQUENCE_IN_SRC        "Invalid unicode sequence in source"
-
-#define TXT_METHOD_CANNOT_OVERRIDE_s                "Method '%s' declared as final and cannot be overridden"
-#define TXT_METHOD_CANT_HAVE_NAME_OF_CLASS          "The method cannot be named with the class name"
-#define TXT_METHOD_s_DOES_NOT_OVERRIDE              "Method '%s' marked as override but does not replace any base class or interface method"
-#define TXT_METHOD_s_s_HAS_NO_RETURN_TYPE           "Method '%s::%s' is missing the return type, nor is it the same name as object to be a constructor"
-#define TXT_MISSING_IMPLEMENTATION_OF_s             "Missing implementation of '%s'"
-#define TXT_MIXIN_CANNOT_BE_DECLARED_AS_s           "Mixin class cannot be declared as '%s'"
-#define TXT_MIXIN_CANNOT_HAVE_CONSTRUCTOR           "Mixin classes cannot have constructors or destructors"
-#define TXT_MIXIN_CLASS_CANNOT_INHERIT              "Mixin class cannot inherit from classes"
-#define TXT_MIXIN_CANNOT_HAVE_CHILD_TYPES           "Mixin classes cannot have child types"
-#define TXT_MORE_THAN_ONE_MATCHING_OP               "Found more than one matching operator"
-#define TXT_MULTIPLE_MATCHING_SIGNATURES_TO_s       "Multiple matching signatures to '%s'"
-#define TXT_MULTIPLE_PROP_GET_ACCESSOR_FOR_s        "Found multiple get accessors for property '%s'"
-#define TXT_MULTIPLE_PROP_SET_ACCESSOR_FOR_s        "Found multiple set accessors for property '%s'"
-#define TXT_MULTILINE_STRINGS_NOT_ALLOWED           "Multiline strings are not allowed in this application"
-#define TXT_MUST_BE_OBJECT                          "Only objects have constructors"
-#define TXT_MUST_RETURN_VALUE                       "Must return a value"
-
-#define TXT_NAMESPACE_s_DOESNT_EXIST               "Namespace '%s' doesn't exist."
-#define TXT_NAME_CONFLICT_s_EXTENDED_TYPE          "Name conflict. '%s' is an extended data type."
-#define TXT_NAME_CONFLICT_s_GLOBAL_PROPERTY        "Name conflict. '%s' is a global property."
-#define TXT_NAME_CONFLICT_s_IS_NAMED_TYPE          "Name conflict. '%s' is a named type."
-#define TXT_NAME_CONFLICT_s_IS_FUNCDEF             "Name conflict. '%s' is a funcdef."
-#define TXT_NAME_CONFLICT_s_IS_MIXIN               "Name conflict. '%s' is a mixin class."
-#define TXT_NAME_CONFLICT_s_STRUCT                 "Name conflict. '%s' is a class."
-#define TXT_NAME_CONFLICT_s_OBJ_PROPERTY           "Name conflict. '%s' is an object property."
-#define TXT_NAME_CONFLICT_s_METHOD                 "Name conflict. '%s' is a class method."
-#define TXT_NAME_CONFLICT_s_ALREADY_USED           "Name conflict. '%s' is already used."
-#define TXT_NAMED_ARGS_WITH_OLD_SYNTAX             "Detected named argument with old syntax"
-#define TXT_NO_APPROPRIATE_INDEX_OPERATOR          "No appropriate indexing operator found"
-#define TXT_NO_APPROPRIATE_OPHNDLASSIGN_s          "No appropriate opHndlAssign method found in '%s' for handle assignment"
-#define TXT_NO_APPROPRIATE_OPEQUALS                "No appropriate opEquals method found"
-#define TXT_NO_CONVERSION_s_TO_s                   "No conversion from '%s' to '%s' available."
-#define TXT_NO_CONVERSION_s_TO_MATH_TYPE           "No conversion from '%s' to math type available."
-#define TXT_NO_DEFAULT_ARRAY_TYPE                  "The application doesn't support the default array type."
-#define TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s           "No default constructor for object of type '%s'."
-#define TXT_NO_DEFAULT_COPY_OP_FOR_s               "No appropriate opAssign method found in '%s' for value assignment"
-#define TXT_NO_COPY_CONSTRUCTOR_FOR_s              "No copy constructor for object of type '%s'."
-#define TXT_NO_MATCHING_SIGNATURES_TO_s            "No matching signatures to '%s'"
-#define TXT_NO_MATCHING_OP_FOUND_FOR_TYPE_s        "No matching operator that takes the type '%s' found"
-#define TXT_NO_MATCHING_OP_FOUND_FOR_TYPES_s_AND_s "No matching operator that takes the types '%s' and '%s' found"
-#define TXT_NON_CONST_METHOD_ON_CONST_OBJ          "Non-const method call on read-only object reference"
-#define TXT_NONTERMINATED_STRING                   "Non-terminated string literal"
-#define TXT_NOT_A_FUNC_s_IS_VAR                    "Expression doesn't form a function call. '%s' is a variable of a non-function type"
-#define TXT_NOT_ALL_PATHS_RETURN                   "Not all paths return a value"
-#define TXT_NOT_ENOUGH_VALUES_FOR_LIST             "Not enough values to match pattern"
-#define TXT_s_NOT_DECLARED                         "'%s' is not declared"
-#define TXT_NOT_EXACT                              "Implicit conversion of value is not exact"
-#define TXT_s_NOT_INITIALIZED                      "'%s' is not initialized."
-#define TXT_NOT_LVALUE                             "Expression is not an l-value"
-#define TXT_s_NOT_MEMBER_OF_s                      "'%s' is not a member of '%s'"
-#define TXT_NOT_VALID_REFERENCE                    "Not a valid reference"
-#define TXT_NOT_VALID_LVALUE                       "Not a valid lvalue"
-#define TXT_NOTHING_WAS_BUILT                      "Nothing was built in the module"
-
-#define TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP          "Type '%s' doesn't support the indexing operator"
-#define TXT_OBJECT_HANDLE_NOT_SUPPORTED             "Object handle is not supported for this type"
-#define TXT_ONLY_OBJECTS_MAY_USE_REF_INOUT          "Only object types that support object handles can use &inout. Use &in or &out instead"
-#define TXT_ONLY_ONE_ARGUMENT_IN_CAST               "A cast operator has one argument"
-#define TXT_ONLY_ONE_FUNCTION_ALLOWED               "The code must contain one and only one function"
-#define TXT_ONLY_ONE_VARIABLE_ALLOWED               "The code must contain one and only one global variable"
-#define TXT_OPERANDS_MUST_BE_HANDLES                "Both operands must be handles when comparing identity"
-#define TXT_OVERLOAD_CONFLICTS_DUE_TO_DEFAULT_ARGS  "The overloaded functions are identical on initial parameters without default arguments"
-
-#define TXT_PARAMETER_ALREADY_DECLARED            "Parameter already declared"
-#define TXT_PARAMETER_CANT_BE_s                   "Parameter type can't be '%s', because the type cannot be instantiated."
-#define TXT_POS_ARG_AFTER_NAMED_ARG               "Positional arguments cannot be passed after named arguments"
-#define TXT_PRIVATE_METHOD_CALL_s                 "Illegal call to private method '%s'"
-#define TXT_PRIVATE_PROP_ACCESS_s                 "Illegal access to private property '%s'"
-#define TXT_PROTECTED_METHOD_CALL_s               "Illegal call to protected method '%s'"
-#define TXT_PROTECTED_PROP_ACCESS_s               "Illegal access to protected property '%s'"
-#define TXT_PROPERTY_ACCESSOR_DISABLED            "Property accessors have been disabled by the application"
-#define TXT_PROPERTY_ACCESSOR_MUST_BE_IMPLEMENTED "Property accessor must be implemented"
-#define TXT_PROPERTY_CANT_BE_CONST                "Class properties cannot be declared as const"
-#define TXT_PROPERTY_HAS_NO_GET_ACCESSOR          "The property has no get accessor"
-#define TXT_PROPERTY_HAS_NO_SET_ACCESSOR          "The property has no set accessor"
-#define TXT_PROPERTY_WITHOUT_ACCESSOR             "Virtual property must have at least one get or set accessor"
-
-#define TXT_REF_CANT_BE_TO_LOCAL_VAR            "Resulting reference cannot be returned. Returned references must not refer to local variables."
-#define TXT_REF_CANT_BE_RETURNED_DEFERRED_PARAM "Resulting reference cannot be returned. There are deferred arguments that may invalidate it."
-#define TXT_REF_CANT_BE_RETURNED_LOCAL_VARS     "Resulting reference cannot be returned. The expression uses objects that during cleanup may invalidate it."
-#define TXT_REF_IS_READ_ONLY                    "Reference is read-only"
-#define TXT_REF_IS_TEMP                         "Reference is temporary"
-#define TXT_REF_TYPE_CANT_BE_PASSED_BY_VAL      "Reference types cannot be passed by value in function parameters"
-#define TXT_REF_TYPE_CANT_BE_RETURNED_BY_VAL    "Reference types cannot be returned by value from functions"
-#define TXT_RETURN_CANT_BE_s                    "Return type can't be '%s'"
-
-#define TXT_SHARED_CANNOT_ACCESS_NON_SHARED_VAR_s      "Shared code cannot access non-shared global variable '%s'"
-#define TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s       "Shared code cannot call non-shared function '%s'"
-#define TXT_SHARED_CANNOT_IMPLEMENT_NON_SHARED_s       "Shared type cannot implement non-shared interface '%s'"
-#define TXT_SHARED_CANNOT_INHERIT_FROM_NON_SHARED_s    "Shared class cannot inherit from non-shared class '%s'"
-#define TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s        "Shared code cannot use non-shared type '%s'"
-#define TXT_SHARED_s_DOESNT_MATCH_ORIGINAL             "Shared type '%s' doesn't match the original declaration in other module"
-#define TXT_SECTION_IS_EMPTY                           "The script section is empty"
-#define TXT_SIGNED_UNSIGNED_MISMATCH                   "Signed/Unsigned mismatch"
-#define TXT_STRINGS_NOT_RECOGNIZED                     "Strings are not recognized by the application"
-#define TXT_SWITCH_CASE_MUST_BE_CONSTANT               "Case expressions must be constants"
-#define TXT_SWITCH_MUST_BE_INTEGRAL                    "Switch expressions must be integral numbers"
-
-#define TXT_TMPL_s_EXPECTS_d_SUBTYPES          "Template '%s' expects %d sub type(s)"
-#define TXT_TMPL_SUBTYPE_MUST_NOT_BE_READ_ONLY "Template subtype must not be read-only"
-#define TXT_TOO_MANY_JUMP_LABELS               "The function has too many jump labels to handle. Split the function into smaller ones."
-#define TXT_TOO_MANY_VALUES_FOR_LIST           "Too many values to match pattern"
-#define TXT_TYPE_s_CANNOT_BE_REFERENCE         "Type '%s' cannot be a reference"
-#define TXT_TYPE_s_NOT_AVAILABLE_FOR_MODULE    "Type '%s' is not available for this module"
-#define TXT_TYPE_s_NOT_TEMPLATE                "Type '%s' is not a template type"
-
-#define TXT_UNEXPECTED_END_OF_FILE             "Unexpected end of file"
-#define TXT_UNEXPECTED_TOKEN_s                 "Unexpected token '%s'"
-#define TXT_UNEXPECTED_VAR_DECL                "Unexpected variable declaration"
-#define TXT_UNINITIALIZED_GLOBAL_VAR_s         "Use of uninitialized global variable '%s'."
-#define TXT_UNKNOWN_SCOPE_s                    "Unknown scope '%s'"
-#define TXT_UNREACHABLE_CODE                   "Unreachable code"
-#define TXT_UNRECOGNIZED_VIRTUAL_PROPERTY_NODE "Virtual property contains unrecognized aspect"
-#define TXT_UNUSED_SCRIPT_NODE                 "Unused script node"
-
-#define TXT_VALUE_TOO_LARGE_FOR_TYPE      "Value is too large for data type"
-#define TXT_VOID_CANT_BE_OPERAND          "Void cannot be an operand in expressions"
-
-#define TXT_WARNINGS_TREATED_AS_ERROR     "Warnings are treated as errors by the application"
-#define TXT_WHILE_PARSING_ARG_LIST        "While parsing argument list"
-#define TXT_WHILE_PARSING_EXPRESSION      "While parsing expression"
-#define TXT_WHILE_PARSING_INIT_LIST       "While parsing initialization list"
-#define TXT_WHILE_PARSING_NAMESPACE       "While parsing namespace"
-#define TXT_WHILE_PARSING_STATEMENT_BLOCK "While parsing statement block"
-#define TXT_WHILE_INCLUDING_MIXIN         "Previous error occurred while including mixin"
-
-// Global variable initialization
-
-#define TXT_FAILED_TO_INITIALIZE_s      "Failed to initialize global variable '%s'"
-#define TXT_EXCEPTION_s_IN_s            "Exception '%s' in '%s'"
-
-// Engine message
-
-#define TXT_AUTOHANDLE_CANNOT_BE_USED_FOR_NOCOUNT        "Autohandles cannot be used with types that have been registered with NOCOUNT"
-#define TXT_FIRST_PARAM_MUST_BE_REF_FOR_TEMPLATE_FACTORY "First parameter to template factory must be a reference. This will be used to pass the object type of the template"
-#define TXT_INVALID_CONFIGURATION                        "Invalid configuration. Verify the registered application interface."
-#define TXT_VALUE_TYPE_MUST_HAVE_SIZE                    "A value type must be registered with a non-zero size"
-#define TXT_TYPE_s_IS_MISSING_BEHAVIOURS                 "Type '%s' is missing behaviours"
-#define TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE                   "The behaviour is not compatible with the type"
-#define TXT_GC_REQUIRE_ADD_REL_GC_BEHAVIOUR              "A garbage collected type must have the addref, release, and all gc behaviours"
-#define TXT_SCOPE_REQUIRE_REL_BEHAVIOUR                  "A scoped reference type must have the release behaviour"
-#define TXT_REF_REQUIRE_ADD_REL_BEHAVIOUR                "A reference type must have the addref and release behaviours"
-#define TXT_NON_POD_REQUIRE_CONSTR_DESTR_BEHAVIOUR       "A non-pod value type must have the default constructor and destructor behaviours"
-#define TXT_CANNOT_PASS_TYPE_s_BY_VAL                    "Can't pass type '%s' by value unless the application type is informed in the registration"
-#define TXT_CANNOT_RET_TYPE_s_BY_VAL                     "Can't return type '%s' by value unless the application type is informed in the registration"
-// TODO: Should be something like "This platform requires that AngelScript knows the exact content of the type '%s' in order to pass by value to application in native calling convention"
-#define TXT_DONT_SUPPORT_TYPE_s_BY_VAL                   "Don't support passing type '%s' by value to application in native calling convention on this platform"
-// TODO: Should be something like "This platform requires that AngelScript knows the exact content of the type '%s' in order to return by value from application in native calling convention"
-#define TXT_DONT_SUPPORT_RET_TYPE_s_BY_VAL               "Don't support returning type '%s' by value from application in native calling convention on this platform"
-#define TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s               "Object {%d}. GC cannot destroy an object of type '%s' as it doesn't know how many references to there are."
-#define TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s_REF_COUNT_d   "Object {%d}. GC cannot destroy an object of type '%s' as it can't see all references. Current ref count is %d."
-#define TXT_OBJECT_TYPE_s_DOESNT_EXIST                   "Object type '%s' doesn't exist"
-#define TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER   "Cannot register. The template type instance '%s' has already been generated."
-#define TXT_TEMPLATE_TYPE_s_DOESNT_EXIST                 "Template type '%s' doesn't exist"
-#define TXT_TEMPLATE_SUBTYPE_s_DOESNT_EXIST              "Template subtype '%s' doesn't exist"
-#define TXT_TEMPLATE_LIST_FACTORY_EXPECTS_2_REF_PARAMS   "Template list factory expects two reference parameters. The last is the pointer to the initialization buffer"
-#define TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM             "List factory expects only one reference parameter. The pointer to the initialization buffer will be passed in this parameter"
-#define TXT_FAILED_READ_SUBTYPE_OF_TEMPLATE_s            "Failed to read subtype of template type '%s'"
-#define TXT_FAILED_IN_FUNC_s_d                           "Failed in call to function '%s' (Code: %d)"
-#define TXT_FAILED_IN_FUNC_s_WITH_s_d                    "Failed in call to function '%s' with '%s' (Code: %d)"
-#define TXT_FAILED_IN_FUNC_s_WITH_s_AND_s_d              "Failed in call to function '%s' with '%s' and '%s' (Code: %d)"
-#define TXT_GC_RECEIVED_NULL_PTR                         "AddScriptObjectToGC called with null pointer"
-#define TXT_EXCEPTION_IN_NESTED_CALL                     "An exception occurred in a nested call"
-#define TXT_TYPE_s_IS_STILL_USED_BY_FUNC_s               "Type '%s' is still used by function '%s'"
-#define TXT_PREV_TYPE_IS_NAMED_s                         "The builtin type in previous message is named '%s'"
-#define TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d               "The function in previous message is named '%s'. The func type is %d"
-#define TXT_RESURRECTING_SCRIPTOBJECT_s                  "The script object of type '%s' is being resurrected illegally during destruction"
-#define TXT_INVALID_BYTECODE_d                           "LoadByteCode failed. The bytecode is invalid. Number of bytes read from stream: %d"
-#define TXT_NO_JIT_IN_FUNC_s                             "Function '%s' appears to have been compiled without JIT entry points"
-#define TXT_ENGINE_REF_COUNT_ERROR_DURING_SHUTDOWN       "Uh oh! The engine's reference count is increasing while it is being destroyed. Make sure references needed for clean-up are immediately released"
-#define TXT_MODULE_IS_IN_USE                             "The module is still in use and cannot be rebuilt. Discard it and request another module"
-#define TXT_EXTRNL_REF_TO_MODULE_s                       "There is an external reference to an object in module '%s', preventing it from being deleted"
-
-// Internal names
-
-#define TXT_PROPERTY                      "Property"
-#define TXT_SYSTEM_FUNCTION               "System function"
-#define TXT_VARIABLE_DECL                 "Variable declaration"
-
-// Exceptions
-
-#define TXT_STACK_OVERFLOW                "Stack overflow"
-#define TXT_NULL_POINTER_ACCESS           "Null pointer access"
-#define TXT_DIVIDE_BY_ZERO                "Divide by zero"
-#define TXT_DIVIDE_OVERFLOW               "Overflow in integer division"
-#define TXT_POW_OVERFLOW                  "Overflow in exponent operation"
-#define TXT_UNRECOGNIZED_BYTE_CODE        "Unrecognized byte code"
-#define TXT_INVALID_CALLING_CONVENTION    "Invalid calling convention"
-#define TXT_UNBOUND_FUNCTION              "Unbound function called"
-#define TXT_OUT_OF_BOUNDS                 "Out of range"
-#define TXT_EXCEPTION_CAUGHT              "Caught an exception from the application"
-#define TXT_MISMATCH_IN_VALUE_ASSIGN      "Mismatching types in value assignment"
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_texts.h
+//
+// These are text strings used through out the library
+//
+
+
+#ifndef AS_TEXTS_H
+#define AS_TEXTS_H
+
+// Compiler messages
+
+#define TXT_s_ALREADY_DECLARED                      "'%s' is already declared"
+#define TXT_ABSTRACT_CLASS_s_CANNOT_BE_INSTANTIATED "Abstract class '%s' cannot be instantiated"
+#define TXT_ACCESSING_PRIVATE_PROP_s                "Accessing private property '%s' of parent class"
+#define TXT_ARG_NOT_LVALUE                          "Output argument expression is not assignable"
+#define TXT_ATTR_s_INFORMED_MULTIPLE_TIMES          "Attribute '%s' informed multiple times"
+#define TXT_AUTO_NOT_ALLOWED                        "Auto is not allowed here"
+
+#define TXT_BOTH_MUST_BE_SAME                     "Can't find unambiguous implicit conversion to make both expressions have the same type"
+#define TXT_BOTH_CONDITIONS_MUST_CALL_CONSTRUCTOR "Both conditions must call constructor"
+#define TEXT_BASE_DOESNT_HAVE_DEF_CONSTR          "Base class doesn't have default constructor. Make explicit call to base constructor"
+
+#define TXT_CANDIDATES_ARE                         "Candidates are:"
+#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_LOOPS       "Can't call a constructor in loops"
+#define TXT_CANNOT_CALL_CONSTRUCTOR_IN_SWITCH      "Can't call a constructor in switch"
+#define TXT_CANNOT_CALL_CONSTRUCTOR_TWICE          "Can't call a constructor multiple times"
+#define TXT_CANNOT_CREATE_DELEGATE_FOR_NOREF_TYPES "Can't create delegate for types that do not support handles"
+#define TXT_CANNOT_IMPLEMENT_SELF                  "Can't implement itself, or another interface that implements this interface"
+#define TXT_CANNOT_INHERIT_FROM_s_FINAL            "Can't inherit from class '%s' marked as final"
+#define TXT_CANNOT_INHERIT_FROM_MULTIPLE_CLASSES   "Can't inherit from multiple classes"
+#define TXT_CANNOT_INHERIT_FROM_SELF               "Can't inherit from itself, or another class that inherits from this class"
+#define TXT_CANNOT_PASS_CLASS_METHOD_AS_ARG        "Can't pass class method as arg directly. Use a delegate object instead"
+#define TXT_CANNOT_RESOLVE_AUTO                    "Unable to resolve auto type"
+#define TXT_CANNOT_ACCESS_NON_STATIC_MEMBER_s      "Cannot access non-static member '%s' like this"
+#define TXT_CANNOT_RETURN_REF_TO_LOCAL             "Can't return reference to local value."
+#define TXT_CANT_CONSTRUCT_s_USE_REF_CAST          "Can't construct handle '%s'. Use ref cast instead"
+#define TXT_CANT_IMPLICITLY_CONVERT_s_TO_s         "Can't implicitly convert from '%s' to '%s'."
+#define TXT_CANT_RETURN_VALUE                      "Can't return value when return type is 'void'"
+#define TXT_CHANGE_SIGN                            "Implicit conversion changed sign of value"
+#define TXT_CLASS_CANT_BE_FINAL_AND_ABSTRACT       "A class cannot be both abstract and final"
+#define TXT_COMPILING_s                            "Compiling %s"
+#define TXT_COMPOUND_ASGN_ON_VALUE_TYPE            "Compound assignments with property accessors on value types are not supported"
+#define TXT_COMPOUND_ASGN_WITH_IDX_PROP            "Compound assignments with indexed property accessors are not supported"
+#define TXT_COMPOUND_ASGN_REQUIRE_GET_SET          "Compound assignments with property accessors require both get and set accessors"
+#define TXT_PROP_ACCESS_s_DOES_NOT_EXPECT_INDEX    "Implemented property accessor '%s' does not expect index argument"
+#define TXT_PROP_ACCESS_s_EXPECTS_INDEX            "Implemented property accessor '%s' expects index argument"
+
+#define TXT_DATA_TYPE_CANT_BE_s                     "Data type can't be '%s'"
+#define TXT_DECL_IN_SWITCH                          "Variables cannot be declared in switch cases, except inside statement blocks"
+#define TXT_DEFAULT_MUST_BE_LAST                    "The default case must be the last one"
+#define TXT_DEF_ARG_MISSING_IN_FUNC_s               "All subsequent parameters after the first default value must have default values in function '%s'"
+#define TXT_DEF_ARG_TYPE_DOESNT_MATCH               "The type of the default argument expression doesn't match the function parameter type"
+#define TXT_DUPLICATE_NAMED_ARG                     "Duplicate named argument"
+#define TXT_DERIVED_METHOD_MUST_HAVE_SAME_RETTYPE_s "The method in the derived class must have the same return type as in the base class: '%s'"
+#define TXT_DESTRUCTOR_MAY_NOT_HAVE_PARM            "The destructor must not have any parameters"
+#define TXT_DESTRUCTOR_s_s_NAME_ERROR               "The name of the destructor '%s::~%s' must be the same as the class"
+#define TXT_DISALLOW_ASSIGN_ON_REF_TYPE             "Value assignment on reference types is not allowed. Did you mean to do a handle assignment?"
+#define TXT_DISALLOW_COMPOUND_ASSIGN_ON_REF_TYPE    "Compound assignment on reference types is not allowed"
+#define TXT_DUPLICATE_SWITCH_CASE                   "Duplicate switch case"
+
+#define TXT_ELSE_WITH_EMPTY_STATEMENT         "Else with empty statement"
+#define TXT_EMPTY_LIST_ELEMENT_IS_NOT_ALLOWED "Empty list element is not allowed"
+#define TXT_EMPTY_SWITCH                      "Empty switch statement"
+#define TXT_EXPECTED_s                        "Expected '%s'"
+#define TXT_EXPECTED_CONSTANT                 "Expected constant"
+#define TXT_EXPECTED_DATA_TYPE                "Expected data type"
+#define TXT_EXPECTED_EXPRESSION_VALUE         "Expected expression value"
+#define TXT_EXPECTED_IDENTIFIER               "Expected identifier"
+#define TXT_EXPECTED_LIST                     "Expected a list enclosed by { } to match pattern"
+#define TXT_EXPECTED_METHOD_OR_PROPERTY       "Expected method or property"
+#define TXT_EXPECTED_ONE_OF                   "Expected one of: "
+#define TXT_EXPECTED_OPERATOR                 "Expected operator"
+#define TXT_EXPECTED_s_OR_s                   "Expected '%s' or '%s'"
+#define TXT_EXPECTED_POST_OPERATOR            "Expected post operator"
+#define TXT_EXPECTED_PRE_OPERATOR             "Expected pre operator"
+#define TXT_EXPECTED_STRING                   "Expected string"
+#define TXT_EXPR_DOESNT_EVAL_TO_FUNC          "Expression doesn't evaluate to a function"
+#define TXT_EXPR_MUST_BE_BOOL                 "Expression must be of boolean type"
+#define TXT_EXPR_s_IS_DATA_TYPE               "Expression '%s' is a data type"
+#define TXT_EXTERNAL_SHARED_s_NOT_FOUND       "External shared entity '%s' not found"
+#define TXT_EXTERNAL_SHARED_s_CANNOT_REDEF    "External shared entity '%s' cannot redefine the original entity"
+
+#define TXT_FAILED_TO_COMPILE_DEF_ARG_d_IN_FUNC_s "Failed while compiling default arg for parameter %d in function '%s'"
+#define TXT_FAILED_TO_CREATE_TEMP_OBJ             "Previous error occurred while attempting to create a temporary copy of object"
+#define TXT_FLOAT_CONV_TO_INT_CAUSE_TRUNC         "Float value truncated in implicit conversion to integer"
+#define TXT_FOUND_MULTIPLE_ENUM_VALUES            "Found multiple matching enum values"
+#define TXT_FUNCTION_ALREADY_EXIST                "A function with the same name and parameters already exists"
+#define TXT_FUNCTION_s_NOT_FOUND                  "Function '%s' not found"
+
+#define TXT_GET_SET_ACCESSOR_TYPE_MISMATCH_FOR_s "The property '%s' has mismatching types for the get and set accessors"
+#define TXT_GLOBAL_VARS_NOT_ALLOWED              "Global variables have been disabled by the application"
+
+#define TXT_HANDLE_ASSIGN_ON_NON_HANDLE_PROP     "It is not allowed to perform a handle assignment on a non-handle property"
+#define TXT_HANDLE_COMPARISON                    "The operand is implicitly converted to handle in order to compare them"
+#define TXT_HANDLE_OF_HANDLE_IS_NOT_ALLOWED      "Handle to handle is not allowed"
+#define TXT_s_HIDES_VAR_IN_OUTER_SCOPE           "Variable '%s' hides another variable of same name in outer scope"
+
+#define TXT_IDENTIFIER_s_NOT_DATA_TYPE              "Identifier '%s' is not a data type"
+#define TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_GLOBAL_NS "Identifier '%s' is not a data type in global namespace"
+#define TXT_IDENTIFIER_s_NOT_DATA_TYPE_IN_NS_s      "Identifier '%s' is not a data type in namespace '%s' or parent"
+#define TXT_IF_WITH_EMPTY_STATEMENT                 "If with empty statement"
+#define TXT_ILLEGAL_MEMBER_TYPE                     "Illegal member type"
+// TODO: Should be TXT_ILLEGAL_OPERATION_ON_s
+#define TXT_ILLEGAL_OPERATION                      "Illegal operation on this datatype"
+#define TXT_ILLEGAL_OPERATION_ON_s                 "Illegal operation on '%s'"
+#define TXT_ILLEGAL_TARGET_TYPE_FOR_REF_CAST       "Illegal target type for reference cast"
+#define TXT_ILLEGAL_VARIABLE_NAME_s                "Illegal variable name '%s'."
+#define TXT_INHERITED_PRIVATE_PROP_ACCESS_s        "Illegal access to inherited private property '%s'"
+#define TXT_INIT_LIST_CANNOT_BE_USED_WITH_s        "Initialization lists cannot be used with '%s'"
+#define TXT_INSTANCING_INVLD_TMPL_TYPE_s_s         "Attempting to instantiate invalid template type '%s<%s>'"
+#define TXT_INSTEAD_FOUND_s                        "Instead found '%s'"
+#define TXT_INSTEAD_FOUND_IDENTIFIER_s             "Instead found identifier '%s'"
+#define TXT_INSTEAD_FOUND_KEYWORD_s                "Instead found reserved keyword '%s'"
+#define TXT_INTERFACE_s_CANNOT_BE_INSTANTIATED     "Interface '%s' cannot be instantiated"
+#define TXT_INTERFACE_CAN_ONLY_IMPLEMENT_INTERFACE "Interfaces can only implement other interfaces"
+#define TXT_INVALID_BREAK                          "Invalid 'break'"
+#define TXT_INVALID_CHAR_LITERAL                   "Invalid character literal"
+#define TXT_INVALID_CONTINUE                       "Invalid 'continue'"
+#define TXT_INVALID_ESCAPE_SEQUENCE                "Invalid escape sequence"
+#define TXT_INVALID_EXPRESSION_AMBIGUOUS_NAME      "Invalid expression: ambiguous name"
+#define TXT_INVALID_EXPRESSION_LAMBDA              "Invalid expression: stand-alone anonymous function"
+#define TXT_INVALID_OP_ON_METHOD                   "Invalid operation on method"
+#define TXT_INVALID_REF_PROP_ACCESS                "Invalid reference. Property accessors cannot be used in combined read/write operations"
+#define TXT_INVALID_SCOPE                          "Invalid scope resolution"
+#define TXT_INVALID_SIG_FOR_VIRTPROP               "Invalid signature for virtual property"
+#define TXT_INVALID_TYPE                           "Invalid type"
+#define TXT_INVALID_UNICODE_FORMAT_EXPECTED_d      "Invalid unicode escape sequence, expected %d hex digits"
+#define TXT_INVALID_UNICODE_VALUE                  "Invalid unicode code point"
+#define TXT_INVALID_UNICODE_SEQUENCE_IN_SRC        "Invalid unicode sequence in source"
+#define TXT_INVALID_USE_OF_NAMED_ARGS              "Invalid use of named arguments"
+
+#define TXT_METHOD_CANNOT_OVERRIDE_s                "Method '%s' declared as final and cannot be overridden"
+#define TXT_METHOD_CANT_HAVE_NAME_OF_CLASS          "The method cannot be named with the class name"
+#define TXT_METHOD_s_DOES_NOT_OVERRIDE              "Method '%s' marked as override but does not replace any base class or interface method"
+#define TXT_METHOD_s_s_HAS_NO_RETURN_TYPE           "Method '%s::%s' is missing the return type, nor is it the same name as object to be a constructor"
+#define TXT_METHOD_s_NOT_PART_OF_OBJECT_s           "Method '%s' is not part of object '%s'"
+#define TXT_MISSING_IMPLEMENTATION_OF_s             "Missing implementation of '%s'"
+#define TXT_MISSING_DEFINITION_OF_s                 "Missing definition of '%s'"
+#define TXT_MIXIN_CANNOT_BE_DECLARED_AS_s           "Mixin class cannot be declared as '%s'"
+#define TXT_MIXIN_CANNOT_HAVE_CONSTRUCTOR           "Mixin classes cannot have constructors or destructors"
+#define TXT_MIXIN_CLASS_CANNOT_INHERIT              "Mixin class cannot inherit from classes"
+#define TXT_MIXIN_CANNOT_HAVE_CHILD_TYPES           "Mixin classes cannot have child types"
+#define TXT_MORE_THAN_ONE_MATCHING_OP               "Found more than one matching operator"
+#define TXT_MULTIPLE_MATCHING_SIGNATURES_TO_s       "Multiple matching signatures to '%s'"
+#define TXT_MULTIPLE_PROP_GET_ACCESSOR_FOR_s        "Found multiple get accessors for property '%s'"
+#define TXT_MULTIPLE_PROP_SET_ACCESSOR_FOR_s        "Found multiple set accessors for property '%s'"
+#define TXT_MULTILINE_STRINGS_NOT_ALLOWED           "Multiline strings are not allowed in this application"
+#define TXT_MUST_BE_OBJECT                          "Only objects have constructors"
+#define TXT_MUST_RETURN_VALUE                       "Must return a value"
+
+#define TXT_NAMESPACE_s_DOESNT_EXIST               "Namespace '%s' doesn't exist."
+#define TXT_NAME_CONFLICT_s_EXTENDED_TYPE          "Name conflict. '%s' is an extended data type."
+#define TXT_NAME_CONFLICT_s_GLOBAL_PROPERTY        "Name conflict. '%s' is a global property."
+#define TXT_NAME_CONFLICT_s_IS_NAMED_TYPE          "Name conflict. '%s' is a named type."
+#define TXT_NAME_CONFLICT_s_IS_FUNCDEF             "Name conflict. '%s' is a funcdef."
+#define TXT_NAME_CONFLICT_s_IS_FUNCTION            "Name conflict. '%s' is a global function."
+#define TXT_NAME_CONFLICT_s_IS_MIXIN               "Name conflict. '%s' is a mixin class."
+#define TXT_NAME_CONFLICT_s_IS_VIRTPROP            "Name conflict. '%s' is a virtual property."
+#define TXT_NAME_CONFLICT_s_STRUCT                 "Name conflict. '%s' is a class."
+#define TXT_NAME_CONFLICT_s_INTF                   "Name conflict. '%s' is an interface."
+#define TXT_NAME_CONFLICT_s_OBJ_PROPERTY           "Name conflict. '%s' is an object property."
+#define TXT_NAME_CONFLICT_s_METHOD                 "Name conflict. '%s' is a class method."
+#define TXT_NAME_CONFLICT_s_ALREADY_USED           "Name conflict. '%s' is already used."
+#define TXT_NAMED_ARGS_WITH_OLD_SYNTAX             "Detected named argument with old syntax"
+#define TXT_NO_APPROPRIATE_INDEX_OPERATOR          "No appropriate indexing operator found"
+#define TXT_NO_APPROPRIATE_OPHNDLASSIGN_s          "No appropriate opHndlAssign method found in '%s' for handle assignment"
+#define TXT_NO_APPROPRIATE_OPEQUALS                "No appropriate opEquals method found"
+#define TXT_NO_CONVERSION_s_TO_s                   "No conversion from '%s' to '%s' available."
+#define TXT_NO_CONVERSION_s_TO_MATH_TYPE           "No conversion from '%s' to math type available."
+#define TXT_NO_DEFAULT_ARRAY_TYPE                  "The application doesn't support the default array type."
+#define TXT_NO_DEFAULT_CONSTRUCTOR_FOR_s           "No default constructor for object of type '%s'."
+#define TXT_NO_DEFAULT_COPY_OP_FOR_s               "No appropriate opAssign method found in '%s' for value assignment"
+#define TXT_NO_COPY_CONSTRUCTOR_FOR_s              "No copy constructor for object of type '%s'."
+#define TXT_NO_MATCHING_SIGNATURES_TO_s            "No matching signatures to '%s'"
+#define TXT_NO_MATCHING_OP_FOUND_FOR_TYPE_s        "No matching operator that takes the type '%s' found"
+#define TXT_NO_MATCHING_OP_FOUND_FOR_TYPES_s_AND_s "No matching operator that takes the types '%s' and '%s' found"
+#define TXT_NO_MATCHING_SYMBOL_s                   "No matching symbol '%s'"
+#define TXT_NON_CONST_METHOD_ON_CONST_OBJ          "Non-const method call on read-only object reference"
+#define TXT_NONTERMINATED_STRING                   "Non-terminated string literal"
+#define TXT_NOT_A_FUNC_s_IS_TYPE_s                 "Expression doesn't form a function call. '%s' evaluates to the non-function type '%s'"
+#define TXT_NOT_ALL_PATHS_RETURN                   "Not all paths return a value"
+#define TXT_NOT_ENOUGH_VALUES_FOR_LIST             "Not enough values to match pattern"
+#define TXT_s_NOT_DECLARED                         "'%s' is not declared"
+#define TXT_NOT_EXACT                              "Implicit conversion of value is not exact"
+#define TXT_s_NOT_INITIALIZED                      "'%s' is not initialized."
+#define TXT_NOT_LVALUE                             "Expression is not an l-value"
+#define TXT_s_NOT_MEMBER_OF_s                      "'%s' is not a member of '%s'"
+#define TXT_NOT_VALID_REFERENCE                    "Not a valid reference"
+#define TXT_NOT_VALID_LVALUE                       "Not a valid lvalue"
+#define TXT_NOTHING_WAS_BUILT                      "Nothing was built in the module"
+
+#define TXT_OBJECT_DOESNT_SUPPORT_INDEX_OP          "Type '%s' doesn't support the indexing operator"
+#define TXT_OBJECT_HANDLE_NOT_SUPPORTED             "Object handle is not supported for this type"
+#define TXT_ONLY_OBJECTS_MAY_USE_REF_INOUT          "Only object types that support object handles can use &inout. Use &in or &out instead"
+#define TXT_ONLY_ONE_ARGUMENT_IN_CAST               "A cast operator has one argument"
+#define TXT_ONLY_ONE_FUNCTION_ALLOWED               "The code must contain one and only one function"
+#define TXT_ONLY_ONE_VARIABLE_ALLOWED               "The code must contain one and only one global variable"
+#define TXT_OPERANDS_MUST_BE_HANDLES                "Both operands must be handles when comparing identity"
+#define TXT_OVERLOAD_CONFLICTS_DUE_TO_DEFAULT_ARGS  "The overloaded functions are identical on initial parameters without default arguments"
+
+#define TXT_PARAMETER_ALREADY_DECLARED            "Parameter already declared"
+#define TXT_PARAMETER_CANT_BE_s                   "Parameter type can't be '%s', because the type cannot be instantiated."
+#define TXT_POS_ARG_AFTER_NAMED_ARG               "Positional arguments cannot be passed after named arguments"
+#define TXT_PREV_ERROR_WHILE_COMP_LIST_FOR_TYPE_s "Previous error occurred while attempting to compile initialization list for type '%s'"
+#define TXT_PRIVATE_METHOD_CALL_s                 "Illegal call to private method '%s'"
+#define TXT_PRIVATE_PROP_ACCESS_s                 "Illegal access to private property '%s'"
+#define TXT_PROTECTED_METHOD_CALL_s               "Illegal call to protected method '%s'"
+#define TXT_PROTECTED_PROP_ACCESS_s               "Illegal access to protected property '%s'"
+#define TXT_PROP_ACCESS_WITH_INDEX_ONE_ARG        "Property accessor with index must have 1 and only 1 index argument"
+#define TXT_PROPERTY_ACCESSOR_DISABLED            "Property accessors have been disabled by the application"
+#define TXT_PROPERTY_ACCESSOR_MUST_BE_IMPLEMENTED "Property accessor must be implemented"
+#define TXT_PROPERTY_CANT_BE_CONST                "Class properties cannot be declared as const"
+#define TXT_PROPERTY_HAS_NO_GET_ACCESSOR          "The property has no get accessor"
+#define TXT_PROPERTY_HAS_NO_SET_ACCESSOR          "The property has no set accessor"
+#define TXT_PROPERTY_WITHOUT_ACCESSOR             "Virtual property must have at least one get or set accessor"
+
+#define TXT_REF_CANT_BE_TO_LOCAL_VAR            "Resulting reference cannot be returned. Returned references must not refer to local variables."
+#define TXT_REF_CANT_BE_RETURNED_DEFERRED_PARAM "Resulting reference cannot be returned. There are deferred arguments that may invalidate it."
+#define TXT_REF_CANT_BE_RETURNED_LOCAL_VARS     "Resulting reference cannot be returned. The expression uses objects that during cleanup may invalidate it."
+#define TXT_REF_IS_READ_ONLY                    "Reference is read-only"
+#define TXT_REF_IS_TEMP                         "Reference is temporary"
+#define TXT_REF_TYPE_CANT_BE_PASSED_BY_VAL      "Reference types cannot be passed by value in function parameters"
+#define TXT_REF_TYPE_CANT_BE_RETURNED_BY_VAL    "Reference types cannot be returned by value from functions"
+#define TXT_RETURN_CANT_BE_s                    "Return type can't be '%s'"
+
+#define TXT_SHARED_CANNOT_ACCESS_NON_SHARED_VAR_s      "Shared code cannot access non-shared global variable '%s'"
+#define TXT_SHARED_CANNOT_CALL_NON_SHARED_FUNC_s       "Shared code cannot call non-shared function '%s'"
+#define TXT_SHARED_CANNOT_IMPLEMENT_NON_SHARED_s       "Shared type cannot implement non-shared interface '%s'"
+#define TXT_SHARED_CANNOT_INHERIT_FROM_NON_SHARED_s    "Shared class cannot inherit from non-shared class '%s'"
+#define TXT_SHARED_CANNOT_USE_NON_SHARED_TYPE_s        "Shared code cannot use non-shared type '%s'"
+#define TXT_SHARED_s_DOESNT_MATCH_ORIGINAL             "Shared type '%s' doesn't match the original declaration in other module"
+#define TXT_SECTION_IS_EMPTY                           "The script section is empty"
+#define TXT_SIGNED_UNSIGNED_MISMATCH                   "Signed/Unsigned mismatch"
+#define TXT_STRINGS_NOT_RECOGNIZED                     "Strings are not recognized by the application"
+#define TXT_SWITCH_CASE_MUST_BE_CONSTANT               "Case expressions must be constants"
+#define TXT_SWITCH_MUST_BE_INTEGRAL                    "Switch expressions must be integral numbers"
+
+#define TXT_TMPL_s_EXPECTS_d_SUBTYPES          "Template '%s' expects %d sub type(s)"
+#define TXT_TMPL_SUBTYPE_MUST_NOT_BE_READ_ONLY "Template subtype must not be read-only"
+#define TXT_TOO_MANY_JUMP_LABELS               "The function has too many jump labels to handle. Split the function into smaller ones."
+#define TXT_TOO_MANY_VALUES_FOR_LIST           "Too many values to match pattern"
+#define TXT_TYPE_s_CANNOT_BE_REFERENCE         "Type '%s' cannot be a reference"
+#define TXT_TYPE_s_NOT_AVAILABLE_FOR_MODULE    "Type '%s' is not available for this module"
+#define TXT_TYPE_s_NOT_TEMPLATE                "Type '%s' is not a template type"
+
+#define TXT_UNEXPECTED_END_OF_FILE             "Unexpected end of file"
+#define TXT_UNEXPECTED_TOKEN_s                 "Unexpected token '%s'"
+#define TXT_UNEXPECTED_VAR_DECL                "Unexpected variable declaration"
+#define TXT_UNINITIALIZED_GLOBAL_VAR_s         "Use of uninitialized global variable '%s'."
+#define TXT_UNKNOWN_SCOPE_s                    "Unknown scope '%s'"
+#define TXT_UNREACHABLE_CODE                   "Unreachable code"
+#define TXT_UNRECOGNIZED_VIRTUAL_PROPERTY_NODE "Virtual property contains unrecognized aspect"
+#define TXT_UNUSED_SCRIPT_NODE                 "Unused script node"
+
+#define TXT_VALUE_TOO_LARGE_FOR_TYPE      "Value is too large for data type"
+#define TXT_VOID_CANT_BE_OPERAND          "Void cannot be an operand in expressions"
+
+#define TXT_WARNINGS_TREATED_AS_ERROR     "Warnings are treated as errors by the application"
+#define TXT_WHERE_s_IS_s                  "Where '%s' is '%s'"
+#define TXT_WHILE_PARSING_ARG_LIST        "While parsing argument list"
+#define TXT_WHILE_PARSING_EXPRESSION      "While parsing expression"
+#define TXT_WHILE_PARSING_INIT_LIST       "While parsing initialization list"
+#define TXT_WHILE_PARSING_NAMESPACE       "While parsing namespace"
+#define TXT_WHILE_PARSING_STATEMENT_BLOCK "While parsing statement block"
+#define TXT_WHILE_INCLUDING_MIXIN         "Previous error occurred while including mixin"
+
+// Global variable initialization
+
+#define TXT_FAILED_TO_INITIALIZE_s      "Failed to initialize global variable '%s'"
+#define TXT_EXCEPTION_s_IN_s            "Exception '%s' in '%s'"
+
+// Engine message
+
+#define TXT_AUTOHANDLE_CANNOT_BE_USED_FOR_NOCOUNT        "Autohandles cannot be used with types that have been registered with NOCOUNT"
+#define TXT_FIRST_PARAM_MUST_BE_REF_FOR_TEMPLATE_FACTORY "First parameter to template factory must be a reference. This will be used to pass the object type of the template"
+#define TXT_INVALID_CONFIGURATION                        "Invalid configuration. Verify the registered application interface."
+#define TXT_VALUE_TYPE_MUST_HAVE_SIZE                    "A value type must be registered with a non-zero size"
+#define TXT_TYPE_s_IS_MISSING_BEHAVIOURS                 "Type '%s' is missing behaviours"
+#define TXT_ILLEGAL_BEHAVIOUR_FOR_TYPE                   "The behaviour is not compatible with the type"
+#define TXT_GC_REQUIRE_ADD_REL_GC_BEHAVIOUR              "A garbage collected ref type must have the addref, release, and all gc behaviours"
+#define TXT_VALUE_GC_REQUIRE_GC_BEHAVIOUR                "A garbage collected value type must have the gc enum references behaviour"
+#define TXT_SCOPE_REQUIRE_REL_BEHAVIOUR                  "A scoped reference type must have the release behaviour"
+#define TXT_REF_REQUIRE_ADD_REL_BEHAVIOUR                "A reference type must have the addref and release behaviours"
+#define TXT_NON_POD_REQUIRE_CONSTR_DESTR_BEHAVIOUR       "A non-pod value type must have at least one constructor and the destructor behaviours"
+#define TXT_CANNOT_PASS_TYPE_s_BY_VAL                    "Can't pass type '%s' by value unless the application type is informed in the registration"
+#define TXT_CANNOT_RET_TYPE_s_BY_VAL                     "Can't return type '%s' by value unless the application type is informed in the registration"
+// TODO: Should be something like "This platform requires that AngelScript knows the exact content of the type '%s' in order to pass by value to application in native calling convention"
+#define TXT_DONT_SUPPORT_TYPE_s_BY_VAL                   "Don't support passing type '%s' by value to application in native calling convention on this platform"
+// TODO: Should be something like "This platform requires that AngelScript knows the exact content of the type '%s' in order to return by value from application in native calling convention"
+#define TXT_DONT_SUPPORT_RET_TYPE_s_BY_VAL               "Don't support returning type '%s' by value from application in native calling convention on this platform"
+#define TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s               "Object {%d}. GC cannot destroy an object of type '%s' as it doesn't know how many references to there are."
+#define TXT_d_GC_CANNOT_FREE_OBJ_OF_TYPE_s_REF_COUNT_d   "Object {%d}. GC cannot destroy an object of type '%s' as it can't see all references. Current ref count is %d."
+#define TXT_OBJECT_TYPE_s_DOESNT_EXIST                   "Object type '%s' doesn't exist"
+#define TXT_TEMPLATE_s_ALREADY_GENERATED_CANT_REGISTER   "Cannot register. The template type instance '%s' has already been generated."
+#define TXT_TEMPLATE_TYPE_s_DOESNT_EXIST                 "Template type '%s' doesn't exist"
+#define TXT_TEMPLATE_SUBTYPE_s_DOESNT_EXIST              "Template subtype '%s' doesn't exist"
+#define TXT_TEMPLATE_LIST_FACTORY_EXPECTS_2_REF_PARAMS   "Template list factory expects two reference parameters. The last is the pointer to the initialization buffer"
+#define TXT_LIST_FACTORY_EXPECTS_1_REF_PARAM             "List factory expects only one reference parameter. The pointer to the initialization buffer will be passed in this parameter"
+#define TXT_FAILED_READ_SUBTYPE_OF_TEMPLATE_s            "Failed to read subtype of template type '%s'"
+#define TXT_FAILED_IN_FUNC_s_s_d                           "Failed in call to function '%s' (Code: %s, %d)"
+#define TXT_FAILED_IN_FUNC_s_WITH_s_s_d                    "Failed in call to function '%s' with '%s' (Code: %s, %d)"
+#define TXT_FAILED_IN_FUNC_s_WITH_s_AND_s_s_d              "Failed in call to function '%s' with '%s' and '%s' (Code: %s, %d)"
+#define TXT_GC_RECEIVED_NULL_PTR                         "AddScriptObjectToGC called with null pointer"
+#define TXT_EXCEPTION_IN_NESTED_CALL                     "An exception occurred in a nested call"
+#define TXT_TYPE_s_IS_STILL_USED_BY_FUNC_s               "Type '%s' is still used by function '%s'"
+#define TXT_PREV_TYPE_IS_NAMED_s                         "The builtin type in previous message is named '%s'"
+#define TXT_PREV_FUNC_IS_NAMED_s_TYPE_IS_d               "The function in previous message is named '%s'. The func type is %d"
+#define TXT_RESURRECTING_SCRIPTOBJECT_s                  "The script object of type '%s' is being resurrected illegally during destruction"
+#define TXT_INVALID_BYTECODE_d                           "LoadByteCode failed. The bytecode is invalid. Number of bytes read from stream: %d"
+#define TXT_NO_JIT_IN_FUNC_s                             "Function '%s' appears to have been compiled without JIT entry points"
+#define TXT_ENGINE_REF_COUNT_ERROR_DURING_SHUTDOWN       "Uh oh! The engine's reference count is increasing while it is being destroyed. Make sure references needed for clean-up are immediately released"
+#define TXT_MODULE_IS_IN_USE                             "The module is still in use and cannot be rebuilt. Discard it and request another module"
+#define TXT_EXTRNL_REF_TO_MODULE_s                       "There is an external reference to an object in module '%s', preventing it from being deleted"
+
+// Internal names
+
+#define TXT_PROPERTY                      "Property"
+#define TXT_SYSTEM_FUNCTION               "System function"
+#define TXT_VARIABLE_DECL                 "Variable declaration"
+
+// Exceptions
+
+#define TXT_STACK_OVERFLOW                "Stack overflow"
+#define TXT_NULL_POINTER_ACCESS           "Null pointer access"
+#define TXT_DIVIDE_BY_ZERO                "Divide by zero"
+#define TXT_DIVIDE_OVERFLOW               "Overflow in integer division"
+#define TXT_POW_OVERFLOW                  "Overflow in exponent operation"
+#define TXT_UNRECOGNIZED_BYTE_CODE        "Unrecognized byte code"
+#define TXT_INVALID_CALLING_CONVENTION    "Invalid calling convention"
+#define TXT_UNBOUND_FUNCTION              "Unbound function called"
+#define TXT_OUT_OF_BOUNDS                 "Out of range"
+#define TXT_EXCEPTION_CAUGHT              "Caught an exception from the application"
+#define TXT_MISMATCH_IN_VALUE_ASSIGN      "Mismatching types in value assignment"
+#define TXT_TOO_MANY_NESTED_CALLS         "Too many nested calls"
+
+// Error codes
+#define ERROR_NAME(x) #x
+static const char*const errorNames[] =
+{
+	ERROR_NAME(asSUCCESS),
+	ERROR_NAME(asERROR),
+	ERROR_NAME(asCONTEXT_ACTIVE),
+	ERROR_NAME(asCONTEXT_NOT_FINISHED),
+	ERROR_NAME(asCONTEXT_NOT_PREPARED),
+	ERROR_NAME(asINVALID_ARG),
+	ERROR_NAME(asNO_FUNCTION),
+	ERROR_NAME(asNOT_SUPPORTED),
+	ERROR_NAME(asINVALID_NAME),
+	ERROR_NAME(asNAME_TAKEN),
+	ERROR_NAME(asINVALID_DECLARATION),
+	ERROR_NAME(asINVALID_OBJECT),
+	ERROR_NAME(asINVALID_TYPE),
+	ERROR_NAME(asALREADY_REGISTERED),
+	ERROR_NAME(asMULTIPLE_FUNCTIONS),
+	ERROR_NAME(asNO_MODULE),
+	ERROR_NAME(asNO_GLOBAL_VAR),
+	ERROR_NAME(asINVALID_CONFIGURATION),
+	ERROR_NAME(asINVALID_INTERFACE),
+	ERROR_NAME(asCANT_BIND_ALL_FUNCTIONS),
+	ERROR_NAME(asLOWER_ARRAY_DIMENSION_NOT_REGISTERED),
+	ERROR_NAME(asWRONG_CONFIG_GROUP),
+	ERROR_NAME(asCONFIG_GROUP_IS_IN_USE),
+	ERROR_NAME(asILLEGAL_BEHAVIOUR_FOR_TYPE),
+	ERROR_NAME(asWRONG_CALLING_CONV),
+	ERROR_NAME(asBUILD_IN_PROGRESS),
+	ERROR_NAME(asINIT_GLOBAL_VARS_FAILED),
+	ERROR_NAME(asOUT_OF_MEMORY),
+	ERROR_NAME(asMODULE_IS_IN_USE)
+};
+
+#endif
diff --git a/Sources/AngelScript/source/as_thread.cpp b/Sources/AngelScript/source/as_thread.cpp
old mode 100755
new mode 100644
index 5f487d4cd..63ab15e1d
--- a/Sources/AngelScript/source/as_thread.cpp
+++ b/Sources/AngelScript/source/as_thread.cpp
@@ -1,468 +1,468 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_thread.cpp
-//
-// Functions for multi threading support
-//
-
-#include "as_config.h"
-#include "as_thread.h"
-#include "as_atomic.h"
-
-BEGIN_AS_NAMESPACE
-
-//=======================================================================
-
-// Singleton
-static asCThreadManager *threadManager = 0;
-
-//======================================================================
-
-// Global API functions
-extern "C"
-{
-
-AS_API int asThreadCleanup()
-{
-	return asCThreadManager::CleanupLocalData();
-}
-
-AS_API asIThreadManager *asGetThreadManager()
-{
-	return threadManager;
-}
-
-AS_API int asPrepareMultithread(asIThreadManager *externalThreadMgr)
-{
-	return asCThreadManager::Prepare(externalThreadMgr);
-}
-
-AS_API void asUnprepareMultithread()
-{
-	asCThreadManager::Unprepare();
-}
-
-AS_API void asAcquireExclusiveLock()
-{
-	if( threadManager )
-	{
-		ACQUIREEXCLUSIVE(threadManager->appRWLock);
-	}
-}
-
-AS_API void asReleaseExclusiveLock()
-{
-	if( threadManager )
-	{
-		RELEASEEXCLUSIVE(threadManager->appRWLock);
-	}
-}
-
-AS_API void asAcquireSharedLock()
-{
-	if( threadManager )
-	{
-		ACQUIRESHARED(threadManager->appRWLock);
-	}
-}
-
-AS_API void asReleaseSharedLock()
-{
-	if( threadManager )
-	{
-		RELEASESHARED(threadManager->appRWLock);
-	}
-}
-
-}
-
-//======================================================================
-
-#if !defined(AS_NO_THREADS) && defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-__declspec(thread) asCThreadLocalData *asCThreadManager::tld = 0;
-#endif
-
-asCThreadManager::asCThreadManager()
-{
-	// We're already in the critical section when this function is called
-
-#ifdef AS_NO_THREADS
-	tld = 0;
-#else
-	// Allocate the thread local storage
-	#if defined AS_POSIX_THREADS
-		pthread_key_t pKey;
-		pthread_key_create(&pKey, 0);
-		tlsKey = (asDWORD)pKey;
-	#elif defined AS_WINDOWS_THREADS
-		#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-			tld = 0;
-		#else
-			tlsKey = (asDWORD)TlsAlloc();
-		#endif
-	#endif
-#endif
-	refCount = 1;
-}
-
-int asCThreadManager::Prepare(asIThreadManager *externalThreadMgr)
-{
-	// Don't allow an external thread manager if there
-	// is already a thread manager defined
-	if( externalThreadMgr && threadManager )
-		return asINVALID_ARG;
-
-	// The critical section cannot be declared globally, as there is no
-	// guarantee for the order in which global variables are initialized
-	// or uninitialized.
-
-	// For this reason it's not possible to prevent two threads from calling
-	// AddRef at the same time, so there is a chance for a race condition here.
-
-	// To avoid the race condition when the thread manager is first created,
-	// the application must make sure to call the global asPrepareForMultiThread()
-	// in the main thread before any other thread creates a script engine.
-	if( threadManager == 0 && externalThreadMgr == 0 )
-		threadManager = asNEW(asCThreadManager);
-	else
-	{
-		// If an application uses different dlls each dll will get it's own memory
-		// space for global variables. If multiple dlls then uses AngelScript's
-		// global thread support functions it is then best to share the thread
-		// manager to make sure all dlls use the same critical section.
-		if( externalThreadMgr )
-			threadManager = reinterpret_cast<asCThreadManager*>(externalThreadMgr);
-
-		ENTERCRITICALSECTION(threadManager->criticalSection);
-		threadManager->refCount++;
-		LEAVECRITICALSECTION(threadManager->criticalSection);
-	}
-
-	// Success
-	return 0;
-}
-
-void asCThreadManager::Unprepare()
-{
-	asASSERT(threadManager);
-
-	if( threadManager == 0 )
-		return;
-
-	// It's necessary to protect this section so no
-	// other thread attempts to call AddRef or Release
-	// while clean up is in progress.
-	ENTERCRITICALSECTION(threadManager->criticalSection);
-	if( --threadManager->refCount == 0 )
-	{
-		// Make sure the local data is destroyed, at least for the current thread
-		CleanupLocalData();
-
-		// As the critical section will be destroyed together
-		// with the thread manager we must first clear the global
-		// variable in case a new thread manager needs to be created;
-		asCThreadManager *mgr = threadManager;
-		threadManager = 0;
-
-		// Leave the critical section before it is destroyed
-		LEAVECRITICALSECTION(mgr->criticalSection);
-
-		asDELETE(mgr,asCThreadManager);
-	}
-	else
-		LEAVECRITICALSECTION(threadManager->criticalSection);
-}
-
-asCThreadManager::~asCThreadManager()
-{
-#ifndef AS_NO_THREADS
-	// Deallocate the thread local storage
-	#if defined AS_POSIX_THREADS
-		pthread_key_delete((pthread_key_t)tlsKey);
-	#elif defined AS_WINDOWS_THREADS
-		#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-			tld = 0;
-		#else
-			TlsFree((DWORD)tlsKey);
-		#endif
-	#endif
-#else
-	if( tld )
-	{
-		asDELETE(tld,asCThreadLocalData);
-	}
-	tld = 0;
-#endif
-}
-
-int asCThreadManager::CleanupLocalData()
-{
-	if( threadManager == 0 )
-		return 0;
-
-#ifndef AS_NO_THREADS
-#if defined AS_POSIX_THREADS
-	asCThreadLocalData *tld = (asCThreadLocalData*)pthread_getspecific((pthread_key_t)threadManager->tlsKey);
-#elif defined AS_WINDOWS_THREADS
-	#if !defined(_MSC_VER) || !(WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-		asCThreadLocalData *tld = (asCThreadLocalData*)TlsGetValue((DWORD)threadManager->tlsKey);
-	#endif
-#endif
-
-	if( tld == 0 )
-		return 0;
-
-	if( tld->activeContexts.GetLength() == 0 )
-	{
-		asDELETE(tld,asCThreadLocalData);
-		#if defined AS_POSIX_THREADS
-			pthread_setspecific((pthread_key_t)threadManager->tlsKey, 0);
-		#elif defined AS_WINDOWS_THREADS
-			#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-				tld = 0;
-			#else
-				TlsSetValue((DWORD)threadManager->tlsKey, 0);
-			#endif
-		#endif
-		return 0;
-	}
-	else
-		return asCONTEXT_ACTIVE;
-
-#else
-	if( threadManager->tld )
-	{
-		if( threadManager->tld->activeContexts.GetLength() == 0 )
-		{
-			asDELETE(threadManager->tld,asCThreadLocalData);
-			threadManager->tld = 0;
-		}
-		else
-			return asCONTEXT_ACTIVE;
-	}
-	return 0;
-#endif
-}
-
-asCThreadLocalData *asCThreadManager::GetLocalData()
-{
-	if( threadManager == 0 )
-		return 0;
-
-#ifndef AS_NO_THREADS
-#if defined AS_POSIX_THREADS
-	asCThreadLocalData *tld = (asCThreadLocalData*)pthread_getspecific((pthread_key_t)threadManager->tlsKey);
-	if( tld == 0 )
-	{
-		tld = asNEW(asCThreadLocalData)();
-		pthread_setspecific((pthread_key_t)threadManager->tlsKey, tld);
-	}
-#elif defined AS_WINDOWS_THREADS
-	#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-		if( tld == 0 )
-			tld = asNEW(asCThreadLocalData)();
-	#else
-		asCThreadLocalData *tld = (asCThreadLocalData*)TlsGetValue((DWORD)threadManager->tlsKey);
-		if( tld == 0 )
-		{
- 			tld = asNEW(asCThreadLocalData)();
-			TlsSetValue((DWORD)threadManager->tlsKey, tld);
- 		}
-	#endif
-#endif
-
-	return tld;
-#else
-	if( threadManager->tld == 0 )
-		threadManager->tld = asNEW(asCThreadLocalData)();
-
-	return threadManager->tld;
-#endif
-}
-
-//=========================================================================
-
-asCThreadLocalData::asCThreadLocalData()
-{
-}
-
-asCThreadLocalData::~asCThreadLocalData()
-{
-}
-
-//=========================================================================
-
-#ifndef AS_NO_THREADS
-asCThreadCriticalSection::asCThreadCriticalSection()
-{
-#if defined AS_POSIX_THREADS
-	pthread_mutex_init(&cs, 0);
-#elif defined AS_WINDOWS_THREADS
-#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-	// Only the Ex version is available on Windows Store
-	InitializeCriticalSectionEx(&cs, 4000, 0);
-#else
-	// Only the non-Ex version is available on WinXP and older
-	// MinGW also only defines this version
-	InitializeCriticalSection(&cs);
-#endif
-#endif
-}
-
-asCThreadCriticalSection::~asCThreadCriticalSection()
-{
-#if defined AS_POSIX_THREADS
-	pthread_mutex_destroy(&cs);
-#elif defined AS_WINDOWS_THREADS
-	DeleteCriticalSection(&cs);
-#endif
-}
-
-void asCThreadCriticalSection::Enter()
-{
-#if defined AS_POSIX_THREADS
-	pthread_mutex_lock(&cs);
-#elif defined AS_WINDOWS_THREADS
-	EnterCriticalSection(&cs);
-#endif
-}
-
-void asCThreadCriticalSection::Leave()
-{
-#if defined AS_POSIX_THREADS
-	pthread_mutex_unlock(&cs);
-#elif defined AS_WINDOWS_THREADS
-	LeaveCriticalSection(&cs);
-#endif
-}
-
-bool asCThreadCriticalSection::TryEnter()
-{
-#if defined AS_POSIX_THREADS
-	return !pthread_mutex_trylock(&cs);
-#elif defined AS_WINDOWS_THREADS
-	return TryEnterCriticalSection(&cs) ? true : false;
-#else
-	return true;
-#endif
-}
-
-asCThreadReadWriteLock::asCThreadReadWriteLock()
-{
-#if defined AS_POSIX_THREADS
-	int r = pthread_rwlock_init(&lock, 0);
-	asASSERT( r == 0 );
-	UNUSED_VAR(r);
-#elif defined AS_WINDOWS_THREADS
-#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-	// Only the Ex versions are available on Windows Store
-
-	// Create a semaphore to allow up to maxReaders simultaneous readers
-	readLocks = CreateSemaphoreExW(NULL, maxReaders, maxReaders, 0, 0, 0);
-	// Create a critical section to synchronize writers
-	InitializeCriticalSectionEx(&writeLock, 4000, 0);
-#else
-	readLocks = CreateSemaphoreW(NULL, maxReaders, maxReaders, 0);
-	InitializeCriticalSection(&writeLock);
-#endif
-#endif
-}
-
-asCThreadReadWriteLock::~asCThreadReadWriteLock()
-{
-#if defined AS_POSIX_THREADS
-	pthread_rwlock_destroy(&lock);
-#elif defined AS_WINDOWS_THREADS
-	DeleteCriticalSection(&writeLock);
-	CloseHandle(readLocks);
-#endif
-}
-
-void asCThreadReadWriteLock::AcquireExclusive()
-{
-#if defined AS_POSIX_THREADS
-	pthread_rwlock_wrlock(&lock);
-#elif defined AS_WINDOWS_THREADS
-	// Synchronize writers, so only one tries to lock out the readers
-	EnterCriticalSection(&writeLock);
-
-	// Lock all reader out from the semaphore. Do this one by one,
-	// so the lock doesn't have to wait until there are no readers at all.
-	// If we try to lock all at once it is quite possible the writer will
-	// never succeed.
-	for( asUINT n = 0; n < maxReaders; n++ )
-		WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
-
-	// Allow another writer to lock. It will only be able to
-	// lock the readers when this writer releases them anyway.
-	LeaveCriticalSection(&writeLock);
-#endif
-}
-
-void asCThreadReadWriteLock::ReleaseExclusive()
-{
-#if defined AS_POSIX_THREADS
-	pthread_rwlock_unlock(&lock);
-#elif defined AS_WINDOWS_THREADS
-	// Release all readers at once
-	ReleaseSemaphore(readLocks, maxReaders, 0);
-#endif
-}
-
-void asCThreadReadWriteLock::AcquireShared()
-{
-#if defined AS_POSIX_THREADS
-	pthread_rwlock_rdlock(&lock);
-#elif defined AS_WINDOWS_THREADS
-	// Lock a reader slot
-	WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
-#endif
-}
-
-void asCThreadReadWriteLock::ReleaseShared()
-{
-#if defined AS_POSIX_THREADS
-	pthread_rwlock_unlock(&lock);
-#elif defined AS_WINDOWS_THREADS
-	// Release the reader slot
-	ReleaseSemaphore(readLocks, 1, 0);
-#endif
-}
-
-#endif
-
-//========================================================================
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2014 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_thread.cpp
+//
+// Functions for multi threading support
+//
+
+#include "as_config.h"
+#include "as_thread.h"
+#include "as_atomic.h"
+
+BEGIN_AS_NAMESPACE
+
+//=======================================================================
+
+// Singleton
+static asCThreadManager *threadManager = 0;
+
+//======================================================================
+
+// Global API functions
+extern "C"
+{
+
+AS_API int asThreadCleanup()
+{
+	return asCThreadManager::CleanupLocalData();
+}
+
+AS_API asIThreadManager *asGetThreadManager()
+{
+	return threadManager;
+}
+
+AS_API int asPrepareMultithread(asIThreadManager *externalThreadMgr)
+{
+	return asCThreadManager::Prepare(externalThreadMgr);
+}
+
+AS_API void asUnprepareMultithread()
+{
+	asCThreadManager::Unprepare();
+}
+
+AS_API void asAcquireExclusiveLock()
+{
+	if( threadManager )
+	{
+		ACQUIREEXCLUSIVE(threadManager->appRWLock);
+	}
+}
+
+AS_API void asReleaseExclusiveLock()
+{
+	if( threadManager )
+	{
+		RELEASEEXCLUSIVE(threadManager->appRWLock);
+	}
+}
+
+AS_API void asAcquireSharedLock()
+{
+	if( threadManager )
+	{
+		ACQUIRESHARED(threadManager->appRWLock);
+	}
+}
+
+AS_API void asReleaseSharedLock()
+{
+	if( threadManager )
+	{
+		RELEASESHARED(threadManager->appRWLock);
+	}
+}
+
+}
+
+//======================================================================
+
+#if !defined(AS_NO_THREADS) && defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+__declspec(thread) asCThreadLocalData *asCThreadManager::tld = 0;
+#endif
+
+asCThreadManager::asCThreadManager()
+{
+	// We're already in the critical section when this function is called
+
+#ifdef AS_NO_THREADS
+	tld = 0;
+#else
+	// Allocate the thread local storage
+	#if defined AS_POSIX_THREADS
+		pthread_key_t pKey;
+		pthread_key_create(&pKey, 0);
+		tlsKey = (asDWORD)pKey;
+	#elif defined AS_WINDOWS_THREADS
+		#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+			tld = 0;
+		#else
+			tlsKey = (asDWORD)TlsAlloc();
+		#endif
+	#endif
+#endif
+	refCount = 1;
+}
+
+int asCThreadManager::Prepare(asIThreadManager *externalThreadMgr)
+{
+	// Don't allow an external thread manager if there
+	// is already a thread manager defined
+	if( externalThreadMgr && threadManager )
+		return asINVALID_ARG;
+
+	// The critical section cannot be declared globally, as there is no
+	// guarantee for the order in which global variables are initialized
+	// or uninitialized.
+
+	// For this reason it's not possible to prevent two threads from calling
+	// AddRef at the same time, so there is a chance for a race condition here.
+
+	// To avoid the race condition when the thread manager is first created,
+	// the application must make sure to call the global asPrepareForMultiThread()
+	// in the main thread before any other thread creates a script engine.
+	if( threadManager == 0 && externalThreadMgr == 0 )
+		threadManager = asNEW(asCThreadManager);
+	else
+	{
+		// If an application uses different dlls each dll will get it's own memory
+		// space for global variables. If multiple dlls then uses AngelScript's
+		// global thread support functions it is then best to share the thread
+		// manager to make sure all dlls use the same critical section.
+		if( externalThreadMgr )
+			threadManager = reinterpret_cast<asCThreadManager*>(externalThreadMgr);
+
+		ENTERCRITICALSECTION(threadManager->criticalSection);
+		threadManager->refCount++;
+		LEAVECRITICALSECTION(threadManager->criticalSection);
+	}
+
+	// Success
+	return 0;
+}
+
+void asCThreadManager::Unprepare()
+{
+	asASSERT(threadManager);
+
+	if( threadManager == 0 )
+		return;
+
+	// It's necessary to protect this section so no
+	// other thread attempts to call AddRef or Release
+	// while clean up is in progress.
+	ENTERCRITICALSECTION(threadManager->criticalSection);
+	if( --threadManager->refCount == 0 )
+	{
+		// Make sure the local data is destroyed, at least for the current thread
+		CleanupLocalData();
+
+		// As the critical section will be destroyed together
+		// with the thread manager we must first clear the global
+		// variable in case a new thread manager needs to be created;
+		asCThreadManager *mgr = threadManager;
+		threadManager = 0;
+
+		// Leave the critical section before it is destroyed
+		LEAVECRITICALSECTION(mgr->criticalSection);
+
+		asDELETE(mgr,asCThreadManager);
+	}
+	else
+		LEAVECRITICALSECTION(threadManager->criticalSection);
+}
+
+asCThreadManager::~asCThreadManager()
+{
+#ifndef AS_NO_THREADS
+	// Deallocate the thread local storage
+	#if defined AS_POSIX_THREADS
+		pthread_key_delete((pthread_key_t)tlsKey);
+	#elif defined AS_WINDOWS_THREADS
+		#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+			tld = 0;
+		#else
+			TlsFree((DWORD)tlsKey);
+		#endif
+	#endif
+#else
+	if( tld )
+	{
+		asDELETE(tld,asCThreadLocalData);
+	}
+	tld = 0;
+#endif
+}
+
+int asCThreadManager::CleanupLocalData()
+{
+	if( threadManager == 0 )
+		return 0;
+
+#ifndef AS_NO_THREADS
+#if defined AS_POSIX_THREADS
+	asCThreadLocalData *tld = (asCThreadLocalData*)pthread_getspecific((pthread_key_t)threadManager->tlsKey);
+#elif defined AS_WINDOWS_THREADS
+	#if !defined(_MSC_VER) || !(WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+		asCThreadLocalData *tld = (asCThreadLocalData*)TlsGetValue((DWORD)threadManager->tlsKey);
+	#endif
+#endif
+
+	if( tld == 0 )
+		return 0;
+
+	if( tld->activeContexts.GetLength() == 0 )
+	{
+		asDELETE(tld,asCThreadLocalData);
+		#if defined AS_POSIX_THREADS
+			pthread_setspecific((pthread_key_t)threadManager->tlsKey, 0);
+		#elif defined AS_WINDOWS_THREADS
+			#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+				tld = 0;
+			#else
+				TlsSetValue((DWORD)threadManager->tlsKey, 0);
+			#endif
+		#endif
+		return 0;
+	}
+	else
+		return asCONTEXT_ACTIVE;
+
+#else
+	if( threadManager->tld )
+	{
+		if( threadManager->tld->activeContexts.GetLength() == 0 )
+		{
+			asDELETE(threadManager->tld,asCThreadLocalData);
+			threadManager->tld = 0;
+		}
+		else
+			return asCONTEXT_ACTIVE;
+	}
+	return 0;
+#endif
+}
+
+asCThreadLocalData *asCThreadManager::GetLocalData()
+{
+	if( threadManager == 0 )
+		return 0;
+
+#ifndef AS_NO_THREADS
+#if defined AS_POSIX_THREADS
+	asCThreadLocalData *tld = (asCThreadLocalData*)pthread_getspecific((pthread_key_t)threadManager->tlsKey);
+	if( tld == 0 )
+	{
+		tld = asNEW(asCThreadLocalData)();
+		pthread_setspecific((pthread_key_t)threadManager->tlsKey, tld);
+	}
+#elif defined AS_WINDOWS_THREADS
+	#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+		if( tld == 0 )
+			tld = asNEW(asCThreadLocalData)();
+	#else
+		asCThreadLocalData *tld = (asCThreadLocalData*)TlsGetValue((DWORD)threadManager->tlsKey);
+		if( tld == 0 )
+		{
+ 			tld = asNEW(asCThreadLocalData)();
+			TlsSetValue((DWORD)threadManager->tlsKey, tld);
+ 		}
+	#endif
+#endif
+
+	return tld;
+#else
+	if( threadManager->tld == 0 )
+		threadManager->tld = asNEW(asCThreadLocalData)();
+
+	return threadManager->tld;
+#endif
+}
+
+//=========================================================================
+
+asCThreadLocalData::asCThreadLocalData()
+{
+}
+
+asCThreadLocalData::~asCThreadLocalData()
+{
+}
+
+//=========================================================================
+
+#ifndef AS_NO_THREADS
+asCThreadCriticalSection::asCThreadCriticalSection()
+{
+#if defined AS_POSIX_THREADS
+	pthread_mutex_init(&cs, 0);
+#elif defined AS_WINDOWS_THREADS
+#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+	// Only the Ex version is available on Windows Store
+	InitializeCriticalSectionEx(&cs, 4000, 0);
+#else
+	// Only the non-Ex version is available on WinXP and older
+	// MinGW also only defines this version
+	InitializeCriticalSection(&cs);
+#endif
+#endif
+}
+
+asCThreadCriticalSection::~asCThreadCriticalSection()
+{
+#if defined AS_POSIX_THREADS
+	pthread_mutex_destroy(&cs);
+#elif defined AS_WINDOWS_THREADS
+	DeleteCriticalSection(&cs);
+#endif
+}
+
+void asCThreadCriticalSection::Enter()
+{
+#if defined AS_POSIX_THREADS
+	pthread_mutex_lock(&cs);
+#elif defined AS_WINDOWS_THREADS
+	EnterCriticalSection(&cs);
+#endif
+}
+
+void asCThreadCriticalSection::Leave()
+{
+#if defined AS_POSIX_THREADS
+	pthread_mutex_unlock(&cs);
+#elif defined AS_WINDOWS_THREADS
+	LeaveCriticalSection(&cs);
+#endif
+}
+
+bool asCThreadCriticalSection::TryEnter()
+{
+#if defined AS_POSIX_THREADS
+	return !pthread_mutex_trylock(&cs);
+#elif defined AS_WINDOWS_THREADS
+	return TryEnterCriticalSection(&cs) ? true : false;
+#else
+	return true;
+#endif
+}
+
+asCThreadReadWriteLock::asCThreadReadWriteLock()
+{
+#if defined AS_POSIX_THREADS
+	int r = pthread_rwlock_init(&lock, 0);
+	asASSERT( r == 0 );
+	UNUSED_VAR(r);
+#elif defined AS_WINDOWS_THREADS
+#if defined(_MSC_VER) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+	// Only the Ex versions are available on Windows Store
+
+	// Create a semaphore to allow up to maxReaders simultaneous readers
+	readLocks = CreateSemaphoreExW(NULL, maxReaders, maxReaders, 0, 0, 0);
+	// Create a critical section to synchronize writers
+	InitializeCriticalSectionEx(&writeLock, 4000, 0);
+#else
+	readLocks = CreateSemaphoreW(NULL, maxReaders, maxReaders, 0);
+	InitializeCriticalSection(&writeLock);
+#endif
+#endif
+}
+
+asCThreadReadWriteLock::~asCThreadReadWriteLock()
+{
+#if defined AS_POSIX_THREADS
+	pthread_rwlock_destroy(&lock);
+#elif defined AS_WINDOWS_THREADS
+	DeleteCriticalSection(&writeLock);
+	CloseHandle(readLocks);
+#endif
+}
+
+void asCThreadReadWriteLock::AcquireExclusive()
+{
+#if defined AS_POSIX_THREADS
+	pthread_rwlock_wrlock(&lock);
+#elif defined AS_WINDOWS_THREADS
+	// Synchronize writers, so only one tries to lock out the readers
+	EnterCriticalSection(&writeLock);
+
+	// Lock all reader out from the semaphore. Do this one by one,
+	// so the lock doesn't have to wait until there are no readers at all.
+	// If we try to lock all at once it is quite possible the writer will
+	// never succeed.
+	for( asUINT n = 0; n < maxReaders; n++ )
+		WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
+
+	// Allow another writer to lock. It will only be able to
+	// lock the readers when this writer releases them anyway.
+	LeaveCriticalSection(&writeLock);
+#endif
+}
+
+void asCThreadReadWriteLock::ReleaseExclusive()
+{
+#if defined AS_POSIX_THREADS
+	pthread_rwlock_unlock(&lock);
+#elif defined AS_WINDOWS_THREADS
+	// Release all readers at once
+	ReleaseSemaphore(readLocks, maxReaders, 0);
+#endif
+}
+
+void asCThreadReadWriteLock::AcquireShared()
+{
+#if defined AS_POSIX_THREADS
+	pthread_rwlock_rdlock(&lock);
+#elif defined AS_WINDOWS_THREADS
+	// Lock a reader slot
+	WaitForSingleObjectEx(readLocks, INFINITE, FALSE);
+#endif
+}
+
+void asCThreadReadWriteLock::ReleaseShared()
+{
+#if defined AS_POSIX_THREADS
+	pthread_rwlock_unlock(&lock);
+#elif defined AS_WINDOWS_THREADS
+	// Release the reader slot
+	ReleaseSemaphore(readLocks, 1, 0);
+#endif
+}
+
+#endif
+
+//========================================================================
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_thread.h b/Sources/AngelScript/source/as_thread.h
old mode 100755
new mode 100644
index 32da2a434..813d4c0f0
--- a/Sources/AngelScript/source/as_thread.h
+++ b/Sources/AngelScript/source/as_thread.h
@@ -1,108 +1,108 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2014 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-
-//
-// as_thread.h
-//
-// Classes for multi threading support
-//
-
-#ifndef AS_THREAD_H
-#define AS_THREAD_H
-
-#include "as_config.h"
-#include "as_string.h"
-#include "as_array.h"
-#include "as_map.h"
-#include "as_criticalsection.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCThreadLocalData;
-
-class asCThreadManager : public asIThreadManager
-{
-public:
-	static asCThreadLocalData *GetLocalData();
-	static int CleanupLocalData();
-
-	static int  Prepare(asIThreadManager *externalThreadMgr);
-	static void Unprepare();
-
-	// This read/write lock can be used by the application to provide simple synchronization
-	DECLAREREADWRITELOCK(appRWLock)
-
-protected:
-	asCThreadManager();
-	~asCThreadManager();
-
-	// No need to use the atomic int here, as it will only be
-	// updated within the thread manager's critical section
-	int refCount;
-
-#ifndef AS_NO_THREADS
-#if defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
-	// On Windows Store we must use MSVC specific thread variables for thread
-	// local storage, as the TLS API isn't available. On desktop we can't use
-	// this as it may cause problems if the library is used in a dll.
-	// ref: http://msdn.microsoft.com/en-us/library/2s9wt68x.aspx
-	// ref: http://msdn.microsoft.com/en-us/library/9w1sdazb.aspx
-	__declspec(thread) static asCThreadLocalData *tld;
-#else
-	asDWORD tlsKey;
-#endif
-	DECLARECRITICALSECTION(criticalSection);
-#else
-	asCThreadLocalData *tld;
-#endif
-};
-
-//======================================================================
-
-class asIScriptContext;
-
-class asCThreadLocalData
-{
-public:
-	asCArray<asIScriptContext *> activeContexts;
-	asCString string;
-
-protected:
-	friend class asCThreadManager;
-
-	asCThreadLocalData();
-	~asCThreadLocalData();
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2017 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+
+//
+// as_thread.h
+//
+// Classes for multi threading support
+//
+
+#ifndef AS_THREAD_H
+#define AS_THREAD_H
+
+#include "as_config.h"
+#include "as_string.h"
+#include "as_array.h"
+#include "as_map.h"
+#include "as_criticalsection.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCThreadLocalData;
+
+class asCThreadManager : public asIThreadManager
+{
+public:
+	static asCThreadLocalData *GetLocalData();
+	static int CleanupLocalData();
+
+	static int  Prepare(asIThreadManager *externalThreadMgr);
+	static void Unprepare();
+
+	// This read/write lock can be used by the application to provide simple synchronization
+	DECLAREREADWRITELOCK(appRWLock)
+
+protected:
+	asCThreadManager();
+	~asCThreadManager();
+
+	// No need to use the atomic int here, as it will only be
+	// updated within the thread manager's critical section
+	int refCount;
+
+#ifndef AS_NO_THREADS
+#if defined(_MSC_VER) && defined(AS_WINDOWS_THREADS) && (WINAPI_FAMILY & WINAPI_FAMILY_PHONE_APP)
+	// On Windows Store we must use MSVC specific thread variables for thread
+	// local storage, as the TLS API isn't available. On desktop we can't use
+	// this as it may cause problems if the library is used in a dll.
+	// ref: http://msdn.microsoft.com/en-us/library/2s9wt68x.aspx
+	// ref: http://msdn.microsoft.com/en-us/library/9w1sdazb.aspx
+	__declspec(thread) static asCThreadLocalData *tld;
+#else
+	asDWORD tlsKey;
+#endif
+	DECLARECRITICALSECTION(criticalSection)
+#else
+	asCThreadLocalData *tld;
+#endif
+};
+
+//======================================================================
+
+class asIScriptContext;
+
+class asCThreadLocalData
+{
+public:
+	asCArray<asIScriptContext *> activeContexts;
+	asCString string;
+
+protected:
+	friend class asCThreadManager;
+
+	asCThreadLocalData();
+	~asCThreadLocalData();
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_tokendef.h b/Sources/AngelScript/source/as_tokendef.h
old mode 100755
new mode 100644
index dbcca65ad..ec59627f5
--- a/Sources/AngelScript/source/as_tokendef.h
+++ b/Sources/AngelScript/source/as_tokendef.h
@@ -1,318 +1,326 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_tokendef.h
-//
-// Definitions for tokens identifiable by the tokenizer
-//
-
-
-#ifndef AS_TOKENDEF_H
-#define AS_TOKENDEF_H
-
-#include "as_config.h"
-
-BEGIN_AS_NAMESPACE
-
-enum eTokenType
-{
-	ttUnrecognizedToken,
-
-	ttEnd,                 // End of file
-
-	// White space and comments
-	ttWhiteSpace,          // ' ', '\t', '\r', '\n', UTF8 byte-order-mark
-	ttOnelineComment,      // // \n
-	ttMultilineComment,    // /* */
-
-	// Atoms
-	ttIdentifier,                  // abc123
-	ttIntConstant,                 // 1234
-	ttFloatConstant,               // 12.34e56f
-	ttDoubleConstant,              // 12.34e56
-	ttStringConstant,              // "123"
-	ttMultilineStringConstant,     //
-	ttHeredocStringConstant,       // """text"""
-	ttNonTerminatedStringConstant, // "123
-	ttBitsConstant,                // 0xFFFF
-
-	// Math operators
-	ttPlus,                // +
-	ttMinus,               // -
-	ttStar,                // *
-	ttSlash,               // /
-	ttPercent,             // %
-	ttStarStar,            // **
-
-	ttHandle,              // @
-
-	ttAddAssign,           // +=
-	ttSubAssign,           // -=
-	ttMulAssign,           // *=
-	ttDivAssign,           // /=
-	ttModAssign,           // %=
-	ttPowAssign,           // **=
-
-	ttOrAssign,            // |=
-	ttAndAssign,           // &=
-	ttXorAssign,           // ^=
-	ttShiftLeftAssign,     // <<=
-	ttShiftRightLAssign,   // >>=
-	ttShiftRightAAssign,   // >>>=
-
-	ttInc,                 // ++
-	ttDec,                 // --
-
-	ttDot,                 // .
-	ttScope,               // ::
-
-	// Statement tokens
-	ttAssignment,          // =
-	ttEndStatement,        // ;
-	ttListSeparator,       // ,
-	ttStartStatementBlock, // {
-	ttEndStatementBlock,   // }
-	ttOpenParanthesis,     // (
-	ttCloseParanthesis,    // )
-	ttOpenBracket,         // [
-	ttCloseBracket,        // ]
-	ttAmp,                 // &
-
-	// Bitwise operators
-	ttBitOr,               // |
-	ttBitNot,              // ~
-	ttBitXor,              // ^
-	ttBitShiftLeft,        // <<
-	ttBitShiftRight,       // >>     // TODO: In Java this is the arithmetical shift
-	ttBitShiftRightArith,  // >>>    // TODO: In Java this is the logical shift
-
-	// Compare operators
-	ttEqual,               // ==
-	ttNotEqual,            // !=
-	ttLessThan,            // <
-	ttGreaterThan,         // >
-	ttLessThanOrEqual,     // <=
-	ttGreaterThanOrEqual,  // >=
-
-	ttQuestion,            // ?
-	ttColon,               // :
-
-	// Reserved keywords
-	ttIf,                  // if
-	ttElse,                // else
-	ttFor,                 // for
-	ttWhile,               // while
-	ttBool,                // bool
-	ttFuncDef,             // funcdef
-	ttImport,              // import
-	ttInt,                 // int
-	ttInt8,                // int8
-	ttInt16,               // int16
-	ttInt64,               // int64
-	ttInterface,           // interface
-	ttIs,                  // is
-	ttNotIs,               // !is
-	ttUInt,                // uint
-	ttUInt8,               // uint8
-	ttUInt16,              // uint16
-	ttUInt64,              // uint64
-	ttFloat,               // float
-	ttVoid,                // void
-	ttTrue,                // true
-	ttFalse,               // false
-	ttReturn,              // return
-	ttNot,                 // not
-	ttAnd,                 // and, &&
-	ttOr,                  // or, ||
-	ttXor,                 // xor, ^^
-	ttBreak,               // break
-	ttContinue,            // continue
-	ttConst,               // const
-	ttDo,                  // do
-	ttDouble,              // double
-	ttSwitch,              // switch
-	ttCase,                // case
-	ttDefault,             // default
-	ttIn,                  // in
-	ttOut,                 // out
-	ttInOut,               // inout
-	ttNull,                // null
-	ttClass,               // class
-	ttTypedef,             // typedef
-	ttEnum,                // enum
-	ttCast,                // cast
-	ttPrivate,             // private
-	ttProtected,           // protected
-	ttNamespace,           // namespace
-	ttMixin,               // mixin
-	ttAuto                 // auto
-};
-
-struct sTokenWord
-{
-	const char *word;
-	size_t      wordLength;
-	eTokenType  tokenType;
-};
-
-#define asTokenDef(str, tok) {str, sizeof(str)-1, tok}
-
-sTokenWord const tokenWords[] =
-{
-	asTokenDef("+"         , ttPlus),
-	asTokenDef("+="        , ttAddAssign),
-	asTokenDef("++"        , ttInc),
-	asTokenDef("-"         , ttMinus),
-	asTokenDef("-="        , ttSubAssign),
-	asTokenDef("--"        , ttDec),
-	asTokenDef("*"         , ttStar),
-	asTokenDef("*="        , ttMulAssign),
-	asTokenDef("/"         , ttSlash),
-	asTokenDef("/="        , ttDivAssign),
-	asTokenDef("%"         , ttPercent),
-	asTokenDef("%="        , ttModAssign),
-	asTokenDef("**"        , ttStarStar),
-	asTokenDef("**="       , ttPowAssign),
-	asTokenDef("="         , ttAssignment),
-	asTokenDef("=="        , ttEqual),
-	asTokenDef("."         , ttDot),
-	asTokenDef("|"         , ttBitOr),
-	asTokenDef("|="        , ttOrAssign),
-	asTokenDef("||"        , ttOr),
-	asTokenDef("&"         , ttAmp),
-	asTokenDef("&="        , ttAndAssign),
-	asTokenDef("&&"        , ttAnd),
-	asTokenDef("^"         , ttBitXor),
-	asTokenDef("^="        , ttXorAssign),
-	asTokenDef("^^"        , ttXor),
-	asTokenDef("<"         , ttLessThan),
-	asTokenDef("<="        , ttLessThanOrEqual),
-	asTokenDef("<<"        , ttBitShiftLeft),
-	asTokenDef("<<="       , ttShiftLeftAssign),
-	asTokenDef(">"         , ttGreaterThan),
-	asTokenDef(">="        , ttGreaterThanOrEqual),
-	asTokenDef(">>"        , ttBitShiftRight),
-	asTokenDef(">>="       , ttShiftRightLAssign),
-	asTokenDef(">>>"       , ttBitShiftRightArith),
-	asTokenDef(">>>="      , ttShiftRightAAssign),
-	asTokenDef("~"         , ttBitNot),
-	asTokenDef(";"         , ttEndStatement),
-	asTokenDef(","         , ttListSeparator),
-	asTokenDef("{"         , ttStartStatementBlock),
-	asTokenDef("}"         , ttEndStatementBlock),
-	asTokenDef("("         , ttOpenParanthesis),
-	asTokenDef(")"         , ttCloseParanthesis),
-	asTokenDef("["         , ttOpenBracket),
-	asTokenDef("]"         , ttCloseBracket),
-	asTokenDef("?"         , ttQuestion),
-	asTokenDef(":"         , ttColon),
-	asTokenDef("::"        , ttScope),
-	asTokenDef("!"         , ttNot),
-	asTokenDef("!="        , ttNotEqual),
-	asTokenDef("!is"       , ttNotIs),
-	asTokenDef("@"         , ttHandle),
-	asTokenDef("and"       , ttAnd),
-	asTokenDef("auto"      , ttAuto),
-	asTokenDef("bool"      , ttBool),
-	asTokenDef("break"     , ttBreak),
-	asTokenDef("case"      , ttCase), 
-	asTokenDef("cast"      , ttCast),
-	asTokenDef("class"     , ttClass),
-	asTokenDef("const"     , ttConst),
-	asTokenDef("continue"  , ttContinue),
-	asTokenDef("default"   , ttDefault),
-	asTokenDef("do"        , ttDo),
-#ifdef  AS_USE_DOUBLE_AS_FLOAT
-	asTokenDef("double"    , ttFloat),
-#else
-	asTokenDef("double"    , ttDouble),
-#endif
-	asTokenDef("else"      , ttElse),
-	asTokenDef("enum"      , ttEnum),
-	asTokenDef("false"     , ttFalse),
-	asTokenDef("float"     , ttFloat),
-	asTokenDef("for"       , ttFor),
-	asTokenDef("funcdef"   , ttFuncDef),
-	asTokenDef("if"        , ttIf),
-	asTokenDef("import"    , ttImport),
-	asTokenDef("in"        , ttIn),
-	asTokenDef("inout"     , ttInOut),
-	asTokenDef("int"       , ttInt),
-	asTokenDef("int8"      , ttInt8),
-	asTokenDef("int16"     , ttInt16),
-	asTokenDef("int32"     , ttInt),  
-	asTokenDef("int64"     , ttInt64),
-	asTokenDef("interface" , ttInterface),
-	asTokenDef("is"        , ttIs),
-	asTokenDef("mixin"     , ttMixin),
-	asTokenDef("namespace" , ttNamespace),
-	asTokenDef("not"       , ttNot),
-	asTokenDef("null"      , ttNull),
-	asTokenDef("or"        , ttOr),
-	asTokenDef("out"       , ttOut),
-	asTokenDef("private"   , ttPrivate),
-	asTokenDef("protected" , ttProtected),
-	asTokenDef("return"    , ttReturn),
-	asTokenDef("switch"    , ttSwitch),
-	asTokenDef("true"      , ttTrue),
-	asTokenDef("typedef"   , ttTypedef),
-	asTokenDef("uint"      , ttUInt),
-	asTokenDef("uint8"     , ttUInt8),
-	asTokenDef("uint16"    , ttUInt16),
-	asTokenDef("uint32"    , ttUInt),
-	asTokenDef("uint64"    , ttUInt64),
-	asTokenDef("void"      , ttVoid),
-	asTokenDef("while"     , ttWhile),
-	asTokenDef("xor"       , ttXor),
-};
-
-const unsigned int numTokenWords = sizeof(tokenWords)/sizeof(sTokenWord);
-
-const char * const whiteSpace = " \t\r\n";
-
-// Some keywords that are not considered tokens by the parser
-// These only have meaning in specific situations. Outside these
-// situations they are treated as normal identifiers.
-const char * const THIS_TOKEN     = "this";
-const char * const FROM_TOKEN     = "from";
-const char * const SUPER_TOKEN    = "super";
-const char * const SHARED_TOKEN   = "shared";
-const char * const FINAL_TOKEN    = "final";
-const char * const OVERRIDE_TOKEN = "override";
-const char * const GET_TOKEN      = "get";
-const char * const SET_TOKEN      = "set";
-const char * const ABSTRACT_TOKEN = "abstract";
-const char * const FUNCTION_TOKEN = "function";
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2021 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_tokendef.h
+//
+// Definitions for tokens identifiable by the tokenizer
+//
+
+
+#ifndef AS_TOKENDEF_H
+#define AS_TOKENDEF_H
+
+#include "as_config.h"
+
+BEGIN_AS_NAMESPACE
+
+enum eTokenType
+{
+	ttUnrecognizedToken,
+
+	ttEnd,                 // End of file
+
+	// White space and comments
+	ttWhiteSpace,          // ' ', '\t', '\r', '\n', UTF8 byte-order-mark
+	ttOnelineComment,      // // \n
+	ttMultilineComment,    // /* */
+
+	// Atoms
+	ttIdentifier,                  // abc123
+	ttIntConstant,                 // 1234
+	ttFloatConstant,               // 12.34e56f
+	ttDoubleConstant,              // 12.34e56
+	ttStringConstant,              // "123"
+	ttMultilineStringConstant,     //
+	ttHeredocStringConstant,       // """text"""
+	ttNonTerminatedStringConstant, // "123
+	ttBitsConstant,                // 0xFFFF
+
+	// Math operators
+	ttPlus,                // +
+	ttMinus,               // -
+	ttStar,                // *
+	ttSlash,               // /
+	ttPercent,             // %
+	ttStarStar,            // **
+
+	ttHandle,              // @
+
+	ttAddAssign,           // +=
+	ttSubAssign,           // -=
+	ttMulAssign,           // *=
+	ttDivAssign,           // /=
+	ttModAssign,           // %=
+	ttPowAssign,           // **=
+
+	ttOrAssign,            // |=
+	ttAndAssign,           // &=
+	ttXorAssign,           // ^=
+	ttShiftLeftAssign,     // <<=
+	ttShiftRightLAssign,   // >>=
+	ttShiftRightAAssign,   // >>>=
+
+	ttInc,                 // ++
+	ttDec,                 // --
+
+	ttDot,                 // .
+	ttScope,               // ::
+
+	// Statement tokens
+	ttAssignment,          // =
+	ttEndStatement,        // ;
+	ttListSeparator,       // ,
+	ttStartStatementBlock, // {
+	ttEndStatementBlock,   // }
+	ttOpenParenthesis,     // (
+	ttCloseParenthesis,    // )
+	ttOpenBracket,         // [
+	ttCloseBracket,        // ]
+	ttAmp,                 // &
+
+	// Bitwise operators
+	ttBitOr,               // |
+	ttBitNot,              // ~
+	ttBitXor,              // ^
+	ttBitShiftLeft,        // <<
+	ttBitShiftRight,       // >>     // TODO: In Java this is the arithmetical shift
+	ttBitShiftRightArith,  // >>>    // TODO: In Java this is the logical shift
+
+	// Compare operators
+	ttEqual,               // ==
+	ttNotEqual,            // !=
+	ttLessThan,            // <
+	ttGreaterThan,         // >
+	ttLessThanOrEqual,     // <=
+	ttGreaterThanOrEqual,  // >=
+
+	ttQuestion,            // ?
+	ttColon,               // :
+
+	// Reserved keywords
+	ttIf,                  // if
+	ttElse,                // else
+	ttFor,                 // for
+	ttWhile,               // while
+	ttBool,                // bool
+	ttFuncDef,             // funcdef
+	ttImport,              // import
+	ttInt,                 // int
+	ttInt8,                // int8
+	ttInt16,               // int16
+	ttInt64,               // int64
+	ttInterface,           // interface
+	ttIs,                  // is
+	ttNotIs,               // !is
+	ttUInt,                // uint
+	ttUInt8,               // uint8
+	ttUInt16,              // uint16
+	ttUInt64,              // uint64
+	ttFloat,               // float
+	ttVoid,                // void
+	ttTrue,                // true
+	ttFalse,               // false
+	ttReturn,              // return
+	ttNot,                 // not
+	ttAnd,                 // and, &&
+	ttOr,                  // or, ||
+	ttXor,                 // xor, ^^
+	ttBreak,               // break
+	ttContinue,            // continue
+	ttConst,               // const
+	ttDo,                  // do
+	ttDouble,              // double
+	ttSwitch,              // switch
+	ttCase,                // case
+	ttDefault,             // default
+	ttIn,                  // in
+	ttOut,                 // out
+	ttInOut,               // inout
+	ttNull,                // null
+	ttClass,               // class
+	ttTypedef,             // typedef
+	ttEnum,                // enum
+	ttCast,                // cast
+	ttPrivate,             // private
+	ttProtected,           // protected
+	ttNamespace,           // namespace
+	ttMixin,               // mixin
+	ttAuto,                // auto
+	ttTry,                 // try
+	ttCatch                // catch
+};
+
+struct sTokenWord
+{
+	const char *word;
+	size_t      wordLength;
+	eTokenType  tokenType;
+};
+
+#define asTokenDef(str, tok) {str, sizeof(str)-1, tok}
+
+sTokenWord const tokenWords[] =
+{
+	asTokenDef("+"         , ttPlus),
+	asTokenDef("+="        , ttAddAssign),
+	asTokenDef("++"        , ttInc),
+	asTokenDef("-"         , ttMinus),
+	asTokenDef("-="        , ttSubAssign),
+	asTokenDef("--"        , ttDec),
+	asTokenDef("*"         , ttStar),
+	asTokenDef("*="        , ttMulAssign),
+	asTokenDef("/"         , ttSlash),
+	asTokenDef("/="        , ttDivAssign),
+	asTokenDef("%"         , ttPercent),
+	asTokenDef("%="        , ttModAssign),
+	asTokenDef("**"        , ttStarStar),
+	asTokenDef("**="       , ttPowAssign),
+	asTokenDef("="         , ttAssignment),
+	asTokenDef("=="        , ttEqual),
+	asTokenDef("."         , ttDot),
+	asTokenDef("|"         , ttBitOr),
+	asTokenDef("|="        , ttOrAssign),
+	asTokenDef("||"        , ttOr),
+	asTokenDef("&"         , ttAmp),
+	asTokenDef("&="        , ttAndAssign),
+	asTokenDef("&&"        , ttAnd),
+	asTokenDef("^"         , ttBitXor),
+	asTokenDef("^="        , ttXorAssign),
+	asTokenDef("^^"        , ttXor),
+	asTokenDef("<"         , ttLessThan),
+	asTokenDef("<="        , ttLessThanOrEqual),
+	asTokenDef("<<"        , ttBitShiftLeft),
+	asTokenDef("<<="       , ttShiftLeftAssign),
+	asTokenDef(">"         , ttGreaterThan),
+	asTokenDef(">="        , ttGreaterThanOrEqual),
+	asTokenDef(">>"        , ttBitShiftRight),
+	asTokenDef(">>="       , ttShiftRightLAssign),
+	asTokenDef(">>>"       , ttBitShiftRightArith),
+	asTokenDef(">>>="      , ttShiftRightAAssign),
+	asTokenDef("~"         , ttBitNot),
+	asTokenDef(";"         , ttEndStatement),
+	asTokenDef(","         , ttListSeparator),
+	asTokenDef("{"         , ttStartStatementBlock),
+	asTokenDef("}"         , ttEndStatementBlock),
+	asTokenDef("("         , ttOpenParenthesis),
+	asTokenDef(")"         , ttCloseParenthesis),
+	asTokenDef("["         , ttOpenBracket),
+	asTokenDef("]"         , ttCloseBracket),
+	asTokenDef("?"         , ttQuestion),
+	asTokenDef(":"         , ttColon),
+	asTokenDef("::"        , ttScope),
+	asTokenDef("!"         , ttNot),
+	asTokenDef("!="        , ttNotEqual),
+	asTokenDef("!is"       , ttNotIs),
+	asTokenDef("@"         , ttHandle),
+	asTokenDef("and"       , ttAnd),
+	asTokenDef("auto"      , ttAuto),
+	asTokenDef("bool"      , ttBool),
+	asTokenDef("break"     , ttBreak),
+	asTokenDef("case"      , ttCase),
+	asTokenDef("cast"      , ttCast),
+	asTokenDef("catch"     , ttCatch),
+	asTokenDef("class"     , ttClass),
+	asTokenDef("const"     , ttConst),
+	asTokenDef("continue"  , ttContinue),
+	asTokenDef("default"   , ttDefault),
+	asTokenDef("do"        , ttDo),
+#ifdef  AS_USE_DOUBLE_AS_FLOAT
+	asTokenDef("double"    , ttFloat),
+#else
+	asTokenDef("double"    , ttDouble),
+#endif
+	asTokenDef("else"      , ttElse),
+	asTokenDef("enum"      , ttEnum),
+	asTokenDef("false"     , ttFalse),
+	asTokenDef("float"     , ttFloat),
+	asTokenDef("for"       , ttFor),
+	asTokenDef("funcdef"   , ttFuncDef),
+	asTokenDef("if"        , ttIf),
+	asTokenDef("import"    , ttImport),
+	asTokenDef("in"        , ttIn),
+	asTokenDef("inout"     , ttInOut),
+	asTokenDef("int"       , ttInt),
+	asTokenDef("int8"      , ttInt8),
+	asTokenDef("int16"     , ttInt16),
+	asTokenDef("int32"     , ttInt),
+	asTokenDef("int64"     , ttInt64),
+	asTokenDef("interface" , ttInterface),
+	asTokenDef("is"        , ttIs),
+	asTokenDef("mixin"     , ttMixin),
+	asTokenDef("namespace" , ttNamespace),
+	asTokenDef("not"       , ttNot),
+	asTokenDef("null"      , ttNull),
+	asTokenDef("or"        , ttOr),
+	asTokenDef("out"       , ttOut),
+	asTokenDef("private"   , ttPrivate),
+	asTokenDef("protected" , ttProtected),
+	asTokenDef("return"    , ttReturn),
+	asTokenDef("switch"    , ttSwitch),
+	asTokenDef("true"      , ttTrue),
+	asTokenDef("try"       , ttTry),
+	asTokenDef("typedef"   , ttTypedef),
+	asTokenDef("uint"      , ttUInt),
+	asTokenDef("uint8"     , ttUInt8),
+	asTokenDef("uint16"    , ttUInt16),
+	asTokenDef("uint32"    , ttUInt),
+	asTokenDef("uint64"    , ttUInt64),
+	asTokenDef("void"      , ttVoid),
+	asTokenDef("while"     , ttWhile),
+	asTokenDef("xor"       , ttXor),
+};
+
+const unsigned int numTokenWords = sizeof(tokenWords)/sizeof(sTokenWord);
+
+const char * const whiteSpace = " \t\r\n";
+
+// Some keywords that are not considered tokens by the parser
+// These only have meaning in specific situations. Outside these
+// situations they are treated as normal identifiers.
+const char * const THIS_TOKEN      = "this";
+const char * const FROM_TOKEN      = "from";
+const char * const SUPER_TOKEN     = "super";
+const char * const SHARED_TOKEN    = "shared";
+const char * const FINAL_TOKEN     = "final";
+const char * const OVERRIDE_TOKEN  = "override";
+const char * const GET_TOKEN       = "get";
+const char * const SET_TOKEN       = "set";
+const char * const ABSTRACT_TOKEN  = "abstract";
+const char * const FUNCTION_TOKEN  = "function";
+const char * const IF_HANDLE_TOKEN = "if_handle_then_const";
+const char * const EXTERNAL_TOKEN  = "external";
+const char * const EXPLICIT_TOKEN  = "explicit";
+const char * const PROPERTY_TOKEN  = "property";
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_tokenizer.cpp b/Sources/AngelScript/source/as_tokenizer.cpp
old mode 100755
new mode 100644
index 63d59e558..2017a12ec
--- a/Sources/AngelScript/source/as_tokenizer.cpp
+++ b/Sources/AngelScript/source/as_tokenizer.cpp
@@ -1,475 +1,475 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2015 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_tokenizer.cpp
-//
-// This class identifies tokens from the script code
-//
-
-#include "as_config.h"
-#include "as_scriptengine.h"
-#include "as_tokenizer.h"
-#include "as_tokendef.h"
-
-#if !defined(AS_NO_MEMORY_H)
-#include <memory.h>
-#endif
-#include <string.h> // strcmp()
-
-BEGIN_AS_NAMESPACE
-
-asCTokenizer::asCTokenizer()
-{
-	engine = 0;
-	memset(keywordTable, 0, sizeof(keywordTable));
-
-	// Initialize the jump table
-	for( asUINT n = 0; n < numTokenWords; n++ )
-	{
-		const sTokenWord& current = tokenWords[n];
-		unsigned char start = current.word[0];
-
-		// Create new jump table entry if none exists
-		if( !keywordTable[start] )
-		{
-			// Surely there won't ever be more than 32 keywords starting with
-			// the same character. Right?
-			keywordTable[start] = asNEWARRAY(const sTokenWord*, 32);
-			memset(keywordTable[start], 0, sizeof(sTokenWord*)*32);
-		}
-
-		// Add the token sorted from longest to shortest so
-		// we check keywords greedily.
-		const sTokenWord** tok = keywordTable[start];
-		unsigned insert = 0, index = 0;
-		while( tok[index] )
-		{
-			if(tok[index]->wordLength >= current.wordLength)
-				++insert;
-			++index;
-		}
-
-		while( index > insert )
-		{
-			tok[index] = tok[index - 1];
-			--index;
-		}
-
-		tok[insert] = &current;
-	}
-}
-
-asCTokenizer::~asCTokenizer()
-{
-	// Deallocate the jump table
-	for( asUINT n = 0; n < 256; n++ )
-	{
-		if( keywordTable[n] )
-			asDELETEARRAY(keywordTable[n]);
-	}
-}
-
-// static
-const char *asCTokenizer::GetDefinition(int tokenType)
-{
-	if( tokenType == ttUnrecognizedToken			) return "<unrecognized token>";
-	if( tokenType == ttEnd							) return "<end of file>";
-	if( tokenType == ttWhiteSpace					) return "<white space>";
-	if( tokenType == ttOnelineComment				) return "<one line comment>";
-	if( tokenType == ttMultilineComment				) return "<multiple lines comment>";
-	if( tokenType == ttIdentifier					) return "<identifier>";
-	if( tokenType == ttIntConstant					) return "<integer constant>";
-	if( tokenType == ttFloatConstant				) return "<float constant>";
-	if( tokenType == ttDoubleConstant				) return "<double constant>";
-	if( tokenType == ttStringConstant				) return "<string constant>";
-	if( tokenType == ttMultilineStringConstant      ) return "<multiline string constant>";
-	if( tokenType == ttNonTerminatedStringConstant	) return "<nonterminated string constant>";
-	if( tokenType == ttBitsConstant					) return "<bits constant>";
-	if( tokenType == ttHeredocStringConstant		) return "<heredoc string constant>";
-
-	for( asUINT n = 0; n < numTokenWords; n++ )
-		if( tokenWords[n].tokenType == tokenType )
-			return tokenWords[n].word;
-
-	return 0;
-}
-
-bool asCTokenizer::IsDigitInRadix(char ch, int radix) const
-{
-	if( ch >= '0' && ch <= '9' ) return (ch -= '0') < radix;
-	if( ch >= 'A' && ch <= 'Z' ) return (ch -= 'A'-10) < radix;
-	if( ch >= 'a' && ch <= 'z' ) return (ch -= 'a'-10) < radix;
-	return false;
-}
-
-eTokenType asCTokenizer::GetToken(const char *source, size_t sourceLength, size_t *tokenLength, asETokenClass *tc) const
-{
-	asASSERT(source != 0);
-	asASSERT(tokenLength != 0);
-
-	eTokenType tokenType;
-	size_t     tlen;
-	asETokenClass t = ParseToken(source, sourceLength, tlen, tokenType);
-	if( tc          ) *tc          = t;
-	if( tokenLength ) *tokenLength = tlen;
-
-	return tokenType;
-}
-
-asETokenClass asCTokenizer::ParseToken(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
-{
-	if( IsWhiteSpace(source, sourceLength, tokenLength, tokenType) ) return asTC_WHITESPACE;
-	if( IsComment(source, sourceLength, tokenLength, tokenType)    ) return asTC_COMMENT;
-	if( IsConstant(source, sourceLength, tokenLength, tokenType)   ) return asTC_VALUE;
-	if( IsIdentifier(source, sourceLength, tokenLength, tokenType) ) return asTC_IDENTIFIER;
-	if( IsKeyWord(source, sourceLength, tokenLength, tokenType)    ) return asTC_KEYWORD;
-
-	// If none of the above this is an unrecognized token
-	// We can find the length of the token by advancing
-	// one step and trying to identify a token there
-	tokenType   = ttUnrecognizedToken;
-	tokenLength = 1;
-
-	return asTC_UNKNOWN;
-}
-
-bool asCTokenizer::IsWhiteSpace(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
-{
-	// Treat UTF8 byte-order-mark (EF BB BF) as whitespace
-	if( sourceLength >= 3 && 
-		asBYTE(source[0]) == 0xEFu &&
-		asBYTE(source[1]) == 0xBBu &&
-		asBYTE(source[2]) == 0xBFu )
-	{
-		tokenType   = ttWhiteSpace;
-		tokenLength = 3;
-		return true;
-	}
-
-	// Group all other white space characters into one
-	size_t n;
-	int numWsChars = (int)strlen(whiteSpace);
-	for( n = 0; n < sourceLength; n++ )
-	{
-		bool isWhiteSpace = false;
-		for( int w = 0; w < numWsChars; w++ )
-		{
-			if( source[n] == whiteSpace[w] )
-			{
-				isWhiteSpace = true;
-				break;
-			}
-		}
-		if( !isWhiteSpace )	break;
-	}
-
-	if( n > 0 )
-	{
-		tokenType   = ttWhiteSpace;
-		tokenLength = n;
-		return true;
-	}
-
-	return false;
-}
-
-bool asCTokenizer::IsComment(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
-{
-	if( sourceLength < 2 )
-		return false;
-
-	if( source[0] != '/' )
-		return false;
-
-	if( source[1] == '/' )
-	{
-		// One-line comment
-
-		// Find the length
-		size_t n;
-		for( n = 2; n < sourceLength; n++ )
-		{
-			if( source[n] == '\n' )
-				break;
-		}
-
-		tokenType   = ttOnelineComment;
-		tokenLength = n < sourceLength ? n+1 : n;
-
-		return true;
-	}
-
-	if( source[1] == '*' )
-	{
-		// Multi-line comment
-
-		// Find the length
-		size_t n;
-		for( n = 2; n < sourceLength-1; )
-		{
-			if( source[n++] == '*' && source[n] == '/' )
-				break;
-		}
-
-		tokenType   = ttMultilineComment;
-		tokenLength = n+1;
-
-		return true;
-	}
-
-	return false;
-}
-
-bool asCTokenizer::IsConstant(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
-{
-	// Starting with number
-	if( (source[0] >= '0' && source[0] <= '9') || (source[0] == '.' && sourceLength > 1 && source[1] >= '0' && source[1] <= '9') )
-	{
-		// Is it a based number?
-		if( source[0] == '0' && sourceLength > 1 )
-		{
-			// Determine the radix for the constant
-			int radix = 0;
-			switch( source[1] )
- 			{
-			case 'b': case 'B': radix =  2; break;
-			case 'o': case 'O': radix =  8; break;
-			case 'd': case 'D': radix = 10; break;
-			case 'x': case 'X': radix = 16; break;
- 			}
-
-			if( radix )
-			{
-				size_t n;
-				for( n = 2; n < sourceLength; n++ )
-					if( !IsDigitInRadix(source[n], radix) )
-						break;
-
-				tokenType   = ttBitsConstant;
-				tokenLength = n;
-				return true;
-			}
-		}
-
-		size_t n;
-		for( n = 0; n < sourceLength; n++ )
-		{
-			if( source[n] < '0' || source[n] > '9' )
-				break;
-		}
-
-		if( n < sourceLength && (source[n] == '.' || source[n] == 'e' || source[n] == 'E') )
-		{
-			if( source[n] == '.' )
-			{
-				n++;
-				for( ; n < sourceLength; n++ )
-				{
-					if( source[n] < '0' || source[n] > '9' )
-						break;
-				}
-			}
-
-			if( n < sourceLength && (source[n] == 'e' || source[n] == 'E') )
-			{
-				n++;
-				if( n < sourceLength && (source[n] == '-' || source[n] == '+') )
-					n++;
-
-				for( ; n < sourceLength; n++ )
-				{
-					if( source[n] < '0' || source[n] > '9' )
-						break;
-				}
-			}
-
-			if( n < sourceLength && (source[n] == 'f' || source[n] == 'F') )
-			{
-				tokenType   = ttFloatConstant;
-				tokenLength = n + 1;
-			}
-			else
-			{
-#ifdef AS_USE_DOUBLE_AS_FLOAT
-				tokenType   = ttFloatConstant;
-#else
-				tokenType   = ttDoubleConstant;
-#endif
-				tokenLength = n;
-			}
-			return true;
-		}
-
-		tokenType   = ttIntConstant;
-		tokenLength = n;
-		return true;
-	}
-
-	// String constant between double or single quotes
-	if( source[0] == '"' || source[0] == '\'' )
-	{
-		// Is it a normal string constant or a heredoc string constant?
-		if( sourceLength >= 6 && source[0] == '"' && source[1] == '"' && source[2] == '"' )
-		{
-			// Heredoc string constant (spans multiple lines, no escape sequences)
-
-			// Find the length
-			size_t n;
-			for( n = 3; n < sourceLength-2; n++ )
-			{
-				if( source[n] == '"' && source[n+1] == '"' && source[n+2] == '"' )
-					break;
-			}
-
-			tokenType   = ttHeredocStringConstant;
-			tokenLength = n+3;
-		}
-		else
-		{
-			// Normal string constant
-			tokenType = ttStringConstant;
-			char quote = source[0];
-			bool evenSlashes = true;
-			size_t n;
-			for( n = 1; n < sourceLength; n++ )
-			{
-#ifdef AS_DOUBLEBYTE_CHARSET
-				// Double-byte characters are only allowed for ASCII
-				if( (source[n] & 0x80) && engine->ep.scanner == 0 )
-				{
-					// This is a leading character in a double byte character, 
-					// include both in the string and continue processing.
-					n++;
-					continue;
-				}
-#endif
-
-				if( source[n] == '\n' ) 
-					tokenType = ttMultilineStringConstant;
-				if( source[n] == quote && evenSlashes )
-				{
-					tokenLength = n+1;
-					return true;
-				}
-				if( source[n] == '\\' ) evenSlashes = !evenSlashes; else evenSlashes = true;
-			}
-
-			tokenType   = ttNonTerminatedStringConstant;
-			tokenLength = n;
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
-bool asCTokenizer::IsIdentifier(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
-{
-	// char is unsigned by default on some architectures, e.g. ppc and arm
-	// Make sure the value is always treated as signed in the below comparisons
-	signed char c = source[0];
-
-	// Starting with letter or underscore
-	if( (c >= 'a' && c <= 'z') ||
-		(c >= 'A' && c <= 'Z') ||
-		c == '_' ||
-		(c < 0 && engine->ep.allowUnicodeIdentifiers) )
-	{
-		tokenType   = ttIdentifier;
-		tokenLength = 1;
-
-		for( size_t n = 1; n < sourceLength; n++ )
-		{
-			c = source[n];
-			if( (c >= 'a' && c <= 'z') ||
-				(c >= 'A' && c <= 'Z') ||
-				(c >= '0' && c <= '9') ||
-				c == '_' ||
-				(c < 0 && engine->ep.allowUnicodeIdentifiers) )
-				tokenLength++;
-			else
-				break;
-		}
-
-		// Make sure the identifier isn't a reserved keyword
-		if( IsKeyWord(source, tokenLength, tokenLength, tokenType) )
-			return false;
-
-		return true;
-	}
-
-	return false;
-}
-
-bool asCTokenizer::IsKeyWord(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
-{
-	unsigned char start = source[0];
-	const sTokenWord **ptr = keywordTable[start];
-
-	if( !ptr )
-		return false;
-
-	for( ; *ptr; ++ptr )
-	{
-		size_t wlen = (*ptr)->wordLength;
-		if( sourceLength >= wlen && strncmp(source, (*ptr)->word, wlen) == 0 )
-		{
-			// Tokens that end with a character that can be part of an 
-			// identifier require an extra verification to guarantee that 
-			// we don't split an identifier token, e.g. the "!is" token 
-			// and the tokens "!" and "isTrue" in the "!isTrue" expression.
-			if( wlen < sourceLength &&
-				((source[wlen-1] >= 'a' && source[wlen-1] <= 'z') ||
-				 (source[wlen-1] >= 'A' && source[wlen-1] <= 'Z') ||
-				 (source[wlen-1] >= '0' && source[wlen-1] <= '9')) &&
-				((source[wlen] >= 'a' && source[wlen] <= 'z') ||
-				 (source[wlen] >= 'A' && source[wlen] <= 'Z') ||
-				 (source[wlen] >= '0' && source[wlen] <= '9') ||
-				 (source[wlen] == '_')) )
-			{
-				// The token doesn't really match, even though 
-				// the start of the source matches the token
-				continue;
-			}
-
-			tokenType = (*ptr)->tokenType;
-			tokenLength = wlen;
-			return true;
-		}
-	}
-
-	return false;
-}
-
-END_AS_NAMESPACE
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2015 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_tokenizer.cpp
+//
+// This class identifies tokens from the script code
+//
+
+#include "as_config.h"
+#include "as_scriptengine.h"
+#include "as_tokenizer.h"
+#include "as_tokendef.h"
+
+#if !defined(AS_NO_MEMORY_H)
+#include <memory.h>
+#endif
+#include <string.h> // strcmp()
+
+BEGIN_AS_NAMESPACE
+
+asCTokenizer::asCTokenizer()
+{
+	engine = 0;
+	memset(keywordTable, 0, sizeof(keywordTable));
+
+	// Initialize the jump table
+	for( asUINT n = 0; n < numTokenWords; n++ )
+	{
+		const sTokenWord& current = tokenWords[n];
+		unsigned char start = current.word[0];
+
+		// Create new jump table entry if none exists
+		if( !keywordTable[start] )
+		{
+			// Surely there won't ever be more than 32 keywords starting with
+			// the same character. Right?
+			keywordTable[start] = asNEWARRAY(const sTokenWord*, 32);
+			memset(keywordTable[start], 0, sizeof(sTokenWord*)*32);
+		}
+
+		// Add the token sorted from longest to shortest so
+		// we check keywords greedily.
+		const sTokenWord** tok = keywordTable[start];
+		unsigned insert = 0, index = 0;
+		while( tok[index] )
+		{
+			if(tok[index]->wordLength >= current.wordLength)
+				++insert;
+			++index;
+		}
+
+		while( index > insert )
+		{
+			tok[index] = tok[index - 1];
+			--index;
+		}
+
+		tok[insert] = &current;
+	}
+}
+
+asCTokenizer::~asCTokenizer()
+{
+	// Deallocate the jump table
+	for( asUINT n = 0; n < 256; n++ )
+	{
+		if( keywordTable[n] )
+			asDELETEARRAY(keywordTable[n]);
+	}
+}
+
+// static
+const char *asCTokenizer::GetDefinition(int tokenType)
+{
+	if( tokenType == ttUnrecognizedToken			) return "<unrecognized token>";
+	if( tokenType == ttEnd							) return "<end of file>";
+	if( tokenType == ttWhiteSpace					) return "<white space>";
+	if( tokenType == ttOnelineComment				) return "<one line comment>";
+	if( tokenType == ttMultilineComment				) return "<multiple lines comment>";
+	if( tokenType == ttIdentifier					) return "<identifier>";
+	if( tokenType == ttIntConstant					) return "<integer constant>";
+	if( tokenType == ttFloatConstant				) return "<float constant>";
+	if( tokenType == ttDoubleConstant				) return "<double constant>";
+	if( tokenType == ttStringConstant				) return "<string constant>";
+	if( tokenType == ttMultilineStringConstant      ) return "<multiline string constant>";
+	if( tokenType == ttNonTerminatedStringConstant	) return "<nonterminated string constant>";
+	if( tokenType == ttBitsConstant					) return "<bits constant>";
+	if( tokenType == ttHeredocStringConstant		) return "<heredoc string constant>";
+
+	for( asUINT n = 0; n < numTokenWords; n++ )
+		if( tokenWords[n].tokenType == tokenType )
+			return tokenWords[n].word;
+
+	return 0;
+}
+
+bool asCTokenizer::IsDigitInRadix(char ch, int radix) const
+{
+	if( ch >= '0' && ch <= '9' ) return (ch -= '0') < radix;
+	if( ch >= 'A' && ch <= 'Z' ) return (ch -= 'A'-10) < radix;
+	if( ch >= 'a' && ch <= 'z' ) return (ch -= 'a'-10) < radix;
+	return false;
+}
+
+eTokenType asCTokenizer::GetToken(const char *source, size_t sourceLength, size_t *tokenLength, asETokenClass *tc) const
+{
+	asASSERT(source != 0);
+	asASSERT(tokenLength != 0);
+
+	eTokenType tokenType;
+	size_t     tlen;
+	asETokenClass t = ParseToken(source, sourceLength, tlen, tokenType);
+	if( tc          ) *tc          = t;
+	if( tokenLength ) *tokenLength = tlen;
+
+	return tokenType;
+}
+
+asETokenClass asCTokenizer::ParseToken(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
+{
+	if( IsWhiteSpace(source, sourceLength, tokenLength, tokenType) ) return asTC_WHITESPACE;
+	if( IsComment(source, sourceLength, tokenLength, tokenType)    ) return asTC_COMMENT;
+	if( IsConstant(source, sourceLength, tokenLength, tokenType)   ) return asTC_VALUE;
+	if( IsIdentifier(source, sourceLength, tokenLength, tokenType) ) return asTC_IDENTIFIER;
+	if( IsKeyWord(source, sourceLength, tokenLength, tokenType)    ) return asTC_KEYWORD;
+
+	// If none of the above this is an unrecognized token
+	// We can find the length of the token by advancing
+	// one step and trying to identify a token there
+	tokenType   = ttUnrecognizedToken;
+	tokenLength = 1;
+
+	return asTC_UNKNOWN;
+}
+
+bool asCTokenizer::IsWhiteSpace(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
+{
+	// Treat UTF8 byte-order-mark (EF BB BF) as whitespace
+	if( sourceLength >= 3 && 
+		asBYTE(source[0]) == 0xEFu &&
+		asBYTE(source[1]) == 0xBBu &&
+		asBYTE(source[2]) == 0xBFu )
+	{
+		tokenType   = ttWhiteSpace;
+		tokenLength = 3;
+		return true;
+	}
+
+	// Group all other white space characters into one
+	size_t n;
+	int numWsChars = (int)strlen(whiteSpace);
+	for( n = 0; n < sourceLength; n++ )
+	{
+		bool isWhiteSpace = false;
+		for( int w = 0; w < numWsChars; w++ )
+		{
+			if( source[n] == whiteSpace[w] )
+			{
+				isWhiteSpace = true;
+				break;
+			}
+		}
+		if( !isWhiteSpace )	break;
+	}
+
+	if( n > 0 )
+	{
+		tokenType   = ttWhiteSpace;
+		tokenLength = n;
+		return true;
+	}
+
+	return false;
+}
+
+bool asCTokenizer::IsComment(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
+{
+	if( sourceLength < 2 )
+		return false;
+
+	if( source[0] != '/' )
+		return false;
+
+	if( source[1] == '/' )
+	{
+		// One-line comment
+
+		// Find the length
+		size_t n;
+		for( n = 2; n < sourceLength; n++ )
+		{
+			if( source[n] == '\n' )
+				break;
+		}
+
+		tokenType   = ttOnelineComment;
+		tokenLength = n < sourceLength ? n+1 : n;
+
+		return true;
+	}
+
+	if( source[1] == '*' )
+	{
+		// Multi-line comment
+
+		// Find the length
+		size_t n;
+		for( n = 2; n < sourceLength-1; )
+		{
+			if( source[n++] == '*' && source[n] == '/' )
+				break;
+		}
+
+		tokenType   = ttMultilineComment;
+		tokenLength = n+1;
+
+		return true;
+	}
+
+	return false;
+}
+
+bool asCTokenizer::IsConstant(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
+{
+	// Starting with number
+	if( (source[0] >= '0' && source[0] <= '9') || (source[0] == '.' && sourceLength > 1 && source[1] >= '0' && source[1] <= '9') )
+	{
+		// Is it a based number?
+		if( source[0] == '0' && sourceLength > 1 )
+		{
+			// Determine the radix for the constant
+			int radix = 0;
+			switch( source[1] )
+ 			{
+			case 'b': case 'B': radix =  2; break;
+			case 'o': case 'O': radix =  8; break;
+			case 'd': case 'D': radix = 10; break;
+			case 'x': case 'X': radix = 16; break;
+ 			}
+
+			if( radix )
+			{
+				size_t n;
+				for( n = 2; n < sourceLength; n++ )
+					if( !IsDigitInRadix(source[n], radix) )
+						break;
+
+				tokenType   = ttBitsConstant;
+				tokenLength = n;
+				return true;
+			}
+		}
+
+		size_t n;
+		for( n = 0; n < sourceLength; n++ )
+		{
+			if( source[n] < '0' || source[n] > '9' )
+				break;
+		}
+
+		if( n < sourceLength && (source[n] == '.' || source[n] == 'e' || source[n] == 'E') )
+		{
+			if( source[n] == '.' )
+			{
+				n++;
+				for( ; n < sourceLength; n++ )
+				{
+					if( source[n] < '0' || source[n] > '9' )
+						break;
+				}
+			}
+
+			if( n < sourceLength && (source[n] == 'e' || source[n] == 'E') )
+			{
+				n++;
+				if( n < sourceLength && (source[n] == '-' || source[n] == '+') )
+					n++;
+
+				for( ; n < sourceLength; n++ )
+				{
+					if( source[n] < '0' || source[n] > '9' )
+						break;
+				}
+			}
+
+			if( n < sourceLength && (source[n] == 'f' || source[n] == 'F') )
+			{
+				tokenType   = ttFloatConstant;
+				tokenLength = n + 1;
+			}
+			else
+			{
+#ifdef AS_USE_DOUBLE_AS_FLOAT
+				tokenType   = ttFloatConstant;
+#else
+				tokenType   = ttDoubleConstant;
+#endif
+				tokenLength = n;
+			}
+			return true;
+		}
+
+		tokenType   = ttIntConstant;
+		tokenLength = n;
+		return true;
+	}
+
+	// String constant between double or single quotes
+	if( source[0] == '"' || source[0] == '\'' )
+	{
+		// Is it a normal string constant or a heredoc string constant?
+		if( sourceLength >= 6 && source[0] == '"' && source[1] == '"' && source[2] == '"' )
+		{
+			// Heredoc string constant (spans multiple lines, no escape sequences)
+
+			// Find the length
+			size_t n;
+			for( n = 3; n < sourceLength-2; n++ )
+			{
+				if( source[n] == '"' && source[n+1] == '"' && source[n+2] == '"' )
+					break;
+			}
+
+			tokenType   = ttHeredocStringConstant;
+			tokenLength = n+3;
+		}
+		else
+		{
+			// Normal string constant
+			tokenType = ttStringConstant;
+			char quote = source[0];
+			bool evenSlashes = true;
+			size_t n;
+			for( n = 1; n < sourceLength; n++ )
+			{
+#ifdef AS_DOUBLEBYTE_CHARSET
+				// Double-byte characters are only allowed for ASCII
+				if( (source[n] & 0x80) && engine->ep.scanner == 0 )
+				{
+					// This is a leading character in a double byte character, 
+					// include both in the string and continue processing.
+					n++;
+					continue;
+				}
+#endif
+
+				if( source[n] == '\n' ) 
+					tokenType = ttMultilineStringConstant;
+				if( source[n] == quote && evenSlashes )
+				{
+					tokenLength = n+1;
+					return true;
+				}
+				if( source[n] == '\\' ) evenSlashes = !evenSlashes; else evenSlashes = true;
+			}
+
+			tokenType   = ttNonTerminatedStringConstant;
+			tokenLength = n;
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+bool asCTokenizer::IsIdentifier(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
+{
+	// char is unsigned by default on some architectures, e.g. ppc and arm
+	// Make sure the value is always treated as signed in the below comparisons
+	signed char c = source[0];
+
+	// Starting with letter or underscore
+	if( (c >= 'a' && c <= 'z') ||
+		(c >= 'A' && c <= 'Z') ||
+		c == '_' ||
+		(c < 0 && engine->ep.allowUnicodeIdentifiers) )
+	{
+		tokenType   = ttIdentifier;
+		tokenLength = 1;
+
+		for( size_t n = 1; n < sourceLength; n++ )
+		{
+			c = source[n];
+			if( (c >= 'a' && c <= 'z') ||
+				(c >= 'A' && c <= 'Z') ||
+				(c >= '0' && c <= '9') ||
+				c == '_' ||
+				(c < 0 && engine->ep.allowUnicodeIdentifiers) )
+				tokenLength++;
+			else
+				break;
+		}
+
+		// Make sure the identifier isn't a reserved keyword
+		if( IsKeyWord(source, tokenLength, tokenLength, tokenType) )
+			return false;
+
+		return true;
+	}
+
+	return false;
+}
+
+bool asCTokenizer::IsKeyWord(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const
+{
+	unsigned char start = source[0];
+	const sTokenWord **ptr = keywordTable[start];
+
+	if( !ptr )
+		return false;
+
+	for( ; *ptr; ++ptr )
+	{
+		size_t wlen = (*ptr)->wordLength;
+		if( sourceLength >= wlen && strncmp(source, (*ptr)->word, wlen) == 0 )
+		{
+			// Tokens that end with a character that can be part of an 
+			// identifier require an extra verification to guarantee that 
+			// we don't split an identifier token, e.g. the "!is" token 
+			// and the tokens "!" and "isTrue" in the "!isTrue" expression.
+			if( wlen < sourceLength &&
+				((source[wlen-1] >= 'a' && source[wlen-1] <= 'z') ||
+				 (source[wlen-1] >= 'A' && source[wlen-1] <= 'Z') ||
+				 (source[wlen-1] >= '0' && source[wlen-1] <= '9')) &&
+				((source[wlen] >= 'a' && source[wlen] <= 'z') ||
+				 (source[wlen] >= 'A' && source[wlen] <= 'Z') ||
+				 (source[wlen] >= '0' && source[wlen] <= '9') ||
+				 (source[wlen] == '_')) )
+			{
+				// The token doesn't really match, even though 
+				// the start of the source matches the token
+				continue;
+			}
+
+			tokenType = (*ptr)->tokenType;
+			tokenLength = wlen;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+END_AS_NAMESPACE
+
diff --git a/Sources/AngelScript/source/as_tokenizer.h b/Sources/AngelScript/source/as_tokenizer.h
old mode 100755
new mode 100644
index 2968fece2..38a08c103
--- a/Sources/AngelScript/source/as_tokenizer.h
+++ b/Sources/AngelScript/source/as_tokenizer.h
@@ -1,79 +1,79 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2013 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_tokenizer.cpp
-//
-// This class identifies tokens from the script code
-//
-
-
-
-#ifndef AS_TOKENIZER_H
-#define AS_TOKENIZER_H
-
-#include "as_config.h"
-#include "as_tokendef.h"
-#include "as_map.h"
-#include "as_string.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCTokenizer
-{
-public:
-	eTokenType GetToken(const char *source, size_t sourceLength, size_t *tokenLength, asETokenClass *tc = 0) const;
-	
-	static const char *GetDefinition(int tokenType);
-
-protected:
-	friend class asCScriptEngine;
-
-	asCTokenizer();
-	~asCTokenizer();
-
-	asETokenClass ParseToken(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
-	bool IsWhiteSpace(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
-	bool IsComment(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
-	bool IsConstant(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
-	bool IsKeyWord(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
-	bool IsIdentifier(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
-	bool IsDigitInRadix(char ch, int radix) const;
-
-	const asCScriptEngine *engine;
-
-	const sTokenWord **keywordTable[256];
-};
-
-END_AS_NAMESPACE
-
-#endif
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2013 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_tokenizer.cpp
+//
+// This class identifies tokens from the script code
+//
+
+
+
+#ifndef AS_TOKENIZER_H
+#define AS_TOKENIZER_H
+
+#include "as_config.h"
+#include "as_tokendef.h"
+#include "as_map.h"
+#include "as_string.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCTokenizer
+{
+public:
+	eTokenType GetToken(const char *source, size_t sourceLength, size_t *tokenLength, asETokenClass *tc = 0) const;
+	
+	static const char *GetDefinition(int tokenType);
+
+protected:
+	friend class asCScriptEngine;
+
+	asCTokenizer();
+	~asCTokenizer();
+
+	asETokenClass ParseToken(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
+	bool IsWhiteSpace(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
+	bool IsComment(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
+	bool IsConstant(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
+	bool IsKeyWord(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
+	bool IsIdentifier(const char *source, size_t sourceLength, size_t &tokenLength, eTokenType &tokenType) const;
+	bool IsDigitInRadix(char ch, int radix) const;
+
+	const asCScriptEngine *engine;
+
+	const sTokenWord **keywordTable[256];
+};
+
+END_AS_NAMESPACE
+
+#endif
+
diff --git a/Sources/AngelScript/source/as_typeinfo.cpp b/Sources/AngelScript/source/as_typeinfo.cpp
old mode 100755
new mode 100644
index 2ddfa2334..04f240d9e
--- a/Sources/AngelScript/source/as_typeinfo.cpp
+++ b/Sources/AngelScript/source/as_typeinfo.cpp
@@ -1,483 +1,476 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_typeinfo.cpp
-//
-
-
-#include "as_config.h"
-#include "as_typeinfo.h"
-#include "as_scriptengine.h"
-
-BEGIN_AS_NAMESPACE
-
-asCTypeInfo::asCTypeInfo()
-{
-	externalRefCount.set(0);
-	internalRefCount.set(1); // start with one internal ref-count
-	engine = 0;
-	module = 0;
-	size = 0;
-	flags = 0;
-	typeId = -1; // start as -1 to signal that it hasn't been defined
-
-	scriptSectionIdx = -1;
-	declaredAt = 0;
-
-	accessMask = 0xFFFFFFFF;
-	nameSpace = 0;
-}
-
-asCTypeInfo::asCTypeInfo(asCScriptEngine *in_engine)
-{
-	externalRefCount.set(0);
-	internalRefCount.set(1); // start with one internal ref count
-	engine = in_engine;
-	module = 0;
-	size = 0;
-	flags = 0;
-	typeId = -1; // start as -1 to signal that it hasn't been defined
-
-	scriptSectionIdx = -1;
-	declaredAt = 0;
-
-	accessMask = 0xFFFFFFFF;
-	nameSpace = engine->nameSpaces[0];
-}
-
-asCTypeInfo::~asCTypeInfo()
-{
-}
-
-// interface
-int asCTypeInfo::AddRef() const
-{
-	return externalRefCount.atomicInc();
-}
-
-// interface
-int asCTypeInfo::Release() const
-{
-	int r = externalRefCount.atomicDec();
-
-	if (r == 0)
-	{
-		// There are no more external references, if there are also no
-		// internal references then it is time to delete the object type
-		if (internalRefCount.get() == 0)
-		{
-			// If the engine is no longer set, then it has already been 
-			// released and we must take care of the deletion ourselves
-			asDELETE(const_cast<asCTypeInfo*>(this), asCTypeInfo);
-		}
-	}
-
-	return r;
-}
-
-int asCTypeInfo::AddRefInternal()
-{
-	return internalRefCount.atomicInc();
-}
-
-int asCTypeInfo::ReleaseInternal()
-{
-	int r = internalRefCount.atomicDec();
-
-	if (r == 0)
-	{
-		// There are no more internal references, if there are also no
-		// external references then it is time to delete the object type
-		if (externalRefCount.get() == 0)
-		{
-			// If the engine is no longer set, then it has already been 
-			// released and we must take care of the deletion ourselves
-			asDELETE(const_cast<asCTypeInfo*>(this), asCTypeInfo);
-		}
-	}
-
-	return r;
-}
-
-// interface
-asIScriptModule *asCTypeInfo::GetModule() const
-{
-	return module;
-}
-
-void *asCTypeInfo::SetUserData(void *data, asPWORD type)
-{
-	// As a thread might add a new new user data at the same time as another
-	// it is necessary to protect both read and write access to the userData member
-	ACQUIREEXCLUSIVE(engine->engineRWLock);
-
-	// It is not intended to store a lot of different types of userdata,
-	// so a more complex structure like a associative map would just have
-	// more overhead than a simple array.
-	for (asUINT n = 0; n < userData.GetLength(); n += 2)
-	{
-		if (userData[n] == type)
-		{
-			void *oldData = reinterpret_cast<void*>(userData[n + 1]);
-			userData[n + 1] = reinterpret_cast<asPWORD>(data);
-
-			RELEASEEXCLUSIVE(engine->engineRWLock);
-
-			return oldData;
-		}
-	}
-
-	userData.PushLast(type);
-	userData.PushLast(reinterpret_cast<asPWORD>(data));
-
-	RELEASEEXCLUSIVE(engine->engineRWLock);
-
-	return 0;
-}
-
-void *asCTypeInfo::GetUserData(asPWORD type) const
-{
-	// There may be multiple threads reading, but when  
-	// setting the user data nobody must be reading.
-	ACQUIRESHARED(engine->engineRWLock);
-
-	for (asUINT n = 0; n < userData.GetLength(); n += 2)
-	{
-		if (userData[n] == type)
-		{
-			RELEASESHARED(engine->engineRWLock);
-			return reinterpret_cast<void*>(userData[n + 1]);
-		}
-	}
-
-	RELEASESHARED(engine->engineRWLock);
-
-	return 0;
-}
-
-// interface
-const char *asCTypeInfo::GetName() const
-{
-	return name.AddressOf();
-}
-
-// interface
-const char *asCTypeInfo::GetNamespace() const
-{
-	if( nameSpace )
-		return nameSpace->name.AddressOf();
-
-	return 0;
-}
-
-// interface
-asDWORD asCTypeInfo::GetFlags() const
-{
-	return flags;
-}
-
-// interface
-asUINT asCTypeInfo::GetSize() const
-{
-	return size;
-}
-
-// interface
-int asCTypeInfo::GetTypeId() const
-{
-	if (typeId == -1)
-	{
-		// We need a non const pointer to create the asCDataType object.
-		// We're not breaking anything here because this function is not
-		// modifying the object, so this const cast is safe.
-		asCTypeInfo *ot = const_cast<asCTypeInfo*>(this);
-
-		// The engine will define the typeId for this object type
-		engine->GetTypeIdFromDataType(asCDataType::CreateType(ot, false));
-	}
-
-	return typeId;
-}
-
-// interface
-asIScriptEngine *asCTypeInfo::GetEngine() const
-{
-	return engine;
-}
-
-// interface
-const char *asCTypeInfo::GetConfigGroup() const
-{
-	asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(this);
-	if (group == 0)
-		return 0;
-
-	return group->groupName.AddressOf();
-}
-
-// interface
-asDWORD asCTypeInfo::GetAccessMask() const
-{
-	return accessMask;
-}
-
-// interface
-int asCTypeInfo::GetProperty(asUINT index, const char **out_name, int *out_typeId, bool *out_isPrivate, bool *out_isProtected, int *out_offset, bool *out_isReference, asDWORD *out_accessMask) const
-{
-	UNUSED_VAR(index);
-	if (out_name) *out_name = 0;
-	if (out_typeId) *out_typeId = 0;
-	if (out_isPrivate) *out_isPrivate = false;
-	if (out_isProtected) *out_isProtected = false;
-	if (out_offset) *out_offset = 0;
-	if (out_isReference) *out_isReference = false;
-	if (out_accessMask) *out_accessMask = 0;
-	return -1;
-}
-
-// yvt: prevents "error: 'this' pointer cannot be null in well-defined C++ code" compiler
-// warning.
-// Compilers are still allowed to do optimization based on the assumption that 'this'
-// pointer cannot be null in well-defined C++ code. This function is defined like this
-// to prevent them from doing that. (What a ugly hack!)
-bool (*volatile isNullPointer)(asCTypeInfo *) = [] (asCTypeInfo *ti)
-{
-	return !ti;
-};
-
-// internal
-asCObjectType *asCTypeInfo::CastToObjectType()
-{
-	// Allow call on null pointer
-	if (isNullPointer(this)) return 0;
-
-	// TODO: type: Should List pattern have its own type class?
-	if ((flags & (asOBJ_VALUE | asOBJ_REF | asOBJ_LIST_PATTERN)) && !(flags & asOBJ_FUNCDEF))
-		return reinterpret_cast<asCObjectType*>(this);
-
-	return 0;
-}
-
-// internal
-asCEnumType *asCTypeInfo::CastToEnumType()
-{
-    // Allow call on null pointer
-    if (isNullPointer(this)) return 0;
-
-	if (flags & (asOBJ_ENUM))
-		return reinterpret_cast<asCEnumType*>(this);
-
-	return 0;
-}
-
-// internal
-asCTypedefType *asCTypeInfo::CastToTypedefType()
-{
-    // Allow call on null pointer
-    if (isNullPointer(this)) return 0;
-
-	if (flags & (asOBJ_TYPEDEF))
-		return reinterpret_cast<asCTypedefType*>(this);
-
-	return 0;
-}
-
-// internal
-asCFuncdefType *asCTypeInfo::CastToFuncdefType()
-{
-    // Allow call on null pointer
-    if (isNullPointer(this)) return 0;
-
-	if (flags & (asOBJ_FUNCDEF))
-		return reinterpret_cast<asCFuncdefType*>(this);
-
-	return 0;
-}
-
-// internal
-void asCTypeInfo::CleanUserData()
-{
-	asASSERT(engine);
-	for (asUINT n = 0; n < userData.GetLength(); n += 2)
-	{
-		if (userData[n + 1])
-		{
-			for (asUINT c = 0; c < engine->cleanTypeInfoFuncs.GetLength(); c++)
-				if (engine->cleanTypeInfoFuncs[c].type == userData[n])
-					engine->cleanTypeInfoFuncs[c].cleanFunc(this);
-		}
-	}
-	userData.SetLength(0);
-}
-
-// internal
-bool asCTypeInfo::IsShared() const
-{
-	// Types that can be declared by scripts need to have the explicit flag asOBJ_SHARED
-	if (flags & (asOBJ_SCRIPT_OBJECT | asOBJ_ENUM)) return flags & asOBJ_SHARED ? true : false;
-
-	// Otherwise we assume the type to be shared
-	return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-
-asCEnumType::~asCEnumType()
-{
-	asUINT n;
-	for (n = 0; n < enumValues.GetLength(); n++)
-	{
-		if (enumValues[n])
-			asDELETE(enumValues[n], asSEnumValue);
-	}
-	enumValues.SetLength(0);
-}
-
-// interface
-asUINT asCEnumType::GetEnumValueCount() const
-{ 
-	return enumValues.GetLength(); 
-}
-
-// interface
-const char *asCEnumType::GetEnumValueByIndex(asUINT index, int *outValue) const
-{ 
-	if (outValue)
-		*outValue = 0;
-
-	if (index >= enumValues.GetLength())
-		return 0;
-
-	if (outValue)
-		*outValue = enumValues[index]->value;
-
-	return enumValues[index]->name.AddressOf();
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-asCTypedefType::~asCTypedefType()
-{
-	DestroyInternal();
-}
-
-void asCTypedefType::DestroyInternal()
-{
-	if (engine == 0) return;
-
-	// Release the object types held by the alias
-	if (aliasForType.GetTypeInfo())
-			aliasForType.GetTypeInfo()->ReleaseInternal();
-	
-	aliasForType = asCDataType::CreatePrimitive(ttVoid, false);
-
-	CleanUserData();
-
-	// Remove the type from the engine
-	if (typeId != -1)
-		engine->RemoveFromTypeIdMap(this);
-
-	// Clear the engine pointer to mark the object type as invalid
-	engine = 0;
-}
-
-// interface
-int asCTypedefType::GetTypedefTypeId() const
-{ 
-	return engine->GetTypeIdFromDataType(aliasForType); 
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-asCFuncdefType::asCFuncdefType(asCScriptEngine *en, asCScriptFunction *func) : asCTypeInfo(en)
-{
-	asASSERT(func->funcType == asFUNC_FUNCDEF);
-	asASSERT(func->funcdefType == 0);
-
-	// A function pointer is special kind of reference type
-	flags       = asOBJ_REF | asOBJ_FUNCDEF | (func->isShared ? asOBJ_SHARED : 0);
-	name        = func->name;
-	nameSpace   = func->nameSpace;
-	module      = func->module;
-	accessMask  = func->accessMask;
-	funcdef     = func; // reference already counted by the asCScriptFunction constructor
-	parentClass = 0;
-
-	func->funcdefType = this;
-}
-
-asCFuncdefType::~asCFuncdefType()
-{
-	DestroyInternal();
-}
-
-void asCFuncdefType::DestroyInternal()
-{
-	if (engine == 0) return;
-
-	// Release the funcdef
-	if( funcdef )
-		funcdef->ReleaseInternal();
-	funcdef = 0;
-
-	// Detach from parent class
-	if (parentClass)
-	{
-		parentClass->childFuncDefs.RemoveValue(this);
-		parentClass = 0;
-	}
-
-	CleanUserData();
-
-	// Remove the type from the engine
-	if (typeId != -1)
-		engine->RemoveFromTypeIdMap(this);
-
-	// Clear the engine pointer to mark the object type as invalid
-	engine = 0;
-}
-
-// interface
-asIScriptFunction *asCFuncdefType::GetFuncdefSignature() const
-{ 
-	return funcdef; 
-}
-
-// interface
-asITypeInfo *asCFuncdefType::GetParentType() const
-{
-	return parentClass;
-}
-
-END_AS_NAMESPACE
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2020 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_typeinfo.cpp
+//
+
+
+#include "as_config.h"
+#include "as_typeinfo.h"
+#include "as_scriptengine.h"
+
+BEGIN_AS_NAMESPACE
+
+asCTypeInfo::asCTypeInfo()
+{
+	externalRefCount.set(0);
+	internalRefCount.set(1); // start with one internal ref-count
+	engine = 0;
+	module = 0;
+	size = 0;
+	flags = 0;
+	typeId = -1; // start as -1 to signal that it hasn't been defined
+
+	scriptSectionIdx = -1;
+	declaredAt = 0;
+
+	accessMask = 0xFFFFFFFF;
+	nameSpace = 0;
+}
+
+asCTypeInfo::asCTypeInfo(asCScriptEngine *in_engine)
+{
+	externalRefCount.set(0);
+	internalRefCount.set(1); // start with one internal ref count
+	engine = in_engine;
+	module = 0;
+	size = 0;
+	flags = 0;
+	typeId = -1; // start as -1 to signal that it hasn't been defined
+
+	scriptSectionIdx = -1;
+	declaredAt = 0;
+
+	accessMask = 0xFFFFFFFF;
+	nameSpace = engine->nameSpaces[0];
+}
+
+asCTypeInfo::~asCTypeInfo()
+{
+}
+
+// interface
+int asCTypeInfo::AddRef() const
+{
+	return externalRefCount.atomicInc();
+}
+
+// interface
+int asCTypeInfo::Release() const
+{
+	int r = externalRefCount.atomicDec();
+
+	if (r == 0)
+	{
+		// There are no more external references, if there are also no
+		// internal references then it is time to delete the object type
+		if (internalRefCount.get() == 0)
+		{
+			// If the engine is no longer set, then it has already been
+			// released and we must take care of the deletion ourselves
+			asDELETE(const_cast<asCTypeInfo*>(this), asCTypeInfo);
+		}
+	}
+
+	return r;
+}
+
+int asCTypeInfo::AddRefInternal()
+{
+	return internalRefCount.atomicInc();
+}
+
+int asCTypeInfo::ReleaseInternal()
+{
+	int r = internalRefCount.atomicDec();
+
+	if (r == 0)
+	{
+		// There are no more internal references, if there are also no
+		// external references then it is time to delete the object type
+		if (externalRefCount.get() == 0)
+		{
+			// If the engine is no longer set, then it has already been
+			// released and we must take care of the deletion ourselves
+			asDELETE(const_cast<asCTypeInfo*>(this), asCTypeInfo);
+		}
+	}
+
+	return r;
+}
+
+// interface
+asIScriptModule *asCTypeInfo::GetModule() const
+{
+	return module;
+}
+
+void *asCTypeInfo::SetUserData(void *data, asPWORD type)
+{
+	// As a thread might add a new new user data at the same time as another
+	// it is necessary to protect both read and write access to the userData member
+	ACQUIREEXCLUSIVE(engine->engineRWLock);
+
+	// It is not intended to store a lot of different types of userdata,
+	// so a more complex structure like a associative map would just have
+	// more overhead than a simple array.
+	for (asUINT n = 0; n < userData.GetLength(); n += 2)
+	{
+		if (userData[n] == type)
+		{
+			void *oldData = reinterpret_cast<void*>(userData[n + 1]);
+			userData[n + 1] = reinterpret_cast<asPWORD>(data);
+
+			RELEASEEXCLUSIVE(engine->engineRWLock);
+
+			return oldData;
+		}
+	}
+
+	userData.PushLast(type);
+	userData.PushLast(reinterpret_cast<asPWORD>(data));
+
+	RELEASEEXCLUSIVE(engine->engineRWLock);
+
+	return 0;
+}
+
+void *asCTypeInfo::GetUserData(asPWORD type) const
+{
+	// There may be multiple threads reading, but when
+	// setting the user data nobody must be reading.
+	ACQUIRESHARED(engine->engineRWLock);
+
+	for (asUINT n = 0; n < userData.GetLength(); n += 2)
+	{
+		if (userData[n] == type)
+		{
+			RELEASESHARED(engine->engineRWLock);
+			return reinterpret_cast<void*>(userData[n + 1]);
+		}
+	}
+
+	RELEASESHARED(engine->engineRWLock);
+
+	return 0;
+}
+
+// interface
+const char *asCTypeInfo::GetName() const
+{
+	return name.AddressOf();
+}
+
+// interface
+const char *asCTypeInfo::GetNamespace() const
+{
+	if( nameSpace )
+		return nameSpace->name.AddressOf();
+
+	return 0;
+}
+
+// interface
+asDWORD asCTypeInfo::GetFlags() const
+{
+	return flags;
+}
+
+// interface
+asUINT asCTypeInfo::GetSize() const
+{
+	return size;
+}
+
+// interface
+int asCTypeInfo::GetTypeId() const
+{
+	if (typeId == -1)
+	{
+		// We need a non const pointer to create the asCDataType object.
+		// We're not breaking anything here because this function is not
+		// modifying the object, so this const cast is safe.
+		asCTypeInfo *ot = const_cast<asCTypeInfo*>(this);
+
+		// The engine will define the typeId for this object type
+		engine->GetTypeIdFromDataType(asCDataType::CreateType(ot, false));
+	}
+
+	return typeId;
+}
+
+// interface
+asIScriptEngine *asCTypeInfo::GetEngine() const
+{
+	return engine;
+}
+
+// interface
+const char *asCTypeInfo::GetConfigGroup() const
+{
+	asCConfigGroup *group = engine->FindConfigGroupForTypeInfo(this);
+	if (group == 0)
+		return 0;
+
+	return group->groupName.AddressOf();
+}
+
+// interface
+asDWORD asCTypeInfo::GetAccessMask() const
+{
+	return accessMask;
+}
+
+// interface
+int asCTypeInfo::GetProperty(asUINT index, const char **out_name, int *out_typeId, bool *out_isPrivate, bool *out_isProtected, int *out_offset, bool *out_isReference, asDWORD *out_accessMask, int *out_compositeOffset, bool *out_isCompositeIndirect) const
+{
+	UNUSED_VAR(index);
+	if (out_name) *out_name = 0;
+	if (out_typeId) *out_typeId = 0;
+	if (out_isPrivate) *out_isPrivate = false;
+	if (out_isProtected) *out_isProtected = false;
+	if (out_offset) *out_offset = 0;
+	if (out_isReference) *out_isReference = false;
+	if (out_accessMask) *out_accessMask = 0;
+	if (out_compositeOffset) *out_compositeOffset = 0;
+	if (out_isCompositeIndirect) *out_isCompositeIndirect = false;
+	return -1;
+}
+
+// internal
+asCObjectType *CastToObjectType(asCTypeInfo *ti)
+{
+	// Allow call on null pointer
+	if (ti == 0) return 0;
+
+	// TODO: type: Should List pattern have its own type class?
+	if ((ti->flags & (asOBJ_VALUE | asOBJ_REF | asOBJ_LIST_PATTERN)) && !(ti->flags & asOBJ_FUNCDEF))
+		return reinterpret_cast<asCObjectType*>(ti);
+
+	return 0;
+}
+
+// internal
+asCEnumType *CastToEnumType(asCTypeInfo *ti)
+{
+	// Allow call on null pointer
+	if (ti == 0) return 0;
+
+	if (ti->flags & (asOBJ_ENUM))
+		return reinterpret_cast<asCEnumType*>(ti);
+
+	return 0;
+}
+
+// internal
+asCTypedefType *CastToTypedefType(asCTypeInfo *ti)
+{
+	// Allow call on null pointer
+	if (ti == 0) return 0;
+
+	if (ti->flags & (asOBJ_TYPEDEF))
+		return reinterpret_cast<asCTypedefType*>(ti);
+
+	return 0;
+}
+
+// internal
+asCFuncdefType *CastToFuncdefType(asCTypeInfo *ti)
+{
+	// Allow call on null pointer
+	if (ti == 0) return 0;
+
+	if (ti->flags & (asOBJ_FUNCDEF))
+		return reinterpret_cast<asCFuncdefType*>(ti);
+
+	return 0;
+}
+
+// internal
+void asCTypeInfo::CleanUserData()
+{
+	asASSERT(engine);
+	for (asUINT n = 0; n < userData.GetLength(); n += 2)
+	{
+		if (userData[n + 1])
+		{
+			for (asUINT c = 0; c < engine->cleanTypeInfoFuncs.GetLength(); c++)
+				if (engine->cleanTypeInfoFuncs[c].type == userData[n])
+					engine->cleanTypeInfoFuncs[c].cleanFunc(this);
+		}
+	}
+	userData.SetLength(0);
+}
+
+// internal
+bool asCTypeInfo::IsShared() const
+{
+	// Types that can be declared by scripts need to have the explicit flag asOBJ_SHARED
+	if (flags & (asOBJ_SCRIPT_OBJECT | asOBJ_ENUM)) return flags & asOBJ_SHARED ? true : false;
+
+	// Otherwise we assume the type to be shared
+	return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////
+
+asCEnumType::~asCEnumType()
+{
+	asUINT n;
+	for (n = 0; n < enumValues.GetLength(); n++)
+	{
+		if (enumValues[n])
+			asDELETE(enumValues[n], asSEnumValue);
+	}
+	enumValues.SetLength(0);
+}
+
+// interface
+asUINT asCEnumType::GetEnumValueCount() const
+{
+	return enumValues.GetLength();
+}
+
+// interface
+const char *asCEnumType::GetEnumValueByIndex(asUINT index, int *outValue) const
+{
+	if (outValue)
+		*outValue = 0;
+
+	if (index >= enumValues.GetLength())
+		return 0;
+
+	if (outValue)
+		*outValue = enumValues[index]->value;
+
+	return enumValues[index]->name.AddressOf();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+asCTypedefType::~asCTypedefType()
+{
+	DestroyInternal();
+}
+
+void asCTypedefType::DestroyInternal()
+{
+	if (engine == 0) return;
+
+	// Release the object types held by the alias
+	if (aliasForType.GetTypeInfo())
+			aliasForType.GetTypeInfo()->ReleaseInternal();
+
+	aliasForType = asCDataType::CreatePrimitive(ttVoid, false);
+
+	CleanUserData();
+
+	// Remove the type from the engine
+	if (typeId != -1)
+		engine->RemoveFromTypeIdMap(this);
+
+	// Clear the engine pointer to mark the object type as invalid
+	engine = 0;
+}
+
+// interface
+int asCTypedefType::GetTypedefTypeId() const
+{
+	return engine->GetTypeIdFromDataType(aliasForType);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+asCFuncdefType::asCFuncdefType(asCScriptEngine *en, asCScriptFunction *func) : asCTypeInfo(en)
+{
+	asASSERT(func->funcType == asFUNC_FUNCDEF);
+	asASSERT(func->funcdefType == 0);
+
+	// A function pointer is special kind of reference type
+	// It must be possible to garbage collect, as funcdefs can form circular references if used as delegates
+	flags       = asOBJ_REF | asOBJ_GC | asOBJ_FUNCDEF | (func->IsShared() ? asOBJ_SHARED : 0);
+	name        = func->name;
+	nameSpace   = func->nameSpace;
+	module      = func->module;
+	accessMask  = func->accessMask;
+	funcdef     = func; // reference already counted by the asCScriptFunction constructor
+	parentClass = 0;
+
+	func->funcdefType = this;
+}
+
+asCFuncdefType::~asCFuncdefType()
+{
+	DestroyInternal();
+}
+
+void asCFuncdefType::DestroyInternal()
+{
+	if (engine == 0) return;
+
+	// Release the funcdef
+	if( funcdef )
+		funcdef->ReleaseInternal();
+	funcdef = 0;
+
+	// Detach from parent class
+	if (parentClass)
+	{
+		parentClass->childFuncDefs.RemoveValue(this);
+		parentClass = 0;
+	}
+
+	CleanUserData();
+
+	// Remove the type from the engine
+	if (typeId != -1)
+		engine->RemoveFromTypeIdMap(this);
+
+	// Clear the engine pointer to mark the object type as invalid
+	engine = 0;
+}
+
+// interface
+asIScriptFunction *asCFuncdefType::GetFuncdefSignature() const
+{
+	return funcdef;
+}
+
+// interface
+asITypeInfo *asCFuncdefType::GetParentType() const
+{
+	return parentClass;
+}
+
+END_AS_NAMESPACE
+
+
diff --git a/Sources/AngelScript/source/as_typeinfo.h b/Sources/AngelScript/source/as_typeinfo.h
old mode 100755
new mode 100644
index 1c0f68eac..a5643dda5
--- a/Sources/AngelScript/source/as_typeinfo.h
+++ b/Sources/AngelScript/source/as_typeinfo.h
@@ -1,241 +1,242 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2016 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_typeinfo.h
-//
-
-
-
-#ifndef AS_TYPEINFO_H
-#define AS_TYPEINFO_H
-
-#include "as_config.h"
-#include "as_string.h"
-#include "as_atomic.h"
-#include "as_datatype.h"
-
-BEGIN_AS_NAMESPACE
-
-class asCScriptEngine;
-class asCModule;
-class asCObjectType;
-class asCEnumType;
-class asCTypedefType;
-class asCFuncdefType;
-struct asSNameSpace;
-
-// TODO: type: asCPrimitiveType shall be implemented to represent primitives (void, int, double, etc)
-
-// TODO: type: asCTypeInfo should have an internal virtual method GetBehaviours. For asCObjectType it 
-//             should return the beh member. For asCFuncdefType it should return the beh member of 
-//             engine->functionBehaviours. This will allow the code that needs the behaviour to handle 
-//             both object types and funcdefs the same way
-
-class asCTypeInfo : public asITypeInfo
-{
-public:
-	//=====================================
-	// From asITypeInfo
-	//=====================================
-	asIScriptEngine *GetEngine() const;
-	const char      *GetConfigGroup() const;
-	asDWORD          GetAccessMask() const;
-	asIScriptModule *GetModule() const;
-
-	// Memory management
-	int AddRef() const;
-	int Release() const;
-
-	// Type info
-	const char      *GetName() const;
-	const char      *GetNamespace() const;
-	asITypeInfo     *GetBaseType() const { return 0; }
-	bool             DerivesFrom(const asITypeInfo *objType) const { UNUSED_VAR(objType); return 0; }
-	asDWORD          GetFlags() const;
-	asUINT           GetSize() const;
-	int              GetTypeId() const;
-	int              GetSubTypeId(asUINT subtypeIndex = 0) const { UNUSED_VAR(subtypeIndex); return -1; }
-	asITypeInfo     *GetSubType(asUINT subtypeIndex = 0) const { UNUSED_VAR(subtypeIndex); return 0; }
-	asUINT           GetSubTypeCount() const { return 0; }
-
-	// Interfaces
-	asUINT           GetInterfaceCount() const { return 0; }
-	asITypeInfo     *GetInterface(asUINT index) const { UNUSED_VAR(index); return 0; }
-	bool             Implements(const asITypeInfo *objType) const { UNUSED_VAR(objType); return false; }
-
-	// Factories
-	asUINT             GetFactoryCount() const { return 0; }
-	asIScriptFunction *GetFactoryByIndex(asUINT index) const { UNUSED_VAR(index); return 0; }
-	asIScriptFunction *GetFactoryByDecl(const char *decl) const { UNUSED_VAR(decl); return 0; }
-
-	// Methods
-	asUINT             GetMethodCount() const { return 0; }
-	asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual) const { UNUSED_VAR(index); UNUSED_VAR(getVirtual); return 0; }
-	asIScriptFunction *GetMethodByName(const char *in_name, bool getVirtual) const { UNUSED_VAR(in_name); UNUSED_VAR(getVirtual); return 0; }
-	asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual) const { UNUSED_VAR(decl); UNUSED_VAR(getVirtual); return 0; }
-
-	// Properties
-	asUINT      GetPropertyCount() const { return 0; }
-	int         GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, bool *isProtected, int *offset, bool *isReference, asDWORD *accessMask) const;
-	const char *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const { UNUSED_VAR(index); UNUSED_VAR(includeNamespace); return 0; }
-
-	// Behaviours
-	asUINT             GetBehaviourCount() const { return 0; }
-	asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const { UNUSED_VAR(index); UNUSED_VAR(outBehaviour); return 0; }
-
-	// Child types
-	asUINT       GetChildFuncdefCount() const { return 0; }
-	asITypeInfo *GetChildFuncdef(asUINT index) const { UNUSED_VAR(index); return 0; }
-	asITypeInfo *GetParentType() const { return 0; }
-
-	// Enums
-	virtual asUINT      GetEnumValueCount() const { return 0; }
-	virtual const char *GetEnumValueByIndex(asUINT index, int *outValue) const { UNUSED_VAR(index); if (outValue) *outValue = 0; return 0; }
-
-	// Typedef
-	virtual int GetTypedefTypeId() const { return asERROR; }
-
-	// Funcdef
-	virtual asIScriptFunction *GetFuncdefSignature() const { return 0; }
-
-	// User data
-	void *SetUserData(void *data, asPWORD type);
-	void *GetUserData(asPWORD type) const;
-
-	//===========================================
-	// Internal
-	//===========================================
-public:
-	asCTypeInfo(asCScriptEngine *engine);
-	virtual ~asCTypeInfo();
-
-	// Keep an internal reference counter to separate references coming from 
-	// application or script objects and references coming from the script code
-	virtual int AddRefInternal();
-	virtual int ReleaseInternal();
-
-	virtual void DestroyInternal() {}
-
-	void CleanUserData();
-
-	bool IsShared() const;
-
-	// These can be safely used on null pointers (which will return null)
-	asCObjectType  *CastToObjectType();
-	asCEnumType    *CastToEnumType();
-	asCTypedefType *CastToTypedefType();
-	asCFuncdefType *CastToFuncdefType();
-
-
-	asCString                    name;
-	asSNameSpace                *nameSpace;
-	int                          size;
-	mutable int                  typeId;
-	asDWORD                      flags;
-	asDWORD                      accessMask;
-
-	// Store the script section where the code was declared
-	int                             scriptSectionIdx;
-	// Store the location where the function was declared (row in the lower 20 bits, and column in the upper 12)
-	int                             declaredAt;
-
-	asCScriptEngine  *engine;
-	asCModule        *module;
-	asCArray<asPWORD> userData;
-
-protected:
-	friend class asCScriptEngine;
-	friend class asCConfigGroup;
-	friend class asCModule;
-	asCTypeInfo();
-
-	mutable asCAtomic externalRefCount;
-	asCAtomic         internalRefCount;
-};
-
-struct asSEnumValue
-{
-	asCString name;
-	int       value;
-};
-
-class asCEnumType : public asCTypeInfo
-{
-public:
-	asCEnumType(asCScriptEngine *engine) : asCTypeInfo(engine) {}
-	~asCEnumType();
-
-	asCArray<asSEnumValue*> enumValues;
-
-	asUINT      GetEnumValueCount() const;
-	const char *GetEnumValueByIndex(asUINT index, int *outValue) const;
-
-protected:
-	asCEnumType() : asCTypeInfo() {}
-};
-
-class asCTypedefType : public asCTypeInfo
-{
-public:
-	asCTypedefType(asCScriptEngine *engine) : asCTypeInfo(engine) {}
-	~asCTypedefType();
-
-	void DestroyInternal();
-
-	asCDataType aliasForType; // increase refCount for typeinfo inside datatype
-
-	int GetTypedefTypeId() const;
-
-protected:
-	asCTypedefType() : asCTypeInfo() {}
-};
-
-class asCFuncdefType : public asCTypeInfo
-{
-public:
-	asCFuncdefType(asCScriptEngine *engine, asCScriptFunction *func);
-	~asCFuncdefType();
-
-	asIScriptFunction *GetFuncdefSignature() const;
-	asITypeInfo       *GetParentType() const;
-
-	void DestroyInternal();
-	asCScriptFunction *funcdef;     // increases refCount
-	asCObjectType     *parentClass; // doesn't increase refCount
-
-protected:
-	asCFuncdefType() : asCTypeInfo(), funcdef(0), parentClass(0) {}
-};
-
-END_AS_NAMESPACE
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2017 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied
+   warranty. In no event will the authors be held liable for any
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any
+   purpose, including commercial applications, and to alter it and
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_typeinfo.h
+//
+
+
+
+#ifndef AS_TYPEINFO_H
+#define AS_TYPEINFO_H
+
+#include "as_config.h"
+#include "as_string.h"
+#include "as_atomic.h"
+#include "as_datatype.h"
+
+BEGIN_AS_NAMESPACE
+
+class asCScriptEngine;
+class asCModule;
+class asCObjectType;
+class asCEnumType;
+class asCTypedefType;
+class asCFuncdefType;
+struct asSNameSpace;
+
+// TODO: type: asCPrimitiveType shall be implemented to represent primitives (void, int, double, etc)
+
+// TODO: type: asCTypeInfo should have an internal virtual method GetBehaviours. For asCObjectType it 
+//             should return the beh member. For asCFuncdefType it should return the beh member of 
+//             engine->functionBehaviours. This will allow the code that needs the behaviour to handle 
+//             both object types and funcdefs the same way
+
+class asCTypeInfo : public asITypeInfo
+{
+public:
+	//=====================================
+	// From asITypeInfo
+	//=====================================
+	asIScriptEngine *GetEngine() const;
+	const char      *GetConfigGroup() const;
+	asDWORD          GetAccessMask() const;
+	asIScriptModule *GetModule() const;
+
+	// Memory management
+	int AddRef() const;
+	int Release() const;
+
+	// Type info
+	const char      *GetName() const;
+	const char      *GetNamespace() const;
+	asITypeInfo     *GetBaseType() const { return 0; }
+	bool             DerivesFrom(const asITypeInfo *objType) const { UNUSED_VAR(objType); return 0; }
+	asDWORD          GetFlags() const;
+	asUINT           GetSize() const;
+	int              GetTypeId() const;
+	int              GetSubTypeId(asUINT subtypeIndex = 0) const { UNUSED_VAR(subtypeIndex); return -1; }
+	asITypeInfo     *GetSubType(asUINT subtypeIndex = 0) const { UNUSED_VAR(subtypeIndex); return 0; }
+	asUINT           GetSubTypeCount() const { return 0; }
+
+	// Interfaces
+	asUINT           GetInterfaceCount() const { return 0; }
+	asITypeInfo     *GetInterface(asUINT index) const { UNUSED_VAR(index); return 0; }
+	bool             Implements(const asITypeInfo *objType) const { UNUSED_VAR(objType); return false; }
+
+	// Factories
+	asUINT             GetFactoryCount() const { return 0; }
+	asIScriptFunction *GetFactoryByIndex(asUINT index) const { UNUSED_VAR(index); return 0; }
+	asIScriptFunction *GetFactoryByDecl(const char *decl) const { UNUSED_VAR(decl); return 0; }
+
+	// Methods
+	asUINT             GetMethodCount() const { return 0; }
+	asIScriptFunction *GetMethodByIndex(asUINT index, bool getVirtual) const { UNUSED_VAR(index); UNUSED_VAR(getVirtual); return 0; }
+	asIScriptFunction *GetMethodByName(const char *in_name, bool getVirtual) const { UNUSED_VAR(in_name); UNUSED_VAR(getVirtual); return 0; }
+	asIScriptFunction *GetMethodByDecl(const char *decl, bool getVirtual) const { UNUSED_VAR(decl); UNUSED_VAR(getVirtual); return 0; }
+
+	// Properties
+	asUINT      GetPropertyCount() const { return 0; }
+	int         GetProperty(asUINT index, const char **name, int *typeId, bool *isPrivate, bool *isProtected, int *offset, bool *isReference, asDWORD *accessMask, int *compositeOffset, bool *isCompositeIndirect) const;
+	const char *GetPropertyDeclaration(asUINT index, bool includeNamespace = false) const { UNUSED_VAR(index); UNUSED_VAR(includeNamespace); return 0; }
+
+	// Behaviours
+	asUINT             GetBehaviourCount() const { return 0; }
+	asIScriptFunction *GetBehaviourByIndex(asUINT index, asEBehaviours *outBehaviour) const { UNUSED_VAR(index); UNUSED_VAR(outBehaviour); return 0; }
+
+	// Child types
+	asUINT       GetChildFuncdefCount() const { return 0; }
+	asITypeInfo *GetChildFuncdef(asUINT index) const { UNUSED_VAR(index); return 0; }
+	asITypeInfo *GetParentType() const { return 0; }
+
+	// Enums
+	virtual asUINT      GetEnumValueCount() const { return 0; }
+	virtual const char *GetEnumValueByIndex(asUINT index, int *outValue) const { UNUSED_VAR(index); if (outValue) *outValue = 0; return 0; }
+
+	// Typedef
+	virtual int GetTypedefTypeId() const { return asERROR; }
+
+	// Funcdef
+	virtual asIScriptFunction *GetFuncdefSignature() const { return 0; }
+
+	// User data
+	void *SetUserData(void *data, asPWORD type);
+	void *GetUserData(asPWORD type) const;
+
+	//===========================================
+	// Internal
+	//===========================================
+public:
+	asCTypeInfo(asCScriptEngine *engine);
+	virtual ~asCTypeInfo();
+
+	// Keep an internal reference counter to separate references coming from 
+	// application or script objects and references coming from the script code
+	virtual int AddRefInternal();
+	virtual int ReleaseInternal();
+
+	virtual void DestroyInternal() {}
+
+	void CleanUserData();
+
+	bool IsShared() const;
+
+	// These can be safely used on null pointers (which will return null)
+	friend asCObjectType  *CastToObjectType(asCTypeInfo *);
+	friend asCEnumType    *CastToEnumType(asCTypeInfo *);
+	friend asCTypedefType *CastToTypedefType(asCTypeInfo *);
+	friend asCFuncdefType *CastToFuncdefType(asCTypeInfo *);
+
+
+	asCString                    name;
+	asSNameSpace                *nameSpace;
+	int                          size;
+	mutable int                  typeId;
+	asDWORD                      flags;
+	asDWORD                      accessMask;
+
+	// Store the script section where the code was declared
+	int                             scriptSectionIdx;
+	// Store the location where the function was declared (row in the lower 20 bits, and column in the upper 12)
+	int                             declaredAt;
+
+	asCScriptEngine  *engine;
+	asCModule        *module;
+	asCArray<asPWORD> userData;
+
+protected:
+	friend class asCScriptEngine;
+	friend class asCConfigGroup;
+	friend class asCModule;
+	friend class asCObjectType;
+	asCTypeInfo();
+
+	mutable asCAtomic externalRefCount;
+	asCAtomic         internalRefCount;
+};
+
+struct asSEnumValue
+{
+	asCString name;
+	int       value;
+};
+
+class asCEnumType : public asCTypeInfo
+{
+public:
+	asCEnumType(asCScriptEngine *engine) : asCTypeInfo(engine) {}
+	~asCEnumType();
+
+	asCArray<asSEnumValue*> enumValues;
+
+	asUINT      GetEnumValueCount() const;
+	const char *GetEnumValueByIndex(asUINT index, int *outValue) const;
+
+protected:
+	asCEnumType() : asCTypeInfo() {}
+};
+
+class asCTypedefType : public asCTypeInfo
+{
+public:
+	asCTypedefType(asCScriptEngine *engine) : asCTypeInfo(engine) {}
+	~asCTypedefType();
+
+	void DestroyInternal();
+
+	asCDataType aliasForType; // increase refCount for typeinfo inside datatype
+
+	int GetTypedefTypeId() const;
+
+protected:
+	asCTypedefType() : asCTypeInfo() {}
+};
+
+class asCFuncdefType : public asCTypeInfo
+{
+public:
+	asCFuncdefType(asCScriptEngine *engine, asCScriptFunction *func);
+	~asCFuncdefType();
+
+	asIScriptFunction *GetFuncdefSignature() const;
+	asITypeInfo       *GetParentType() const;
+
+	void DestroyInternal();
+	asCScriptFunction *funcdef;     // increases refCount
+	asCObjectType     *parentClass; // doesn't increase refCount
+
+protected:
+	asCFuncdefType() : asCTypeInfo(), funcdef(0), parentClass(0) {}
+};
+
+END_AS_NAMESPACE
+
+#endif
diff --git a/Sources/AngelScript/source/as_variablescope.cpp b/Sources/AngelScript/source/as_variablescope.cpp
old mode 100755
new mode 100644
index 63d38a693..aca36dae1
--- a/Sources/AngelScript/source/as_variablescope.cpp
+++ b/Sources/AngelScript/source/as_variablescope.cpp
@@ -1,142 +1,142 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_variablescope.cpp
-//
-// A manager class for variable declarations
-//
-
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_variablescope.h"
-
-BEGIN_AS_NAMESPACE
-
-asCVariableScope::asCVariableScope(asCVariableScope *parent)
-{
-	this->parent    = parent;
-	Reset();
-}
-
-asCVariableScope::~asCVariableScope()
-{
-	Reset();
-}
-
-void asCVariableScope::Reset()
-{
-	isBreakScope = false;
-	isContinueScope = false;
-
-	for( asUINT n = 0; n < variables.GetLength(); n++ )
-		if( variables[n] ) 
-		{
-			asDELETE(variables[n],sVariable);
-		}
-	variables.SetLength(0);
-}
-
-int asCVariableScope::DeclareVariable(const char *name, const asCDataType &type, int stackOffset, bool onHeap)
-{
-	// TODO: optimize: Improve linear search
-	// See if the variable is already declared
-	if( strcmp(name, "") != 0 )
-	{
-		for( asUINT n = 0; n < variables.GetLength(); n++ )
-		{
-			if( variables[n]->name == name )
-				return -1;
-		}
-	}
-
-	sVariable *var = asNEW(sVariable);
-	if( var == 0 )
-	{
-		// Out of memory. Return without allocating the var
-		return -2;
-	}
-	var->name           = name;
-	var->type           = type;
-	var->stackOffset    = stackOffset;
-	var->isInitialized  = false;
-	var->isPureConstant = false;
-	var->onHeap         = onHeap;
-
-	// Parameters are initialized
-	if( stackOffset <= 0 )
-		var->isInitialized = true;
-
-	variables.PushLast(var);
-
-	return 0;
-}
-
-sVariable *asCVariableScope::GetVariable(const char *name)
-{
-	// TODO: optimize: Improve linear search
-	// Find the variable
-	for( asUINT n = 0; n < variables.GetLength(); n++ )
-	{
-		if( variables[n]->name == name )
-			return variables[n];
-	}
-
-	if( parent )
-		return parent->GetVariable(name);
-
-	return 0;
-}
-
-sVariable *asCVariableScope::GetVariableByOffset(int offset)
-{
-	// TODO: optimize: Improve linear search
-	// Find the variable
-	for( asUINT n = 0; n < variables.GetLength(); n++ )
-	{
-		if( variables[n]->stackOffset == offset )
-			return variables[n];
-	}
-
-	if( parent )
-		return parent->GetVariableByOffset(offset);
-
-	return 0;
-}
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
-
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2012 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_variablescope.cpp
+//
+// A manager class for variable declarations
+//
+
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_variablescope.h"
+
+BEGIN_AS_NAMESPACE
+
+asCVariableScope::asCVariableScope(asCVariableScope *parent)
+{
+	this->parent    = parent;
+	Reset();
+}
+
+asCVariableScope::~asCVariableScope()
+{
+	Reset();
+}
+
+void asCVariableScope::Reset()
+{
+	isBreakScope = false;
+	isContinueScope = false;
+
+	for( asUINT n = 0; n < variables.GetLength(); n++ )
+		if( variables[n] ) 
+		{
+			asDELETE(variables[n],sVariable);
+		}
+	variables.SetLength(0);
+}
+
+int asCVariableScope::DeclareVariable(const char *name, const asCDataType &type, int stackOffset, bool onHeap)
+{
+	// TODO: optimize: Improve linear search
+	// See if the variable is already declared
+	if( strcmp(name, "") != 0 )
+	{
+		for( asUINT n = 0; n < variables.GetLength(); n++ )
+		{
+			if( variables[n]->name == name )
+				return -1;
+		}
+	}
+
+	sVariable *var = asNEW(sVariable);
+	if( var == 0 )
+	{
+		// Out of memory. Return without allocating the var
+		return -2;
+	}
+	var->name           = name;
+	var->type           = type;
+	var->stackOffset    = stackOffset;
+	var->isInitialized  = false;
+	var->isPureConstant = false;
+	var->onHeap         = onHeap;
+
+	// Parameters are initialized
+	if( stackOffset <= 0 )
+		var->isInitialized = true;
+
+	variables.PushLast(var);
+
+	return 0;
+}
+
+sVariable *asCVariableScope::GetVariable(const char *name)
+{
+	// TODO: optimize: Improve linear search
+	// Find the variable
+	for( asUINT n = 0; n < variables.GetLength(); n++ )
+	{
+		if( variables[n]->name == name )
+			return variables[n];
+	}
+
+	if( parent )
+		return parent->GetVariable(name);
+
+	return 0;
+}
+
+sVariable *asCVariableScope::GetVariableByOffset(int offset)
+{
+	// TODO: optimize: Improve linear search
+	// Find the variable
+	for( asUINT n = 0; n < variables.GetLength(); n++ )
+	{
+		if( variables[n]->stackOffset == offset )
+			return variables[n];
+	}
+
+	if( parent )
+		return parent->GetVariableByOffset(offset);
+
+	return 0;
+}
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
+
diff --git a/Sources/AngelScript/source/as_variablescope.h b/Sources/AngelScript/source/as_variablescope.h
old mode 100755
new mode 100644
index 98fd05f1d..d4b220a01
--- a/Sources/AngelScript/source/as_variablescope.h
+++ b/Sources/AngelScript/source/as_variablescope.h
@@ -1,87 +1,87 @@
-/*
-   AngelCode Scripting Library
-   Copyright (c) 2003-2012 Andreas Jonsson
-
-   This software is provided 'as-is', without any express or implied 
-   warranty. In no event will the authors be held liable for any 
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any 
-   purpose, including commercial applications, and to alter it and 
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you 
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product 
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and 
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source 
-      distribution.
-
-   The original version of this library can be located at:
-   http://www.angelcode.com/angelscript/
-
-   Andreas Jonsson
-   andreas@angelcode.com
-*/
-
-
-//
-// as_variablescope.h
-//
-// A manager class for variable declarations
-//
-
-
-#ifndef AS_VARIABLESCOPE_H
-#define AS_VARIABLESCOPE_H
-
-#include "as_config.h"
-
-#ifndef AS_NO_COMPILER
-
-#include "as_array.h"
-#include "as_string.h"
-#include "as_datatype.h"
-
-BEGIN_AS_NAMESPACE
-
-struct sVariable
-{
-	asCString   name;
-	asCDataType type;
-	int         stackOffset;
-	bool        isInitialized;
-	bool        isPureConstant;
-	asQWORD     constantValue;
-	bool        onHeap;
-};
-
-class asCVariableScope
-{
-public:
-	asCVariableScope(asCVariableScope *parent);
-	~asCVariableScope();
-
-	void Reset();
-
-	int DeclareVariable(const char *name, const asCDataType &type, int stackOffset, bool isObjectOnHeap);
-	sVariable *GetVariable(const char *name);
-	sVariable *GetVariableByOffset(int offset);
-
-	asCVariableScope *parent;
-
-	bool isBreakScope;
-	bool isContinueScope;
-
-	asCArray<sVariable *> variables;
-};
-
-END_AS_NAMESPACE
-
-#endif // AS_NO_COMPILER
-
-#endif
+/*
+   AngelCode Scripting Library
+   Copyright (c) 2003-2012 Andreas Jonsson
+
+   This software is provided 'as-is', without any express or implied 
+   warranty. In no event will the authors be held liable for any 
+   damages arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any 
+   purpose, including commercial applications, and to alter it and 
+   redistribute it freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you 
+      must not claim that you wrote the original software. If you use
+      this software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and 
+      must not be misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source 
+      distribution.
+
+   The original version of this library can be located at:
+   http://www.angelcode.com/angelscript/
+
+   Andreas Jonsson
+   andreas@angelcode.com
+*/
+
+
+//
+// as_variablescope.h
+//
+// A manager class for variable declarations
+//
+
+
+#ifndef AS_VARIABLESCOPE_H
+#define AS_VARIABLESCOPE_H
+
+#include "as_config.h"
+
+#ifndef AS_NO_COMPILER
+
+#include "as_array.h"
+#include "as_string.h"
+#include "as_datatype.h"
+
+BEGIN_AS_NAMESPACE
+
+struct sVariable
+{
+	asCString   name;
+	asCDataType type;
+	int         stackOffset;
+	bool        isInitialized;
+	bool        isPureConstant;
+	asQWORD     constantValue;
+	bool        onHeap;
+};
+
+class asCVariableScope
+{
+public:
+	asCVariableScope(asCVariableScope *parent);
+	~asCVariableScope();
+
+	void Reset();
+
+	int DeclareVariable(const char *name, const asCDataType &type, int stackOffset, bool isObjectOnHeap);
+	sVariable *GetVariable(const char *name);
+	sVariable *GetVariableByOffset(int offset);
+
+	asCVariableScope *parent;
+
+	bool isBreakScope;
+	bool isContinueScope;
+
+	asCArray<sVariable *> variables;
+};
+
+END_AS_NAMESPACE
+
+#endif // AS_NO_COMPILER
+
+#endif
diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
index 1304bf023..82644f900 100644
--- a/Sources/CMakeLists.txt
+++ b/Sources/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
 
 add_subdirectory(AngelScript/projects/cmake)
 add_subdirectory(AngelScript/projects/cmake_addons)
-set(ANGELSCRIPT_LIBS Angelscript Angelscript_addons)
+set(ANGELSCRIPT_LIBS angelscript angelscript_add_on)
 
 include_directories(BEFORE ".")
 include_directories(BEFORE "json/include")
@@ -52,9 +52,9 @@ if(APPLE OR WIN32)
 	# the correct capitalization.
 	# We also want the correct capitalization on Windows.
 	set_target_properties(OpenSpades PROPERTIES OUTPUT_NAME OpenSpades)
-else(APPLE)
+else(APPLE OR WIN32)
 	set_target_properties(OpenSpades PROPERTIES OUTPUT_NAME openspades)
-endif(APPLE)
+endif(APPLE OR WIN32)
 
 if (APPLE)
 	# The built pak files are copied into the macOS application bundle. CMake
@@ -83,7 +83,7 @@ if(WIN32)
 	endforeach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
 endif()
 
-add_dependencies(OpenSpades Angelscript Angelscript_addons)
+add_dependencies(OpenSpades angelscript angelscript_add_on)
 
 if(WIN32)
 	source_group("Resources" ${RESOURCE_FILES})
diff --git a/Sources/Gui/MainScreenHelper.h b/Sources/Gui/MainScreenHelper.h
index a34672986..788106516 100644
--- a/Sources/Gui/MainScreenHelper.h
+++ b/Sources/Gui/MainScreenHelper.h
@@ -28,7 +28,7 @@
 #include <Core/TMPUtils.h>
 #include <ScriptBindings/ScriptManager.h>
 
-#include <AngelScript/addons/scriptarray.h>
+#include <AngelScript/add_on/scriptarray/scriptarray.h>
 
 namespace spades {
 	class ServerItem;
diff --git a/Sources/Gui/StartupScreenHelper.h b/Sources/Gui/StartupScreenHelper.h
index 5710d15c0..09e9c73ee 100644
--- a/Sources/Gui/StartupScreenHelper.h
+++ b/Sources/Gui/StartupScreenHelper.h
@@ -30,7 +30,7 @@
 
 // scriptarray.h must be included after ScriptManager.h or it won't be able to
 // find angelscript.h
-#include <AngelScript/addons/scriptarray.h>
+#include <AngelScript/add_on/scriptarray/scriptarray.h>
 
 namespace spades {
 	class Serveritem;
diff --git a/Sources/ScriptBindings/ScriptManager.cpp b/Sources/ScriptBindings/ScriptManager.cpp
index e4ad67b08..77074e58b 100644
--- a/Sources/ScriptBindings/ScriptManager.cpp
+++ b/Sources/ScriptBindings/ScriptManager.cpp
@@ -50,7 +50,7 @@ namespace spades {
 			
 		}
 	protected:
-		int  LoadScriptSection(const char *filename) override {
+		int  LoadScriptSection(const char *filename) {
 			if(filename[0] != '/') {
 				SPLog("Invalid script path detected: not starting with '/'");
 				return -1;
diff --git a/Sources/ScriptBindings/ScriptManager.h b/Sources/ScriptBindings/ScriptManager.h
index 0684563b3..c2a34b817 100644
--- a/Sources/ScriptBindings/ScriptManager.h
+++ b/Sources/ScriptBindings/ScriptManager.h
@@ -21,16 +21,16 @@
 #pragma once
 
 #include <AngelScript/include/angelscript.h>
-#include <AngelScript/addons/scriptany.h>
-#include <AngelScript/addons/scriptarray.h>
-#include <AngelScript/addons/scriptbuilder.h>
-#include <AngelScript/addons/scriptdictionary.h>
-#include <AngelScript/addons/scripthandle.h>
-#include <AngelScript/addons/scripthelper.h>
-#include <AngelScript/addons/scriptmath.h>
-#include <AngelScript/addons/scriptmathcomplex.h>
-#include <AngelScript/addons/scriptstdstring.h>
-#include <AngelScript/addons/weakref.h>
+#include <AngelScript/add_on/scriptany/scriptany.h>
+#include <AngelScript/add_on/scriptarray/scriptarray.h>
+#include <AngelScript/add_on/scriptbuilder/scriptbuilder.h>
+#include <AngelScript/add_on/scriptdictionary/scriptdictionary.h>
+#include <AngelScript/add_on/scripthandle/scripthandle.h>
+#include <AngelScript/add_on/scripthelper/scripthelper.h>
+#include <AngelScript/add_on/scriptmath/scriptmath.h>
+#include <AngelScript/add_on/scriptmath/scriptmathcomplex.h>
+#include <AngelScript/add_on/scriptstdstring/scriptstdstring.h>
+#include <AngelScript/add_on/weakref/weakref.h>
 #include <list>
 #include <mutex>
 
@@ -113,4 +113,4 @@ namespace spades {
 		std::string name;
 	};
 
-}
\ No newline at end of file
+}