1 files changed, 28 insertions, 37 deletions

diff --git a/source/tests/02-luax/main.cpp b/source/tests/02-luax/main.cpp
index f87226e..cd718ac 100644
--- a/source/tests/02-luax/main.cpp
+++ b/source/tests/02-luax/main.cpp
@@ -2,10 +2,11 @@
 /// Scripting with Lua.
 ///
 extern "C"{
-#include "Lua51/lua.h"
-#include "Lua51/lauxlib.h"
+#include <Lua51/lua.h>
+#include <Lua51/lauxlib.h>
 }
-#include "Luax/luax.h"
+#include <Luax/luax.h>
+
 #include "header.h"
 
 #include <iostream>
@@ -114,7 +115,7 @@ int Boy::l_New(lua_State* L)
 int Boy::l_GetAge(lua_State* L)
 {
 	LUAX_SETUP(L, "U");
-	Boy* self = state.GetLuaUserdata<Boy>(1);
+	Boy* self = state.CheckUserdata<Boy>(1);
 	state.Push(self->mAge);
 	return 1;
 }
@@ -122,7 +123,7 @@ int Boy::l_GetAge(lua_State* L)
 int Boy::l_GetName(lua_State* L)
 {
 	LUAX_SETUP(L, "U");
-	Boy* self = state.GetLuaUserdata<Boy>(1);
+	Boy* self = state.CheckUserdata<Boy>(1);
 	state.Push(self->mName);
 	return 1;
 }
@@ -138,7 +139,7 @@ int Boy::l_Speak(lua_State* L)
 {
 	LUAX_STATE(L);
 
-	Boy* self = state.GetLuaUserdata<Boy>(1);
+	Boy* self = state.CheckUserdata<Boy>(1);
 	self->PushMemberRef(state, self->mCallbak);
 	state.Call(0, 1);
 	return 1;
@@ -148,51 +149,41 @@ int Boy::l_Write(lua_State* L)
 {
 	LUAX_STATE(L);
 	// self, func
-	Boy* self = state.GetLuaUserdata<Boy>(1);
+	Boy* self = state.CheckUserdata<Boy>(1);
 	self->SetMemberRef(state, self->mCallbak, 2);
 	return 0;
 }
 
 void Boy::RegisterLuaxClass(LuaxState& state)
 {
-	luaL_Reg regTable[] = {
-	// class functions
-	{ "New", l_New },
-	{ "GetGender", l_GetGender },
-	// members
-	{ "GetAge", l_GetAge },
-	{ "GetName", l_GetName },
-	{ "Write", l_Write },
-	{ "Speak", l_Speak },
-	{ 0, 0}
-	};
 
-	state.RegisterMethods(regTable);
+	LUAX_REGISTER_METHODS(state,
+		{ "New", l_New },/*��������*/
+		{ "GetGender", l_GetGender },
+		{ "GetAge", l_GetAge },
+		{ "GetName", l_GetName },
+		{ "Write", l_Write },
+		{ "Speak", l_Speak }
+	);
 
 	// boy����
-	LuaxEnum EHabits[] = {
-		{ "Computer", 1},
-		{ "Buscketball", 2},
-		{ "Baseball", 3},
-		{ "Girls", 4},
-		{0, 0}
-	};
-
-	state.RegisterEnum("EHabits", EHabits);
+	LUAX_REGISTER_ENUM(state, "EHabits",
+		{ "Computer", 1 },
+		{ "Buscketball", 2 },
+		{ "Baseball", 3 },
+		{ "Girls", 4 }
+	);
 }
 
 void Boy::RegisterLuaxPostprocess(LuaxState& state)
 {
 	// boy����
-	LuaxEnum EHabits[] = {
-		{ "Computer", 1},
-		{ "Buscketball", 2},
-		{ "Baseball", 3},
-		{ "Girls", 4},
-		{0, 0}
-	};
-
-	state.RegisterEnum("EHabits", EHabits);
+	LUAX_REGISTER_ENUM(state, "EHabits",
+		{ "Computer", 1 },
+		{ "Buscketball", 2 },
+		{ "Baseball", 3 },
+		{ "Girls", 4 }
+	);
 }
 
 //----------------------------------------------------------------------------------------------------------------