mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 19:42:50 -06:00
updated wide coverage NDTrans Eng,Swe with the new constructs.
This commit is contained in:
@@ -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
|
cat
|
||||||
--< Arg ;
|
--< Arg ;
|
||||||
@@ -179,6 +179,9 @@ fun
|
|||||||
--< QuestIAdv : (a : Arg) -> IAdv -> PrCl a -> PrQCl a ;
|
--< QuestIAdv : (a : Arg) -> IAdv -> PrCl a -> PrQCl a ;
|
||||||
QuestIAdv_none : IAdv -> PrCl_none -> PrQCl_none ;
|
QuestIAdv_none : IAdv -> PrCl_none -> PrQCl_none ;
|
||||||
|
|
||||||
|
QuestIComp_none : Ant -> Tense -> Pol -> IComp -> NP -> PrQCl_none ; -- where is she
|
||||||
|
|
||||||
|
|
||||||
--< UseCl : PrCl aNone -> PrS ;
|
--< UseCl : PrCl aNone -> PrS ;
|
||||||
UseCl_none : PrCl_none -> PrS ;
|
UseCl_none : PrCl_none -> PrS ;
|
||||||
|
|
||||||
@@ -198,6 +201,15 @@ fun
|
|||||||
AdvQCl_none : PrAdv_none -> PrQCl_none -> PrQCl_none ;
|
AdvQCl_none : PrAdv_none -> PrQCl_none -> PrQCl_none ;
|
||||||
AdvQCl_np : PrAdv_np -> PrQCl_none -> PrQCl_np ;
|
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
|
-- participles as adjectives
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
concrete NDPredEng of Pred =
|
concrete NDPredEng of Pred =
|
||||||
CatEng [Ant,NP,Utt,IP,IAdv,Conj] **
|
CatEng [Ant,NP,Utt,IP,IAdv,IComp,Conj,RS,RP] **
|
||||||
NDPredFunctor with
|
NDPredFunctor with
|
||||||
(PredInterface = PredInstanceEng),
|
(PredInterface = PredInstanceEng),
|
||||||
(Pred = PredEng) ;
|
(Pred = PredEng) ;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
incomplete concrete NDPredFunctor of NDPred =
|
incomplete concrete NDPredFunctor of NDPred =
|
||||||
Cat [Ant,NP,Utt,IP,IAdv,Conj] **
|
Cat [Ant,NP,Utt,IP,IAdv,Conj,RS,RP] **
|
||||||
open
|
open
|
||||||
PredInterface,
|
PredInterface,
|
||||||
Pred,
|
Pred,
|
||||||
@@ -131,6 +131,9 @@ lin
|
|||||||
QuestIAdv_none
|
QuestIAdv_none
|
||||||
= Pred.QuestIAdv Pred.aNone ;
|
= Pred.QuestIAdv Pred.aNone ;
|
||||||
|
|
||||||
|
QuestIComp_none
|
||||||
|
= Pred.QuestIComp ;
|
||||||
|
|
||||||
QuestVP_none
|
QuestVP_none
|
||||||
= Pred.QuestVP Pred.aNone ;
|
= Pred.QuestVP Pred.aNone ;
|
||||||
|
|
||||||
@@ -153,6 +156,18 @@ lin
|
|||||||
AdvQCl_none, AdvQCl_np
|
AdvQCl_none, AdvQCl_np
|
||||||
= Pred.AdvQCl Pred.aNone ;
|
= 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
|
PresPartAP_none, PresPartAP_np
|
||||||
= Pred.PresPartAP Pred.aNone ;
|
= Pred.PresPartAP Pred.aNone ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
concrete NDPredSwe of Pred =
|
concrete NDPredSwe of Pred =
|
||||||
CatSwe [Ant,NP,Utt,IP,IAdv,Conj] **
|
CatSwe [Ant,NP,Utt,IP,IAdv,IComp,Conj,RS,RP] **
|
||||||
NDPredFunctor with
|
NDPredFunctor with
|
||||||
(PredInterface = PredInstanceSwe),
|
(PredInterface = PredInstanceSwe),
|
||||||
(Pred = PredSwe) ;
|
(Pred = PredSwe) ;
|
||||||
|
|||||||
Reference in New Issue
Block a user