From 06c0b57ed14788b94bb5fe5d3fbcc0e04376934a Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 27 Apr 2009 13:28:47 +0000 Subject: [PATCH] have_V2 in Structural --- next-lib/src/arabic/LexiconAra.gf | 1 - next-lib/src/arabic/StructuralAra.gf | 2 ++ next-lib/src/bulgarian/LexiconBul.gf | 1 - next-lib/src/bulgarian/StructuralBul.gf | 3 +++ next-lib/src/catalan/LexiconCat.gf | 2 +- next-lib/src/danish/LexiconDan.gf | 1 - next-lib/src/danish/StructuralDan.gf | 3 ++- next-lib/src/french/LexiconFre.gf | 1 - next-lib/src/french/StructuralFre.gf | 2 ++ next-lib/src/german/LexiconGer.gf | 1 - next-lib/src/german/StructuralGer.gf | 4 +++- next-lib/src/interlingua/LexiconIna.gf | 1 - next-lib/src/interlingua/StructuralIna.gf | 1 + next-lib/src/italian/ParadigmsIta.gf | 4 ++-- next-lib/src/norwegian/LexiconNor.gf | 1 - next-lib/src/norwegian/StructuralNor.gf | 3 ++- next-lib/src/romanian/LexiconRon.gf | 1 - next-lib/src/russian/LexiconRus.gf | 1 - next-lib/src/russian/StructuralRus.gf | 2 ++ next-lib/src/spanish/LexiconSpa.gf | 1 - next-lib/src/spanish/StructuralSpa.gf | 1 + next-lib/src/swedish/LexiconSwe.gf | 1 - next-lib/src/swedish/StructuralSwe.gf | 1 + 23 files changed, 22 insertions(+), 17 deletions(-) diff --git a/next-lib/src/arabic/LexiconAra.gf b/next-lib/src/arabic/LexiconAra.gf index 6d457e0d8..7f52d52bd 100644 --- a/next-lib/src/arabic/LexiconAra.gf +++ b/next-lib/src/arabic/LexiconAra.gf @@ -99,7 +99,6 @@ flags harbour_N = brkN "رف؟" "مَفعَل" "مَفاعِل" Masc NoHum ; --mInA', marsaY hate_V2 = dirV2 (regV "كَرِه") ; hat_N = sdfN "قبع" "فُعَّلة" Fem NoHum ; - have_V2 = dirV2 (regV "يَملِك") ; -- have_V2 = dirV2 (v1 "ملك" a i) ; hear_V2 = dirV2 (regV "سَمِع") ; -- hear_V2 = dirV2 (v1 "سمع" i a) ; diff --git a/next-lib/src/arabic/StructuralAra.gf b/next-lib/src/arabic/StructuralAra.gf index 58240c781..98b52523e 100644 --- a/next-lib/src/arabic/StructuralAra.gf +++ b/next-lib/src/arabic/StructuralAra.gf @@ -107,4 +107,6 @@ concrete StructuralAra of Structural = CatAra ** youPl_Pron = mkPron "أَنتُمْ" "كُمْ" "كُمْ" (Per2 Masc Sg) ; youPol_Pron = mkPron "أَنتِ" "كِ" "كِ" (Per2 Fem Sg) ; + have_V2 = dirV2 (regV "يَملِك") ; + } diff --git a/next-lib/src/bulgarian/LexiconBul.gf b/next-lib/src/bulgarian/LexiconBul.gf index 6f5a86013..6a9fba097 100644 --- a/next-lib/src/bulgarian/LexiconBul.gf +++ b/next-lib/src/bulgarian/LexiconBul.gf @@ -95,7 +95,6 @@ lin harbour_N = mkN066 "" ; hate_V2 = dirV2 (stateV (mkV173 "")) ; hat_N = mkN041 "" ; - have_V2 = dirV2 (stateV (mkV186 "")) ; hear_V2 = dirV2 (actionV (mkV186 "") (mkV163 "")) ; hill_N = mkN001 "" ; hope_VS = mkVS (medialV (stateV (mkV186 "")) Acc) ; diff --git a/next-lib/src/bulgarian/StructuralBul.gf b/next-lib/src/bulgarian/StructuralBul.gf index 4ff725d26..422ed7169 100644 --- a/next-lib/src/bulgarian/StructuralBul.gf +++ b/next-lib/src/bulgarian/StructuralBul.gf @@ -118,5 +118,8 @@ concrete StructuralBul of Structural = CatBul ** youSg_Pron = mkPron "" "" "" "" "" "" "" "" "" "" "" "" (GSg Masc) P2 ; youPl_Pron = mkPron "" "" "" "" "" "" "" "" "" "" "" "" GPl P2 ; youPol_Pron = mkPron "" "" "" "" "" "" "" "" "" "" "" "" GPl P2 ; + + have_V2 = dirV2 (stateV (mkV186 "")) ; + } diff --git a/next-lib/src/catalan/LexiconCat.gf b/next-lib/src/catalan/LexiconCat.gf index d06cc7e57..54902786d 100644 --- a/next-lib/src/catalan/LexiconCat.gf +++ b/next-lib/src/catalan/LexiconCat.gf @@ -96,7 +96,6 @@ lin harbour_N = regMN "port" ; hate_V2 = dirV2 (verbV (canviar_16 "odiar")) ; hat_N = regMN "barret" ; - have_V2 = dirV2 (verbV (tenir_108 "tenir")) ; hear_V2 = mkV2 (regV "escoltar") dative ; -- Must be "oir". Add it to Besch hill_N = regMN "tur" ; hope_VS = mkVS (regV "esperar") ; @@ -361,5 +360,6 @@ lin ready_A = regA "preparat" ; reason_N = regFN "ra" ; uncertain_A = regA "incert" ; + have_V2 = dirV2 (verbV (tenir_108 "tenir")) ; } ; diff --git a/next-lib/src/danish/LexiconDan.gf b/next-lib/src/danish/LexiconDan.gf index 055a2c8dd..38361a67b 100644 --- a/next-lib/src/danish/LexiconDan.gf +++ b/next-lib/src/danish/LexiconDan.gf @@ -92,7 +92,6 @@ lin harbour_N = mk2N "havn" "havnen" ; hate_V2 = dirV2 (regV "hade") ; hat_N = mk3N "hat" "hatten" "hatte" ; - have_V2 = dirV2 have_V ; hear_V2 = dirV2 (mk2V "hre" "hrte") ; hill_N = mk2N "hj" "hjen" ; hope_VS = mkVS (regV "hbe") ; diff --git a/next-lib/src/danish/StructuralDan.gf b/next-lib/src/danish/StructuralDan.gf index 9ab2beb61..8c582ece4 100644 --- a/next-lib/src/danish/StructuralDan.gf +++ b/next-lib/src/danish/StructuralDan.gf @@ -1,5 +1,5 @@ concrete StructuralDan of Structural = CatDan ** - open MorphoDan, ParadigmsDan, (X = ConstructX), Prelude in { + open MorphoDan, ParadigmsDan, (X = ConstructX), IrregDan, Prelude in { flags optimize=all ; @@ -118,6 +118,7 @@ concrete StructuralDan of Structural = CatDan ** MorphoDan.mkNP "du" "dig" "din" "dit" "dine" SgUtr P2 ; ---- youPl_Pron = MorphoDan.mkNP "i" "jer" "jeres" "jeres" "jeres" Plg P2 ; youPol_Pron = MorphoDan.mkNP "Dere" "Dere" "Deres" "Deres" "Deres" SgUtr P2 ; --- wrong in refl + have_V2 = dirV2 have_V ; -- Auxiliaries that are used repeatedly. diff --git a/next-lib/src/french/LexiconFre.gf b/next-lib/src/french/LexiconFre.gf index 11dbcb5db..b2aedcd1b 100644 --- a/next-lib/src/french/LexiconFre.gf +++ b/next-lib/src/french/LexiconFre.gf @@ -92,7 +92,6 @@ lin harbour_N = regGenN "port" masculine ; hate_V2 = har_V2 ; hat_N = regGenN "chapeau" masculine ; - have_V2 = avoir_V2 ; hear_V2 = entendre_V2 ; hill_N = regGenN "colline" feminine ; hope_VS = mkVS (reg3V "esprer" "espre" "esprera") ; diff --git a/next-lib/src/french/StructuralFre.gf b/next-lib/src/french/StructuralFre.gf index 0293db257..5f92ccdff 100644 --- a/next-lib/src/french/StructuralFre.gf +++ b/next-lib/src/french/StructuralFre.gf @@ -187,5 +187,7 @@ lin as_CAdv = X.mkCAdv "aussi" conjThan ; + have_V2 = avoir_V2 ; + } diff --git a/next-lib/src/german/LexiconGer.gf b/next-lib/src/german/LexiconGer.gf index 38dfda364..61ab8dd32 100644 --- a/next-lib/src/german/LexiconGer.gf +++ b/next-lib/src/german/LexiconGer.gf @@ -96,7 +96,6 @@ lin harbour_N = reg2N "Hafen" "Hfen" masculine ; hate_V2 = dirV2 (regV "hassen") ; hat_N = reg2N "Hut" "Hte" masculine ; - have_V2 = dirV2 IrregGer.haben_V ; hear_V2 = dirV2 (regV "hren") ; hill_N = mkN "Hgel" ; hope_VS = mkVS (regV "hoffen") ; diff --git a/next-lib/src/german/StructuralGer.gf b/next-lib/src/german/StructuralGer.gf index 723837974..a48a30143 100644 --- a/next-lib/src/german/StructuralGer.gf +++ b/next-lib/src/german/StructuralGer.gf @@ -1,6 +1,7 @@ concrete StructuralGer of Structural = CatGer ** - open MorphoGer, MakeStructuralGer, (X = ConstructX), Prelude in { + open MorphoGer, MakeStructuralGer, (X = ConstructX), + (P = ParadigmsGer), IrregGer, Prelude in { flags optimize=all ; @@ -145,5 +146,6 @@ concrete StructuralGer of Structural = CatGer ** except_Prep = mkPrep "auer" Dat ; as_CAdv = X.mkCAdv "ebenso" "wie" ; + have_V2 = P.dirV2 IrregGer.haben_V ; } diff --git a/next-lib/src/interlingua/LexiconIna.gf b/next-lib/src/interlingua/LexiconIna.gf index beba8fa64..7876b69da 100644 --- a/next-lib/src/interlingua/LexiconIna.gf +++ b/next-lib/src/interlingua/LexiconIna.gf @@ -90,7 +90,6 @@ concrete LexiconIna of Lexicon = CatIna ** harbour_N = regN "porto" ; hate_V2 = dirV2 (regV "detestar0") ; hat_N = regN "cappello" ; - have_V2 = dirV2 (R.haberV ** {lock_V = <>}); hear_V2 = dirV2 (regV "audir"); hill_N = regN "monticulo" ; hope_VS = mkVS (regV "sperar") ; diff --git a/next-lib/src/interlingua/StructuralIna.gf b/next-lib/src/interlingua/StructuralIna.gf index cda371c3a..2db1f5a63 100644 --- a/next-lib/src/interlingua/StructuralIna.gf +++ b/next-lib/src/interlingua/StructuralIna.gf @@ -104,6 +104,7 @@ concrete StructuralIna of Structural = CatIna ** youPl_Pron = mkPron "vos" "vos" "vostre" Pp2; youPol_Pron = mkPron "vos" "vos" "vostre" Pp2; + have_V2 = dirV2 (R.haberV ** {lock_V = <>}); oper mkQuant : Str -> Str -> {s : Number => Case => Str} = \x,y -> { diff --git a/next-lib/src/italian/ParadigmsIta.gf b/next-lib/src/italian/ParadigmsIta.gf index cb2e033ae..b81a4c31b 100644 --- a/next-lib/src/italian/ParadigmsIta.gf +++ b/next-lib/src/italian/ParadigmsIta.gf @@ -24,12 +24,12 @@ -- separate module [``BeschIta`` ../../italian/BeschIta.gf], -- which covers the "Bescherelle" verb conjugations. -resource ParadigmsIta = +resource ParadigmsIta = BeschIta ** open (Predef=Predef), Prelude, MorphoIta, - BeschIta, +-- BeschIta, CatIta in { flags optimize=all ; diff --git a/next-lib/src/norwegian/LexiconNor.gf b/next-lib/src/norwegian/LexiconNor.gf index 30cda22ea..ed74cd1ba 100644 --- a/next-lib/src/norwegian/LexiconNor.gf +++ b/next-lib/src/norwegian/LexiconNor.gf @@ -90,7 +90,6 @@ lin harbour_N = regGenN "havn" feminine; hate_V2 = dirV2 (regV "hate") ; hat_N = regGenN "hatt" masculine ; - have_V2 = dirV2 IrregNor.ha_V ; hear_V2 = dirV2 (mk2V "hre" "hrte") ; hill_N = regGenN "haug" masculine ; hope_VS = mkVS (regV "hpe") ; diff --git a/next-lib/src/norwegian/StructuralNor.gf b/next-lib/src/norwegian/StructuralNor.gf index c7ee5b237..f47474cf8 100644 --- a/next-lib/src/norwegian/StructuralNor.gf +++ b/next-lib/src/norwegian/StructuralNor.gf @@ -1,5 +1,5 @@ concrete StructuralNor of Structural = CatNor ** - open MorphoNor, ParadigmsNor, (X = ConstructX), Prelude in { + open MorphoNor, ParadigmsNor, (X = ConstructX), IrregNor, Prelude in { flags optimize=all ; @@ -119,6 +119,7 @@ concrete StructuralNor of Structural = CatNor ** MorphoNor.mkNP "du" "deg" (variants {"din" ; "di"}) "dit" "dine" SgUtr P2 ; ---- youPl_Pron = MorphoNor.mkNP "dere" "dere" "deres" "deres" "deres" Plg P2 ; youPol_Pron = MorphoNor.mkNP "Dere" "Dere" "Deres" "Deres" "Deres" SgUtr P2 ; --- wrong in refl + have_V2 = dirV2 IrregNor.ha_V ; -- Auxiliaries that are used repeatedly. diff --git a/next-lib/src/romanian/LexiconRon.gf b/next-lib/src/romanian/LexiconRon.gf index 1fe317afe..f5c643364 100644 --- a/next-lib/src/romanian/LexiconRon.gf +++ b/next-lib/src/romanian/LexiconRon.gf @@ -91,7 +91,6 @@ green_A = mkA "verde" ; harbour_N = mkNR "port" ; hate_V2 = dirV2 (mkV "ur") ; hat_N = mkN "plrie" ; -have_V2 = dirV2 (v_have) ; hear_V2 = dirV2 (v_besch127 "auzi") ; hill_N = mkNR "deal" ; hope_VS = mkVS (v_besch17 "spera") ; diff --git a/next-lib/src/russian/LexiconRus.gf b/next-lib/src/russian/LexiconRus.gf index 229b07ed1..6cee3846b 100644 --- a/next-lib/src/russian/LexiconRus.gf +++ b/next-lib/src/russian/LexiconRus.gf @@ -139,7 +139,6 @@ lin harbour_N = mkN "порт" ; -- prepos -u hat_N = mkN "шляпа" ; hate_V2= dirV2 (regV imperfective second "ненави" "жу" "ненавидел" "ненавидь" "ненавидеть" ); - have_V2= dirV2 (regV imperfective first "име" "ю" "имел" "имей" "иметь" ); head_N = mkN "голова" ; hear_V2= dirV2 (regV imperfective first "слуша" "ю" "слушал" "слушай" "слушать" ); heart_N = mkN "сердце" "сердца" "сердцу" "сердца" "сердцем" "сердце" "сердце" "сердца" "сердец" "сердцам" "сердец" "сердцами" "сердцах" neuter inanimate ; diff --git a/next-lib/src/russian/StructuralRus.gf b/next-lib/src/russian/StructuralRus.gf index 84546031a..d5635005b 100644 --- a/next-lib/src/russian/StructuralRus.gf +++ b/next-lib/src/russian/StructuralRus.gf @@ -112,6 +112,8 @@ lin youSg_Pron = pronTu; youPol_Pron = pronVu; + have_V2= P.dirV2 (P.regV P.imperfective P.first "име" "ю" "имел" "имей" "иметь" ); + --- NoDet = nikakojDet ** {n = Sg; g = PNoGen; c= Nom} ; --- AnyDet = lubojDet ** {n = Sg; g = PNoGen; c= Nom} ; --- AnyNumDet = mkDeterminerNum (lubojDet ** {n = Pl; g = PNoGen; c= Nom} ); diff --git a/next-lib/src/spanish/LexiconSpa.gf b/next-lib/src/spanish/LexiconSpa.gf index fb7352ef0..4b083b775 100644 --- a/next-lib/src/spanish/LexiconSpa.gf +++ b/next-lib/src/spanish/LexiconSpa.gf @@ -90,7 +90,6 @@ lin harbour_N = regN "puerto" ; hate_V2 = dirV2 (regV "odiar") ; hat_N = regN "sombrero" ; - have_V2 = dirV2 (verboV (tener_4 "tener")) ; hear_V2 = mkV2 (regV "escuchar") dative ; -- or_51 hill_N = regN "colina" ; hope_VS = mkVS (regV "esperar") ; diff --git a/next-lib/src/spanish/StructuralSpa.gf b/next-lib/src/spanish/StructuralSpa.gf index 597b207c4..f8cefbbd9 100644 --- a/next-lib/src/spanish/StructuralSpa.gf +++ b/next-lib/src/spanish/StructuralSpa.gf @@ -170,6 +170,7 @@ oper }} ** {n = Pl} ; lin as_CAdv = X.mkCAdv "si" conjThan ; ---- + have_V2 = dirV2 (verboV (tener_4 "tener")) ; } diff --git a/next-lib/src/swedish/LexiconSwe.gf b/next-lib/src/swedish/LexiconSwe.gf index 724186fce..8d4efeea1 100644 --- a/next-lib/src/swedish/LexiconSwe.gf +++ b/next-lib/src/swedish/LexiconSwe.gf @@ -90,7 +90,6 @@ lin harbour_N = regGenN "hamn" utrum; hate_V2 = dirV2 (regV "hatar") ; hat_N = regGenN "hatt" utrum ; - have_V2 = dirV2 (mkV "ha" "har" "ha" "hade" "haft" "haft") ; ---- pp hear_V2 = dirV2 (mkV "hra" "hr" "hr" "hrde" "hrt" "hrd") ; hill_N = regGenN "kulle" utrum ; -- hope_VS = mkVS ((regV "nskar")) ; diff --git a/next-lib/src/swedish/StructuralSwe.gf b/next-lib/src/swedish/StructuralSwe.gf index 06883b912..32f8ace3c 100644 --- a/next-lib/src/swedish/StructuralSwe.gf +++ b/next-lib/src/swedish/StructuralSwe.gf @@ -149,6 +149,7 @@ lin except_Prep = ss "utom" ; as_CAdv = X.mkCAdv "lika" "som" ; + have_V2 = dirV2 (mkV "ha" "har" "ha" "hade" "haft" "haft") ; ---- pp }