1 files changed, 102 insertions, 115 deletions

diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c
index 5785f8d..f55e010 100644
--- a/src/ellinika/elmorph.c
+++ b/src/ellinika/elmorph.c
@@ -101,11 +101,14 @@ _elstr_alloc(const char *instr, int syl)
         elstr = scm_gc_malloc(sizeof(*elstr), "Elstr");
         elstr->str = wptr;
         elstr->len = wlen;
         elstr->sylmap = NULL;
+        elstr->nsyl = 0;
+        elstr->acc_syl = 0;
+        elstr->acc_pos = 0;
         if (syl)
                 _elstr_syllabize(elstr);
-        
+                
         SCM_RETURN_NEWSMOB(_elstr_tag, elstr);
 }
 
 static SCM
@@ -139,8 +142,10 @@ static void
 _elstr_concat(struct elstr *dest, struct elstr *src, const char *func_name)
 {
         unsigned *wp;
 
+        if (src->len == 0)
+                return;
         wp = realloc(dest->str,
                      sizeof(dest->str[0]) * (dest->len + src->len));
         if (!wp)
                 scm_memory_error(func_name);
@@ -218,8 +223,37 @@ _elstr_init()
 }
 
 #define scm_is_elstr(s) (!SCM_IMP(s) && SCM_CELL_TYPE(s) == _elstr_tag)
 
+static SCM
+force_elstr(struct elstr **ep, SCM scm, int sylopt,
+            int arg, const char *func_name)
+{
+        struct elstr *elstr;
+        
+        if (scm_is_elstr(scm)) {
+                elstr = (struct elstr*) SCM_CDR(scm);
+        } else {
+                SCM newscm;
+                char *str;
+                
+                SCM_ASSERT(scm_is_string(scm), scm, arg, func_name);
+                str = scm_to_locale_string(scm);
+                newscm = _elstr_alloc(str, sylopt);
+                free(str);
+                if (newscm == SCM_EOL)
+                        scm_misc_error(func_name,
+                                       "Invalid input string: ~S",
+                                       scm_list_1(scm));
+                scm = newscm;
+                elstr = (struct elstr*) SCM_CDR(newscm);
+        }
+        if (ep)
+                *ep = elstr;
+        return scm;
+}
+
+
 SCM_DEFINE_PUBLIC(scm_elstr_p, "elstr?", 1, 0, 0,
                   (SCM string),
 "Return true if STRING is an elstr\n")
 #define FUNC_NAME s_scm_elstr_p
@@ -236,16 +270,9 @@ SCM_DEFINE_PUBLIC(scm_string__elstr, "string->elstr", 1, 0, 0,
         char *str;
         SCM scm;
         
         SCM_ASSERT(scm_is_string(string), string, SCM_ARG1, FUNC_NAME);
-        str = scm_to_locale_string(string);
-        scm = _elstr_alloc(str, 1);
-        free(str);
-        if (scm == SCM_EOL)
-                scm_misc_error(FUNC_NAME,
-                               "Invalid input string: ~S",
-                               scm_list_1(string));
-        return scm;
+        return force_elstr(NULL, string, 1, SCM_ARG1, FUNC_NAME);
 }
 #undef FUNC_NAME
 
 SCM_DEFINE_PUBLIC(scm_elstr__string, "elstr->string", 1, 0, 0,
@@ -274,11 +301,9 @@ SCM_DEFINE_PUBLIC(scm_elstr_length, "elstr-length", 1, 0, 0,
 "Returns the number of characters in EL\n")
 #define FUNC_NAME s_scm_elstr_length
 {
         struct elstr *elstr;
-
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, FUNC_NAME);
-        elstr = (struct elstr*) SCM_CDR(el);
+        force_elstr(&elstr, el, 0, SCM_ARG1, FUNC_NAME);
         return scm_from_uint(elstr->len);
 }
 #undef FUNC_NAME
 
