From 1138ac8fc8764cf5cd987383a7a0332879be6cca Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sun, 9 Jul 2023 00:50:58 +0200 Subject: rename conditionals and deconjugate obligatory inflections --- db/dict/deinflections.sql | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'db/dict/deinflections.sql') diff --git a/db/dict/deinflections.sql b/db/dict/deinflections.sql index a6070a8..7d67b02 100644 --- a/db/dict/deinflections.sql +++ b/db/dict/deinflections.sql @@ -142,17 +142,23 @@ insert into deinflection_temp values ('infl:potential', 'ありえる', 'ある', 'a', ''), -- exception -- conditionals - ('infl:suffix:ba', 'えば', 'う', 'a', 'u'), - ('infl:suffix:ba', 'けば', 'く', 'a', 'u'), - ('infl:suffix:ba', 'げば', 'ぐ', 'a', 'u'), - ('infl:suffix:ba', 'せば', 'す', 'a', 'u'), - ('infl:suffix:ba', 'てば', 'つ', 'a', 'u'), - ('infl:suffix:ba', 'ねば', 'ぬ', 'a', 'u'), - ('infl:suffix:ba', 'べば', 'ぶ', 'a', 'u'), - ('infl:suffix:ba', 'めば', 'む', 'a', 'u'), - ('infl:suffix:ba', 'れば', 'る', 'a', 'u ru'), - ('infl:suffix:ba', 'ければ', 'い', 'a', 'a'), + ('infl:cond:ba', 'えば', 'う', 'a', 'u'), + ('infl:cond:ba', 'けば', 'く', 'a', 'u'), + ('infl:cond:ba', 'げば', 'ぐ', 'a', 'u'), + ('infl:cond:ba', 'せば', 'す', 'a', 'u'), + ('infl:cond:ba', 'てば', 'つ', 'a', 'u'), + ('infl:cond:ba', 'ねば', 'ぬ', 'a', 'u'), + ('infl:cond:ba', 'べば', 'ぶ', 'a', 'u'), + ('infl:cond:ba', 'めば', 'む', 'a', 'u'), + ('infl:cond:ba', 'れば', 'る', 'a', 'u ru'), + ('infl:cond:ba', 'ければ', 'い', 'a', 'a'), -- TODO: 〜であれば (deconjugates to です i think?) + ('infl:cond:ra', 'ら', '', 'a', 'a'), -- TODO: constrain valid matches to after past conjugation? + + -- obligation + ('infl:must infl:negative', 'はだめ', '', 'a', 'a'), -- built-in negative because だめ can't be deconjugated + ('infl:must', 'はいける', '', 'a', 'a'), -- はいけない -> positive + ('infl:must', 'はなる', '', 'a', 'a'), -- はならない -> positive -- auxiliary rules ('class:verb:suru-included', 'する', '', 's', ''); -- deconjugate suru verbs into stem -- cgit v1.2.3