diff options
-rw-r--r-- | elisp/ellinika-dict-mode.el | 4 | ||||
-rw-r--r-- | elisp/ellinika-mode.el | 2 | ||||
-rw-r--r-- | src/ellinika/Makefile.am | 3 | ||||
-rw-r--r-- | src/ellinika/elmorph.c | 12 |
4 files changed, 12 insertions, 9 deletions
diff --git a/elisp/ellinika-dict-mode.el b/elisp/ellinika-dict-mode.el index e075ea7..bfe00f5 100644 --- a/elisp/ellinika-dict-mode.el +++ b/elisp/ellinika-dict-mode.el @@ -54,19 +54,19 @@ 'initial))) (defun ellinika-dict-select-input-method nil (let ((syntax (ellinika-dict-guess-syntax))) (cond ((eq syntax 'ascii-input) - (inactivate-input-method)) + (deactivate-input-method)) ((eq syntax 'alternative-input) (alt-input nil)) ((eq syntax 'greek-input) (greek-input nil)) ((or (eq syntax 'node) (eq syntax 'initial)) - (inactivate-input-method))))) + (deactivate-input-method))))) (defun ellinika-dict-newline (arg) (interactive "p") (ellinika-dict-select-input-method) (newline-and-indent)) diff --git a/elisp/ellinika-mode.el b/elisp/ellinika-mode.el index 115a7ca..864a5c3 100644 --- a/elisp/ellinika-mode.el +++ b/elisp/ellinika-mode.el @@ -36,13 +36,13 @@ 'greek-ibycus4))) (defun alt-input (arg) (interactive "p") (if (and (boundp 'alternative-input-method) alternative-input-method) (set-input-method alternative-input-method) - (inactivate-input-method))) + (deactivate-input-method))) (set-language-environment 'utf-8) ;;;; 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; } |