@@ -288,11 +313,9 @@ SCM_DEFINE_PUBLIC(scm_elstr_number_of_syllables, "elstr-number-of-syllables",
 "Returns the number of characters in EL\n")
 #define FUNC_NAME s_scm_elstr_number_of_syllables
 {
         struct elstr *elstr;
-
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, FUNC_NAME);
-        elstr = (struct elstr*) SCM_CDR(el);
+        force_elstr(&elstr, el, 1, SCM_ARG1, FUNC_NAME);
         return scm_from_uint(elstr->nsyl);
 }
 #undef FUNC_NAME
 
@@ -304,10 +327,9 @@ SCM_DEFINE_PUBLIC(scm_elstr_syllable_prop, "elstr-syllable-prop",
 {
         struct elstr *elstr;
         unsigned num, start;
         
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, FUNC_NAME);
-        elstr = (struct elstr*) SCM_CDR(el);
+        force_elstr(&elstr, el, 1, SCM_ARG1, FUNC_NAME);
         SCM_ASSERT(scm_is_integer(n), n, SCM_ARG2, FUNC_NAME);
         num = scm_to_uint(n);
         if (num > elstr->nsyl)
                 scm_misc_error(FUNC_NAME,
@@ -329,11 +351,9 @@ SCM_DEFINE_PUBLIC(scm_elstr_accent_position, "elstr-accent-position", 1, 0, 0,
 "Return position of the accented character in EL\n")
 #define FUNC_NAME s_scm_elstr_accent_position
 {
         struct elstr *elstr;
-
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, FUNC_NAME);
-        elstr = (struct elstr*) SCM_CDR(el);
+        force_elstr(&elstr, el, 0, SCM_ARG1, FUNC_NAME);
         return scm_from_uint(elstr->acc_pos);
 }
 #undef FUNC_NAME
 
@@ -343,11 +363,9 @@ SCM_DEFINE_PUBLIC(scm_elstr_accented_syllable, "elstr-accented-syllable",
 "Return position of the accented syllable in EL\n")
 #define FUNC_NAME s_scm_elstr_accented_syllable
 {
         struct elstr *elstr;
-
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, FUNC_NAME);
-        elstr = (struct elstr*) SCM_CDR(el);
+        force_elstr(&elstr, el, 1, SCM_ARG1, FUNC_NAME);
         return scm_from_uint(elstr->acc_syl);
 }
 #undef FUNC_NAME
 
@@ -361,10 +379,9 @@ SCM_DEFINE_PUBLIC(scm_elstr_syllable, "elstr-syllable",
         char *s;
         SCM scm;
         unsigned num, start;
         
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, FUNC_NAME);
-        elstr = (struct elstr*) SCM_CDR(el);
+        force_elstr(&elstr, el, 1, SCM_ARG1, FUNC_NAME);
         SCM_ASSERT(scm_is_integer(n), n, SCM_ARG2, FUNC_NAME);
         num = scm_to_uint(n);
         if (num > elstr->nsyl)
                 scm_misc_error(FUNC_NAME,
@@ -397,10 +414,9 @@ SCM_DEFINE_PUBLIC(scm_elstr_character, "elstr-character",
         unsigned num;
         char r[6];
         int len;
         
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, FUNC_NAME);
-        elstr = (struct elstr*) SCM_CDR(el);
+        force_elstr(&elstr, el, 0, SCM_ARG1, FUNC_NAME);
         SCM_ASSERT(scm_is_integer(n), n, SCM_ARG2, FUNC_NAME);
         num = scm_to_uint(n);
         if (num >= elstr->len)
                 scm_misc_error(FUNC_NAME,
@@ -422,15 +438,18 @@ _elstr_chgcase(SCM el, void (*chgfun)(unsigned *, size_t),
 {
         struct elstr *elstr;
         SCM scm;
         
-        SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, func_name);
-        elstr = (struct elstr*) SCM_CDR(el);
-        if (destructive)
+        if (destructive) {
+                SCM_ASSERT(scm_is_elstr(el), el, SCM_ARG1, func_name);
+                elstr = (struct elstr*) SCM_CDR(el);
                 scm = SCM_UNSPECIFIED;
-        else {
-                scm = _elstr_dup(elstr);
-                elstr = (struct elstr*) SCM_CDR(scm);
+        } else {
+                scm = force_elstr(&elstr, el, 1, SCM_ARG1, func_name);
+                if (scm == el) {
+