From 0e0221d2d07fbddbdf92f8f9742846ff55465a45 Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 6 Dec 2014 11:36:54 +0000 Subject: [PATCH] restored Dictionary.get_V2 which had been omitted. It is a very common verb, although sense splits will certainly be needed. --- lib/src/english/ResEng.gf | 18 ++---------------- lib/src/translator/Dictionary.gf | 1 + lib/src/translator/DictionaryCat.gf | 1 + lib/src/translator/DictionaryChi.gf | 3 ++- lib/src/translator/DictionaryDut.gf | 1 + lib/src/translator/DictionaryEng.gf | 4 ++-- lib/src/translator/DictionaryFin.gf | 1 + lib/src/translator/DictionaryFre.gf | 1 + lib/src/translator/DictionaryGer.gf | 1 + lib/src/translator/DictionaryIta.gf | 1 + lib/src/translator/DictionarySpa.gf | 1 + lib/src/translator/DictionarySwe.gf | 1 + lib/src/translator/todo/TopDictionary.gf | 1 + 13 files changed, 16 insertions(+), 19 deletions(-) diff --git a/lib/src/english/ResEng.gf b/lib/src/english/ResEng.gf index 3f1b8ec9f..85db72643 100644 --- a/lib/src/english/ResEng.gf +++ b/lib/src/english/ResEng.gf @@ -369,28 +369,14 @@ param False => {aux = x ; adv = "not" ; fin = [] ; inf = z} } ; - insertObj : (Agr => Str) -> VP -> VP = \obj,vp -> { - s = vp.s ; - p = vp.p ; - prp = vp.prp ; - ptp = vp.ptp ; - inf = vp.inf ; - ad = vp.ad ; + insertObj : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** { s2 = \\a => vp.s2 ! a ++ obj ! a ; isSimple = False ; - ext = vp.ext } ; - insertObjPre : (Agr => Str) -> VP -> VP = \obj,vp -> { - s = vp.s ; - p = vp.p ; - prp = vp.prp ; - ptp = vp.ptp ; - inf = vp.inf ; - ad = vp.ad ; + insertObjPre : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** { s2 = \\a => obj ! a ++ vp.s2 ! a ; isSimple = False ; - ext = vp.ext } ; insertObjc : (Agr => Str) -> SlashVP -> SlashVP = \obj,vp -> diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index 551968b0d..3f98dfa4e 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -23909,6 +23909,7 @@ fun gestural_A : A ; fun gesture_N : N ; fun gesture_V : V ; fun get_N : N ; +fun get_V2 : V2 ; fun get_V2V : V2V ; fun get_VV : VV ; fun get_about_V : V ; diff --git a/lib/src/translator/DictionaryCat.gf b/lib/src/translator/DictionaryCat.gf index f9d2e9d0b..86a89cc16 100644 --- a/lib/src/translator/DictionaryCat.gf +++ b/lib/src/translator/DictionaryCat.gf @@ -5909,6 +5909,7 @@ lin gerund_N = mkN "gerundi" masculine ; --auto lin gestation_N = mkN "gestació" feminine ; --auto lin gesticulation_N = mkN "gesticulació" feminine ; --auto lin gesture_N = mkN "gest" masculine ; --auto +lin get_V2 = mkV2 (mkV (tenir_108 "obtenir")) ; lin get_V2V = mkV2V (verbV (servir_101 "aconseguir")) ParadigmsCat.accusative ParadigmsCat.dative ; --subcat mkVS (verbV (servir_101 "aconseguir")) lin get_VV = deVV IrregCat.haver_V ; lin geyser_N = mkN "guèiser" masculine ; --auto diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index 480a4a09e..ce063c14d 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -14069,7 +14069,8 @@ lin gesneriad_N = mkN "苦苣苔类" ; -- open-multilingual-wordnet lin gestational_A = mkA "妊娠" | mkA "妊娠期" ; -- open-multilingual-wordnet lin gesture_N = mkN "手势" ; lin gesture_V = mkV "做手势" | {-HSK-} mkV "比" ; -lin get_N = mkN "生殖""" ; +lin get_N = mkN "生殖" "" ; ---- ?? +lin get_V2 = mkV2 "收到" ; lin get_V2V = mkV2V "取" | mkV2V "获得" | {-HSK-} mkV2V "得到" ; lin get_VV = mkVV "取" | mkVV "获得" | {-HSK-} mkVV "得到" ; lin get_along_V = mkV "过" ; diff --git a/lib/src/translator/DictionaryDut.gf b/lib/src/translator/DictionaryDut.gf index 1aba2f905..306c8231b 100644 --- a/lib/src/translator/DictionaryDut.gf +++ b/lib/src/translator/DictionaryDut.gf @@ -8130,6 +8130,7 @@ lin gertrude_PN = mkPN "Gertrude" ; -- src=eng status=guess lin gerund_N = mkN "gerundium" neuter ; -- status=guess lin gesture_N = mkN "gebaar" neuter ; -- status=guess lin gesture_V = mkV "gebaren" ; -- status=guess, src=wikt +lin get_V2 = mkV2 krijgen_V ; lin get_V2V = mkV2V (mkV "op" schieten_V) | mkV2V (mkV "overeen" LexiconDut.come_V) ; lin get_VV = mkVV (mkV "hebben") ; ---- subcat, tocheck all of get_ lin geyser_N = mkN "geiser" masculine | mkN "geizer" masculine ; -- status=guess status=guess diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index d659d9562..0bd5e781d 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -24014,9 +24014,9 @@ lin gesture_N = mkN "gesture" "gestures"; lin gesture_V = mkV "gesture" "gestures" "gestured" "gestured" "gesturing"; lin get_N = mkN "get" ; --subcat lin get_V = IrregEng.get_V; ---subcat lin get_V2 = mkV2 (IrregEng.get_V); +lin get_V2 = mkV2 (IrregEng.get_V) | mkV2 (mkV "get" "got" "got") ; ---- IrregEng only gives "gotten" lin get_V2V = mkV2V (IrregEng.get_V) noPrep to_Prep ; ---subcat lin get_VA = mkVA (IrregEng.get_V); +-- subcat lin get_VA = mkVA (IrregEng.get_V); --subcat lin get_VS = mkVS (IrregEng.get_V); lin get_VV = mkVV (IrregEng.get_V); lin get_about_V = partV IrregEng.get_V "about"; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 443325f35..f38d7f114 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -21737,6 +21737,7 @@ lin gesticulation_N = mkWN (k9A "elehdintä") ; --UNCHK lin gestural_A = mkWA (k34A "sanaton") ; --UNCHK lin gesture_N = mkWN (k48 "ele") ; lin gesture_V = mkWV (k52A "viittoa") ; --UNCHK +lin get_V2 = mkV2 (mkV "saada") ; lin get_V2V = mkV2V (mkV "saada") accusative infIllat ; lin get_VV = mkVV "päätyä" infIllat ; lin get_across_V = mkWV (k52 "paljastua") ; --UNCHK diff --git a/lib/src/translator/DictionaryFre.gf b/lib/src/translator/DictionaryFre.gf index 0c57b6885..0d78094c6 100644 --- a/lib/src/translator/DictionaryFre.gf +++ b/lib/src/translator/DictionaryFre.gf @@ -9275,6 +9275,7 @@ lin gerund_N = mkN "gérondif" masculine ; -- tocheck lin gestalt_N = mkN "profil" feminine ; -- tocheck lin gesticulate_V = mkV (mkV "gesticuler") ; -- tocheck lin gesture_N = mkN "geste" masculine ; -- tocheck +lin get_V2 = I.recevoir_V2 ; lin get_V2V = mkV2V (mkV I.obtenir_V2) ; lin get_VV = mkVV (mkV "arriver") ; lin geyser_N = mkN "geyser" masculine ; -- tocheck diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index 1aedab340..3b9fff171 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -23916,6 +23916,7 @@ lin gestural_A = variants {} ; lin gesture_N = mkN "Geste" "Gesten" feminine ; -- status=guess lin gesture_V = mkV "gestikulieren" ; -- status=guess, src=wikt lin get_N = variants {} ; +lin get_V2 = mkV2 (fixprefixV "be" I.kommen_V) | mkV2 (mkV "kriegen") ; lin get_V2V = mkV2V (mkV "machen") accPrep ; -- comment=? lin get_VV = mkVV I.dürfen_V ; lin get_about_V = variants {} ; diff --git a/lib/src/translator/DictionaryIta.gf b/lib/src/translator/DictionaryIta.gf index 514b6146e..8c83717ca 100644 --- a/lib/src/translator/DictionaryIta.gf +++ b/lib/src/translator/DictionaryIta.gf @@ -7988,6 +7988,7 @@ lin gerund_N = mkN "gerundio" ; -- status=guess lin gesso_N = mkN "gesso" ; -- status=guess lin gesticulation_N = mkN "gesticolio" ; -- status=guess lin gesture_N = mkN "gesto" ; -- status=guess +lin get_V2 = mkV2 (mkV "ricevere") ; lin get_V2V = mkV2V (mkV "ricevere") ; lin get_VV = mkVV (mkV "ricevere") ; lin geyser_N = mkN "geyser" masculine ; -- status=guess diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 145489e22..faad36b0b 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -9527,6 +9527,7 @@ lin gerontology_N = mkN "gerontología" ; -- status=guess lin gerund_N = mkN "gerundio" ; -- status=guess lin gesture_N = mkN "gesto" ; -- status=guess lin get_N = mkN "quedada" ; -- status=guess +lin get_V2 = mkV2 obtener_V ; -- status=guess lin get_V2V = mkV2V obtener_V ; lin get_VV = mkVV obtener_V ; lin geyser_N = mkN "géiser" masculine ; -- status=guess diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 02c958bed..6f5d6eda9 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -23828,6 +23828,7 @@ lin gestural_A = variants {} ; -- status=guess lin gesture_N = mkN "gest" "gester" ; -- SaldoWN lin gesture_V = mkV "gestikulerar" ; -- status=guess, src=wikt lin get_N = mkN "skada" ; -- comment=2 +lin get_V2 = mkV2 I.få_V ; lin get_V2V = mkV2V I.få_V ; lin get_VV = mkVV I.få_V ; lin get_about_V = mkV "anländer" ; -- comment=17 diff --git a/lib/src/translator/todo/TopDictionary.gf b/lib/src/translator/todo/TopDictionary.gf index 8e1b2ac77..168e219e4 100644 --- a/lib/src/translator/todo/TopDictionary.gf +++ b/lib/src/translator/todo/TopDictionary.gf @@ -33,6 +33,7 @@ fun if_Subj : Subj ; fun go_VV : VV ; fun go_VA : VA ; fun go_V : V ; +fun get_V2 : V2 ; fun get_VV : VV ; fun get_V2V : V2V ; fun make_V2V : V2V ;