have_V2 in Structural

2009-04-27 13:28:47 +00:00
parent 2a235f9709
commit 06c0b57ed1
23 changed files with 22 additions and 17 deletions
--- 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) ;
--- 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 "يَملِك") ; 
+
 }
--- 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) ;
--- 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 "èìàì")) ;
+
 }

--- 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")) ;

 } ;
--- 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 "høre" "hørte") ;
  hill_N = mk2N "høj" "højen" ;
  hope_VS = mkVS (regV "håbe") ;
--- 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.

--- 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 = haïr_V2 ;
  hat_N = regGenN "chapeau" masculine ;
-  have_V2 = avoir_V2 ;
  hear_V2 = entendre_V2 ;
  hill_N = regGenN "colline" feminine ;
  hope_VS = mkVS (reg3V "espérer" "espère" "espérera") ;
--- 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 ;
+
 }

--- a/next-lib/src/german/LexiconGer.gf
+++ b/next-lib/src/german/LexiconGer.gf
@@ -96,7 +96,6 @@ lin
  harbour_N = reg2N "Hafen" "Häfen" masculine ;
  hate_V2 = dirV2 (regV "hassen") ;
  hat_N = reg2N "Hut" "Hüte" masculine ;
-  have_V2 = dirV2 IrregGer.haben_V ;
  hear_V2 = dirV2 (regV "hören") ;
  hill_N = mkN "Hügel" ;
  hope_VS = mkVS (regV "hoffen") ;
--- 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 "außer" Dat ;

  as_CAdv = X.mkCAdv "ebenso" "wie" ;
+  have_V2 = P.dirV2 IrregGer.haben_V ;

 }
--- 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") ;
--- 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 -> {
--- 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 ;
--- 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 "høre" "hørte") ;
  hill_N = regGenN "haug" masculine ;
  hope_VS = mkVS (regV "håpe") ;
--- 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.

--- 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 "pãlãrie" ;
-have_V2 = dirV2 (v_have) ;
 hear_V2 = dirV2 (v_besch127 "auzi") ;
 hill_N = mkNR "deal" ;
 hope_VS = mkVS (v_besch17 "spera") ;
--- 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 ;
--- 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} );  
--- 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 ; -- oír_51 
   hill_N = regN "colina" ;
   hope_VS = mkVS (regV "esperar") ;
--- 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")) ;

 }

--- 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 "höra" "hör" "hör" "hörde" "hört" "hörd") ;
  hill_N = regGenN "kulle" utrum ;
 --  hope_VS = mkVS ((regV "önskar")) ;
--- 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

 }