diff -r 90073cbb535d -r 5db1448eb857 lm_message_node.c --- a/lm_message_node.c Fri Feb 20 23:07:43 2009 +0200 +++ b/lm_message_node.c Sat Feb 21 12:43:51 2009 +0200 @@ -24,22 +24,22 @@ /// message_node:name /// Gets a name of message node. /// R: string -static int llm_message_node_name (lua_State *L) +int llm_message_node_name (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); - lua_pushstring (L, object->message_node->name); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); + lua_pushstring (L, node->name); return 1; } /// message_node:next /// Gets next message node. /// R: lm message node object or nil -static int llm_message_node_next (lua_State *L) +int llm_message_node_next (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); - LmMessageNode *node = object->message_node->next; - if (node) - llm_message_node_bless (L, node); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); + LmMessageNode *next = node->next; + if (next) + llm_message_node_bless (L, next); else lua_pushnil (L); return 1; @@ -48,12 +48,12 @@ /// message_node:prev /// Gets previous message node. /// R: lm message node object or nil -static int llm_message_node_prev (lua_State *L) +int llm_message_node_prev (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); - LmMessageNode *node = object->message_node->prev; - if (node) - llm_message_node_bless (L, node); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); + LmMessageNode *prev = node->prev; + if (prev) + llm_message_node_bless (L, prev); else lua_pushnil (L); return 1; @@ -62,12 +62,12 @@ /// message_node:children /// Gets first child node (raw access used). /// R: lm message node object or nil -static int llm_message_node_children (lua_State *L) +int llm_message_node_children (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); - LmMessageNode *node = object->message_node->children; - if (node) - llm_message_node_bless (L, node); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); + LmMessageNode *child = node->children; + if (child) + llm_message_node_bless (L, child); else lua_pushnil (L); return 1; @@ -76,12 +76,12 @@ /// message_node:parent /// Gets parent message node. /// R: lm message node object or nil -static int llm_message_node_parent (lua_State *L) +int llm_message_node_parent (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); - LmMessageNode *node = object->message_node->parent; - if (node) - llm_message_node_bless (L, node); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); + LmMessageNode *parent = node->parent; + if (parent) + llm_message_node_bless (L, parent); else lua_pushnil (L); return 1; @@ -91,15 +91,15 @@ /// Gets or sets a value of message node. /// A: string (optional value) /// R: string (if called without arguments) or lm message node object -static int llm_message_node_value (lua_State *L) +int llm_message_node_value (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); if (lua_gettop (L) > 1) { // Set const char *value = luaL_checkstring (L, 2); - lm_message_node_set_value (object->message_node, value); + lm_message_node_set_value (node, value); lua_pop (L, 1); } else // Get - lua_pushstring (L, lm_message_node_get_value (object->message_node)); + lua_pushstring (L, lm_message_node_get_value (node)); return 1; } @@ -107,17 +107,17 @@ /// Gets or creates child node object with given name. /// A: string (name), string (optional value) /// R: lm message node object or nil -static int llm_message_node_child (lua_State *L) +int llm_message_node_child (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); const char *name = luaL_checkstring (L, 2); LmMessageNode *child; if (lua_gettop (L) > 2) // Add - child = lm_message_node_add_child (object->message_node, name, + child = lm_message_node_add_child (node, name, luaL_checkstring (L, 3)); else { // Get - child = lm_message_node_get_child (object->message_node, name); + child = lm_message_node_get_child (node, name); if (!child) { lua_pushnil (L); return 1; @@ -132,13 +132,13 @@ /// Searches for node with a given name over all node subtree. /// A: string (name) /// R: lm message node object or nil -static int llm_message_node_find_child (lua_State *L) +int llm_message_node_find_child (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); const char *name = luaL_checkstring (L, 2); LmMessageNode *child; - child = lm_message_node_get_child (object->message_node, name); + child = lm_message_node_get_child (node, name); if (!child) lua_pushnil (L); else { @@ -153,15 +153,15 @@ /// When set, value of node will not be escaped. /// A: boolean (optional) /// V: boolean (if called with no apguments) or lm message node object -static int llm_message_node_raw (lua_State *L) +int llm_message_node_raw (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); if (lua_gettop (L) > 1) { // Set luaL_checktype (L, 2, LUA_TBOOLEAN); - lm_message_node_set_raw_mode (object->message_node, lua_toboolean (L, 2)); + lm_message_node_set_raw_mode (node, lua_toboolean (L, 2)); lua_pop (L, 1); } else // Get - lua_pushboolean (L, lm_message_node_get_raw_mode (object->message_node)); + lua_pushboolean (L, lm_message_node_get_raw_mode (node)); return 1; } @@ -169,25 +169,25 @@ /// Gets or sets value of node attribute with a given name. /// A: string (name), string (optional value) /// R: string (when called with one aprgument) or lm message node object -static int llm_message_node_attribute (lua_State *L) +int llm_message_node_attribute (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); const char *name = luaL_checkstring (L, 2); if (lua_gettop (L) > 2) { // Set - lm_message_node_set_attribute (object->message_node, name, luaL_checkstring (L, 3)); + lm_message_node_set_attribute (node, name, luaL_checkstring (L, 3)); lua_pop (L, 2); } else // Get - lua_pushstring (L, lm_message_node_get_attribute (object->message_node, name)); + lua_pushstring (L, lm_message_node_get_attribute (node, name)); return 1; } /// message_node:xml /// Returns node representation in xml. /// R: string -static int llm_message_node_xml (lua_State *L) +int llm_message_node_xml (lua_State *L) { - llm_message_node_t *object = luaL_checklm_message_node (L, 1); - lua_pushstring (L, lm_message_node_to_string (object->message_node)); + LmMessageNode *node = luaL_checkLmMessageNode (L, 1); + lua_pushstring (L, lm_message_node_to_string (node)); return 1; }