bugfix: use pbc_enum_id

cloudwu · May 22, 2015 · f72e8a5 · f72e8a5
1 parent f89bd87
commit f72e8a5
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/binding/lua53/pbc-lua53.c b/binding/lua53/pbc-lua53.c
@@ -56,21 +56,15 @@ _env_register(lua_State *L) {
 
 static int
 _env_enum_id(lua_State *L) {
-    struct pbc_env * env = (struct pbc_env *)checkuserdata(L,1);
-    size_t sz = 0;
-    const char* enum_type = luaL_checklstring(L, 2, &sz);
-    struct _enum *enum_map = (struct _enum *)_pbcM_sp_query(env->enums, enum_type);
-    if(!enum_map) {
-        return 0;
-    }
-    const char* enum_name = luaL_checklstring(L, 3, &sz);
-    int32_t enum_id = 0;
-    int err = _pbcM_si_query(enum_map->name, enum_name, &enum_id);
-    if(err) {
-        return 0;
-    }
-    lua_pushinteger(L, enum_id);
-    return 1;
+	struct pbc_env * env = (struct pbc_env *)checkuserdata(L,1);
+	size_t sz = 0;
+	const char* enum_type = luaL_checklstring(L, 2, &sz);
+	const char* enum_name = luaL_checklstring(L, 3, &sz);
+	int32_t enum_id = pbc_enum_id(env, enum_type, enum_name);
+	if (enum_id < 0)
+		return 0;
+	lua_pushinteger(L, enum_id);
+	return 1;
 }
 
 static int