--- a/lm_message_node.c Mon Feb 23 19:19:13 2009 +0200
+++ b/lm_message_node.c Sun Mar 08 00:48:19 2009 +0200
@@ -14,17 +14,17 @@
/// Blesses given pointer to lm message node object.
/// A: lightuserdata (C lm message node object)
/// R: lm message node object
-static int llm_message_node_bless_lua (lua_State *L)
+static int bless_lua_lm_node (lua_State *L)
{
luaL_argcheck (L, lua_islightuserdata (L, 1), 1, "loudmouth message node lightuserdata expected");
- llm_message_node_bless (L, lua_touserdata (L, 1));
+ bless_lm_node (L, lua_touserdata (L, 1));
return 1;
}
/// message_node:name
/// Gets a name of message node.
/// R: string
-int llm_message_node_name (lua_State *L)
+int name_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
lua_pushstring (L, node->name);
@@ -34,12 +34,12 @@
/// message_node:next
/// Gets next message node.
/// R: lm message node object or nil
-int llm_message_node_next (lua_State *L)
+int next_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
LmMessageNode *next = node->next;
if (next)
- llm_message_node_bless (L, next);
+ bless_lm_node (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
-int llm_message_node_prev (lua_State *L)
+int prev_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
LmMessageNode *prev = node->prev;
if (prev)
- llm_message_node_bless (L, prev);
+ bless_lm_node (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
-int llm_message_node_children (lua_State *L)
+int children_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
LmMessageNode *child = node->children;
if (child)
- llm_message_node_bless (L, child);
+ bless_lm_node (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
-int llm_message_node_parent (lua_State *L)
+int parent_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
LmMessageNode *parent = node->parent;
if (parent)
- llm_message_node_bless (L, parent);
+ bless_lm_node (L, parent);
else
lua_pushnil (L);
return 1;
@@ -91,7 +91,7 @@
/// Gets or sets a value of message node.
/// A: string (optional value)
/// R: string (if called without arguments) or lm message node object
-int llm_message_node_value (lua_State *L)
+int value_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
if (lua_gettop (L) > 1) { // Set
@@ -107,7 +107,7 @@
/// Gets or creates child node object with given name.
/// A: string (name), string (optional value)
/// R: lm message node object or nil
-int llm_message_node_child (lua_State *L)
+int child_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
const char *name = luaL_checkstring (L, 2);
@@ -123,7 +123,7 @@
return 1;
}
}
- llm_message_node_bless (L, child);
+ bless_lm_node (L, child);
// XXX lm_message_node_unref (child);
return 1;
}
@@ -132,7 +132,7 @@
/// Searches for node with a given name over all node subtree.
/// A: string (name)
/// R: lm message node object or nil
-int llm_message_node_find_child (lua_State *L)
+int find_child_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
const char *name = luaL_checkstring (L, 2);
@@ -142,7 +142,7 @@
if (!child)
lua_pushnil (L);
else {
- llm_message_node_bless (L, child);
+ bless_lm_node (L, child);
// XXX lm_message_node_unref (child);
}
return 1;
@@ -153,7 +153,7 @@
/// When set, value of node will not be escaped.
/// A: boolean (optional)
/// V: boolean (if called with no apguments) or lm message node object
-int llm_message_node_raw (lua_State *L)
+int raw_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
if (lua_gettop (L) > 1) { // Set
@@ -169,7 +169,7 @@
/// 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
-int llm_message_node_attribute (lua_State *L)
+int attribute_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
const char *name = luaL_checkstring (L, 2);
@@ -184,7 +184,7 @@
/// message_node:xml
/// Returns node representation in xml.
/// R: string
-int llm_message_node_xml (lua_State *L)
+int xml_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
lua_pushstring (L, lm_message_node_to_string (node));
@@ -196,7 +196,7 @@
/// If any element in a path cannot be found, it returns nil.
/// A: string (node name), ...
/// R: lm message node object or nil
-int llm_message_node_path (lua_State *L)
+int path_lm_node (lua_State *L)
{
LmMessageNode *node = luaL_checkLmMessageNode (L, 1);
int i = 1;
@@ -207,7 +207,7 @@
return 1;
}
}
- llm_message_node_bless (L, node);
+ bless_lm_node (L, node);
// XXX lm_message_node_unref (child);
return 1;
}
@@ -215,41 +215,41 @@
/// message_node:pointer
/// Returns pointer to underlying C structure.
/// R: lightuserdata
-static int llm_message_node_pointer (lua_State *L)
+static int pointer_lm_node (lua_State *L)
{
- llm_message_node_t *object = luaL_checklm_message_node (L, 1);
- lua_pushlightuserdata (L, object->message_node);
+ llm_node_t *object = luaL_checklm_node (L, 1);
+ lua_pushlightuserdata (L, object->node);
return 1;
}
-static int llm_message_node_gc (lua_State *L)
+static int gc_lm_node (lua_State *L)
{
- llm_message_node_t *object = luaL_checklm_message_node (L, 1);
+ llm_node_t *object = luaL_checklm_node (L, 1);
D ("Message node %X gc called", (int) object);
- lm_message_node_unref (object->message_node);
+ lm_message_node_unref (object->node);
return 0;
}
-static const luaL_Reg llm_message_node_reg_f[] = {
- { "bless", llm_message_node_bless_lua },
+static const luaL_Reg reg_f_lm_node[] = {
+ { "bless", bless_lua_lm_node },
{ NULL, NULL },
};
-static const luaL_Reg llm_message_node_reg_m[] = {
- { "name", llm_message_node_name },
- { "next", llm_message_node_next },
- { "prev", llm_message_node_prev },
- { "children", llm_message_node_children },
- { "parent", llm_message_node_parent },
- { "value", llm_message_node_value },
- { "child", llm_message_node_child },
- { "find_child", llm_message_node_find_child },
- { "attribute", llm_message_node_attribute },
- { "raw", llm_message_node_raw },
- { "xml", llm_message_node_xml },
- { "path", llm_message_node_path },
- { "pointer", llm_message_node_pointer },
- { "__gc", llm_message_node_gc },
+static const luaL_Reg reg_m_lm_node[] = {
+ { "name", name_lm_node },
+ { "next", next_lm_node },
+ { "prev", prev_lm_node },
+ { "children", children_lm_node },
+ { "parent", parent_lm_node },
+ { "value", value_lm_node },
+ { "child", child_lm_node },
+ { "find_child", find_child_lm_node },
+ { "attribute", attribute_lm_node },
+ { "raw", raw_lm_node },
+ { "xml", xml_lm_node },
+ { "path", path_lm_node },
+ { "pointer", pointer_lm_node },
+ { "__gc", gc_lm_node },
{ NULL, NULL },
};
@@ -259,9 +259,9 @@
lua_pushstring (L, "__index");
lua_pushvalue (L, -2);
lua_settable (L, -3);
- luaL_register (L, NULL, llm_message_node_reg_m);
+ luaL_register (L, NULL, reg_m_lm_node);
lua_pop (L, 1);
- luaL_register (L, "lm.message_node", llm_message_node_reg_f);
+ luaL_register (L, "lm.message_node", reg_f_lm_node);
return 1;
}