vlastavesely/sanskrit-iast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

transliteration: use double pointers on syllable chain

Browse source
This commit is contained in:
Vlasta Vesely 2018-06-03 15:59:16 +02:00
parent f2d74710d6
commit 9093211ae3
3 changed files with 21 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
syllable.c
View file

@ -3,17 +3,18 @@
#include <stdlib.h>
#include <string.h>
#include "syllable.h"
#include "utf8.h"
struct syllable *syllable_alloc(const char *data)
struct syllable *syllable_alloc(const char *data, unsigned int code)
{
struct syllable *ptr = malloc(sizeof(*ptr));
if (ptr == NULL)
goto out;
ptr->data = strdup(data);
ptr->code = 0;
ptr->data = data != NULL ? strdup(data) : utf8_code_to_string(code);
ptr->code = code;
ptr->prev = NULL;
ptr->next = NULL;
@ -30,17 +31,6 @@ void syllable_drop(struct syllable *ptr)
free(ptr);
}
struct syllable *syllable_append(struct syllable *tail, const char *data)
{
struct syllable *ptr;
ptr = syllable_alloc(data);
ptr->prev = tail;
tail->next = ptr;
return ptr;
}
unsigned int syllable_chain_length(struct syllable *head)
{
struct syllable *walk = head;

4
syllable.h
View file

@ -10,11 +10,9 @@ struct syllable {
struct syllable *next;
};
struct syllable *syllable_alloc();
struct syllable *syllable_alloc(const char *data, unsigned int code);
void syllable_drop(struct syllable *syllable);
struct syllable *syllable_append(struct syllable *tail, const char *data);
unsigned int syllable_chain_length(struct syllable *head);
char *syllable_chain_to_string(struct syllable *head);
void syllable_chain_drop(struct syllable *head);

40
transliteration.c
View file

@ -28,6 +28,9 @@ static void syllable_modify(struct syllable *syllable, const char *data)
{
char buffer[10];
if (syllable == NULL)
return;
strcpy(buffer, syllable->data);
buffer[strlen(buffer) - 1] = 0;
strcat(buffer, data);
@ -47,46 +50,35 @@ static void apply_transliteration_filters(struct syllable *head,
}
}
char *transliterate_devanagari_to_latin(const char *text,
char *transliterate_devanagari_to_latin(const char *devanagari,
const struct transliteration_context *context)
{
unsigned int length = strlen(text);
const char *ptr = text;
const char *end = ptr + length;
char *tmp;
unsigned int code;
struct syllable *head, *tail;
struct syllable *head = NULL, *tail = NULL, **indirect = &head;
const struct transliteration_letter *letter;
head = syllable_alloc("");
tail = head;
const char *ptr = devanagari;
const char *end = ptr + strlen(devanagari);
unsigned int code;
char *retval;
while (ptr < end) {
code = utf8_unpack_char(ptr);
ptr += utf8_char_length(code);
letter = find_letter_by_code(code, context->table);
if (letter != NULL) {
if (letter->flags & FLAG_REGULAR) {
tail = syllable_append(tail, letter->data);
tail->code = code;
} else if (letter->flags & FLAG_MODIFIER) {
syllable_modify(tail, letter->data);
}
if (letter && letter->flags & FLAG_MODIFIER) {
syllable_modify(tail, letter->data);
continue;
}
tmp = utf8_code_to_string(code);
tail = syllable_append(tail, tmp);
free(tmp);
*indirect = syllable_alloc(letter ? letter->data : NULL, code);
tail = *indirect;
indirect = &(*indirect)->next;
}
apply_transliteration_filters(head, context->filters);
tmp = syllable_chain_to_string(head);
retval = syllable_chain_to_string(head);
syllable_chain_drop(head);
return tmp;
return retval;
}