Improvements in conjugator.

* src/ellinika/conjugator.scm: Correctly handle alternative stems
* data/irregular-verbs.xml: Add alternative stems for erxomai.
in perfective compound tenses.

2 files changed, 30 insertions, 16 deletions

diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm
index 001a882..536b48e 100644
--- a/src/ellinika/conjugator.scm
+++ b/src/ellinika/conjugator.scm
@@ -505,16 +505,27 @@ AND i.tense=\"~A\" AND i.ident=f.ident"
              (cond
               ((and (string=? (conj-info #:thema conj) "synt")
                     (conj-info #:aux conj))
+               (let ((aparemfato-list
+                      (map
+                       (lambda (x)
+                         (let ((t (conjugation:table x)))
+                           (if t
                                (cons
-                (cons
-                 (let* ((verb-conj
-                         (car (conjugate verb voice "sub" "Αόριστος"
+                                (list-ref t 2)
+                                (conjugation:attested x))
+                               #f)))
+                       (conjugate verb voice "sub" "Αόριστος"
                                   #:nopart)))
-                        (form (list-ref verb-conj 2))
-                        (part (conj-info #:particle conj)))
-                   (cond
-                    (form
-;                     (format #t "FORM ~A FROM ~A~%" form verb-conj);;FIXME
+                     (part (conj-info #:particle conj))
+                     (fold-id (conj-info #:fold conj)))
+                 (fold
+                  (lambda (param prev)
+                    (if (not param)
+                        prev
+                        (let ((aparemfato (car param))
+                              (attested (cdr param)))
+                          (cons
+                           (cons
                             (append
                              (map
                               (lambda (aux flag)
@@ -522,20 +533,22 @@ AND i.tense=\"~A\" AND i.ident=f.ident"
                                     #f
                                     (elstr->string
                                      (if part
-                                  (elstr-append part " " aux " " form)
-                                  (elstr-append aux " " form)))))
+                                         (elstr-append part " " aux " "
+                                                       aparemfato)
+                                         (elstr-append aux " " aparemfato)))))
                               (conjugation:table
-                        (car (conjugate (conj-info #:aux conj) "act" "ind"
+                               (car (conjugate (conj-info #:aux conj)
+                                               "act" "ind"
                                                (conj-info #:auxtense conj))))
                               (string->list (or (verb-get vinfo #:accmap)
                                                 (conj-info #:accmap conj)
                                                 "000000")))
                              (list (verb-get vinfo #:conj)
-                            (conjugation:attested verb-conj))))
-                    (else
-                     #f)))
-                 (conj-info #:fold conj))
-                prev))
+                                   attested))
+                            fold-id)
+                           prev))))
+                  prev
+                  aparemfato-list)))
               ((and (string=? (conj-info #:thema conj) "synt")
                     (conj-info #:auxtense conj))
                (let ((part (conj-info #:particle conj)))
diff --git a/src/ellinika/tests/conj/erxomai.scm b/src/ellinika/tests/conj/erxomai.scm
index aaca526..ce6d5ba 100644
--- a/src/ellinika/tests/conj/erxomai.scm
+++ b/src/ellinika/tests/conj/erxomai.scm
@@ -1,3 +1,4 @@
 (use-modules ((ellinika test-conjugation)))
 
 (test-conjugation:verb "έρχομαι")
+;(test-conjugation:tense "έρχομαι" "pas" "ind" "Παρακείμενος")