1 files changed, 112 insertions, 29 deletions

diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c
index 6ff5f01..75e42f9 100644
--- a/src/ellinika/elmorph.c
+++ b/src/ellinika/elmorph.c
@@ -48,7 +48,7 @@ _elstr_syllabize(struct elstr *elstr)
                 elstr->sylmap = scm_gc_malloc(sizeof(sylmap[0])*elstr->len,
                                               "syllable map");
         sylmap = elstr->sylmap;
-        
+
         for (i = 0; i < elstr->len; i++) {
                 int nstate;
                 
@@ -75,7 +75,18 @@ _elstr_syllabize(struct elstr *elstr)
 }
 
 static SCM
-_elstr_alloc(const char *instr)
+_elstr_alloc_empty(struct elstr **pelstr)
+{
+        struct elstr *elstr;
+
+        elstr = scm_gc_malloc(sizeof(*elstr), "Elstr");
+        memset(elstr, 0, sizeof(*elstr));
+        *pelstr = elstr;
+        SCM_RETURN_NEWSMOB(_elstr_tag, elstr);
+}
+
+static SCM
+_elstr_alloc(const char *instr, int syl)
 {
         struct elstr *elstr;
         unsigned *wptr;
@@ -88,7 +99,8 @@ _elstr_alloc(const char *instr)
         elstr->str = wptr;
         elstr->len = wlen;
         elstr->sylmap = NULL;
-        _elstr_syllabize(elstr);
+        if (syl)
+                _elstr_syllabize(elstr);
         
         SCM_RETURN_NEWSMOB(_elstr_tag, elstr);
 }
@@ -116,7 +128,23 @@ _elstr_dup(struct elstr *elstr)
         elnew->acc_pos = elstr->acc_pos;
         SCM_RETURN_NEWSMOB(_elstr_tag, elnew);
 }
-        
+
+static void
+_elstr_concat(struct elstr *dest, struct elstr *src, const char *func_name)
+{
+        unsigned *wp;
+
+        wp = realloc(dest->str,
+                     sizeof(dest->str[0]) * (dest->len + src->len));
+        if (!wp)
+                scm_memory_error(func_name);
+        dest->str = wp;
+        memcpy(dest->str + dest->len,
+               src->str,
+               sizeof(src->str[0]) * src->len);
+        dest->len += src->len;
+}
+
 static scm_sizet
 _elstr_free(SCM smob)
 {
@@ -134,29 +162,43 @@ _elstr_print(SCM smob, SCM port, scm_print_state *pstate)
         int i, j, an;
         char *s;
         
-        scm_puts("#<elstr ``", port);
-        an = elstr->nsyl - elstr->acc_syl;
-        if (an == 0)
-                scm_puts("[", port);
-        for (i = j = 0; i < elstr->len; i++) {
-                char r[6];
-                int n;
-
-                if (i == elstr->sylmap[j] + 1) {
-                        if (j == an)
-                                scm_puts("]", port);
-                        scm_puts("-", port);
-                        if (++j == an)
-                                scm_puts("[", port);
+        scm_puts("#<elstr ", port);
+        if (elstr->sylmap) {
+                scm_puts("``", port);
+                an = elstr->nsyl - elstr->acc_syl;
+                if (an == 0)
+                        scm_puts("[", port);
+                for (i = j = 0; i < elstr->len; i++) {
+                        char r[6];
+                        int n;
+                        
+                        if (i == elstr->sylmap[j] + 1) {
+                                if (j == an)
+                                        scm_puts("]", port);
+                                scm_puts("-", port);
+                                if (++j == an)
+                                        scm_puts("[", port);
+                        }
+                        n = utf8_wctomb(r, elstr->str[i]);
+                        if (n == -1)
+                                continue;
+                        r[n] = 0;
+                        scm_puts(r, port);
+                }
+                if (j == an)
+                        scm_puts("]", port);
+        } else {
+                scm_puts("[NS] ``", port);
+                for (i = j = 0; i < elstr->len; i++) {
+                        char r[6];
+                        int n;
+                        n = utf8_wctomb(r, elstr->str[i]);
+                        if (n == -1)
+                                continue;
+                        r[n] = 0;
+                        scm_puts(r, port);
                 }
-                n = utf8_wctomb(r, elstr->str[i]);
-                if (n == -1)
-                        continue;
-                r[n] = 0;
-                scm_puts(r, port);
         }
-        if (j == an)
-                scm_puts("]", port);
         scm_puts("''>", port);
         return 1;
 }
@@ -169,6 +211,17 @@ _elstr_init()
     scm_set_smob_print(_elstr_tag, _elstr_print);
 }
 
+#define scm_is_elstr(s) (!SCM_IMP(s) && SCM_CELL_TYPE(s) == _elstr_tag)
+
+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
+{
+        return scm_is_elstr(string) ? SCM_BOOL_T : SCM_BOOL_F;
+}
+#undef FUNC_NAME
+
 SCM_DEFINE_PUBLIC(scm_string__elstr, "string->elstr", 1, 0, 0,
                   (SCM string),
 "Create new ELSTR from STRING\n")
@@ -179,7 +232,7 @@ SCM_DEFINE_PUBLIC(scm_string__elstr, "string->elstr", 1, 0, 0,
         
         SCM_ASSERT(scm_is_string(string), string, SCM_ARG1, FUNC_NAME);
         str = scm_to_locale_string(string);
-        scm = _elstr_alloc(str);
+        scm = _elstr_alloc(str, 1);
         free(str);
         if (scm == SCM_EOL)
                 scm_misc_error(FUNC_NAME,
@@ -189,8 +242,6 @@ SCM_DEFINE_PUBLIC(scm_string__elstr, "string->elstr", 1, 0, 0,
 }
 #undef FUNC_NAME
 
-#define scm_is_elstr(s) (!SCM_IMP(s) && SCM_CELL_TYPE(s) == _elstr_tag)
-
 SCM_DEFINE_PUBLIC(scm_elstr__string, "elstr->string", 1, 0, 0,
                   (SCM el),
 "Convert EL to a STRING\n")
@@ -475,7 +526,7 @@ _elstr_set_accent(SCM el, SCM n, int destructive, const char *func_name)
         num = scm_to_uint(n);
         if (num > elstr->nsyl)
                 scm_misc_error(func_name,
-                               "cannot get syllable #~S: not enough syllables: ~S",
+                               "cannot set accent on syllable #~S: not enough syllables: ~S",
                                scm_list_2(el, n));
         acc_num = elstr->nsyl - num;
         if (acc_num == 0)
@@ -754,6 +805,38 @@ SCM_DEFINE_PUBLIC(scm_elstr_index, "elstr-index",
         return SCM_BOOL_F;
 }
 #undef FUNC_NAME
+
+SCM_DEFINE_PUBLIC(scm_elstr_append, "elstr-append",
+                  0, 0, 1,
+                  (SCM rest),
+"")
+#define FUNC_NAME s_scm_elstr_append
+{
+        SCM ret = _elstr_alloc("", 0);
+        struct elstr *elstr = (struct elstr*) SCM_CDR(ret);
+
+        for (; !scm_is_null(rest); rest = SCM_CDR(rest)) {
+                SCM val = SCM_CAR(rest);
+                if (scm_is_elstr(val)) {
+                        struct elstr *elt = (struct elstr*) SCM_CDR(val);
+                        _elstr_concat(elstr, elt, FUNC_NAME);
+                } else if (scm_is_string(val)) {
+                        char *s = scm_to_locale_string(val);
+                        if (s[0]) {
+                                SCM tmp = _elstr_alloc(s, 0);
+                                free(s);
+                                _elstr_concat(elstr,
+                                              (struct elstr*) SCM_CDR(tmp),
+                                              FUNC_NAME);
+                        } else
+                                free(s);
+                } else
+                        scm_wrong_type_arg(FUNC_NAME, SCM_ARGn, rest);
+        }
+        _elstr_syllabize(elstr);
+        return ret;
+}
+#undef FUNC_NAME