mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-21 00:52:51 -06:00
completed OverGrammar with missing params
This commit is contained in:
@@ -1,4 +1,13 @@
|
||||
concrete OverGrammarEng of OverGrammar = StructuralEng,NumeralEng,ConjunctionEng[ListS,ListNP,ListAP,ListAdv] ** open GrammarEng in {
|
||||
lincat ImpForm = {p : PImpForm ; s : Str} ;
|
||||
lincat Punct = {p : PPunct ; s : Str} ;
|
||||
param PImpForm = IFSg | IFPl | IFPol ;
|
||||
param PPunct = PFullStop | PExclMark | PQuestMark ;
|
||||
oper mkUttImp : PImpForm -> Str -> Pol -> Imp -> Utt = \f,s,p,i -> {s = s ++ (case f of {
|
||||
IFSg => UttImpSg p i ; IFPl => UttImpPl p i ; IFPol => UttImpPol p i}).s ; lock_Utt = <>} ;
|
||||
oper mkPhrPunct : Phr -> PPunct -> Str -> Text -> Text = \p,f,s,t -> {s = s ++ (case f of {
|
||||
PFullStop => TFullStop p t ; PExclMark => TExclMark p t ; PQuestMark => TQuestMark p t}).s ;
|
||||
lock_Text = <>} ;
|
||||
lin ovrld0_mkAP = PositA ;
|
||||
lin ovrld1_mkAP = ComparA ;
|
||||
lin ovrld2_mkAP = ComplA2 ;
|
||||
@@ -153,111 +162,121 @@ lin ovrld150_presentTense = TPres ;
|
||||
lin ovrld151_pastTense = TPast ;
|
||||
lin ovrld152_futureTense = TFut ;
|
||||
lin ovrld153_conditionalTense = TCond ;
|
||||
lin ovrld154_mkUtt = UttS ;
|
||||
lin ovrld155_mkUtt = \c -> UttS (UseCl TPres ASimul PPos c) ;
|
||||
lin ovrld156_mkUtt = UttQS ;
|
||||
lin ovrld157_mkUtt = UttImpSg ;
|
||||
lin ovrld158_mkUtt = UttImpSg PPos ;
|
||||
lin ovrld159_mkUtt = UttIP ;
|
||||
lin ovrld160_mkUtt = UttIAdv ;
|
||||
lin ovrld161_mkUtt = UttNP ;
|
||||
lin ovrld162_mkUtt = UttAdv ;
|
||||
lin ovrld163_mkUtt = UttVP ;
|
||||
lin ovrld164_lets_Utt = ImpPl1 ;
|
||||
lin ovrld165_mkQCl = QuestCl ;
|
||||
lin ovrld166_mkQCl = QuestVP ;
|
||||
lin ovrld167_mkQCl = QuestSlash ;
|
||||
lin ovrld168_mkQCl = \ip,np,v -> QuestSlash ip (SlashV2 np v) ;
|
||||
lin ovrld169_mkQCl = QuestIAdv ;
|
||||
lin ovrld170_mkQCl = \p,ip -> QuestIAdv (PrepIP p ip) ;
|
||||
lin ovrld171_mkQCl = \a -> QuestIComp (CompIAdv a) ;
|
||||
lin ovrld172_mkQCl = ExistIP ;
|
||||
lin ovrld173_mkIP = IDetCN ;
|
||||
lin ovrld174_mkIP = \i -> IDetCN i NoNum ;
|
||||
lin ovrld175_mkIP = \i,n -> IDetCN i n NoOrd ;
|
||||
lin ovrld176_mkIP = \i,n -> IDetCN i NoNum NoOrd (UseN n) ;
|
||||
lin ovrld177_mkIP = AdvIP ;
|
||||
lin ovrld178_mkIAdv = PrepIP ;
|
||||
lin ovrld179_mkRCl = RelCl ;
|
||||
lin ovrld180_mkRCl = RelVP ;
|
||||
lin ovrld181_mkRCl = RelSlash ;
|
||||
lin ovrld182_mkRCl = \rp,np,v2 -> RelSlash rp (SlashV2 np v2) ;
|
||||
lin ovrld183_which_RP = IdRP ;
|
||||
lin ovrld184_mkRP = FunRP ;
|
||||
lin ovrld185_mkSlash = SlashV2 ;
|
||||
lin ovrld186_mkSlash = SlashVVV2 ;
|
||||
lin ovrld187_mkSlash = AdvSlash ;
|
||||
lin ovrld188_mkSlash = SlashPrep ;
|
||||
lin ovrld189_mkImp = ImpVP ;
|
||||
lin ovrld190_mkImp = \v -> ImpVP (UseV v) ;
|
||||
lin ovrld191_mkImp = \v,np -> ImpVP (ComplV2 v np) ;
|
||||
lin ovrld192_mkS = UseCl TPres ASimul PPos ;
|
||||
lin ovrld193_mkS = \t -> UseCl t ASimul PPos ;
|
||||
lin ovrld194_mkS = \a -> UseCl TPres a PPos ;
|
||||
lin ovrld195_mkS = \p -> UseCl TPres ASimul p ;
|
||||
lin ovrld196_mkS = \t,a -> UseCl t a PPos ;
|
||||
lin ovrld197_mkS = \t,p -> UseCl t ASimul p ;
|
||||
lin ovrld198_mkS = \a,p -> UseCl TPres a p ;
|
||||
lin ovrld199_mkS = UseCl ;
|
||||
lin ovrld200_mkS = \c,x,y -> ConjS c (BaseS x y) ;
|
||||
lin ovrld201_mkS = \c,x,y -> DConjS c (BaseS x y) ;
|
||||
lin ovrld202_mkS = \c,xy -> ConjS c xy ;
|
||||
lin ovrld203_mkS = \c,xy -> DConjS c xy ;
|
||||
lin ovrld204_mkS = AdvS ;
|
||||
lin ovrld205_mkQS = UseQCl TPres ASimul PPos ;
|
||||
lin ovrld206_mkQS = \t -> UseQCl t ASimul PPos ;
|
||||
lin ovrld207_mkQS = \a -> UseQCl TPres a PPos ;
|
||||
lin ovrld208_mkQS = \p -> UseQCl TPres ASimul p ;
|
||||
lin ovrld209_mkQS = \t,a -> UseQCl t a PPos ;
|
||||
lin ovrld210_mkQS = \t,p -> UseQCl t ASimul p ;
|
||||
lin ovrld211_mkQS = \a,p -> UseQCl TPres a p ;
|
||||
lin ovrld212_mkQS = UseQCl ;
|
||||
lin ovrld213_mkQS = \x -> UseQCl TPres ASimul PPos (QuestCl x) ;
|
||||
lin ovrld214_mkRS = UseRCl TPres ASimul PPos ;
|
||||
lin ovrld215_mkRS = \t,c -> UseRCl t ASimul PPos c ;
|
||||
lin ovrld216_mkRS = \a,c -> UseRCl TPres a PPos c ;
|
||||
lin ovrld217_mkRS = \p,c -> UseRCl TPres ASimul p c ;
|
||||
lin ovrld218_mkRS = \t,a,c -> UseRCl t a PPos c ;
|
||||
lin ovrld219_mkRS = \t,p,c -> UseRCl t ASimul p c ;
|
||||
lin ovrld220_mkRS = \a,p,c -> UseRCl TPres a p c ;
|
||||
lin ovrld221_mkRS = UseRCl ;
|
||||
lin ovrld222_emptyText = TEmpty ;
|
||||
lin ovrld223_mkText = \x -> TFullStop x TEmpty ;
|
||||
lin ovrld224_mkText = \u -> TFullStop (PhrUtt NoPConj u NoVoc) TEmpty ;
|
||||
lin ovrld225_mkText = \s -> TFullStop (PhrUtt NoPConj (UttS s) NoVoc) TEmpty ;
|
||||
lin ovrld226_mkText = \c -> TFullStop (PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos c)) NoVoc) TEmpty ;
|
||||
lin ovrld227_mkText = \q -> TQuestMark (PhrUtt NoPConj (UttQS q) NoVoc) TEmpty ;
|
||||
lin ovrld228_mkText = \i -> TExclMark (PhrUtt NoPConj (UttImpSg PPos i) NoVoc) TEmpty ;
|
||||
lin ovrld229_mkText = \p,i -> TExclMark (PhrUtt NoPConj (UttImpSg p i) NoVoc) TEmpty ;
|
||||
lin ovrld230_mkText = TFullStop ;
|
||||
lin ovrld231_mkVP = UseV ;
|
||||
lin ovrld232_mkVP = ComplV2 ;
|
||||
lin ovrld233_mkVP = ComplV3 ;
|
||||
lin ovrld234_mkVP = ComplVV ;
|
||||
lin ovrld235_mkVP = ComplVS ;
|
||||
lin ovrld236_mkVP = ComplVQ ;
|
||||
lin ovrld237_mkVP = ComplVA ;
|
||||
lin ovrld238_mkVP = ComplV2A ;
|
||||
lin ovrld239_mkVP = \a -> UseComp (CompAP (PositA a)) ;
|
||||
lin ovrld240_mkVP = \y,z -> (UseComp (CompAP (ComparA y z))) ;
|
||||
lin ovrld241_mkVP = \y,z -> (UseComp (CompAP (ComplA2 y z))) ;
|
||||
lin ovrld242_mkVP = \a -> UseComp (CompAP a) ;
|
||||
lin ovrld243_mkVP = \a -> UseComp (CompNP a) ;
|
||||
lin ovrld244_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) y))) ;
|
||||
lin ovrld245_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN y)))) ;
|
||||
lin ovrld246_mkVP = \a -> UseComp (CompAdv a) ;
|
||||
lin ovrld247_mkVP = AdvVP ;
|
||||
lin ovrld248_mkVP = AdVVP ;
|
||||
lin ovrld249_reflexiveVP = ReflV2 ;
|
||||
lin ovrld250_passiveVP = PassV2 ;
|
||||
lin ovrld251_passiveVP = \v,np -> (AdvVP (PassV2 v) (PrepNP by8agent_Prep np)) ;
|
||||
lin ovrld252_progressiveVP = ProgrVP ;
|
||||
lin ovrld253_mkListS = BaseS ;
|
||||
lin ovrld254_mkListS = ConsS ;
|
||||
lin ovrld255_mkListAP = BaseAP ;
|
||||
lin ovrld256_mkListAP = ConsAP ;
|
||||
lin ovrld257_mkListAdv = BaseAdv ;
|
||||
lin ovrld258_mkListAdv = ConsAdv ;
|
||||
lin ovrld259_mkListNP = BaseNP ;
|
||||
lin ovrld260_mkListNP = ConsNP ;
|
||||
lin ovrld154_singularImpForm = {p= IFSg; s= []} ;
|
||||
lin ovrld155_pluralImpForm = {p= IFPl; s= []} ;
|
||||
lin ovrld156_politeImpForm = {p= IFPol; s= []} ;
|
||||
lin ovrld157_mkUtt = UttS ;
|
||||
lin ovrld158_mkUtt = \c -> UttS (UseCl TPres ASimul PPos c) ;
|
||||
lin ovrld159_mkUtt = UttQS ;
|
||||
lin ovrld160_mkUtt = \f -> mkUttImp f.p f.s ;
|
||||
lin ovrld161_mkUtt = \f -> mkUttImp f.p f.s PPos ;
|
||||
lin ovrld162_mkUtt = UttImpSg ;
|
||||
lin ovrld163_mkUtt = UttImpSg PPos ;
|
||||
lin ovrld164_mkUtt = UttIP ;
|
||||
lin ovrld165_mkUtt = UttIAdv ;
|
||||
lin ovrld166_mkUtt = UttNP ;
|
||||
lin ovrld167_mkUtt = UttAdv ;
|
||||
lin ovrld168_mkUtt = UttVP ;
|
||||
lin ovrld169_lets_Utt = ImpPl1 ;
|
||||
lin ovrld170_mkQCl = QuestCl ;
|
||||
lin ovrld171_mkQCl = QuestVP ;
|
||||
lin ovrld172_mkQCl = QuestSlash ;
|
||||
lin ovrld173_mkQCl = \ip,np,v -> QuestSlash ip (SlashV2 np v) ;
|
||||
lin ovrld174_mkQCl = QuestIAdv ;
|
||||
lin ovrld175_mkQCl = \p,ip -> QuestIAdv (PrepIP p ip) ;
|
||||
lin ovrld176_mkQCl = \a -> QuestIComp (CompIAdv a) ;
|
||||
lin ovrld177_mkQCl = ExistIP ;
|
||||
lin ovrld178_mkIP = IDetCN ;
|
||||
lin ovrld179_mkIP = \i -> IDetCN i NoNum ;
|
||||
lin ovrld180_mkIP = \i,n -> IDetCN i n NoOrd ;
|
||||
lin ovrld181_mkIP = \i,n -> IDetCN i NoNum NoOrd (UseN n) ;
|
||||
lin ovrld182_mkIP = AdvIP ;
|
||||
lin ovrld183_mkIAdv = PrepIP ;
|
||||
lin ovrld184_mkRCl = RelCl ;
|
||||
lin ovrld185_mkRCl = RelVP ;
|
||||
lin ovrld186_mkRCl = RelSlash ;
|
||||
lin ovrld187_mkRCl = \rp,np,v2 -> RelSlash rp (SlashV2 np v2) ;
|
||||
lin ovrld188_which_RP = IdRP ;
|
||||
lin ovrld189_mkRP = FunRP ;
|
||||
lin ovrld190_mkSlash = SlashV2 ;
|
||||
lin ovrld191_mkSlash = SlashVVV2 ;
|
||||
lin ovrld192_mkSlash = AdvSlash ;
|
||||
lin ovrld193_mkSlash = SlashPrep ;
|
||||
lin ovrld194_mkImp = ImpVP ;
|
||||
lin ovrld195_mkImp = \v -> ImpVP (UseV v) ;
|
||||
lin ovrld196_mkImp = \v,np -> ImpVP (ComplV2 v np) ;
|
||||
lin ovrld197_mkS = UseCl TPres ASimul PPos ;
|
||||
lin ovrld198_mkS = \t -> UseCl t ASimul PPos ;
|
||||
lin ovrld199_mkS = \a -> UseCl TPres a PPos ;
|
||||
lin ovrld200_mkS = \p -> UseCl TPres ASimul p ;
|
||||
lin ovrld201_mkS = \t,a -> UseCl t a PPos ;
|
||||
lin ovrld202_mkS = \t,p -> UseCl t ASimul p ;
|
||||
lin ovrld203_mkS = \a,p -> UseCl TPres a p ;
|
||||
lin ovrld204_mkS = UseCl ;
|
||||
lin ovrld205_mkS = \c,x,y -> ConjS c (BaseS x y) ;
|
||||
lin ovrld206_mkS = \c,x,y -> DConjS c (BaseS x y) ;
|
||||
lin ovrld207_mkS = \c,xy -> ConjS c xy ;
|
||||
lin ovrld208_mkS = \c,xy -> DConjS c xy ;
|
||||
lin ovrld209_mkS = AdvS ;
|
||||
lin ovrld210_mkQS = UseQCl TPres ASimul PPos ;
|
||||
lin ovrld211_mkQS = \t -> UseQCl t ASimul PPos ;
|
||||
lin ovrld212_mkQS = \a -> UseQCl TPres a PPos ;
|
||||
lin ovrld213_mkQS = \p -> UseQCl TPres ASimul p ;
|
||||
lin ovrld214_mkQS = \t,a -> UseQCl t a PPos ;
|
||||
lin ovrld215_mkQS = \t,p -> UseQCl t ASimul p ;
|
||||
lin ovrld216_mkQS = \a,p -> UseQCl TPres a p ;
|
||||
lin ovrld217_mkQS = UseQCl ;
|
||||
lin ovrld218_mkQS = \x -> UseQCl TPres ASimul PPos (QuestCl x) ;
|
||||
lin ovrld219_mkRS = UseRCl TPres ASimul PPos ;
|
||||
lin ovrld220_mkRS = \t,c -> UseRCl t ASimul PPos c ;
|
||||
lin ovrld221_mkRS = \a,c -> UseRCl TPres a PPos c ;
|
||||
lin ovrld222_mkRS = \p,c -> UseRCl TPres ASimul p c ;
|
||||
lin ovrld223_mkRS = \t,a,c -> UseRCl t a PPos c ;
|
||||
lin ovrld224_mkRS = \t,p,c -> UseRCl t ASimul p c ;
|
||||
lin ovrld225_mkRS = \a,p,c -> UseRCl TPres a p c ;
|
||||
lin ovrld226_mkRS = UseRCl ;
|
||||
lin ovrld227_emptyText = TEmpty ;
|
||||
lin ovrld228_fullStopPunct = {p= PFullStop; s= []} ;
|
||||
lin ovrld229_questMarkPunct = {p= PQuestMark; s= []} ;
|
||||
lin ovrld230_exclMarkPunct = {p= PExclMark; s= []} ;
|
||||
lin ovrld231_mkText = \p,f -> mkPhrPunct p f.p f.s ;
|
||||
lin ovrld232_mkText = \p,f -> mkPhrPunct p f.p f.s TEmpty ;
|
||||
lin ovrld233_mkText = \x -> TFullStop x TEmpty ;
|
||||
lin ovrld234_mkText = \u -> TFullStop (PhrUtt NoPConj u NoVoc) TEmpty ;
|
||||
lin ovrld235_mkText = \s -> TFullStop (PhrUtt NoPConj (UttS s) NoVoc) TEmpty ;
|
||||
lin ovrld236_mkText = \c -> TFullStop (PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos c)) NoVoc) TEmpty ;
|
||||
lin ovrld237_mkText = \q -> TQuestMark (PhrUtt NoPConj (UttQS q) NoVoc) TEmpty ;
|
||||
lin ovrld238_mkText = \i -> TExclMark (PhrUtt NoPConj (UttImpSg PPos i) NoVoc) TEmpty ;
|
||||
lin ovrld239_mkText = \p,i -> TExclMark (PhrUtt NoPConj (UttImpSg p i) NoVoc) TEmpty ;
|
||||
lin ovrld240_mkText = TFullStop ;
|
||||
lin ovrld241_mkVP = UseV ;
|
||||
lin ovrld242_mkVP = ComplV2 ;
|
||||
lin ovrld243_mkVP = ComplV3 ;
|
||||
lin ovrld244_mkVP = ComplVV ;
|
||||
lin ovrld245_mkVP = ComplVS ;
|
||||
lin ovrld246_mkVP = ComplVQ ;
|
||||
lin ovrld247_mkVP = ComplVA ;
|
||||
lin ovrld248_mkVP = ComplV2A ;
|
||||
lin ovrld249_mkVP = \a -> UseComp (CompAP (PositA a)) ;
|
||||
lin ovrld250_mkVP = \y,z -> (UseComp (CompAP (ComparA y z))) ;
|
||||
lin ovrld251_mkVP = \y,z -> (UseComp (CompAP (ComplA2 y z))) ;
|
||||
lin ovrld252_mkVP = \a -> UseComp (CompAP a) ;
|
||||
lin ovrld253_mkVP = \a -> UseComp (CompNP a) ;
|
||||
lin ovrld254_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) y))) ;
|
||||
lin ovrld255_mkVP = \y -> (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN y)))) ;
|
||||
lin ovrld256_mkVP = \a -> UseComp (CompAdv a) ;
|
||||
lin ovrld257_mkVP = AdvVP ;
|
||||
lin ovrld258_mkVP = AdVVP ;
|
||||
lin ovrld259_reflexiveVP = ReflV2 ;
|
||||
lin ovrld260_passiveVP = PassV2 ;
|
||||
lin ovrld261_passiveVP = \v,np -> (AdvVP (PassV2 v) (PrepNP by8agent_Prep np)) ;
|
||||
lin ovrld262_progressiveVP = ProgrVP ;
|
||||
lin ovrld263_mkListS = BaseS ;
|
||||
lin ovrld264_mkListS = ConsS ;
|
||||
lin ovrld265_mkListAP = BaseAP ;
|
||||
lin ovrld266_mkListAP = ConsAP ;
|
||||
lin ovrld267_mkListAdv = BaseAdv ;
|
||||
lin ovrld268_mkListAdv = ConsAdv ;
|
||||
lin ovrld269_mkListNP = BaseNP ;
|
||||
lin ovrld270_mkListNP = ConsNP ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user