diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-19 07:15:04 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-06-19 07:16:30 +0300 |
commit | b56552e3260023593a3bf80315edf0f069eebac1 (patch) | |
tree | 729ba1bd4eb4d80c69bfa4ea65a50a69daae1e4e /src | |
parent | 3b0729ca8599173a61b97d59513c32b8b8eb1ea4 (diff) | |
download | ellinika-b56552e3260023593a3bf80315edf0f069eebac1.tar.gz ellinika-b56552e3260023593a3bf80315edf0f069eebac1.tar.bz2 |
Conjugator: bugfix
* data/irregular-verbs.xml: Update.
* src/ellinika/conjugator.scm (conjugate): Create a copy of
vinfo prior to complementing it to avoid side effects on
subsequent iterations.
Diffstat (limited to 'src')
-rw-r--r-- | src/ellinika/conjugator.scm | 32 | ||||
-rw-r--r-- | src/ellinika/tests/conj/blepv.scm | 2 |
2 files changed, 18 insertions, 16 deletions
diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm index 2a6425c..0abec8d 100644 --- a/src/ellinika/conjugator.scm +++ b/src/ellinika/conjugator.scm @@ -538,28 +538,30 @@ AND i.tense=\"~A\" AND i.ident=f.ident" (conj-info #:fold conj)) prev)) prev (conjugate verb voice "ind" (conj-info #:auxtense conj))))) (else - (if (not (verb-get vinfo #:root)) - (let ((thema (string-split (conj-info #:thema conj) #\:))) -; (format #t "THEMA ~A~%" thema) - (complement-verb-info vinfo verb - (if (null? (cdr thema)) - voice - (car (cdr thema))) - (car thema)))) + (let ((vinfo (copy-tree vinfo))) + (if (verb-get vinfo #:root) + (verb-set! vinfo #:attested 'root) + (let ((thema (string-split (conj-info #:thema conj) #\:))) +; (format #t "THEMA ~A~%" thema) + (complement-verb-info vinfo verb + (if (null? (cdr thema)) + voice + (car (cdr thema))) + (car thema)))) ; (format #t "VINFO ~A~%" vinfo) - (cons - (cons - (append (apply-flect conj vinfo verb) - (list (verb-get vinfo #:conj) - (verb-get vinfo #:attested))) - (conj-info #:fold conj)) - prev)))) + (cons + (cons + (append (apply-flect conj vinfo verb) + (list (verb-get vinfo #:conj) + (verb-get vinfo #:attested))) + (conj-info #:fold conj)) + prev))))) '() conj-list)))))))) (define-public (conjugator verb voice mood tense) (conjugate verb voice mood tense)) diff --git a/src/ellinika/tests/conj/blepv.scm b/src/ellinika/tests/conj/blepv.scm index 7e54734..6c0ac99 100644 --- a/src/ellinika/tests/conj/blepv.scm +++ b/src/ellinika/tests/conj/blepv.scm @@ -1,4 +1,4 @@ (use-modules ((ellinika test-conjugation))) (test-conjugation:verb "βλέπω") -;(test-conjugation:tense "βλέπω" "pas" "sub" "Αόριστος") +;(test-conjugation:tense "βλέπω" "pas" "imp" "Αόριστος") |