瀏覽代碼

Modified validation mask for methods allowing nulls to get default values

mingodad 13 年之前
父節點
當前提交
2fe77bf4a5
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      ext/sqmix.cpp

+ 3 - 2
ext/sqmix.cpp

@@ -109,10 +109,11 @@ static SQRESULT mix_loadstring(HSQUIRRELVM sqvm) {
 	return mix_loadbuffer(sqvm, &S, "chunk");
 	return mix_loadbuffer(sqvm, &S, "chunk");
 }
 }
 
 
+const SQChar validate_format_mask[] = _SC(".s s|o s|o s|o s");
 #define _DECL_MIX_FUNC(name,nparams,pmask) {_SC(#name), mix_##name,nparams,pmask}
 #define _DECL_MIX_FUNC(name,nparams,pmask) {_SC(#name), mix_##name,nparams,pmask}
 static SQRegFunction mix_obj_funcs[]={
 static SQRegFunction mix_obj_funcs[]={
-	_DECL_MIX_FUNC(loadfile,-2,_SC(".sssss")),
-	_DECL_MIX_FUNC(loadstring,-2,_SC(".sssss")),
+	_DECL_MIX_FUNC(loadfile,-2,validate_format_mask),
+	_DECL_MIX_FUNC(loadstring,-2,validate_format_mask),
 	{0,0}
 	{0,0}
 };
 };
 #undef _DECL_MIX_FUNC
 #undef _DECL_MIX_FUNC