diff --git a/lib/src/experimental/NDPred.gf b/lib/src/experimental/NDPred.gf index e983b4214..f671fe8fa 100644 --- a/lib/src/experimental/NDPred.gf +++ b/lib/src/experimental/NDPred.gf @@ -1,4 +1,4 @@ -abstract NDPred = Cat [Ant,NP,Utt,IP,IAdv,Conj] ** { +abstract NDPred = Cat [Ant,NP,Utt,IP,IAdv,IComp,Conj,RS,RP] ** { cat --< Arg ; @@ -179,6 +179,9 @@ fun --< QuestIAdv : (a : Arg) -> IAdv -> PrCl a -> PrQCl a ; QuestIAdv_none : IAdv -> PrCl_none -> PrQCl_none ; + QuestIComp_none : Ant -> Tense -> Pol -> IComp -> NP -> PrQCl_none ; -- where is she + + --< UseCl : PrCl aNone -> PrS ; UseCl_none : PrCl_none -> PrS ; @@ -198,6 +201,15 @@ fun AdvQCl_none : PrAdv_none -> PrQCl_none -> PrQCl_none ; AdvQCl_np : PrAdv_np -> PrQCl_none -> PrQCl_np ; +-- relatives: just one of each + RelCl_none : PrCl_none -> RS ; + RelVP_none : RP -> PrVP_none -> RS ; + RelSlash_none : RP -> PrCl_np -> RS ; + +-- imperatives: just one of each + + PrImpSg : PrVP_none -> Utt ; + PrImpPl : PrVP_none -> Utt ; -- participles as adjectives diff --git a/lib/src/experimental/NDPredEng.gf b/lib/src/experimental/NDPredEng.gf index 88ff4bdad..0ce69a03e 100644 --- a/lib/src/experimental/NDPredEng.gf +++ b/lib/src/experimental/NDPredEng.gf @@ -1,5 +1,5 @@ concrete NDPredEng of Pred = - CatEng [Ant,NP,Utt,IP,IAdv,Conj] ** + CatEng [Ant,NP,Utt,IP,IAdv,IComp,Conj,RS,RP] ** NDPredFunctor with (PredInterface = PredInstanceEng), (Pred = PredEng) ; diff --git a/lib/src/experimental/NDPredFunctor.gf b/lib/src/experimental/NDPredFunctor.gf index bdb0e4aa1..2eb2b8723 100644 --- a/lib/src/experimental/NDPredFunctor.gf +++ b/lib/src/experimental/NDPredFunctor.gf @@ -1,5 +1,5 @@ incomplete concrete NDPredFunctor of NDPred = - Cat [Ant,NP,Utt,IP,IAdv,Conj] ** + Cat [Ant,NP,Utt,IP,IAdv,Conj,RS,RP] ** open PredInterface, Pred, @@ -131,6 +131,9 @@ lin QuestIAdv_none = Pred.QuestIAdv Pred.aNone ; + QuestIComp_none + = Pred.QuestIComp ; + QuestVP_none = Pred.QuestVP Pred.aNone ; @@ -153,6 +156,18 @@ lin AdvQCl_none, AdvQCl_np = Pred.AdvQCl Pred.aNone ; +---- RelCl_none +---- = Pred.RelCl Pred.aNone ; + RelVP_none + = Pred.RelVP ; + RelSlash_none + = Pred.RelSlash ; + + PrImpSg + = Pred.PrImpSg ; + PrImpPl + = Pred.PrImpPl ; + PresPartAP_none, PresPartAP_np = Pred.PresPartAP Pred.aNone ; diff --git a/lib/src/experimental/NDPredSwe.gf b/lib/src/experimental/NDPredSwe.gf index e0446db23..5f71ad6e6 100644 --- a/lib/src/experimental/NDPredSwe.gf +++ b/lib/src/experimental/NDPredSwe.gf @@ -1,5 +1,5 @@ concrete NDPredSwe of Pred = - CatSwe [Ant,NP,Utt,IP,IAdv,Conj] ** + CatSwe [Ant,NP,Utt,IP,IAdv,IComp,Conj,RS,RP] ** NDPredFunctor with (PredInterface = PredInstanceSwe), (Pred = PredSwe) ;