From 38c6bbc71b711f72a7044cf9af659024af65a9ec Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 15 Oct 2015 14:43:20 +0000 Subject: [PATCH] made Lexicon.give_V3 ditransitive in a number of languages; corrected the default order for V3 in Romance (was accusative dative, now the other way around as it should be) --- lib/src/catalan/ParadigmsCat.gf | 2 +- lib/src/english/LexiconEng.gf | 2 +- lib/src/english/ParseEngAbs.gf | 4 ++-- lib/src/finnish/LexiconFin.gf | 4 ++-- lib/src/french/ParadigmsFre.gf | 2 +- lib/src/italian/LexiconIta.gf | 2 +- lib/src/italian/ParadigmsIta.gf | 2 +- lib/src/spanish/ParadigmsSpa.gf | 2 +- lib/src/swedish/LexiconSwe.gf | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/src/catalan/ParadigmsCat.gf b/lib/src/catalan/ParadigmsCat.gf index c64a9c4b0..5c9cbac56 100644 --- a/lib/src/catalan/ParadigmsCat.gf +++ b/lib/src/catalan/ParadigmsCat.gf @@ -440,7 +440,7 @@ oper mkV3 v p q = lin V3 (v ** {c2 = p ; c3 = q}) ; dirV3 v p = mkV3 v accusative p ; - dirdirV3 v = dirV3 v dative ; + dirdirV3 v = mkV3 v dative accusative ; V0 : Type = V ; AS, AV : Type = A ; diff --git a/lib/src/english/LexiconEng.gf b/lib/src/english/LexiconEng.gf index 9b656760d..7597a7a50 100644 --- a/lib/src/english/LexiconEng.gf +++ b/lib/src/english/LexiconEng.gf @@ -315,7 +315,7 @@ lin flow_V = regV "flow" ; fly_V = IrregEng.fly_V ; freeze_V = IrregEng.freeze_V ; - give_V3 = dirV3 give_V toP ; + give_V3 = mkV3 give_V noPrep noPrep ; laugh_V = regV "laugh" ; lie_V = IrregEng.lie_V ; play_V = regV "play" ; diff --git a/lib/src/english/ParseEngAbs.gf b/lib/src/english/ParseEngAbs.gf index fcea90840..56c193692 100644 --- a/lib/src/english/ParseEngAbs.gf +++ b/lib/src/english/ParseEngAbs.gf @@ -24,8 +24,8 @@ abstract ParseEngAbs = flags startcat=Phr; heuristic_search_factor=0.60; - meta_prob=1.0e-5; - meta_token_prob=1.1965149246222233e-9; +--- meta_prob=1.0e-5; +--- meta_token_prob=1.1965149246222233e-9; fun CompoundCN : Num -> N -> CN -> CN ; DashCN : N -> N -> N ; diff --git a/lib/src/finnish/LexiconFin.gf b/lib/src/finnish/LexiconFin.gf index ca6521509..58b0578cc 100644 --- a/lib/src/finnish/LexiconFin.gf +++ b/lib/src/finnish/LexiconFin.gf @@ -323,7 +323,7 @@ lin wing_N = mk2N "siipi" "siipiä" ; worm_N = mkN "mato" ; year_N = mk3N "vuosi" "vuoden" "vuosia" ; - bite_V2 = mkV2 (mkV "purra") ; + bite_V2 = mkV2 (mkV "purra") cpartitive ; blow_V = mkV "puhaltaa" ; burn_V = mkV "palaa" ; count_V2 = mkV2 (mkV "laskea") ; @@ -336,7 +336,7 @@ lin flow_V = mkV "virrata" "virtaan" "virtasi" ; fly_V = mkV "lentää" ; freeze_V = mkV "jäätyä" ; - give_V3 = mkV3 (mkV "antaa" "annan" "antoi") accPrep (casePrep allative) ; + give_V3 = mkV3 (mkV "antaa" "annan" "antoi") (casePrep allative) accPrep ; hit_V2 = mkV2 (mkV "lyödä") cpartitive ; hold_V2 = mkV2 (mkV "pitää") cpartitive ; hunt_V2 = mkV2 (mkV "metsästää") cpartitive ; diff --git a/lib/src/french/ParadigmsFre.gf b/lib/src/french/ParadigmsFre.gf index 5037d2461..97dea8761 100644 --- a/lib/src/french/ParadigmsFre.gf +++ b/lib/src/french/ParadigmsFre.gf @@ -414,7 +414,7 @@ oper mmkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ; dirV3 v p = mmkV3 v accusative p ; - dirdirV3 v = dirV3 v dative ; + dirdirV3 v = mmkV3 v dative accusative ; mkV3 = overload { mkV3 : V -> V3 = dirdirV3 ; -- donner,_,_ diff --git a/lib/src/italian/LexiconIta.gf b/lib/src/italian/LexiconIta.gf index ed173e38c..e374d885f 100644 --- a/lib/src/italian/LexiconIta.gf +++ b/lib/src/italian/LexiconIta.gf @@ -319,7 +319,7 @@ lin flow_V = verboV (finire_100 "fluire") ; fly_V = regV "volare" ; freeze_V = regV "gelare" ; - give_V3 = dirdirV3 (verboV (dare_15 "dare")) ; + give_V3 = mkV3 (verboV (dare_15 "dare")) dative accusative ; hit_V2 = dirV2 (regV "colpire") ; hold_V2 = dirV2 (verboV (venire_110 "tenire")) ; hunt_V2 = dirV2 (regV "cacciare") ; diff --git a/lib/src/italian/ParadigmsIta.gf b/lib/src/italian/ParadigmsIta.gf index cf0a8c7fd..ec8084271 100644 --- a/lib/src/italian/ParadigmsIta.gf +++ b/lib/src/italian/ParadigmsIta.gf @@ -432,7 +432,7 @@ oper mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de mmkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ; dirV3 v p = mmkV3 v accusative p ; - dirdirV3 v = dirV3 v dative ; + dirdirV3 v = mmkV3 v dative accusative ; mmkV2 : V -> Prep -> V2 ; mmkV2 v p = v ** {c2 = p ; lock_V2 = <>} ; diff --git a/lib/src/spanish/ParadigmsSpa.gf b/lib/src/spanish/ParadigmsSpa.gf index e618af520..a3cc8d602 100644 --- a/lib/src/spanish/ParadigmsSpa.gf +++ b/lib/src/spanish/ParadigmsSpa.gf @@ -424,7 +424,7 @@ oper mmkV3 : V -> Prep -> Prep -> V3 ; -- parler, à, de mmkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ; dirV3 v p = mmkV3 v accusative p ; - dirdirV3 v = dirV3 v dative ; + dirdirV3 v = mmkV3 v dative accusative ; mmkV2 : V -> Prep -> V2 ; mmkV2 v p = v ** {c2 = p ; lock_V2 = <>} ; diff --git a/lib/src/swedish/LexiconSwe.gf b/lib/src/swedish/LexiconSwe.gf index 8b0d462df..e6bef2d0f 100644 --- a/lib/src/swedish/LexiconSwe.gf +++ b/lib/src/swedish/LexiconSwe.gf @@ -317,7 +317,7 @@ lin flow_V = rinna_V ; fly_V = flyga_V ; freeze_V = frysa_V ; - give_V3 = dirV3 (mkV "ge" "ger""ge" "gav" "givit" "given" "givande") (mkPrep "till"); + give_V3 = mkV3 (mkV "ge" "ger""ge" "gav" "givit" "given" "givande") (mkPrep []) (mkPrep []) ; hit_V2 = dirV2 (slå_V) ; hold_V2 = dirV2 (hålla_V) ; hunt_V2 = dirV2 (regV "jaga") ;