mirror of
git://git.psyc.eu/libpsyc
synced 2024-08-15 03:19:02 +00:00
refactoring - renamed functions
This commit is contained in:
parent
0a95b0a518
commit
260bba0c46
37 changed files with 570 additions and 691 deletions
|
@ -97,19 +97,19 @@ extern (C) MatchVar varTypes[];
|
|||
/**
|
||||
* Get the type of variable name.
|
||||
*/
|
||||
Bool psyc_isRoutingVar (char[]* name);
|
||||
Bool psyc_var_is_routing (char* name, size_t len);
|
||||
|
||||
bool isRoutingVar (char[] name)
|
||||
{
|
||||
return psyc_isRoutingVar(&name);
|
||||
return psyc_var_is_routing(name.ptr, name.length); //FIXME
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the type of variable name.
|
||||
*/
|
||||
Type psyc_getVarType(char *name, size_t len);
|
||||
Type psyc_var_type(char *name, size_t len);
|
||||
|
||||
alias psyc_getVarType getVarType;
|
||||
alias psyc_var_type getVarType;
|
||||
|
||||
/**
|
||||
* Checks if long keyword string inherits from short keyword string.
|
||||
|
|
|
@ -96,7 +96,7 @@ struct Modifier
|
|||
|
||||
size_t length ( )
|
||||
{
|
||||
return psyc_getModifierLength (this);
|
||||
return psyc_modifier_length (this);
|
||||
}
|
||||
|
||||
private ModifierFlag checkLength ( ubyte[] value )
|
||||
|
@ -142,24 +142,24 @@ struct Packet
|
|||
char[] method, ubyte[] data,
|
||||
PacketFlag flag = PacketFlag.CHECK_LENGTH)
|
||||
{
|
||||
return psyc_newPacket (&routing, &entity, cast(ubyte[]*)&method, &data, flag);
|
||||
return psyc_packet_new(&routing, &entity, cast(ubyte[]*)&method, &data, flag); // FIXME
|
||||
}
|
||||
|
||||
static Packet opCall (Modifier[] routing, ubyte[] content,
|
||||
PacketFlag flag = PacketFlag.CHECK_LENGTH)
|
||||
{
|
||||
return psyc_newRawPacket (&routing, &content, flag);
|
||||
return psyc_packet_new_raw(&routing, &content, flag); // FIXME
|
||||
}
|
||||
|
||||
size_t length ( )
|
||||
{
|
||||
psyc_setPacketLength(this);
|
||||
psyc_packet_length_set(this);
|
||||
return this._length;
|
||||
}
|
||||
|
||||
ubyte[] render ( ubyte[] buffer )
|
||||
{
|
||||
psyc_setPacketLength(this);
|
||||
psyc_packet_length_set(this);
|
||||
|
||||
with (RenderRC)
|
||||
switch (psyc_render(this, buffer.ptr, buffer.length))
|
||||
|
@ -189,56 +189,43 @@ struct Packet
|
|||
/**
|
||||
* \internal
|
||||
*/
|
||||
private size_t psyc_getModifierLength (Modifier *m);
|
||||
private size_t psyc_modifier_length (Modifier *m);
|
||||
|
||||
/**
|
||||
* \internal
|
||||
* Check if a list needs length.
|
||||
*/
|
||||
ListFlag psyc_checkListLength (List *list);
|
||||
ListFlag psyc_list_length_check (List *list);
|
||||
|
||||
/**
|
||||
* \internal
|
||||
* Get the total length of a list when rendered.
|
||||
*/
|
||||
ListFlag psyc_getListLength (List *list);
|
||||
ListFlag psyc_list_length (List *list);
|
||||
|
||||
/**
|
||||
* \internal
|
||||
* Check if a packet needs length.
|
||||
*/
|
||||
PacketFlag psyc_checkPacketLength (Packet *p);
|
||||
PacketFlag psyc_packet_length_check (Packet *p);
|
||||
|
||||
/**
|
||||
* Calculate and set the rendered length of packet parts and total packet length.
|
||||
*/
|
||||
private size_t psyc_setPacketLength (Packet *p);
|
||||
private size_t psyc_packet_length_set (Packet *p);
|
||||
|
||||
/** Create new list. */
|
||||
List psyc_newList (String *elems, size_t num_elems, ListFlag flag);
|
||||
List psyc_list_new (String *elems, size_t num_elems, ListFlag flag);
|
||||
|
||||
/** Create new packet. */
|
||||
private Packet psyc_newPacket (Modifier[]* routing,
|
||||
Modifier[]* entity,
|
||||
String *method, String *data,
|
||||
PacketFlag flag);
|
||||
|
||||
|
||||
|
||||
|
||||
/** Create new packet. */
|
||||
Packet psyc_newPacket2 (Modifier *routing, size_t routinglen,
|
||||
Packet psyc_packet_new (Modifier *routing, size_t routinglen,
|
||||
Modifier *entity, size_t entitylen,
|
||||
char *method, size_t methodlen,
|
||||
char *data, size_t datalen,
|
||||
PacketFlag flag);
|
||||
|
||||
/** Create new packet with raw content. */
|
||||
Packet psyc_newRawPacket (Modifier[] *routing, ubyte[] *content,
|
||||
PacketFlag flag);
|
||||
|
||||
/** Create new packet with raw content. */
|
||||
Packet psyc_newRawPacket2 (Modifier *routing, size_t routinglen,
|
||||
char *content, size_t contentlen,
|
||||
PacketFlag flag);
|
||||
Packet psyc_packet_new_raw (Modifier *routing, size_t routinglen,
|
||||
char *content, size_t contentlen,
|
||||
PacketFlag flag);
|
||||
|
||||
|
|
|
@ -316,6 +316,6 @@ ParseRC psyc_parse(ParseState* state, char* oper, String* name, String* value);
|
|||
/**
|
||||
* List value parser.
|
||||
*/
|
||||
ParseListRC psyc_parseList(ParseListState* state, String *name, String* value, String* elem);
|
||||
ParseListRC psyc_parse_list(ParseListState* state, String *name, String* value, String* elem);
|
||||
|
||||
/** @} */ // end of parsing group
|
||||
|
|
|
@ -25,7 +25,7 @@ enum RenderRC
|
|||
} ;
|
||||
|
||||
/**
|
||||
* Return codes for psyc_renderList.
|
||||
* Return codes for psyc_render_list.
|
||||
*/
|
||||
enum RenderListRC
|
||||
{
|
||||
|
@ -41,20 +41,18 @@ enum RenderListRC
|
|||
* The packet structure should contain the packet parts, either routing, entity,
|
||||
* method & data, or routing & content when rendering raw content.
|
||||
* It should also contain the contentLength & total length of the packet,
|
||||
* you can use psyc_setPacketLength() for calculating & setting these values.
|
||||
* you can use psyc_packet_length_set() for calculating & setting these values.
|
||||
* This function renders packet->length bytes to the buffer,
|
||||
* if buflen is less than that an error is returned.
|
||||
*
|
||||
* @see psyc_newPacket
|
||||
* @see psyc_newPacket2
|
||||
* @see psyc_newRawPacket
|
||||
* @see psyc_newRawPacket2
|
||||
* @see psyc_setPacketLength
|
||||
* @see psyc_packet_new
|
||||
* @see psyc_packet_new_raw
|
||||
* @see psyc_packet_length_set
|
||||
*/
|
||||
RenderRC psyc_render (Packet *packet, ubyte *buffer, size_t buflen);
|
||||
|
||||
/**
|
||||
* Render a PSYC list into a buffer.
|
||||
*/
|
||||
RenderListRC psyc_renderList (List *list, ubyte *buffer, size_t buflen);
|
||||
RenderListRC psyc_render_list (List *list, ubyte *buffer, size_t buflen);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue