diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-09-10 09:55:17 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-09-10 10:00:57 +0300 |
commit | 3c71deb63229da1bf3e75470499048bdce378966 (patch) | |
tree | ac07a8074ead739f9d04b187682667919cbdff95 /src | |
parent | 9c24462716287ee5b1903dbfb77238fda0af31db (diff) | |
download | ellinika-3c71deb63229da1bf3e75470499048bdce378966.tar.gz ellinika-3c71deb63229da1bf3e75470499048bdce378966.tar.bz2 |
Minor changes
* elisp/ellinika-dict-mode.el: Use deactivate-input-method instead
of deprecated inactivate-input-method.
* elisp/ellinika-mode.el: Likewise.
* src/ellinika/Makefile.am: Fix dependencies.
* src/ellinika/elmorph.c: Minor changes for switch to Guile 2.2
Diffstat (limited to 'src')
-rw-r--r-- | src/ellinika/Makefile.am | 3 | ||||
-rw-r--r-- | src/ellinika/elmorph.c | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/ellinika/Makefile.am b/src/ellinika/Makefile.am index 5f476ef..99a2918 100644 --- a/src/ellinika/Makefile.am +++ b/src/ellinika/Makefile.am @@ -70,12 +70,15 @@ libelmorph_la_SOURCES = \ syllabificator.c DOT_X_FILES = elmorph.x utf8scm.x BUILT_SOURCES = $(DOT_X_FILES) DISTCLEANFILES = $(DOT_X_FILES) +phoneme.h phoneme.c: phoneme.y +elchr.c: phoneme.h + pkglibnames=elmorph install-data-hook: here=`pwd`; \ cd $(DESTDIR)$(pkglibdir);\ for name in $(pkglibnames); do \ diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c index 5094db8..ab5dea4 100644 --- a/src/ellinika/elmorph.c +++ b/src/ellinika/elmorph.c @@ -126,34 +126,34 @@ _elstr_dup(struct elstr *elstr) { struct elstr *elnew; elnew = scm_gc_malloc(sizeof(*elstr), "Elstr"); elnew->str = calloc(elstr->len, sizeof(elnew->str[0])); if (!elnew->str) - scm_memory_error("_elstr_dup"); + scm_report_out_of_memory(); memcpy(elnew->str, elstr->str, sizeof(elstr->str[0]) * elstr->len); elnew->len = elstr->len; if (elstr->phoneme) { elnew->phoneme = calloc(elstr->phoneme_count, sizeof(elnew->phoneme[0])); if (!elnew->phoneme) { free(elnew->str); - scm_memory_error("_elstr_dup"); + scm_report_out_of_memory(); } memcpy(elnew->phoneme, elstr->phoneme, sizeof(elstr->phoneme[0]) * elstr->phoneme_count); } else elnew->phoneme = NULL; elnew->phoneme_count = elstr->phoneme_count; if (elstr->sylmap) { elnew->sylmap = calloc(elstr->nsyl, sizeof(elnew->sylmap[0])); if (!elnew->sylmap) { free(elnew->str); - scm_memory_error("_elstr_dup"); + scm_report_out_of_memory(); } memcpy(elnew->sylmap, elstr->sylmap, sizeof(elstr->sylmap[0]) * elstr->nsyl); } else elnew->sylmap = NULL; elnew->nsyl = elstr->nsyl; @@ -170,21 +170,21 @@ _elstr_concat(struct elstr *dest, struct elstr *src, const char *func_name) if (src->len == 0) return; wp = realloc(dest->str, sizeof(dest->str[0]) * (dest->len + src->len)); if (!wp) - scm_memory_error(func_name); + scm_report_out_of_memory(); dest->str = wp; memcpy(dest->str + dest->len, src->str, sizeof(src->str[0]) * src->len); dest->len += src->len; } -static scm_sizet +static size_t _elstr_free(SCM smob) { struct elstr *elstr = (struct elstr *) SCM_CDR(smob); free(elstr->str); free(elstr->sylmap); free(elstr->phoneme); @@ -786,13 +786,13 @@ _elstr_thema_aoristoy(SCM el, int destructive, const char *func_name) if (scm == el) { scm = _elstr_dup(elstr); elstr = (struct elstr*) SCM_CDR(scm); } } if (elmorph_thema_aoristoy(elstr->str, elstr->len, &wc, &wclen)) - scm_memory_error(func_name); + scm_report_out_of_memory(); free(elstr->str); elstr->str = wc; elstr->len = wclen; return scm; } |