copy files over from GF-latin

src/latin/VerbLat.gf

@@ -1,5 +1,5 @@
 --1 Construction rules for latin verb phrases
-concrete VerbLat of Verb = CatLat ** open (S=StructuralLat),ResLat,IrregLat in {
+concrete VerbLat of Verb = CatLat ** open (S=StructuralLat),ResLat,IrregLat,ExtraLat,Predef,Prelude in {
 
   flags optimize=all_subs ;
 
@@ -11,88 +11,107 @@ concrete VerbLat of Verb = CatLat ** open (S=StructuralLat),ResLat,IrregLat in {
 
 --  ComplVV : VV -> VP -> VP ;  -- want to run        
     ComplVV v vp =
-      {
-	fin = vp.fin ;
-	inf = v.inf ;
-	obj = vp.obj ;
-	adj = vp.adj
-      };
+      vp ** {
+	s = \\af,qf => v.act ! af ;
+	compl = \\ag => vp.compl ! ag ++ vp.inf ! VInfActPres
+      } ;
 
 --  ComplVS : VS -> S -> VP ;  -- say that she runs
-    ComplVS v s  = insertObj (S.that_Subj.s ++ s.s) (predV v) ;
+    ComplVS v s  = insertObj ( dummyNP (S.that_Subj.s ++ s.s ! PreS)) Nom_Prep (predV v) ;
 
 --  ComplVQ : VQ -> QS -> VP ;  -- wonder who runs
-    ComplVQ v q  = insertObj ( q.s ! QIndir) (predV v) ;
+    ComplVQ v q  = insertObj (dummyNP (q.s ! QIndir)) Nom_Prep (predV v) ;
     
 --  ComplVA : VA -> AP -> VP ;  -- they become red
-    ComplVA v ap = (predV v) ** { adj = ap.s } ;
+    ComplVA v ap = (predV v) ** { compl = ap.s } ;
 
 --  SlashV2a : V2 -> VPSlash ;  -- love (it)
     SlashV2a v = lin VP (predV2 v) ;
 
---    Slash2V3 v np = 
-    --      insertObjc (\\_ => v.c2 ++ np.s ! Acc) (predV v ** {c2 = v.c3}) ;
+--  Slash2V3 : V3  -> NP -> VPSlash ;  -- give it (to her)
+    Slash2V3 v np = lin VP (insertObjc np (predV3 v ** { c = v.c2 } ) );
     
 --  Slash3V3 : V3  -> NP -> VPSlash ;  -- give (it) to her
-    Slash3V3 v np =
-      lin VP ( insertObjc ( v.c2.s ++ np.s ! v.c2.c ) ( predV3 v ) ) ;
+    Slash3V3 v np = lin VP ( insertObjc np ( predV3 v ** { c = v.c} ) ) ;
 
+--  SlashV2V : V2V -> VP -> VPSlash ;  -- beg (her) to go
 --    SlashV2V v vp = insertObjc (\\a => infVP v.isAux vp a) (predVc v) ;
 
+--  SlashV2S : V2S -> S  -> VPSlash ;  -- answer (to him) that it is good
 --    SlashV2S v s  = insertObjc (\\_ => conjThat ++ s.s) (predVc v) ;
 
 --  SlashV2Q : V2Q -> QS -> VPSlash ;  -- ask (him) who came
-    SlashV2Q v q  = lin VP (insertObjc (q.s ! QIndir) (predV2 v) ) ;
+    SlashV2Q v q  = lin VP (insertObjc (dummyNP (q.s ! QIndir)) (predV2 v) ) ;
 
 --  SlashV2A : V2A -> AP -> VPSlash ;  -- paint (it) red
     SlashV2A v ap = lin VP ( (predV2 v) ** { adj = ap.s } ) ; 
 
 --  ComplSlash : VPSlash -> NP -> VP ; -- love it
     ComplSlash vp np = -- VPSlash -> NP -> VP
-      insertObj (appPrep vp.c2 np.s) vp ;
+      insertObj np vp.c vp ;
 
+--  SlashVV    : VV  -> VPSlash -> VPSlash ;       -- want to buy
 --    SlashVV vv vp = 
 --      insertObj (\\a => infVP vv.isAux vp a) (predVV vv) **
 --        {c2 = vp.c2} ;
 
+--  SlashV2VNP : V2V -> NP -> VPSlash -> VPSlash ; -- beg me to buy
 --    SlashV2VNP vv np vp = 
 --      insertObjPre (\\_ => vv.c2 ++ np.s ! Acc)
 --        (insertObjc (\\a => infVP vv.isAux vp a) (predVc vv)) **
 --          {c2 = vp.c2} ;
 
 --2 Other ways of forming verb phrases
-    
+
+--  ReflVP   : VPSlash -> VP ;         -- love himself
 --    ReflVP v = insertObjPre (\\a => v.c2 ++ reflPron ! a) v ;    
 
---  UseComp : Comp -> VP
+--  UseComp : Comp -> VP ;            -- be warm
     UseComp comp = 
       insertAdj comp.s (predV be_V) ;
 
---    PassV2 v = insertObj (\\_ => v.s ! VPPart) (predAux auxBe) ;
+--  PassV2   : V2 -> VP ;               -- be loved
+    PassV2 v = predV (
+      v ** {
+	act = table { VAct anter tense number person =>
+			case anter of {
+			  VSim => v.pass ! VPass tense number person ;
+			  VAnt => ""  --error "using participles is not implemented yet"
+			}
+	  } 
+	} );
 
 --  AdvVP    : VP -> Adv -> VP ;        -- sleep here
-    AdvVP vp adv = insertObj adv.s vp ;
+    AdvVP vp adv = insertAdv adv vp ;
 
 --    ExtAdvVP vp adv = vp
 
---    AdVVP adv vp = insertObj adv.s vp ;
+--  AdVVP    : AdV -> VP -> VP ;        -- always sleep
+    AdVVP adv vp = vp ** { adv = vp.adv ++ adv.s } ;
 
---    AdvVPSlash : VPSlash -> Adv -> VPSlash ;  -- use (it) here
-
---    AdVVPSlash : AdV -> VPSlash -> VPSlash ;  -- always use (it)
-   
+--  AdvVPSlash : VPSlash -> Adv -> VPSlash ;  -- use (it) here
+    AdvVPSlash vp adv = vp ** { adv = (adv.s ! Posit) ++ vp.adv } ;
+    
+--  AdVVPSlash : AdV -> VPSlash -> VPSlash ;  -- always use (it)
+    AdVVPSlash adv vp = vp ** { adv = vp.adv ++ adv.s } ;
+    
 --    VPSlashPrep : VP -> Prep -> VPSlash ;  -- live in (it)
 
     --2 Complements to copula
 
---  CompAP : AP -> Comp
+--  CompAP   : AP  -> Comp ;            -- (be) small
     CompAP ap = ap ;
+    
+--  CompNP   : NP  -> Comp ;            -- (be) the man
+    CompNP np = {s = \\_ => let a = Ag np.g np.n Nom in np.preap.s ! a ++ np.s ! Nom ++ np.postap.s ! a } ;
 
---    CompNP np = {s = \\_ => np.s ! Acc} ;
+--  CompAdv  : Adv -> Comp ;            -- (be) here
+    CompAdv a = {s = \\_ => a.s ! Posit } ;
 
---    CompAdv a = {s = \\_ => a.s} ;
+--  CompCN   : CN  -> Comp ;            -- (be) a man/men
+    CompCN cn = {s = table { Ag g n c => cn.preap.s ! Ag cn.g n Nom ++ cn.s ! n ! Nom ++ cn.postap.s ! Ag cn.g n Nom} };
 
---    CompCN
 
---    UseCopula v = v
+--  UseCopula : VP ;                    -- be
+    UseCopula = predV be_V ;
 }